Merge branch 'dev'
Showing
7 changed files
with
99 additions
and
61 deletions
1 | /* | 1 | /* |
2 | * @Description: | 2 | * @Description: |
3 | * @Autor: renchao | 3 | * @Autor: renchao |
4 | * @LastEditTime: 2023-05-17 10:24:24 | 4 | * @LastEditTime: 2023-07-25 14:46:16 |
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')) |
... | @@ -69,6 +69,18 @@ export function leftMenu (data) { | ... | @@ -69,6 +69,18 @@ export function leftMenu (data) { |
69 | data | 69 | data |
70 | }) | 70 | }) |
71 | } | 71 | } |
72 | /** | ||
73 | * @description: 进度查询获取左侧列表 | ||
74 | * @param {*} data | ||
75 | * @author: renchao | ||
76 | */ | ||
77 | export function jdcxLeftMenu (data) { | ||
78 | return request({ | ||
79 | url: SERVER.SERVERAPI + '/rest/business/workFlow/jdcxLeftMenu', | ||
80 | method: 'post', | ||
81 | data | ||
82 | }) | ||
83 | } | ||
72 | 84 | ||
73 | /** | 85 | /** |
74 | * @description: 获取下一环节信息 | 86 | * @description: 获取下一环节信息 | ... | ... |
1 | <!-- | 1 | <!-- |
2 | * @Description: workFrame左侧菜单列表-普通 | 2 | * @Description: workFrame左侧菜单列表-普通 |
3 | * @Autor: renchao | 3 | * @Autor: renchao |
4 | * @LastEditTime: 2023-07-25 14:14:04 | 4 | * @LastEditTime: 2023-07-25 14:55:49 |
5 | --> | 5 | --> |
6 | <template> | 6 | <template> |
7 | <div class="leftmenu" :class="{ 'animation-map-drawer': isShowdrawer }"> | 7 | <div class="leftmenu" :class="{ 'animation-map-drawer': isShowdrawer }"> |
... | @@ -40,7 +40,7 @@ | ... | @@ -40,7 +40,7 @@ |
40 | </template> | 40 | </template> |
41 | <script> | 41 | <script> |
42 | import { mapGetters } from 'vuex' | 42 | import { mapGetters } from 'vuex' |
43 | import { leftMenu, deleteSlbdcdy } from "@/api/workFlow.js" | 43 | import { leftMenu, deleteSlbdcdy, jdcxLeftMenu } from "@/api/workFlow.js" |
44 | export default { | 44 | export default { |
45 | data () { | 45 | data () { |
46 | return { | 46 | return { |
... | @@ -85,26 +85,47 @@ | ... | @@ -85,26 +85,47 @@ |
85 | loadBdcdylist () { | 85 | loadBdcdylist () { |
86 | var formdata = new FormData(); | 86 | var formdata = new FormData(); |
87 | formdata.append("bsmSlsq", this.bsmSlsq); | 87 | formdata.append("bsmSlsq", this.bsmSlsq); |
88 | formdata.append("bestepid", this.bestepid); | 88 | if (this.$route.query.bestepid) { |
89 | formdata.append("bestepid", this.bestepid); | ||
90 | } | ||
89 | if (this.$route.query.bsmBusiness) { | 91 | if (this.$route.query.bsmBusiness) { |
90 | formdata.append("bsmBusiness", this.$route.query.bsmBusiness); | 92 | formdata.append("bsmBusiness", this.$route.query.bsmBusiness); |
91 | } | 93 | } |
92 | leftMenu(formdata).then((res) => { | 94 | if (this.$route.query.type == 'jdcx') { |
93 | if (res.code === 200 && res.result) { | 95 | jdcxLeftMenu(formdata).then((res) => { |
94 | this.unitData = res.result; | 96 | if (res.code === 200 && res.result) { |
95 | window.unitData = res.result; | 97 | this.unitData = res.result; |
96 | this.currentSelectProps = res.result[0]; | 98 | window.unitData = res.result; |
97 | this.$emit('getCurrentSelectProps', this.currentSelectProps); | 99 | this.currentSelectProps = res.result[0]; |
98 | this.judgeBatchShow(); | 100 | this.$emit('getCurrentSelectProps', this.currentSelectProps); |
99 | if (this.showBatch) { | 101 | this.judgeBatchShow(); |
100 | //满足批量查封/批量抵押按钮出现 即先展示批量表单 | 102 | if (this.showBatch) { |
101 | this.batchUnitClick(); | 103 | //满足批量查封/批量抵押按钮出现 即先展示批量表单 |
102 | } else { | 104 | this.batchUnitClick(); |
103 | //默认选择单元列表第一个 | 105 | } else { |
104 | this.unitClick(0); | 106 | //默认选择单元列表第一个 |
107 | this.unitClick(0); | ||
108 | } | ||
105 | } | 109 | } |
106 | } | 110 | }) |
107 | }) | 111 | } else { |
112 | leftMenu(formdata).then((res) => { | ||
113 | if (res.code === 200 && res.result) { | ||
114 | this.unitData = res.result; | ||
115 | window.unitData = res.result; | ||
116 | this.currentSelectProps = res.result[0]; | ||
117 | this.$emit('getCurrentSelectProps', this.currentSelectProps); | ||
118 | this.judgeBatchShow(); | ||
119 | if (this.showBatch) { | ||
120 | //满足批量查封/批量抵押按钮出现 即先展示批量表单 | ||
121 | this.batchUnitClick(); | ||
122 | } else { | ||
123 | //默认选择单元列表第一个 | ||
124 | this.unitClick(0); | ||
125 | } | ||
126 | } | ||
127 | }) | ||
128 | } | ||
108 | }, | 129 | }, |
109 | //批量按钮判断 | 130 | //批量按钮判断 |
110 | /** | 131 | /** | ... | ... |
1 | <!-- | 1 | <!-- |
2 | * @Description: workFrame左侧菜单列表-分割 | 2 | * @Description: workFrame左侧菜单列表-分割 |
3 | * @Autor: renchao | 3 | * @Autor: renchao |
4 | * @LastEditTime: 2023-07-17 16:21:24 | 4 | * @LastEditTime: 2023-07-25 14:52:40 |
5 | --> | 5 | --> |
6 | <template> | 6 | <template> |
7 | <div class="leftmenu" :class="{ 'animation-map-drawer': isShowdrawer }"> | 7 | <div class="leftmenu" :class="{ 'animation-map-drawer': isShowdrawer }"> |
... | @@ -53,7 +53,7 @@ | ... | @@ -53,7 +53,7 @@ |
53 | </template> | 53 | </template> |
54 | <script> | 54 | <script> |
55 | import { mapGetters } from 'vuex' | 55 | import { mapGetters } from 'vuex' |
56 | import { leftMenu, deleteFlow } from "@/api/workFlow.js" | 56 | import { leftMenu, deleteFlow, jdcxLeftMenu } from "@/api/workFlow.js" |
57 | export default { | 57 | export default { |
58 | data () { | 58 | data () { |
59 | return { | 59 | return { |
... | @@ -102,26 +102,47 @@ | ... | @@ -102,26 +102,47 @@ |
102 | loadBdcdylist () { | 102 | loadBdcdylist () { |
103 | var formdata = new FormData(); | 103 | var formdata = new FormData(); |
104 | formdata.append("bsmSlsq", this.bsmSlsq); | 104 | formdata.append("bsmSlsq", this.bsmSlsq); |
105 | formdata.append("bestepid", this.bestepid); | 105 | if (this.$route.query.bestepid) { |
106 | formdata.append("bestepid", this.bestepid); | ||
107 | } | ||
106 | if (this.$route.query.bsmBusiness) { | 108 | if (this.$route.query.bsmBusiness) { |
107 | formdata.append("bsmBusiness", this.$route.query.bsmBusiness); | 109 | formdata.append("bsmBusiness", this.$route.query.bsmBusiness); |
108 | } | 110 | } |
109 | leftMenu(formdata).then((res) => { | 111 | if (this.$route.query.type == 'jdcx') { |
110 | if (res.code === 200 && res.result) { | 112 | jdcxLeftMenu(formdata).then((res) => { |
111 | this.aroundUnitData = res.result.filter(item => item.bglx == '1') | 113 | if (res.code === 200 && res.result) { |
112 | this.afterUnitData = res.result.filter(item => item.bglx == '2') | 114 | this.aroundUnitData = res.result.filter(item => item.bglx == '1') |
113 | this.currentSelectProps = res.result[0]; | 115 | this.afterUnitData = res.result.filter(item => item.bglx == '2') |
114 | this.$emit('getCurrentSelectProps', this.currentSelectProps); | 116 | this.currentSelectProps = res.result[0]; |
115 | this.judgeBatchShow(); | 117 | this.$emit('getCurrentSelectProps', this.currentSelectProps); |
116 | if (this.showBatch) { | 118 | this.judgeBatchShow(); |
117 | //满足批量查封/批量抵押按钮出现 即先展示批量表单 | 119 | if (this.showBatch) { |
118 | this.batchUnitClick(); | 120 | //满足批量查封/批量抵押按钮出现 即先展示批量表单 |
119 | } else { | 121 | this.batchUnitClick(); |
120 | //默认选择单元列表第一个 | 122 | } else { |
121 | this.unitClick(0); | 123 | //默认选择单元列表第一个 |
124 | this.unitClick(0); | ||
125 | } | ||
122 | } | 126 | } |
123 | } | 127 | }) |
124 | }) | 128 | } else { |
129 | leftMenu(formdata).then((res) => { | ||
130 | if (res.code === 200 && res.result) { | ||
131 | this.aroundUnitData = res.result.filter(item => item.bglx == '1') | ||
132 | this.afterUnitData = res.result.filter(item => item.bglx == '2') | ||
133 | this.currentSelectProps = res.result[0]; | ||
134 | this.$emit('getCurrentSelectProps', this.currentSelectProps); | ||
135 | this.judgeBatchShow(); | ||
136 | if (this.showBatch) { | ||
137 | //满足批量查封/批量抵押按钮出现 即先展示批量表单 | ||
138 | this.batchUnitClick(); | ||
139 | } else { | ||
140 | //默认选择单元列表第一个 | ||
141 | this.unitClick(0); | ||
142 | } | ||
143 | } | ||
144 | }) | ||
145 | } | ||
125 | }, | 146 | }, |
126 | //批量按钮判断 | 147 | //批量按钮判断 |
127 | /** | 148 | /** |
... | @@ -178,7 +199,7 @@ | ... | @@ -178,7 +199,7 @@ |
178 | }); | 199 | }); |
179 | }, | 200 | }, |
180 | 201 | ||
181 | //批量按钮点击事件 | 202 | //批量按钮点击事件 |
182 | /** | 203 | /** |
183 | * @description: 批量按钮点击事件 | 204 | * @description: 批量按钮点击事件 |
184 | * @author: renchao | 205 | * @author: renchao | ... | ... |
... | @@ -32,6 +32,7 @@ | ... | @@ -32,6 +32,7 @@ |
32 | v-model="tdyt" | 32 | v-model="tdyt" |
33 | :disabled="!ableOperation" | 33 | :disabled="!ableOperation" |
34 | noOptionsText="暂无数据" | 34 | noOptionsText="暂无数据" |
35 | placeholder='' | ||
35 | :show-count="true" | 36 | :show-count="true" |
36 | :options="dictData['tdyt']" | 37 | :options="dictData['tdyt']" |
37 | :normalizer="normalizer" | 38 | :normalizer="normalizer" |
... | @@ -315,5 +316,4 @@ | ... | @@ -315,5 +316,4 @@ |
315 | /deep/.el-table th { | 316 | /deep/.el-table th { |
316 | height: 30px !important; | 317 | height: 30px !important; |
317 | } | 318 | } |
318 | |||
319 | </style> | 319 | </style> | ... | ... |
... | @@ -93,7 +93,7 @@ | ... | @@ -93,7 +93,7 @@ |
93 | currentSelectProps: {}, | 93 | currentSelectProps: {}, |
94 | //是否开启材料分屏 | 94 | //是否开启材料分屏 |
95 | splitScreen: false, | 95 | splitScreen: false, |
96 | ableOperation:false, | 96 | ableOperation: false, |
97 | //材料分屏表单 | 97 | //材料分屏表单 |
98 | clxxForm: "", | 98 | clxxForm: "", |
99 | //材料信息选择卡索引 | 99 | //材料信息选择卡索引 |
... | @@ -126,7 +126,7 @@ | ... | @@ -126,7 +126,7 @@ |
126 | this.tabList = res.result; | 126 | this.tabList = res.result; |
127 | //默认加载第一个表单信息 | 127 | //默认加载第一个表单信息 |
128 | this.tabName = res.result[0].value; | 128 | this.tabName = res.result[0].value; |
129 | this.ableOperation=this.tabList[0].ableOperation | 129 | this.ableOperation = this.tabList[0].ableOperation |
130 | //批量操作无分屏按钮 | 130 | //批量操作无分屏按钮 |
131 | if (index != null) { | 131 | if (index != null) { |
132 | //处理分屏材料信息 | 132 | //处理分屏材料信息 | ... | ... |
1 | <!-- | 1 | <!-- |
2 | * @Description: | 2 | * @Description: |
3 | * @Autor: renchao | 3 | * @Autor: renchao |
4 | * @LastEditTime: 2023-07-24 14:04:15 | 4 | * @LastEditTime: 2023-07-25 14:47:41 |
5 | --> | 5 | --> |
6 | <template> | 6 | <template> |
7 | <div class="from-clues"> | 7 | <div class="from-clues"> |
... | @@ -195,23 +195,7 @@ | ... | @@ -195,23 +195,7 @@ |
195 | this.$popupDialog('楼盘表', 'lpb/index', { | 195 | this.$popupDialog('楼盘表', 'lpb/index', { |
196 | bsm: '' | 196 | bsm: '' |
197 | }, '85%') | 197 | }, '85%') |
198 | }, | 198 | } |
199 | // ywhClick (item) { | ||
200 | // const { href } = this.$router.resolve( | ||
201 | // "/djbworkFrame?bdcdyid=" + | ||
202 | // item.bdcdyid+ | ||
203 | // "&bdcdyh=" + | ||
204 | // item.bdcdyh+ | ||
205 | // "&qllx="+ | ||
206 | // item.qllx+ | ||
207 | // "&bsmQlxx="+ | ||
208 | // item.bsmQlxx+ | ||
209 | // "&viewtype=1" | ||
210 | // ); | ||
211 | // localStorage.setItem('ywbl', JSON.stringify(item)); | ||
212 | // window.open(href, `urlname${item.bdcdyid}`); | ||
213 | |||
214 | // }, | ||
215 | } | 199 | } |
216 | } | 200 | } |
217 | </script> | 201 | </script> | ... | ... |
1 | <!-- | 1 | <!-- |
2 | * @Description: | 2 | * @Description: |
3 | * @Autor: renchao | 3 | * @Autor: renchao |
4 | * @LastEditTime: 2023-07-24 14:02:07 | 4 | * @LastEditTime: 2023-07-25 14:47:05 |
5 | --> | 5 | --> |
6 | <template> | 6 | <template> |
7 | <div class="from-clues"> | 7 | <div class="from-clues"> |
... | @@ -151,7 +151,7 @@ | ... | @@ -151,7 +151,7 @@ |
151 | * @author: renchao | 151 | * @author: renchao |
152 | */ | 152 | */ |
153 | openDialog (item) { | 153 | openDialog (item) { |
154 | const { href } = this.$router.resolve('/workFrameView?bsmSlsq=' + item.bsmSlsq + '&bestepid=' + item.bestepid + '&bsmBusiness=' + item.bsmBusiness + '&viewtype=3') | 154 | const { href } = this.$router.resolve('/workFrameView?bsmSlsq=' + item.bsmSlsq + '&bsmBusiness=' + item.bsmBusiness + '&viewtype=3'+ '&type=jdcx') |
155 | window.open(href, `urlname${item.bsmSlsq}`) | 155 | window.open(href, `urlname${item.bsmSlsq}`) |
156 | } | 156 | } |
157 | } | 157 | } | ... | ... |
-
Please register or sign in to post a comment