lilei hace 10 meses
padre
commit
47315eb59d
Se han modificado 1 ficheros con 22 adiciones y 19 borrados
  1. 22 19
      src/views/financialManagement/financialCollection/detail.vue

+ 22 - 19
src/views/financialManagement/financialCollection/detail.vue

@@ -13,24 +13,24 @@
         </template>
       </a-page-header>
       <a-card :bordered="false" class="financialCollectionAddcont" v-show="showDetail">
-         <a-descriptions :column="{ xs: 2, sm: 3, md: 3}" v-if="detailData" ref="tableSearch">
-           <a-descriptions-item label="创建时间">{{ detailData&&detailData.createDate || '--' }}</a-descriptions-item>
-           <a-descriptions-item label="收款单号">
-             {{ detailData&&detailData.bookNo || '--' }}
-           </a-descriptions-item>
-           <a-descriptions-item label="申请人">{{ detailData&&detailData.applyPersonName || '--' }}</a-descriptions-item>
-           <a-descriptions-item label="审核时间">{{ detailData&&detailData.auditDate || '--' }}</a-descriptions-item>
-           <a-descriptions-item span="2" label="收款事由">{{ detailData&&detailData.bookReason || '--' }}</a-descriptions-item>
-           <a-descriptions-item label="状态">{{ detailData&&detailData.statusDictValue || '--' }}</a-descriptions-item>
-           <a-descriptions-item label="付款方类型">{{ detailData&&detailData.payerTypeDictValue || '--' }}</a-descriptions-item>
-           <a-descriptions-item label="付款方">{{ detailData&&detailData.payerName || '--' }}</a-descriptions-item>
-           <a-descriptions-item label="备注" :span="3">{{ detailData&&detailData.remarks||'--' }}</a-descriptions-item>
-           <a-descriptions-item label="附件" :span="3">
-             <a target="_blank" style="color: #00aaff;text-decoration: underline;margin-right: 15px;" :href="item.filePath" v-for="item in detailData.attachmentList" :key="item.id">
-               {{ item.fileName }}
-             </a>
-           </a-descriptions-item>
-         </a-descriptions>
+        <a-descriptions :column="{ xs: 2, sm: 3, md: 3}" v-if="detailData" ref="tableSearch">
+          <a-descriptions-item label="创建时间">{{ detailData&&detailData.createDate || '--' }}</a-descriptions-item>
+          <a-descriptions-item label="收款单号">
+            {{ detailData&&detailData.bookNo || '--' }}
+          </a-descriptions-item>
+          <a-descriptions-item label="申请人">{{ detailData&&detailData.applyPersonName || '--' }}</a-descriptions-item>
+          <a-descriptions-item label="审核时间">{{ detailData&&detailData.auditDate || '--' }}</a-descriptions-item>
+          <a-descriptions-item span="2" label="收款事由">{{ detailData&&detailData.bookReason || '--' }}</a-descriptions-item>
+          <a-descriptions-item label="状态">{{ detailData&&detailData.statusDictValue || '--' }}</a-descriptions-item>
+          <a-descriptions-item label="付款方类型">{{ detailData&&detailData.payerTypeDictValue || '--' }}</a-descriptions-item>
+          <a-descriptions-item label="付款方">{{ detailData&&detailData.payerName || '--' }}</a-descriptions-item>
+          <a-descriptions-item label="备注" :span="3">{{ detailData&&detailData.remarks||'--' }}</a-descriptions-item>
+          <a-descriptions-item label="附件" :span="3">
+            <a target="_blank" style="color: #00aaff;text-decoration: underline;margin-right: 15px;" :href="item.filePath" v-for="item in detailData.attachmentList" :key="item.id">
+              {{ item.fileName }}
+            </a>
+          </a-descriptions-item>
+        </a-descriptions>
       </a-card>
       <!-- 财务明细 -->
       <a-card :bordered="false" size="small" class="financialCollectionAddcont" v-if="$route.params.sn||bookSn">
@@ -46,7 +46,9 @@
             收款金额合计 {{ toThousands(detailData.receiptTotalAmount ||0) }},
             使用授信合计 {{ toThousands(detailData.useTotalAmount||0) }},
             授信还款合计 {{ toThousands(detailData.payTotalAmount||0) }},
-            余款抵扣合计 {{ toThousands(detailData.balanceTotalAmount||0) }}
+            余款抵扣合计 {{ toThousands(detailData.balanceTotalAmount||0) }},
+            跨月打款合计 {{ toThousands(detailData.nextMonthTotalAmount||0) }},
+            特殊申请发货合计 {{ toThousands(detailData.specialTotalAmount||0) }}
           </div>
         </a-alert>
         <!-- 列表 -->
@@ -141,6 +143,7 @@ export default {
         { title: '授信还款', dataIndex: 'payTotalAmount', align: 'right', width: '5%', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') },
         { title: '余款抵扣', dataIndex: 'balanceAmount', align: 'right', width: '5%', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') },
         { title: '跨月打款', dataIndex: 'nextMonthAmount', align: 'right', width: '5%', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') },
+        { title: '特殊申请发货', dataIndex: 'specialSendAmount', width: '5%', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') },
         { title: '户名', dataIndex: 'bankAccount', align: 'center', width: '8%', customRender: function (text) { return text || '--' } },
         { title: '汇入银行', dataIndex: 'bankName', align: 'center', width: '8%', customRender: function (text) { return text || '--' } },
         { title: '足额打款', dataIndex: 'fullPaymentFlagDictValue', align: 'center', width: '5%', customRender: function (text) { return (text == 0 || text) ? text : '--' } },