Merge branch 'dev'

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-08-07 14:43:46
+ * @LastEditTime: 2023-08-18 13:53:23
 -->
 <template>
   <div class="rlPopup">

@@ -34,7 +34,7 @@
                 @click="treeClick(item, index)">
                 <span v-if="item.isrequired == 1" class="required">必选</span>
                 {{ item.sjmc }}
-                <span class="cl_number">({{ item.children ? item.children.length : 0 }})</span>
+                <span class="cl_number" :key="key">({{ item.children ? item.children.length : 0 }})</span>
               </div>
             </div>
           </div>
@@ -206,6 +206,7 @@
           if (this.previewImg.index == this.previewImg.imgList.length) {
             this.previewImg.index = this.previewImg.index - 1;
           }
+          this.key++
         } else {
           this.previewImg.imgList = [];
           this.tableData.forEach((item, index) => {

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-08-16 17:31:25
+ * @LastEditTime: 2023-08-18 13:51:27
 -->
 <template>
   <div class="from-clues loadingtext" v-Loading="loading" element-loading-text="拼命加载中..." style="height:720px;text-align: center;">
@@ -149,7 +149,7 @@
           const maxWidth = 330; // 最大宽度限制
           let lines = this.bdcqz.qlqtzk ? this.bdcqz.qlqtzk.split('\n') : [];
           lines.forEach((line, index) => {
-            const y = 473 + (index * 27); // 每行文本的垂直位置
+            const y = 473 + (index * 30); // 每行文本的垂直位置
             let currentLine = '';
             let arr = [];
             for (let word of line) {

@@ -159,7 +159,7 @@
               </el-radio-group>
             </el-form-item>
           </el-col>
-          <el-col :span="6" v-if="ruleForm.sldyList[0].gyfs!=0">
+          <el-col :span="6" v-if="ruleForm.sldyList[0].gyfs!=0&&ruleForm.sldyList[0].sqfbcz=='0'">
             <el-form-item label="持证人：">
               <el-select
                 v-model="ruleForm.czr"

@@ -160,7 +160,7 @@
               </el-radio-group>
             </el-form-item>
           </el-col>
-          <el-col :span="5" v-show="ruleForm.sldyList[0].gyfs != '0'">
+          <el-col :span="5" v-show="ruleForm.sldyList[0].gyfs != '0'&&ruleForm.sldyList[0].sqfbcz == '0' ">
             <el-form-item label="持证人：">
               <el-select v-model="ruleForm.czr" placeholder="持证人" :disabled="!viewEdit">
                 <el-option v-for="item in czrOptions" :key="item.value" :label="item.label" :value="item.value">

@@ -145,7 +145,7 @@
               this.$popupCacel()
 
             } else {
-              if (res.result.length > 0) {
+              if (res.result && res.result.length > 0) {
                 ywPopupDialog("申请错误明细", "components/ywdialog", { result: res.result }, '36%', true)
               } else {
                 ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message }, '36%', true)

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-08-14 13:28:37
+ * @LastEditTime: 2023-08-18 14:01:00
 -->
 <template>
   <div class="from-clues">
@@ -258,7 +258,7 @@
               }
               this.$popupCacel()
             } else {
-              if (res.result.length > 0) {
+              if (res.result && res.result.length > 0) {
                 ywPopupDialog("申请错误明细", "components/ywdialog", { result: res.result }, '36%', true)
               } else {
                 ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message }, '36%', true)
@@ -283,7 +283,7 @@
               store.dispatch('user/refreshPage', true);
               this.$popupCacel()
             } else {
-              if (res.result.length > 0) {
+              if (res.result && res.result.length > 0) {
                 ywPopupDialog("申请错误明细", "components/ywdialog", { result: res.result }, '36%', true)
               } else {
                 ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message }, '36%', true)