Преглед изворни кода

Merge branch 'develop_cuxiao' of jianguan-web/jg-ocs-html into pre-release

李磊 пре 1 година
родитељ
комит
779f4e838c

+ 6 - 3
src/views/financialManagement/financialCollection/detail.vue

@@ -11,6 +11,9 @@
         <a-collapse-panel key="1" header="基础信息">
           <a-descriptions :column="{ xs: 2, sm: 3, md: 3}">
             <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>
@@ -36,8 +39,8 @@
         <a-alert type="info" style="margin-bottom:10px" v-if="detailData">
           <div slot="message">
             共 {{ total }} 条,
-            订单金额合计 {{ toThousands(detailData.orderTotalAmount ||0)}},
-            收款金额合计 {{ toThousands(detailData.receiptTotalAmount ||0)}},
+            订单金额合计 {{ toThousands(detailData.orderTotalAmount ||0) }},
+            收款金额合计 {{ toThousands(detailData.receiptTotalAmount ||0) }},
             使用授信合计 {{ toThousands(detailData.useTotalAmount||0) }},
             授信还款合计 {{ toThousands(detailData.payTotalAmount||0) }},
             余款抵扣合计 {{ toThousands(detailData.balanceTotalAmount||0) }}
@@ -165,7 +168,7 @@ export default {
           this.disabled = false
         }
       })
-      this.$nextTick(()=>{
+      this.$nextTick(() => {
         this.$refs.table.refresh(true)
       })
     },

+ 3 - 0
src/views/financialManagement/financialCollection/edit.vue

@@ -14,6 +14,9 @@
           </div>
           <a-descriptions :column="{ xs: 2, sm: 3, md: 3}">
             <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>