010822bc by renchao@pashanhoo.com

Merge branch 'dev'

2 parents 07cb58ff 536a58c7
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2024-01-18 13:22:31 4 * @LastEditTime: 2024-01-18 13:35:52
5 --> 5 -->
6 <template> 6 <template>
7 <div class="tableBox"> 7 <div class="tableBox">
...@@ -256,21 +256,28 @@ ...@@ -256,21 +256,28 @@
256 handleSelectYwh (row, ywh) { 256 handleSelectYwh (row, ywh) {
257 let sjlx = row.sjlx, 257 let sjlx = row.sjlx,
258 bsmQlxx = row.bsmQlxx 258 bsmQlxx = row.bsmQlxx
259 if (sjlx == '系统数据') { 259 getBlParamsByYwh(ywh, bsmQlxx).then(res => {
260 getXtParamsByYwh(ywh).then(res => { 260 let data = res.result
261 let data = res.result 261 this.$popup('材料信息', 'registerBook/components/clxx/index', {
262 const { href } = Router.resolve('/workFrameView?bsmSlsq=' + data.bsmSlsq + '&bsmBusiness=' + data.bsmBusiness) 262 width: '60%',
263 window.open(href, `urlname${new Date().getTime()}`) 263 formData: data
264 }) 264 })
265 } else { 265 })
266 getBlParamsByYwh(ywh, bsmQlxx).then(res => { 266 // if (sjlx == '系统数据') {
267 let data = res.result 267 // getXtParamsByYwh(ywh).then(res => {
268 this.$popup('材料信息', 'registerBook/components/clxx/index', { 268 // let data = res.result
269 width: '60%', 269 // const { href } = Router.resolve('/workFrameView?bsmSlsq=' + data.bsmSlsq + '&bsmBusiness=' + data.bsmBusiness)
270 formData: data 270 // window.open(href, `urlname${new Date().getTime()}`)
271 }) 271 // })
272 }) 272 // } else {
273 } 273 // getBlParamsByYwh(ywh, bsmQlxx).then(res => {
274 // let data = res.result
275 // this.$popup('材料信息', 'registerBook/components/clxx/index', {
276 // width: '60%',
277 // formData: data
278 // })
279 // })
280 // }
274 } 281 }
275 } 282 }
276 } 283 }
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: miaofang 3 * @Autor: miaofang
4 * @LastEditTime: 2023-11-02 13:39:22 4 * @LastEditTime: 2024-01-18 13:36:24
5 --> 5 -->
6 <template> 6 <template>
7 <div class="djxxTable"> 7 <div class="djxxTable">
...@@ -303,21 +303,28 @@ ...@@ -303,21 +303,28 @@
303 handleSelectYwh (row, ywh) { 303 handleSelectYwh (row, ywh) {
304 let sjlx = row.sjlx, 304 let sjlx = row.sjlx,
305 bsmQlxx = row.bsmQlxx 305 bsmQlxx = row.bsmQlxx
306 if (sjlx == '系统数据') { 306 getBlParamsByYwh(ywh, bsmQlxx).then(res => {
307 getXtParamsByYwh(ywh).then(res => { 307 let data = res.result
308 let data = res.result 308 this.$popup('材料信息', 'registerBook/components/clxx/index', {
309 const { href } = Router.resolve('/workFrameView?bsmSlsq=' + data.bsmSlsq + '&bsmBusiness=' + data.bsmBusiness) 309 width: '60%',
310 window.open(href, `urlname${new Date().getTime()}`) 310 formData: data
311 }) 311 })
312 } else { 312 })
313 getBlParamsByYwh(ywh, bsmQlxx).then(res => { 313 // if (sjlx == '系统数据') {
314 let data = res.result 314 // getXtParamsByYwh(ywh).then(res => {
315 this.$popup('材料信息', 'registerBook/components/clxx/index', { 315 // let data = res.result
316 width: '60%', 316 // const { href } = Router.resolve('/workFrameView?bsmSlsq=' + data.bsmSlsq + '&bsmBusiness=' + data.bsmBusiness)
317 formData: data 317 // window.open(href, `urlname${new Date().getTime()}`)
318 }) 318 // })
319 }) 319 // } else {
320 } 320 // getBlParamsByYwh(ywh, bsmQlxx).then(res => {
321 // let data = res.result
322 // this.$popup('材料信息', 'registerBook/components/clxx/index', {
323 // width: '60%',
324 // formData: data
325 // })
326 // })
327 // }
321 } 328 }
322 } 329 }
323 }; 330 };
......