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

src/views/warehouseBusiness/outStock/index.vue

@@ -1262,18 +1262,13 @@
           </template>
         </el-table-column>
         <el-table-column
-          prop="ffeeUnitid"
+          prop="fFeeUnitid"
           header-align="center"
           align="center"
           width="180px"
           label="计价单位"
         >
           <template slot-scope="scope">
-            <!-- <el-input
-              v-model="scope.row.fFeeUnitid"
-              placeholder="计价单位"
-              show-word-limit
-            /> -->
             <el-select
               v-model="scope.row.fFeeUnitid"
               placeholder="请选择计费单位"
@@ -2417,7 +2412,7 @@ export default {
           var D = (date.getDate() < 10 ? '0' + date.getDate() : date.getDate()) + ' '
           this.$set(this.Printinglist[aorp], 'fBsdate', Y + M + D)
      }
-          
+
       this.editDialogVisible_s = true;
       console.log(this.fMblnoOptions)
       console.log(this.form.fCorpid)
@@ -2426,7 +2421,7 @@ export default {
                 this.$set(this.form, "fCorpid", this.fMblnoOptions[corp].fName);
               }
             }
-            
+
             for(let sorp in this.warehouseOptions){
               console.log(this.form.fWarehouseid)
               if(this.form.fWarehouseid === this.warehouseOptions[sorp].fId) {
@@ -2906,7 +2901,16 @@ export default {
           formData.append("warehousebillsitems", JSON.stringify(this.dataListSelection));
           formData.append("whgenleg", JSON.stringify(this.relevantAttachments));
           addWhgenleg(formData).then((response) => {
-            this.fid = response.data;
+            this.fid = response.data.fPid;
+            // 仓储费得出的明细
+            this.fWbuOptions = response.data.fees;
+            let warehousebillsfees = response.data.warehousebillsfees;
+            for (let fees in warehousebillsfees) {
+              this.$set(warehousebillsfees[fees], 'fFeeid', warehousebillsfees[fees].fFeeid + '')
+              this.$set(warehousebillsfees[fees], 'fCorpid', warehousebillsfees[fees].fCorpid + '')
+              this.$set(warehousebillsfees[fees], 'fFeeUnitid', warehousebillsfees[fees].fFeeUnitid + '')
+              this.warehouseDrList.push(warehousebillsfees[fees])
+            }
             this.msgSuccess("出库成功");
             this.formBrowseStatus = true
             for (let li in this.dataListSelection) {
@@ -2965,7 +2969,7 @@ export default {
           var M = (date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1) + '-'
           var D = (date.getDate() < 10 ? '0' + date.getDate() : date.getDate()) + ' '
           this.fBsdate = Y + M + D;
-         
+
       }
     },
     // 计价单位选择