wangcz 7 жил өмнө
parent
commit
8ab4519ea5

+ 4 - 4
pages/mobile/center/user/btobarCheck.vue

@@ -115,7 +115,7 @@
                   <div class="inline-block" style="vertical-align: top" >
                     <div v-for="count in item.amountDetailList">
                       <span v-if="count.thisPeriodAmount > 0">{{count.currency}}:{{count.thisPeriodAmount | computeNum(2)}}</span>
-                      <span v-else>{{count.currency}}:暂无数据</span>
+                      <span v-else>{{count.currency}}:0</span>
                     </div>
                   </div>
                 </div>
@@ -135,7 +135,7 @@
                   <div class="inline-block" style="vertical-align: top" >
                     <div v-for="count in item.amountDetailList">
                       <span v-if="count.thisPeriodTodoAmount > 0">{{count.currency}}:{{count.thisPeriodTodoAmount | computeNum(2)}}</span>
-                      <span v-else>{{count.currency}}:暂无数据</span>
+                      <span v-else>{{count.currency}}:0</span>
                     </div>
                   </div>
                 </div>
@@ -145,7 +145,7 @@
                   <div class="inline-block" style="vertical-align: top" >
                     <div v-for="count in item.amountDetailList">
                       <span v-if="count.thisPeriodDoneAmount > 0">{{count.currency}}:{{count.thisPeriodDoneAmount | computeNum(2)}}</span>
-                      <span v-else>{{count.currency}}:暂无数据</span>
+                      <span v-else>{{count.currency}}:0</span>
                     </div>
                   </div>
                 </div>
@@ -165,7 +165,7 @@
                   <div class="inline-block" style="vertical-align: top" >
                     <div v-for="count in item.amountDetailList">
                       <span v-if="count.totalAmount > 0">{{count.currency}}:{{count.totalAmount | computeNum(2)}}</span>
-                      <span v-else>{{count.currency}}:暂无数据</span>
+                      <span v-else>{{count.currency}}:0</span>
                     </div>
                   </div>
                 </div>

+ 29 - 5
pages/mobile/center/vendor/btobapCheck.vue

@@ -115,7 +115,7 @@
                   <div class="inline-block" style="vertical-align: top" >
                     <div v-for="count in item.amountDetailList">
                       <span v-if="count.thisPeriodAmount > 0">{{count.currency}}:{{count.thisPeriodAmount | computeNum(2)}}</span>
-                      <span v-else>{{count.currency}}:暂无数据</span>
+                      <span v-else>{{count.currency}}:0</span>
                     </div>
                   </div>
                 </div>
@@ -135,7 +135,7 @@
                   <div class="inline-block" style="vertical-align: top" >
                     <div v-for="count in item.amountDetailList">
                       <span v-if="count.thisPeriodTodoAmount > 0">{{count.currency}}:{{count.thisPeriodTodoAmount | computeNum(2)}}</span>
-                      <span v-else>{{count.currency}}:暂无数据</span>
+                      <span v-else>{{count.currency}}:0</span>
                     </div>
                   </div>
                 </div>
@@ -145,7 +145,7 @@
                   <div class="inline-block" style="vertical-align: top" >
                     <div v-for="count in item.amountDetailList">
                       <span v-if="count.thisPeriodDoneAmount > 0">{{count.currency}}:{{count.thisPeriodDoneAmount | computeNum(2)}}</span>
-                      <span v-else>{{count.currency}}:暂无数据</span>
+                      <span v-else>{{count.currency}}:0</span>
                     </div>
                   </div>
                 </div>
@@ -165,7 +165,7 @@
                   <div class="inline-block" style="vertical-align: top" >
                     <div v-for="count in item.amountDetailList">
                       <span v-if="count.totalAmount > 0">{{count.currency}}:{{count.totalAmount | computeNum(2)}}</span>
-                      <span v-else>{{count.currency}}:暂无数据</span>
+                      <span v-else>{{count.currency}}:0</span>
                     </div>
                   </div>
                 </div>
@@ -729,6 +729,14 @@
         let validQty = true
         let _list = []
         this.isShowApcheckList.list.forEach((items) => {
+          let _insideList = {
+            allChecked: '',
+            checkAmountList: [],
+            checkQty: '',
+            orderCode: '',
+            sendQty: '',
+            details: []
+          }
           items.details.forEach((check) => {
             // 保存应收对账单明细行数据
             let item = {
@@ -766,7 +774,15 @@
 
             // 此次对账后新的已转数
             if (check.check === true && !check.haveChecked) {
-              _list.push(check)
+              if (_insideList.orderCode !== '') {
+                _insideList.details.push(check)
+              } else {
+                Object.assign(_insideList, items, {
+                  details: []
+                })
+                _insideList.details.push(check)
+              }
+
               apCheck.custName = check.custname
               apCheck.enUu = check.enuu
               apCheck.checkAmount += (check.thischeckqty || 0) * (check.orderprice || 0)
@@ -849,6 +865,14 @@
               // 如果是同一家客户,生成对账单的同时,关闭模态框
             }
           })
+
+          let IsHas = false // 是否存在
+          for (let i = 0; i < _list.length; i++) {
+            if (_list[i].orderCode === _insideList.orderCode) {
+              IsHas = true
+            }
+          }
+          if (!IsHas && _insideList.details.length > 0) _list.push(_insideList)
         })
         if (this.ShowApcheckChooseTime) {
           let _time1 = this.isShowApcheckList.objTime.value.fromDate