Merge branch 'dev'
Showing
11 changed files
with
26 additions
and
87 deletions
| 1 | <!-- | 1 | <!-- |
| 2 | * @Description: | 2 | * @Description: |
| 3 | * @Autor: renchao | 3 | * @Autor: renchao |
| 4 | * @LastEditTime: 2023-08-17 15:20:29 | 4 | * @LastEditTime: 2023-09-19 15:52:44 |
| 5 | --> | 5 | --> |
| 6 | <template> | 6 | <template> |
| 7 | <div class='ywdialog'> | 7 | <div class='ywdialog'> |
| ... | @@ -33,4 +33,7 @@ | ... | @@ -33,4 +33,7 @@ |
| 33 | </script> | 33 | </script> |
| 34 | <style scoped lang='scss'> | 34 | <style scoped lang='scss'> |
| 35 | @import "~@/styles/public.scss"; | 35 | @import "~@/styles/public.scss"; |
| 36 | .ywdialog { | ||
| 37 | min-width: 230px; | ||
| 38 | } | ||
| 36 | </style> | 39 | </style> |
| ... | \ No newline at end of file | ... | \ No newline at end of file | ... | ... |
| 1 | <!-- | 1 | <!-- |
| 2 | * @Description: | 2 | * @Description: |
| 3 | * @Autor: renchao | 3 | * @Autor: renchao |
| 4 | * @LastEditTime: 2023-09-11 11:29:36 | 4 | * @LastEditTime: 2023-09-19 14:04:13 |
| 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;"> |
| ... | @@ -204,7 +204,6 @@ | ... | @@ -204,7 +204,6 @@ |
| 204 | }) | 204 | }) |
| 205 | }) | 205 | }) |
| 206 | } | 206 | } |
| 207 | // context.fillText(this.bdcqz.syqx ? this.bdcqz.syqx : '', 129, 429); | ||
| 208 | // 权利其他状态 | 207 | // 权利其他状态 |
| 209 | let lines = this.bdcqz.qlqtzk ? this.bdcqz.qlqtzk.split('\n') : []; | 208 | let lines = this.bdcqz.qlqtzk ? this.bdcqz.qlqtzk.split('\n') : []; |
| 210 | for (let i = 0; i < lines.length; i++) { | 209 | for (let i = 0; i < lines.length; i++) { |
| ... | @@ -225,18 +224,18 @@ | ... | @@ -225,18 +224,18 @@ |
| 225 | arr.push(currentLine); | 224 | arr.push(currentLine); |
| 226 | if (i > 0) { | 225 | if (i > 0) { |
| 227 | arr.forEach((line, index) => { | 226 | arr.forEach((line, index) => { |
| 228 | context.fillText(line, 129, 480 + (26 * (i - 1)) + 4 * num + (index * 14)); // 调整行高 | 227 | context.fillText(line, 129, 490 + (26 * (i - 1)) + 4 * num + (index * 14)); // 调整行高 |
| 229 | }) | 228 | }) |
| 230 | } else { | 229 | } else { |
| 231 | arr.forEach((line, index) => { | 230 | arr.forEach((line, index) => { |
| 232 | context.fillText(line, 129, 490 + (26 * (i - 1)) + (index * 14)); // 调整行高 | 231 | context.fillText(line, 129, 500 + (26 * (i - 1)) + (index * 14)); // 调整行高 |
| 233 | }) | 232 | }) |
| 234 | } | 233 | } |
| 235 | } else { | 234 | } else { |
| 236 | if (i > 0) { | 235 | if (i > 0) { |
| 237 | context.fillText(lines[i] ? lines[i] : '', 129, 490 + 4 * num + (24 * (i - 1))); | 236 | context.fillText(lines[i] ? lines[i] : '', 129, 500 + 4 * num + (24 * (i - 1))); |
| 238 | } else { | 237 | } else { |
| 239 | context.fillText(lines[i] ? lines[i] : '', 129, 495 + (24 * (i - 1))); | 238 | context.fillText(lines[i] ? lines[i] : '', 129, 505 + (24 * (i - 1))); |
| 240 | } | 239 | } |
| 241 | } | 240 | } |
| 242 | } | 241 | } |
| ... | @@ -518,9 +517,9 @@ | ... | @@ -518,9 +517,9 @@ |
| 518 | image.src = this.bdczmSrc; | 517 | image.src = this.bdczmSrc; |
| 519 | } | 518 | } |
| 520 | }, | 519 | }, |
| 521 | computed:{ | 520 | computed: { |
| 522 | hdiffHeight(){ | 521 | hdiffHeight () { |
| 523 | return this.headTabBdcqz.length > 1 ? 54 :0 | 522 | return this.headTabBdcqz.length > 1 ? 54 : 0 |
| 524 | } | 523 | } |
| 525 | } | 524 | } |
| 526 | } | 525 | } | ... | ... |
| 1 | <!-- | 1 | <!-- |
| 2 | * @Description: | 2 | * @Description: |
| 3 | * @Autor: renchao | 3 | * @Autor: renchao |
| 4 | * @LastEditTime: 2023-07-11 09:56:42 | 4 | * @LastEditTime: 2023-09-19 15:24:14 |
| 5 | --> | 5 | --> |
| 6 | <template> | 6 | <template> |
| 7 | <div class="slxx"> | 7 | <div class="slxx"> |
| ... | @@ -72,12 +72,6 @@ | ... | @@ -72,12 +72,6 @@ |
| 72 | <el-input v-model="ruleForm.cfdjList[0].cfwh" :disabled="!ableOperation|| isJfOperation"></el-input> | 72 | <el-input v-model="ruleForm.cfdjList[0].cfwh" :disabled="!ableOperation|| isJfOperation"></el-input> |
| 73 | </el-form-item> | 73 | </el-form-item> |
| 74 | </el-col> | 74 | </el-col> |
| 75 | <!-- 批量查封状态有多种查封类型,不予展示 --> | ||
| 76 | <!-- <el-col :span="8"> | ||
| 77 | <el-form-item :class="flag ? 'marginBot0' : ''" label="查封类型:" prop="cfdj.cflxmc"> | ||
| 78 | <el-input v-model="ruleForm.cfdjList[0].cflxmc" disabled></el-input> | ||
| 79 | </el-form-item> | ||
| 80 | </el-col>--> | ||
| 81 | </el-row> | 75 | </el-row> |
| 82 | <el-row :gutter="10"> | 76 | <el-row :gutter="10"> |
| 83 | <el-col :span="8"> | 77 | <el-col :span="8"> | ... | ... |
| 1 | <!-- | 1 | <!-- |
| 2 | * @Description: | 2 | * @Description: |
| 3 | * @Autor: renchao | 3 | * @Autor: renchao |
| 4 | * @LastEditTime: 2023-09-19 10:56:19 | 4 | * @LastEditTime: 2023-09-19 15:47:56 |
| 5 | --> | 5 | --> |
| 6 | <template> | 6 | <template> |
| 7 | <div class="slxx"> | 7 | <div class="slxx"> |
| ... | @@ -128,15 +128,7 @@ | ... | @@ -128,15 +128,7 @@ |
| 128 | <el-row :gutter="10"> | 128 | <el-row :gutter="10"> |
| 129 | <el-col :span="8"> | 129 | <el-col :span="8"> |
| 130 | <el-form-item :class="flag ? 'marginBot0' : ''" label="权利性质"> | 130 | <el-form-item :class="flag ? 'marginBot0' : ''" label="权利性质"> |
| 131 | <treeselect | 131 | <el-input disabled v-model="ruleForm.ztQlxx.qlxzmc"></el-input> |
| 132 | disabled | ||
| 133 | v-model="ruleForm.ztQlxx.qlxzmc" | ||
| 134 | noOptionsText="暂无数据" | ||
| 135 | :default-expand-level="1" | ||
| 136 | placeholder="" | ||
| 137 | :normalizer="normalizer" | ||
| 138 | :show-count="true" | ||
| 139 | :options="dictData['A9']" /> | ||
| 140 | </el-form-item> | 132 | </el-form-item> |
| 141 | </el-col> | 133 | </el-col> |
| 142 | <el-col :span="8"> | 134 | <el-col :span="8"> | ... | ... |
| 1 | <!-- | 1 | <!-- |
| 2 | * @Description: | 2 | * @Description: |
| 3 | * @Autor: renchao | 3 | * @Autor: renchao |
| 4 | * @LastEditTime: 2023-09-19 10:56:41 | 4 | * @LastEditTime: 2023-09-19 15:23:42 |
| 5 | --> | 5 | --> |
| 6 | <template> | 6 | <template> |
| 7 | <!-- 受理信息 --> | 7 | <!-- 受理信息 --> |
| ... | @@ -100,15 +100,7 @@ | ... | @@ -100,15 +100,7 @@ |
| 100 | </el-col> | 100 | </el-col> |
| 101 | <el-col :span="8"> | 101 | <el-col :span="8"> |
| 102 | <el-form-item label="权利性质:"> | 102 | <el-form-item label="权利性质:"> |
| 103 | <treeselect | 103 | <el-input disabled v-model="ruleForm.ztQlxx.qlxzmc"></el-input> |
| 104 | disabled | ||
| 105 | v-model="ruleForm.ztQlxx.qlxzmc" | ||
| 106 | noOptionsText="暂无数据" | ||
| 107 | :default-expand-level="1" | ||
| 108 | placeholder="" | ||
| 109 | :normalizer="normalizer" | ||
| 110 | :show-count="true" | ||
| 111 | :options="dictData['A9']" /> | ||
| 112 | </el-form-item> | 104 | </el-form-item> |
| 113 | </el-col> | 105 | </el-col> |
| 114 | <el-col :span="8"> | 106 | <el-col :span="8"> | ... | ... |
| 1 | <!-- | 1 | <!-- |
| 2 | * @Description: | 2 | * @Description: |
| 3 | * @Autor: renchao | 3 | * @Autor: renchao |
| 4 | * @LastEditTime: 2023-09-19 10:56:59 | 4 | * @LastEditTime: 2023-09-19 15:55:59 |
| 5 | --> | 5 | --> |
| 6 | <template> | 6 | <template> |
| 7 | <!-- 受理信息 --> | 7 | <!-- 受理信息 --> |
| ... | @@ -94,15 +94,7 @@ | ... | @@ -94,15 +94,7 @@ |
| 94 | </el-col> | 94 | </el-col> |
| 95 | <el-col :span="8"> | 95 | <el-col :span="8"> |
| 96 | <el-form-item label="权利性质:" prop="qlxzmc"> | 96 | <el-form-item label="权利性质:" prop="qlxzmc"> |
| 97 | <treeselect | 97 | <el-input disabled v-model="ruleForm.qlxzmc"></el-input> |
| 98 | disabled | ||
| 99 | v-model="ruleForm.qlxzmc" | ||
| 100 | noOptionsText="暂无数据" | ||
| 101 | :default-expand-level="1" | ||
| 102 | placeholder="" | ||
| 103 | :normalizer="normalizer" | ||
| 104 | :show-count="true" | ||
| 105 | :options="dictData['A9']" /> | ||
| 106 | </el-form-item> | 98 | </el-form-item> |
| 107 | </el-col> | 99 | </el-col> |
| 108 | </el-row> | 100 | </el-row> | ... | ... |
| 1 | <!-- | 1 | <!-- |
| 2 | * @Description: | 2 | * @Description: |
| 3 | * @Autor: renchao | 3 | * @Autor: renchao |
| 4 | * @LastEditTime: 2023-09-19 10:57:23 | 4 | * @LastEditTime: 2023-09-19 15:44:16 |
| 5 | --> | 5 | --> |
| 6 | <template> | 6 | <template> |
| 7 | <!-- 受理信息 --> | 7 | <!-- 受理信息 --> |
| ... | @@ -72,7 +72,6 @@ | ... | @@ -72,7 +72,6 @@ |
| 72 | <el-col :span="8"> | 72 | <el-col :span="8"> |
| 73 | <el-form-item label="权利性质"> | 73 | <el-form-item label="权利性质"> |
| 74 | <treeselect | 74 | <treeselect |
| 75 | disabled | ||
| 76 | v-model="ruleForm.zdjbxx.qlxzmc" | 75 | v-model="ruleForm.zdjbxx.qlxzmc" |
| 77 | noOptionsText="暂无数据" | 76 | noOptionsText="暂无数据" |
| 78 | :default-expand-level="1" | 77 | :default-expand-level="1" | ... | ... |
| ... | @@ -2,7 +2,7 @@ | ... | @@ -2,7 +2,7 @@ |
| 2 | <!-- | 2 | <!-- |
| 3 | * @Description: | 3 | * @Description: |
| 4 | * @Autor: renchao | 4 | * @Autor: renchao |
| 5 | * @LastEditTime: 2023-09-19 10:57:35 | 5 | * @LastEditTime: 2023-09-19 15:45:34 |
| 6 | --> | 6 | --> |
| 7 | <template> | 7 | <template> |
| 8 | <!-- 受理信息 --> | 8 | <!-- 受理信息 --> |
| ... | @@ -72,15 +72,7 @@ | ... | @@ -72,15 +72,7 @@ |
| 72 | </el-col> | 72 | </el-col> |
| 73 | <el-col :span="8"> | 73 | <el-col :span="8"> |
| 74 | <el-form-item label="权利性质:"> | 74 | <el-form-item label="权利性质:"> |
| 75 | <treeselect | 75 | <el-input disabled v-model="ruleForm.zdjbxx.qlxzmc"></el-input> |
| 76 | disabled | ||
| 77 | v-model="ruleForm.zdjbxx.qlxzmc" | ||
| 78 | noOptionsText="暂无数据" | ||
| 79 | :default-expand-level="1" | ||
| 80 | placeholder="" | ||
| 81 | :normalizer="normalizer" | ||
| 82 | :show-count="true" | ||
| 83 | :options="dictData['A9']" /> | ||
| 84 | </el-form-item> | 76 | </el-form-item> |
| 85 | </el-col> | 77 | </el-col> |
| 86 | </el-row> | 78 | </el-row> | ... | ... |
| ... | @@ -65,15 +65,7 @@ | ... | @@ -65,15 +65,7 @@ |
| 65 | </el-col> | 65 | </el-col> |
| 66 | <el-col :span="8"> | 66 | <el-col :span="8"> |
| 67 | <el-form-item label="权利性质:"> | 67 | <el-form-item label="权利性质:"> |
| 68 | <treeselect | 68 | <el-input disabled v-model="ruleForm.zdjbxx.qlxzmc"></el-input> |
| 69 | disabled | ||
| 70 | v-model="ruleForm.zdjbxx.qlxzmc" | ||
| 71 | noOptionsText="暂无数据" | ||
| 72 | :default-expand-level="1" | ||
| 73 | placeholder="" | ||
| 74 | :normalizer="normalizer" | ||
| 75 | :show-count="true" | ||
| 76 | :options="dictData['A9']" /> | ||
| 77 | </el-form-item> | 69 | </el-form-item> |
| 78 | </el-col> | 70 | </el-col> |
| 79 | </el-row> | 71 | </el-row> | ... | ... |
| ... | @@ -65,15 +65,7 @@ | ... | @@ -65,15 +65,7 @@ |
| 65 | </el-col> | 65 | </el-col> |
| 66 | <el-col :span="8"> | 66 | <el-col :span="8"> |
| 67 | <el-form-item label="权利性质:"> | 67 | <el-form-item label="权利性质:"> |
| 68 | <treeselect | 68 | <el-input disabled v-model="ruleForm.zdjbxx.qlxzmc"></el-input> |
| 69 | disabled | ||
| 70 | v-model="ruleForm.zdjbxx.qlxzmc" | ||
| 71 | noOptionsText="暂无数据" | ||
| 72 | :default-expand-level="1" | ||
| 73 | placeholder="" | ||
| 74 | :normalizer="normalizer" | ||
| 75 | :show-count="true" | ||
| 76 | :options="dictData['A9']" /> | ||
| 77 | </el-form-item> | 69 | </el-form-item> |
| 78 | </el-col> | 70 | </el-col> |
| 79 | </el-row> | 71 | </el-row> | ... | ... |
| 1 | <!-- | 1 | <!-- |
| 2 | * @Description: | 2 | * @Description: |
| 3 | * @Autor: renchao | 3 | * @Autor: renchao |
| 4 | * @LastEditTime: 2023-09-19 10:58:26 | 4 | * @LastEditTime: 2023-09-19 15:30:04 |
| 5 | --> | 5 | --> |
| 6 | <template> | 6 | <template> |
| 7 | <!-- 受理信息 --> | 7 | <!-- 受理信息 --> |
| ... | @@ -70,15 +70,7 @@ | ... | @@ -70,15 +70,7 @@ |
| 70 | </el-col> | 70 | </el-col> |
| 71 | <el-col :span="8"> | 71 | <el-col :span="8"> |
| 72 | <el-form-item label="权利性质:"> | 72 | <el-form-item label="权利性质:"> |
| 73 | <treeselect | 73 | <el-input disabled v-model="ruleForm.zdjbxx.qlxzmc"></el-input> |
| 74 | disabled | ||
| 75 | v-model="ruleForm.zdjbxx.qlxzmc" | ||
| 76 | noOptionsText="暂无数据" | ||
| 77 | :default-expand-level="1" | ||
| 78 | placeholder="" | ||
| 79 | :normalizer="normalizer" | ||
| 80 | :show-count="true" | ||
| 81 | :options="dictData['A9']" /> | ||
| 82 | </el-form-item> | 74 | </el-form-item> |
| 83 | </el-col> | 75 | </el-col> |
| 84 | </el-row> | 76 | </el-row> | ... | ... |
-
Please register or sign in to post a comment