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/PolicyDirect/components/policySubscription.vue

@@ -172,8 +172,8 @@
       :modal-append-to-body="false"
       width="80%"
     >
-      <el-form ref="addForm" :model="addForm">
-        <el-form-item label="订阅区域" prop="address">
+      <el-form class="add-form" ref="addForm" :model="addForm">
+        <el-form-item label="订阅区域:" prop="address">
           <!--<el-cascader
             v-model="areaCode"
             placeholder="注册地区"
@@ -185,9 +185,11 @@
             clearable
             :options="addressInfo"
           />-->
+          <br>
           {{ addressHeBei }}
         </el-form-item>
-        <el-form-item label="订阅周期">
+        <el-form-item label="订阅周期:">
+          <br>
           <el-date-picker
             v-model="time"
             class="subscription-date-picker"
@@ -203,10 +205,11 @@
         <el-form-item
           v-for="(item, index) in addSubscriptionCheckbox"
           :key="index"
-          :label="item.name"
+          :label="item.name+':'"
           class="checkbox-group-shell"
         >
           <el-checkbox-group v-model="addForm.tabIdList">
+            <br>
             <el-checkbox-button
               v-for="(childItem, childIndex) in item.childrenList"
               :key="childIndex"
@@ -221,6 +224,7 @@
         <!--有行业小类时才显示-->
         <el-form-item v-if="addSubscriptionIndustryCategory.length > 0" :label="keyword.industryCategory" class="checkbox-group-shell">
           <el-checkbox-group v-model="addForm.tabIdList">
+            <br>
             <el-checkbox-button
               v-for="(item, index) in addSubscriptionIndustryCategory"
               :key="index"
@@ -929,6 +933,34 @@ export default {
   }
 
   .policy-subscription-add-subscription-dialog {
+    ::v-deep.el-dialog__body {
+      padding: 10px 25px 25px 5px;
+    }
+    ::v-deep.el-form-item.el-form-item--small{
+      &:nth-of-type(1){
+        margin-bottom: 10px;
+      }
+      &:nth-of-type(2){
+        margin-top: 0px;
+        .el-form-item__content{
+          margin-top: 10px;
+          margin-bottom: 5px;
+        }
+      }
+      .el-checkbox-group{
+        .el-checkbox-button__inner{
+          border: 1px solid #1A78E5;
+          color: #1A78E5;
+          &:hover{
+            border: 1px solid #2662AD;
+            color: #2662AD;
+          }
+        }
+        .is-checked .el-checkbox-button__inner{
+          color: #FFFFFF;
+        }
+      }
+    }
     .dialog-footer {
       .el-button {
         width: 132px;
@@ -936,11 +968,12 @@ export default {
     }
   }
 }
-
 // 添加订阅 多选样式
 .checkbox-group-shell {
   ::v-deep.el-form-item__content {
     display: flex;
+    line-height: 2px;
+    margin-top: 40px;
   }
 
   .checkbox-button-content {