Merge branch 'master' of http://git.keao.tech/SupplyChain/front

front-vue/src/views/service/bill/addBill.vue

@@ -247,7 +247,7 @@
         </div>
     </el-row>
     <el-row class="zap-margin-top">
-        <el-row class="zap-title" type="flex" align="middle"><span class="zap-title__prefix"></span>合同附件</el-row>
+        <el-row class="zap-title" type="flex" align="middle"><span class="zap-title__prefix"></span>贸易合同</el-row>
         <div class="zap-form" style="padding-bottom: 20px">
             <el-upload :file-list="contractList" :auto-upload="true" :http-request="httpRequestContract" action="" ref="contractUpload" list-type="picture-card" accept=".jpg,.jpeg,.png" :before-upload="beforeUpload" :on-preview="invoicePictureCardPreview" :before-remove="beforeRemove" :on-remove="handleRemoveContract">
                 <!-- 触发文件选择框的内容 -->
@@ -429,7 +429,7 @@ export default {
             },
             //类型
             type: "00",
-            //合同附件
+            //贸易合同
             contractList: [],
             //物流附件
             logisticsList: [],
@@ -825,7 +825,7 @@ export default {
             }
             return a;
         },
-        //删除合同附件
+        //删除贸易合同
         handleRemoveContract(file, fileList) {
             var self = this;
             if (this.contractList) {

front-vue/src/views/service/bill/billAdd.vue

@@ -267,7 +267,7 @@
         </div>
     </el-row>
     <el-row class="zap-margin-top">
-        <div class="zap-title">合同附件</div>
+        <div class="zap-title">贸易合同</div>
         <div class="zap-form" style="padding-bottom: 20px;">
             <el-form ref="contract" label-width="auto" :inline="true">
             </el-form>
@@ -434,7 +434,7 @@ export default {
             },
             //类型
             type: "00",
-            //合同附件
+            //贸易合同
             contractList: [],
             //物流附件
             logisticsList: [],
@@ -835,7 +835,7 @@ export default {
             }
             return a;
         },
-        //删除合同附件
+        //删除贸易合同
         handleRemoveContract(file, fileList) {
             var self = this;
             if (this.contractList) {

front-vue/src/views/service/bill/billDetail.vue

@@ -142,7 +142,7 @@
         </div>
     </el-row>
      <el-row class="zap-margin-top">
-        <div class="zap-title">合同附件</div>
+        <div class="zap-title">贸易合同</div>
         <div class="zap-form" style="padding-bottom: 20px;">
             <el-upload :disabled="true" :file-list="contractList" :auto-upload="false" action="" ref="contractUpload" list-type="picture-card" :on-preview="invoicePictureCardPreview">
             </el-upload>
@@ -205,7 +205,7 @@ export default {
             active: 0,
             //类型
             type: "00",
-            //合同附件
+            //贸易合同
             contractList: [],
             //物流附件
             logisticsList: [],

front-vue/src/views/service/bill/billEdit.vue

@@ -301,7 +301,7 @@
         </div>
     </el-row>
     <el-row class="zap-margin-top">
-        <div class="zap-title">合同附件</div>
+        <div class="zap-title">贸易合同</div>
         <div class="zap-form" style="padding-bottom: 20px;">
             <el-form ref="contract" label-width="auto" :inline="true">
             </el-form>
@@ -468,7 +468,7 @@ export default {
             },
             //类型
             type: "00",
-            //合同附件
+            //贸易合同
             contractList: [],
             //物流附件
             logisticsList: [],
@@ -904,7 +904,7 @@ export default {
             }
             return a;
         },
-        //删除合同附件
+        //删除贸易合同
         handleRemoveContract(file, fileList) {
             var self = this;
             // if (self.contractList) {

front-vue/src/views/service/company/detailCompany.vue

@@ -241,14 +241,14 @@
                 <span v-else>{{companyTypeFormat(scope.row.launchScrLaunchType)}}</span>
               </template>
             </el-table-column>
-            <el-table-column label="联系人" align="center" prop="launchScrContarct"></el-table-column>
-            <el-table-column label="联系电话" align="center" prop="launchScrContarctPhone"></el-table-column>
+            <!-- <el-table-column label="联系人" align="center" prop="launchScrContarct"></el-table-column> -->
+            <!-- <el-table-column label="联系电话" align="center" prop="launchScrContarctPhone"></el-table-column>
             <el-table-column
               label="邮箱"
               align="center"
               prop="launchScrContarctEmail"
               show-overflow-tooltip
-            ></el-table-column>
+            ></el-table-column> -->
             <el-table-column
               label="状态"
               align="center"

front-vue/src/views/service/company/detailCompanyExam.vue

@@ -161,12 +161,12 @@
                         <span v-else>{{companyTypeFormat(scope.row.launchScrLaunchType)}}</span>
                     </template>
                 </el-table-column>
-                <el-table-column label="联系人" align="center" prop="launchScrContarct">
+                <!-- <el-table-column label="联系人" align="center" prop="launchScrContarct">
                 </el-table-column>
                 <el-table-column label="联系电话" align="center" prop="launchScrContarctPhone">
                 </el-table-column>
                 <el-table-column label="邮箱" align="center" prop="launchScrContarctEmail" show-overflow-tooltip>
-                </el-table-column>
+                </el-table-column> -->
                 <el-table-column label="状态" align="center" prop="launchScrStatus" :formatter="launchScrStatusFormat">
                 </el-table-column>
             </el-table>

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">

front-vue/src/views/service/rel/companyRel.vue

@@ -189,7 +189,7 @@
                   <span v-if="scope.row.spare">{{companyTypeFormat(scope.row.scpType)}}</span>
                 </template>
               </el-table-column>
-              <el-table-column
+              <!-- <el-table-column
                 label="联系人"
                 align="center"
                 prop="scpContarct"
@@ -207,7 +207,7 @@
                 prop="scpContarctEmail"
                 v-if="uncheckList.scpContarctEmail"
                 show-overflow-tooltip
-              ></el-table-column>
+              ></el-table-column> -->
               <el-table-column
                 label="链属状态"
                 align="center"
@@ -305,26 +305,23 @@
               <el-table-column
                 label="企业名称"
                 align="center"
-                width="202"
                 prop="scpName"
                 show-overflow-tooltip
               />
               <el-table-column
                 label="社会统一代码"
                 align="center"
-                width="151"
                 prop="scpSocialCode"
                 show-overflow-tooltip
               />
               <el-table-column
                 label="链属关系"
                 align="center"
-                width="91"
                 prop="scpType"
                 :formatter="scpTypeFormat"
               />
-              <el-table-column label="联系人" align="center" width="83" prop="scpContarct" />
-              <el-table-column
+              <!-- <el-table-column label="联系人" align="center" width="83" prop="scpContarct" /> -->
+              <!-- <el-table-column
                 label="联系电话"
                 align="center"
                 width="109"
@@ -337,11 +334,10 @@
                 width="187"
                 prop="scpContarctEmail"
                 show-overflow-tooltip
-              />
+              /> -->
               <el-table-column
                 label="状态"
                 align="center"
-                width="80"
                 prop="scpStatus"
                 :formatter="scpStatusFormat"
               />
@@ -349,7 +345,6 @@
                 label="操作"
                 align="center"
                 class-name="small-padding fixed-width"
-                width="150"
               >
                 <template slot-scope="scope">
                   <el-button
@@ -683,18 +678,18 @@ export default {
           label: "companyType",
           value: "链属关系"
         },
-        {
-          label: "scpContarct",
-          value: "联系人"
-        },
-        {
-          label: "scpContarctPhone",
-          value: "联系电话"
-        },
-        {
-          label: "scpContarctEmail",
-          value: "邮箱"
-        },
+        // {
+        //   label: "scpContarct",
+        //   value: "联系人"
+        // },
+        // {
+        //   label: "scpContarctPhone",
+        //   value: "联系电话"
+        // },
+        // {
+        //   label: "scpContarctEmail",
+        //   value: "邮箱"
+        // },
         {
           label: "launchScrStatus",
           value: "链属状态"

front-vue/src/views/service/rel/companyRelManage.vue

@@ -196,25 +196,25 @@
                 <span v-if="scope.row.spare">{{launchScrReceiveTypeFormat(scope.row.scpType)}}</span>
               </template>
             </el-table-column>
-            <el-table-column
+            <!-- <el-table-column
               label="联系人"
               align="center"
               prop="scpContarct"
               v-if="uncheckList.scpContarct"
-            ></el-table-column>
-            <el-table-column
+            ></el-table-column> -->
+            <!-- <el-table-column
               label="联系电话"
               align="center"
               prop="scpContarctPhone"
               v-if="uncheckList.scpContarctPhone"
-            ></el-table-column>
-            <el-table-column
+            ></el-table-column> -->
+            <!-- <el-table-column
               label="邮箱"
               align="center"
               prop="scpContarctEmail"
               v-if="uncheckList.scpContarctEmail"
               show-overflow-tooltip
-            ></el-table-column>
+            ></el-table-column> -->
             <el-table-column
               label="链属状态"
               align="center"
@@ -282,8 +282,8 @@
               prop="scpType"
               :formatter="scpTypeFormat"
             />
-            <el-table-column label="联系人" align="center" width="100px" prop="scpContarct" />
-            <el-table-column
+            <!-- <el-table-column label="联系人" align="center" width="100px" prop="scpContarct" /> -->
+            <!-- <el-table-column
               label="联系电话"
               align="center"
               width="100px"
@@ -295,7 +295,7 @@
               align="center"
               prop="scpContarctEmail"
               show-overflow-tooltip
-            />
+            /> -->
             <el-table-column
               label="状态"
               align="center"
@@ -554,18 +554,18 @@ export default {
           label: "launchScrReceiveType",
           value: "链属关系(接收方)"
         },
-        {
-          label: "scpContarct",
-          value: "联系人"
-        },
-        {
-          label: "scpContarctPhone",
-          value: "联系电话"
-        },
-        {
-          label: "scpContarctEmail",
-          value: "邮箱"
-        },
+        // {
+        //   label: "scpContarct",
+        //   value: "联系人"
+        // },
+        // {
+        //   label: "scpContarctPhone",
+        //   value: "联系电话"
+        // },
+        // {
+        //   label: "scpContarctEmail",
+        //   value: "邮箱"
+        // },
         {
           label: "launchScrStatus",
           value: "链属状态"