优化显示

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

@@ -817,14 +817,16 @@
           <el-table-column label="融信产品" align="center" prop="zfpName"   :show-overflow-tooltip="true"/>
           <el-table-column label="融信金额" align="center" :formatter="moneyFormat" prop="zfiAmount" :show-overflow-tooltip="true" />
           <el-table-column label="融信利率(%)" align="center" width="100px;" prop="zfiRate" :show-overflow-tooltip="true"/>
-          <el-table-column label="签发有效期" align="center" width="100px;" prop="zfiEffectiveDate" :show-overflow-tooltip="true" />
+          <!-- <el-table-column label="签发有效期" align="center" width="100px;" prop="zfiEffectiveDate" :show-overflow-tooltip="true" /> -->
           <el-table-column label="承诺还款日" align="center" width="100px;" prop="zfiExpireDate" :show-overflow-tooltip="true" />
           <el-table-column label="签收日期" align="center" prop="zfiSignDate" :show-overflow-tooltip="true" />
           <el-table-column label="承诺函编号" align="center" width="100px;" prop="zfiPaymentNumber" :show-overflow-tooltip="true"/>
-          <el-table-column label="融资方审批状态" :formatter="supplierStatusFormat"  align="center" width="110px;" prop="zfiSupplierStatus" :show-overflow-tooltip="true" v-if="this.companyType == '02' || this.companyType == '00'"/>
+          <el-table-column label="融资方审批状态" :formatter="supplierStatusFormat"  align="center" width="110px;" prop="zfiSupplierStatus" :show-overflow-tooltip="true" v-if=" this.companyType == '00'"/>
           <el-table-column label="平台审批状态" :formatter="platformStatusFormat"  align="center" width="100px;" prop="zfiPlatformStatus" :show-overflow-tooltip="true"  v-if="this.companyType == '00'"/>
-          <el-table-column label="核心审批状态" :formatter="coreStatusFormat" align="center" width="100px;" prop="zfiCoreStatus" :show-overflow-tooltip="true"  v-if="this.companyType == '01' || this.companyType == '00'"/>
-          <el-table-column label="状态" :formatter="stateFormat" align="center" prop="zfiStatus" :show-overflow-tooltip="true" />
+          <el-table-column label="核心审批状态" :formatter="coreStatusFormat" align="center" width="100px;" prop="zfiCoreStatus" :show-overflow-tooltip="true"  v-if=" this.companyType == '00'"/>
+          <el-table-column label="内部审批状态" :formatter="supplierStatusFormat"  align="center" width="110px;" prop="zfiSupplierStatus" :show-overflow-tooltip="true" v-if=" this.companyType == '02'"/>
+          <el-table-column label="内部审批状态" :formatter="coreStatusFormat" align="center" width="100px;" prop="zfiCoreStatus" :show-overflow-tooltip="true"  v-if=" this.companyType == '01'"/>
+          <el-table-column label="融信状态" :formatter="stateFormat" align="center" prop="zfiStatus" :show-overflow-tooltip="true" />
           <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width='300' fixed="right" >
             <template slot-scope="scope">
               <el-button
@@ -984,14 +986,16 @@
           <el-table-column label="融信产品" align="center" prop="zfpName"   :show-overflow-tooltip="true"/>
           <el-table-column label="融信金额" align="center" :formatter="moneyFormat" prop="zfiAmount" :show-overflow-tooltip="true" />
           <el-table-column label="融信利率(%)" align="center" width="100px;" prop="zfiRate" :show-overflow-tooltip="true"/>
-          <el-table-column label="签发有效期" align="center" width="100px;" prop="zfiEffectiveDate" :show-overflow-tooltip="true" />
+         <!--  <el-table-column label="签发有效期" align="center" width="100px;" prop="zfiEffectiveDate" :show-overflow-tooltip="true" /> -->
           <el-table-column label="承诺还款日" align="center" width="100px;" prop="zfiExpireDate" :show-overflow-tooltip="true" />
           <el-table-column label="签收日期" align="center" prop="zfiSignDate" :show-overflow-tooltip="true" />
           <el-table-column label="承诺函编号" align="center" width="100px;" prop="zfiPaymentNumber" :show-overflow-tooltip="true"/>
-          <el-table-column label="融资方审批状态" :formatter="supplierStatusFormat"  align="center" width="110px;" prop="zfiSupplierStatus" :show-overflow-tooltip="true" v-if="this.companyType == '02' || this.companyType == '00'"/>
+          <el-table-column label="融资方审批状态" :formatter="supplierStatusFormat"  align="center" width="110px;" prop="zfiSupplierStatus" :show-overflow-tooltip="true" v-if=" this.companyType == '00'"/>
           <el-table-column label="平台审批状态" :formatter="platformStatusFormat"  align="center" width="100px;" prop="zfiPlatformStatus" :show-overflow-tooltip="true"  v-if="this.companyType == '00'"/>
