Merge branch 'dev'
Showing
3 changed files
with
14 additions
and
16 deletions
1 | <!-- | 1 | <!-- |
2 | * @Description: | 2 | * @Description: |
3 | * @Autor: renchao | 3 | * @Autor: renchao |
4 | * @LastEditTime: 2023-10-19 10:30:56 | 4 | * @LastEditTime: 2023-10-27 13:17:15 |
5 | --> | 5 | --> |
6 | <template> | 6 | <template> |
7 | <div class="from-clues"> | 7 | <div class="from-clues"> |
... | @@ -37,7 +37,7 @@ | ... | @@ -37,7 +37,7 @@ |
37 | <el-col :span="4" class="btnColRight"> | 37 | <el-col :span="4" class="btnColRight"> |
38 | <el-form-item> | 38 | <el-form-item> |
39 | <el-button type="primary" native-type="submit" @click="handleSearch">查询</el-button> | 39 | <el-button type="primary" native-type="submit" @click="handleSearch">查询</el-button> |
40 | <el-button @click="moreQueryClick">高级查询</el-button> | 40 | <!-- <el-button @click="moreQueryClick">高级查询</el-button> --> |
41 | </el-form-item> | 41 | </el-form-item> |
42 | </el-col> | 42 | </el-col> |
43 | </el-row> | 43 | </el-row> | ... | ... |
... | @@ -69,14 +69,15 @@ class data extends filter { | ... | @@ -69,14 +69,15 @@ class data extends filter { |
69 | }, | 69 | }, |
70 | { | 70 | { |
71 | label: "业务号", | 71 | label: "业务号", |
72 | minWidth: '100', | 72 | prop: "ywh", |
73 | render: (h, scope) => { | 73 | width: '100', |
74 | return ( | 74 | // render: (h, scope) => { |
75 | <div> | 75 | // return ( |
76 | <el-link type="primary" onClick={() => { vm.openYwDialog(scope.row) }}>{scope.row.ywh}</el-link> | 76 | // <div> |
77 | </div> | 77 | // <el-link type="primary" onClick={() => { vm.openYwDialog(scope.row) }}>{scope.row.ywh}</el-link> |
78 | ) | 78 | // </div> |
79 | } | 79 | // ) |
80 | // } | ||
80 | }, | 81 | }, |
81 | { | 82 | { |
82 | label: "权利类型", | 83 | label: "权利类型", | ... | ... |
... | @@ -118,18 +118,15 @@ | ... | @@ -118,18 +118,15 @@ |
118 | item.djywbm = "DJBBL"; | 118 | item.djywbm = "DJBBL"; |
119 | const { href } = this.$router.resolve( | 119 | const { href } = this.$router.resolve( |
120 | "/djbworkFrameview?bsmSlsq=" + | 120 | "/djbworkFrameview?bsmSlsq=" + |
121 | item.bsmSlsq + | 121 | item.bsmSlsq + "&bsmBusiness=" + |
122 | "&bsmBusiness=" + | 122 | item.bsmBusiness + "&djywbm=" + |
123 | item.bsmBusiness + | ||
124 | "&sqywbm=" + | ||
125 | item.djywbm | 123 | item.djywbm |
126 | ); | 124 | ); |
127 | window.open(href, `djbworkFrameview${item.bsmSlsq}`); | 125 | window.open(href, `djbworkFrameview${item.bsmSlsq}`); |
128 | } else { | 126 | } else { |
129 | const { href } = this.$router.resolve( | 127 | const { href } = this.$router.resolve( |
130 | "/workFrameView?bsmSlsq=" + | 128 | "/workFrameView?bsmSlsq=" + |
131 | item.bsmSlsq + | 129 | item.bsmSlsq + "&bsmBusiness=" + |
132 | "&bsmBusiness=" + | ||
133 | item.bsmBusiness | 130 | item.bsmBusiness |
134 | ); | 131 | ); |
135 | window.open(href, `workFrameView${item.bsmSlsq}`) | 132 | window.open(href, `workFrameView${item.bsmSlsq}`) | ... | ... |
-
Please register or sign in to post a comment