入库作业费修改

src/views/warehouseBusiness/inStock/index.vue

@@ -1792,7 +1792,9 @@
               <template slot-scope="scope">
                 <el-select
                   v-model="scope.row.fStltypeid"
-                  placeholder="请选择结算表票结、月结">
+                  placeholder="请选择结算表票结、月结"
+                  :disabled="browseStatus"
+                  >
                   <el-option
                     v-for="dict in fStltypeidOptions"
                     :key="dict.dictValue"
@@ -2027,6 +2029,28 @@
               </template>
             </el-table-column>
             <el-table-column
+              prop="fBusinessType"
+              header-align="center"
+              align="center"
+              width="180px"
+              label="作业类型"
+            >
+              <el-select
+                style="width: 80%"
+                v-model="warehouseDrList.fBusinessType"
+                filterable
+                disabled
+              >
+                <el-option
+                  v-for="(dict,index) in businessTypeOption"
+                  :key="dict.dictValue"
+                  :label="dict.dictLabel"
+                  :value="dict.dictValue"
+                ></el-option>
+              </el-select>
+            </el-table-column>
+
+            <el-table-column
               prop="fFeeUnitid"
               header-align="center"
               align="center"
@@ -3292,8 +3316,6 @@ export default {
     getAlltree(tree){
       this.information = tree.fWarehouseInformation
       this.informationId = tree.id
-      // this.$set(this.dataList[this.inDex], 'fWarehouseInformation', tree.fWarehouseInformation)
-      // this.$set(this.dataList[this.inDex], 'fWarehouselocid', tree.id)
     },
     confirm(){
       this.$set(this.dataList[this.inDex], 'fWarehouseInformation', this.information)
@@ -3320,7 +3342,7 @@ export default {
     adoPt(){
       this.approval = this.$route.query.data
       if (this.approval){
-        this.getTreeselect()
+
         this.reset();
         this.doNot = true
         this.closeButton = false
@@ -3872,7 +3894,7 @@ export default {
         fPackagespecs: null,
         fWarehouselocid: null,
         fBoxno: null,
-        fMarks: this.form.fMarks,
+        fMarks: null,
         fGoodsval: null,
         fTruckno: fTruckno,
         fDriverTel: fDriverTel,
@@ -3910,7 +3932,8 @@ export default {
           getFees(feeId).then((response) => {
             this.fWbuOptions.push(response.data);
           });
-          this.warehouseDrList.push({
+          let row = {
+            fQty:null,
             fCorpid: this.dialogWhgenlegList[whgen].fCorpid,
             fFeeid: feeId,
             fFeeUnitid: this.dialogWhgenlegList[whgen].fFeeUnitid + "",
@@ -3922,24 +3945,29 @@ export default {
             fProductName:this.form.fProductName,
             fMarks:this.form.fMarks,
             fBusinessType:this.$set(this.warehouseDrList,'fBusinessType',this.form.fBusinessType)
-          });
-        }
-        for (let list in this.warehouseDrList) {
-          if (this.warehouseDrList[list].fFeeUnitid === "1") {
-            this.$set(this.warehouseDrList[list], "fQty", this.fQty.toFixed(2));
+          }
+          if (row.fFeeUnitid === "1") {
+            this.$set(this.row, "fQty", this.fQty.toFixed(2));
             console.log("111111433543")
             return
-          } else if (this.warehouseDrList[list].fFeeUnitid === "2") {
-            this.$set(this.warehouseDrList[list], "fQty", (this.fGrossweight/1000).toFixed(2));
-          } else if (this.warehouseDrList[list].fFeeUnitid === "3") {
-            this.$set(this.warehouseDrList[list], "fQty", (this.fNetweight/1000).toFixed(2));
+          } else if (row.fFeeUnitid === "2") {
+            this.$set(row, "fQty", (this.fGrossweight/1000).toFixed(2));
+          } else if (row.fFeeUnitid === "3") {
+            this.$set(row, "fQty", (this.fNetweight/1000).toFixed(2));
           } else {
-            this.$set(this.warehouseDrList[list], "fQty", 0);
+            this.$set(row, "fQty", 0);
           }
-          this.$set(this.warehouseDrList[list], "fAmount", (Number(this.warehouseDrList[list].fUnitprice) * Number(this.warehouseDrList[list].fQty)).toFixed(2));
+          this.$set(row, "fAmount", (Number(row.fUnitprice) * Number(row.fQty)).toFixed(2));
+
+          this.warehouseDrList.push(row);
+        }
+
+
+        // for (let list in this.warehouseDrList) {
+
         }
         this.warehousingagreement = false;
-      }
+      // }
     },
     zhgenlegData() {
       if (this.dialogWhgenlegList.length === 0) {