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

src/views/finance/applyForInvoice/chargeInvoice/index.vue

@@ -2676,6 +2676,7 @@ export default {
       this.addOrUpdateVisib = false
       let id = '448'
       let actId = '470'
+      console.log(this.increase_s.fId)
       this.$nextTick(() => {
         this.$refs.addOrUpdate.init(this.queryParams.fId, this.contrastId)
       })
@@ -3083,6 +3084,7 @@ export default {
               formDate.append('tFeeInvoice', JSON.stringify(this.invoiceList))
               formDate.append('billsType', 'ApplyFP')
               addcheck(formDate).then(response => {
+                this.queryParams.fId = response.data.tFee.fId
                 this.msgSuccess('操作成功')
                 this.getList()
                 this.notChange = true
@@ -3231,7 +3233,7 @@ export default {
             this.nothing.push(this.selection[item].fName)
             if (this.increase_s.length === 0) {
               this.increase_s = this.increase_s.concat(this.selection)
-
+              console.log(this.increase_s)
               //去重提单号
               this.empty = new Set(this.empty)
               this.empty = Array.from(this.empty)

src/views/finance/charge/index.vue

@@ -2684,6 +2684,7 @@ export default {
             }else if(Cookies.get("sysType") == 3){
               formDate.append('billsType','KHSF')
               collectFee(formDate).then((response) => {
+                this.queryParams.fId = response.data.tFee.fId
                 this.open = false;
                 this.msgSuccess("操作成功");
                 this.getList();
@@ -3365,7 +3366,7 @@ export default {
             }else if(Cookies.get("sysType") == 3){
               formData.append("billsType", 'KHSF');
               addCharge(formData).then((response) => {
-                let feeBills = response.data.tFee;
+                this.queryParams = response.data.tFee;
                 this.$set(this.queryParams, "fId", response.data.tFee.fId);
                 this.$set(
                   this.queryParams,
@@ -3388,11 +3389,11 @@ export default {
             this.queryParams.fBillstatus = "1";
             let formData = new window.FormData();
             for(let li in this.increase_s){
-              if(this.increase_s[li].fSrcdc == '收'){
-                this.increase_s[li].fSrcdc = 'D'
-              }else if(this.increase_s[li].fSrcdc == '付'){
-                this.increase_s[li].fSrcdc = 'C'
-              }
+              // if(this.increase_s[li].fSrcdc == '收'){
+              //   this.increase_s[li].fSrcdc = 'D'
+              // }else if(this.increase_s[li].fSrcdc == '付'){
+              //   this.increase_s[li].fSrcdc = 'C'
+              // }
             }
             formData.append("tFee", JSON.stringify(this.queryParams));
             formData.append("tFeeDo", JSON.stringify(this.increase_s));

src/views/finance/contrast/index.vue

@@ -7,7 +7,7 @@
         ref="queryParams_s"
         :inline="true"
         v-show="showSearch"
-        label-width="70px"
+        label-width="68px"
       >
         <el-row>
           <el-col :span="6">
@@ -50,7 +50,7 @@
           <el-col :span="6">
             <el-form-item label="状态" prop="fBillstatus">
               <el-input
-                v-model="queryParams.fBillstatus"
+                v-model="tablefilter.fBillstatus"
                 placeholder="请输入提单号"
                 clearable
                 style="width: 200px"
@@ -110,6 +110,7 @@
                     size="small"
                     style="width: 240px"
                     value-format="yyyy-MM-dd"
+                    :default-time="['00:00:00', '23:59:59']"
                     type="daterange"
                     range-separator="-"
                     start-placeholder="开始日期"
@@ -2387,6 +2388,7 @@ export default {
             }else if(Cookies.get("sysType") == 3){
               formDate.append('billsType','KHDZ')
               Cfee(formDate).then((response) => {
+                this.queryParams.fId = response.data.tFee.fId
                 this.open = false;
                 this.msgSuccess("操作成功");
                 this.doNot = true;
@@ -3229,13 +3231,13 @@ export default {
               if (e.fChargedate) {
                 e.fChargedate = e.fChargedate.slice(0, 10);
               }
-              if (e.fSrcdc) {
-                if (e.fSrcdc == "D") {
-                  e.fSrcdc = "收";
-                } else {
-                  e.fSrcdc = "付";
-                }
-              }
+              // if (e.fDc) {
+              //   if (e.fDc == "D") {
+              //     e.fDc = "收";
+              //   } else {
+              //     e.fDc = "付";
+              //   }
+              // }
             });
           }
           this.DzfeeList = response.data.feeDoList;
@@ -3273,13 +3275,13 @@ export default {
                     if (e.fChargedate) {
                       e.fChargedate = e.fChargedate.slice(0, 10);
                     }
-                    if (e.fSrcdc) {
-                      if (e.fSrcdc == "D") {
-                        e.fSrcdc = "收";
-                      } else {
-                        e.fSrcdc = "付";
-                      }
-                    }
+                    // if (e.fDc) {
+                    //   if (e.fDc == "D") {
+                    //     e.fDc = "收";
+                    //   } else {
+                    //     e.fDc = "付";
+                    //   }
+                    // }
                   });
                 }
                 this.DzfeeList = response.data.feeDoList;
@@ -3317,13 +3319,13 @@ export default {
                   if (e.fChargedate) {
                     e.fChargedate = e.fChargedate.slice(0, 10);
                   }
-                  if (e.fSrcdc) {
-                    if (e.fSrcdc == "D") {
-                      e.fSrcdc = "收";
-                    } else {
-                      e.fSrcdc = "付";
-                    }
-                  }
+                  // if (e.fDc) {
+                  //   if (e.fDc == "D") {
+                  //     e.fDc = "收";
+                  //   } else {
+                  //     e.fDc = "付";
+                  //   }
+                  // }
                 });
               }
               this.DzfeeList = response.data.feeDoList;
@@ -3440,10 +3442,10 @@ export default {
                 e.fChargedate = e.fChargedate.slice(0, 10);
               }
               if (e.fSrcdc) {
-                if (e.fSrcdc == "D") {
-                  e.fSrcdc = "收";
-                } else {
-                  e.fSrcdc = "付";
+                if (e.fDc == "D") {
+                  e.fDc = "收";
+                } else if(e.fDc == "C"){
+                  e.fDc = "付";
                 }
               }
             });

src/views/finance/payment/index.vue

@@ -3262,13 +3262,13 @@ export default {
                     if (e.fBsdate) {
                       e.fBsdate = e.fBsdate.slice(0, 10);
                     }
-                    if (e.fSrcdc) {
-                      if (e.fSrcdc == "D") {
-                        e.fSrcdc = "收";
-                      } else {
-                        e.fSrcdc = "付";
-                      }
-                    }
+                    // if (e.fSrcdc) {
+                    //   if (e.fSrcdc == "D") {
+                    //     e.fSrcdc = "收";
+                    //   } else {
+                    //     e.fSrcdc = "付";
+                    //   }
+                    // }
                   });
                 }
                 this.increase_s = response.data.feeDoList;
@@ -3300,13 +3300,13 @@ export default {
                   if (e.fBsdate) {
                     e.fBsdate = e.fBsdate.slice(0, 10);
                   }
-                  if (e.fSrcdc) {
-                    if (e.fSrcdc == "D") {
-                      e.fSrcdc = "收";
-                    } else {
-                      e.fSrcdc = "付";
-                    }
-                  }
+                  // if (e.fSrcdc) {
+                  //   if (e.fSrcdc == "D") {
+                  //     e.fSrcdc = "收";
+                  //   } else {
+                  //     e.fSrcdc = "付";
+                  //   }
+                  // }
                 });
               }
               this.increase_s = response.data.feeDoList;
@@ -3375,6 +3375,7 @@ export default {
             }else if(Cookies.get("sysType") == 3){
               formDate.append('billsType','KHFF')
               collectFee(formDate).then((response) => {
+                this.queryParams.fId = response.data.tFee.fId
                 this.msgSuccess("操作成功");
                 this.getList();
                 this.doNot = true;
@@ -3981,13 +3982,13 @@ export default {
               if (e.fBsdate) {
                 e.fBsdate = e.fBsdate.slice(0, 10);
               }
-              if (e.fSrcdc) {
-                if (e.fSrcdc == "D") {
-                  e.fSrcdc = "收";
-                } else {
-                  e.fSrcdc = "付";
-                }
-              }
+              // if (e.fSrcdc) {
+              //   if (e.fSrcdc == "D") {
+              //     e.fSrcdc = "收";
+              //   } else {
+              //     e.fSrcdc = "付";
+              //   }
+              // }
             });
           }
           this.increase_s = response.data.feeDoList;