Merge branch 'dev'
Showing
19 changed files
with
314 additions
and
373 deletions
... | @@ -25,6 +25,7 @@ | ... | @@ -25,6 +25,7 @@ |
25 | "nprogress": "0.2.0", | 25 | "nprogress": "0.2.0", |
26 | "print-js": "^1.6.0", | 26 | "print-js": "^1.6.0", |
27 | "qrcode": "^1.5.3", | 27 | "qrcode": "^1.5.3", |
28 | "sortablejs": "^1.15.0", | ||
28 | "vue": "2.6.10", | 29 | "vue": "2.6.10", |
29 | "vue-json-editor": "^1.4.3", | 30 | "vue-json-editor": "^1.4.3", |
30 | "vue-print-nb": "^1.7.5", | 31 | "vue-print-nb": "^1.7.5", | ... | ... |
1 | /* | 1 | /* |
2 | * @Description: 材料信息 | 2 | * @Description: 材料信息 |
3 | * @Autor: renchao | 3 | * @Autor: renchao |
4 | * @LastEditTime: 2023-09-08 13:41:46 | 4 | * @LastEditTime: 2023-09-13 11:09:48 |
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')) |
... | @@ -49,9 +49,9 @@ export function saveClml (data) { | ... | @@ -49,9 +49,9 @@ export function saveClml (data) { |
49 | * @param {*} data | 49 | * @param {*} data |
50 | * @author: renchao | 50 | * @author: renchao |
51 | */ | 51 | */ |
52 | export function updateClml (data) { | 52 | export function updateClml (data, bsmSldy) { |
53 | return request({ | 53 | return request({ |
54 | url: SERVER.SERVERAPI + '/rest/ywbl/clxx/updateClml', | 54 | url: SERVER.SERVERAPI + '/rest/ywbl/clxx/updateClml/' + bsmSldy, |
55 | method: 'post', | 55 | method: 'post', |
56 | data | 56 | data |
57 | }) | 57 | }) | ... | ... |
1 | /* | 1 | /* |
2 | * @Description: 楼盘表查询 | 2 | * @Description: 楼盘表查询 |
3 | * @Autor: renchao | 3 | * @Autor: renchao |
4 | * @LastEditTime: 2023-07-19 15:00:43 | 4 | * @LastEditTime: 2023-09-12 10:25:47 |
5 | */ | 5 | */ |
6 | import request from "@/utils/request"; | 6 | import request from "@/utils/request"; |
7 | let SERVER = window.config | 7 | let SERVER = window.config |
... | @@ -26,10 +26,14 @@ export function getLpZrz (data) { | ... | @@ -26,10 +26,14 @@ export function getLpZrz (data) { |
26 | * @param {*} zrzbsm | 26 | * @param {*} zrzbsm |
27 | * @author: renchao | 27 | * @author: renchao |
28 | */ | 28 | */ |
29 | export function getLpb (zrzbsm) { | 29 | export function getLpb (zrzbsm,lx) { |
30 | return request({ | 30 | return request({ |
31 | url: "service-lpb/rest/zhcx/lpcx/getLpb?scyclx=0&zrzbsm=" + zrzbsm, | 31 | url: "service-lpb/rest/zhcx/lpcx/getLpb", |
32 | method: "get", | 32 | method: "get", |
33 | params: { | ||
34 | zrzbsm:zrzbsm, | ||
35 | scyclx:lx, | ||
36 | }, | ||
33 | }); | 37 | }); |
34 | } | 38 | } |
35 | /** | 39 | /** | ... | ... |
1 | <!-- | 1 | <!-- |
2 | * @Description: | 2 | * @Description: |
3 | * @Autor: renchao | 3 | * @Autor: renchao |
4 | * @LastEditTime: 2023-09-12 13:58:04 | 4 | * @LastEditTime: 2023-09-13 09:10:29 |
5 | --> | 5 | --> |
6 | <template> | 6 | <template> |
7 | <div class="rlPopup"> | 7 | <div class="rlPopup"> |
... | @@ -273,9 +273,12 @@ | ... | @@ -273,9 +273,12 @@ |
273 | } | 273 | } |
274 | formData.append("bsmSj", this.previewImg.bsmSj); | 274 | formData.append("bsmSj", this.previewImg.bsmSj); |
275 | formData.append("bsmSlsq", this.previewImg.bsmSlsq); | 275 | formData.append("bsmSlsq", this.previewImg.bsmSlsq); |
276 | if (this.previewImg.imgList.length > 0) { | ||
277 | formData.append("index", this.previewImg.imgList[this.previewImg.index].sxh); | ||
278 | } | ||
276 | uploadBatch(formData).then((res) => { | 279 | uploadBatch(formData).then((res) => { |
277 | if (res.code == 200) { | 280 | if (res.code == 200) { |
278 | this.$emit('updateList', res.result) | 281 | this.$emit('updateList', { children: res.result, bsmSj: this.previewImg.bsmSj }) |
279 | this.$message({ | 282 | this.$message({ |
280 | message: '上传成功!', | 283 | message: '上传成功!', |
281 | type: 'success' | 284 | type: 'success' | ... | ... |
1 | <!-- | 1 | <!-- |
2 | * @Description: | 2 | * @Description: |
3 | * @Autor: renchao | 3 | * @Autor: renchao |
4 | * @LastEditTime: 2023-09-01 09:18:29 | 4 | * @LastEditTime: 2023-09-12 16:55:35 |
5 | --> | 5 | --> |
6 | <template> | 6 | <template> |
7 | <div class="edit"> | 7 | <div class="edit"> |
... | @@ -20,8 +20,10 @@ | ... | @@ -20,8 +20,10 @@ |
20 | <lpbContent | 20 | <lpbContent |
21 | ref="lpbContent" | 21 | ref="lpbContent" |
22 | :zrzbsm="formData.bsm" | 22 | :zrzbsm="formData.bsm" |
23 | :scyclx="formData.scyclx" | ||
23 | :onlyShow="formData.onlyShow" | 24 | :onlyShow="formData.onlyShow" |
24 | :unitData="formData.unitData" | 25 | :unitData="formData.unitData" |
26 | :sqywInfo="formData" | ||
25 | :key="time"></lpbContent> | 27 | :key="time"></lpbContent> |
26 | </div> | 28 | </div> |
27 | <!-- 右侧图例 --> | 29 | <!-- 右侧图例 --> | ... | ... |
... | @@ -12,13 +12,14 @@ | ... | @@ -12,13 +12,14 @@ |
12 | <ljzs-cpn v-if="lpbData.ljzs.length" :ljzs="lpbData.ljzs" :onlyShow="onlyShow"/> | 12 | <ljzs-cpn v-if="lpbData.ljzs.length" :ljzs="lpbData.ljzs" :onlyShow="onlyShow"/> |
13 | </div> | 13 | </div> |
14 | <!-- 自然幢名称 --> | 14 | <!-- 自然幢名称 --> |
15 | <p class="lpb-xmmc" :style="{ 'border-bottom': onlyShow ? 0 : '1px solid #e6e6e6'}"> | 15 | <!-- <p class="lpb-xmmc" :style="{ 'border-bottom': onlyShow ? 0 : '1px solid #e6e6e6'}"> --> |
16 | <el-checkbox @change="zdySelectAll($event)" v-if="!onlyShow">{{ | 16 | <p class="lpb-xmmc" :style="{ 'border-bottom':'1px solid #e6e6e6'}"> |
17 | <el-checkbox @change="zdySelectAll($event)">{{ | ||
17 | lpbData.xmmc | 18 | lpbData.xmmc |
18 | }}</el-checkbox> | 19 | }}</el-checkbox> |
19 | <span v-else>{{lpbData.xmmc}}</span> | ||
20 | </p> | 20 | </p> |
21 | <el-button type="primary" class="save-btn" v-if="!onlyShow" @click="saveLpb">保存</el-button> | 21 | <el-button type="primary" class="save-btn" v-if="!onlyShow" @click="saveLpb">保存</el-button> |
22 | <el-button type="primary" class="save-btn" v-else @click="submitForm" :loading="loading">发起申请</el-button> | ||
22 | <!-- 右键菜单 --> | 23 | <!-- 右键菜单 --> |
23 | <ul | 24 | <ul |
24 | v-show="lpbChVisible" | 25 | v-show="lpbChVisible" |
... | @@ -35,6 +36,7 @@ import { getLpb } from "@/api/lpcx.js"; | ... | @@ -35,6 +36,7 @@ import { getLpb } from "@/api/lpcx.js"; |
35 | import chCpn from "./ch.vue"; | 36 | import chCpn from "./ch.vue"; |
36 | import zdyCpn from "./zdys.vue"; | 37 | import zdyCpn from "./zdys.vue"; |
37 | import ljzsCpn from "./ljzs.vue"; | 38 | import ljzsCpn from "./ljzs.vue"; |
39 | import { startBusinessFlow, choiceBdcdy } from "@/api/workFlow.js"; | ||
38 | export default { | 40 | export default { |
39 | provide() { | 41 | provide() { |
40 | return { | 42 | return { |
... | @@ -63,7 +65,15 @@ export default { | ... | @@ -63,7 +65,15 @@ export default { |
63 | onlyShow:{ | 65 | onlyShow:{ |
64 | type: Boolean, | 66 | type: Boolean, |
65 | default: true, | 67 | default: true, |
66 | } | 68 | }, |
69 | scyclx: { | ||
70 | type: Number, | ||
71 | default: 0, | ||
72 | }, | ||
73 | sqywInfo: { | ||
74 | type: Object, | ||
75 | default: () => { } | ||
76 | }, | ||
67 | }, | 77 | }, |
68 | data() { | 78 | data() { |
69 | return { | 79 | return { |
... | @@ -87,11 +97,12 @@ export default { | ... | @@ -87,11 +97,12 @@ export default { |
87 | color:'' | 97 | color:'' |
88 | }, | 98 | }, |
89 | // 选中户bsm合集 | 99 | // 选中户bsm合集 |
90 | bsmList:[] | 100 | bsmList:[], |
101 | loading: false, | ||
91 | }; | 102 | }; |
92 | }, | 103 | }, |
93 | mounted() { | 104 | mounted() { |
94 | this.getLpb(this.zrzbsm); | 105 | this.scyclx ? this.getLpb(this.zrzbsm,this.scyclx):this.getLpb(this.zrzbsm); |
95 | window.lpbContent = this; | 106 | window.lpbContent = this; |
96 | }, | 107 | }, |
97 | methods: { | 108 | methods: { |
... | @@ -151,13 +162,15 @@ export default { | ... | @@ -151,13 +162,15 @@ export default { |
151 | getLpb(zrzbsm, scyclx, actual) { | 162 | getLpb(zrzbsm, scyclx, actual) { |
152 | getLpb(zrzbsm, scyclx).then((res) => { | 163 | getLpb(zrzbsm, scyclx).then((res) => { |
153 | if (res.code == 200) { | 164 | if (res.code == 200) { |
154 | res.result.lpb.ljzs = res.result.lpb.ljzs.sort(this.compare("place")); | 165 | if(scyclx){ |
155 | this.lpbData = res.result.lpb == null ? this.lpbData : res.result.lpb; | 166 | if(res.result.syclx == "1") { |
156 | // this.$nextTick(() => { | 167 | res.result.lpb.ljzs = res.result.lpb.ljzs.sort(this.compare("place")); |
157 | // //渲染楼盘表 | 168 | this.lpbData = res.result.lpb == null ? this.lpbData : res.result.lpb; |
158 | // this.dataChange(); | 169 | } |
159 | // }); | 170 | }else{ |
160 | console.log(this.lpbData, "this.lpbData"); | 171 | res.result.lpb.ljzs = res.result.lpb.ljzs.sort(this.compare("place")); |
172 | this.lpbData = res.result.lpb == null ? this.lpbData : res.result.lpb; | ||
173 | } | ||
161 | } else { | 174 | } else { |
162 | this.$message({ | 175 | this.$message({ |
163 | message: res.message, | 176 | message: res.message, |
... | @@ -207,10 +220,52 @@ export default { | ... | @@ -207,10 +220,52 @@ export default { |
207 | return value1 - value2; | 220 | return value1 - value2; |
208 | }; | 221 | }; |
209 | }, | 222 | }, |
223 | /** | ||
224 | * @description: submitForm | ||
225 | * @author: renchao | ||
226 | */ | ||
227 | submitForm () { | ||
228 | if (this.bsmList.length == 0) { | ||
229 | this.$message.error("请至少选择一条数据"); | ||
230 | return; | ||
231 | } | ||
232 | this.loading = true | ||
233 | this.bsmList.forEach(item=>{ | ||
234 | item['bdcdyid'] = item.dyhbsm | ||
235 | }) | ||
236 | startBusinessFlow({ | ||
237 | bsmSqyw: this.sqywInfo.bsmSqyw, | ||
238 | bdcdysz: this.bsmList, | ||
239 | }).then((res) => { | ||
240 | this.loading = false | ||
241 | if (res.code == 200) { | ||
242 | this.$message({ | ||
243 | showClose: true, | ||
244 | message: '发起申请成功', | ||
245 | type: 'success' | ||
246 | }) | ||
247 | if (!this.isJump) { | ||
248 | this.jump(res.result, this.sqywInfo.djywbm) | ||
249 | } else { | ||
250 | store.dispatch('user/refreshPage', true); | ||
251 | } | ||
252 | this.$popupCacel() | ||
253 | } else { | ||
254 | if (res.result && res.result.length > 0) { | ||
255 | this.$popup("申请错误明细", "components/ywdialog", { width:'36%', formData:{result: res.result} }) | ||
256 | } else { | ||
257 | this.$popup("申请错误明细", "components/ywdialog", { width:'36%', formData:{message: res.message} }) | ||
258 | } | ||
259 | } | ||
260 | }).catch(() => { | ||
261 | this.loading = false | ||
262 | }) | ||
263 | }, | ||
210 | }, | 264 | }, |
211 | computed:{ | 265 | computed:{ |
212 | lpbContentHeight(){ | 266 | lpbContentHeight(){ |
213 | return this.onlyShow ? 36 : 76 | 267 | // return this.onlyShow ? 36 : 76 |
268 | return 76 | ||
214 | } | 269 | } |
215 | }, | 270 | }, |
216 | watch: { | 271 | watch: { | ... | ... |
... | @@ -72,7 +72,9 @@ export default { | ... | @@ -72,7 +72,9 @@ export default { |
72 | }, | 72 | }, |
73 | render: { | 73 | render: { |
74 | handler(newValue, oldValue) { | 74 | handler(newValue, oldValue) { |
75 | this.loadData(); | 75 | if(newValue){ |
76 | this.loadData(); | ||
77 | } | ||
76 | }, | 78 | }, |
77 | }, | 79 | }, |
78 | immediate: true, | 80 | immediate: true, | ... | ... |
... | @@ -2,7 +2,7 @@ | ... | @@ -2,7 +2,7 @@ |
2 | * @Author: yangwei | 2 | * @Author: yangwei |
3 | * @Date: 2023-09-01 10:39:03 | 3 | * @Date: 2023-09-01 10:39:03 |
4 | * @LastEditors: yangwei | 4 | * @LastEditors: yangwei |
5 | * @LastEditTime: 2023-09-11 15:48:03 | 5 | * @LastEditTime: 2023-09-12 15:12:09 |
6 | * @FilePath: \bdcdj-web\src\views\sjgx\gbmhlgxsjgx\gbmhlgxsjgx.vue | 6 | * @FilePath: \bdcdj-web\src\views\sjgx\gbmhlgxsjgx\gbmhlgxsjgx.vue |
7 | * @Description: | 7 | * @Description: |
8 | * | 8 | * |
... | @@ -85,11 +85,12 @@ | ... | @@ -85,11 +85,12 @@ |
85 | :style="{ | 85 | :style="{ |
86 | backgroundColor: 'rgba(' + item.bgColor + ',0.12)', | 86 | backgroundColor: 'rgba(' + item.bgColor + ',0.12)', |
87 | border: '1px solid ' + 'rgba(' + item.bgColor + ',0.3)', | 87 | border: '1px solid ' + 'rgba(' + item.bgColor + ',0.3)', |
88 | '--hover-color': 'rgba(' + item.bgColor + ',1)' | ||
88 | }" | 89 | }" |
89 | > | 90 | > |
90 | <img :src="item.svg" alt="" /> | 91 | <img :src="item.svg" alt="" /> |
91 | </div> | 92 | </div> |
92 | <p>{{ item.name }}</p> | 93 | <p>{{ item.interfaceDescription }}</p> |
93 | </div> | 94 | </div> |
94 | </div> | 95 | </div> |
95 | <el-dialog | 96 | <el-dialog |
... | @@ -200,6 +201,12 @@ export default { | ... | @@ -200,6 +201,12 @@ export default { |
200 | comp: "zgfbm", | 201 | comp: "zgfbm", |
201 | svg: require("./images/zgfbm.svg"), | 202 | svg: require("./images/zgfbm.svg"), |
202 | }, | 203 | }, |
204 | { | ||
205 | name: "未知", | ||
206 | bgColor: "109, 114, 120", | ||
207 | comp: "", | ||
208 | svg: require("./images/unknow.svg"), | ||
209 | }, | ||
203 | ], | 210 | ], |
204 | dialogVisible: false, | 211 | dialogVisible: false, |
205 | dialogTitle: "", | 212 | dialogTitle: "", |
... | @@ -210,10 +217,19 @@ export default { | ... | @@ -210,10 +217,19 @@ export default { |
210 | mounted() { | 217 | mounted() { |
211 | getSysInterfaceList({ interfaceType: "4",pageSize:100 }).then((res) => { | 218 | getSysInterfaceList({ interfaceType: "4",pageSize:100 }).then((res) => { |
212 | if (res.code == 200) { | 219 | if (res.code == 200) { |
213 | this.searchType.forEach(item=>{ | 220 | res.result.records.forEach(i=>{ |
214 | let a = res.result.records.filter(i => i.interfaceService == item.name) | 221 | let a = this.searchType.filter(item => i.interfaceService == item.name) |
215 | 222 | if (a.length) { | |
223 | i.bgColor = a[0].bgColor | ||
224 | i.svg = a[0].svg | ||
225 | i.comp = a[0].comp | ||
226 | }else{ | ||
227 | i.bgColor = '109, 114, 120' | ||
228 | i.svg = require("./images/unknow.svg") | ||
229 | i.comp = '' | ||
230 | } | ||
216 | }) | 231 | }) |
232 | this.searchType = res.result.records | ||
217 | } | 233 | } |
218 | }); | 234 | }); |
219 | }, | 235 | }, |
... | @@ -225,10 +241,10 @@ export default { | ... | @@ -225,10 +241,10 @@ export default { |
225 | * @author: renchao | 241 | * @author: renchao |
226 | */ | 242 | */ |
227 | openDialog(item) { | 243 | openDialog(item) { |
228 | this.dialogTitle = item.name; | 244 | this.dialogTitle = item.interfaceDescription; |
229 | this.dialogVisible = true; | ||
230 | this.dialogComp = (r) => | 245 | this.dialogComp = (r) => |
231 | require.ensure([], () => r(require(`./components/${item.comp}.vue`))); | 246 | require.ensure([], () => r(require(`./components/${item.comp}.vue`))); |
247 | item.comp && (this.dialogVisible = true); | ||
232 | }, | 248 | }, |
233 | }, | 249 | }, |
234 | computed: { | 250 | computed: { |
... | @@ -254,6 +270,9 @@ export default { | ... | @@ -254,6 +270,9 @@ export default { |
254 | border-radius: 4px; | 270 | border-radius: 4px; |
255 | margin: 0 auto; | 271 | margin: 0 auto; |
256 | cursor: pointer; | 272 | cursor: pointer; |
273 | &:hover{ | ||
274 | border-color: var(--hover-color)!important; | ||
275 | } | ||
257 | i { | 276 | i { |
258 | text-align: center; | 277 | text-align: center; |
259 | line-height: 60px; | 278 | line-height: 60px; | ... | ... |
src/views/sjgx/gbmhlgxsjgx/images/unknow.svg
0 → 100644
1 | <?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1694481575357" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3080" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M908.91 937.6c0 17.67-14.33 32-32 32H147.09c-17.67 0-32-14.33-32-32V116.19c0-23.52 19.07-42.59 42.59-42.59h544.3l206.93 206.93V937.6z" fill="#B5B5B5" p-id="3081"></path><path d="M495.53 620.39c-37.63 0-44.43 6.79-44.43 43.38 0 37.63 6.8 43.91 44.43 43.91 37.11 0 44.43-6.27 44.43-43.91 0-36.59-7.32-43.38-44.43-43.38zM490.83 335.53c-31.36 0-59.58 3.66-78.92 9.41v64.82c18.29-5.76 42.33-8.89 63.77-8.89 42.33 0 55.4 6.79 55.4 38.15 0 21.95-4.7 31.88-27.7 50.18-30.84 26.65-40.25 42.85-40.25 72.64v23.52h63.77v-12.03c0-17.76 6.28-27.69 38.16-51.22 35.54-26.65 47.04-45.48 47.04-94.08-0.01-73.17-35.55-92.5-121.27-92.5zM700.91 73.6v173.92c0 17.47 14.05 31.7 31.52 31.91l176.48 2.18-208-208.01z" fill="#FFFFFF" p-id="3082"></path></svg> | ||
... | \ No newline at end of file | ... | \ No newline at end of file |
... | @@ -58,7 +58,7 @@ | ... | @@ -58,7 +58,7 @@ |
58 | </el-radio-group> | 58 | </el-radio-group> |
59 | </el-form-item> | 59 | </el-form-item> |
60 | </el-col> | 60 | </el-col> |
61 | </el-row> | 61 | </el-row> |
62 | <el-row> | 62 | <el-row> |
63 | <el-col :span="8"> | 63 | <el-col :span="8"> |
64 | <el-form-item label="业务流程ID" prop="flowid" v-if="form.sqdjyw"> | 64 | <el-form-item label="业务流程ID" prop="flowid" v-if="form.sqdjyw"> |
... | @@ -102,7 +102,7 @@ | ... | @@ -102,7 +102,7 @@ |
102 | </el-row> | 102 | </el-row> |
103 | </el-form> | 103 | </el-form> |
104 | <el-collapse class="modifycollapse" accordion> | 104 | <el-collapse class="modifycollapse" accordion> |
105 | <el-collapse-item title="登记类型" name="0" v-if="form.sqdjyw.sqfl=='2'"> | 105 | <el-collapse-item title="权利信息" name="0" v-if="form.sqdjyw.sqfl=='2'"> |
106 | <lb-table :column="djqxCol" :pagination="false" heightNumSetting :minHeight="160" :data="form.djlx"> | 106 | <lb-table :column="djqxCol" :pagination="false" heightNumSetting :minHeight="160" :data="form.djlx"> |
107 | </lb-table> | 107 | </lb-table> |
108 | </el-collapse-item> | 108 | </el-collapse-item> |
... | @@ -203,19 +203,19 @@ | ... | @@ -203,19 +203,19 @@ |
203 | */ | 203 | */ |
204 | init () { | 204 | init () { |
205 | this.tn = 0; | 205 | this.tn = 0; |
206 | if(this.formData.sqfl=="2"){ | 206 | if (this.formData.sqfl == "2") { |
207 | this.getDetail(this.formData.bsmSqyw); | 207 | this.getDetail(this.formData.bsmSqyw); |
208 | }else{ | 208 | } else { |
209 | getDjlxInfo(this.formData.bsmSqyw).then((res) => { | 209 | getDjlxInfo(this.formData.bsmSqyw).then((res) => { |
210 | let { result } = res; | 210 | let { result } = res; |
211 | this.djlxList = result ? result : []; | 211 | this.djlxList = result ? result : []; |
212 | if (this.djlxList.length > 0) { | 212 | if (this.djlxList.length > 0) { |
213 | this.getDetail(this.djlxList[0].bsmSqyw); | 213 | this.getDetail(this.djlxList[0].bsmSqyw); |
214 | } else { | 214 | } else { |
215 | this.getDetail(this.formData.bsmSqyw); | 215 | this.getDetail(this.formData.bsmSqyw); |
216 | } | 216 | } |
217 | }) | 217 | }) |
218 | } | 218 | } |
219 | }, | 219 | }, |
220 | /** | 220 | /** |
221 | * @description: orderNoChange | 221 | * @description: orderNoChange | ... | ... |
1 | <!-- | 1 | <!-- |
2 | * @Description: | 2 | * @Description: |
3 | * @Autor: renchao | 3 | * @Autor: renchao |
4 | * @LastEditTime: 2023-09-08 14:18:42 | 4 | * @LastEditTime: 2023-09-13 11:26:39 |
5 | --> | 5 | --> |
6 | <template> | 6 | <template> |
7 | <div class="clxx"> | 7 | <div class="clxx"> |
... | @@ -173,7 +173,6 @@ | ... | @@ -173,7 +173,6 @@ |
173 | formdata.append("bsmSldy", this.$parent.bsmRepair); | 173 | formdata.append("bsmSldy", this.$parent.bsmRepair); |
174 | formdata.append("clfl", 3); | 174 | formdata.append("clfl", 3); |
175 | } else { | 175 | } else { |
176 | //formdata.append("bsmSldy", this.unitData[0]?.bsmSldy); | ||
177 | formdata.append("bsmSldy", this.$parent.currentSelectProps.bsmSldy); | 176 | formdata.append("bsmSldy", this.$parent.currentSelectProps.bsmSldy); |
178 | formdata.append("clfl", 2); | 177 | formdata.append("clfl", 2); |
179 | } | 178 | } |
... | @@ -235,7 +234,7 @@ | ... | @@ -235,7 +234,7 @@ |
235 | this.previewImg.imgList = []; | 234 | this.previewImg.imgList = []; |
236 | this.tableData.forEach((item, index) => { | 235 | this.tableData.forEach((item, index) => { |
237 | if (this.treeCheckId == item.bsmSj) { | 236 | if (this.treeCheckId == item.bsmSj) { |
238 | item.children = []; | 237 | item.ys = 0; |
239 | that.treeCheckIndex = index; | 238 | that.treeCheckIndex = index; |
240 | } | 239 | } |
241 | }); | 240 | }); |
... | @@ -309,24 +308,6 @@ | ... | @@ -309,24 +308,6 @@ |
309 | this.showImg = item; | 308 | this.showImg = item; |
310 | this.titleYs = index + 1; | 309 | this.titleYs = index + 1; |
311 | }, | 310 | }, |
312 | /** | ||
313 | * @description: 字典 | ||
314 | * @param {*} val | ||
315 | * @param {*} code | ||
316 | * @author: renchao | ||
317 | */ | ||
318 | dicStatus (val, code) { | ||
319 | let data = this.$store.getters.dictData[code], | ||
320 | name = "暂无"; | ||
321 | if (data) { | ||
322 | data.map((item) => { | ||
323 | if (item.dcode == val) { | ||
324 | name = item.dname; | ||
325 | } | ||
326 | }); | ||
327 | return name; | ||
328 | } | ||
329 | }, | ||
330 | //查看明细 | 311 | //查看明细 |
331 | viewDetail () { | 312 | viewDetail () { |
332 | this.$store.dispatch("user/reWorkFresh", false); | 313 | this.$store.dispatch("user/reWorkFresh", false); |
... | @@ -335,6 +316,7 @@ | ... | @@ -335,6 +316,7 @@ |
335 | "workflow/components/dialog/clxxDetailDialog", | 316 | "workflow/components/dialog/clxxDetailDialog", |
336 | { | 317 | { |
337 | data: this.tableData, | 318 | data: this.tableData, |
319 | bsmSldy: this.$parent.currentSelectProps.bsmSldy, | ||
338 | unitData: this.$parent.unitData, | 320 | unitData: this.$parent.unitData, |
339 | ableOperation: this.$parent.ableOperation, | 321 | ableOperation: this.$parent.ableOperation, |
340 | bsmRepair: this.$parent.bsmRepair | 322 | bsmRepair: this.$parent.bsmRepair | ... | ... |
... | @@ -16,8 +16,8 @@ | ... | @@ -16,8 +16,8 @@ |
16 | 16 | ||
17 | <el-tabs v-model="activeName" @tab-click="handleClick" class="from-clues-header"> | 17 | <el-tabs v-model="activeName" @tab-click="handleClick" class="from-clues-header"> |
18 | <el-tab-pane label="基本信息" name="1"></el-tab-pane> | 18 | <el-tab-pane label="基本信息" name="1"></el-tab-pane> |
19 | <el-tab-pane label="企业信息" name="2"></el-tab-pane> | 19 | <el-tab-pane label="企业信息" v-if="showButton" name="2"></el-tab-pane> |
20 | <el-tab-pane label="银行机构" name="3"></el-tab-pane> | 20 | <el-tab-pane label="银行机构" v-if="showButton" name="3"></el-tab-pane> |
21 | </el-tabs> | 21 | </el-tabs> |
22 | 22 | ||
23 | <el-form | 23 | <el-form | ... | ... |
1 | <!-- | 1 | <!-- |
2 | * @Description: | 2 | * @Description: |
3 | * @Autor: renchao | 3 | * @Autor: renchao |
4 | * @LastEditTime: 2023-09-12 14:48:12 | 4 | * @LastEditTime: 2023-09-13 13:48:47 |
5 | --> | 5 | --> |
6 | <template> | 6 | <template> |
7 | <div class="clmlmx-box"> | 7 | <div class="clmlmx-box"> |
8 | <lb-table :column="column" :key="key" :heightNumSetting="true" :calcHeight="600" :pagination="false" :data="tableData"> | 8 | <lb-table :column="column" :key="key" row-key="bsmSj" ref="listTable" :heightNumSetting="true" :calcHeight="600" |
9 | :pagination="false" :data="tableData"> | ||
9 | </lb-table> | 10 | </lb-table> |
10 | <div class="text-center"> | 11 | <div class="text-center"> |
11 | <el-button @click="$popupCacel">取消</el-button> | 12 | <el-button @click="$popupCacel">取消</el-button> |
... | @@ -15,8 +16,9 @@ | ... | @@ -15,8 +16,9 @@ |
15 | </template> | 16 | </template> |
16 | <script> | 17 | <script> |
17 | import Vue from 'vue' | 18 | import Vue from 'vue' |
19 | import Sortable from 'sortablejs' | ||
18 | import store from '@/store/index.js' | 20 | import store from '@/store/index.js' |
19 | import { InitClml, updateClml, deleteSjClml, moveClml } from "@/api/clxx.js"; | 21 | import { InitClml, updateClml } from "@/api/clxx.js"; |
20 | export default { | 22 | export default { |
21 | props: { | 23 | props: { |
22 | formData: { | 24 | formData: { |
... | @@ -29,27 +31,9 @@ | ... | @@ -29,27 +31,9 @@ |
29 | data () { | 31 | data () { |
30 | return { | 32 | return { |
31 | loading: false, | 33 | loading: false, |
34 | sortable: null, | ||
32 | column: [ | 35 | column: [ |
33 | { | 36 | { |
34 | width: '50', | ||
35 | renderHeader: (h, scope) => { | ||
36 | return <div> { | ||
37 | !this.formData.ableOperation ? '序号' : <i class="el-icon-plus pointer" onClick={() => { this.addClick() }}></i> | ||
38 | } | ||
39 | </div> | ||
40 | }, | ||
41 | render: (h, scope) => { | ||
42 | return ( | ||
43 | <div> | ||
44 | { | ||
45 | !this.formData.ableOperation ? <span>{scope.$index + 1}</span> : | ||
46 | <i class="el-icon-minus pointer" onClick={() => { this.handleDelete(scope.$index, scope.row) }}></i> | ||
47 | } | ||
48 | </div> | ||
49 | ) | ||
50 | } | ||
51 | }, | ||
52 | { | ||
53 | prop: "isrequired", | 37 | prop: "isrequired", |
54 | label: "是否必选", | 38 | label: "是否必选", |
55 | width: "80", | 39 | width: "80", |
... | @@ -74,7 +58,7 @@ | ... | @@ -74,7 +58,7 @@ |
74 | label: "材料名称", | 58 | label: "材料名称", |
75 | render: (h, scope) => { | 59 | render: (h, scope) => { |
76 | return ( | 60 | return ( |
77 | (this.formData.ableOperation && scope.row.isrequired != '1') ? | 61 | (this.formData.ableOperation && scope.row.sfxjcl == '1') ? |
78 | <el-input value={scope.row.sjmc} onInput={(val) => { scope.row.sjmc = val }}></el-input> : <span>{scope.row.sjmc}</span> | 62 | <el-input value={scope.row.sjmc} onInput={(val) => { scope.row.sjmc = val }}></el-input> : <span>{scope.row.sjmc}</span> |
79 | ) | 63 | ) |
80 | } | 64 | } |
... | @@ -100,53 +84,56 @@ | ... | @@ -100,53 +84,56 @@ |
100 | }, | 84 | }, |
101 | { | 85 | { |
102 | prop: "sjsl", | 86 | prop: "sjsl", |
103 | label: "份数", | 87 | label: "收件数量", |
104 | width: "50", | 88 | width: "80", |
105 | render: (h, scope) => { | 89 | render: (h, scope) => { |
106 | return ( | 90 | return ( |
107 | (this.formData.ableOperation && scope.row.isrequired != '1') ? | 91 | (this.formData.ableOperation) ? |
108 | <el-input value={scope.row.sjsl} onInput={(val) => { scope.row.sjsl = val }}></el-input> : <span>{ | 92 | <el-input value={scope.row.sjsl} onInput={(val) => { scope.row.sjsl = val }}></el-input> : <span>{ |
109 | scope.row.sjsl ? | 93 | scope.row.sjsl |
110 | <span>{scope.row.sjsl}</span> : 1 | ||
111 | }</span> | 94 | }</span> |
112 | ) | 95 | ) |
113 | } | 96 | } |
114 | }, | 97 | }, |
115 | { | 98 | { |
116 | prop: "smzt", | 99 | label: "扫描时间", |
117 | label: "扫描状态", | 100 | width: "140", |
118 | width: "80", | 101 | render: (h, scope) => { |
102 | return ( | ||
103 | <span>{scope.row.sjsj}</span> | ||
104 | ) | ||
105 | } | ||
106 | }, | ||
107 | { | ||
108 | label: "页数", | ||
109 | width: "60", | ||
119 | render: (h, scope) => { | 110 | render: (h, scope) => { |
120 | if (scope.row.children && scope.row.children.length > 0) { | 111 | if (scope.row.ys && scope.row.ys > 0) { |
121 | return ( | 112 | return ( |
122 | <div> | 113 | <div> |
123 | <span>已扫描</span> | 114 | <span>{scope.row.ys}</span> |
124 | </div> | 115 | </div> |
125 | ); | 116 | ); |
126 | } else { | 117 | } else { |
127 | return ( | 118 | return ( |
128 | <div> | 119 | <div> |
129 | <span>未扫描</span> | 120 | <span>0</span> |
130 | </div> | 121 | </div> |
131 | ); | 122 | ); |
132 | } | 123 | } |
133 | }, | 124 | }, |
134 | }, | 125 | }, |
135 | { | 126 | { |
136 | label: "扫描页数", | 127 | label: "是否新建材料", |
137 | width: "80", | 128 | width: "80", |
138 | render: (h, scope) => { | 129 | render: (h, scope) => { |
139 | if (scope.row.children && scope.row.children.length > 0) { | 130 | if (scope.row.sfxjcl && scope.row.sfxjcl == '1') { |
140 | return ( | 131 | return ( |
141 | <div> | 132 | <span>是</span> |
142 | <span>{scope.row.children.length}</span> | ||
143 | </div> | ||
144 | ); | 133 | ); |
145 | } else { | 134 | } else { |
146 | return ( | 135 | return ( |
147 | <div> | 136 | <span>否</span> |
148 | <span>0</span> | ||
149 | </div> | ||
150 | ); | 137 | ); |
151 | } | 138 | } |
152 | }, | 139 | }, |
... | @@ -156,27 +143,16 @@ | ... | @@ -156,27 +143,16 @@ |
156 | width: "100", | 143 | width: "100", |
157 | render: (h, scope) => { | 144 | render: (h, scope) => { |
158 | return ( | 145 | return ( |
159 | <div> | 146 | <el-button |
160 | <el-button | 147 | type="text" |
161 | type="text" | 148 | icon="el-icon-delete" |
162 | disabled={scope.$index == 0 || !this.formData.ableOperation} | 149 | disabled={!(scope.row.ys == 0 && scope.row.sfxjcl == '1') || !this.formData.ableOperation} |
163 | onClick={() => { | 150 | onClick={() => { |
164 | this.moveUpward(scope.$index, scope.row); | 151 | this.handleDelete(scope.$index, scope.row); |
165 | }} | 152 | }} |
166 | > | 153 | > |
167 | 上移 | 154 | 删除 |
168 | </el-button> | 155 | </el-button> |
169 | <el-button | ||
170 | type="text" | ||
171 | disabled={scope.$index + 1 == this.tableData.length || !this.formData.ableOperation} | ||
172 | onClick={() => { | ||
173 | this.moveDown(scope.$index, scope.row); | ||
174 | }} | ||
175 | > | ||
176 | 下移 | ||
177 | </el-button> | ||
178 | |||
179 | </div > | ||
180 | ) | 156 | ) |
181 | } | 157 | } |
182 | } | 158 | } |
... | @@ -194,14 +170,19 @@ | ... | @@ -194,14 +170,19 @@ |
194 | deep: true | 170 | deep: true |
195 | } | 171 | } |
196 | }, | 172 | }, |
173 | mounted () { | ||
174 | this.initSort() | ||
175 | }, | ||
176 | beforeDestroy () { | ||
177 | if (this.sortable) { | ||
178 | this.sortable.destroy(); | ||
179 | } | ||
180 | }, | ||
197 | methods: { | 181 | methods: { |
198 | /** | ||
199 | * @description: handleSubmit | ||
200 | * @author: renchao | ||
201 | */ | ||
202 | handleSubmit () { | 182 | handleSubmit () { |
203 | this.loading = true | 183 | this.loading = true |
204 | updateClml(this.tableData).then(res => { | 184 | store.dispatch('user/reWorkFresh', false) |
185 | updateClml(this.tableData, this.formData.bsmSldy).then(res => { | ||
205 | this.loading = false | 186 | this.loading = false |
206 | if (res.code == 200) { | 187 | if (res.code == 200) { |
207 | this.$message({ | 188 | this.$message({ |
... | @@ -246,87 +227,18 @@ | ... | @@ -246,87 +227,18 @@ |
246 | }) | 227 | }) |
247 | }, | 228 | }, |
248 | /** | 229 | /** |
249 | * @description: 上移 | ||
250 | * @param {*} index | ||
251 | * @param {*} row | ||
252 | * @author: renchao | ||
253 | */ | ||
254 | moveUpward (index, row) { | ||
255 | let obj = { | ||
256 | xh: row.xh, | ||
257 | bsmSlsq: row.bsmSlsq, | ||
258 | moveDirection: "UP", | ||
259 | }; | ||
260 | // 接口待调 | ||
261 | moveClml(obj).then(async (res) => { | ||
262 | if (res.code == 200) { | ||
263 | let res = await this.clmlInitList() | ||
264 | if (res == 200) { | ||
265 | this.$message({ | ||
266 | message: '上移成功', | ||
267 | type: 'success' | ||
268 | }) | ||
269 | } | ||
270 | } else { | ||
271 | this.$message.error(res.message); | ||
272 | } | ||
273 | }) | ||
274 | }, | ||
275 | /** | ||
276 | * @description: 下移 | ||
277 | * @param {*} index | ||
278 | * @param {*} row | ||
279 | * @author: renchao | ||
280 | */ | ||
281 | moveDown (index, row) { | ||
282 | let obj = { | ||
283 | xh: row.xh, | ||
284 | bsmSlsq: row.bsmSlsq, | ||
285 | moveDirection: "DOWN", | ||
286 | } | ||
287 | // 接口待调 | ||
288 | moveClml(obj).then(async (res) => { | ||
289 | if (res.code == 200) { | ||
290 | let res = await this.clmlInitList() | ||
291 | if (res == 200) { | ||
292 | this.$message({ | ||
293 | message: '下移成功', | ||
294 | type: 'success' | ||
295 | }) | ||
296 | } | ||
297 | } else { | ||
298 | this.$message.error(res.message); | ||
299 | } | ||
300 | }) | ||
301 | }, | ||
302 | /** | ||
303 | * @description: 材料目录删除 | 230 | * @description: 材料目录删除 |
304 | * @param {*} index | 231 | * @param {*} index |
305 | * @param {*} row | 232 | * @param {*} row |
306 | * @author: renchao | ||
307 | */ | 233 | */ |
308 | handleDelete (index, row) { | 234 | handleDelete (index, row) { |
309 | if (row.children.length > 0) { | ||
310 | this.$message.error('页数存在不可删除'); | ||
311 | return | ||
312 | } | ||
313 | let that = this | 235 | let that = this |
314 | this.$confirm('此操作将永久删除该 是否继续?', '提示', { | 236 | this.$confirm('此操作将永久删除该 是否继续?', '提示', { |
315 | confirmButtonText: '确定', | 237 | confirmButtonText: '确定', |
316 | cancelButtonText: '取消', | 238 | cancelButtonText: '取消', |
317 | type: 'warning' | 239 | type: 'warning' |
318 | }).then(() => { | 240 | }).then(() => { |
319 | deleteSjClml({ sjBsm: row.bsmSj }).then(async (res) => { | 241 | this.tableData.splice(index, 1); |
320 | if (res.code == 200) { | ||
321 | let res = await that.clmlInitList() | ||
322 | if (res == 200) { | ||
323 | that.$message({ | ||
324 | message: "删除成功", | ||
325 | type: "success" | ||
326 | }) | ||
327 | } | ||
328 | } | ||
329 | }) | ||
330 | }).catch(() => { | 242 | }).catch(() => { |
331 | this.$message({ | 243 | this.$message({ |
332 | type: 'info', | 244 | type: 'info', |
... | @@ -334,23 +246,18 @@ | ... | @@ -334,23 +246,18 @@ |
334 | }) | 246 | }) |
335 | }) | 247 | }) |
336 | }, | 248 | }, |
337 | /** | 249 | initSort () { |
338 | * @description: 字典 | 250 | const el = this.$refs.listTable.$el.querySelectorAll('.el-table__body-wrapper > table > tbody')[0] |
339 | * @param {*} val | 251 | this.sortable = Sortable.create(el, { |
340 | * @param {*} code | 252 | ghostClass: 'sortable-ghost', |
341 | * @author: renchao | 253 | setData: function (dataTransfer) { |
342 | */ | 254 | dataTransfer.setData('Text', '') |
343 | dicStatus (val, code) { | 255 | }, |
344 | let data = store.getters.dictData[code], | 256 | onEnd: evt => { |
345 | name = "暂无"; | 257 | const targetRow = this.tableData.splice(evt.oldIndex, 1)[0]; |
346 | if (data) { | 258 | this.tableData.splice(evt.newIndex, 0, targetRow); |
347 | data.map((item) => { | 259 | } |
348 | if (item.dcode == val) { | 260 | }) |
349 | name = item.dname; | ||
350 | } | ||
351 | }); | ||
352 | return name; | ||
353 | } | ||
354 | } | 261 | } |
355 | } | 262 | } |
356 | } | 263 | } | ... | ... |
1 | <!-- | 1 | <!-- |
2 | * @Description: workFrame左侧菜单列表-普通 | 2 | * @Description: workFrame左侧菜单列表-普通 |
3 | * @Autor: renchao | 3 | * @Autor: renchao |
4 | * @LastEditTime: 2023-09-12 13:29:54 | 4 | * @LastEditTime: 2023-09-13 13:51:33 |
5 | --> | 5 | --> |
6 | <template> | 6 | <template> |
7 | <div class="leftmenu" :class="{ 'animation-map-drawer': isShowdrawer }"> | 7 | <div class="leftmenu" :class="{ 'animation-map-drawer': isShowdrawer }"> | ... | ... |
1 | <!-- | 1 | <!-- |
2 | * @Description: | 2 | * @Description: |
3 | * @Autor: renchao | 3 | * @Autor: renchao |
4 | * @LastEditTime: 2023-09-13 13:55:25 | 4 | * @LastEditTime: 2023-09-13 14:00:22 |
5 | --> | 5 | --> |
6 | <template> | 6 | <template> |
7 | <div class="container"> | 7 | <div class="container"> |
... | @@ -181,12 +181,7 @@ | ... | @@ -181,12 +181,7 @@ |
181 | window.removeEventListener("unload", (e) => this.unloadHandler(e)); | 181 | window.removeEventListener("unload", (e) => this.unloadHandler(e)); |
182 | }, | 182 | }, |
183 | methods: { | 183 | methods: { |
184 | /** | ||
185 | * @description: openPrint | ||
186 | * @author:miaofang | ||
187 | */ | ||
188 | openPrint () { | 184 | openPrint () { |
189 | |||
190 | // 获取打印回执数据 | 185 | // 获取打印回执数据 |
191 | var formdata = new FormData(); | 186 | var formdata = new FormData(); |
192 | formdata.append("bsmSldy", this.currentSelectProps.bsmSldy); | 187 | formdata.append("bsmSldy", this.currentSelectProps.bsmSldy); |
... | @@ -199,15 +194,9 @@ | ... | @@ -199,15 +194,9 @@ |
199 | setTimeout(() => { | 194 | setTimeout(() => { |
200 | this.prinsss() | 195 | this.prinsss() |
201 | }, 100) | 196 | }, 100) |
202 | |||
203 | } | 197 | } |
204 | }) | 198 | }) |
205 | |||
206 | }, | 199 | }, |
207 | /** | ||
208 | * @description: prinsss | ||
209 | * @author: miaofang | ||
210 | */ | ||
211 | prinsss () { | 200 | prinsss () { |
212 | printJS({ | 201 | printJS({ |
213 | printable: "boxaaa", // // 文档来源:pdf或图像的url,html元素的id或json数据的对象 | 202 | printable: "boxaaa", // // 文档来源:pdf或图像的url,html元素的id或json数据的对象 |
... | @@ -268,6 +257,9 @@ | ... | @@ -268,6 +257,9 @@ |
268 | } else { | 257 | } else { |
269 | this.tabName = res.result[0].value; | 258 | this.tabName = res.result[0].value; |
270 | } | 259 | } |
260 | if (sessionStorage.getItem('activeName') == this.tabName) { | ||
261 | this.fresh++; | ||
262 | } | ||
271 | this.ableOperation = this.tabList[0].ableOperation; | 263 | this.ableOperation = this.tabList[0].ableOperation; |
272 | //批量操作无分屏按钮 | 264 | //批量操作无分屏按钮 |
273 | if (index != null) { | 265 | if (index != null) { | ... | ... |
1 | <!-- | 1 | <!-- |
2 | * @Description: | 2 | * @Description: |
3 | * @Autor: renchao | 3 | * @Autor: renchao |
4 | * @LastEditTime: 2023-09-12 15:18:52 | 4 | * @LastEditTime: 2023-09-13 13:46:03 |
5 | --> | 5 | --> |
6 | <template> | 6 | <template> |
7 | <div class="clmlmx-box"> | 7 | <div class="clmlmx-box"> |
8 | <lb-table :column="column" :key="key" :heightNumSetting="true" :calcHeight="500" :pagination="false" :data="tableData"> | 8 | <lb-table :column="column" :key="key" row-key="bsmMaterial" ref="listTable" :heightNumSetting="true" :calcHeight="500" :pagination="false" |
9 | :data="tableData"> | ||
9 | </lb-table> | 10 | </lb-table> |
10 | <div class="text-center"> | 11 | <div class="text-center"> |
11 | <el-button @click="handleCancel">取消</el-button> | 12 | <el-button @click="handleCancel">取消</el-button> |
... | @@ -30,23 +31,27 @@ | ... | @@ -30,23 +31,27 @@ |
30 | data () { | 31 | data () { |
31 | return { | 32 | return { |
32 | loading: false, | 33 | loading: false, |
34 | sortable: null, | ||
33 | column: [ | 35 | column: [ |
34 | { | 36 | { |
35 | width: '50', | 37 | prop: "isrequired", |
36 | renderHeader: (h, scope) => { | 38 | label: "是否必选", |
37 | return <div> { | 39 | width: "80", |
38 | <i class="el-icon-plus pointer" onClick={() => { this.handleAdd() }}></i> | ||
39 | } | ||
40 | </div> | ||
41 | }, | ||
42 | render: (h, scope) => { | 40 | render: (h, scope) => { |
43 | return ( | 41 | if (scope.row.isrequired === "1") { |
44 | <div> | 42 | return ( |
45 | { | 43 | <div> |
46 | <i class="el-icon-minus pointer" onClick={() => { this.handleDelete(scope.$index, scope.row) }}></i> | 44 | <span>必选</span> |
47 | } | 45 | </div> |
48 | </div> | 46 | ); |
49 | ) | 47 | } |
48 | else { | ||
49 | return ( | ||
50 | <div> | ||
51 | <span>可选</span> | ||
52 | </div> | ||
53 | ) | ||
54 | } | ||
50 | } | 55 | } |
51 | }, | 56 | }, |
52 | { | 57 | { |
... | @@ -85,40 +90,44 @@ | ... | @@ -85,40 +90,44 @@ |
85 | } | 90 | } |
86 | }, | 91 | }, |
87 | { | 92 | { |
88 | prop: "smzt", | 93 | label: "扫描时间", |
89 | label: "扫描状态", | 94 | width: "140", |
95 | render: (h, scope) => { | ||
96 | return ( | ||
97 | <span>{scope.row.sjsj}</span> | ||
98 | ) | ||
99 | } | ||
100 | }, | ||
101 | { | ||
102 | label: "页数", | ||
90 | width: "80", | 103 | width: "80", |
91 | render: (h, scope) => { | 104 | render: (h, scope) => { |
92 | if (scope.row.children && scope.row.children.length > 0) { | 105 | if (scope.row.count && scope.row.count > 0) { |
93 | return ( | 106 | return ( |
94 | <div> | 107 | <div> |
95 | <span>已扫描</span> | 108 | <span>{scope.row.count}</span> |
96 | </div> | 109 | </div> |
97 | ); | 110 | ); |
98 | } else { | 111 | } else { |
99 | return ( | 112 | return ( |
100 | <div> | 113 | <div> |
101 | <span>未扫描</span> | 114 | <span>0</span> |
102 | </div> | 115 | </div> |
103 | ); | 116 | ); |
104 | } | 117 | } |
105 | }, | 118 | }, |
106 | }, | 119 | }, |
107 | { | 120 | { |
108 | label: "扫描页数", | 121 | label: "是否新建材料", |
109 | width: "80", | 122 | width: "80", |
110 | render: (h, scope) => { | 123 | render: (h, scope) => { |
111 | if (scope.row.count && scope.row.count > 0) { | 124 | if (scope.row.sfxjcl && scope.row.sfxjcl == '1') { |
112 | return ( | 125 | return ( |
113 | <div> | 126 | <span>是</span> |
114 | <span>{scope.row.count}</span> | ||
115 | </div> | ||
116 | ); | 127 | ); |
117 | } else { | 128 | } else { |
118 | return ( | 129 | return ( |
119 | <div> | 130 | <span>否</span> |
120 | <span>0</span> | ||
121 | </div> | ||
122 | ); | 131 | ); |
123 | } | 132 | } |
124 | }, | 133 | }, |
... | @@ -128,26 +137,16 @@ | ... | @@ -128,26 +137,16 @@ |
128 | width: "100", | 137 | width: "100", |
129 | render: (h, scope) => { | 138 | render: (h, scope) => { |
130 | return ( | 139 | return ( |
131 | <div> | 140 | <el-button |
132 | <el-button | 141 | type="text" |
133 | type="text" | 142 | icon="el-icon-delete" |
134 | disabled={scope.$index == 0} | 143 | disabled={!(scope.row.count == 0 && scope.row.sfxjcl == '1') || !this.formData.ableOperation} |
135 | onClick={() => { | 144 | onClick={() => { |
136 | this.moveUpward(scope.$index, scope.row); | 145 | this.handleDelete(scope.$index, scope.row); |
137 | }} | 146 | }} |
138 | > | 147 | > |
139 | 上移 | 148 | 删除 |
140 | </el-button> | 149 | </el-button> |
141 | <el-button | ||
142 | type="text" | ||
143 | disabled={scope.$index + 1 == this.tableData.length} | ||
144 | onClick={() => { | ||
145 | this.moveDown(scope.$index, scope.row); | ||
146 | }} | ||
147 | > | ||
148 | 下移 | ||
149 | </el-button> | ||
150 | </div > | ||
151 | ) | 150 | ) |
152 | } | 151 | } |
153 | } | 152 | } |
... | @@ -156,6 +155,14 @@ | ... | @@ -156,6 +155,14 @@ |
156 | tableData: [] | 155 | tableData: [] |
157 | } | 156 | } |
158 | }, | 157 | }, |
158 | mounted () { | ||
159 | this.initSort() | ||
160 | }, | ||
161 | beforeDestroy () { | ||
162 | if (this.sortable) { | ||
163 | this.sortable.destroy(); | ||
164 | } | ||
165 | }, | ||
159 | watch: { | 166 | watch: { |
160 | 'formData.data': { | 167 | 'formData.data': { |
161 | handler: function (val, oldVal) { | 168 | handler: function (val, oldVal) { |
... | @@ -180,6 +187,7 @@ | ... | @@ -180,6 +187,7 @@ |
180 | }, | 187 | }, |
181 | handleSubmit () { | 188 | handleSubmit () { |
182 | this.loading = true | 189 | this.loading = true |
190 | store.dispatch('user/reWorkFresh', false) | ||
183 | updateClml(this.tableData).then(res => { | 191 | updateClml(this.tableData).then(res => { |
184 | this.loading = false | 192 | this.loading = false |
185 | if (res.code == 200) { | 193 | if (res.code == 200) { |
... | @@ -218,60 +226,6 @@ | ... | @@ -218,60 +226,6 @@ |
218 | }) | 226 | }) |
219 | }, | 227 | }, |
220 | /** | 228 | /** |
221 | * @description: 上移 | ||
222 | * @param {*} index | ||
223 | * @param {*} row | ||
224 | * @author: renchao | ||
225 | */ | ||
226 | moveUpward (index, row) { | ||
227 | let obj = { | ||
228 | xh: row.xh, | ||
229 | bsmSlsq: row.bsmSlsq, | ||
230 | moveDirection: "UP", | ||
231 | }; | ||
232 | // 接口待调 | ||
233 | moveClml(obj).then(async (res) => { | ||
234 | if (res.code == 200) { | ||
235 | let res = await this.clmlInitList() | ||
236 | if (res == 200) { | ||
237 | this.$message({ | ||
238 | message: '上移成功', | ||
239 | type: 'success' | ||
240 | }) | ||
241 | } | ||
242 | } else { | ||
243 | this.$message.error(res.message); | ||
244 | } | ||
245 | }) | ||
246 | }, | ||
247 | /** | ||
248 | * @description: 下移 | ||
249 | * @param {*} index | ||
250 | * @param {*} row | ||
251 | * @author: renchao | ||
252 | */ | ||
253 | moveDown (index, row) { | ||
254 | let obj = { | ||
255 | xh: row.xh, | ||
256 | bsmSlsq: row.bsmSlsq, | ||
257 | moveDirection: "DOWN", | ||
258 | } | ||
259 | // 接口待调 | ||
260 | moveClml(obj).then(async (res) => { | ||
261 | if (res.code == 200) { | ||
262 | let res = await this.clmlInitList() | ||
263 | if (res == 200) { | ||
264 | this.$message({ | ||
265 | message: '下移成功', | ||
266 | type: 'success' | ||
267 | }) | ||
268 | } | ||
269 | } else { | ||
270 | this.$message.error(res.message); | ||
271 | } | ||
272 | }) | ||
273 | }, | ||
274 | /** | ||
275 | * @description: 材料目录删除 | 229 | * @description: 材料目录删除 |
276 | * @param {*} index | 230 | * @param {*} index |
277 | * @param {*} row | 231 | * @param {*} row |
... | @@ -301,6 +255,19 @@ | ... | @@ -301,6 +255,19 @@ |
301 | message: '已取消删除' | 255 | message: '已取消删除' |
302 | }) | 256 | }) |
303 | }) | 257 | }) |
258 | }, | ||
259 | initSort () { | ||
260 | const el = this.$refs.listTable.$el.querySelectorAll('.el-table__body-wrapper > table > tbody')[0] | ||
261 | this.sortable = Sortable.create(el, { | ||
262 | ghostClass: 'sortable-ghost', | ||
263 | setData: function (dataTransfer) { | ||
264 | dataTransfer.setData('Text', '') | ||
265 | }, | ||
266 | onEnd: evt => { | ||
267 | const targetRow = this.tableData.splice(evt.oldIndex, 1)[0]; | ||
268 | this.tableData.splice(evt.newIndex, 0, targetRow); | ||
269 | } | ||
270 | }) | ||
304 | } | 271 | } |
305 | } | 272 | } |
306 | } | 273 | } | ... | ... |
1 | <!-- | 1 | <!-- |
2 | * @Description: | 2 | * @Description: |
3 | * @Autor: renchao | 3 | * @Autor: renchao |
4 | * @LastEditTime: 2023-08-18 14:01:00 | 4 | * @LastEditTime: 2023-09-13 14:00:51 |
5 | --> | 5 | --> |
6 | <template> | 6 | <template> |
7 | <div class="from-clues"> | 7 | <div class="from-clues"> |
... | @@ -61,7 +61,7 @@ | ... | @@ -61,7 +61,7 @@ |
61 | </el-form> | 61 | </el-form> |
62 | </div> | 62 | </div> |
63 | <div class="from-clues-content loadingtext"> | 63 | <div class="from-clues-content loadingtext"> |
64 | <lb-table ref="table" @row-click="handleRowClick" :page-size="pageData.pageSize" :calcHeight="300" | 64 | <lb-table ref="table1" @row-click="handleRowClick" :page-size="pageData.pageSize" :calcHeight="300" |
65 | :current-page.sync="pageData.currentPage" :total="zrztableData.total" @size-change="handleSizeChange" @select="select" | 65 | :current-page.sync="pageData.currentPage" :total="zrztableData.total" @size-change="handleSizeChange" @select="select" |
66 | @p-current-change="handleCurrentChange" @selection-change="handleSelectionChange" :column="zrztableData.columns" | 66 | @p-current-change="handleCurrentChange" @selection-change="handleSelectionChange" :column="zrztableData.columns" |
67 | :data="zrztableData.data"> | 67 | :data="zrztableData.data"> |
... | @@ -303,14 +303,11 @@ | ... | @@ -303,14 +303,11 @@ |
303 | * @author: renchao | 303 | * @author: renchao |
304 | */ | 304 | */ |
305 | handleLpbClick (item) { | 305 | handleLpbClick (item) { |
306 | this.$popup('楼盘表', 'lpb/index', { | 306 | ywPopupDialog('楼盘表', 'lpb/index', { |
307 | width: '85%', | ||
308 | formData: { | ||
309 | bsm: item.bsm, | 307 | bsm: item.bsm, |
310 | bsmSqyw:this.sqywInfo.bsmSqyw | 308 | bsmSqyw:this.sqywInfo.bsmSqyw, |
311 | 309 | scyclx:1 | |
312 | } | 310 | }, '85%', true,false) |
313 | }) | ||
314 | }, | 311 | }, |
315 | /** | 312 | /** |
316 | * @description: select | 313 | * @description: select |
... | @@ -335,26 +332,27 @@ | ... | @@ -335,26 +332,27 @@ |
335 | */ | 332 | */ |
336 | handleRowClick (row) { | 333 | handleRowClick (row) { |
337 | // 自然幢多选,多幢单选 | 334 | // 自然幢多选,多幢单选 |
335 | let refs = 'table1'; | ||
338 | if (this.activeName == 'dz') { | 336 | if (this.activeName == 'dz') { |
339 | const bdcdysz = this.bdcdysz | 337 | refs = 'table'; |
340 | this.$refs.table.clearSelection() | 338 | this.$refs[refs].clearSelection() |
341 | if (bdcdysz.length == 1) { | ||
342 | bdcdysz.forEach(item => { | ||
343 | // 判断 如果当前的一行被勾选, 再次点击的时候就会取消选中 | ||
344 | if (item == row) { | ||
345 | this.$refs.table.toggleRowSelection(row, false); | ||
346 | } | ||
347 | // 不然就让当前的一行勾选 | ||
348 | else { | ||
349 | this.$refs.table.toggleRowSelection(row, true); | ||
350 | } | ||
351 | }) | ||
352 | } | ||
353 | else { | ||
354 | this.$refs.table.toggleRowSelection(row, true); | ||
355 | } | ||
356 | } else { | 339 | } else { |
357 | this.$refs.table.toggleRowSelection(row); | 340 | } |
341 | const bdcdysz = this.bdcdysz | ||
342 | if (bdcdysz.length > 0) { | ||
343 | bdcdysz.forEach(item => { | ||
344 | // 判断 如果当前的一行被勾选, 再次点击的时候就会取消选中 | ||
345 | if (item == row) { | ||
346 | this.$nextTick(()=>{this.$refs[refs].toggleRowSelection(row, false);}) | ||
347 | } | ||
348 | // 不然就让当前的一行勾选 | ||
349 | else { | ||
350 | this.$refs[refs].toggleRowSelection(row, true); | ||
351 | } | ||
352 | }) | ||
353 | } | ||
354 | else { | ||
355 | this.$refs[refs].toggleRowSelection(row, true); | ||
358 | } | 356 | } |
359 | }, | 357 | }, |
360 | /** | 358 | /** | ... | ... |
1 | <!-- | 1 | <!-- |
2 | * @Description: | 2 | * @Description: |
3 | * @Autor: renchao | 3 | * @Autor: renchao |
4 | * @LastEditTime: 2023-09-01 09:18:46 | 4 | * @LastEditTime: 2023-09-13 10:01:27 |
5 | --> | 5 | --> |
6 | <template> | 6 | <template> |
7 | <!-- 主体权利信息查询 --> | 7 | <!-- 主体权利信息查询 --> |
... | @@ -45,14 +45,14 @@ | ... | @@ -45,14 +45,14 @@ |
45 | </lb-table> | 45 | </lb-table> |
46 | </div> | 46 | </div> |
47 | <div class="submit_button" style="text-align:center"> | 47 | <div class="submit_button" style="text-align:center"> |
48 | <el-button @click="$popupCacel">取消</el-button> | 48 | <el-button @click="close">取消</el-button> |
49 | <el-button type="primary" plain @click="submitForm" :loading="loading">发起申请</el-button> | 49 | <el-button type="primary" plain @click="submitForm" :loading="loading">发起申请</el-button> |
50 | </div> | 50 | </div> |
51 | </div> | 51 | </div> |
52 | </template> | 52 | </template> |
53 | <script> | 53 | <script> |
54 | import store from '@/store/index.js' | 54 | import store from '@/store/index.js' |
55 | import { ywPopupDialog } from "@/utils/popup.js"; | 55 | import { ywPopupDialog,ywPopupCacel } from "@/utils/popup.js"; |
56 | import { datas, sendThis } from "../javascript/selectAllHInfo.js"; | 56 | import { datas, sendThis } from "../javascript/selectAllHInfo.js"; |
57 | import { defaultParameters } from "../javascript/publicDefaultPar.js"; | 57 | import { defaultParameters } from "../javascript/publicDefaultPar.js"; |
58 | import table from "@/utils/mixin/table"; | 58 | import table from "@/utils/mixin/table"; |
... | @@ -125,12 +125,12 @@ | ... | @@ -125,12 +125,12 @@ |
125 | } else { | 125 | } else { |
126 | store.dispatch('user/refreshPage', true); | 126 | store.dispatch('user/refreshPage', true); |
127 | } | 127 | } |
128 | this.$popupCacel() | 128 | this.close() |
129 | } else { | 129 | } else { |
130 | if (res.result && res.result.length > 0) { | 130 | if (res.result && res.result.length > 0) { |
131 | ywPopupDialog("申请错误明细", "components/ywdialog", { result: res.result }, '36%', true) | 131 | this.$popup("申请错误明细", "components/ywdialog", { width:'36%', formData:{result: res.result} }) |
132 | } else { | 132 | } else { |
133 | ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message }, '36%', true) | 133 | this.$popup("申请错误明细", "components/ywdialog", { width:'36%', formData:{message: res.message} }) |
134 | } | 134 | } |
135 | } | 135 | } |
136 | }).catch(() => { | 136 | }).catch(() => { |
... | @@ -138,6 +138,14 @@ | ... | @@ -138,6 +138,14 @@ |
138 | }) | 138 | }) |
139 | }, | 139 | }, |
140 | /** | 140 | /** |
141 | * @description: close | ||
142 | * @param {*} val | ||
143 | * @author: renchao | ||
144 | */ | ||
145 | close(){ | ||
146 | ywPopupCacel() | ||
147 | }, | ||
148 | /** | ||
141 | * @description: handleSelectionChange | 149 | * @description: handleSelectionChange |
142 | * @param {*} val | 150 | * @param {*} val |
143 | * @author: renchao | 151 | * @author: renchao | ... | ... |
-
Please register or sign in to post a comment