Skip to content

bdc / bdcdj-web

Go to a project
Toggle navigation
Toggle navigation pinning
302e768c by renchao@pashanhoo.com
Options

Merge branch 'dev'

2 parents d27b5075 cd3475f4
Inline Side-by-side
Showing 7 changed files with 11 additions and 10 deletions
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-08-07 14:43:46 4 * @LastEditTime: 2023-08-18 13:53:23
5 --> 5 -->
6 <template> 6 <template>
7 <div class="rlPopup"> 7 <div class="rlPopup">
......
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
34 @click="treeClick(item, index)"> 34 @click="treeClick(item, index)">
35 <span v-if="item.isrequired == 1" class="required">必选</span> 35 <span v-if="item.isrequired == 1" class="required">必选</span>
36 {{ item.sjmc }} 36 {{ item.sjmc }}
37 <span class="cl_number">({{ item.children ? item.children.length : 0 }})</span> 37 <span class="cl_number" :key="key">({{ item.children ? item.children.length : 0 }})</span>
38 </div> 38 </div>
39 </div> 39 </div>
40 </div> 40 </div>
...@@ -206,6 +206,7 @@ ...@@ -206,6 +206,7 @@
206 if (this.previewImg.index == this.previewImg.imgList.length) { 206 if (this.previewImg.index == this.previewImg.imgList.length) {
207 this.previewImg.index = this.previewImg.index - 1; 207 this.previewImg.index = this.previewImg.index - 1;
208 } 208 }
209 this.key++
209 } else { 210 } else {
210 this.previewImg.imgList = []; 211 this.previewImg.imgList = [];
211 this.tableData.forEach((item, index) => { 212 this.tableData.forEach((item, index) => {
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-08-16 17:31:25 4 * @LastEditTime: 2023-08-18 13:51:27
5 --> 5 -->
6 <template> 6 <template>
7 <div class="from-clues loadingtext" v-Loading="loading" element-loading-text="拼命加载中..." style="height:720px;text-align: center;"> 7 <div class="from-clues loadingtext" v-Loading="loading" element-loading-text="拼命加载中..." style="height:720px;text-align: center;">
...@@ -149,7 +149,7 @@ ...@@ -149,7 +149,7 @@
149 const maxWidth = 330; // 最大宽度限制 149 const maxWidth = 330; // 最大宽度限制
150 let lines = this.bdcqz.qlqtzk ? this.bdcqz.qlqtzk.split('\n') : []; 150 let lines = this.bdcqz.qlqtzk ? this.bdcqz.qlqtzk.split('\n') : [];
151 lines.forEach((line, index) => { 151 lines.forEach((line, index) => {
152 const y = 473 + (index * 27); // 每行文本的垂直位置 152 const y = 473 + (index * 30); // 每行文本的垂直位置
153 let currentLine = ''; 153 let currentLine = '';
154 let arr = []; 154 let arr = [];
155 for (let word of line) { 155 for (let word of line) {
......
...@@ -159,7 +159,7 @@ ...@@ -159,7 +159,7 @@
159 </el-radio-group> 159 </el-radio-group>
160 </el-form-item> 160 </el-form-item>
161 </el-col> 161 </el-col>
162 <el-col :span="6" v-if="ruleForm.sldyList[0].gyfs!=0"> 162 <el-col :span="6" v-if="ruleForm.sldyList[0].gyfs!=0&&ruleForm.sldyList[0].sqfbcz=='0'">
163 <el-form-item label="持证人："> 163 <el-form-item label="持证人：">
164 <el-select 164 <el-select
165 v-model="ruleForm.czr" 165 v-model="ruleForm.czr"
......
...@@ -160,7 +160,7 @@ ...@@ -160,7 +160,7 @@
160 </el-radio-group> 160 </el-radio-group>
161 </el-form-item> 161 </el-form-item>
162 </el-col> 162 </el-col>
163 <el-col :span="5" v-show="ruleForm.sldyList[0].gyfs != '0'"> 163 <el-col :span="5" v-show="ruleForm.sldyList[0].gyfs != '0'&&ruleForm.sldyList[0].sqfbcz == '0' ">
164 <el-form-item label="持证人："> 164 <el-form-item label="持证人：">
165 <el-select v-model="ruleForm.czr" placeholder="持证人" :disabled="!viewEdit"> 165 <el-select v-model="ruleForm.czr" placeholder="持证人" :disabled="!viewEdit">
166 <el-option v-for="item in czrOptions" :key="item.value" :label="item.label" :value="item.value"> 166 <el-option v-for="item in czrOptions" :key="item.value" :label="item.label" :value="item.value">
......
...@@ -145,7 +145,7 @@ ...@@ -145,7 +145,7 @@
145 this.$popupCacel() 145 this.$popupCacel()
146 146
147 } else { 147 } else {
148 if (res.result.length > 0) { 148 if (res.result && res.result.length > 0) {
149 ywPopupDialog("申请错误明细", "components/ywdialog", { result: res.result }, '36%', true) 149 ywPopupDialog("申请错误明细", "components/ywdialog", { result: res.result }, '36%', true)
150 } else { 150 } else {
151 ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message }, '36%', true) 151 ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message }, '36%', true)
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-08-14 13:28:37 4 * @LastEditTime: 2023-08-18 14:01:00
5 --> 5 -->
6 <template> 6 <template>
7 <div class="from-clues"> 7 <div class="from-clues">
...@@ -258,7 +258,7 @@ ...@@ -258,7 +258,7 @@
258 } 258 }
259 this.$popupCacel() 259 this.$popupCacel()
260 } else { 260 } else {
261 if (res.result.length > 0) { 261 if (res.result && res.result.length > 0) {
262 ywPopupDialog("申请错误明细", "components/ywdialog", { result: res.result }, '36%', true) 262 ywPopupDialog("申请错误明细", "components/ywdialog", { result: res.result }, '36%', true)
263 } else { 263 } else {
264 ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message }, '36%', true) 264 ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message }, '36%', true)
...@@ -283,7 +283,7 @@ ...@@ -283,7 +283,7 @@
283 store.dispatch('user/refreshPage', true); 283 store.dispatch('user/refreshPage', true);
284 this.$popupCacel() 284 this.$popupCacel()
285 } else { 285 } else {
286 if (res.result.length > 0) { 286 if (res.result && res.result.length > 0) {
287 ywPopupDialog("申请错误明细", "components/ywdialog", { result: res.result }, '36%', true) 287 ywPopupDialog("申请错误明细", "components/ywdialog", { result: res.result }, '36%', true)
288 } else { 288 } else {
289 ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message }, '36%', true) 289 ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message }, '36%', true)
......