فهرست منبع

调整仓储业务bug

阿伏兔 4 سال پیش
والد
کامیت
ac8dd4faff

+ 47 - 17
src/views/warehouseBusiness/goodsTransfer/index.vue

@@ -613,6 +613,36 @@
         >
         </el-table-column>
         <el-table-column
+          prop="fBusinessType"
+          header-align="center"
+          width="140px"
+          align="center"
+          label="*业务类型"
+        >
+          <template slot-scope="scope">
+            <el-select v-model="scope.row.fBusinessType"
+                       filterable
+                       disabled
+                       placeholder="请选择业务类型"
+            >
+              <el-option
+                v-for="(dict, index) in fStorageTypeOptions"
+                :key="index.dictValue"
+                :label="dict.dictLabel"
+                :value="dict.dictValue"
+              />
+            </el-select>
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="fMarks"
+          header-align="center"
+          align="center"
+          width="140px"
+          label="*业务详情"
+        >
+        </el-table-column>
+        <el-table-column
           prop="fMblno"
           header-align="center"
           align="center"
@@ -1561,6 +1591,8 @@
         dataWithdrawList: [],
         // 仓库(仓库
         warehouseOptions: [],
+        // 仓储类型 入库时选择 产地 规格 品牌 所用,对应storage_type 字典
+        fStorageTypeOptions: [],
         kqhouseOptions: [],
         // 贸易方式(数据字典),对应t_trademodels 字典
         fTrademodeidOptions: [],
@@ -1694,6 +1726,9 @@
       this.getDicts('data_trademodes').then((response) => {
         this.fTrademodeidOptions = response.data
       })
+      this.getDicts("storage_type").then((response) => {
+        this.fStorageTypeOptions = response.data;
+      });
       this.getDicts('data_stltype_type').then((response) => {
         this.fStltypeOptions = response.data
       })
@@ -1891,15 +1926,8 @@
       },
       // 添加list
       addRelevant() {
-        if (
-          !this.form.fCorpid ||
-          !this.form.fTrademodeid ||
-          !this.form.fWarehouseid
-        ) {
-          this.$message({
-            message: '请维护货权方、贸易方式、仓库',
-            type: 'warning'
-          })
+        if (!this.form.fCorpid || !this.form.fTrademodeid || !this.form.fWarehouseid) {
+          this.$message({ message: '请维护货权方、贸易方式、仓库', type: 'warning' })
           return false
         }
         this.whgenlegList = []
@@ -1953,6 +1981,7 @@
               fPlannetweight: this.dialogWhgenlegList[whgen].fNetweightblc,
               fOriginalbillno: this.dialogWhgenlegList[whgen].fOriginalbillno,
               fPlangrossweight: this.dialogWhgenlegList[whgen].fGrossweightblc,
+              fBusinessType: this.dialogWhgenlegList[whgen].fBusinessType + '',
               fOriginalbilldate: this.dialogWhgenlegList[whgen].fOriginalbilldate,
               fWarehouselocid: this.dialogWhgenlegList[whgen].fWarehouseLocationid,
               fWarehouselocids: this.dialogWhgenlegList[whgen].fWarehouseLocationids
@@ -2244,8 +2273,8 @@
           this.form = response.data.warehousebills
           this.$set(this.form, 'fStltypeid', this.form.fStltypeid + '')
           this.$set(this.form, 'fFeetunit', Number(this.form.fFeetunit))
-          this.$set(this.form, 'fChargedate', Date.parse(this.form.fChargedate))
           this.$set(this.form, 'fTrademodeid', this.form.fTrademodeid + '')
+          this.$set(this.form, 'fChargedate', Date.parse(this.form.fChargedate))
           this.fMblnoOptions = response.data.corps
           this.KHblnoOptions = response.data.corps
           this.fWbuOptions = response.data.feesList
@@ -2256,6 +2285,7 @@
               this.formBrowseStatus = true
             }
             this.$set(this.dataList[list], 'fBsdate', Date.parse(this.dataList[list].fBsdate))
+            this.$set(this.dataList[list], 'fBusinessType', this.dataList[list].fBusinessType + '')
           }
           this.goodsOptions = response.data.goodsList
           if (response.data.warehousebillsfeesDr) {
@@ -2492,8 +2522,6 @@
         this.dataListSelection = row
       },
       saveForm() {
-        // this.notChange = true
-        // this.browseStatus = true
         this.updateDeduplication()
         this.$refs['form'].validate((valid) => {
           if (this.form.fCorpid === this.form.fTocorpid) {
@@ -2532,7 +2560,9 @@
               this.$set(this.form, 'fTrademodeid', this.form.fTrademodeid + '')
               this.$set(this.form, 'fChargedate', Date.parse(this.form.fChargedate))
               this.dataList = response.data.warehousebillsitems
-              this.getList()
+              for (let li in this.dataList) {
+                this.$set(this.dataList[li], 'fBusinessType', this.dataList[li].fBusinessType + '')
+              }
             })
           }
         })