-          <el-table-column label="核心审批状态" :formatter="coreStatusFormat" align="center" width="100px;" prop="zfiCoreStatus" :show-overflow-tooltip="true"  v-if="this.companyType == '01' || this.companyType == '00'"/>
-          <el-table-column label="状态" :formatter="stateFormat" align="center" prop="zfiStatus" :show-overflow-tooltip="true" />
+          <el-table-column label="核心审批状态" :formatter="coreStatusFormat" align="center" width="100px;" prop="zfiCoreStatus" :show-overflow-tooltip="true"  v-if=" this.companyType == '00'"/>
+          <el-table-column label="内部审批状态" :formatter="supplierStatusFormat"  align="center" width="110px;" prop="zfiSupplierStatus" :show-overflow-tooltip="true" v-if=" this.companyType == '02'"/>
+          <el-table-column label="内部审批状态" :formatter="coreStatusFormat" align="center" width="100px;" prop="zfiCoreStatus" :show-overflow-tooltip="true"  v-if=" this.companyType == '01'"/>
+          <el-table-column label="融信状态" :formatter="stateFormat" align="center" prop="zfiStatus" :show-overflow-tooltip="true" />
           <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width='300' fixed="right" >
             <template slot-scope="scope">
               <el-button
@@ -1150,14 +1154,16 @@
           <el-table-column label="融信产品" align="center" prop="zfpName"   :show-overflow-tooltip="true"/>
           <el-table-column label="融信金额" align="center" :formatter="moneyFormat" prop="zfiAmount" :show-overflow-tooltip="true" />
           <el-table-column label="融信利率(%)" align="center" width="100px;" prop="zfiRate" :show-overflow-tooltip="true" />
-          <el-table-column label="签发有效期" align="center" width="100px;" prop="zfiEffectiveDate" :show-overflow-tooltip="true" />
+         <!--  <el-table-column label="签发有效期" align="center" width="100px;" prop="zfiEffectiveDate" :show-overflow-tooltip="true" /> -->
           <el-table-column label="承诺还款日" align="center" width="100px;" prop="zfiExpireDate" :show-overflow-tooltip="true"/>
           <el-table-column label="签收日期" align="center" prop="zfiSignDate" :show-overflow-tooltip="true" />
           <el-table-column label="承诺函编号" align="center" width="100px;" prop="zfiPaymentNumber" :show-overflow-tooltip="true" />
-          <el-table-column label="融资方审批状态" :formatter="supplierStatusFormat"  align="center" width="110px;" prop="zfiSupplierStatus" :show-overflow-tooltip="true" v-if="this.companyType == '02' || this.companyType == '00'"/>
+           <el-table-column label="融资方审批状态" :formatter="supplierStatusFormat"  align="center" width="110px;" prop="zfiSupplierStatus" :show-overflow-tooltip="true" v-if=" this.companyType == '00'"/>
           <el-table-column label="平台审批状态" :formatter="platformStatusFormat"  align="center" width="100px;" prop="zfiPlatformStatus" :show-overflow-tooltip="true"  v-if="this.companyType == '00'"/>
-          <el-table-column label="核心审批状态" :formatter="coreStatusFormat" align="center" width="100px;" prop="zfiCoreStatus" :show-overflow-tooltip="true"  v-if="this.companyType == '01' || this.companyType == '00'"/>
-          <el-table-column label="状态" :formatter="stateFormat" align="center" prop="zfiStatus" :show-overflow-tooltip="true"/>
+          <el-table-column label="核心审批状态" :formatter="coreStatusFormat" align="center" width="100px;" prop="zfiCoreStatus" :show-overflow-tooltip="true"  v-if=" this.companyType == '00'"/>
+          <el-table-column label="内部审批状态" :formatter="supplierStatusFormat"  align="center" width="110px;" prop="zfiSupplierStatus" :show-overflow-tooltip="true" v-if=" this.companyType == '02'"/>
+          <el-table-column label="内部审批状态" :formatter="coreStatusFormat" align="center" width="100px;" prop="zfiCoreStatus" :show-overflow-tooltip="true"  v-if=" this.companyType == '01'"/>
+          <el-table-column label="融信状态" :formatter="stateFormat" align="center" prop="zfiStatus" :show-overflow-tooltip="true"/>
           <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width='300' fixed="right" >
             <template slot-scope="scope">
               <el-button
@@ -1316,14 +1322,16 @@
           <el-table-column label="融信产品" align="center" prop="zfpName"   :show-overflow-tooltip="true"/>
           <el-table-column label="融信金额" align="center" :formatter="moneyFormat" prop="zfiAmount" :show-overflow-tooltip="true" />
           <el-table-column label="融信利率(%)" align="center" width="100px;" prop="zfiRate" :show-overflow-tooltip="true" />
