Merge remote-tracking branch 'origin/master'

front-vue/src/views/service/credit/credit.vue

@@ -157,9 +157,10 @@
       <el-table-column label="融信产品" align="center" prop="zfpName"   v-if="uncheckList.zfpName" :show-overflow-tooltip="true"/>
       <el-table-column label="融信金额" align="center" :formatter="moneyFormat" prop="zfiAmount" :show-overflow-tooltip="true" v-if="uncheckList.zfiAmount"/>
       <el-table-column label="融信利率(%)" align="center" width="100px;" prop="zfiRate" :show-overflow-tooltip="true" v-if="uncheckList.zfiRate"/>
-      <el-table-column label="签发有效期" align="center" prop="zfiEffectiveDate" :show-overflow-tooltip="true" v-if="uncheckList.zfiEffectiveDate"/>
-      <el-table-column label="承诺还款日" align="center" prop="zfiExpireDate" :show-overflow-tooltip="true" v-if="uncheckList.zfiExpireDate"/>
+      <el-table-column label="签发有效期" align="center" width="100px;" prop="zfiEffectiveDate" :show-overflow-tooltip="true" v-if="uncheckList.zfiEffectiveDate"/>
+      <el-table-column label="承诺还款日" align="center" width="100px;" prop="zfiExpireDate" :show-overflow-tooltip="true" v-if="uncheckList.zfiExpireDate"/>
       <el-table-column label="签收日期" align="center" prop="zfiSignDate" :show-overflow-tooltip="true" v-if="uncheckList.zfiSignDate"/>
+      <el-table-column label="承诺函编号" align="center" width="100px;" prop="zfiPaymentNumber" :show-overflow-tooltip="true" v-if="uncheckList.zfiPaymentNumber"/>
       <el-table-column label="状态" :formatter="stateFormat" align="center" prop="zfiStatus" :show-overflow-tooltip="true" v-if="uncheckList.zfiStatus"/>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width='300' fixed="right" >
         <template slot-scope="scope">
@@ -388,6 +389,10 @@ export default {
               value: '签收日期'
             },
             {
+              label: 'zfiPaymentNumber',
+              value: '承诺函编号'
+            },
+            {
               label: 'zfiStatus',
               value: '状态'
             }