fubin пре 2 година
родитељ
комит
547f9c6226

+ 1 - 0
src/locale/lang/zh-CN.js

@@ -578,6 +578,7 @@ export const columns = {
   intoAmtSum:'已入库总金额',
   returnQtySum:'已入库退货总量',
   returnAmtSum:'已入库退货总金额',
+  sumShouldHandle:'待核销金额',
 }
 
 /**

+ 7 - 0
src/view/fin/payment/form.vue

@@ -64,6 +64,11 @@
       </BaseIndexButtonGroup>
       <DkForm ref="payableFootFormData" v-model="payableFootFormData" :labelMaxWords="6" name="dk-form"
               class="form-content-class">
+        <!-- 待核销金额 -->
+        <DkFormItem prop="sumShouldHandle">
+          <InputNumberPop ref="sumShouldHandle" v-model="payableFootFormData.sumShouldHandle" :digits="2"
+                          :disabled="true"/>
+        </DkFormItem>
         <!-- 本次核销金额 -->
         <DkFormItem prop="sumAmtPayableHandle">
           <InputNumberPop ref="sumAmtPayableHandle" v-model="payableFootFormData.sumAmtPayableHandle"
@@ -186,6 +191,7 @@ export default {
       },
       // 应付合计信息
       payableFootFormData: {
+        sumShouldHandle: 0,
         sumAmtPayableHandle: 0,
         sumAmtWaiveHandle: 0,
         sumUsePaymentResidue: 0,
@@ -363,6 +369,7 @@ export default {
       })
       let sumAmtPayableHandle = this.formData.payableList.sum('amtPayableHandle');
       this.payableFootFormData.sumAmtPayableHandle = sumAmtPayableHandle
+      this.payableFootFormData.sumShouldHandle = sumAmtPayableHandle
       this.payableFootFormData2.sumAmtPayableHandle2 = sumAmtPayableHandle
       this.payableModal = false
       // 设置预收抵扣

+ 3 - 0
src/view/fin/payment/index.vue

@@ -44,6 +44,9 @@
           <DkTableColumn field="rpTypeName" :title="$t('paymentTypeName')"/>
           <DkTableColumn field="supName"/>
           <DkTableColumn field="sumAmtPay" :digits="2" dataType="number" sum/>
+          <DkTableColumn field="sumShouldHandle" :digits="2" dataType="number" sum/>
+          <DkTableColumn field="sumUsePaymentResidue":digits="2" dataType="number" sum/>
+          <DkTableColumn field="sumAmtPayableHandle" :digits="2" dataType="number" sum/>
           <DkTableColumn field="accDate" :title="$t('paymentDate')"/>
           <DkTableColumn field="orgName"/>
           <DkTableColumn field="staffName"/>

+ 7 - 0
src/view/fin/receipt/form.vue

@@ -70,6 +70,11 @@
       </BaseIndexButtonGroup>
       <DkForm ref="receivableFootFormData" v-model="receivableFootFormData" :labelMaxWords="6" name="dk-form"
               class="form-content-class">
+        <!-- 待核销金额 -->
+        <DkFormItem prop="sumShouldHandle">
+          <InputNumberPop ref="sumShouldHandle" v-model="receivableFootFormData.sumShouldHandle" :digits="2"
+                          :disabled="true"/>
+        </DkFormItem>
         <!-- 本次核销金额 -->
         <DkFormItem prop="sumAmtReceivableHandle">
           <InputNumberPop ref="sumAmtReceivableHandle" v-model="receivableFootFormData.sumAmtReceivableHandle"
@@ -192,6 +197,7 @@ export default {
       },
       // 应收合计信息
       receivableFootFormData: {
+        sumShouldHandle: 0,
         sumAmtReceivableHandle: 0,
         sumAmtWaiveHandle: 0,
         sumUseReceiptResidue: 0,
@@ -371,6 +377,7 @@ export default {
       })
       let sumAmtReceivableHandle = this.formData.receivableList.sum('amtReceivableHandle');
       this.receivableFootFormData.sumAmtReceivableHandle = sumAmtReceivableHandle
+      this.receivableFootFormData.sumShouldHandle = sumAmtReceivableHandle
       this.receivableFootFormData2.sumAmtReceivableHandle2 = sumAmtReceivableHandle
       this.receivableModal = false
       // 设置预收抵扣

+ 3 - 0
src/view/fin/receipt/index.vue

@@ -46,6 +46,9 @@
           <DkTableColumn field="cusPhone"/>
           <DkTableColumn field="addressFull"/>
           <DkTableColumn field="sumAmtRec" :digits="2" dataType="number" sum/>
+          <DkTableColumn field="sumShouldHandle" :digits="2" dataType="number" sum/>
+          <DkTableColumn field="sumUseReceiptResidue" :digits="2" dataType="number" sum/>
+          <DkTableColumn field="sumAmtReceivableHandle" :digits="2" dataType="number" sum/>
           <DkTableColumn field="accDate" :title="$t('receiptDate')"/>
           <DkTableColumn field="orgName"/>
           <DkTableColumn field="staffName"/>