-          <el-table-column label="签发有效期" align="center" width="100px;" prop="zfiEffectiveDate" :show-overflow-tooltip="true" />
+         <!--  <el-table-column label="签发有效期" align="center" width="100px;" prop="zfiEffectiveDate" :show-overflow-tooltip="true" /> -->
           <el-table-column label="承诺还款日" align="center" width="100px;" prop="zfiExpireDate" :show-overflow-tooltip="true"/>
           <el-table-column label="签收日期" align="center" prop="zfiSignDate" :show-overflow-tooltip="true" />
           <el-table-column label="承诺函编号" align="center" width="100px;" prop="zfiPaymentNumber" :show-overflow-tooltip="true" />
-          <el-table-column label="融资方审批状态" :formatter="supplierStatusFormat"  align="center" width="110px;" prop="zfiSupplierStatus" :show-overflow-tooltip="true" v-if="this.companyType == '02' || this.companyType == '00'"/>
+          <el-table-column label="融资方审批状态" :formatter="supplierStatusFormat"  align="center" width="110px;" prop="zfiSupplierStatus" :show-overflow-tooltip="true" v-if=" this.companyType == '00'"/>
           <el-table-column label="平台审批状态" :formatter="platformStatusFormat"  align="center" width="100px;" prop="zfiPlatformStatus" :show-overflow-tooltip="true"  v-if="this.companyType == '00'"/>
-          <el-table-column label="核心审批状态" :formatter="coreStatusFormat" align="center" width="100px;" prop="zfiCoreStatus" :show-overflow-tooltip="true"  v-if="this.companyType == '01' || this.companyType == '00'"/>
-          <el-table-column label="状态" :formatter="stateFormat" align="center" prop="zfiStatus" :show-overflow-tooltip="true"/>
+          <el-table-column label="核心审批状态" :formatter="coreStatusFormat" align="center" width="100px;" prop="zfiCoreStatus" :show-overflow-tooltip="true"  v-if=" this.companyType == '00'"/>
+          <el-table-column label="内部审批状态" :formatter="supplierStatusFormat"  align="center" width="110px;" prop="zfiSupplierStatus" :show-overflow-tooltip="true" v-if=" this.companyType == '02'"/>
+          <el-table-column label="内部审批状态" :formatter="coreStatusFormat" align="center" width="100px;" prop="zfiCoreStatus" :show-overflow-tooltip="true"  v-if=" this.companyType == '01'"/>
+          <el-table-column label="融信状态" :formatter="stateFormat" align="center" prop="zfiStatus" :show-overflow-tooltip="true"/>
           <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width='300' fixed="right" >
             <template slot-scope="scope">
               <el-button
@@ -1487,14 +1495,16 @@
           <el-table-column label="融信产品" align="center" prop="zfpName"   :show-overflow-tooltip="true"/>
           <el-table-column label="融信金额" align="center" :formatter="moneyFormat" prop="zfiAmount" :show-overflow-tooltip="true" />
           <el-table-column label="融信利率(%)" align="center" width="100px;" prop="zfiRate" :show-overflow-tooltip="true" />
-          <el-table-column label="签发有效期" align="center" width="100px;" prop="zfiEffectiveDate" :show-overflow-tooltip="true" />
+         <!--  <el-table-column label="签发有效期" align="center" width="100px;" prop="zfiEffectiveDate" :show-overflow-tooltip="true" /> -->
           <el-table-column label="承诺还款日" align="center" width="100px;" prop="zfiExpireDate" :show-overflow-tooltip="true"/>
           <el-table-column label="签收日期" align="center" prop="zfiSignDate" :show-overflow-tooltip="true" />
           <el-table-column label="承诺函编号" align="center" width="100px;" prop="zfiPaymentNumber" :show-overflow-tooltip="true" />
-          <el-table-column label="融资方审批状态" :formatter="supplierStatusFormat"  align="center" width="110px;" prop="zfiSupplierStatus" :show-overflow-tooltip="true" v-if="this.companyType == '02' || this.companyType == '00'"/>
+          <el-table-column label="融资方审批状态" :formatter="supplierStatusFormat"  align="center" width="110px;" prop="zfiSupplierStatus" :show-overflow-tooltip="true" v-if=" this.companyType == '00'"/>
           <el-table-column label="平台审批状态" :formatter="platformStatusFormat"  align="center" width="100px;" prop="zfiPlatformStatus" :show-overflow-tooltip="true"  v-if="this.companyType == '00'"/>
