fba0d689 by renchao@pashanhoo.com

Merge branch 'dev'

2 parents 44a9e22f d2e071f1
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-10-12 09:59:39 4 * @LastEditTime: 2023-10-19 16:28:06
5 --> 5 -->
6 <template> 6 <template>
7 <div class="clxx"> 7 <div class="clxx">
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-09-12 13:26:13 4 * @LastEditTime: 2023-10-19 16:23:02
5 --> 5 -->
6 <template> 6 <template>
7 <div class="from-clues"> 7 <div class="from-clues">
...@@ -56,19 +56,15 @@ ...@@ -56,19 +56,15 @@
56 shyj: "", 56 shyj: "",
57 }; 57 };
58 }, 58 },
59 59 // watch: {
60 watch: { 60 // yjsqOptions: {
61 yjsqOptions: { 61 // handler (val) {
62 handler (val) { 62 // this.add(val.opinion);
63 this.add(val.opinion); 63 // },
64 }, 64 // deep: true,
65 deep: true, 65 // immediate: true,
66 immediate: true, 66 // },
67 }, 67 // },
68 },
69 mounted () {
70 // this.queryForm= this.queryForm.obj
71 },
72 methods: { 68 methods: {
73 /** 69 /**
74 * @description: submitForm 70 * @description: submitForm
...@@ -114,16 +110,11 @@ ...@@ -114,16 +110,11 @@
114 } 110 }
115 }); 111 });
116 }, 112 },
117 /** 113 // add (val) {
118 * @description: add 114 // if (val != "") {
119 * @param {*} val 115 // this.shyj;
120 * @author: renchao 116 // }
121 */ 117 // },
122 add (val) {
123 if (val != "") {
124 this.shyj;
125 }
126 },
127 118
128 /** 119 /**
129 * @description: closeDialog 120 * @description: closeDialog
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-09-22 09:47:08 4 * @LastEditTime: 2023-10-19 16:12:50
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(tableData, row[item.prop])" 75 @click="handleSelectYwh(row)"
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,24 +217,19 @@ ...@@ -217,24 +217,19 @@
217 }) 217 })
218 }, 218 },
219 // 选择业务号 219 // 选择业务号
220 handleSelectYwh (data, ywh) { 220 handleSelectYwh (row) {
221 let sjlx = '', 221 let sjlx = row.sjlx,
222 bsmQlxx = '' 222 bsmQlxx = row.bsmQlxx
223 data.forEach(item => {
224 if (item.ywh == ywh) {
225 sjlx = item.sjlx
226 bsmQlxx = item.bsmQlxx
227 }
228 })
229 if (sjlx == '系统数据') { 223 if (sjlx == '系统数据') {
230 getXtParamsByYwh(ywh).then(res => { 224 getXtParamsByYwh(row.ywh).then(res => {
231 let data = res.result 225 let data = res.result
232 const { href } = Router.resolve('/workFrameView?bsmSlsq=' + data.bsmSlsq + '&bsmBusiness=' + data.bsmBusiness) 226 const { href } = Router.resolve('/workFrameView?bsmSlsq=' + data.bsmSlsq + '&bsmBusiness=' + data.bsmBusiness)
233 window.open(href, `urlname${data.bsmSlsq}`) 227 window.open(href, `urlname${data.bsmSlsq}`)
234 }) 228 })
235 } else { 229 } else {
236 getBlParamsByYwh(ywh, bsmQlxx).then(res => { 230 getBlParamsByYwh(row.ywh, bsmQlxx).then(res => {
237 let data = res.result 231 let data = res.result
232 console.log(data, 'datadatadatadata');
238 this.$popup('材料信息', 'registerBook/components/clxx/index', { 233 this.$popup('材料信息', 'registerBook/components/clxx/index', {
239 width: '60%', 234 width: '60%',
240 formData: data 235 formData: data
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: miaofang 3 * @Autor: miaofang
4 * @LastEditTime: 2023-10-09 10:35:56 4 * @LastEditTime: 2023-10-19 16:13:55
5 --> 5 -->
6 <template> 6 <template>
7 <div class="djxxTable"> 7 <div class="djxxTable">
...@@ -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(tableData, row[item.prop])" 76 @click="handleSelectYwh(row)"
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,23 +280,17 @@ ...@@ -280,23 +280,17 @@
280 }); 280 });
281 }, 281 },
282 // 选择业务号 282 // 选择业务号
283 handleSelectYwh (data, ywh) { 283 handleSelectYwh (row) {
284 let sjlx = '', 284 let sjlx = row.sjlx,
285 bsmQlxx = '' 285 bsmQlxx = row.bsmQlxx
286 data.forEach(item => {
287 if (item.ywh == ywh) {
288 sjlx = item.sjlx
289 bsmQlxx = item.bsmQlxx
290 }
291 })
292 if (sjlx == '系统数据') { 286 if (sjlx == '系统数据') {
293 getXtParamsByYwh(ywh).then(res => { 287 getXtParamsByYwh(row.ywh).then(res => {
294 let data = res.result 288 let data = res.result
295 const { href } = Router.resolve('/workFrameView?bsmSlsq=' + data.bsmSlsq + '&bsmBusiness=' + data.bsmBusiness + '&type=jdcx') 289 const { href } = Router.resolve('/workFrameView?bsmSlsq=' + data.bsmSlsq + '&bsmBusiness=' + data.bsmBusiness)
296 window.open(href, `urlname${data.bsmSlsq}`) 290 window.open(href, `urlname${data.bsmSlsq}`)
297 }) 291 })
298 } else { 292 } else {
299 getBlParamsByYwh(ywh, bsmQlxx).then(res => { 293 getBlParamsByYwh(row.ywh, bsmQlxx).then(res => {
300 let data = res.result 294 let data = res.result
301 this.$popup('材料信息', 'registerBook/components/clxx/index', { 295 this.$popup('材料信息', 'registerBook/components/clxx/index', {
302 width: '60%', 296 width: '60%',
......