lilei 2 nedēļas atpakaļ
vecāks
revīzija
a2183fb41a

+ 20 - 11
src/views/financialManagement/accountStatement/confrontModal.vue

@@ -160,6 +160,10 @@ export default {
         this.spinning = true
         const params = Object.assign(parameter, this.queryParam)
         params.verifyAccountBillSn = this.verifyAccountBillSn
+        const beginFlag = (!!params.beginDate && !!params.endDate)
+        const a = !params.bizNo && !params.changeType && !params.bizType
+        const b = !params.beginDate && !params.endDate
+        params.beginFlag = beginFlag && a || a && b ? 1 : 0
         return verifyAcountBillDetailQueryList(params).then(res => {
           let data
           if (res.status == 200) {
@@ -168,18 +172,23 @@ export default {
             let prevTotalAmount = 0
             for (var i = 0; i < data.length; i++) {
               data[i].no = no + i + 1
-              const dates = data[i].bizDate.split('-')
-              data[i].year = dates[0]
-              data[i].month = dates[1]
-              data[i].day = dates[2].split(' ')[0]
-              // 正为借方, 负数为贷方
-              if (data[i].bizAmount > 0) {
-                data[i].debitAmount = Number(data[i].bizAmount).toFixed(2)
-              } else {
-                data[i].creditorAmount = Number(data[i].bizAmount * -1).toFixed(2)
+              if (data[i].bizDate) {
+                const dates = data[i].bizDate.split('-')
+                data[i].year = dates[0]
+                data[i].month = dates[1]
+                data[i].day = dates[2].split(' ')[0]
+              }
+
+              if (data[i].bizAmount) {
+                // 正为借方, 负数为贷方
+                if (data[i].bizAmount > 0) {
+                  data[i].debitAmount = Number(data[i].bizAmount).toFixed(2)
+                } else {
+                  data[i].creditorAmount = Number(data[i].bizAmount * -1).toFixed(2)
+                }
+                data[i].totalAmount = Number(Number(prevTotalAmount || 0) + Number(data[i].debitAmount || 0) - Number(data[i].creditorAmount || 0)).toFixed(2)
+                prevTotalAmount = data[i].totalAmount
               }
-              data[i].totalAmount = Number(Number(prevTotalAmount || 0) + Number(data[i].debitAmount || 0) - Number(data[i].creditorAmount || 0)).toFixed(2)
-              prevTotalAmount = data[i].totalAmount
             }
             this.total = data.length || 0 + 1
             this.disabled = false