39d0902b by renchao@pashanhoo.com

Merge branch 'dev'

2 parents fba0d689 190f34d8
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-10-19 16:12:50 4 * @LastEditTime: 2023-10-19 16:57:33
5 --> 5 -->
6 <template> 6 <template>
7 <div class="tableBox"> 7 <div class="tableBox">
...@@ -72,7 +72,7 @@ ...@@ -72,7 +72,7 @@
72 {{ getQsztName(row[item.prop]) }} 72 {{ getQsztName(row[item.prop]) }}
73 </span> 73 </span>
74 <el-link v-if="['zxywh', 'ywh'].includes(item.prop)" 74 <el-link v-if="['zxywh', 'ywh'].includes(item.prop)"
75 @click="handleSelectYwh(row)" 75 @click="handleSelectYwh(row, row[item.prop])"
76 type="primary">{{ row[item.prop] }}</el-link> 76 type="primary">{{ row[item.prop] }}</el-link>
77 <span v-if="!['qszt','ywh', 'zxywh' ].includes(item.prop)">{{ row[item.prop] }}</span> 77 <span v-if="!['qszt','ywh', 'zxywh' ].includes(item.prop)">{{ row[item.prop] }}</span>
78 </p> 78 </p>
...@@ -217,19 +217,18 @@ ...@@ -217,19 +217,18 @@
217 }) 217 })
218 }, 218 },
219 // 选择业务号 219 // 选择业务号
220 handleSelectYwh (row) { 220 handleSelectYwh (row, ywh) {
221 let sjlx = row.sjlx, 221 let sjlx = row.sjlx,
222 bsmQlxx = row.bsmQlxx 222 bsmQlxx = row.bsmQlxx
223 if (sjlx == '系统数据') { 223 if (sjlx == '系统数据') {
224 getXtParamsByYwh(row.ywh).then(res => { 224 getXtParamsByYwh(ywh).then(res => {
225 let data = res.result 225 let data = res.result
226 const { href } = Router.resolve('/workFrameView?bsmSlsq=' + data.bsmSlsq + '&bsmBusiness=' + data.bsmBusiness) 226 const { href } = Router.resolve('/workFrameView?bsmSlsq=' + data.bsmSlsq + '&bsmBusiness=' + data.bsmBusiness)
227 window.open(href, `urlname${data.bsmSlsq}`) 227 window.open(href, `urlname${data.bsmSlsq}`)
228 }) 228 })
229 } else { 229 } else {
230 getBlParamsByYwh(row.ywh, bsmQlxx).then(res => { 230 getBlParamsByYwh(ywh, bsmQlxx).then(res => {
231 let data = res.result 231 let data = res.result
232 console.log(data, 'datadatadatadata');
233 this.$popup('材料信息', 'registerBook/components/clxx/index', { 232 this.$popup('材料信息', 'registerBook/components/clxx/index', {
234 width: '60%', 233 width: '60%',
235 formData: data 234 formData: data
......
...@@ -73,7 +73,7 @@ ...@@ -73,7 +73,7 @@
73 {{ getQsztName(row[item.prop]) }} 73 {{ getQsztName(row[item.prop]) }}
74 </span> 74 </span>
75 <el-link v-if=" ['zxywh', 'ywh'].includes(item.prop)" 75 <el-link v-if=" ['zxywh', 'ywh'].includes(item.prop)"
76 @click="handleSelectYwh(row)" 76 @click="handleSelectYwh(row, row[item.prop])"
77 type="primary">{{ row[item.prop] }}</el-link> 77 type="primary">{{ row[item.prop] }}</el-link>
78 <el-tooltip 78 <el-tooltip
79 v-if="['djyy', 'fj'].includes(item.prop)" 79 v-if="['djyy', 'fj'].includes(item.prop)"
...@@ -280,17 +280,17 @@ ...@@ -280,17 +280,17 @@
280 }); 280 });
281 }, 281 },
282 // 选择业务号 282 // 选择业务号
283 handleSelectYwh (row) { 283 handleSelectYwh (row, ywh) {
284 let sjlx = row.sjlx, 284 let sjlx = row.sjlx,
285 bsmQlxx = row.bsmQlxx 285 bsmQlxx = row.bsmQlxx
286 if (sjlx == '系统数据') { 286 if (sjlx == '系统数据') {
287 getXtParamsByYwh(row.ywh).then(res => { 287 getXtParamsByYwh(ywh).then(res => {
288 let data = res.result 288 let data = res.result
289 const { href } = Router.resolve('/workFrameView?bsmSlsq=' + data.bsmSlsq + '&bsmBusiness=' + data.bsmBusiness) 289 const { href } = Router.resolve('/workFrameView?bsmSlsq=' + data.bsmSlsq + '&bsmBusiness=' + data.bsmBusiness)
290 window.open(href, `urlname${data.bsmSlsq}`) 290 window.open(href, `urlname${data.bsmSlsq}`)
291 }) 291 })
292 } else { 292 } else {
293 getBlParamsByYwh(row.ywh, bsmQlxx).then(res => { 293 getBlParamsByYwh(ywh, bsmQlxx).then(res => {
294 let data = res.result 294 let data = res.result
295 this.$popup('材料信息', 'registerBook/components/clxx/index', { 295 this.$popup('材料信息', 'registerBook/components/clxx/index', {
296 width: '60%', 296 width: '60%',
......