Merge remote-tracking branch 'origin/master'

src/views/PolicyDirect/components/policyRecommendation.vue

@@ -726,6 +726,17 @@ export default {
           if (res.code === 200) {
             this.enterpriseNotExist = false
             this.form = res.data
+            if (this.form.address) {
+              // 转换地址
+              var province = this.form.address.slice(0, 4)
+              var city = this.form.address.slice(4, 8)
+              var area = this.form.address.slice(8, this.form.address.length)
+              var address = []
+              address.push(province)
+              address.push(city)
+              address.push(area)
+              this.address = address
+            }
             this.form.fwEnterpriseOperateRelativeList = [
               {
                 year: '2022',

src/views/homePage/components/searchHome/components/header.vue

@@ -25,13 +25,15 @@
       :close-on-click-modal="false"
       :title="dialog.title"
       :visible.sync="dialog.dialogVisible"
-      width="52%"
+      width="40%"
       @close="dialog.dialogVisible=false"
+      :show-close="false"
     >
-      <el-button icon="el-icon-plus" type="primary" size="small" @click="addEnterprise">添加关联企业</el-button>
+      <el-button class="addButton"  type="primary" size="small" @click="addEnterprise"><span class="addspan">添加关联企业</span></el-button>
       <!--         -->
       <el-table
         ref="EnterprisesListRef"
+        :header-cell-style="{background:'#fffeff'}"
         class="dialogTable"
         :data="EnterprisesList"
         :header-cell-class-name="cellClass"
@@ -39,8 +41,12 @@
         @current-change="currentChange"
       >
         <el-table-column label="选择" width="50" type="selection" />
-        <el-table-column align="center" label="企业名称" prop="name" width="380" :show-overflow-tooltip="true" />
-        <el-table-column label="操作" width="300">
+        <el-table-column align="center" label="企业名称" prop="name" width="380" :show-overflow-tooltip="true">
+          <template slot-scope="scope">
+            <span style="color: #333333">{{scope.row.name}}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" width="280">
           <template slot-scope="scope">
             <el-button icon="el-icon-edit" type="text" size="small" @click="updataInfo(scope.row)">完善信息</el-button>
             <el-button icon="el-icon-delete" type="text" size="small" @click="deleteInfo(scope.row)">移除企业
@@ -334,11 +340,36 @@ export default {
 }
 
 .headerDialog {
+  .addButton{
+    margin-top: 1%;
+    width: 128px;
+    height: 36px;
+    .addspan{
+      font-size: 15px;
+      color: #333333 !important;
+    }
+  }
   .dialogTable {
     margin-top: 4%;
   }
+  .dialog-footer {
+    .cancelBtn:hover{
+      background-color: #e8f2fc !important;
+    }
+  }
   ::v-deep .el-table .disabledCheck .cell .el-checkbox__inner {
     display: none !important;
   }
+  ::v-deep .el-dialog {
+    border-radius: 0px !important;
+  }
+  ::v-deep .el-dialog__title {
+    color: #333333;
+  }
+  ::v-deep .el-table {
+    tr td, tr th{
+      border-right: none;
+    }
+  }
 }
 </style>

src/views/personalCenter/components/AffiliatedEnterprises.vue

@@ -49,9 +49,10 @@
             </el-button>
           </el-col>
           <el-col :span="3">
-            <el-button round v-if="this.form.status !==0" class="deleteButton" type="danger" size="small"
+            <el-button round v-if="this.form.status ==='0' || this.form.status === '3' " class="deleteButton" type="danger" size="small"
                        @click="deleteEnterPrises">移除企业
             </el-button>
+            <el-button round v-if="this.form.status === '1' || this.form.status === '2'|| this.form.status === '4'" class="deleteButton1" type="danger" size="small"  @click="deleteEnterPrises">移除企业</el-button>
           </el-col>
         </el-row>
         <div> <span class="form-title">一: 企业基本信息</span></div>
@@ -440,6 +441,7 @@
       </el-form>
       <!--  对话框区域    -->
       <el-dialog
+        class="switchDialog"
         highlight-current-row
         :close-on-click-modal="false"
         :title="dialog.title"
@@ -447,7 +449,7 @@
         :show-close="false"
         width="40%"
       >
-        <el-button class="addEnterprises" type="primary" size="small" @click="addEnterprise">添加关联企业</el-button>
+        <el-button class="addEnterprises" type="primary" size="small" @click="addEnterprise"><span class="addSpan">添加关联企业</span></el-button>
         <!--     切换企业弹出框    -->
         <el-table
           class="dialogTable"
@@ -460,7 +462,11 @@
           style="width: 100%"
         >
           <el-table-column label="选择" width="50" type="selection"/>
-          <el-table-column align="center" label="企业名称" prop="name" width="380" :show-overflow-tooltip="true"/>
+          <el-table-column align="center" label="企业名称" prop="name" width="380" :show-overflow-tooltip="true">
+            <template slot-scope="scope">
+              <span style="color: #333333">{{scope.row.name}}</span>
+            </template>
+          </el-table-column>
           <el-table-column label="操作" width="280">
             <template slot-scope="scope">
               <el-button icon="el-icon-edit" type="text" size="small" @click="updataInfo(scope.row)">完善信息</el-button>
@@ -1770,6 +1776,14 @@ export default {
       background: #C24E3E;
       border-radius: 6px;
     }
+    .deleteButton1{
+      margin-left: -17px;
+      width: 102px;
+      height: 36px;
+      border-color: #C24E3E ;
+      background: #C24E3E;
+      border-radius: 6px;
+    }
 
     .footer {
       text-align: center;
@@ -1803,10 +1817,15 @@ export default {
       color: #333333;
       line-height: 24px;
     }
-    .el-button {
+    .switchDialog{
       .addEnterprises{
+        margin-top: 1%;
         width: 128px;
         height: 36px;
+        .addSpan{
+          font-size: 15px;
+          color: #333333 !important;
+        }
       }
     }
     .dialogTable {