@@ -2651,10 +2681,10 @@
           this.$set(row, 'fGrossweight', 0)
           return false;
         }
-        let netweight = parseFloat(Number(row.fPlannetweight) / Number(row.fPlanqty)).toFixed(6)
-        let grossweigh = parseFloat(Number(row.fPlangrossweight) / Number(row.fPlanqty)).toFixed(6)
-        this.$set(row, 'fNetweight', parseFloat(Number(netweight) * Number(row.fQty)).toFixed(6))
-        this.$set(row, 'fGrossweight', parseFloat(Number(grossweigh) * Number(row.fQty)).toFixed(6))
+        let netweight = parseFloat(Number(row.fPlannetweight) / Number(row.fPlanqty)).toFixed(2)
+        let grossweigh = parseFloat(Number(row.fPlangrossweight) / Number(row.fPlanqty)).toFixed(2)
+        this.$set(row, 'fNetweight', parseFloat(Number(netweight) * Number(row.fQty)).toFixed(2))
+        this.$set(row, 'fGrossweight', parseFloat(Number(grossweigh) * Number(row.fQty)).toFixed(2))
       },
       // 修改毛重净重
       changeTransfer (row) {

+ 136 - 161
src/views/warehouseBusiness/inStock/index.vue

@@ -466,6 +466,7 @@
                 :disabled="browseStatus || formBrowseStatus"
                 remote
                 style="width: 80%"
+                @change="changeWarehouse"
                 :remote-method="warehouseRemoteMethod"
                 placeholder="请输入模糊查找"
               >
@@ -1723,7 +1724,6 @@
           width="200px"
         >
           <template slot-scope="scope">
-            <!-- <el-button size="small">审核费用</el-button> -->
             <el-button
               @click.native.prevent="deleteRow(scope.$index, warehouseDrList)"
               size="small"
@@ -1748,14 +1748,9 @@
             @click.prevent="addpayment()"
           >新行
           </el-button>
-          <!-- <el-button :disabled="browseStatus" @click.prevent="deleteRow(warehouseCrList)"
-          >删除
-        </el-button> -->
           <el-button type="primary" @click="submitForm(2)" :disabled="browseStatus">保 存</el-button>
-          <!-- <el-button type="warning">仓储费协议</el-button> -->
           <el-button type="danger" @click.prevent="addAgreements()" :disabled="browseStatus"
-          >作业费协议</el-button
-          >
+          >作业费协议</el-button>
         </div>
         <div style="font-size: 18px">付款信息</div>
       </div>
@@ -2050,7 +2045,7 @@
             <el-col :span="8">
               <el-form-item label="计划件数" prop="fPlanqty">
                 <el-input
-                  oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d).*$/, "$1$2.$3")'
+                  oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\..*$/, "$1$2.$3")'
                   v-model="planningList.fPlanqty"
                   style="width: 80%"
                   laceholder="计划件数"