-          <el-table-column label="核心审批状态" :formatter="coreStatusFormat" align="center" width="100px;" prop="zfiCoreStatus" :show-overflow-tooltip="true"  v-if="this.companyType == '01' || this.companyType == '00'"/>
-          <el-table-column label="状态" :formatter="stateFormat" align="center" prop="zfiStatus" :show-overflow-tooltip="true"/>
+          <el-table-column label="核心审批状态" :formatter="coreStatusFormat" align="center" width="100px;" prop="zfiCoreStatus" :show-overflow-tooltip="true"  v-if=" this.companyType == '00'"/>
+          <el-table-column label="内部审批状态" :formatter="supplierStatusFormat"  align="center" width="110px;" prop="zfiSupplierStatus" :show-overflow-tooltip="true" v-if=" this.companyType == '02'"/>
+          <el-table-column label="内部审批状态" :formatter="coreStatusFormat" align="center" width="100px;" prop="zfiCoreStatus" :show-overflow-tooltip="true"  v-if=" this.companyType == '01'"/>
+          <el-table-column label="融信状态" :formatter="stateFormat" align="center" prop="zfiStatus" :show-overflow-tooltip="true"/>
           <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width='300' fixed="right" >
             <template slot-scope="scope">
               <el-button
@@ -1653,14 +1663,16 @@
           <el-table-column label="融信产品" align="center" prop="zfpName"   :show-overflow-tooltip="true"/>
           <el-table-column label="融信金额" align="center" :formatter="moneyFormat" prop="zfiAmount" :show-overflow-tooltip="true" />
           <el-table-column label="融信利率(%)" align="center" width="100px;" prop="zfiRate" :show-overflow-tooltip="true" />
-          <el-table-column label="签发有效期" align="center" width="100px;" prop="zfiEffectiveDate" :show-overflow-tooltip="true" />
+         <!--  <el-table-column label="签发有效期" align="center" width="100px;" prop="zfiEffectiveDate" :show-overflow-tooltip="true" /> -->
           <el-table-column label="承诺还款日" align="center" width="100px;" prop="zfiExpireDate" :show-overflow-tooltip="true"/>
           <el-table-column label="签收日期" align="center" prop="zfiSignDate" :show-overflow-tooltip="true" />
           <el-table-column label="承诺函编号" align="center" width="100px;" prop="zfiPaymentNumber" :show-overflow-tooltip="true" />
-          <el-table-column label="融资方审批状态" :formatter="supplierStatusFormat"  align="center" width="110px;" prop="zfiSupplierStatus" :show-overflow-tooltip="true" v-if="this.companyType == '02' || this.companyType == '00'"/>
+          <el-table-column label="融资方审批状态" :formatter="supplierStatusFormat"  align="center" width="110px;" prop="zfiSupplierStatus" :show-overflow-tooltip="true" v-if=" this.companyType == '00'"/>
           <el-table-column label="平台审批状态" :formatter="platformStatusFormat"  align="center" width="100px;" prop="zfiPlatformStatus" :show-overflow-tooltip="true"  v-if="this.companyType == '00'"/>
-          <el-table-column label="核心审批状态" :formatter="coreStatusFormat" align="center" width="100px;" prop="zfiCoreStatus" :show-overflow-tooltip="true"  v-if="this.companyType == '01' || this.companyType == '00'"/>
-          <el-table-column label="状态" :formatter="stateFormat" align="center" prop="zfiStatus" :show-overflow-tooltip="true"/>
+          <el-table-column label="核心审批状态" :formatter="coreStatusFormat" align="center" width="100px;" prop="zfiCoreStatus" :show-overflow-tooltip="true"  v-if=" this.companyType == '00'"/>
+          <el-table-column label="内部审批状态" :formatter="supplierStatusFormat"  align="center" width="110px;" prop="zfiSupplierStatus" :show-overflow-tooltip="true" v-if=" this.companyType == '02'"/>
+          <el-table-column label="内部审批状态" :formatter="coreStatusFormat" align="center" width="100px;" prop="zfiCoreStatus" :show-overflow-tooltip="true"  v-if=" this.companyType == '01'"/>
+          <el-table-column label="融信状态" :formatter="stateFormat" align="center" prop="zfiStatus" :show-overflow-tooltip="true"/>
           <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width='300' fixed="right" >
             <template slot-scope="scope">
               <el-button

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

@@ -174,8 +174,8 @@
                 <el-form-item label="金额大写" prop="issuedAmount">{{issuedAmount}}</el-form-item>
               </el-col>
             </el-row>
-            <p>请知悉，资产信息仅能接受指定的销售方与购买方的往来账款(含账款基本信息、贸易合同与贸易发票等)；如须使用系统尚未维护的往来账款，请点击新增应付账款
-            </p>
+            <!-- <p>请知悉，资产信息仅能接受指定的销售方与购买方的往来账款(含账款基本信息、贸易合同与贸易发票等)；如须使用系统尚未维护的往来账款，请点击新增应付账款
+            </p> -->
           </el-row>
         </el-form>
         <el-row style="height: 109px;" type="flex" align="middle" justify="center">