wenhongquan 3 年 前
コミット
331554ebe4

+ 3 - 3
src/views/WarehouseDetail/index.vue

@@ -70,7 +70,7 @@
               
               <div style="font-size:14px;"><span style="color:#646566">物资名称:</span>{{item.name}} (<span style="font-size:12px;">规格:{{item.size}}</span><span style="font-size:12px;margin-left:10px">型号:{{item.model}}</span>)</div>
                <div style="margin-top:10px">
-               <div style="font-size:14px;display:inline-block"><span style="color:#646566">可用数量:</span>{{item.availableNum}}{{item.unit}}</div>
+               <div v-if="!isbj" style="font-size:14px;display:inline-block"><span style="color:#646566">可用数量:</span>{{item.availableNum}}{{item.unit}}</div>
               <div style="font-size:14px;display:inline-block;margin-left:20px" ><span style="color:#646566">仓储数量:</span>{{item.num}}{{item.unit}}</div>
              
                </div>
@@ -228,7 +228,7 @@ const wzdata = reactive({ aar: [] });
 
 const godetail =(item)=>{
   localStorage.setItem("wzdata",JSON.stringify(item));
-  router.push("/warehouse/detailgoods");
+  router.push("/warehouse/detailgoods?kys="+(!isbj.value?1:0));
   // window.location.reload();
 }
 
@@ -244,7 +244,7 @@ const addwz = ()=>{
     pic:"",
     resourceId:whdata.value.id
 }));
-router.push("/warehouse/detailgoods");
+router.push("/warehouse/detailgoods?kys="+(!isbj.value?1:0));
 // window.location.reload();
 }
 

+ 16 - 5
src/views/WarehouseDetailGoods/index.vue

@@ -49,6 +49,7 @@
               placeholder="请输入数量"
             />
             <van-field
+              v-if="iskysl"
               v-model="whdata.availableNum"
               label="可用数量"
               required
@@ -251,10 +252,16 @@ const dosavedata = () => {
     Toast.fail("物资仓储数量未填写");
     return;
   }
-  if(whdata.value.availableNum===""){
-    Toast.fail("物资可用数量未填写");
-    return;
+  if (iskysl.value) {
+    if (whdata.value.availableNum === "") {
+      Toast.fail("物资可用数量未填写");
+      return;
+    }
+
+  } else { 
+    delete whdata.value.availableNum;
   }
+  
    if(whdata.value.unit===""){
     Toast.fail("物资单位未填写");
     return;
@@ -317,8 +324,12 @@ const dosavedata = () => {
 
 const goodlistall = ref([]);
 
-
-onMounted(()=>{
+const iskysl = ref(false);
+onMounted(() => {
+  var kys = route.query.kys;
+  if (kys.toString() === '1') { 
+    iskysl.value = true;
+  }
   var c = async ()=>{
     await commonStore.getGlobalDict("zhdd_resource_goods");
     goodlist.value = commonStore.globalDict['zhdd_resource_goods']?.map(o => o.dictLabel);