2 Commits 9cd5168122 ... d48783d2ee

Autore SHA1 Messaggio Data
  lucw d48783d2ee Merge branch 'dev' of http://110.41.163.243:9980/kd-aiot/kd-aiot-frontend-wt into dev 5 giorni fa
  lucw ef53d6bebf feat: 应收应付对账单审批明细新增差异汇总金额、异常处理与冲抵单据展示 5 giorni fa

+ 127 - 1
src/views/bpm/handleTask/components/purchaseOrder/accountstatement/payablesInfo.vue

@@ -103,6 +103,70 @@
           </el-form-item>
         </template>
 
+        <template v-slot:amountDiff="scope">
+          <el-input
+            v-model="scope.row.amountDiff"
+            type="number"
+            :min="0"
+            disabled
+            placeholder="0"
+          />
+        </template>
+
+        <template v-slot:dealType="scope">
+          <el-select
+            v-model="scope.row.dealType"
+            placeholder="请选择"
+            class="ele-block"
+            disabled
+          >
+            <el-option
+              v-for="item in dealTypeOp"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
+        </template>
+
+        <template v-slot:offsetMode="scope">
+          <el-select
+            v-if="scope.row.dealType === 3"
+            v-model="scope.row.offsetMode"
+            placeholder="请选择"
+            class="ele-block"
+            disabled
+          >
+            <el-option
+              v-for="item in offsetModeOp"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
+          <span v-else class="ele-block diff-direction-empty">-</span>
+        </template>
+
+        <template v-slot:offsetRef="scope">
+          <el-tag
+            v-if="scope.row.dealType === 3 && isWriteoffMode(scope.row.offsetMode) && (scope.row.writeoffList || []).length"
+            size="mini"
+            type="success"
+          >
+            已选{{ (scope.row.writeoffList || []).length }}张/合计{{ sumWriteoff(scope.row) }}
+          </el-tag>
+          <span v-else>-</span>
+        </template>
+
+        <template v-slot:exceptionRemark="scope">
+          <el-input
+            v-model="scope.row.exceptionRemark"
+            type="textarea"
+            :autosize="{ minRows: 1, maxRows: 3 }"
+            disabled
+          />
+        </template>
+
         <template v-slot:action="scope">
           <el-link
             v-if="!isView"
@@ -157,10 +221,25 @@
     },
     data() {
       return {
-        cacheKeyUrl: 'eom-202608181000-purchase-payables-table',
+        // 缓存键变更:强制重建列配置,确保「差异汇总金额」「异常处理」「冲抵处置方式」「冲抵单据」「异常说明」五列在审批页显示
+        cacheKeyUrl: 'wt-202611172100-purchase-payables-table',
         paymentTypeOp,
         transactionMethodsOp,
         paymentStatusOp: paymentStatus,
+        // 金额差异异常处理类型(与后端 FinStatDealTypeEnum 一致)
+        dealTypeOp: [
+          { value: 1, label: '收款' },
+          { value: 2, label: '退款' },
+          { value: 3, label: '冲抵下期' },
+          { value: 4, label: '不处置' }
+        ],
+        // 冲抵处置方式(与后端 FinOffsetModeEnum 一致)
+        offsetModeOp: [
+          { value: 1, label: '借向结转(应补未补)' },
+          { value: 2, label: '贷向结转(应退未退)' },
+          { value: 3, label: '核销冲抵单据(借向)' },
+          { value: 4, label: '核销冲抵单据(贷向)' }
+        ],
         rules: {},
         // 本地维护的应付明细,避免每次编辑都同步回父组件
         localList: [],
@@ -269,6 +348,41 @@
             label: '累计应付金额',
             align: 'center',
             showOverflowTooltip: true
+          },
+          {
+            minWidth: 140,
+            prop: 'amountDiff',
+            label: '差异汇总金额',
+            align: 'center',
+            slot: 'amountDiff'
+          },
+          {
+            minWidth: 160,
+            prop: 'dealType',
+            label: '异常处理',
+            align: 'center',
+            slot: 'dealType'
+          },
+          {
+            minWidth: 180,
+            prop: 'offsetMode',
+            label: '冲抵处置方式',
+            align: 'center',
+            slot: 'offsetMode'
+          },
+          {
+            minWidth: 220,
+            prop: 'writeoffList',
+            label: '冲抵单据',
+            align: 'center',
+            slot: 'offsetRef'
+          },
+          {
+            minWidth: 160,
+            prop: 'exceptionRemark',
+            label: '异常说明',
+            align: 'center',
+            slot: 'exceptionRemark'
           }
         ]
       };
