Merge remote-tracking branch 'origin/dev1.6' into dev1.6

src/views/ecw/financial/components/CollectionBankDetail.vue

@@ -152,6 +152,7 @@ export default {
       currencyList:[],
       list:[],
       detailed: [],
+      detatilData:[],
       showCurrencyId:0,
       surplusData:[],
       openAddDialog:false,
@@ -159,7 +160,8 @@ export default {
       addForm:{},
       receiptId:0,
       receiptItemId:0,
-      reason:''
+      reason:'',
+      receiptAccountList:[]
     }
   },
   watch:{
@@ -197,18 +199,19 @@ export default {
    },
    getList() {
      getReceivableItem({ id: this.receiptId }).then(res => {
-       res.data = res.data.map(v => ({
+       this.detatilData = res.data.map(v => ({
          ...v,
          amountDate: this.parseTime(v.amountDate, '{y}-{m}-{d}'),
          accountNo: +v.accountNo,
          rate:parseFloat(v.rate).toFixed(6),
          attr: v.attr ? v.attr.split(',').map(t => ({ name: t.slice(t.lastIndexOf('/') + 1), url: t })) : []
        }))
-       this.addForm = res.data.find(v=>v.id==this.receiptItemId)
+       this.addForm = this.detatilData.find(v=>v.id==this.receiptItemId)
        this.detailed = []
        this.detailed.push(this.addForm)
        this.getCollectionData()
      })
+     
    },
    getReceiptInfo(){
        getReceiptInfoByIds({ id: this.receiptId }).then(res => {
@@ -274,7 +277,7 @@ export default {
     handleAddReceiptItem() {
       // 已收
       let recepted = []
-      this.detailed.forEach(item => {
+      this.detatilData.forEach(item => {
           if(!recepted[item.currencyId]){
             recepted[item.currencyId] = item.amount
           }else recepted[item.currencyId] = NP.plus(recepted[item.currencyId], item.amount)
@@ -282,9 +285,9 @@ export default {
       // 应收
       let collom = []
       // 从期望收费金额中提取应收币种和金额
-      this.collectionAmount.forEach(item => {
-        collom[item.currencyId] = item.amount
-      })
+         this.collectionAmount.forEach(item => {
+           collom[item.currencyId] = item.amount
+         })
       console.log(recepted)
         recepted.forEach((amount,currency)=>{
           if(amount){

src/views/ecw/financial/receiptDetail.vue

@@ -825,6 +825,43 @@ export default {
       if(label.length>0) return this.$i18n.locale=='zh_CN'?label[0].titleZh:label[0].titleEn
       return ''
     },
+    getsurplusData() {
+          // 已收
+          this.surplusData = []
+          let recepted = []
+          this.detailed.forEach(item => {
+              if(!recepted[item.currencyId]){
+                recepted[item.currencyId] = item.amount
+              }else recepted[item.currencyId] = NP.plus(recepted[item.currencyId], item.amount)
+          })
+          // 应收
+          let collom = []
+         // 从期望收费金额中提取应收币种和金额
+         this.form.receiptAccountList.find(item => item.type == 'total').collectionAmount.forEach(item => {
+           collom[item.currencyId] = item.amount
+         })
+            recepted.forEach((amount,currency)=>{
+              if(amount){
+                if(collom[currency]){
+                  if((collom[currency]-amount)!=0) this.surplusData[currency] = +parseFloat((collom[currency]-amount).toPrecision(12))
+                }else{
+                  this.surplusData[currency] = -amount
+                }
+              }
+
+            })
+            collom.forEach((amount,currency)=>{
+              if(amount){
+                if(!this.surplusData[currency]){
+                  if(recepted[currency]){
+                   if((amount-recepted[currency])!=0)  this.surplusData[currency] = +parseFloat((amount-recepted[currency]).toPrecision(12))
+                  }else{
+                  this.surplusData[currency] = amount
+                }
+                }
+              }
+            })
+        },
     calculation() {
       // this.currencyList.forEach((item,index)=>{
       //   var verificationList = this.detailed.filter(v => v.status === 1)
@@ -945,7 +982,7 @@ export default {
             });
           })
           .catch(() => {this.wiffShow = false});
-    
+
     },
     //显示取消审核弹窗
     detailClickCancel(type){
@@ -1082,6 +1119,7 @@ export default {
       return this.$router.push("creatCollection?id=" + this.id);
     },
     detailClick(row) {
+      this.getsurplusData()
       this.openAddDialog = true
       this.dialogTitle = this.$t('银行实收明细详情')
       this.isView = true
@@ -1183,59 +1221,7 @@ export default {
       this.openAddDialog = false
     },
     handleAddReceiptItem() {
-      this.surplusData = []
-
-      // 已收
-      let recepted = []
-      this.detailed.forEach(item => {
-
-          if(!recepted[item.currencyId]){
-            recepted[item.currencyId] = item.amount
-          }else recepted[item.currencyId] = NP.plus(recepted[item.currencyId], item.amount)
-      })
-      console.log('rece',recepted)
-
-      // 应收
-      let collom = []
-      /* this.form.receiptAccountList.forEach(item => {
-          if(item.type!='total'){
-            if(!collom[item.currencyId]){
-              collom[item.currencyId] = item.receivableAmount-item.discountTotal
-            }else collom[item.currencyId] = NP.plus(collom[item.currencyId], item.receivableAmount)
-          }
-      }) */
-      // 从期望收费金额中提取应收币种和金额
-      this.form.receiptAccountList.find(item => item.type == 'total').collectionAmount.forEach(item => {
-        collom[item.currencyId] = item.amount
-      })
-      console.log(this.form.receiptAccountList)
-          console.log('collom',collom)
-      // if(recepted.length>collom.length){
-        recepted.forEach((amount,currency)=>{
-          if(amount){
-            if(collom[currency]){
-              if((collom[currency]-amount)!=0) this.surplusData[currency] = +parseFloat((collom[currency]-amount).toPrecision(12))
-            }else{
-              this.surplusData[currency] = -amount
-            }
-          }
-
-        })
-      // }else{
-        collom.forEach((amount,currency)=>{
-          if(amount){
-            if(!this.surplusData[currency]){
-              if(recepted[currency]){
-               if((amount-recepted[currency])!=0)  this.surplusData[currency] = +parseFloat((amount-recepted[currency]).toPrecision(12))
-              }else{
-              this.surplusData[currency] = amount
-            }
-
-            }
-          }
-        })
-      // }
-      console.log(this.surplusData)
+      this.getsurplusData()
       this.addForm = {}
       this.openAddDialog = true
       this.isView = false

src/views/ecw/financial/voucher.vue

@@ -316,6 +316,7 @@ export default {
       dateType: [],
       loading: "",
       params: {
+
       },
       // 查询参数
       queryParams: {
@@ -361,6 +362,13 @@ export default {
     /** 查询列表 */
     getList() {
       this.loading = true;
+      this.params = {}
+      for(var key in this.queryParams){
+          if(this.queryParams[key]){
+            this.params[key] = this.queryParams[key]
+          }
+         }
+      console.log(this.params)
       // 处理查询参数
       let params = { ...this.params };
       this.addBeginAndEndTime(params, this.dateRangeCreateTime, "createTime");
@@ -451,7 +459,7 @@ export default {
             this.cancelShow = false
             this.getList();
             this.$message.success(this.$t("提交成功"));
-      
+
           });
       }
 
@@ -500,7 +508,6 @@ export default {
     },
     /** 搜索按钮操作 */
     handleQuery() {
-      this.params = {}
       if(this.dateFilter&&this.dateFilter.length>0){
         this.queryParams.beginCreateTime = this.dateFilter[0]
         this.queryParams.endCreateTime = this.dateFilter[1]
@@ -509,12 +516,7 @@ export default {
         this.queryParams.endCreateTime = ''
       }
 
-      this.queryParams.pageNo = 1;
-      for(var key in this.queryParams){
-          if(this.queryParams[key]){
-            this.params[key] = this.queryParams[key]
-          }
-         }
+      this.queryParams.page = 1;
       this.getList();
     },
     /** 新增按钮操作 */