Merge branch 'dev'
Showing
3 changed files
with
41 additions
and
44 deletions
| ... | @@ -148,6 +148,7 @@ | ... | @@ -148,6 +148,7 @@ |
| 148 | clmlInitList (type) { | 148 | clmlInitList (type) { |
| 149 | // 1：列表初始化 2：新增材料 | 149 | // 1：列表初始化 2：新增材料 |
| 150 | return new Promise((resolve) => { | 150 | return new Promise((resolve) => { |
| 151 | console.log(this.formData, 'this.formData'); | ||
| 151 | repairInitClml(this.formData).then((res) => { | 152 | repairInitClml(this.formData).then((res) => { |
| 152 | if (res.code == 200) { | 153 | if (res.code == 200) { |
| 153 | resolve(res.code); | 154 | resolve(res.code); | ... | ... |
| 1 | <!-- | 1 | <!-- |
| 2 | * @Description: | 2 | * @Description: |
| 3 | * @Autor: renchao | 3 | * @Autor: renchao |
| 4 | * @LastEditTime: 2024-01-18 13:35:52 | 4 | * @LastEditTime: 2024-01-19 15:46:35 |
| 5 | --> | 5 | --> |
| 6 | <template> | 6 | <template> |
| 7 | <div class="tableBox"> | 7 | <div class="tableBox"> |
| ... | @@ -254,30 +254,28 @@ | ... | @@ -254,30 +254,28 @@ |
| 254 | }, | 254 | }, |
| 255 | // 选择业务号 | 255 | // 选择业务号 |
| 256 | handleSelectYwh (row, ywh) { | 256 | handleSelectYwh (row, ywh) { |
| 257 | let that = this | ||
| 257 | let sjlx = row.sjlx, | 258 | let sjlx = row.sjlx, |
| 258 | bsmQlxx = row.bsmQlxx | 259 | bsmQlxx = row.bsmQlxx |
| 259 | getBlParamsByYwh(ywh, bsmQlxx).then(res => { | 260 | if (sjlx == '系统数据') { |
| 260 | let data = res.result | 261 | getXtParamsByYwh(ywh).then(res => { |
| 261 | this.$popup('材料信息', 'registerBook/components/clxx/index', { | 262 | let data = res.result |
| 262 | width: '60%', | 263 | // that.$popup('材料信息', 'registerBook/components/clxx/index', { |
| 263 | formData: data | 264 | // width: '60%', |
| 265 | // formData: data | ||
| 266 | // }) | ||
| 267 | const { href } = Router.resolve('/workFrameView?bsmSlsq=' + data.bsmSlsq + '&bsmBusiness=' + data.bsmBusiness) | ||
| 268 | window.open(href, `urlname${new Date().getTime()}`) | ||
| 264 | }) | 269 | }) |
| 265 | }) | 270 | } else { |
| 266 | // if (sjlx == '系统数据') { | 271 | getBlParamsByYwh(ywh, bsmQlxx).then(res => { |
| 267 | // getXtParamsByYwh(ywh).then(res => { | 272 | let data = res.result |
| 268 | // let data = res.result | 273 | this.$popup('材料信息', 'registerBook/components/clxx/index', { |
| 269 | // const { href } = Router.resolve('/workFrameView?bsmSlsq=' + data.bsmSlsq + '&bsmBusiness=' + data.bsmBusiness) | 274 | width: '60%', |
| 270 | // window.open(href, `urlname${new Date().getTime()}`) | 275 | formData: data |
| 271 | // }) | 276 | }) |
| 272 | // } else { | 277 | }) |
| 273 | // getBlParamsByYwh(ywh, bsmQlxx).then(res => { | 278 | } |
| 274 | // let data = res.result | ||
| 275 | // this.$popup('材料信息', 'registerBook/components/clxx/index', { | ||
| 276 | // width: '60%', | ||
| 277 | // formData: data | ||
| 278 | // }) | ||
| 279 | // }) | ||
| 280 | // } | ||
| 281 | } | 279 | } |
| 282 | } | 280 | } |
| 283 | } | 281 | } | ... | ... |
| 1 | <!-- | 1 | <!-- |
| 2 | * @Description: | 2 | * @Description: |
| 3 | * @Autor: miaofang | 3 | * @Autor: miaofang |
| 4 | * @LastEditTime: 2024-01-18 13:36:24 | 4 | * @LastEditTime: 2024-01-19 15:46:23 |
| 5 | --> | 5 | --> |
| 6 | <template> | 6 | <template> |
| 7 | <div class="djxxTable"> | 7 | <div class="djxxTable"> |
| ... | @@ -301,30 +301,28 @@ | ... | @@ -301,30 +301,28 @@ |
| 301 | }, | 301 | }, |
| 302 | // 选择业务号 | 302 | // 选择业务号 |
| 303 | handleSelectYwh (row, ywh) { | 303 | handleSelectYwh (row, ywh) { |
| 304 | let that = this | ||
| 304 | let sjlx = row.sjlx, | 305 | let sjlx = row.sjlx, |
| 305 | bsmQlxx = row.bsmQlxx | 306 | bsmQlxx = row.bsmQlxx |
| 306 | getBlParamsByYwh(ywh, bsmQlxx).then(res => { | 307 | if (sjlx == '系统数据') { |
| 307 | let data = res.result | 308 | getXtParamsByYwh(ywh).then(res => { |
| 308 | this.$popup('材料信息', 'registerBook/components/clxx/index', { | 309 | let data = res.result |
| 309 | width: '60%', | 310 | // that.$popup('材料信息', 'registerBook/components/clxx/index', { |
| 310 | formData: data | 311 | // width: '60%', |
| 312 | // formData: data | ||
| 313 | // }) | ||
| 314 | const { href } = Router.resolve('/workFrameView?bsmSlsq=' + data.bsmSlsq + '&bsmBusiness=' + data.bsmBusiness) | ||
| 315 | window.open(href, `urlname${new Date().getTime()}`) | ||
| 311 | }) | 316 | }) |
| 312 | }) | 317 | } else { |
| 313 | // if (sjlx == '系统数据') { | 318 | getBlParamsByYwh(ywh, bsmQlxx).then(res => { |
| 314 | // getXtParamsByYwh(ywh).then(res => { | 319 | let data = res.result |
| 315 | // let data = res.result | 320 | this.$popup('材料信息', 'registerBook/components/clxx/index', { |
| 316 | // const { href } = Router.resolve('/workFrameView?bsmSlsq=' + data.bsmSlsq + '&bsmBusiness=' + data.bsmBusiness) | 321 | width: '60%', |
| 317 | // window.open(href, `urlname${new Date().getTime()}`) | 322 | formData: data |
| 318 | // }) | 323 | }) |
| 319 | // } else { | 324 | }) |
| 320 | // getBlParamsByYwh(ywh, bsmQlxx).then(res => { | 325 | } |
| 321 | // let data = res.result | ||
| 322 | // this.$popup('材料信息', 'registerBook/components/clxx/index', { | ||
| 323 | // width: '60%', | ||
| 324 | // formData: data | ||
| 325 | // }) | ||
| 326 | // }) | ||
| 327 | // } | ||
| 328 | } | 326 | } |
| 329 | } | 327 | } |
| 330 | }; | 328 | }; | ... | ... |
-
Please register or sign in to post a comment