@@ -2719,7 +2714,6 @@ export default {
       editDialogClosed_ss: false,
       addOrUpdateVisible: false,
       addOrUpdateVisib: false,
-
       // 新增计划净重
       weightList: false,
       dataList: [],
@@ -2856,13 +2850,6 @@ export default {
         fCntrtype: null,
         fCntqty: null,
       },
-      // // 作业费参数
-      // queryParams: {
-      //   pageNum: 1,
-      //   pageSize: 10,
-      //   fCorpid: null,
-      //   fLineno: null,
-      // },
       planningList: {
         fPlanqty: null,
         fPlannetweight: null,
@@ -2871,7 +2858,8 @@ export default {
       approVal:false,
       // 表单参数
       form: {
-        fItemsStatus: null,
+        fBusinessType: '常规入账',
+        fItemsStatus: null
       },
       // 表单校验
       rules: {
@@ -3039,6 +3027,7 @@ export default {
     },
     //关闭弹框的事件
     addCloseDialog(){
+      this.reset()
       this.getList()
     },
     cancelTwo(){
@@ -3087,6 +3076,7 @@ export default {
         if (data.code === 200) {
           this.msgSuccess("撤销成功");
           this.open = false;
+          this.getList()
           this.reset();
         }
       })
@@ -3178,7 +3168,7 @@ export default {
       }
       this.fPlaNnumber = this.form.fPlannetweight / this.form.fPlanqty;
       this.fPlangNumber = this.form.fPlangrossweight / this.form.fPlanqty;
-      this.planningList.fPlanqty = parseFloat(Number(this.form.fPlanqty) - Number(this.mum)).toFixed(2)
+      this.planningList.fPlanqty = Number(this.form.fPlanqty) - Number(this.mum)
       this.planningList.fPlannetweight = parseFloat(Number(this.fPlaNnumber) * Number(this.planningList.fPlanqty).toFixed(2))
       this.planningList.fPlangrossweight = parseFloat(Number(this.fPlangNumber) * Number(this.planningList.fPlanqty)).toFixed(2)
       this.weightList = true
@@ -3502,11 +3492,11 @@ export default {
           });
         }
         for (let list in this.warehouseDrList) {
-          if (this.warehouseDrList[list].fFeeUnitid == 1) {
+          if (this.warehouseDrList[list].fFeeUnitid === 1) {
             this.$set(this.warehouseDrList[list], "fQty", this.fQty.toFixed(2));
-          } else if (this.warehouseDrList[list].fFeeUnitid == 2) {
+          } else if (this.warehouseDrList[list].fFeeUnitid === 2) {
             this.$set(this.warehouseDrList[list], "fQty", this.fGrossweight.toFixed(2));
-          } else if (this.warehouseDrList[list].fFeeUnitid == 3) {
+          } else if (this.warehouseDrList[list].fFeeUnitid === 3) {
             this.$set(this.warehouseDrList[list], "fQty", this.fNetweight.toFixed(2));
           } else {
             this.$set(this.warehouseDrList[list], "fQty", 0);
@@ -3540,31 +3530,16 @@ export default {
           });
         }
         for (let list in this.warehouseCrList) {
-          if (this.warehouseCrList[list].fFeeUnitid == 1) {
+          if (this.warehouseCrList[list].fFeeUnitid === 1) {
             this.$set(this.warehouseCrList[list], "fQty", this.fQty.toFixed(2));
-          } else if (this.warehouseCrList[list].fFeeUnitid == 2) {
-            this.$set(
-              this.warehouseCrList[list],
-              "fQty",
-              this.fGrossweight.toFixed(2)
-            );
-          } else if (this.warehouseCrList[list].fFeeUnitid == 3) {
-            this.$set(
-              this.warehouseCrList[list],
-              "fQty",
-              this.fNetweight.toFixed(2)
-            );
+          } else if (this.warehouseCrList[list].fFeeUnitid === 2) {
+            this.$set(this.warehouseCrList[list], "fQty", this.fGrossweight.toFixed(2));
+          } else if (this.warehouseCrList[list].fFeeUnitid === 3) {
+            this.$set(this.warehouseCrList[list], "fQty", this.fNetweight.toFixed(2));
           } else {
             this.$set(this.warehouseCrList[list], "fQty", 0);
           }
-          this.$set(
-            this.warehouseCrList[list],
-            "fAmount",
-            (
-              Number(this.warehouseCrList[list].fUnitprice) *
-              Number(this.warehouseCrList[list].fQty)
-            ).toFixed(2)
-          );
+          this.$set(this.warehouseCrList[list], "fAmount", (Number(this.warehouseCrList[list].fUnitprice) * Number(this.warehouseCrList[list].fQty)).toFixed(2));
         }
         this.warehousingagreements = false;
       }
@@ -3605,9 +3580,24 @@ export default {
     cancel() {
       this.open = false;
       this.reset();
+      this.getList()
     },
     // 表单重置
     reset() {
+      this.doNot = false
+      this.browseStatus = false
+      this.approvalStatus = false
+      this.detailsHidden = false
+      this.warehousingagreement = false
+      this.warehousingagreements = false
+      this.formBrowseStatus = false
+      this.editDialogVisible_s = false
+      this.editDialogVisible_ss = false
+      this.editDialogVisible_sss = false
+      this.editDialogClosed_ss = false
+      this.addOrUpdateVisible = false
+      this.addOrUpdateVisib = false
+      this.weightList = false
       this.form = {
         fId: null,
         fBillno: null,
@@ -3655,9 +3645,9 @@ export default {
         fCreatetime: null,
         fGoodsid: null,
         fCntrtype: null,
-        fCntqty: null,
-      };
-      this.fMblnoOptions = [];
+        fCntqty: null
+      }
+      this.fMblnoOptions = []
       this.userOptions = [];
       this.warehouseOptions = [];
       this.fSbuOptions = [];
@@ -3696,10 +3686,7 @@ export default {
         for (let se in selection) {
           if (!selection[se].fBillstatus || selection[se].fBillstatus !== 40) {
             this.dataListSelection.push(selection[se]);
-          } else if (
-            selection[se].fBillstatus &&
-            selection[se].fBillstatus === 40
-          ) {
+          } else if (selection[se].fBillstatus && selection[se].fBillstatus === 40) {
             this.dataWithdrawList.push(selection[se]);
           }
         }
@@ -3712,17 +3699,11 @@ export default {
 
     // 收款选
     Collectionoptions(selection) {
-      this.Collectionoptionss = selection;
+      this.Collectionoptionss = selection
       for (let lest in this.fWbuOptions) {
         for (let li in this.Collectionoptionss) {
-          if (
-            this.fWbuOptions[lest].fId == this.Collectionoptionss[li].fFeeid
-          ) {
-            this.$set(
-              this.Collectionoptionss[li],
-              "fFeeids",
-              this.fWbuOptions[lest].fName
-            );
+          if (this.fWbuOptions[lest].fId === this.Collectionoptionss[li].fFeeid) {
+            this.$set(this.Collectionoptionss[li], 'fFeeids', this.fWbuOptions[lest].fName)
           }
         }
       }
@@ -3740,7 +3721,6 @@ export default {
     /** 新增按钮操作 */
     handleAdd(status) {
       this.browseStatus = status;
-      this.reset();
       this.queryUser();
       this.open = true;
       this.detailsHidden = false;
@@ -3797,13 +3777,15 @@ export default {
         if (response.data.enclosures) {
           this.relevantAttachments = response.data.enclosures;
         }
-        this.$set(this.form, "fStltypeid", this.form.fStltypeid + "");
         this.$set(this.form, "fEta", Date.parse(this.form.fEta));
+        this.$set(this.form, "fStltypeid", this.form.fStltypeid + "");
         this.$set(this.form, "fBsdate", Date.parse(this.form.fBsdate));
-        this.$set(this.form, "createTime", Date.parse(this.form.createTime));
         this.$set(this.form, "fTrademodeid", this.form.fTrademodeid + "");
+        this.$set(this.form, "createTime", Date.parse(this.form.createTime));
         this.$set(this.form, "fPlannetweight", this.form.fPlannetweight.toFixed(2));
         this.$set(this.form, "fPlangrossweight", this.form.fPlangrossweight.toFixed(2));
+
+        console.log(JSON.stringify(this.form))
         for (let list in this.dataList) {
           this.$set(this.dataList[list], "fBsdate", Date.parse(this.dataList[list].fBsdate));
         }
@@ -4122,6 +4104,15 @@ export default {
         this.$refs.checkout.clearSelection();
       });
     },
+    // 仓库发生变化时
+    changeWarehouse () {
+      for (let ware in this.warehouseOptions) {
+        if (this.form.fWarehouseid === this.warehouseOptions[ware].fId) {
+          this.$set(this.form, 'fTel', this.warehouseOptions[ware].fTel)
+          this.$set(this.form, 'fContacts', this.warehouseOptions[ware].fContacts)
+        }
+      }
+    },
     // 卸货按钮
     discharge() {
       if (this.Printinglist.length > 0) {
@@ -4199,151 +4190,135 @@ export default {
     },
     // 提交保存保存成功
     preservation() {
-      this.$refs["form"].validate((valid) => {
+      this.$refs['form'].validate((valid) => {
         if (valid) {
-          this.form.fBillstatus = status;
-          this.form.fNetweight = this.fNetweight;
-          this.form.fPlanvolumn = this.fPlanvolumn;
-          this.form.fGrossweight = this.fGrossweight;
-          this.form.fQty = this.fQty;
+          this.form.fBillstatus = status
+          this.form.fNetweight = this.fNetweight
+          this.form.fPlanvolumn = this.fPlanvolumn
+          this.form.fGrossweight = this.fGrossweight
+          this.form.fQty = this.fQty
           if (!this.form.fId) {
-            this.form.fId = this.fid;
+            this.form.fId = this.fid
           }
-          let formDatae = new window.FormData();
+          let formDatae = new window.FormData()
           // 附件数据
-          this.form.fBillingway = this.form.fFeetunit;
-          formDatae.append("tWarehouseBills", JSON.stringify(this.form));
+          this.form.fBillingway = this.form.fFeetunit
+          formDatae.append('tWarehouseBills', JSON.stringify(this.form))
           // 库存明细
-          formDatae.append("tWarehousebillsitems", JSON.stringify(this.dataList));
+          formDatae.append('tWarehousebillsitems', JSON.stringify(this.dataList))
           // 附件数据
-          formDatae.append("tEnclosure", JSON.stringify(this.relevantAttachments));
+          formDatae.append('tEnclosure', JSON.stringify(this.relevantAttachments))
           // 费用明细付款
-          formDatae.append("tWarehousebillsfeesCr", JSON.stringify(this.warehouseCrList));
+          formDatae.append('tWarehousebillsfeesCr', JSON.stringify(this.warehouseCrList))
           // 收款
-          formDatae.append("tWarehousebillsfeesDr", JSON.stringify(this.warehouseDrList));
+          formDatae.append('tWarehousebillsfeesDr', JSON.stringify(this.warehouseDrList))
           addWarehousebills(formDatae).then((response) => {
-            this.msgSuccess("保存成功");
-            this.form = response.data.warehouseBills;
-            this.$set(this.form, "fEta", Date.parse(this.form.fEta));
-            this.$set(this.form, "fStltypeid", this.form.fStltypeid + "");
-            this.$set(this.form, "fBsdate", Date.parse(this.form.fBsdate));
-            this.$set(this.form, "fTrademodeid", this.form.fTrademodeid + "");
-            this.$set(this.form, "createTime", Date.parse(this.form.createTime));
-            this.dataList = response.data.warehousebillsitems;
+            this.msgSuccess('保存成功')
+            this.form = response.data.warehouseBills
+            this.$set(this.form, 'fEta', Date.parse(this.form.fEta))
+            this.$set(this.form, 'fStltypeid', this.form.fStltypeid + '')
+            this.$set(this.form, 'fBsdate', Date.parse(this.form.fBsdate))
+            this.$set(this.form, 'fTrademodeid', this.form.fTrademodeid + '')
+            this.$set(this.form, 'createTime', Date.parse(this.form.createTime))
+            this.dataList = response.data.warehousebillsitems
             for (let list in this.dataList) {
-              this.$set(this.dataList[list], "fBsdate", Date.parse(this.dataList[list].fBsdate));
-              this.$set(this.dataList[list], "fBusinessType", this.dataList[list].fBusinessType + '');
+              this.$set(this.dataList[list], 'fBsdate', Date.parse(this.dataList[list].fBsdate))
+              this.$set(this.dataList[list], 'fBusinessType', this.dataList[list].fBusinessType + '')
             }
-            this.fid = response.data.warehouseBills.fId;
-            this.getList();
-          });
+            this.fid = response.data.warehouseBills.fId
+            this.getList()
+          })
         }
-      });
+      })
     },
     // 请核成功
     pleaseCheck() {
       this.updateDeduplication()
-      this.$refs["form"].validate((valid) => {
+      this.$refs['form'].validate((valid) => {
         if (this.dataList.length === 0) {
-          this.$message.error("请新增库存明细!");
-          return false;
+          this.$message.error('请新增库存明细!')
+          return false
         }
         for (let list in this.dataList) {
           if (!this.dataList[list].fGoodsid) {
-            this.$message.error("请输入品名!");
-            return false;
+            this.$message.error('请输入品名!')
+            return false
           }
           if (!this.dataList[list].fWarehouselocid) {
-            this.$message.error("请输入库区!");
-            return false;
+            this.$message.error('请输入库区!')
+            return false
           }
-          if (this.dataList[list].fBillstatus != 40) {
-            this.$message.error("请入账库存明细!");
-            return false;
+          if (this.dataList[list].fBillstatus !== 40) {
+            this.$message.error('请入账库存明细!')
+            return false
           }
         }
         if (valid) {
-          this.form.fBillstatus = status;
-          this.form.fNetweight = this.fNetweight;
-          // this.form.fPlangrossweight = this.fPlangrossweight;
-          // this.form.fPlannetweight = this.fPlannetweight;
-          this.form.fPlanvolumn = this.fPlanvolumn;
-          // this.form.fPlanqty = this.fPlanqty;
-          this.form.fGrossweight = this.fGrossweight;
-          this.form.fQty = this.fQty;
+          this.form.fBillstatus = status
+          this.form.fNetweight = this.fNetweight
+          this.form.fPlanvolumn = this.fPlanvolumn
+          this.form.fGrossweight = this.fGrossweight
+          this.form.fQty = this.fQty
           if (!this.form.fId) {
-            this.form.fId = this.fid;
+            this.form.fId = this.fid
           }
-          let formData = new window.FormData();
+          let formData = new window.FormData()
           // 附件数据
-          this.form.fBillingway = this.form.fFeetunit;
-          formData.append("tWarehouseBills", JSON.stringify(this.form));
+          this.form.fBillingway = this.form.fFeetunit
+          formData.append('tWarehouseBills', JSON.stringify(this.form))
           // 库存明细
-          formData.append(
-            "tWarehousebillsitems",
-            JSON.stringify(this.dataList)
-          );
+          formData.append('tWarehousebillsitems', JSON.stringify(this.dataList))
           // 附件数据
-          formData.append(
-            "tEnclosure",
-            JSON.stringify(this.relevantAttachments)
-          );
+          formData.append('tEnclosure', JSON.stringify(this.relevantAttachments))
           // 费用明细付款
-          formData.append(
-            "tWarehousebillsfeesCr",
-            JSON.stringify(this.warehouseCrList)
-          );
+          formData.append('tWarehousebillsfeesCr', JSON.stringify(this.warehouseCrList))
           // 收款
-          formData.append(
-            "tWarehousebillsfeesDr",
-            JSON.stringify(this.warehouseDrList)
-          );
+          formData.append('tWarehousebillsfeesDr', JSON.stringify(this.warehouseDrList))
           addWarehouse(formData).then((response) => {
-            this.msgSuccess("提交成功");
-            this.open = false;
-            this.getList();
-          });
+            this.msgSuccess('提交成功')
+            this.open = false
+            this.getList()
+            this.reset()
+          })
         }
-      });
+      })
     },
 
     /** 删除按钮操作 */
     handleDelete(row) {
-      const fIds = row.fId || this.ids;
+      const fIds = row.fId || this.ids
       this.$confirm(
         '是否确认删除仓库主(出入库)编号为"' + fIds + '"的数据项?',
-        "警告",
+        '警告',
         {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning",
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
         }
       )
-        .then(function () {
-          return delWarehousebills(fIds);
+        .then(function() {
+          return delWarehousebills(fIds)
         })
         .then(() => {
-          this.getList();
-          this.msgSuccess("删除成功");
-        });
+          this.getList()
+          this.msgSuccess('删除成功')
+        })
     },
     /** 导出按钮操作 */
     handleExport() {
-      const queryParams = this.queryParams;
-      this.$confirm("是否确认导出所有仓库主(出入库)数据项?", "警告", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
-        .then(function () {
-          return exportWarehousebills(queryParams);
+      const queryParams = this.queryParams
+      this.$confirm('是否确认导出所有仓库主(出入库)数据项?', '警告', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(function() {
+          return exportWarehousebills(queryParams)
+        }).then((response) => {
+          this.download(response.msg)
         })
-        .then((response) => {
-          this.download(response.msg);
-        });
     },
     wDeleteRow(index, rows) {
-      rows.splice(index, 1);
+      rows.splice(index, 1)
       if (this.dataList.length === 0) {
         this.formBrowseStatus = false
         return false
@@ -4361,19 +4336,19 @@ export default {
     },
     // 查看审批流
     getDataList() {
-      this.addOrUpdateVisible = false;
+      this.addOrUpdateVisible = false
     },
     returnData() {
-      this.addOrUpdateVisib = false;
+      this.addOrUpdateVisib = false
       this.cancelTwo()
     },
     addOrUpdateHandle(form) {
-      this.addOrUpdateVisible = true;
-      let id = form.fId;
-      let actId = "110";
+      this.addOrUpdateVisible = true
+      let id = form.fId
+      let actId = '110'
       this.$nextTick(() => {
-        this.$refs.addOrUpdate.init(id, actId);
-      });
+        this.$refs.addOrUpdate.init(id, actId)
+      })
     },
     addOrUpdateHand(form) {
       this.addOrUpdateVisib = true;

+ 13 - 9
src/views/warehouseBusiness/stockTransfer/index.vue

@@ -433,7 +433,7 @@
                 v-model="form.fWarehouseid"
                 filterable
                 remote
-                @change="changefWarehouseid(form)"
+                @change="changefWarehouseid"
                 :disabled="notChange || formBrowseStatus"
                 style="width: 80%"
                 :remote-method="warehouseRemoteMethod"
@@ -761,6 +761,14 @@
         >
         </el-table-column>
         <el-table-column
+          prop="fMblno"
+          header-align="center"
+          align="center"
+          width="140px"
+          label="提单号"
+        >
+        </el-table-column>
+        <el-table-column
           prop="fWarehouseids"
           header-align="center"
           width="150px"
@@ -3211,16 +3219,12 @@ export default {
       }
     },
     // change仓库
-    changefWarehouseid(row) {
+    changefWarehouseid() {
       for (let corp in this.warehouseOptions) {
-        if (row.fWarehouseid === this.warehouseOptions[corp].fId) {
-          this.$set(
-            this.form,
-            "fContacts",
-            this.warehouseOptions[corp].fContacts
-          );
-          this.$set(this.form, "fTel", this.warehouseOptions[corp].fTel);
+        if (this.form.fWarehouseid === this.warehouseOptions[corp].fId) {
           this.fAddr = this.warehouseOptions[corp].fAddr;
+          this.$set(this.form, "fTel", this.warehouseOptions[corp].fTel);
+          this.$set(this.form, "fContacts", this.warehouseOptions[corp].fContacts);
         }
       }
     },