@@ -319,6 +433,18 @@
       }
     },
     methods: {
+      // 是否核销模式(3核销借向 / 4核销贷向)
+      isWriteoffMode(mode) {
+        return mode === 3 || mode === 4;
+      },
+      // 已选冲抵金额合计
+      sumWriteoff(row) {
+        const sum = (row.writeoffList || []).reduce(
+          (pre, cur) => pre + (+cur.writeoffAmt || 0),
+          0
+        );
+        return Math.round(sum * 100) / 100;
+      },
       openPaymentTerms(index) {
         this.currentRowIndex = index;
         this.$refs.receiveTermsDialogRef.open();

+ 19 - 10
src/views/bpm/handleTask/components/saleOrder/accountstatement/accountDetailTable.vue

@@ -265,7 +265,9 @@
     },
     data() {
       return {
-        cacheKeyUrl: 'eom-202608171423-account-detail-table',
+        // 缓存键变更:强制重建列配置,确保「差异数量/差异金额/处置类型/异常状态/异常说明」
+        // 五列处于最右侧的新列顺序在已缓存列设置的审批页也能生效
+        cacheKeyUrl: 'eom-202611171800-account-detail-table',
         // 当前激活的页签:detail=单据明细(可编辑,提交依据),item=物品明细(只读汇总)
         activeTab: 'detail',
         isTaxRate: 0,
@@ -491,19 +493,12 @@
             slot: 'diffAmount'
           },
           {
-            minWidth: 150,
+            minWidth: 200,
             prop: 'exceptionDetermine',
             label: '处置类型',
             align: 'center',
             slot: 'exceptionDetermine'
           },
-          {
-            minWidth: 100,
-            prop: 'exceptionStatus',
-            label: '异常状态',
-            align: 'center',
-            slot: 'exceptionStatus'
-          },
           {
             minWidth: 180,
             prop: 'exceptionRemark',
@@ -511,6 +506,13 @@
             align: 'center',
             slot: 'exceptionRemark'
           },
+          {
+            minWidth: 100,
+            prop: 'exceptionStatus',
+            label: '异常状态',
+            align: 'center',
+            slot: 'exceptionStatus'
+          },
         ]
       },
       // 物品明细表的 cacheKey:与主表列配置隔离,避免两张表互相覆盖
@@ -730,7 +732,14 @@
         const purchase = this.queryDimension == 3;
         const map = purchase
           ? { 1: '多收', 2: '少收', 3: '错收', 5: '质量不良', 6: '丢失', 9: '不处置' }
-          : { 1: '多发', 2: '少发', 3: '错发', 5: '质量不良', 6: '丢失', 9: '不处置' };
+          : {
+              1: '多发·退回成品仓',
+              2: '少发·补发',
+              3: '错发·退回后重发',
+              5: '质量不良·退回不良品仓',
+              6: '丢失·报损核销',
+              9: '不处置'
+            };
         return map[code] || code;
       },
       // 数值收敛到 4 位小数

+ 127 - 1
src/views/bpm/handleTask/components/saleOrder/accountstatement/receivableInfo.vue

@@ -95,6 +95,70 @@
           </el-form-item>
         </template>
 
