仓储模块修改

src/views/agreement/agreementTask/index.vue

@@ -603,18 +603,22 @@ export default {
   methods: {
     changefDc(){
       if(this.form.fDc === 'D'){
-        console.log("111")
         let queryParams = { pageNum: 1, pageSize: 10, fDc:'D'};
         listFees(queryParams).then((response) => {
           this.fWbuOptions = response.rows;
         });
       }else if(this.form.fDc === 'C'){
-        console.log("222")
         let queryParams = { pageNum: 1, pageSize: 10, fDc:'C'};
         listFees(queryParams).then((response) => {
           this.fWbuOptions = response.rows;
         });
       }
+      if(this.agreementitemsList.length){
+        this.$message.error("请重新选择费用名称")
+        for(let item in this.agreementitemsList){
+          this.agreementitemsList[item].fFeeid = ''
+        }
+      }
     },
     // 默认录入人
     register() {
@@ -987,7 +991,6 @@ export default {
         this.deptName = response.dept.deptName
         this.form.fDeptid = response.dept.deptId
       });
-      this.changefDc()
     },
     /** 修改按钮操作 */
     handleUpdate(row,num) {
@@ -1042,7 +1045,6 @@ export default {
       }
       let queryParams = { pageNum: 1, fName: name, type: 1 };
       listCorps(queryParams).then((response) => {
-        console.log(response)
         this.fMblnoOptions = response.rows;
         this.KHblnoOptions = response.rows;
       });

src/views/basicdata/corps/index.vue

@@ -723,13 +723,13 @@
               console.log(this.fTypeidOptions)
             for (let index in this.fTypeidOptions){
               for (let item in this.form.fTypeid){
+                console.log(this.form.fTypeid)
                 if (this.fTypeidOptions[index].dictValue == this.form.fTypeid[item]){
-                  console.log(this.form.fTypename)
-                  console.log(this.fTypeidOptions[index].dictValue,this.form.fTypeid[item])
-                  this.form.fTypename += this.fTypeidOptions[item].dictLabel + ','
+                  this.form.fTypename += this.fTypeidOptions[index].dictLabel + ','
                 }
               }
             }
+              console.log(this.form.fTypename)
               this.form.fTypename = this.form.fTypename.substring(0,this.form.fTypename.length-1)
             console.log(this.form)
               formDate.append('corps',JSON.stringify(this.form));
@@ -741,6 +741,16 @@
               });
             } else {
               let formDate= new FormData()
+              for (let index in this.fTypeidOptions){
+                for (let item in this.form.fTypeid){
+                  if (this.fTypeidOptions[index].dictValue == this.form.fTypeid[item]){
+                    console.log(this.form.fTypename)
+                    console.log(this.fTypeidOptions[index].dictValue,this.form.fTypeid[item])
+                    this.form.fTypename += this.fTypeidOptions[item].dictLabel + ','
+                  }
+                }
+              }
+              this.form.fTypename = this.form.fTypename.substring(0,this.form.fTypename.length-1)
               formDate.append('corps',JSON.stringify(this.form));
               formDate.append('customerContacts',JSON.stringify(this.contactList));
               addCorps(formDate).then(response => {

src/views/warehouseBusiness/inStock/index.vue

@@ -3396,7 +3396,11 @@ export default {
       this.jFeetunitOptions = response.data;
     });
     this.getDicts("st_in_type").then((response) => {
-      this.businessTypeOption = response.data;
+      if (response.data){
+        this.businessTypeOption = response.data;
+      }else {
+        return
+      }
     });
     this.getDicts("data_stltype_type").then(response => {
       this.fStltypeidOptions = response.data;
@@ -4208,10 +4212,15 @@ export default {
           let feeId = this.dialogWhgenlegList[zhgen].feeFId;
           getFees(feeId).then((response) => {
             this.fWbuOptions = []
-            let queryParams = { pageNum: 1, pageSize: 10};
+            let queryParams = { pageNum: 1, pageSize: 10, fDc:'C'};
             listFees(queryParams).then((response) => {
-              this.fWbuOptions = response.rows;
+              this.fCNameOptions = response.rows;
             });
+            let query = { pageNum: 1, pageSize: 10, fDc:'D'};
+            listFees(query).then((response) => {
+              this.fDNameOptions = response.rows;
+            });
+
           });
           let qty = 1;
           if (this.dialogWhgenlegList[zhgen].fFeeUnitid == 1) {

src/views/warehouseBusiness/outStock/index.vue

@@ -3269,6 +3269,7 @@ export default {
       this.jFeetunitOptions = response.data;
     });
     this.getDicts("st_out_type").then((response) => {
+      console.log(response)
       this.businessTypeOption = response.data;
     });
     this.getDicts("sys_car_type").then((response) => {
@@ -3547,6 +3548,7 @@ export default {
     },
     // 新增作业费协议
     addAgreement(kye,status) {
+
       this.costStatus = status
       if (!this.form.fCorpid) {
         this.$message({ message: "请维护货权方", type: "warning", });
@@ -3697,6 +3699,10 @@ export default {
         // qty=(qty/1000).toFixed(2);
         let fAmount = parseFloat(Number(this.dialogWhgenlegList[zhgen].fPrice) * Number(qty)).toFixed(2)
         if(this.costStatus == '3' ){
+          let queryParams = { pageNum: 1, pageSize: 10, fDc:'D'};
+          listFees(queryParams).then((response) => {
+            this.fDNameOptions = response.rows;
+          });
           this.warehouseDrList.push({
                 fQty: qty,
                 fCorpid: this.dialogWhgenlegList[zhgen].fCorpid,
@@ -3712,7 +3718,12 @@ export default {
                 fMarks:this.form.fMarks,
                 fBusinessType:this.$set(this.warehouseDrList,'fBusinessType',this.form.fBusinessType)
               })
+
         }else{
+          let queryParams = { pageNum: 1, pageSize: 10, fDc:'C'};
+          listFees(queryParams).then((response) => {
+            this.fCNameOptions = response.rows;
+          });
           this.warehouseCrList.push({
                 fQty: qty,
                 fCorpid: this.dialogWhgenlegList[zhgen].fCorpid,
@@ -3728,6 +3739,7 @@ export default {
                 fMarks:this.form.fMarks,
                 fBusinessType:this.$set(this.warehouseCrList,'fBusinessType',this.form.fBusinessType)
               })
+
         }
         // if (this.costStatus === 'Cr' ) {
         //   this.warehouseCrList.push({
@@ -4670,7 +4682,6 @@ export default {
             this.$refs.tableList.clearSelection();
             this.formBrowseStatus = true;
             this.contrOl = true
-            this.form.fBillstatus = 40
             for (let li in listSelection) {
               for (let i in this.dataList) {
                 if (listSelection[li].fId == this.dataList[i].fId) {
@@ -4745,7 +4756,6 @@ export default {
               this.title = "修改仓入库";
               this.warehousesssMethod()
             });
-
             this.$refs['form'].validate((valid) => {
               for (let li in this.dataList) {
                 for(let list in this.fStorageTypeOptions){
@@ -4777,7 +4787,6 @@ export default {
                     this.$set(this.form, 'fBsdate', Date.parse(this.form.fBsdate))
                     this.$set(this.form, 'createTime', Date.parse(this.form.createTime))
                     this.$set(this.form, 'fChargedate', Date.parse(this.form.fChargedate))
-                    this.$set(this.form, 'fBusinessType', Date.parse(this.form.fChargedate))
                     this.dataList = response.data.warehousebillsitems
                     for (let list in this.dataList) {
                       this.$set(this.dataList[list], "fBsdate", Date.parse(this.dataList[list].fBsdate));

src/views/warehouseBusiness/stockTransfer/index.vue

@@ -3364,6 +3364,8 @@ export default {
     },
     // 查看审批流
     addOrUpdateHandle(){
+
+      this.approvalStatus = false
       this.addOrUpdateVisible = true
       this.addOrUpdateVisib = false
       let id = '448'
@@ -3564,6 +3566,10 @@ export default {
             fMarks:this.form.fMarks,
             fBusinessType:this.$set(this.warehouseCrList,'fBusinessType',this.form.fBusinessType)
           })
+          let queryParams = { pageNum: 1, pageSize: 10, fDc:'C'};
+          listFees(queryParams).then((response) => {
+            this.fCNameOptions = response.rows;
+          });
         } else {
           this.warehouseDrList.push({
             fQty: qty,
@@ -3580,6 +3586,10 @@ export default {
             fMarks:this.form.fMarks,
             fBusinessType:this.$set(this.warehouseDrList,'fBusinessType',this.form.fBusinessType)
           })
+          let queryParams = { pageNum: 1, pageSize: 10, fDc:'D'};
+          listFees(queryParams).then((response) => {
+            this.fDNameOptions = response.rows;
+          });
         }
       }
       this.warehousingagreements = false
@@ -4101,6 +4111,7 @@ export default {
 
     check(row,status,res){
       this.reset();
+      this.contrOl = true
       this.disappear = false
       this.notChange = true
       this.browseStatus = status;
@@ -4923,9 +4934,7 @@ export default {
         for(let item in this.warehouseDrList) {
           if (!this.warehouseDrList[item].fCorpid) {
             if (item === 'fBusinessType') {
-              console.log(item)
             } else {
-              console.log(this.warehouseDrList[item].fCorpid)
               this.$message.error("请维护收款信息第" + (Number(item) + 1) + "行客户名称")
               return false
             }