Merge branch 'dev' of http://yun.pashanhoo.com:9090/bdc/bdcdj-web into dev
Showing
27 changed files
with
87 additions
and
99 deletions
1 | <!-- | 1 | <!-- |
2 | * @Description: | 2 | * @Description: |
3 | * @Autor: renchao | 3 | * @Autor: renchao |
4 | * @LastEditTime: 2023-07-25 16:09:44 | 4 | * @LastEditTime: 2023-08-15 10:01:26 |
5 | --> | 5 | --> |
6 | <template> | 6 | <template> |
7 | <transition name="msgbox-fade"> | 7 | <transition name="msgbox-fade"> |
... | @@ -148,8 +148,8 @@ | ... | @@ -148,8 +148,8 @@ |
148 | 148 | ||
149 | .ls-title { | 149 | .ls-title { |
150 | padding: 16px; | 150 | padding: 16px; |
151 | color: #4a4e56; | 151 | color: #ffffff; |
152 | // background: linear-gradient(3deg, #edf0f7, #f4f5f6); | 152 | background: linear-gradient(3deg, #409eff, #a7cbee); |
153 | font-size: 16px; | 153 | font-size: 16px; |
154 | } | 154 | } |
155 | 155 | ||
... | @@ -185,7 +185,7 @@ | ... | @@ -185,7 +185,7 @@ |
185 | right: 26px; | 185 | right: 26px; |
186 | font-size: 24px; | 186 | font-size: 24px; |
187 | cursor: pointer; | 187 | cursor: pointer; |
188 | color: #4a4e56; | 188 | color: #ffffff; |
189 | } | 189 | } |
190 | 190 | ||
191 | /deep/.el-loading-mask { | 191 | /deep/.el-loading-mask { | ... | ... |
... | @@ -54,7 +54,9 @@ service.interceptors.response.use( | ... | @@ -54,7 +54,9 @@ service.interceptors.response.use( |
54 | */ | 54 | */ |
55 | if (response.status == 200) { | 55 | if (response.status == 200) { |
56 | return response.data; | 56 | return response.data; |
57 | } else { | 57 | }else if (response.status == 2002){ |
58 | Message.error(response.message); | ||
59 | }else { | ||
58 | handleErrorData(response.data); | 60 | handleErrorData(response.data); |
59 | } | 61 | } |
60 | return response; | 62 | return response; | ... | ... |
1 | <!-- | 1 | <!-- |
2 | * @Description: | 2 | * @Description: |
3 | * @Autor: renchao | 3 | * @Autor: renchao |
4 | * @LastEditTime: 2023-08-01 15:19:13 | 4 | * @LastEditTime: 2023-08-15 09:43:21 |
5 | --> | 5 | --> |
6 | <template> | 6 | <template> |
7 | <div class="clxx"> | 7 | <div class="clxx"> |
... | @@ -13,9 +13,7 @@ | ... | @@ -13,9 +13,7 @@ |
13 | type="primary" | 13 | type="primary" |
14 | native-type="submit" | 14 | native-type="submit" |
15 | @click="viewDetail" | 15 | @click="viewDetail" |
16 | style="width: 100%; margin-top: 10px" | 16 | style="width: 100%; margin-top: 10px">申请材料目录</el-button> |
17 | >查看明细</el-button | ||
18 | > | ||
19 | <div class="item"> | 17 | <div class="item"> |
20 | 材料目录({{ tableData.length }}) | 18 | 材料目录({{ tableData.length }}) |
21 | <div style="margin-top: 10px"> | 19 | <div style="margin-top: 10px"> |
... | @@ -26,21 +24,17 @@ | ... | @@ -26,21 +24,17 @@ |
26 | color: black; | 24 | color: black; |
27 | font-size: 14px; | 25 | font-size: 14px; |
28 | " | 26 | " |
29 | v-if="tableData.length == 0" | 27 | v-if="tableData.length == 0"> |
30 | > | ||
31 | 暂无数据 | 28 | 暂无数据 |
32 | </div> | 29 | </div> |
33 | <div | 30 | <div |
34 | v-for="(item, index) in tableData" | 31 | v-for="(item, index) in tableData" |
35 | :key="item.bsmSj" | 32 | :key="item.bsmSj" |
36 | :class="['child', treeCheckId == item.bsmSj ? 'checked' : '']" | 33 | :class="['child', treeCheckId == item.bsmSj ? 'checked' : '']" |
37 | @click="treeClick(item, index)" | 34 | @click="treeClick(item, index)"> |
38 | > | ||
39 | <span v-if="item.isrequired == 1" class="required">必选</span> | 35 | <span v-if="item.isrequired == 1" class="required">必选</span> |
40 | {{ item.sjmc }} | 36 | {{ item.sjmc }} |
41 | <span class="cl_number" | 37 | <span class="cl_number">({{ item.children ? item.children.length : 0 }})</span> |
42 | >({{ item.children ? item.children.length : 0 }})</span | ||
43 | > | ||
44 | </div> | 38 | </div> |
45 | </div> | 39 | </div> |
46 | </div> | 40 | </div> |
... | @@ -49,9 +43,7 @@ | ... | @@ -49,9 +43,7 @@ |
49 | native-type="submit" | 43 | native-type="submit" |
50 | style="width: 100%" | 44 | style="width: 100%" |
51 | @click="handleAdd()" | 45 | @click="handleAdd()" |
52 | v-if="ableOperation" | 46 | v-if="ableOperation">新增</el-button> |
53 | >新增</el-button | ||
54 | > | ||
55 | </div> | 47 | </div> |
56 | <image-preview | 48 | <image-preview |
57 | ref="imageRef" | 49 | ref="imageRef" |
... | @@ -60,22 +52,21 @@ | ... | @@ -60,22 +52,21 @@ |
60 | :ableOperation="ableOperation" | 52 | :ableOperation="ableOperation" |
61 | @updateList="updateList" | 53 | @updateList="updateList" |
62 | @nextPriview="nextPriview" | 54 | @nextPriview="nextPriview" |
63 | @prevPriview="prevPriview" | 55 | @prevPriview="prevPriview" /> |
64 | /> | ||
65 | </div> | 56 | </div> |
66 | </div> | 57 | </div> |
67 | <clxxAddDialog v-model="isDialog" /> | 58 | <clxxAddDialog v-model="isDialog" /> |
68 | </div> | 59 | </div> |
69 | </template> | 60 | </template> |
70 | <script> | 61 | <script> |
71 | import { mapGetters } from "vuex"; | 62 | import { mapGetters } from "vuex"; |
72 | import clxxAddDialog from "../dialog/clxxAddDialog.vue"; | 63 | import clxxAddDialog from "../dialog/clxxAddDialog.vue"; |
73 | import clxxDetailDialog from "../dialog/clxxDetailDialog.vue"; | 64 | import clxxDetailDialog from "../dialog/clxxDetailDialog.vue"; |
74 | import imagePreview from "@/views/components/imagePreview.vue"; | 65 | import imagePreview from "@/views/components/imagePreview.vue"; |
75 | import { InitClml, saveClml } from "@/api/clxx.js"; | 66 | import { InitClml, saveClml } from "@/api/clxx.js"; |
76 | export default { | 67 | export default { |
77 | components: { clxxAddDialog, imagePreview, clxxDetailDialog }, | 68 | components: { clxxAddDialog, imagePreview, clxxDetailDialog }, |
78 | data() { | 69 | data () { |
79 | return { | 70 | return { |
80 | //表单是否可操作 | 71 | //表单是否可操作 |
81 | ableOperation: true, | 72 | ableOperation: true, |
... | @@ -99,7 +90,7 @@ export default { | ... | @@ -99,7 +90,7 @@ export default { |
99 | computed: { | 90 | computed: { |
100 | ...mapGetters(["dictData"]), | 91 | ...mapGetters(["dictData"]), |
101 | }, | 92 | }, |
102 | created() { | 93 | created () { |
103 | this.clmlInitList(1); | 94 | this.clmlInitList(1); |
104 | }, | 95 | }, |
105 | computed: { | 96 | computed: { |
... | @@ -107,12 +98,12 @@ export default { | ... | @@ -107,12 +98,12 @@ export default { |
107 | }, | 98 | }, |
108 | watch: { | 99 | watch: { |
109 | workFresh: { | 100 | workFresh: { |
110 | handler(newVal, oldVal) { | 101 | handler (newVal, oldVal) { |
111 | if (newVal) this.clmlInitList(1); | 102 | if (newVal) this.clmlInitList(1); |
112 | }, | 103 | }, |
113 | }, | 104 | }, |
114 | }, | 105 | }, |
115 | mounted() { | 106 | mounted () { |
116 | this.ableOperation = this.$parent.ableOperation; | 107 | this.ableOperation = this.$parent.ableOperation; |
117 | }, | 108 | }, |
118 | methods: { | 109 | methods: { |
... | @@ -121,7 +112,7 @@ export default { | ... | @@ -121,7 +112,7 @@ export default { |
121 | * @description: 自动预览 | 112 | * @description: 自动预览 |
122 | * @author: renchao | 113 | * @author: renchao |
123 | */ | 114 | */ |
124 | nextPriview() { | 115 | nextPriview () { |
125 | if (this.treeCheckIndex < this.tableData.length) { | 116 | if (this.treeCheckIndex < this.tableData.length) { |
126 | this.treeCheckIndex++; | 117 | this.treeCheckIndex++; |
127 | this.treeCheckId = this.tableData[this.treeCheckIndex].bsmSj; | 118 | this.treeCheckId = this.tableData[this.treeCheckIndex].bsmSj; |
... | @@ -134,7 +125,7 @@ export default { | ... | @@ -134,7 +125,7 @@ export default { |
134 | * @description: prevPriview | 125 | * @description: prevPriview |
135 | * @author: renchao | 126 | * @author: renchao |
136 | */ | 127 | */ |
137 | prevPriview() { | 128 | prevPriview () { |
138 | if (this.treeCheckIndex >= 1) { | 129 | if (this.treeCheckIndex >= 1) { |
139 | this.treeCheckIndex--; | 130 | this.treeCheckIndex--; |
140 | this.treeCheckId = this.tableData[this.treeCheckIndex].bsmSj; | 131 | this.treeCheckId = this.tableData[this.treeCheckIndex].bsmSj; |
... | @@ -149,7 +140,7 @@ export default { | ... | @@ -149,7 +140,7 @@ export default { |
149 | * @param {*} type | 140 | * @param {*} type |
150 | * @author: renchao | 141 | * @author: renchao |
151 | */ | 142 | */ |
152 | clmlInitList(type) { | 143 | clmlInitList (type) { |
153 | //type 1:列表初始化 2:新增材料 | 144 | //type 1:列表初始化 2:新增材料 |
154 | return new Promise((resolve) => { | 145 | return new Promise((resolve) => { |
155 | this.unitData = this.$parent.unitData; | 146 | this.unitData = this.$parent.unitData; |
... | @@ -189,7 +180,7 @@ export default { | ... | @@ -189,7 +180,7 @@ export default { |
189 | * @param {*} item | 180 | * @param {*} item |
190 | * @author: renchao | 181 | * @author: renchao |
191 | */ | 182 | */ |
192 | setChecked(item) { | 183 | setChecked (item) { |
193 | this.treeCheckId = item.bsmSj; | 184 | this.treeCheckId = item.bsmSj; |
194 | this.title = item.sjmc; | 185 | this.title = item.sjmc; |
195 | this.titleYs = 1; | 186 | this.titleYs = 1; |
... | @@ -202,7 +193,7 @@ export default { | ... | @@ -202,7 +193,7 @@ export default { |
202 | * @param {*} val | 193 | * @param {*} val |
203 | * @author: renchao | 194 | * @author: renchao |
204 | */ | 195 | */ |
205 | updateList(val) { | 196 | updateList (val) { |
206 | let that = this; | 197 | let that = this; |
207 | if (val.children.length != 0) { | 198 | if (val.children.length != 0) { |
208 | //删除最后一张图片时 val=null | 199 | //删除最后一张图片时 val=null |
... | @@ -230,7 +221,7 @@ export default { | ... | @@ -230,7 +221,7 @@ export default { |
230 | * @description: 添加材料目录 | 221 | * @description: 添加材料目录 |
231 | * @author: renchao | 222 | * @author: renchao |
232 | */ | 223 | */ |
233 | handleAdd() { | 224 | handleAdd () { |
234 | this.isDialog = true; | 225 | this.isDialog = true; |
235 | }, | 226 | }, |
236 | // 新增弹窗保存 | 227 | // 新增弹窗保存 |
... | @@ -239,7 +230,7 @@ export default { | ... | @@ -239,7 +230,7 @@ export default { |
239 | * @param {*} data | 230 | * @param {*} data |
240 | * @author: renchao | 231 | * @author: renchao |
241 | */ | 232 | */ |
242 | addSave(data) { | 233 | addSave (data) { |
243 | let obj = { | 234 | let obj = { |
244 | bsmSlsq: this.$parent.bsmSlsq, | 235 | bsmSlsq: this.$parent.bsmSlsq, |
245 | isrequired: "1", | 236 | isrequired: "1", |
... | @@ -251,7 +242,7 @@ export default { | ... | @@ -251,7 +242,7 @@ export default { |
251 | sfxjcl: "1", // 是否必选 | 242 | sfxjcl: "1", // 是否必选 |
252 | }; | 243 | }; |
253 | if (this.$route.query.sqywbm == "DJBBL") { | 244 | if (this.$route.query.sqywbm == "DJBBL") { |
254 | obj.bsmSldy=this.$parent.bsmRepair | 245 | obj.bsmSldy = this.$parent.bsmRepair |
255 | } | 246 | } |
256 | saveClml(obj).then(async (res) => { | 247 | saveClml(obj).then(async (res) => { |
257 | if (res.code == 200) { | 248 | if (res.code == 200) { |
... | @@ -271,7 +262,7 @@ export default { | ... | @@ -271,7 +262,7 @@ export default { |
271 | * @param {*} index | 262 | * @param {*} index |
272 | * @author: renchao | 263 | * @author: renchao |
273 | */ | 264 | */ |
274 | treeClick(item, index) { | 265 | treeClick (item, index) { |
275 | this.previewImg.index = 0; | 266 | this.previewImg.index = 0; |
276 | this.treeCheckId = item?.bsmSj; | 267 | this.treeCheckId = item?.bsmSj; |
277 | this.treeCheckIndex = index; | 268 | this.treeCheckIndex = index; |
... | @@ -285,7 +276,7 @@ export default { | ... | @@ -285,7 +276,7 @@ export default { |
285 | * @param {*} index | 276 | * @param {*} index |
286 | * @author: renchao | 277 | * @author: renchao |
287 | */ | 278 | */ |
288 | imgClick(item, index) { | 279 | imgClick (item, index) { |
289 | this.showImg = item; | 280 | this.showImg = item; |
290 | this.titleYs = index + 1; | 281 | this.titleYs = index + 1; |
291 | }, | 282 | }, |
... | @@ -296,7 +287,7 @@ export default { | ... | @@ -296,7 +287,7 @@ export default { |
296 | * @param {*} code | 287 | * @param {*} code |
297 | * @author: renchao | 288 | * @author: renchao |
298 | */ | 289 | */ |
299 | dicStatus(val, code) { | 290 | dicStatus (val, code) { |
300 | let data = this.$store.getters.dictData[code], | 291 | let data = this.$store.getters.dictData[code], |
301 | name = "暂无"; | 292 | name = "暂无"; |
302 | if (data) { | 293 | if (data) { |
... | @@ -309,49 +300,49 @@ export default { | ... | @@ -309,49 +300,49 @@ export default { |
309 | } | 300 | } |
310 | }, | 301 | }, |
311 | //查看明细 | 302 | //查看明细 |
312 | viewDetail() { | 303 | viewDetail () { |
313 | this.$store.dispatch("user/reWorkFresh", false); | 304 | this.$store.dispatch("user/reWorkFresh", false); |
314 | this.$popupDialog( | 305 | this.$popupDialog( |
315 | "查看明细", | 306 | "申请材料目录", |
316 | "workflow/components/dialog/clxxDetailDialog", | 307 | "workflow/components/dialog/clxxDetailDialog", |
317 | { | 308 | { |
318 | data: this.tableData, | 309 | data: this.tableData, |
319 | unitData: this.$parent.unitData, | 310 | unitData: this.$parent.unitData, |
320 | ableOperation: this.$parent.ableOperation, | 311 | ableOperation: this.$parent.ableOperation, |
321 | bsmRepair:this.$parent.bsmRepair | 312 | bsmRepair: this.$parent.bsmRepair |
322 | }, | 313 | }, |
323 | "60%", | 314 | "60%", |
324 | true | 315 | true |
325 | ); | 316 | ); |
326 | }, | 317 | }, |
327 | //设置tableData | 318 | //设置tableData |
328 | setTableData(tableData) { | 319 | setTableData (tableData) { |
329 | this.$nextTick((res) => { | 320 | this.$nextTick((res) => { |
330 | this.tableData = tableData; | 321 | this.tableData = tableData; |
331 | }); | 322 | }); |
332 | }, | 323 | }, |
333 | }, | 324 | }, |
334 | }; | 325 | }; |
335 | </script> | 326 | </script> |
336 | <style scoped lang="scss"> | 327 | <style scoped lang="scss"> |
337 | @import "~@/styles/mixin.scss"; | 328 | @import "~@/styles/mixin.scss"; |
338 | 329 | ||
339 | .active { | 330 | .active { |
340 | background: $light-blue !important; | 331 | background: $light-blue !important; |
341 | color: #fff; | 332 | color: #fff; |
342 | } | 333 | } |
343 | 334 | ||
344 | .required { | 335 | .required { |
345 | font-size: 12px; | 336 | font-size: 12px; |
346 | color: $pink; | 337 | color: $pink; |
347 | float: left; | 338 | float: left; |
348 | } | 339 | } |
349 | 340 | ||
350 | .cl_number { | 341 | .cl_number { |
351 | float: right; | 342 | float: right; |
352 | } | 343 | } |
353 | 344 | ||
354 | .clxx { | 345 | .clxx { |
355 | width: 100%; | 346 | width: 100%; |
356 | display: flex; | 347 | display: flex; |
357 | padding-left: 5px; | 348 | padding-left: 5px; |
... | @@ -457,5 +448,5 @@ export default { | ... | @@ -457,5 +448,5 @@ export default { |
457 | } | 448 | } |
458 | } | 449 | } |
459 | } | 450 | } |
460 | } | 451 | } |
461 | </style> | 452 | </style> | ... | ... |
1 | <!-- | 1 | <!-- |
2 | * @Description: | 2 | * @Description: |
3 | * @Autor: renchao | 3 | * @Autor: renchao |
4 | * @LastEditTime: 2023-08-02 09:53:05 | 4 | * @LastEditTime: 2023-08-15 09:43:46 |
5 | --> | 5 | --> |
6 | <template> | 6 | <template> |
7 | <div class="clmlmx-box"> | 7 | <div class="clmlmx-box"> |
8 | <div class="title">申请材料目录</div> | ||
9 | <lb-table :column="column" :key="key" :heightNumSetting="true" :calcHeight="600" :pagination="false" :data="tableData"> | 8 | <lb-table :column="column" :key="key" :heightNumSetting="true" :calcHeight="600" :pagination="false" :data="tableData"> |
10 | </lb-table> | 9 | </lb-table> |
11 | <div class="text-center"> | 10 | <div class="text-center"> |
... | @@ -61,7 +60,7 @@ | ... | @@ -61,7 +60,7 @@ |
61 | label: "材料名称", | 60 | label: "材料名称", |
62 | render: (h, scope) => { | 61 | render: (h, scope) => { |
63 | return ( | 62 | return ( |
64 | this.formData.ableOperation ? | 63 | (this.formData.ableOperation && scope.row.isrequired != '1') ? |
65 | <el-input value={scope.row.sjmc} onInput={(val) => { scope.row.sjmc = val }}></el-input> : <span>{scope.row.sjmc}</span> | 64 | <el-input value={scope.row.sjmc} onInput={(val) => { scope.row.sjmc = val }}></el-input> : <span>{scope.row.sjmc}</span> |
66 | ) | 65 | ) |
67 | } | 66 | } | ... | ... |
1 | <!-- | 1 | <!-- |
2 | * @Description: 房屋多幢受理信息 | 2 | * @Description: 房屋多幢受理信息 |
3 | * @Autor: ssq | 3 | * @Autor: ssq |
4 | * @LastEditTime: 2023-08-14 12:49:48 | 4 | * @LastEditTime: 2023-08-15 10:24:21 |
5 | --> | 5 | --> |
6 | <template> | 6 | <template> |
7 | <div class="slxx"> | 7 | <div class="slxx"> |
... | @@ -338,15 +338,15 @@ | ... | @@ -338,15 +338,15 @@ |
338 | * @author: renchao | 338 | * @author: renchao |
339 | */ | 339 | */ |
340 | onSubmit () { | 340 | onSubmit () { |
341 | let arr = this.ruleForm.tdytqxList.filter(item => !item.yt) | 341 | // let arr = this.ruleForm.tdytqxList || [] .filter(item => !item.yt) |
342 | if (arr.length > 0) { | 342 | // if (arr.length > 0) { |
343 | this.$message({ | 343 | // this.$message({ |
344 | showClose: true, | 344 | // showClose: true, |
345 | message: "土地用途不能为空", | 345 | // message: "土地用途不能为空", |
346 | type: "error", | 346 | // type: "error", |
347 | }); | 347 | // }); |
348 | return false; | 348 | // return false; |
349 | } | 349 | // } |
350 | saveData(this.ruleForm).then((res) => { | 350 | saveData(this.ruleForm).then((res) => { |
351 | if (res.code === 200) { | 351 | if (res.code === 200) { |
352 | this.$message({ | 352 | this.$message({ | ... | ... |
... | @@ -145,7 +145,7 @@ | ... | @@ -145,7 +145,7 @@ |
145 | this.$popupCacel() | 145 | this.$popupCacel() |
146 | 146 | ||
147 | } else { | 147 | } else { |
148 | ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%') | 148 | ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%', true) |
149 | } | 149 | } |
150 | }).catch(() => { | 150 | }).catch(() => { |
151 | this.loading = false | 151 | this.loading = false | ... | ... |
... | @@ -138,7 +138,7 @@ | ... | @@ -138,7 +138,7 @@ |
138 | } | 138 | } |
139 | this.$popupCacel() | 139 | this.$popupCacel() |
140 | } else { | 140 | } else { |
141 | ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%') | 141 | ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%', true) |
142 | } | 142 | } |
143 | }).catch(() => { | 143 | }).catch(() => { |
144 | this.loading = false | 144 | this.loading = false | ... | ... |
... | @@ -258,7 +258,7 @@ | ... | @@ -258,7 +258,7 @@ |
258 | } | 258 | } |
259 | this.$popupCacel() | 259 | this.$popupCacel() |
260 | } else { | 260 | } else { |
261 | ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%') | 261 | ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%', true) |
262 | } | 262 | } |
263 | }).catch(() => { | 263 | }).catch(() => { |
264 | this.loading = false | 264 | this.loading = false |
... | @@ -279,7 +279,7 @@ | ... | @@ -279,7 +279,7 @@ |
279 | store.dispatch('user/refreshPage', true); | 279 | store.dispatch('user/refreshPage', true); |
280 | this.$popupCacel() | 280 | this.$popupCacel() |
281 | } else { | 281 | } else { |
282 | ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%') | 282 | ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%', true) |
283 | } | 283 | } |
284 | }).catch(() => { | 284 | }).catch(() => { |
285 | this.loading = false | 285 | this.loading = false | ... | ... |
... | @@ -120,7 +120,7 @@ | ... | @@ -120,7 +120,7 @@ |
120 | } | 120 | } |
121 | this.$popupCacel() | 121 | this.$popupCacel() |
122 | } else { | 122 | } else { |
123 | ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%') | 123 | ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%', true) |
124 | } | 124 | } |
125 | }).catch(() => { | 125 | }).catch(() => { |
126 | this.loading = false | 126 | this.loading = false | ... | ... |
... | @@ -121,7 +121,7 @@ | ... | @@ -121,7 +121,7 @@ |
121 | } | 121 | } |
122 | this.$popupCacel() | 122 | this.$popupCacel() |
123 | } else { | 123 | } else { |
124 | ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%') | 124 | ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%', true) |
125 | } | 125 | } |
126 | }).catch(() => { | 126 | }).catch(() => { |
127 | this.loading = false | 127 | this.loading = false | ... | ... |
... | @@ -145,7 +145,7 @@ | ... | @@ -145,7 +145,7 @@ |
145 | } | 145 | } |
146 | this.$popupCacel() | 146 | this.$popupCacel() |
147 | } else { | 147 | } else { |
148 | ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%') | 148 | ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%', true) |
149 | } | 149 | } |
150 | }).catch(() => { | 150 | }).catch(() => { |
151 | this.loading = false | 151 | this.loading = false | ... | ... |
... | @@ -182,7 +182,7 @@ | ... | @@ -182,7 +182,7 @@ |
182 | } | 182 | } |
183 | this.$popupCacel() | 183 | this.$popupCacel() |
184 | } else { | 184 | } else { |
185 | ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%') | 185 | ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%', true) |
186 | } | 186 | } |
187 | }).catch(() => { | 187 | }).catch(() => { |
188 | this.loading = false | 188 | this.loading = false | ... | ... |
... | @@ -126,7 +126,7 @@ | ... | @@ -126,7 +126,7 @@ |
126 | } | 126 | } |
127 | this.$popupCacel() | 127 | this.$popupCacel() |
128 | } else { | 128 | } else { |
129 | ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%') | 129 | ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%', true) |
130 | } | 130 | } |
131 | }).catch(() => { | 131 | }).catch(() => { |
132 | this.loading = false | 132 | this.loading = false | ... | ... |
... | @@ -125,7 +125,7 @@ | ... | @@ -125,7 +125,7 @@ |
125 | } | 125 | } |
126 | this.$popupCacel() | 126 | this.$popupCacel() |
127 | } else { | 127 | } else { |
128 | ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%') | 128 | ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%', true) |
129 | } | 129 | } |
130 | }).catch(() => { | 130 | }).catch(() => { |
131 | this.loading = false | 131 | this.loading = false | ... | ... |
... | @@ -134,7 +134,7 @@ | ... | @@ -134,7 +134,7 @@ |
134 | } | 134 | } |
135 | this.$popupCacel() | 135 | this.$popupCacel() |
136 | } else { | 136 | } else { |
137 | ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%') | 137 | ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%', true) |
138 | } | 138 | } |
139 | }).catch(() => { | 139 | }).catch(() => { |
140 | this.loading = false | 140 | this.loading = false | ... | ... |
... | @@ -254,7 +254,7 @@ | ... | @@ -254,7 +254,7 @@ |
254 | } | 254 | } |
255 | this.$popupCacel() | 255 | this.$popupCacel() |
256 | } else { | 256 | } else { |
257 | ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%') | 257 | ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%', true) |
258 | } | 258 | } |
259 | }).catch(() => { | 259 | }).catch(() => { |
260 | this.loading = false | 260 | this.loading = false | ... | ... |
... | @@ -127,7 +127,7 @@ | ... | @@ -127,7 +127,7 @@ |
127 | } | 127 | } |
128 | this.$popupCacel() | 128 | this.$popupCacel() |
129 | } else { | 129 | } else { |
130 | ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%') | 130 | ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%', true) |
131 | } | 131 | } |
132 | }).catch(() => { | 132 | }).catch(() => { |
133 | this.loading = false | 133 | this.loading = false | ... | ... |
... | @@ -129,7 +129,7 @@ | ... | @@ -129,7 +129,7 @@ |
129 | } | 129 | } |
130 | this.$popupCacel() | 130 | this.$popupCacel() |
131 | } else { | 131 | } else { |
132 | ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%') | 132 | ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%', true) |
133 | } | 133 | } |
134 | }).catch(() => { | 134 | }).catch(() => { |
135 | this.loading = false | 135 | this.loading = false | ... | ... |
... | @@ -127,7 +127,7 @@ | ... | @@ -127,7 +127,7 @@ |
127 | } | 127 | } |
128 | this.$popupCacel() | 128 | this.$popupCacel() |
129 | } else { | 129 | } else { |
130 | ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%') | 130 | ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%', true) |
131 | } | 131 | } |
132 | }).catch(() => { | 132 | }).catch(() => { |
133 | this.loading = false | 133 | this.loading = false | ... | ... |
... | @@ -134,7 +134,7 @@ | ... | @@ -134,7 +134,7 @@ |
134 | } | 134 | } |
135 | this.$popupCacel() | 135 | this.$popupCacel() |
136 | } else { | 136 | } else { |
137 | ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%') | 137 | ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%', true) |
138 | } | 138 | } |
139 | }).catch(() => { | 139 | }).catch(() => { |
140 | this.loading = false | 140 | this.loading = false | ... | ... |
... | @@ -125,7 +125,7 @@ | ... | @@ -125,7 +125,7 @@ |
125 | this.$popupCacel() | 125 | this.$popupCacel() |
126 | } | 126 | } |
127 | } else { | 127 | } else { |
128 | ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%') | 128 | ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%', true) |
129 | } | 129 | } |
130 | }).catch(() => { | 130 | }).catch(() => { |
131 | this.loading = false | 131 | this.loading = false | ... | ... |
... | @@ -123,7 +123,7 @@ | ... | @@ -123,7 +123,7 @@ |
123 | } | 123 | } |
124 | this.$popupCacel() | 124 | this.$popupCacel() |
125 | } else { | 125 | } else { |
126 | ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%') | 126 | ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%', true) |
127 | } | 127 | } |
128 | }).catch(() => { | 128 | }).catch(() => { |
129 | this.loading = false | 129 | this.loading = false | ... | ... |
... | @@ -125,7 +125,7 @@ | ... | @@ -125,7 +125,7 @@ |
125 | } | 125 | } |
126 | this.$popupCacel() | 126 | this.$popupCacel() |
127 | } else { | 127 | } else { |
128 | ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%') | 128 | ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%', true) |
129 | } | 129 | } |
130 | }).catch(() => { | 130 | }).catch(() => { |
131 | this.loading = false | 131 | this.loading = false | ... | ... |
... | @@ -125,7 +125,7 @@ | ... | @@ -125,7 +125,7 @@ |
125 | this.$popupCacel() | 125 | this.$popupCacel() |
126 | } | 126 | } |
127 | } else { | 127 | } else { |
128 | ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%') | 128 | ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%', true) |
129 | } | 129 | } |
130 | }).catch(() => { | 130 | }).catch(() => { |
131 | this.loading = false | 131 | this.loading = false | ... | ... |
... | @@ -126,7 +126,7 @@ | ... | @@ -126,7 +126,7 @@ |
126 | } | 126 | } |
127 | this.$popupCacel() | 127 | this.$popupCacel() |
128 | } else { | 128 | } else { |
129 | ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%') | 129 | ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%', true) |
130 | } | 130 | } |
131 | }).catch(() => { | 131 | }).catch(() => { |
132 | this.loading = false | 132 | this.loading = false | ... | ... |
... | @@ -127,7 +127,7 @@ | ... | @@ -127,7 +127,7 @@ |
127 | } | 127 | } |
128 | this.$popupCacel() | 128 | this.$popupCacel() |
129 | } else { | 129 | } else { |
130 | ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%') | 130 | ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%', true) |
131 | } | 131 | } |
132 | }).catch(() => { | 132 | }).catch(() => { |
133 | this.loading = false | 133 | this.loading = false | ... | ... |
... | @@ -148,7 +148,6 @@ | ... | @@ -148,7 +148,6 @@ |
148 | * @author: renchao | 148 | * @author: renchao |
149 | */ | 149 | */ |
150 | sqywlxClick (item) { | 150 | sqywlxClick (item) { |
151 | console.log("item", item); | ||
152 | this.btnDisabled = true; | 151 | this.btnDisabled = true; |
153 | this.selectType = item.type; | 152 | this.selectType = item.type; |
154 | this.sqywQllxList.forEach(item => { | 153 | this.sqywQllxList.forEach(item => { |
... | @@ -211,6 +210,7 @@ | ... | @@ -211,6 +210,7 @@ |
211 | */ | 210 | */ |
212 | getNextNode (bsmSqyw) { | 211 | getNextNode (bsmSqyw) { |
213 | getNextNode(bsmSqyw).then(res => { | 212 | getNextNode(bsmSqyw).then(res => { |
213 | if (res.result) { | ||
214 | if (res.result.djqx) { | 214 | if (res.result.djqx) { |
215 | this.djqxList = res.result.djqx; | 215 | this.djqxList = res.result.djqx; |
216 | this.djqxList.forEach(item => { | 216 | this.djqxList.forEach(item => { |
... | @@ -223,6 +223,7 @@ | ... | @@ -223,6 +223,7 @@ |
223 | this.$set(item, 'selected', false); | 223 | this.$set(item, 'selected', false); |
224 | }); | 224 | }); |
225 | } | 225 | } |
226 | } | ||
226 | }) | 227 | }) |
227 | }, | 228 | }, |
228 | 229 | ||
... | @@ -234,7 +235,6 @@ | ... | @@ -234,7 +235,6 @@ |
234 | getRepairBiz () { | 235 | getRepairBiz () { |
235 | getRepairBiz().then(res => { | 236 | getRepairBiz().then(res => { |
236 | if (res) { | 237 | if (res) { |
237 | console.log("res", res); | ||
238 | this.djqxList = res.result; | 238 | this.djqxList = res.result; |
239 | } | 239 | } |
240 | }) | 240 | }) |
... | @@ -258,7 +258,6 @@ | ... | @@ -258,7 +258,6 @@ |
258 | dialogClick () { | 258 | dialogClick () { |
259 | this.openDialog(); | 259 | this.openDialog(); |
260 | }, | 260 | }, |
261 | //收藏操作 | ||
262 | /** | 261 | /** |
263 | * @description: 收藏操作 | 262 | * @description: 收藏操作 |
264 | * @param {*} item | 263 | * @param {*} item |
... | @@ -356,7 +355,6 @@ | ... | @@ -356,7 +355,6 @@ |
356 | this.handleSelectYw(item, list) | 355 | this.handleSelectYw(item, list) |
357 | this.openDialog() | 356 | this.openDialog() |
358 | }, | 357 | }, |
359 | // 选择不动产信息 | ||
360 | /** | 358 | /** |
361 | * @description: 选择不动产信息 | 359 | * @description: 选择不动产信息 |
362 | * @author: renchao | 360 | * @author: renchao |
... | @@ -370,11 +368,9 @@ | ... | @@ -370,11 +368,9 @@ |
370 | */ | 368 | */ |
371 | openDialog () { | 369 | openDialog () { |
372 | let title = this.selectParam.djywmc; | 370 | let title = this.selectParam.djywmc; |
373 | if(this.selectParam.nodetype=="djqx"){ | 371 | if (this.selectParam.nodetype == "djqx") { |
374 | title+="("+this.selectParam.nodename+")"; | 372 | title += "(" + this.selectParam.nodename + ")"; |
375 | } | 373 | } |
376 | //let title = "申请业务:"; | ||
377 | //console.log(title); | ||
378 | this.$popupDialog(title, "ywbl/ywsq/selectBdc", { 'sqywInfo': this.selectParam }, "90%", true) | 374 | this.$popupDialog(title, "ywbl/ywsq/selectBdc", { 'sqywInfo': this.selectParam }, "90%", true) |
379 | }, | 375 | }, |
380 | /** | 376 | /** | ... | ... |
-
Please register or sign in to post a comment