lilei 2 weeks ago
parent
commit
a36e9b73ee

+ 2 - 2
src/views/financialManagement/accountStatement/confrontModal.vue

@@ -87,7 +87,7 @@
             <div><span>盖章</span></div>
           </div>
           <div class="conFrontModal-subTitle">
-            <div><span>公司名称:</span>{{ detailData.dealerAlias }}</div>
+            <div><span>公司名称:</span>{{ dealear.dealerAlias }}</div>
             <div><span>签名:</span></div>
             <div><span>盖章</span></div>
           </div>
@@ -158,7 +158,7 @@ export default {
               if (data[i].bizAmount > 0) {
                 data[i].debitAmount = data[i].bizAmount
               } else {
-                data[i].creditorAmount = data[i].bizAmount
+                data[i].creditorAmount = data[i].bizAmount * -1
               }
             }
             this.total = data.length || 0 + 1

+ 2 - 2
src/views/financialManagement/accountStatement/edit.vue

@@ -31,7 +31,7 @@
             <div>
               <span>余额:{{ countData && (countData.bizAmount || countData.bizAmount == 0) ? toThousands(countData.bizAmount) : '--' }};</span>
               <span>借方:{{ countData && (countData.borrowAmount || countData.borrowAmount == 0) ? toThousands(countData.borrowAmount) : '--' }};</span>
-              <span>贷方:{{ countData && (countData.loanAmount || countData.loanAmount == 0) ? toThousands(countData.loanAmount) : '--' }};</span>
+              <span>贷方:{{ countData && (countData.loanAmount || countData.loanAmount == 0) ? toThousands(countData.loanAmount*-1) : '--' }};</span>
             </div>
           </div>
         </a-alert>
@@ -192,7 +192,7 @@ export default {
               if (data.list[i].bizAmount > 0) {
                 data.list[i].debitAmount = data.list[i].bizAmount
               } else {
-                data.list[i].creditorAmount = data.list[i].bizAmount
+                data.list[i].creditorAmount = data.list[i].bizAmount * -1
               }
             }
           }

+ 8 - 1
src/views/financialManagement/accountStatement/queryPart.vue

@@ -57,7 +57,8 @@
             <a-col :md="24" :sm="24" style="margin-bottom: 10px;display: flex;align-items: center;justify-content: space-between;">
               <div>
                 <a-button type="primary" style="margin-right: 5px" @click="handleBatchAdd" :loading="addMoreLoading">批量选择</a-button>
-                <span v-if="selNums&&selNums!=0" style="margin:0 10px;">已选中{{ selNums }}项</span>
+                <span v-if="selNums&&selNums!=0" style="margin:0 0 0 10px;">已选中{{ selNums }}项</span>
+                <span v-if="totalAmount&&totalAmount!=0">,余额 {{ Number(totalAmount).toFixed(2) }}元</span>
               </div>
             </a-col>
           </a-row>
@@ -223,6 +224,12 @@ export default {
     },
     selNums () {
       return this.rowSelectionInfo && this.rowSelectionInfo.selectedRowKeys.length || 0
+    },
+    totalAmount () {
+      const amount = this.rowSelectionInfo && this.rowSelectionInfo.selectedRows.reduce((total, item) => {
+        return total + item.debitAmount || 0 - item.creditorAmount || 0
+      }, 0)
+      return amount
     }
   },
   methods: {

+ 1 - 1
src/views/financialManagement/accountStatementBill/detail.vue

@@ -98,7 +98,7 @@
         <div slot="message">
           余额:<strong>{{ totalData&&(totalData.bizAmount || totalData.bizAmount==0) ? toThousands(totalData.bizAmount) : '--' }}</strong>;
           借方:<strong>{{ totalData&&(totalData.borrowAmount || totalData.borrowAmount==0) ? toThousands(totalData.borrowAmount) : '--' }}</strong>;
-          贷方:<strong>{{ totalData&&(totalData.loanAmount || totalData.loanAmount==0) ? toThousands(totalData.loanAmount) : '--' }}</strong>;
+          贷方:<strong>{{ totalData&&(totalData.loanAmount || totalData.loanAmount==0) ? toThousands(totalData.loanAmount*-1) : '--' }}</strong>;
         </div>
       </a-alert>
       <a-spin :spinning="spinning" tip="Loading...">

+ 1 - 1
src/views/financialManagement/manualEntryForm/list.vue

@@ -270,7 +270,7 @@ export default {
     },
     // 提交审核人员
     handleSave (data) {
-      verifyAcountBillSubmit({ changeSn: this.itemSn, ...data }).then(res => {
+      verifyAcountBillSubmit({ changeSn: this.itemSn || data.changeSn, ...data }).then(res => {
         if (res.status == 200) {
           this.$message.success('提交成功')
           this.openDepartUserModal = false