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

src/views/finance/charge/index.vue

@@ -3401,7 +3401,7 @@ export default {
       if (name == null || name === "") {
         return false;
       }
-      let queryParams = { pageNum: 1, pageSize: 10, fName: name };
+      let queryParams = { pageNum: 1, pageSize: 20, fName: name };
       listFees(queryParams).then((response) => {
         this.fWbuOptions = response.rows;
       });
@@ -3567,6 +3567,17 @@ export default {
           if (!this.queryParams.fId) {
             // this.chargeList.fBillstatus = '1'
             this.queryParams.fBillstatus = "1";
+            let noList=[]
+            if(this.increase_s){
+              this.increase_s.forEach(e=>{
+                e.fInvoiceNo=e.invoiceNo
+                noList.push(e.invoiceNo)
+              })
+            }
+            if(!this.queryParams.invoiceNo){
+              const newArr =[...new Set(noList)]
+              this.queryParams.invoiceNo=newArr.join(",")
+            }
             let formData = new window.FormData();
             formData.append("tFee", JSON.stringify(this.queryParams));
             formData.append("tFeeDo", JSON.stringify(this.increase_s));
@@ -3631,6 +3642,17 @@ export default {
             }
           } else if(Cookies.get("sysType") == 1 || Cookies.get("sysType") == 2){
             this.queryParams.fBillstatus = "1";
+            let noList=[]
+            if(this.increase_s){
+              this.increase_s.forEach(e=>{
+                e.fInvoiceNo=e.invoiceNo
+                noList.push(e.invoiceNo)
+              })
+            }
+            if(!this.queryParams.invoiceNo){
+              const newArr =[...new Set(noList)]
+              this.queryParams.invoiceNo=newArr.join(",")
+            }
             let formData = new window.FormData();
             formData.append("tFee", JSON.stringify(this.queryParams));
             formData.append("tFeeDo", JSON.stringify(this.increase_s));

src/views/finance/payment/index.vue

@@ -4206,7 +4206,7 @@ export default {
       if (name == null || name === "") {
         return false;
       }
-      let queryParams = { pageNum: 1, pageSize: 10, fName: name };
+      let queryParams = { pageNum: 1, pageSize: 20, fName: name };
       listFees(queryParams).then((response) => {
         this.fWbuOptions = response.rows;
       });
@@ -4358,6 +4358,17 @@ export default {
           if (this.queryParams.fId == null) {
             // this.chargeList.fBillstatus = '1'
             this.queryParams.fBillstatus = "1";
+            let noList=[]
+            if(this.increase_s){
+              this.increase_s.forEach(e=>{
+                e.fInvoiceNo=e.invoiceNo
+                noList.push(e.invoiceNo)
+              })
+            }
+            if(!this.queryParams.invoiceNo){
+              const newArr =[...new Set(noList)]
+              this.queryParams.invoiceNo=newArr.join(",")
+            }
             let formData = new window.FormData();
             formData.append("tFee", JSON.stringify(this.queryParams));
             formData.append("tFeeDo", JSON.stringify(this.increase_s));
@@ -4429,6 +4440,17 @@ export default {
             // this.pass.fAmtcr.toFixed(2);
 
             this.queryParams.fBillstatus = "1";
+            let noList=[]
+            if(this.increase_s){
+              this.increase_s.forEach(e=>{
+                e.fInvoiceNo=e.invoiceNo
+                noList.push(e.invoiceNo)
+              })
+            }
+            if(!this.queryParams.invoiceNo){
+              const newArr =[...new Set(noList)]
+              this.queryParams.invoiceNo=newArr.join(",")
+            }
             let formData = new window.FormData();
             formData.append("tFee", JSON.stringify(this.queryParams));
             formData.append("tFeeDo", JSON.stringify(this.increase_s));

src/views/reportManagement/whgenleg/index.vue

@@ -686,6 +686,41 @@ export default {
           checked: 0,
           width: 100,
         },
+        {
+          surface: "22",
+          label: "lockStatus",
+          name: "是否出质",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "23",
+          label: "belongTo",
+          name: "质押归属人",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "24",
+          label: "lockTime",
+          name: "锁定时间",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "25",
+          label: "unlockTime",
+          name: "解锁时间",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "26",
+          label: "wrNumber",
+          name: "仓单编号",
+          checked: 0,
+          width: 100,
+        }
       ],
       allCheck: false,
       isCntrnoOptions: [