+        <template v-slot:amountDiff="scope">
+          <el-input
+            v-model="scope.row.amountDiff"
+            type="number"
+            :min="0"
+            disabled
+            placeholder="0"
+          />
+        </template>
+
+        <template v-slot:dealType="scope">
+          <el-select
+            v-model="scope.row.dealType"
+            placeholder="请选择"
+            class="ele-block"
+            disabled
+          >
+            <el-option
+              v-for="item in dealTypeOp"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
+        </template>
+
+        <template v-slot:offsetMode="scope">
+          <el-select
+            v-if="scope.row.dealType === 3"
+            v-model="scope.row.offsetMode"
+            placeholder="请选择"
+            class="ele-block"
+            disabled
+          >
+            <el-option
+              v-for="item in offsetModeOp"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
+          <span v-else class="ele-block diff-direction-empty">-</span>
+        </template>
+
+        <template v-slot:offsetRef="scope">
+          <el-tag
+            v-if="scope.row.dealType === 3 && isWriteoffMode(scope.row.offsetMode) && (scope.row.writeoffList || []).length"
+            size="mini"
+            type="success"
+          >
+            已选{{ (scope.row.writeoffList || []).length }}张/合计{{ sumWriteoff(scope.row) }}
+          </el-tag>
+          <span v-else>-</span>
+        </template>
+
+        <template v-slot:exceptionRemark="scope">
+          <el-input
+            v-model="scope.row.exceptionRemark"
+            type="textarea"
+            :autosize="{ minRows: 1, maxRows: 3 }"
+            disabled
+          />
+        </template>
+
         <template v-slot:action="scope">
           <el-link
             v-if="!isView"
@@ -146,10 +210,25 @@
     },
     data() {
       return {
-        cacheKeyUrl: 'eom-202608171425-account-receivable-table',
+        // 缓存键变更:强制重建列配置,确保「差异汇总金额」「异常处理」「冲抵处置方式」「冲抵单据」「异常说明」五列在审批页显示
+        cacheKeyUrl: 'wt-202611172100-account-receivable-table',
         paymentTypeOp,
         transactionMethodsOp,
         paymentStatusOp: paymentStatus,
+        // 金额差异异常处理类型(与后端 FinStatDealTypeEnum 一致)
+        dealTypeOp: [
+          { value: 1, label: '收款' },
+          { value: 2, label: '退款' },
+          { value: 3, label: '冲抵下期' },
+          { value: 4, label: '不处置' }
+        ],
+        // 冲抵处置方式(与后端 FinOffsetModeEnum 一致)
+        offsetModeOp: [
+          { value: 1, label: '借向结转(应补未补)' },
+          { value: 2, label: '贷向结转(应退未退)' },
+          { value: 3, label: '核销冲抵单据(借向)' },
+          { value: 4, label: '核销冲抵单据(贷向)' }
+        ],
         rules: {},
         // 本地维护的应收明细,避免每次编辑都同步回父组件
         localList: [],
@@ -241,6 +320,41 @@
             label: '累计应收金额',
             align: 'center',
             showOverflowTooltip: true
+          },
+          {
+            minWidth: 140,
+            prop: 'amountDiff',
+            label: '差异汇总金额',
+            align: 'center',
+            slot: 'amountDiff'
+          },
+          {
+            minWidth: 160,
+            prop: 'dealType',
+            label: '异常处理',
+            align: 'center',
+            slot: 'dealType'
+          },
+          {
+            minWidth: 180,
+            prop: 'offsetMode',
+            label: '冲抵处置方式',
+            align: 'center',
+            slot: 'offsetMode'
+          },
+          {
+            minWidth: 220,
+            prop: 'writeoffList',
+            label: '冲抵单据',
+            align: 'center',
+            slot: 'offsetRef'
+          },
+          {
+            minWidth: 160,
+            prop: 'exceptionRemark',
+            label: '异常说明',
+            align: 'center',
+            slot: 'exceptionRemark'
           }
         ]
       };
@@ -287,6 +401,18 @@
       }
     },
     methods: {
+      // 是否核销模式(3核销借向 / 4核销贷向)
+      isWriteoffMode(mode) {
+        return mode === 3 || mode === 4;
+      },
+      // 已选冲抵金额合计
+      sumWriteoff(row) {
+        const sum = (row.writeoffList || []).reduce(
+          (pre, cur) => pre + (+cur.writeoffAmt || 0),
+          0
+        );
+        return Math.round(sum * 100) / 100;
+      },
       openReceiveTerms(index) {
         this.currentRowIndex = index;
         this.$refs.receiveTermsDialogRef.open();