Merge branch 'dev'
Showing
5 changed files
with
71 additions
and
66 deletions
1 | /* | 1 | /* |
2 | * @Description: 材料信息 | 2 | * @Description: 材料信息 |
3 | * @Autor: renchao | 3 | * @Autor: renchao |
4 | * @LastEditTime: 2023-09-18 16:03:16 | 4 | * @LastEditTime: 2024-01-19 16:00:03 |
5 | */ | 5 | */ |
6 | import request from '@/utils/request' | 6 | import request from '@/utils/request' |
7 | let SERVER = window.config ? window.config : JSON.parse(localStorage.getItem('ApiUrl')) | 7 | let SERVER = window.config ? window.config : JSON.parse(localStorage.getItem('ApiUrl')) | ... | ... |
1 | <!-- | 1 | <!-- |
2 | * @Description: | 2 | * @Description: |
3 | * @Autor: renchao | 3 | * @Autor: renchao |
4 | * @LastEditTime: 2023-10-09 10:18:46 | 4 | * @LastEditTime: 2024-01-19 16:30:06 |
5 | --> | 5 | --> |
6 | <template> | 6 | <template> |
7 | <div class="clxx"> | 7 | <div class="clxx"> |
... | @@ -45,7 +45,7 @@ | ... | @@ -45,7 +45,7 @@ |
45 | <script> | 45 | <script> |
46 | import store from '@/store/index.js' | 46 | import store from '@/store/index.js' |
47 | import imagePreview from "./dialog/imagePreview.vue"; | 47 | import imagePreview from "./dialog/imagePreview.vue"; |
48 | import { repairInitClml, getClmxList } from "@/api/clxx.js"; | 48 | import { InitClml, repairInitClml, getClmxList } from "@/api/clxx.js"; |
49 | export default { | 49 | export default { |
50 | components: { imagePreview }, | 50 | components: { imagePreview }, |
51 | props: { | 51 | props: { |
... | @@ -87,7 +87,7 @@ | ... | @@ -87,7 +87,7 @@ |
87 | } | 87 | } |
88 | }, | 88 | }, |
89 | created () { | 89 | created () { |
90 | this.clmlInitList() | 90 | this.clmlInitList(1) |
91 | }, | 91 | }, |
92 | methods: { | 92 | methods: { |
93 | /** | 93 | /** |
... | @@ -148,26 +148,51 @@ | ... | @@ -148,26 +148,51 @@ |
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 | if (this.formData.sjlx == 2) { |
152 | repairInitClml(this.formData).then((res) => { | 152 | repairInitClml(this.formData).then((res) => { |
153 | if (res.code == 200) { | 153 | if (res.code == 200) { |
154 | resolve(res.code); | 154 | resolve(res.code); |
155 | if (res.result && res.result.length > 0) { | 155 | if (res.result && res.result.length > 0) { |
156 | this.tableData = res.result; | 156 | this.tableData = res.result; |
157 | if (type == 1) { | 157 | if (type == 1) { |
158 | this.treeClick(this.tableData[0], 0); | 158 | this.treeClick(this.tableData[0], 0); |
159 | } else { | 159 | } else { |
160 | //新增材料后刷新列表焦点置于新增的对象上 | 160 | //新增材料后刷新列表焦点置于新增的对象上 |
161 | this.treeClick( | 161 | this.treeClick( |
162 | this.tableData[this.tableData.length - 1], | 162 | this.tableData[this.tableData.length - 1], |
163 | this.tableData.length - 1 | 163 | this.tableData.length - 1 |
164 | ); | 164 | ); |
165 | } | ||
165 | } | 166 | } |
167 | } else { | ||
168 | this.$message.error(res.message); | ||
166 | } | 169 | } |
167 | } else { | 170 | }) |
168 | this.$message.error(res.message); | 171 | } else { |
169 | } | 172 | var formdata = new FormData(); |
170 | }) | 173 | formdata.append("bsmSlsq", this.formData.bsmSlsq); |
174 | formdata.append("bsmSldy", this.formData.bsmSldy); | ||
175 | |||
176 | InitClml(formdata).then((res) => { | ||
177 | if (res.code == 200) { | ||
178 | resolve(res.code); | ||
179 | if (res.result && res.result.length > 0) { | ||
180 | this.tableData = res.result; | ||
181 | if (type == 1) { | ||
182 | this.treeClick(this.tableData[0], 0); | ||
183 | } else { | ||
184 | //新增材料后刷新列表焦点置于新增的对象上 | ||
185 | this.treeClick( | ||
186 | this.tableData[this.tableData.length - 1], | ||
187 | this.tableData.length - 1 | ||
188 | ); | ||
189 | } | ||
190 | } | ||
191 | } else { | ||
192 | this.$message.error(res.message); | ||
193 | } | ||
194 | }) | ||
195 | } | ||
171 | }) | 196 | }) |
172 | }, | 197 | }, |
173 | /** | 198 | /** |
... | @@ -280,13 +305,11 @@ | ... | @@ -280,13 +305,11 @@ |
280 | position: absolute; | 305 | position: absolute; |
281 | 306 | ||
282 | .menu-tree { | 307 | .menu-tree { |
283 | width: 20%; | 308 | width: 26%; |
284 | min-width: 160px; | 309 | min-width: 160px; |
285 | height: 100%; | 310 | height: 100%; |
286 | margin-right: 10px; | 311 | margin-right: 5px; |
287 | border-right: 1px dotted #d9d9d9; | 312 | border-right: 1px dotted #d9d9d9; |
288 | padding: 0 15px; | ||
289 | |||
290 | .item { | 313 | .item { |
291 | line-height: 30px; | 314 | line-height: 30px; |
292 | padding-top: 5px; | 315 | padding-top: 5px; | ... | ... |
1 | <!-- | 1 | <!-- |
2 | * @Description: | 2 | * @Description: |
3 | * @Autor: renchao | 3 | * @Autor: renchao |
4 | * @LastEditTime: 2024-01-19 15:46:35 | 4 | * @LastEditTime: 2024-01-19 16:10:10 |
5 | --> | 5 | --> |
6 | <template> | 6 | <template> |
7 | <div class="tableBox"> | 7 | <div class="tableBox"> |
... | @@ -260,19 +260,19 @@ | ... | @@ -260,19 +260,19 @@ |
260 | if (sjlx == '系统数据') { | 260 | if (sjlx == '系统数据') { |
261 | getXtParamsByYwh(ywh).then(res => { | 261 | getXtParamsByYwh(ywh).then(res => { |
262 | let data = res.result | 262 | let data = res.result |
263 | // that.$popup('材料信息', 'registerBook/components/clxx/index', { | 263 | that.$popup('材料信息', 'registerBook/components/clxx/index', { |
264 | // width: '60%', | 264 | width: '70%', |
265 | // formData: data | 265 | formData: { ...data, sjlx: 1, bsmSldy: row.bsmSldy } |
266 | // }) | 266 | }) |
267 | const { href } = Router.resolve('/workFrameView?bsmSlsq=' + data.bsmSlsq + '&bsmBusiness=' + data.bsmBusiness) | 267 | // const { href } = Router.resolve('/workFrameView?bsmSlsq=' + data.bsmSlsq + '&bsmBusiness=' + data.bsmBusiness) |
268 | window.open(href, `urlname${new Date().getTime()}`) | 268 | // window.open(href, `urlname${new Date().getTime()}`) |
269 | }) | 269 | }) |
270 | } else { | 270 | } else { |
271 | getBlParamsByYwh(ywh, bsmQlxx).then(res => { | 271 | getBlParamsByYwh(ywh, bsmQlxx).then(res => { |
272 | let data = res.result | 272 | let data = res.result |
273 | this.$popup('材料信息', 'registerBook/components/clxx/index', { | 273 | this.$popup('材料信息', 'registerBook/components/clxx/index', { |
274 | width: '60%', | 274 | width: '70%', |
275 | formData: data | 275 | formData: { ...data, sjlx: 2 } |
276 | }) | 276 | }) |
277 | }) | 277 | }) |
278 | } | 278 | } | ... | ... |
1 | <!-- | 1 | <!-- |
2 | * @Description: | 2 | * @Description: |
3 | * @Autor: miaofang | 3 | * @Autor: miaofang |
4 | * @LastEditTime: 2024-01-19 15:46:23 | 4 | * @LastEditTime: 2024-01-19 16:09:59 |
5 | --> | 5 | --> |
6 | <template> | 6 | <template> |
7 | <div class="djxxTable"> | 7 | <div class="djxxTable"> |
... | @@ -307,19 +307,19 @@ | ... | @@ -307,19 +307,19 @@ |
307 | if (sjlx == '系统数据') { | 307 | if (sjlx == '系统数据') { |
308 | getXtParamsByYwh(ywh).then(res => { | 308 | getXtParamsByYwh(ywh).then(res => { |
309 | let data = res.result | 309 | let data = res.result |
310 | // that.$popup('材料信息', 'registerBook/components/clxx/index', { | 310 | that.$popup('材料信息', 'registerBook/components/clxx/index', { |
311 | // width: '60%', | 311 | width: '70%', |
312 | // formData: data | 312 | formData: { ...data, sjlx: 1, bsmSldy: row.bsmSldy } |
313 | // }) | 313 | }) |
314 | const { href } = Router.resolve('/workFrameView?bsmSlsq=' + data.bsmSlsq + '&bsmBusiness=' + data.bsmBusiness) | 314 | // const { href } = Router.resolve('/workFrameView?bsmSlsq=' + data.bsmSlsq + '&bsmBusiness=' + data.bsmBusiness) |
315 | window.open(href, `urlname${new Date().getTime()}`) | 315 | // window.open(href, `urlname${new Date().getTime()}`) |
316 | }) | 316 | }) |
317 | } else { | 317 | } else { |
318 | getBlParamsByYwh(ywh, bsmQlxx).then(res => { | 318 | getBlParamsByYwh(ywh, bsmQlxx).then(res => { |
319 | let data = res.result | 319 | let data = res.result |
320 | this.$popup('材料信息', 'registerBook/components/clxx/index', { | 320 | this.$popup('材料信息', 'registerBook/components/clxx/index', { |
321 | width: '60%', | 321 | width: '70%', |
322 | formData: data | 322 | formData: { ...data, sjlx: 2 } |
323 | }) | 323 | }) |
324 | }) | 324 | }) |
325 | } | 325 | } | ... | ... |
1 | <!-- | 1 | <!-- |
2 | * @Description: | 2 | * @Description: |
3 | * @Autor: renchao | 3 | * @Autor: renchao |
4 | * @LastEditTime: 2024-01-17 14:17:17 | 4 | * @LastEditTime: 2024-01-19 16:25:18 |
5 | --> | 5 | --> |
6 | <template> | 6 | <template> |
7 | <div class="from-clues"> | 7 | <div class="from-clues"> |
... | @@ -195,6 +195,7 @@ | ... | @@ -195,6 +195,7 @@ |
195 | }, | 195 | }, |
196 | handleChange () { | 196 | handleChange () { |
197 | let arr = this.tableData.data.filter(item => item.bdcdyid == this.radioVal) | 197 | let arr = this.tableData.data.filter(item => item.bdcdyid == this.radioVal) |
198 | arr[0].bsm = arr[0].zdbsm | ||
198 | this.bdcdysz = arr | 199 | this.bdcdysz = arr |
199 | }, | 200 | }, |
200 | /** | 201 | /** |
... | @@ -204,31 +205,12 @@ | ... | @@ -204,31 +205,12 @@ |
204 | */ | 205 | */ |
205 | handleRowClick (row) { | 206 | handleRowClick (row) { |
206 | // 如果状态是1,那就是单选 | 207 | // 如果状态是1,那就是单选 |
207 | // if (this.sqywInfo.sqywdylx == "1") { | ||
208 | // const bdcdysz = this.bdcdysz | ||
209 | // this.$refs.table.clearSelection() | ||
210 | // if (bdcdysz.length == 1) { | ||
211 | // bdcdysz.forEach(item => { | ||
212 | // // 判断 如果当前的一行被勾选, 再次点击的时候就会取消选中 | ||
213 | // if (item == row) { | ||
214 | // this.$refs.table.toggleRowSelection(row, false); | ||
215 | // } | ||
216 | // // 不然就让当前的一行勾选 | ||
217 | // else { | ||
218 | // this.$refs.table.toggleRowSelection(row, true); | ||
219 | // } | ||
220 | // }) | ||
221 | // } | ||
222 | // else { | ||
223 | // this.$refs.table.toggleRowSelection(row, true); | ||
224 | // } | ||
225 | // } else { | ||
226 | // this.$refs.table.toggleRowSelection(row); | ||
227 | // } | ||
228 | let refs = 'table'; | 208 | let refs = 'table'; |
229 | if (this.sqywInfo.sqywdylx == "1") { | 209 | if (this.sqywInfo.sqywdylx == "1") { |
210 | row.bsm = row.zdbsm | ||
230 | this.bdcdysz = [row] | 211 | this.bdcdysz = [row] |
231 | this.radioVal = row.bdcdyid | 212 | this.radioVal = row.bdcdyid |
213 | |||
232 | } else { | 214 | } else { |
233 | this.$refs[refs].toggleRowSelection(row) | 215 | this.$refs[refs].toggleRowSelection(row) |
234 | } | 216 | } | ... | ... |
-
Please register or sign in to post a comment