Merge remote-tracking branch 'origin/dev_third_stage' into dev_third_stage

jero-boot/db/蔚来标准sql/dev_third_record.sql

@@ -949,3 +949,7 @@ delete from country_national_flag where id in ('3','8');
 -- 法规流程历史表增加字段 审批意见 2022-08-16
 ALTER TABLE `laws_weilai`.`laws_process_history`
     ADD COLUMN `approval_opinion` varchar(2000) NULL COMMENT '审批意见' AFTER `flow_type`;
+
+--- 用户表 删除工号唯一索引 2022-08-18
+ALTER TABLE `laws_weilai`.`sys_user`
+DROP INDEX `uniq_sys_user_work_no`;

jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardView.vue

@@ -30,9 +30,9 @@
                     <img class="content-box-box-img" style="display: inline-block;width: auto" v-if="index2 == 0">
                     <img :src="item2.img" v-else class="content-box-box-img" alt="">
                     <span v-if="index2 == 0" class="content-box-box-text"></span>
-                    <span v-else class="content-box-box-text">
+                    <div v-else class="content-box-box-text">
                       {{item2.applyMarket_dictText}}
-                    </span>
+                    </div>
 
                   </div>
                   <div class="content-box-box" v-else>
@@ -352,6 +352,7 @@
     display: inline-block;
     cursor: pointer;
     background: #fff;
+    position: relative;
     border-right: 1px #d9d9d9 solid;
     border-top: 1px #d9d9d9 solid;
     border-bottom: 1px #d9d9d9 solid;
@@ -368,6 +369,11 @@
       font-size: 18px;
       font-weight: 500;
       color: #040B29;
+      word-break: break-word;
+      white-space: pre-line;
+      position: absolute;
+      top: 50%;
+      transform: translateY(-66%);
     }
   }
 
@@ -398,6 +404,7 @@
       font-size: 18px;
       font-weight: 500;
       color: #040B29;
+      word-break: break-word;
     }
   }
 

jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardViewAdd.vue

@@ -54,6 +54,7 @@
                     v-if="(formInline.dataList.length-1) == index && formInline.dataList.length < 5"
                     type="plus-circle"/>
             <a-icon class="icon-size"
+                    style="margin-left: 8px"
                     @click="deleteData"
                     v-if="formInline.dataList.length > 1 && (formInline.dataList.length - 1) == index"
                     type="minus-circle"/>
@@ -252,6 +253,5 @@
   .icon-size {
     font-size: 18px;
     margin-top: 14px;
-    margin-right: 4px;
   }
 </style>