Эх сурвалжийг харах

refactor(accountstatement): 更新金额字段命名和显示标签

liujt 4 сар өмнө
parent
commit
f65805477d

+ 12 - 12
src/BIZComponents/paymentCollectionPlan/Index.vue

@@ -11,16 +11,18 @@
       <!-- 表头工具栏 -->
       <template v-slot:toolbar>
         <div class="headbox">
-            <el-button
-            size="small"
-            type="primary"
-            icon="el-icon-plus"
-            class="ele-btn-icon"
-            @click="handlAdd"
-            v-if="showAddBtn"
-            >
-            新增
-            </el-button>
+            <div>
+              <el-button
+                size="small"
+                type="primary"
+                icon="el-icon-plus"
+                class="ele-btn-icon"
+                @click="handlAdd"
+                v-if="showAddBtn"
+              >
+                新增
+              </el-button>
+            </div>
 
             <div class="pricebox">
                 <span class="amount">比例合计:{{ allRatio }}%</span>
@@ -364,13 +366,11 @@
       info: {
         handler(newval) {
           if (newval && newval.receiptPaymentList) {
-            // Directly assign API data to table without calculation
             this.isLoadingFromApi = true;
             this.form.datasource = newval.receiptPaymentList;
             if (newval.payAmount) {
               this.discountAmount = newval.payAmount;
             }
-            // Reset flag after a short delay to avoid affecting subsequent user changes
             setTimeout(() => {
               this.isLoadingFromApi = false;
             }, 100);

+ 3 - 1
src/views/purchasingManage/purchaseOrder/accountstatement/components/addAccountDialog.vue

@@ -99,6 +99,7 @@
     },
     data() {
       return {
+        businessId: '',
         fullscreen: false,
         datasource: [],
         recorpayList: [],
@@ -131,6 +132,7 @@
     computed: {},
     methods: {
       open(dialogType, row, type = '') {
+        this.businessId = row?.id || '';
         this.dialogType = dialogType;
         this.title =
           dialogType == 'add'
@@ -238,7 +240,7 @@
         this.reload();
       },
       async submit(res) {
-        let data = await accountstatementInfoAPI(res);
+        let data = await accountstatementInfoAPI(this.businessId || res);
         this.processSubmitDialogFlag = true;
         this.$nextTick(() => {
           let params = {

+ 4 - 4
src/views/purchasingManage/purchaseOrder/accountstatement/index.vue

@@ -295,15 +295,15 @@
             minWidth: 130
           },
           {
-            prop: 'amountReceivablePrice',
-            label: '应收金额',
+            prop: 'statementAmount',
+            label: '已对账金额',
             align: 'center',
             showOverflowTooltip: true,
             minWidth: 130
           },
           {
-            prop: 'amountPayablePrice',
-            label: '应付金额',
+            prop: 'unStatementAmount',
+            label: '未对账金额',
             align: 'center',
             showOverflowTooltip: true,
             minWidth: 130

+ 4 - 4
src/views/saleManage/saleOrder/accountstatement/index.vue

@@ -315,15 +315,15 @@
             minWidth: 130
           },
           {
-            prop: 'amountReceivablePrice',
-            label: '应收金额',
+            prop: 'statementAmount',
+            label: '已对账金额',
             align: 'center',
             showOverflowTooltip: true,
             minWidth: 130
           },
           {
-            prop: 'amountPayablePrice',
-            label: '应付金额',
+            prop: 'unStatementAmount',
+            label: '未对账金额',
             align: 'center',
             showOverflowTooltip: true,
             minWidth: 130