Merge branch 'dev' of http://yun.pashanhoo.com:9090/bdc/bdcdj-web into dev
Showing
14 changed files
with
108 additions
and
151 deletions
... | @@ -76,7 +76,7 @@ | ... | @@ -76,7 +76,7 @@ |
76 | qllx: this.$route.query.qllx, | 76 | qllx: this.$route.query.qllx, |
77 | // 默认选中 | 77 | // 默认选中 |
78 | activeIndex: "0", | 78 | activeIndex: "0", |
79 | clickindex:"", | 79 | clickindex: "", |
80 | // 折叠 | 80 | // 折叠 |
81 | isShowdrawer: true, | 81 | isShowdrawer: true, |
82 | delel: true, | 82 | delel: true, |
... | @@ -113,7 +113,6 @@ | ... | @@ -113,7 +113,6 @@ |
113 | // }, | 113 | // }, |
114 | }, | 114 | }, |
115 | methods: { | 115 | methods: { |
116 | //读取申请单元信息 | ||
117 | /** | 116 | /** |
118 | * @description: 读取申请单元信息 | 117 | * @description: 读取申请单元信息 |
119 | * @author: renchao | 118 | * @author: renchao |
... | @@ -130,10 +129,7 @@ | ... | @@ -130,10 +129,7 @@ |
130 | } | 129 | } |
131 | }); | 130 | }); |
132 | } | 131 | } |
133 | |||
134 | |||
135 | }, | 132 | }, |
136 | // 获取右侧菜单 | ||
137 | /** | 133 | /** |
138 | * @description: 获取右侧菜单 | 134 | * @description: 获取右侧菜单 |
139 | * @param {*} row | 135 | * @param {*} row |
... | @@ -150,25 +146,19 @@ | ... | @@ -150,25 +146,19 @@ |
150 | this.unitClick(index) | 146 | this.unitClick(index) |
151 | } | 147 | } |
152 | }) | 148 | }) |
153 | if(row=="change"){ | 149 | if (row == "change") { |
154 | this.unitClick(this.clickindex) | 150 | this.unitClick(this.clickindex) |
155 | |||
156 | } | 151 | } |
157 | }else{ | ||
158 | if (this.supplementarylist.length) { | ||
159 | this.unitClick(0) | ||
160 | this.activeIndex = "0" | ||
161 | } else { | 152 | } else { |
162 | this.loadBdcdylist() | 153 | if (this.supplementarylist.length) { |
163 | // this.$emit("getCurrentSelectProps", this.currentSelectProps); | 154 | this.unitClick(0) |
155 | this.activeIndex = "0" | ||
156 | } else { | ||
157 | this.loadBdcdylist() | ||
158 | // this.$emit("getCurrentSelectProps", this.currentSelectProps); | ||
159 | } | ||
164 | } | 160 | } |
165 | 161 | }) | |
166 | } | ||
167 | |||
168 | |||
169 | |||
170 | |||
171 | }); | ||
172 | }, | 162 | }, |
173 | /** | 163 | /** |
174 | * @description: handleNodeClick | 164 | * @description: handleNodeClick |
... | @@ -188,11 +178,10 @@ | ... | @@ -188,11 +178,10 @@ |
188 | * @author: renchao | 178 | * @author: renchao |
189 | */ | 179 | */ |
190 | unitClick (index) { | 180 | unitClick (index) { |
191 | this.clickindex=index | 181 | this.clickindex = index |
192 | this.currentSelectProps = this.supplementarylist[index]; | 182 | this.currentSelectProps = this.supplementarylist[index]; |
193 | this.$emit("getCurrentSelectProps", this.currentSelectProps); | 183 | this.$emit("getCurrentSelectProps", this.currentSelectProps); |
194 | }, | 184 | }, |
195 | //登记簿点击事件 | ||
196 | /** | 185 | /** |
197 | * @description: 登记簿点击事件 | 186 | * @description: 登记簿点击事件 |
198 | * @author: renchao | 187 | * @author: renchao |
... | @@ -200,7 +189,6 @@ | ... | @@ -200,7 +189,6 @@ |
200 | djbClick () { | 189 | djbClick () { |
201 | this.loadBdcdylist(); | 190 | this.loadBdcdylist(); |
202 | }, | 191 | }, |
203 | // 删除补录记录 | ||
204 | /** | 192 | /** |
205 | * @description: 删除补录记录 | 193 | * @description: 删除补录记录 |
206 | * @param {*} row | 194 | * @param {*} row |
... | @@ -234,7 +222,6 @@ | ... | @@ -234,7 +222,6 @@ |
234 | }); | 222 | }); |
235 | }); | 223 | }); |
236 | }, | 224 | }, |
237 | //补录信息点击事件默认展示第一条补录记录 | ||
238 | /** | 225 | /** |
239 | * @description: 补录信息点击事件默认展示第一条补录记录 | 226 | * @description: 补录信息点击事件默认展示第一条补录记录 |
240 | * @author: renchao | 227 | * @author: renchao |
... | @@ -243,10 +230,9 @@ | ... | @@ -243,10 +230,9 @@ |
243 | if (this.supplementarylist.length) { | 230 | if (this.supplementarylist.length) { |
244 | this.unitClick(0); | 231 | this.unitClick(0); |
245 | } | 232 | } |
246 | 233 | } | |
247 | }, | 234 | } |
248 | }, | 235 | } |
249 | }; | ||
250 | </script> | 236 | </script> |
251 | <style scoped lang="scss"> | 237 | <style scoped lang="scss"> |
252 | @import "~@/styles/mixin.scss"; | 238 | @import "~@/styles/mixin.scss"; |
... | @@ -323,8 +309,8 @@ | ... | @@ -323,8 +309,8 @@ |
323 | color: red; | 309 | color: red; |
324 | line-height: 22px; | 310 | line-height: 22px; |
325 | } | 311 | } |
326 | .ywh{ | 312 | .ywh { |
327 | font-size: 12px; | 313 | font-size: 12px; |
328 | } | 314 | } |
329 | .el-icon-delete { | 315 | .el-icon-delete { |
330 | margin-top: 10px; | 316 | margin-top: 10px; |
... | @@ -333,7 +319,7 @@ | ... | @@ -333,7 +319,7 @@ |
333 | height: 27px; | 319 | height: 27px; |
334 | float: left; | 320 | float: left; |
335 | } | 321 | } |
336 | .el-icon-delete:hover{ | 322 | .el-icon-delete:hover { |
337 | color: #0079fe; | 323 | color: #0079fe; |
338 | } | 324 | } |
339 | } | 325 | } | ... | ... |
1 | <!-- | 1 | <!-- |
2 | * @Description: | 2 | * @Description: |
3 | * @Autor: renchao | 3 | * @Autor: renchao |
4 | * @LastEditTime: 2023-09-15 09:27:14 | 4 | * @LastEditTime: 2023-09-21 14:57:51 |
5 | --> | 5 | --> |
6 | <template> | 6 | <template> |
7 | <div class="container"> | 7 | <div class="container"> |
... | @@ -73,8 +73,6 @@ | ... | @@ -73,8 +73,6 @@ |
73 | import { getForm } from "./flowform"; | 73 | import { getForm } from "./flowform"; |
74 | import { getStepFormInfo } from "@/api/workFlow.js"; | 74 | import { getStepFormInfo } from "@/api/workFlow.js"; |
75 | import NoticeBar from "@/components/NoticeBar/index"; | 75 | import NoticeBar from "@/components/NoticeBar/index"; |
76 | // import ProcessViewer from "./components/processViewer.vue"; | ||
77 | |||
78 | import ordinaryMenu from "./components/leftmenu/ordinaryMenu.vue"; | 76 | import ordinaryMenu from "./components/leftmenu/ordinaryMenu.vue"; |
79 | import qllxDailog from "./djbBook/components/qllxDailog"; | 77 | import qllxDailog from "./djbBook/components/qllxDailog"; |
80 | import selectBdc from "@/views/ywbl/ywsq/selectBdc.vue"; | 78 | import selectBdc from "@/views/ywbl/ywsq/selectBdc.vue"; |
... | @@ -128,9 +126,6 @@ | ... | @@ -128,9 +126,6 @@ |
128 | ableOperation: false, | 126 | ableOperation: false, |
129 | }; | 127 | }; |
130 | }, | 128 | }, |
131 | mounted () { | ||
132 | // this.getleftMenubl() | ||
133 | }, | ||
134 | methods: { | 129 | methods: { |
135 | /** | 130 | /** |
136 | * @description: stepForm | 131 | * @description: stepForm |
... | @@ -155,10 +150,10 @@ | ... | @@ -155,10 +150,10 @@ |
155 | that.clxxForm = getForm(item.value, that.$route.query.sqywbm); | 150 | that.clxxForm = getForm(item.value, that.$route.query.sqywbm); |
156 | that.clxxTab = item; | 151 | that.clxxTab = item; |
157 | } | 152 | } |
158 | }); | 153 | }) |
159 | } | 154 | } |
160 | }); | 155 | }) |
161 | }); | 156 | }) |
162 | } | 157 | } |
163 | }, | 158 | }, |
164 | /** | 159 | /** |
... | @@ -226,7 +221,6 @@ | ... | @@ -226,7 +221,6 @@ |
226 | if (p) { | 221 | if (p) { |
227 | this.ableOperation = this.tabList[a.index].ableOperation; | 222 | this.ableOperation = this.tabList[a.index].ableOperation; |
228 | } | 223 | } |
229 | |||
230 | }, | 224 | }, |
231 | /** | 225 | /** |
232 | * @description: 右侧表单选项卡事件 | 226 | * @description: 右侧表单选项卡事件 |
... | @@ -285,13 +279,13 @@ | ... | @@ -285,13 +279,13 @@ |
285 | } else { | 279 | } else { |
286 | this.$alert(res.message, "提示", { | 280 | this.$alert(res.message, "提示", { |
287 | confirmButtonText: "确定", | 281 | confirmButtonText: "确定", |
288 | type: "warning", | 282 | type: "warning" |
289 | }); | 283 | }) |
290 | } | 284 | } |
291 | }) | 285 | }) |
292 | .catch((res) => { | 286 | .catch((res) => { |
293 | console.log("错", res); | 287 | console.log("错", res) |
294 | }); | 288 | }) |
295 | } | 289 | } |
296 | } | 290 | } |
297 | } | 291 | } | ... | ... |
1 | <!-- | 1 | <!-- |
2 | * @Description: | 2 | * @Description: |
3 | * @Autor: renchao | 3 | * @Autor: renchao |
4 | * @LastEditTime: 2023-09-21 10:19:25 | 4 | * @LastEditTime: 2023-09-21 10:53:44 |
5 | --> | 5 | --> |
6 | <template> | 6 | <template> |
7 | <div class="tableBox"> | 7 | <div class="tableBox"> |
... | @@ -71,10 +71,10 @@ | ... | @@ -71,10 +71,10 @@ |
71 | <span v-if="item.prop == 'qszt'"> | 71 | <span v-if="item.prop == 'qszt'"> |
72 | {{ getQsztName(row[item.prop]) }} | 72 | {{ getQsztName(row[item.prop]) }} |
73 | </span> | 73 | </span> |
74 | <el-link v-if="item.prop == 'ywh'" | 74 | <el-link v-if="['zxywh', 'ywh'].includes(item.prop)" |
75 | @click="handleSelectYwh(tableData, row[item.prop])" | 75 | @click="handleSelectYwh(tableData, row[item.prop])" |
76 | type="primary">{{ row[item.prop] }}</el-link> | 76 | type="primary">{{ row[item.prop] }}</el-link> |
77 | <span v-if="!['qszt','ywh' ].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> |
79 | 79 | ||
80 | <el-tooltip | 80 | <el-tooltip |
... | @@ -229,7 +229,7 @@ | ... | @@ -229,7 +229,7 @@ |
229 | if (sjlx == '系统数据') { | 229 | if (sjlx == '系统数据') { |
230 | getXtParamsByYwh(ywh).then(res => { | 230 | getXtParamsByYwh(ywh).then(res => { |
231 | let data = res.result | 231 | let data = res.result |
232 | const { href } = Router.resolve('/workFrameView?bsmSlsq=' + data.bsmSlsq + '&bestepid=' + data.bestepid + '&bsmBusiness=' + data.bsmBusiness + '&type=jdcx') | 232 | const { href } = Router.resolve('/workFrameView?bsmSlsq=' + data.bsmSlsq + '&bsmBusiness=' + data.bsmBusiness) |
233 | window.open(href, `urlname${data.bsmSlsq}`) | 233 | window.open(href, `urlname${data.bsmSlsq}`) |
234 | }) | 234 | }) |
235 | } else { | 235 | } else { | ... | ... |
1 | <!-- | 1 | <!-- |
2 | * @Description: | 2 | * @Description: |
3 | * @Autor: miaofang | 3 | * @Autor: miaofang |
4 | * @LastEditTime: 2023-09-18 14:48:07 | 4 | * @LastEditTime: 2023-09-21 11:05:33 |
5 | --> | 5 | --> |
6 | <template> | 6 | <template> |
7 | <div class="djxxTable"> | 7 | <div class="djxxTable"> |
... | @@ -72,7 +72,7 @@ | ... | @@ -72,7 +72,7 @@ |
72 | <span v-if="item.prop == 'qszt'"> | 72 | <span v-if="item.prop == 'qszt'"> |
73 | {{ getQsztName(row[item.prop]) }} | 73 | {{ getQsztName(row[item.prop]) }} |
74 | </span> | 74 | </span> |
75 | <el-link v-if="item.prop == 'ywh'" | 75 | <el-link v-if=" ['zxywh', 'ywh'].includes(item.prop)" |
76 | @click="handleSelectYwh(tableData, row[item.prop])" | 76 | @click="handleSelectYwh(tableData, row[item.prop])" |
77 | type="primary">{{ row[item.prop] }}</el-link> | 77 | type="primary">{{ row[item.prop] }}</el-link> |
78 | <el-tooltip | 78 | <el-tooltip |
... | @@ -88,6 +88,7 @@ | ... | @@ -88,6 +88,7 @@ |
88 | 88 | ||
89 | <span | 89 | <span |
90 | v-if=" | 90 | v-if=" |
91 | item.prop !== 'zxywh' && | ||
91 | item.prop !== 'ywh' && | 92 | item.prop !== 'ywh' && |
92 | item.prop !== 'qszt' && | 93 | item.prop !== 'qszt' && |
93 | item.prop !== 'djyy' && | 94 | item.prop !== 'djyy' && |
... | @@ -291,14 +292,16 @@ | ... | @@ -291,14 +292,16 @@ |
291 | if (sjlx == '系统数据') { | 292 | if (sjlx == '系统数据') { |
292 | getXtParamsByYwh(ywh).then(res => { | 293 | getXtParamsByYwh(ywh).then(res => { |
293 | let data = res.result | 294 | let data = res.result |
294 | const { href } = Router.resolve('/workFrameView?bsmSlsq=' + data.bsmSlsq + '&bestepid=' + data.bestepid + '&bsmBusiness=' + data.bsmBusiness + '&type=jdcx') | 295 | const { href } = Router.resolve('/workFrameView?bsmSlsq=' + data.bsmSlsq + '&bsmBusiness=' + data.bsmBusiness + '&type=jdcx') |
295 | window.open(href, `urlname${data.bsmSlsq}`) | 296 | window.open(href, `urlname${data.bsmSlsq}`) |
296 | }) | 297 | }) |
297 | } else { | 298 | } else { |
298 | getBlParamsByYwh(ywh, bsmQlxx).then(res => { | 299 | getBlParamsByYwh(ywh, bsmQlxx).then(res => { |
299 | let data = res.result | 300 | let data = res.result |
300 | const { href } = Router.resolve('/workFrameView?bsmSlsq=' + data.bsmSlsq + '&bestepid=' + data.bestepid + '&bsmBusiness=' + data.bsmBusiness + '&type=jdcx') | 301 | this.$popup('材料信息', 'registerBook/components/clxx/index', { |
301 | window.open(href, `urlname${data.bsmSlsq}`) | 302 | width: '60%', |
303 | formData: data | ||
304 | }) | ||
302 | }) | 305 | }) |
303 | } | 306 | } |
304 | } | 307 | } | ... | ... |
1 | <!-- | 1 | <!-- |
2 | * @Description: workFrame左侧菜单列表-普通 | 2 | * @Description: workFrame左侧菜单列表-普通 |
3 | * @Autor: renchao | 3 | * @Autor: renchao |
4 | * @LastEditTime: 2023-09-21 10:46:05 | 4 | * @LastEditTime: 2023-09-21 14:40:30 |
5 | --> | 5 | --> |
6 | <template> | 6 | <template> |
7 | <div class="leftmenu" :class="{ 'animation-map-drawer': isShowdrawer }"> | 7 | <div class="leftmenu" :class="{ 'animation-map-drawer': isShowdrawer }"> |
... | @@ -49,8 +49,8 @@ | ... | @@ -49,8 +49,8 @@ |
49 | return { | 49 | return { |
50 | //受理申请标识码 | 50 | //受理申请标识码 |
51 | bsmSlsq: this.$route.query.bsmSlsq, | 51 | bsmSlsq: this.$route.query.bsmSlsq, |
52 | //当前流程所在环节 | ||
53 | bestepid: this.$route.query.bestepid, | 52 | bestepid: this.$route.query.bestepid, |
53 | bsmBusiness: this.$route.query.bsmBusiness, | ||
54 | // 默认选中 | 54 | // 默认选中 |
55 | activeIndex: '0', | 55 | activeIndex: '0', |
56 | // 折叠 | 56 | // 折叠 |
... | @@ -89,11 +89,10 @@ | ... | @@ -89,11 +89,10 @@ |
89 | loadBdcdylist (status = false) { | 89 | loadBdcdylist (status = false) { |
90 | let that = this | 90 | let that = this |
91 | var formdata = new FormData(); | 91 | var formdata = new FormData(); |
92 | formdata.append("bsmSlsq", this.bsmSlsq); | 92 | formdata.append("bsmSlsq", this.$route.query.bsmSlsq); |
93 | if (this.$route.query.bsmBusiness) { | 93 | formdata.append("bestepid", this.bestepid ? this.bestepid : ''); |
94 | formdata.append("bsmBusiness", this.$route.query.bsmBusiness); | 94 | formdata.append("bsmBusiness", this.bsmBusiness ? this.bsmBusiness : ''); |
95 | } | 95 | if (this.type) { |
96 | if (this.$route.query.type == 'jdcx') { | ||
97 | jdcxLeftMenu(formdata).then((res) => { | 96 | jdcxLeftMenu(formdata).then((res) => { |
98 | if (res.code === 200 && res.result) { | 97 | if (res.code === 200 && res.result) { |
99 | that.unitData = res.result; | 98 | that.unitData = res.result; |
... | @@ -183,10 +182,6 @@ | ... | @@ -183,10 +182,6 @@ |
183 | deleteSlbdcdy(formdata).then((res) => { | 182 | deleteSlbdcdy(formdata).then((res) => { |
184 | if (res.code == 200) { | 183 | if (res.code == 200) { |
185 | this.$message.success("删除成功"); | 184 | this.$message.success("删除成功"); |
186 | /** | ||
187 | * @description: 更新列表 | ||
188 | * @author: miaofang | ||
189 | */ | ||
190 | this.loadBdcdylist() | 185 | this.loadBdcdylist() |
191 | // this.$parent.updateDialog(); | 186 | // this.$parent.updateDialog(); |
192 | } else { | 187 | } else { | ... | ... |
1 | <!-- | 1 | <!-- |
2 | * @Description: workFrame左侧菜单列表-分割 | 2 | * @Description: workFrame左侧菜单列表-分割 |
3 | * @Autor: renchao | 3 | * @Autor: renchao |
4 | * @LastEditTime: 2023-09-21 10:46:34 | 4 | * @LastEditTime: 2023-09-21 14:44:34 |
5 | --> | 5 | --> |
6 | <template> | 6 | <template> |
7 | <div class="leftmenu" :class="{ 'animation-map-drawer': isShowdrawer }"> | 7 | <div class="leftmenu" :class="{ 'animation-map-drawer': isShowdrawer }"> |
... | @@ -61,6 +61,9 @@ | ... | @@ -61,6 +61,9 @@ |
61 | export default { | 61 | export default { |
62 | data () { | 62 | data () { |
63 | return { | 63 | return { |
64 | bsmSlsq: this.$route.query.bsmSlsq, | ||
65 | bsmBusiness: this.$route.query.bsmBusiness, | ||
66 | bestepid: this.$route.query.bestepid, | ||
64 | // 变更前单元默认选中 | 67 | // 变更前单元默认选中 |
65 | activeIndex: '0', | 68 | activeIndex: '0', |
66 | // 变更后单元默认选中 | 69 | // 变更后单元默认选中 |
... | @@ -102,9 +105,10 @@ | ... | @@ -102,9 +105,10 @@ |
102 | let that = this | 105 | let that = this |
103 | var formdata = new FormData(); | 106 | var formdata = new FormData(); |
104 | // 受理申请标识码 | 107 | // 受理申请标识码 |
105 | formdata.append("bsmSlsq", this.paramData.bsmSlsq); | 108 | formdata.append("bsmSlsq", this.$route.query.bsmSlsq); |
106 | formdata.append("bsmBusiness", this.paramData.bsmBusiness); | 109 | formdata.append("bsmBusiness", this.bsmBusiness ? this.bsmBusiness : ''); |
107 | if (this.$route.query.type == 'jdcx') { | 110 | formdata.append("bestepid", this.bestepid ? this.bestepid : ''); |
111 | if (this.type) { | ||
108 | jdcxLeftMenu(formdata).then((res) => { | 112 | jdcxLeftMenu(formdata).then((res) => { |
109 | if (res.code === 200 && res.result) { | 113 | if (res.code === 200 && res.result) { |
110 | this.aroundUnitData = res.result.filter(item => item.bglx == '1') | 114 | this.aroundUnitData = res.result.filter(item => item.bglx == '1') |
... | @@ -206,6 +210,7 @@ | ... | @@ -206,6 +210,7 @@ |
206 | * @author: renchao | 210 | * @author: renchao |
207 | */ | 211 | */ |
208 | batchUnitClick () { | 212 | batchUnitClick () { |
213 | window.currentSelect = {} | ||
209 | this.currentSelectProps.batchOperation = true; | 214 | this.currentSelectProps.batchOperation = true; |
210 | // this.activeIndex = "-1"; | 215 | // this.activeIndex = "-1"; |
211 | this.$parent.stepForm(0); | 216 | this.$parent.stepForm(0); | ... | ... |
1 | /* | 1 | /* |
2 | * @Description: | 2 | * @Description: |
3 | * @Autor: renchao | 3 | * @Autor: renchao |
4 | * @LastEditTime: 2023-09-20 16:56:46 | 4 | * @LastEditTime: 2023-09-21 14:20:02 |
5 | */ | 5 | */ |
6 | import { getPrintTemplateByCode } from "@/api/print"; | 6 | import { getPrintTemplateByCode } from "@/api/print"; |
7 | import { uploadUndo } from "@/api/clxx"; | 7 | import { uploadUndo } from "@/api/clxx"; |
... | @@ -52,7 +52,7 @@ export default { | ... | @@ -52,7 +52,7 @@ export default { |
52 | flowInitParam () { | 52 | flowInitParam () { |
53 | var formdata = new FormData(); | 53 | var formdata = new FormData(); |
54 | formdata.append("bsmSlsq", this.bsmSlsq); | 54 | formdata.append("bsmSlsq", this.bsmSlsq); |
55 | formdata.append("bestepid", this.bestepid); | 55 | formdata.append("bestepid", this.bestepid ? this.bestepid : ''); |
56 | if (this.type) { | 56 | if (this.type) { |
57 | formdata.append("type", "READ_ONLY"); | 57 | formdata.append("type", "READ_ONLY"); |
58 | } | 58 | } |
... | @@ -85,7 +85,7 @@ export default { | ... | @@ -85,7 +85,7 @@ export default { |
85 | }) | 85 | }) |
86 | break; | 86 | break; |
87 | case "B1": | 87 | case "B1": |
88 | getWorkFlowImage(this.bsmSlsq, this.$route.query.bestepid).then(res => { | 88 | getWorkFlowImage(this.bsmSlsq, this.bestepid ? this.bestepid : '').then(res => { |
89 | let { result } = res | 89 | let { result } = res |
90 | this.$popupDialog("流程图", "workflow/components/processViewer", { | 90 | this.$popupDialog("流程图", "workflow/components/processViewer", { |
91 | xml: result.xml, | 91 | xml: result.xml, |
... | @@ -163,22 +163,22 @@ export default { | ... | @@ -163,22 +163,22 @@ export default { |
163 | bsm: res.result[0], | 163 | bsm: res.result[0], |
164 | onlyShow: false, | 164 | onlyShow: false, |
165 | unitData: window.unitData, | 165 | unitData: window.unitData, |
166 | bsmSlsq:this.bsmSlsq, | 166 | bsmSlsq: this.bsmSlsq, |
167 | showSave:true, | 167 | showSave: true, |
168 | djlx: window.djlx | 168 | djlx: window.djlx |
169 | }, '90%', true) | 169 | }, '90%', true) |
170 | } else { | 170 | } else { |
171 | this.$message.error(res.message) | 171 | this.$message.error(res.message) |
172 | } | 172 | } |
173 | }) | 173 | }) |
174 | .catch((err) => { | 174 | .catch((err) => { |
175 | this.$message.error(err) | 175 | this.$message.error(err) |
176 | }); | 176 | }); |
177 | window.djlx && this.$popupDialog('楼盘表', 'lpb/zjgcdy', { | 177 | window.djlx && this.$popupDialog('楼盘表', 'lpb/zjgcdy', { |
178 | onlyShow: false, | 178 | onlyShow: false, |
179 | unitData: window.unitData, | 179 | unitData: window.unitData, |
180 | bsmSlsq:this.bsmSlsq, | 180 | bsmSlsq: this.bsmSlsq, |
181 | showSave:true, | 181 | showSave: true, |
182 | djlx: window.djlx | 182 | djlx: window.djlx |
183 | }, '90%', true) | 183 | }, '90%', true) |
184 | break; | 184 | break; |
... | @@ -192,13 +192,13 @@ export default { | ... | @@ -192,13 +192,13 @@ export default { |
192 | case "back": //退回按钮 | 192 | case "back": //退回按钮 |
193 | this.$popupDialog("退回", "workflow/components/th", { | 193 | this.$popupDialog("退回", "workflow/components/th", { |
194 | bsmSlsq: this.bsmSlsq, | 194 | bsmSlsq: this.bsmSlsq, |
195 | bestepid: this.bestepid | 195 | bestepid: this.bestepid ? this.bestepid : '' |
196 | }, '800px', true) | 196 | }, '800px', true) |
197 | break; | 197 | break; |
198 | case "transfer": //转件按钮 | 198 | case "transfer": //转件按钮 |
199 | getNextLinkInfo({ | 199 | getNextLinkInfo({ |
200 | bsmSlsq: this.bsmSlsq, | 200 | bsmSlsq: this.bsmSlsq, |
201 | bestepid: this.bestepid, | 201 | bestepid: this.bestepid ? his.bestepid : '' |
202 | }).then((res) => { | 202 | }).then((res) => { |
203 | if (res.code === 200) { | 203 | if (res.code === 200) { |
204 | if (res.result) { | 204 | if (res.result) { |
... | @@ -212,18 +212,18 @@ export default { | ... | @@ -212,18 +212,18 @@ export default { |
212 | case "stop": //终止按钮 | 212 | case "stop": //终止按钮 |
213 | this.$popupDialog("终止", "workflow/components/stop", { | 213 | this.$popupDialog("终止", "workflow/components/stop", { |
214 | bsmSlsq: this.bsmSlsq, | 214 | bsmSlsq: this.bsmSlsq, |
215 | bestepid: this.bestepid, | 215 | bestepid: this.bestepid ? this.bestepid : '' |
216 | }, '600px', true) | 216 | }, '600px', true) |
217 | break; | 217 | break; |
218 | case "signout": | 218 | case "signout": |
219 | window.close(); | 219 | window.close(); |
220 | //取消认领 | 220 | //取消认领 |
221 | unClaimTask(this.bsmSlsq, this.bestepid) | 221 | unClaimTask(this.bsmSlsq, this.bestepid ? this.bestepid : '') |
222 | break; | 222 | break; |
223 | case "B9": | 223 | case "B9": |
224 | var formdata = new FormData(); | 224 | var formdata = new FormData(); |
225 | formdata.append("bsmSlsq", this.bsmSlsq); | 225 | formdata.append("bsmSlsq", this.bsmSlsq); |
226 | formdata.append("bestepid", this.bestepid); | 226 | formdata.append("bestepid", this.bestepid ? this.bestepid : ''); |
227 | this.$confirm("请确认是否登簿", "提示", { | 227 | this.$confirm("请确认是否登簿", "提示", { |
228 | iconClass: "el-icon-info", //自定义图标样式 | 228 | iconClass: "el-icon-info", //自定义图标样式 |
229 | confirmButtonText: "确认", //确认按钮文字更换 | 229 | confirmButtonText: "确认", //确认按钮文字更换 |
... | @@ -265,7 +265,7 @@ export default { | ... | @@ -265,7 +265,7 @@ export default { |
265 | this.$confirm("确定要删除吗, 是否继续?", "提示", { | 265 | this.$confirm("确定要删除吗, 是否继续?", "提示", { |
266 | confirmButtonText: "确定", | 266 | confirmButtonText: "确定", |
267 | cancelButtonText: "取消", | 267 | cancelButtonText: "取消", |
268 | type: "warning", | 268 | type: "warning" |
269 | }) | 269 | }) |
270 | .then(() => { | 270 | .then(() => { |
271 | deleteFlow(formdata).then((res) => { | 271 | deleteFlow(formdata).then((res) => { |
... | @@ -279,14 +279,14 @@ export default { | ... | @@ -279,14 +279,14 @@ export default { |
279 | } else { | 279 | } else { |
280 | this.$message.error(res.message); | 280 | this.$message.error(res.message); |
281 | } | 281 | } |
282 | }); | 282 | }) |
283 | }) | 283 | }) |
284 | .catch(() => { | 284 | .catch(() => { |
285 | this.$message({ | 285 | this.$message({ |
286 | type: "info", | 286 | type: "info", |
287 | message: "已取消删除", | 287 | message: "已取消删除" |
288 | }); | 288 | }) |
289 | }); | 289 | }) |
290 | }, | 290 | }, |
291 | /** | 291 | /** |
292 | * @description: 发送下一个环节 | 292 | * @description: 发送下一个环节 |
... | @@ -337,7 +337,7 @@ export default { | ... | @@ -337,7 +337,7 @@ export default { |
337 | formdata.append("bsmSlsq", this.bsmSlsq); | 337 | formdata.append("bsmSlsq", this.bsmSlsq); |
338 | uploadUndo(formdata).then(res => { | 338 | uploadUndo(formdata).then(res => { |
339 | if (res.code == 200) { | 339 | if (res.code == 200) { |
340 | this.$message.success("导入成功"); | 340 | this.$message.success("导入成功") |
341 | } else { | 341 | } else { |
342 | this.$message.error(res.message) | 342 | this.$message.error(res.message) |
343 | } | 343 | } | ... | ... |
1 | /* | 1 | /* |
2 | * @Description: | 2 | * @Description: |
3 | * @Autor: renchao | 3 | * @Autor: renchao |
4 | * @LastEditTime: 2023-09-12 10:52:24 | 4 | * @LastEditTime: 2023-09-21 14:16:39 |
5 | */ | 5 | */ |
6 | import { getForm } from "../flowform"; | 6 | import { getForm } from "../flowform"; |
7 | import { getHomeNoticeList } from "@/api/home.js" | 7 | import { getHomeNoticeList } from "@/api/home.js" |
... | @@ -55,7 +55,7 @@ export default { | ... | @@ -55,7 +55,7 @@ export default { |
55 | break; | 55 | break; |
56 | } | 56 | } |
57 | } | 57 | } |
58 | this.componentTag = getForm(tabname, this.$route.query.sqywbm); | 58 | this.componentTag = getForm(tabname); |
59 | } | 59 | } |
60 | } | 60 | } |
61 | } | 61 | } | ... | ... |
1 | <!-- | 1 | <!-- |
2 | * @Description: | 2 | * @Description: |
3 | * @Autor: renchao | 3 | * @Autor: renchao |
4 | * @LastEditTime: 2023-09-18 11:13:57 | 4 | * @LastEditTime: 2023-09-21 13:45:04 |
5 | --> | 5 | --> |
6 | <template> | 6 | <template> |
7 | <div class="container"> | 7 | <div class="container"> |
... | @@ -178,7 +178,7 @@ | ... | @@ -178,7 +178,7 @@ |
178 | // 获取打印回执数据 | 178 | // 获取打印回执数据 |
179 | var formdata = new FormData(); | 179 | var formdata = new FormData(); |
180 | formdata.append("bsmSldy", this.currentSelectProps.bsmSldy); | 180 | formdata.append("bsmSldy", this.currentSelectProps.bsmSldy); |
181 | formdata.append("bsmSlsq", this.paramData.bsmSlsq); | 181 | formdata.append("bsmSlsq", this.$route.query.bsmSlsq); |
182 | formdata.append("djlx", this.currentSelectProps.djlx); | 182 | formdata.append("djlx", this.currentSelectProps.djlx); |
183 | BatchInit(formdata).then((res) => { | 183 | BatchInit(formdata).then((res) => { |
184 | if (res.code === 200 && res.result) { | 184 | if (res.code === 200 && res.result) { |
... | @@ -231,7 +231,7 @@ | ... | @@ -231,7 +231,7 @@ |
231 | //判断是窗口关闭还是刷新 | 231 | //判断是窗口关闭还是刷新 |
232 | if (this._gap_time <= 10) { | 232 | if (this._gap_time <= 10) { |
233 | //取消认领 | 233 | //取消认领 |
234 | unClaimTask(this.paramData.bsmSlsq, this.paramData.bestepid) | 234 | unClaimTask(this.$route.query.bsmSlsq, this.bestepid ? this.bestepid : '') |
235 | } | 235 | } |
236 | }, | 236 | }, |
237 | /** | 237 | /** | ... | ... |
1 | <!-- | 1 | <!-- |
2 | * @Description: | 2 | * @Description: |
3 | * @Autor: renchao | 3 | * @Autor: renchao |
4 | * @LastEditTime: 2023-09-21 10:46:55 | 4 | * @LastEditTime: 2023-09-21 13:11:04 |
5 | --> | 5 | --> |
6 | <template> | 6 | <template> |
7 | <div class="container"> | 7 | <div class="container"> |
... | @@ -71,8 +71,6 @@ | ... | @@ -71,8 +71,6 @@ |
71 | return { | 71 | return { |
72 | //受理申请标识码 | 72 | //受理申请标识码 |
73 | bsmSlsq: this.$route.query.bsmSlsq, | 73 | bsmSlsq: this.$route.query.bsmSlsq, |
74 | //当前流程所在环节 | ||
75 | bestepid: this.$route.query.bestepid, | ||
76 | // 流程图 | 74 | // 流程图 |
77 | imgSrc: "", | 75 | imgSrc: "", |
78 | // 折叠 | 76 | // 折叠 | ... | ... |
1 | <!-- | 1 | <!-- |
2 | * @Description: | 2 | * @Description: |
3 | * @Autor: renchao | 3 | * @Autor: renchao |
4 | * @LastEditTime: 2023-09-15 16:30:47 | 4 | * @LastEditTime: 2023-09-21 14:49:29 |
5 | --> | 5 | --> |
6 | <template> | 6 | <template> |
7 | <div class="from-clues"> | 7 | <div class="from-clues"> |
... | @@ -303,32 +303,20 @@ | ... | @@ -303,32 +303,20 @@ |
303 | //有任务权限 | 303 | //有任务权限 |
304 | if (item.sjlx == "3") { | 304 | if (item.sjlx == "3") { |
305 | const { href } = this.$router.resolve( | 305 | const { href } = this.$router.resolve( |
306 | "/djbworkFrame?bsmSlsq=" + | 306 | "/djbworkFrame?bsmSlsq=" + item.bsmSlsq + |
307 | item.bsmSlsq + | 307 | "&bestepid=" + item.bestepid + |
308 | "&bestepid=" + | 308 | "&zbhj=" + item.zbhj |
309 | item.bestepid + | ||
310 | "&bsmBusiness=" + | ||
311 | "&sqywbm=" + | ||
312 | item.djywbm + | ||
313 | "&zbhj=" + | ||
314 | item.zbhj | ||
315 | ); | 309 | ); |
316 | window.open(href, `djbworkFrame${item.bsmSlsq}`); | 310 | window.open(href, `djbworkFrame${item.bsmSlsq}`); |
317 | } else { | 311 | } else { |
318 | const { href } = this.$router.resolve( | 312 | const { href } = this.$router.resolve( |
319 | "/workFrame?bsmSlsq=" + | 313 | "/workFrame?bsmSlsq=" + item.bsmSlsq + |
320 | item.bsmSlsq + | 314 | "&bestepid=" + item.bestepid + |
321 | "&bestepid=" + | 315 | "&zbhj=" + item.zbhj |
322 | item.bestepid + | 316 | ) |
323 | "&bsmBusiness=" + | 317 | window.open(href, `workFrame${item.bsmSlsq}`) |
324 | "&sqywbm=" + | ||
325 | item.djywbm + | ||
326 | "&zbhj=" + | ||
327 | item.zbhj | ||
328 | ); | ||
329 | window.open(href, `workFrame${item.bsmSlsq}`); | ||
330 | } | 318 | } |
331 | localStorage.setItem("ywbl", JSON.stringify(item)); | 319 | localStorage.setItem("ywbl", JSON.stringify(item)) |
332 | 320 | ||
333 | //从待办箱进入的调取任务领取接口 | 321 | //从待办箱进入的调取任务领取接口 |
334 | claimTask(item.bsmSlsq, item.bestepid); | 322 | claimTask(item.bsmSlsq, item.bestepid); |
... | @@ -341,10 +329,10 @@ | ... | @@ -341,10 +329,10 @@ |
341 | } else { | 329 | } else { |
342 | this.$message.error("用户任务权限判断失败,请联系管理员"); | 330 | this.$message.error("用户任务权限判断失败,请联系管理员"); |
343 | } | 331 | } |
344 | }); | 332 | }) |
345 | }, | 333 | } |
346 | }, | 334 | } |
347 | }; | 335 | } |
348 | </script> | 336 | </script> |
349 | <style scoped lang="scss"> | 337 | <style scoped lang="scss"> |
350 | @import "~@/styles/public.scss"; | 338 | @import "~@/styles/public.scss"; | ... | ... |
1 | <!-- | 1 | <!-- |
2 | * @Description: | 2 | * @Description: |
3 | * @Autor: renchao | 3 | * @Autor: renchao |
4 | * @LastEditTime: 2023-09-19 10:04:58 | 4 | * @LastEditTime: 2023-09-21 14:24:21 |
5 | --> | 5 | --> |
6 | <template> | 6 | <template> |
7 | <div class="from-clues"> | 7 | <div class="from-clues"> |
... | @@ -220,7 +220,6 @@ | ... | @@ -220,7 +220,6 @@ |
220 | methods: { | 220 | methods: { |
221 | /** | 221 | /** |
222 | * @description: 列表渲染接口 | 222 | * @description: 列表渲染接口 |
223 | * @author: renchao | ||
224 | */ | 223 | */ |
225 | queryClick () { | 224 | queryClick () { |
226 | this.$startLoading(); | 225 | this.$startLoading(); |
... | @@ -264,22 +263,17 @@ | ... | @@ -264,22 +263,17 @@ |
264 | if (item.sjlx == "3") { | 263 | if (item.sjlx == "3") { |
265 | item.djywbm = "DJBBL"; | 264 | item.djywbm = "DJBBL"; |
266 | const { href } = this.$router.resolve( | 265 | const { href } = this.$router.resolve( |
267 | "/djbworkFrameview?bsmSlsq=" + | 266 | "/djbworkFrameview?bsmSlsq=" + item.bsmSlsq + |
268 | item.bsmSlsq + | 267 | "&bsmBusiness=" + item.bsmBusiness + |
269 | "&bestepid=" + | 268 | "&sqywbm=" + item.djywbm |
270 | item.bestepid + | ||
271 | "&sqywbm=" + | ||
272 | item.djywbm | ||
273 | ); | 269 | ); |
274 | window.open(href, `djbworkFrameview${item.bsmSlsq}`); | 270 | window.open(href, `djbworkFrameview${item.bsmSlsq}`); |
275 | } else { | 271 | } else { |
276 | const { href } = this.$router.resolve( | 272 | const { href } = this.$router.resolve( |
277 | "/workFrameView?bsmSlsq=" + | 273 | "/workFrameView?bsmSlsq=" + item.bsmSlsq + |
278 | item.bsmSlsq + | 274 | "&bsmBusiness=" + item.bsmBusiness |
279 | "&bestepid=" + | ||
280 | item.bestepid | ||
281 | ); | 275 | ); |
282 | window.open(href, `workFrameView${item.bsmSlsq}`); | 276 | window.open(href, `workFrameView${item.bsmSlsq}`) |
283 | } | 277 | } |
284 | } | 278 | } |
285 | } | 279 | } | ... | ... |
1 | /* | 1 | /* |
2 | * @Description: | 2 | * @Description: |
3 | * @Autor: renchao | 3 | * @Autor: renchao |
4 | * @LastEditTime: 2023-05-05 09:45:31 | 4 | * @LastEditTime: 2023-09-21 14:59:40 |
5 | */ | 5 | */ |
6 | import Router from '@/router' | 6 | import Router from '@/router' |
7 | export default { | 7 | export default { |
... | @@ -25,10 +25,8 @@ export default { | ... | @@ -25,10 +25,8 @@ export default { |
25 | */ | 25 | */ |
26 | jump (data, type) { | 26 | jump (data, type) { |
27 | const { href } = Router.resolve( | 27 | const { href } = Router.resolve( |
28 | "/djbworkFrame?bsmSlsq=" + | 28 | "/djbworkFrame?bsmSlsq=" + data.bsmSlsq + |
29 | data.bsmSlsq + | 29 | "&bestepid=" + data.bestepid + '&bsmBusiness=' + '&sqywbm=' + type |
30 | "&bestepid=" + | ||
31 | data.bestepid + '&bsmBusiness=' + '&sqywbm=' + type | ||
32 | ); | 30 | ); |
33 | window.open(href, "_blank"); | 31 | window.open(href, "_blank"); |
34 | this.$popupCacel() | 32 | this.$popupCacel() | ... | ... |
1 | /* | 1 | /* |
2 | * @Description: | 2 | * @Description: |
3 | * @Autor: renchao | 3 | * @Autor: renchao |
4 | * @LastEditTime: 2023-09-18 11:30:35 | 4 | * @LastEditTime: 2023-09-21 14:59:02 |
5 | */ | 5 | */ |
6 | import Router from '@/router' | 6 | import Router from '@/router' |
7 | export default { | 7 | export default { |
... | @@ -19,18 +19,14 @@ export default { | ... | @@ -19,18 +19,14 @@ export default { |
19 | }, | 19 | }, |
20 | /** | 20 | /** |
21 | * @description: jump | 21 | * @description: jump |
22 | * @param {*} data | ||
23 | * @param {*} type | ||
24 | * @author: renchao | 22 | * @author: renchao |
25 | */ | 23 | */ |
26 | jump (data, type) { | 24 | jump (data, type) { |
27 | const { href } = Router.resolve( | 25 | const { href } = Router.resolve( |
28 | "/workFrame?bsmSlsq=" + | 26 | "/workFrame?bsmSlsq=" + data.bsmSlsq + |
29 | data.bsmSlsq + | 27 | "&bestepid=" + data.bestepid + "&zbhj=受理" |
30 | "&bestepid=" + | 28 | ) |
31 | data.bestepid + '&bsmBusiness=' + '&sqywbm=' + type + "&zbhj=受理" | 29 | window.open(href, "_blank") |
32 | ); | ||
33 | window.open(href, "_blank") | ||
34 | this.$popupCacel() | 30 | this.$popupCacel() |
35 | }, | 31 | }, |
36 | /** | 32 | /** | ... | ... |
-
Please register or sign in to post a comment