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

src/views/finance/charge/index.vue

@@ -1744,65 +1744,8 @@ export default {
     // 查看按钮
     check(row, res) {
       this.notChange = true;
-      // getCharge(row.fId).then((response) => {
-      //   this.Operator = response.data.tFee.createBy;
-      //   this.increase_s = response.data.feeDoList;
-      //   this.fWbuOptions = response.data.feesList;
-      //   this.queryParams = response.data.tFee;
-      //   this.fWbuOptions = response.data.feesList;
-      //   this.fMblnoOptions = response.data.corps;
-      //   this.open = true;
-      //   this.title = "收费列表";
-      //   this.tablefilter = true;
-      //   if (res == 1) {
-      //     this.notChange = true;
-      //     if (this.Operator == this.Lander) {
-      //       this.tablefilter = false;
-      //       this.reset();
-      //       this.pass = {
-      //         fAmtdr: 0, //应收合计
-      //         fAmtcr: 0, //应付合计
-      //         fMblno: "", //提单号
-      //         fName: "", //货权方
-      //         fFeesName: "", //结算单位
-      //         fCorpid: "", //结算单位ID
-      //       };
-      //       const fId = row.fId || this.ids;
-      //       getCharge(fId).then((response) => {
-      //         this.increase_s = response.data.feeDoList;
-      //         this.fWbuOptions = response.data.feesList;
-      //         this.queryParams = response.data.tFee;
-      //         this.fWbuOptions = response.data.feesList;
-      //         this.fMblnoOptions = response.data.corps;
-      //         this.open = true;
-      //       });
-      //     } else {
-      //       this.notChange = true;
-      //       // this.$message.error('未知异常，请联系管理员')
-      //     }
-      //   } else {
-      //     this.notChange = true;
-      //     this.reset();
-      //     this.pass = {
-      //       fAmtdr: 0, //应收合计
-      //       fAmtcr: 0, //应付合计
-      //       fMblno: "", //提单号
-      //       fName: "", //货权方
-      //       fFeesName: "", //结算单位
-      //       fCorpid: "", //结算单位ID
-      //     };
-      //     const fId = row.fId || this.ids;
-      //     getCharge(fId).then((response) => {
-      //       this.increase_s = response.data.feeDoList;
-      //       this.fWbuOptions = response.data.feesList;
-      //       this.queryParams = response.data.tFee;
-      //       this.fWbuOptions = response.data.feesList;
-      //       this.fMblnoOptions = response.data.corps;
-      //       this.open = true;
-      //     });
-      //   }
-      // });
-      getCharges(row.fId).then((response) => {
+      //大木
+      getCharge(row.fId).then((response) => {
         this.Operator = response.data.tFee.createBy;
         this.increase_s = response.data.feeDoList;
         this.fWbuOptions = response.data.feesList;
@@ -1826,7 +1769,7 @@ export default {
               fCorpid: "", //结算单位ID
             };
             const fId = row.fId || this.ids;
-            getCharges(fId).then((response) => {
+            getCharge(fId).then((response) => {
               this.increase_s = response.data.feeDoList;
               this.fWbuOptions = response.data.feesList;
               this.queryParams = response.data.tFee;
@@ -1850,7 +1793,7 @@ export default {
             fCorpid: "", //结算单位ID
           };
           const fId = row.fId || this.ids;
-          getCharges(fId).then((response) => {
+          getCharge(fId).then((response) => {
             this.increase_s = response.data.feeDoList;
             this.fWbuOptions = response.data.feesList;
             this.queryParams = response.data.tFee;
@@ -1860,6 +1803,65 @@ export default {
           });
         }
       });
+      //车队
+      // getCharges(row.fId).then((response) => {
+      //   this.Operator = response.data.tFee.createBy;
+      //   this.increase_s = response.data.feeDoList;
+      //   this.fWbuOptions = response.data.feesList;
+      //   this.queryParams = response.data.tFee;
+      //   this.fWbuOptions = response.data.feesList;
+      //   this.fMblnoOptions = response.data.corps;
+      //   this.open = true;
+      //   this.title = "收费列表";
+      //   this.tablefilter = true;
+      //   if (res == 1) {
+      //     this.notChange = true;
+      //     if (this.Operator == this.Lander) {
+      //       this.tablefilter = false;
+      //       this.reset();
+      //       this.pass = {
+      //         fAmtdr: 0, //应收合计
+      //         fAmtcr: 0, //应付合计
+      //         fMblno: "", //提单号
+      //         fName: "", //货权方
+      //         fFeesName: "", //结算单位
+      //         fCorpid: "", //结算单位ID
+      //       };
+      //       const fId = row.fId || this.ids;
+      //       getCharges(fId).then((response) => {
+      //         this.increase_s = response.data.feeDoList;
+      //         this.fWbuOptions = response.data.feesList;
+      //         this.queryParams = response.data.tFee;
+      //         this.fWbuOptions = response.data.feesList;
+      //         this.fMblnoOptions = response.data.corps;
+      //         this.open = true;
+      //       });
+      //     } else {
+      //       this.notChange = true;
+      //       // this.$message.error('未知异常，请联系管理员')
+      //     }
+      //   } else {
+      //     this.notChange = true;
+      //     this.reset();
+      //     this.pass = {
+      //       fAmtdr: 0, //应收合计
+      //       fAmtcr: 0, //应付合计
+      //       fMblno: "", //提单号
+      //       fName: "", //货权方
+      //       fFeesName: "", //结算单位
+      //       fCorpid: "", //结算单位ID
+      //     };
+      //     const fId = row.fId || this.ids;
+      //     getCharges(fId).then((response) => {
+      //       this.increase_s = response.data.feeDoList;
+      //       this.fWbuOptions = response.data.feesList;
+      //       this.queryParams = response.data.tFee;
+      //       this.fWbuOptions = response.data.feesList;
+      //       this.fMblnoOptions = response.data.corps;
+      //       this.open = true;
+      //     });
+      //   }
+      // });
     },
     //打印功能
     printing() {

src/views/finance/payment/index.vue

@@ -1219,6 +1219,7 @@ export default {
     //导出明细
     handleExportItems() {
       const fIds = this.queryParams.fId;
+
       if (fIds !== null) {
         this.$confirm("是否确认导出所有计费物资明细数据?", "警告", {
           confirmButtonText: "确定",

src/views/warehouseBusiness/inStock/index.vue

@@ -4577,28 +4577,42 @@ export default {
       if (this.form.fDriverIdCar) {
         fDriverIdCar = this.form.fDriverIdCar
       }
-      this.dataList.push({
-        fBsdate: this.form.fBsdate,
-        fGoodsid: this.form.fGoodsid,
-        fCntrtype: null,
-        fCntqty: 1,
-        fNetweight: this.planningList.fPlannetweight,
-        fPlanvolumn: 0,
-        fGrossweight: this.planningList.fPlangrossweight,
-        fQty: this.planningList.fPlanqty,
-        fPackagespecs: null,
-        fWarehouselocid: null,
-        fBoxno: null,
-        fMarks: null,
-        fGoodsval: null,
-        fTruckno: fTruckno,
-        fDriverTel: fDriverTel,
-        fDriverName: fDriverName,
-        fDriverIdCar: fDriverIdCar,
-        remark: null,
-        fBillstatus: 10,
-        fMblno:this.form.fMblno
-      });
+      console.log(this.goodsOptions)
+      for (let item in this.goodsOptions){
+        if (this.form.fGoodsid == this.goodsOptions[item].fId){
+          this.dataList.push({
+            fBsdate: this.form.fBsdate,
+            fGoodsid: this.form.fGoodsid,
+            fGoodsids:this.goodsOptions[item].fName,
+            fCntrtype: null,
+            fCntqty: 1,
+            fNetweight: this.planningList.fPlannetweight,
+            fPlanvolumn: 0,
+            fGrossweight: this.planningList.fPlangrossweight,
+            fQty: this.planningList.fPlanqty,
+            fPackagespecs: null,
+            fWarehouselocid: null,
+            fBoxno: null,
+            fMarks: null,
+            fGoodsval: null,
+            fTruckno: fTruckno,
+            fDriverTel: fDriverTel,
+            fDriverName: fDriverName,
+            fDriverIdCar: fDriverIdCar,
+            remark: null,
+            fBillstatus: 10,
+            fMblno:this.form.fMblno
+          });
+        }
+      }
+      if(this.dataList[0].fGoodsid){
+        for(let item in this.goodsOptions){
+          if(this.goodsOptions[item].fId == this.dataList[0].fGoodsid){
+            console.log("111")
+            this.form.fProductName = this.goodsOptions[item].fName
+          }
+        }
+      }
       this.weightList = false;
       // this.contrOl = true
       // 查询库区下 所有库位
@@ -5636,13 +5650,19 @@ export default {
       let fMarks = []
       let fGoodsid = []
       for (let li in this.dataList) {
+        console.log(this.dataList)
         if (this.dataList[li].fMarks) {
           fMarks.push(this.dataList[li].fMarks)
         }
-        fGoodsid.push(this.dataList[li].fGoodsids)
+        if (this.dataList[li].fGoodsids){
+          fGoodsid.push(this.dataList[li].fGoodsids)
+          console.log(fGoodsid)
+        }
+        console.log(this.dataList[li])
       }
       this.$set(this.form, 'fMarks', Array.from(new Set(fMarks)).join(","))
       this.$set(this.form, 'fProductName', Array.from(new Set(fGoodsid)).join(","))
+      console.log(fGoodsid)
     },
     //作业类型校验
     educationChange() {