Merge branch 'master' of git.echepei.com:zhujiawei/Warehouse_management_ui

src/views/Warehousing/inStock/AddOrUpdate.vue

@@ -29,6 +29,7 @@
               placeholder="请输入关键词"
               style="width: 80%"
               @change="changefStltype"
+              :disabled="detailList.length"
             >
               <el-option
                 v-for="(item, index) in fMblnoOptions"
@@ -61,7 +62,7 @@
           <el-form-item label="提单号" prop="fMblno">
             <el-input
               v-model="form.fMblno"
-              :disabled="browseStatus || formBrowseStatus"
+              :disabled="browseStatus || formBrowseStatus||detailList.length"
               style="width: 80%"
               placeholder="请输入提单号"
             />
@@ -118,7 +119,7 @@
               filterable
               v-model="form.fGoodsid"
               style="width: 80%"
-              :disabled="browseStatus || formBrowseStatus"
+              :disabled="browseStatus || formBrowseStatus||detailList.length"
               placeholder="请选择品名"
             >
               <el-option
@@ -135,7 +136,7 @@
             <el-select
               v-model="form.fWarehouseid"
               filterable
-              :disabled="browseStatus || formBrowseStatus"
+              :disabled="browseStatus || formBrowseStatus||detailList.length"
               style="width: 80%"
               placeholder="请选择"
             >
@@ -183,10 +184,10 @@
         <el-col :span="8">
           <el-form-item label="计划净重(kg)" prop="fPlannetweight">
             <el-input
-              v-model.number="form.fPlannetweight"
+              v-model="form.fPlannetweight"
               style="width: 80%"
               maxlength="9"
-              v-input-limit="0"
+              v-input-limit="2"
               laceholder="计划净重"
               :disabled="browseStatus || current !== before"
             />
@@ -195,8 +196,8 @@
         <el-col :span="8">
           <el-form-item label="计划毛重(kg)" prop="fPlangrossweight">
             <el-input
-              v-model.number="form.fPlangrossweight"
-              v-input-limit="0"
+              v-model="form.fPlangrossweight"
+              v-input-limit="2"
               style="width: 80%"
               laceholder="计划毛重"
               maxlength="9"
@@ -856,6 +857,7 @@
               align="center"
               width="140px"
               label="箱型"
+              :formatter="fCntrtypeFormat"
             />
             <el-table-column
               prop="fCntqty"
@@ -1949,12 +1951,6 @@
           <el-row>
             <el-col :span="6">
               <el-form-item label="库区" prop="fWarehouselocid">
-                <!-- <el-cascader
-                  v-model="importList.fWarehouseInformation"
-                  :props="cascaderprops"
-                  :options="fWarehouseidOptions"
-                  :show-all-levels="false"
-                ></el-cascader> -->
                 <treeselect
                   v-model="importList.fWarehouselocid"
                   @select="getAlltree"
@@ -3074,9 +3070,7 @@ export default {
         fGoodsid: [{ required: true, message: " ", trigger: "blur" }],
         fBusinessType: [{ required: true, message: " ", trigger: "blur" }],
         fMarks: [{ required: true, message: " ", trigger: "blur" }],
-        fWarehouselocid: [
-          { required: true, message: " ", trigger: "blur" },
-        ],
+        fWarehouselocid: [{ required: true, message: " ", trigger: "blur" }],
         fPackagespecs: [{ required: true, message: " ", trigger: "blur" }],
         fTruckno: [{ required: true, message: " ", trigger: "blur" }],
       },
@@ -3371,6 +3365,7 @@ export default {
               });
             });
             this.msgSuccess("卸货成功");
+            this.$set(this.form,"fItemsStatus", 3);
           }
         });
       } else {
@@ -3461,6 +3456,7 @@ export default {
             });
           });
           this.msgSuccess("入库成功");
+          this.$set(this.form,"fItemsStatus", 4);
         }
       });
     },
@@ -3550,6 +3546,7 @@ export default {
           });
         });
         this.msgSuccess("撤回成功");
+        this.$set(this.form,"fItemsStatus", 1);
       });
     },
     fStorageTypeFormat(row) {
@@ -3561,6 +3558,15 @@ export default {
       });
       return fStorageType;
     },
+    fCntrtypeFormat(row) {
+      let fCntrtype;
+      this.cntrList.map((e) => {
+        if (row.fCntrtype == e.fId) {
+          fCntrtype = e.fName;
+        }
+      });
+      return fCntrtype;
+    },
     goodsFormat(row) {
       let goods;
       this.goodsOptions.map((e) => {
@@ -3966,7 +3972,7 @@ export default {
     },
 
     fiximporTable() {
-      console.log(this.importList)
+      console.log(this.importList);
       this.detailList[this.fixdetaiNum] = this.importList;
       this.weightList = false;
     },
@@ -4069,8 +4075,8 @@ export default {
       return sums;
     },
     playcomputer() {
-      let Num1 = this.form.fPlannetweight / this.form.fPlanqty;
-      let Num2 = this.form.fPlangrossweight / this.form.fPlanqty;
+      let Num1 = Number(this.form.fPlannetweight) / Number(this.form.fPlanqty);
+      let Num2 = Number(this.form.fPlangrossweight) / Number(this.form.fPlanqty);
       this.importList.fNetweight = Number(
         (this.importList.fQty * Num1).toFixed(2)
       );
@@ -4305,6 +4311,9 @@ export default {
       this.reset();
       this.fixdetaiNum = null;
       this.fixdetaiNum = index;
+      treeselect(this.form.fWarehouseid).then((response) => {
+        this.fWarehouseidOptions = response.data;
+      });
       row.fBsdate = new Date(row.fBsdate).getTime();
       row.fBusinessType = row.fBusinessType.toString();
       row.fCntrtype = Number(row.fCntrtype);
@@ -4639,14 +4648,17 @@ export default {
         formData.append("tEnclosure", JSON.stringify(this.relevantAttachments));
         formData.append("tCntr", JSON.stringify(this.CntrTable));
         addJoblist(formData).then((response) => {
-          this.detailList.map((e, index) => {
-            response.data.warehousebillsitems.map((item) => {
-              if (e.fId == item.fId) {
-                e = item;
-                this.$set(this.detailList, index, e);
-              }
+          if (response.code == 200) {
+            this.detailList.map((e, index) => {
+              response.data.warehousebillsitems.map((item) => {
+                if (e.fId == item.fId) {
+                  e = item;
+                  this.$set(this.detailList, index, e);
+                }
+              });
             });
-          });
+            this.$set(this.form,"fItemsStatus", 2);
+          }
         });
       }
       const style =