仓储模块作业类型修改

src/views/warehouseBusiness/inStock/index.vue

@@ -1791,7 +1791,7 @@
               header-align="center"
               align="center"
               width="130px"
-              label="结算1方式"
+              label="结算方式"
             >
               <template slot-scope="scope">
                 <el-select
@@ -4565,7 +4565,7 @@ export default {
       } else if (row.fFeeUnitid === "3") {
         this.$set(row, "fQty", (this.fNetweight / 1000).toFixed(2));
       }else if(row.fFeeUnitid === "7"){
-        this.$set(row, "fQty", this.fCntqty.toFixed(2));
+        this.$set(row, "fQty", this.fCntqty);
       } else {
         this.$set(row, "fQty", 0);
       }

src/views/warehouseBusiness/outStock/index.vue

@@ -1500,19 +1500,21 @@
               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>
+              <template slot-scope="scope">
+                <el-select
+                  style="width: 80%"
+                  v-model="scope.row.fBusinessType"
+                  filterable
+                  disabled
+                >
+                  <el-option
+                    v-for="(dict,index) in businessTypeOption"
+                    :key="dict.dictValue"
+                    :label="dict.dictLabel"
+                    :value="dict.dictValue"
+                  ></el-option>
+                </el-select>
+              </template>
             </el-table-column>
             <el-table-column
               prop="fFeeunitid"
@@ -1844,19 +1846,21 @@
               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>
+              <template slot-scope="scope">
+                <el-select
+                  style="width: 80%"
+                  v-model="scope.row.fBusinessType"
+                  filterable
+                  disabled
+                >
+                  <el-option
+                    v-for="(dict,index) in businessTypeOption"
+                    :key="dict.dictValue"
+                    :label="dict.dictLabel"
+                    :value="dict.dictValue"
+                  ></el-option>
+                </el-select>
+              </template>
             </el-table-column>
             <el-table-column
               prop="fFeeunitid"
@@ -3918,7 +3922,8 @@ export default {
         remarks: null,
         fMblno:this.form.fMblno,
         fProductName:this.form.fProductName,
-        fMarks:this.form.fMarks
+        fMarks:this.form.fMarks,
+        fBusinessType: this.form.fBusinessType + ''
       });
     },
     addpayment() {
@@ -3936,7 +3941,7 @@ export default {
         fMblno:this.form.fMblno,
         fProductName:this.form.fProductName,
         fMarks:this.form.fMarks,
-        fBusinessType:this.form.fBusinessType
+        fBusinessType:this.form.fBusinessType + ''
       });
     },
     queryUser() {
@@ -4202,6 +4207,7 @@ export default {
         }
         this.goodsOptions = response.data.goodsList;
         this.kqhouseOptions = response.data.warehouseAreas;
+
         this.warehouseDrList = response.data.warehousebillsfeesDr;
         for (let dr in this.warehouseDrList) {
           this.$set(this.warehouseDrList[dr], "fFeeunitid", this.warehouseDrList[dr].fFeeunitid + '');
@@ -4211,7 +4217,7 @@ export default {
         this.warehouseCrList = response.data.warehousebillsfeesCr;
         for (let cr in this.warehouseCrList) {
           this.$set(this.warehouseCrList[cr], "fFeeunitid", this.warehouseCrList[cr].fFeeunitid + "");
-          this.$set(this.warehouseDrList[cr], "fBusinessType", this.warehouseDrList[cr].fBusinessType + "");
+          // this.$set(this.warehouseCrList[cr], "fBusinessType", response.data.warehousebillsfeesCr);
         }
         this.userOptions = response.data.sysUser;
         this.open = true;
@@ -4404,7 +4410,7 @@ export default {
       }else if (row.fFeeunitid == "3") {
         this.$set(row, 'fQty', (fNetweight/1000).toFixed(2))
       }else if(row.fFeeunitid == "7"){
-        this.$set(row, "fQty", this.fCntqty.toFixed(2));
+        this.$set(row, "fQty", this.fCntqty);
       } else {
         this.$set(row, "fQty", 0);
       }

src/views/warehouseBusiness/stockTransfer/index.vue

@@ -1457,19 +1457,22 @@
               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>
+              <template slot-scope="scope">
+                <el-select
+                  style="width: 80%"
+                  v-model="scope.row.fBusinessType"
+                  filterable
+                  disabled
+                >
+                  <el-option
+                    v-for="(dict,index) in businessTypeOption"
+                    :key="dict.dictValue"
+                    :label="dict.dictLabel"
+                    :value="dict.dictValue"
+                  ></el-option>
+                </el-select>
+
+              </template>
             </el-table-column>
 
             <el-table-column
@@ -1793,19 +1796,22 @@
               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>
+              <template slot-scope="scope">
+                <el-select
+                  style="width: 80%"
+                  v-model="scope.row.fBusinessType"
+                  filterable
+                  disabled
+                >
+                  <el-option
+                    v-for="(dict,index) in businessTypeOption"
+                    :key="dict.dictValue"
+                    :label="dict.dictLabel"
+                    :value="dict.dictValue"
+                  ></el-option>
+                </el-select>
+
+              </template>
             </el-table-column>
 
             <el-table-column
@@ -3342,7 +3348,8 @@ export default {
         remarks: null,
         fMblno:this.form.fMblno,
         fProductName:this.form.fProductName,
-        fMarks:this.form.fMarks
+        fMarks:this.form.fMarks,
+        fBusinessType: this.form.fBusinessType
       });
     },
     addpayment() {