Merge branch 'dev'
Showing
7 changed files
with
179 additions
and
151 deletions
1 | <!-- | 1 | <!-- |
2 | * @Description: | 2 | * @Description: |
3 | * @Autor: renchao | 3 | * @Autor: renchao |
4 | * @LastEditTime: 2023-09-26 16:49:33 | 4 | * @LastEditTime: 2023-10-17 13:18:17 |
5 | --> | 5 | --> |
6 | <template> | 6 | <template> |
7 | <dialogBox | 7 | <dialogBox |
... | @@ -93,7 +93,25 @@ | ... | @@ -93,7 +93,25 @@ |
93 | oninput="value=value.replace(/[^\d]/g,'')"></el-input> | 93 | oninput="value=value.replace(/[^\d]/g,'')"></el-input> |
94 | </el-form-item> | 94 | </el-form-item> |
95 | </el-col> | 95 | </el-col> |
96 | 96 | <el-col :span="8"> | |
97 | <el-form-item label="性别"> | ||
98 | <el-select | ||
99 | clearable | ||
100 | v-model="ruleForm.xb" | ||
101 | :disabled="!showButton" | ||
102 | class="width100" | ||
103 | placeholder="请选择"> | ||
104 | <el-option | ||
105 | v-for="item in dictData['A43']" | ||
106 | :key="item.dcode" | ||
107 | :label="item.dname" | ||
108 | :value="item.dcode"> | ||
109 | </el-option> | ||
110 | </el-select> | ||
111 | </el-form-item> | ||
112 | </el-col> | ||
113 | </el-row> | ||
114 | <el-row> | ||
97 | <el-col :span="8"> | 115 | <el-col :span="8"> |
98 | <el-form-item label="权利比例"> | 116 | <el-form-item label="权利比例"> |
99 | <el-input | 117 | <el-input |
... | @@ -102,8 +120,6 @@ | ... | @@ -102,8 +120,6 @@ |
102 | :disabled="!showButton || this.ruleForm.gyfs == 1"></el-input> | 120 | :disabled="!showButton || this.ruleForm.gyfs == 1"></el-input> |
103 | </el-form-item> | 121 | </el-form-item> |
104 | </el-col> | 122 | </el-col> |
105 | </el-row> | ||
106 | <el-row> | ||
107 | <el-col :span="8"> | 123 | <el-col :span="8"> |
108 | <el-form-item label="法人名称" prop="frmc"> | 124 | <el-form-item label="法人名称" prop="frmc"> |
109 | <el-input | 125 | <el-input |
... | @@ -120,6 +136,8 @@ | ... | @@ -120,6 +136,8 @@ |
120 | :disabled="!showButton"></el-input> | 136 | :disabled="!showButton"></el-input> |
121 | </el-form-item> | 137 | </el-form-item> |
122 | </el-col> | 138 | </el-col> |
139 | </el-row> | ||
140 | <el-row> | ||
123 | <el-col :span="8"> | 141 | <el-col :span="8"> |
124 | <el-form-item label="户籍所在省市"> | 142 | <el-form-item label="户籍所在省市"> |
125 | <el-input | 143 | <el-input |
... | @@ -128,10 +146,7 @@ | ... | @@ -128,10 +146,7 @@ |
128 | :disabled="!showButton"></el-input> | 146 | :disabled="!showButton"></el-input> |
129 | </el-form-item> | 147 | </el-form-item> |
130 | </el-col> | 148 | </el-col> |
131 | </el-row> | 149 | <el-col :span="16"> |
132 | |||
133 | <el-row> | ||
134 | <el-col :span="24"> | ||
135 | <el-form-item label="地址"> | 150 | <el-form-item label="地址"> |
136 | <el-input | 151 | <el-input |
137 | v-model="ruleForm.dz" | 152 | v-model="ruleForm.dz" |
... | @@ -190,15 +205,6 @@ | ... | @@ -190,15 +205,6 @@ |
190 | 205 | ||
191 | <el-row> | 206 | <el-row> |
192 | <el-col :span="8"> | 207 | <el-col :span="8"> |
193 | <el-form-item label="代理人电话"> | ||
194 | <el-input | ||
195 | v-model="ruleForm.dlrdhhm" | ||
196 | :disabled="!showButton" | ||
197 | maxlength="11" | ||
198 | oninput="value=value.replace(/[^\d]/g,'')"></el-input> | ||
199 | </el-form-item> | ||
200 | </el-col> | ||
201 | <el-col :span="8"> | ||
202 | <el-form-item label="代理人姓名"> | 208 | <el-form-item label="代理人姓名"> |
203 | <el-input | 209 | <el-input |
204 | v-model="ruleForm.dlrxm" | 210 | v-model="ruleForm.dlrxm" |
... | @@ -223,31 +229,23 @@ | ... | @@ -223,31 +229,23 @@ |
223 | </el-select> | 229 | </el-select> |
224 | </el-form-item> | 230 | </el-form-item> |
225 | </el-col> | 231 | </el-col> |
226 | </el-row> | ||
227 | <el-row> | ||
228 | <el-col :span="8"> | 232 | <el-col :span="8"> |
229 | <el-form-item label="性别"> | 233 | <el-form-item label="代理人证件号"> |
230 | <el-select | 234 | <el-input |
231 | clearable | 235 | v-model="ruleForm.dlrzjh" |
232 | v-model="ruleForm.xb" | ||
233 | :disabled="!showButton" | 236 | :disabled="!showButton" |
234 | class="width100" | 237 | maxlength="18"></el-input> |
235 | placeholder="请选择"> | ||
236 | <el-option | ||
237 | v-for="item in dictData['A43']" | ||
238 | :key="item.dcode" | ||
239 | :label="item.dname" | ||
240 | :value="item.dcode"> | ||
241 | </el-option> | ||
242 | </el-select> | ||
243 | </el-form-item> | 238 | </el-form-item> |
244 | </el-col> | 239 | </el-col> |
240 | </el-row> | ||
241 | <el-row> | ||
245 | <el-col :span="8"> | 242 | <el-col :span="8"> |
246 | <el-form-item label="代理人证件号"> | 243 | <el-form-item label="代理人电话"> |
247 | <el-input | 244 | <el-input |
248 | v-model="ruleForm.dlrzjh" | 245 | v-model="ruleForm.dlrdhhm" |
249 | :disabled="!showButton" | 246 | :disabled="!showButton" |
250 | maxlength="18"></el-input> | 247 | maxlength="11" |
248 | oninput="value=value.replace(/[^\d]/g,'')"></el-input> | ||
251 | </el-form-item> | 249 | </el-form-item> |
252 | </el-col> | 250 | </el-col> |
253 | </el-row> | 251 | </el-row> | ... | ... |
1 | <!-- | 1 | <!-- |
2 | * @Description: | 2 | * @Description: |
3 | * @Autor: renchao | 3 | * @Autor: renchao |
4 | * @LastEditTime: 2023-09-26 15:40:49 | 4 | * @LastEditTime: 2023-10-17 13:20:04 |
5 | --> | 5 | --> |
6 | <template> | 6 | <template> |
7 | <dialogBox | 7 | <dialogBox |
... | @@ -91,6 +91,25 @@ | ... | @@ -91,6 +91,25 @@ |
91 | </el-form-item> | 91 | </el-form-item> |
92 | </el-col> | 92 | </el-col> |
93 | <el-col :span="8"> | 93 | <el-col :span="8"> |
94 | <el-form-item label="性别" prop="xb"> | ||
95 | <el-select | ||
96 | clearable | ||
97 | v-model="ruleForm.xb" | ||
98 | :disabled="!showButton" | ||
99 | class="width100" | ||
100 | placeholder="请选择"> | ||
101 | <el-option | ||
102 | v-for="item in dictData['A43']" | ||
103 | :key="item.dcode" | ||
104 | :label="item.dname" | ||
105 | :value="item.dcode"> | ||
106 | </el-option> | ||
107 | </el-select> | ||
108 | </el-form-item> | ||
109 | </el-col> | ||
110 | </el-row> | ||
111 | <el-row> | ||
112 | <el-col :span="8"> | ||
94 | <el-form-item label="权利比例" prop="qlbl"> | 113 | <el-form-item label="权利比例" prop="qlbl"> |
95 | <el-input | 114 | <el-input |
96 | v-model="ruleForm.qlbl" | 115 | v-model="ruleForm.qlbl" |
... | @@ -98,8 +117,6 @@ | ... | @@ -98,8 +117,6 @@ |
98 | :disabled="!showButton || this.ruleForm.gyfs == 1"></el-input> | 117 | :disabled="!showButton || this.ruleForm.gyfs == 1"></el-input> |
99 | </el-form-item> | 118 | </el-form-item> |
100 | </el-col> | 119 | </el-col> |
101 | </el-row> | ||
102 | <el-row> | ||
103 | <el-col :span="8"> | 120 | <el-col :span="8"> |
104 | <el-form-item label="法人名称" prop="frmc"> | 121 | <el-form-item label="法人名称" prop="frmc"> |
105 | <el-input | 122 | <el-input |
... | @@ -116,6 +133,8 @@ | ... | @@ -116,6 +133,8 @@ |
116 | :disabled="!showButton"></el-input> | 133 | :disabled="!showButton"></el-input> |
117 | </el-form-item> | 134 | </el-form-item> |
118 | </el-col> | 135 | </el-col> |
136 | </el-row> | ||
137 | <el-row> | ||
119 | <el-col :span="8"> | 138 | <el-col :span="8"> |
120 | <el-form-item label="户籍所在省市" prop="hjszss"> | 139 | <el-form-item label="户籍所在省市" prop="hjszss"> |
121 | <el-input | 140 | <el-input |
... | @@ -124,10 +143,7 @@ | ... | @@ -124,10 +143,7 @@ |
124 | :disabled="!showButton"></el-input> | 143 | :disabled="!showButton"></el-input> |
125 | </el-form-item> | 144 | </el-form-item> |
126 | </el-col> | 145 | </el-col> |
127 | </el-row> | 146 | <el-col :span="16"> |
128 | |||
129 | <el-row> | ||
130 | <el-col :span="24"> | ||
131 | <el-form-item label="地址" prop="txdz"> | 147 | <el-form-item label="地址" prop="txdz"> |
132 | <el-input | 148 | <el-input |
133 | v-model="ruleForm.txdz" | 149 | v-model="ruleForm.txdz" |
... | @@ -186,15 +202,6 @@ | ... | @@ -186,15 +202,6 @@ |
186 | 202 | ||
187 | <el-row> | 203 | <el-row> |
188 | <el-col :span="8"> | 204 | <el-col :span="8"> |
189 | <el-form-item label="代理人电话" prop="dlrdh"> | ||
190 | <el-input | ||
191 | v-model="ruleForm.dlrdh" | ||
192 | :disabled="!showButton" | ||
193 | maxlength="11" | ||
194 | oninput="value=value.replace(/[^\d]/g,'')"></el-input> | ||
195 | </el-form-item> | ||
196 | </el-col> | ||
197 | <el-col :span="8"> | ||
198 | <el-form-item label="代理人姓名" prop="dlrmc"> | 205 | <el-form-item label="代理人姓名" prop="dlrmc"> |
199 | <el-input | 206 | <el-input |
200 | v-model="ruleForm.dlrmc" | 207 | v-model="ruleForm.dlrmc" |
... | @@ -219,25 +226,6 @@ | ... | @@ -219,25 +226,6 @@ |
219 | </el-select> | 226 | </el-select> |
220 | </el-form-item> | 227 | </el-form-item> |
221 | </el-col> | 228 | </el-col> |
222 | </el-row> | ||
223 | <el-row> | ||
224 | <el-col :span="8"> | ||
225 | <el-form-item label="性别" prop="xb"> | ||
226 | <el-select | ||
227 | clearable | ||
228 | v-model="ruleForm.xb" | ||
229 | :disabled="!showButton" | ||
230 | class="width100" | ||
231 | placeholder="请选择"> | ||
232 | <el-option | ||
233 | v-for="item in dictData['A43']" | ||
234 | :key="item.dcode" | ||
235 | :label="item.dname" | ||
236 | :value="item.dcode"> | ||
237 | </el-option> | ||
238 | </el-select> | ||
239 | </el-form-item> | ||
240 | </el-col> | ||
241 | <el-col :span="8"> | 229 | <el-col :span="8"> |
242 | <el-form-item label="代理人证件号" prop="dlrzjh"> | 230 | <el-form-item label="代理人证件号" prop="dlrzjh"> |
243 | <el-input | 231 | <el-input |
... | @@ -248,6 +236,17 @@ | ... | @@ -248,6 +236,17 @@ |
248 | </el-form-item> | 236 | </el-form-item> |
249 | </el-col> | 237 | </el-col> |
250 | </el-row> | 238 | </el-row> |
239 | <el-row> | ||
240 | <el-col :span="8"> | ||
241 | <el-form-item label="代理人电话" prop="dlrdh"> | ||
242 | <el-input | ||
243 | v-model="ruleForm.dlrdh" | ||
244 | :disabled="!showButton" | ||
245 | maxlength="11" | ||
246 | oninput="value=value.replace(/[^\d]/g,'')"></el-input> | ||
247 | </el-form-item> | ||
248 | </el-col> | ||
249 | </el-row> | ||
251 | </el-form> | 250 | </el-form> |
252 | 251 | ||
253 | <div v-if="activeName==2" class="padding10"> | 252 | <div v-if="activeName==2" class="padding10"> | ... | ... |
... | @@ -207,15 +207,6 @@ | ... | @@ -207,15 +207,6 @@ |
207 | 207 | ||
208 | <el-row> | 208 | <el-row> |
209 | <el-col :span="8"> | 209 | <el-col :span="8"> |
210 | <el-form-item label="代理人电话" prop="dlrdh"> | ||
211 | <el-input | ||
212 | v-model="ruleForm.dlrdh" | ||
213 | :disabled="!showButton" | ||
214 | maxlength="11" | ||
215 | oninput="value=value.replace(/[^\d]/g,'')"></el-input> | ||
216 | </el-form-item> | ||
217 | </el-col> | ||
218 | <el-col :span="8"> | ||
219 | <el-form-item label="代理人姓名" prop="dlrmc"> | 210 | <el-form-item label="代理人姓名" prop="dlrmc"> |
220 | <el-input | 211 | <el-input |
221 | v-model="ruleForm.dlrmc" | 212 | v-model="ruleForm.dlrmc" |
... | @@ -240,9 +231,6 @@ | ... | @@ -240,9 +231,6 @@ |
240 | </el-select> | 231 | </el-select> |
241 | </el-form-item> | 232 | </el-form-item> |
242 | </el-col> | 233 | </el-col> |
243 | </el-row> | ||
244 | <el-row> | ||
245 | |||
246 | <el-col :span="8"> | 234 | <el-col :span="8"> |
247 | <el-form-item label="代理人证件号" prop="dlrzjh"> | 235 | <el-form-item label="代理人证件号" prop="dlrzjh"> |
248 | <el-input | 236 | <el-input |
... | @@ -252,6 +240,18 @@ | ... | @@ -252,6 +240,18 @@ |
252 | oninput="this.value=this.value.replace(/[^\X0-9]/g,'')"></el-input> | 240 | oninput="this.value=this.value.replace(/[^\X0-9]/g,'')"></el-input> |
253 | </el-form-item> | 241 | </el-form-item> |
254 | </el-col> | 242 | </el-col> |
243 | |||
244 | </el-row> | ||
245 | <el-row> | ||
246 | <el-col :span="8"> | ||
247 | <el-form-item label="代理人电话" prop="dlrdh"> | ||
248 | <el-input | ||
249 | v-model="ruleForm.dlrdh" | ||
250 | :disabled="!showButton" | ||
251 | maxlength="11" | ||
252 | oninput="value=value.replace(/[^\d]/g,'')"></el-input> | ||
253 | </el-form-item> | ||
254 | </el-col> | ||
255 | </el-row> | 255 | </el-row> |
256 | </el-form> | 256 | </el-form> |
257 | <div v-if="activeName==2" class="padding10"> | 257 | <div v-if="activeName==2" class="padding10"> | ... | ... |
1 | <!-- | 1 | <!-- |
2 | * @Description: workFrame左侧菜单列表-普通 | 2 | * @Description: workFrame左侧菜单列表-普通 |
3 | * @Autor: renchao | 3 | * @Autor: renchao |
4 | * @LastEditTime: 2023-10-13 10:52:12 | 4 | * @LastEditTime: 2023-10-17 09:54:06 |
5 | --> | 5 | --> |
6 | <template> | 6 | <template> |
7 | <div class="leftmenu" :class="{ 'animation-map-drawer': isShowdrawer }"> | 7 | <div class="leftmenu" :class="{ 'animation-map-drawer': isShowdrawer }"> |
... | @@ -15,7 +15,7 @@ | ... | @@ -15,7 +15,7 @@ |
15 | 申请单元列表({{ unitData.length }}) | 15 | 申请单元列表({{ unitData.length }}) |
16 | <el-button type="text" class="batchDel" @click="handleBatchDel" v-if="unitData.length > 1">批量删除</el-button> | 16 | <el-button type="text" class="batchDel" @click="handleBatchDel" v-if="unitData.length > 1">批量删除</el-button> |
17 | </div> | 17 | </div> |
18 | <el-menu v-model="activeIndex" :default-active="activeIndex" @select="unitClick"> | 18 | <el-menu v-model="activeIndex" :default-active="activeIndex" :key="key" @select="unitClick"> |
19 | <el-menu-item v-for="(item, index) in unitData" :index="index.toString()" :key="index"> | 19 | <el-menu-item v-for="(item, index) in unitData" :index="index.toString()" :key="index"> |
20 | <p class="dot" v-if="item.issave == '0'"></p> | 20 | <p class="dot" v-if="item.issave == '0'"></p> |
21 | <div class="menu-con"> | 21 | <div class="menu-con"> |
... | @@ -47,10 +47,12 @@ | ... | @@ -47,10 +47,12 @@ |
47 | export default { | 47 | export default { |
48 | data () { | 48 | data () { |
49 | return { | 49 | return { |
50 | key: 0, | ||
50 | //受理申请标识码 | 51 | //受理申请标识码 |
51 | bsmSlsq: this.$route.query.bsmSlsq, | 52 | bsmSlsq: this.$route.query.bsmSlsq, |
52 | bestepid: this.$route.query.bestepid, | 53 | bestepid: this.$route.query.bestepid, |
53 | bsmBusiness: this.$route.query.bsmBusiness, | 54 | bsmBusiness: this.$route.query.bsmBusiness, |
55 | type: this.$route.query.type, | ||
54 | // 默认选中 | 56 | // 默认选中 |
55 | activeIndex: '0', | 57 | activeIndex: '0', |
56 | // 折叠 | 58 | // 折叠 |
... | @@ -172,6 +174,7 @@ | ... | @@ -172,6 +174,7 @@ |
172 | * @author: renchao | 174 | * @author: renchao |
173 | */ | 175 | */ |
174 | handleDel (item) { | 176 | handleDel (item) { |
177 | let that = this | ||
175 | this.$confirm("确定要删除吗, 是否继续?", "提示", { | 178 | this.$confirm("确定要删除吗, 是否继续?", "提示", { |
176 | confirmButtonText: "确定", | 179 | confirmButtonText: "确定", |
177 | cancelButtonText: "取消", | 180 | cancelButtonText: "取消", |
... | @@ -182,12 +185,16 @@ | ... | @@ -182,12 +185,16 @@ |
182 | formdata.append("bsmSldyList", item.bsmSldy.split(",")); | 185 | formdata.append("bsmSldyList", item.bsmSldy.split(",")); |
183 | deleteSlbdcdy(formdata).then((res) => { | 186 | deleteSlbdcdy(formdata).then((res) => { |
184 | if (res.code == 200) { | 187 | if (res.code == 200) { |
185 | this.$message.success("删除成功"); | 188 | that.$message.success("删除成功"); |
186 | this.loadBdcdylist() | 189 | that.loadBdcdylist() |
190 | if (that.activeIndex != '-1') { | ||
191 | that.activeIndex = '0' | ||
192 | sessionStorage.setItem('keyPath', '0'); | ||
193 | } | ||
187 | } else { | 194 | } else { |
188 | this.$message.error(res.message); | 195 | this.$message.error(res.message); |
189 | } | 196 | } |
190 | }); | 197 | }) |
191 | }) | 198 | }) |
192 | .catch(() => { | 199 | .catch(() => { |
193 | this.$message({ | 200 | this.$message({ |
... | @@ -229,6 +236,7 @@ | ... | @@ -229,6 +236,7 @@ |
229 | this.currentSelectProps.batchOperation = false; | 236 | this.currentSelectProps.batchOperation = false; |
230 | this.activeIndex = index.toString(); | 237 | this.activeIndex = index.toString(); |
231 | sessionStorage.setItem('keyPath', this.activeIndex); | 238 | sessionStorage.setItem('keyPath', this.activeIndex); |
239 | this.key++ | ||
232 | //选中表单传递数据 | 240 | //选中表单传递数据 |
233 | this.$emit('getCurrentSelectProps', this.currentSelectProps); | 241 | this.$emit('getCurrentSelectProps', this.currentSelectProps); |
234 | this.$parent.stepForm(index); | 242 | this.$parent.stepForm(index); | ... | ... |
1 | <!-- | 1 | <!-- |
2 | * @Description: workFrame左侧菜单列表-分割 | 2 | * @Description: workFrame左侧菜单列表-分割 |
3 | * @Autor: renchao | 3 | * @Autor: renchao |
4 | * @LastEditTime: 2023-10-13 11:24:29 | 4 | * @LastEditTime: 2023-10-17 10:54:39 |
5 | --> | 5 | --> |
6 | <template> | 6 | <template> |
7 | <div class="leftmenu" :class="{ 'animation-map-drawer': isShowdrawer }"> | 7 | <div class="leftmenu" :class="{ 'animation-map-drawer': isShowdrawer }"> |
8 | <el-menu :default-active="activeIndex" @select="batchUnitClick" class="title-batch" v-if="showBatch"> | 8 | <el-menu :default-active="activeBatchIndex" @select="batchUnitClick" class="title-batch" v-if="showBatch"> |
9 | <el-menu-item index="-1" key="-1" class="menus"> | 9 | <el-menu-item index="-1" key="-1" class="menus"> |
10 | <div>{{ batchButtonName }}</div> | 10 | <div>{{ batchButtonName }}</div> |
11 | </el-menu-item> | 11 | </el-menu-item> |
12 | </el-menu> | 12 | </el-menu> |
13 | <div v-if="this.isShowdrawer"> | 13 | <div v-if="this.isShowdrawer"> |
14 | <!-- 变更前单元 --> | 14 | <!-- 变更前单元 --> |
15 | <div class="title"> | 15 | <div class="title" v-if="aroundShow"> |
16 | <b>变更前单元</b>/申请单元列表({{ aroundUnitData.length }}) | 16 | <b>变更前单元</b>/申请单元列表({{ aroundUnitData.length }}) |
17 | </div> | 17 | </div> |
18 | <el-menu :default-active="activeIndex" @select="unitClick"> | 18 | <el-menu :default-active="activeIndex" @select="unitClick"> |
... | @@ -23,11 +23,11 @@ | ... | @@ -23,11 +23,11 @@ |
23 | <p class="title-detail">{{ item.zl }}</p> | 23 | <p class="title-detail">{{ item.zl }}</p> |
24 | </el-tooltip> | 24 | </el-tooltip> |
25 | </div> | 25 | </div> |
26 | <i class="el-icon-delete" v-if="aroundUnitData.length > 1" @click.stop="handleDel(item)"></i> | 26 | <i class="el-icon-delete" v-if="aroundUnitData.length > 1" @click.stop="handleDel(item,'around')"></i> |
27 | </el-menu-item> | 27 | </el-menu-item> |
28 | </el-menu> | 28 | </el-menu> |
29 | <!-- 变更后单元 --> | 29 | <!-- 变更后单元 --> |
30 | <div class="title"> | 30 | <div class="title" v-if="afterShow"> |
31 | <b>变更后单元</b>/申请单元列表({{ afterUnitData.length }}) | 31 | <b>变更后单元</b>/申请单元列表({{ afterUnitData.length }}) |
32 | </div> | 32 | </div> |
33 | <el-menu :default-active="activeHIndex" @select="handleAfterunitClick"> | 33 | <el-menu :default-active="activeHIndex" @select="handleAfterunitClick"> |
... | @@ -39,7 +39,7 @@ | ... | @@ -39,7 +39,7 @@ |
39 | <p class="title-detail">{{ item.zl }}</p> | 39 | <p class="title-detail">{{ item.zl }}</p> |
40 | </el-tooltip> | 40 | </el-tooltip> |
41 | </div> | 41 | </div> |
42 | <i class="el-icon-delete" v-if="afterUnitData.length > 1" @click.stop="handleDel(item)"></i> | 42 | <i class="el-icon-delete" v-if="afterUnitData.length > 1" @click.stop="handleDel(item, 'after')"></i> |
43 | </el-menu-item> | 43 | </el-menu-item> |
44 | </el-menu> | 44 | </el-menu> |
45 | </div> | 45 | </div> |
... | @@ -61,9 +61,14 @@ | ... | @@ -61,9 +61,14 @@ |
61 | export default { | 61 | export default { |
62 | data () { | 62 | data () { |
63 | return { | 63 | return { |
64 | aroundShow: false, | ||
65 | afterShow: false, | ||
64 | bsmSlsq: this.$route.query.bsmSlsq, | 66 | bsmSlsq: this.$route.query.bsmSlsq, |
65 | bsmBusiness: this.$route.query.bsmBusiness, | 67 | bsmBusiness: this.$route.query.bsmBusiness, |
66 | bestepid: this.$route.query.bestepid, | 68 | bestepid: this.$route.query.bestepid, |
69 | type: this.$route.query.type, | ||
70 | // 批量操作 | ||
71 | activeBatchIndex: '0', | ||
67 | // 变更前单元默认选中 | 72 | // 变更前单元默认选中 |
68 | activeIndex: '0', | 73 | activeIndex: '0', |
69 | // 变更后单元默认选中 | 74 | // 变更后单元默认选中 |
... | @@ -112,15 +117,33 @@ | ... | @@ -112,15 +117,33 @@ |
112 | jdcxLeftMenu(formdata).then((res) => { | 117 | jdcxLeftMenu(formdata).then((res) => { |
113 | if (res.code === 200 && res.result) { | 118 | if (res.code === 200 && res.result) { |
114 | this.aroundUnitData = res.result.filter(item => item.bglx == '1') | 119 | this.aroundUnitData = res.result.filter(item => item.bglx == '1') |
120 | if (this.aroundUnitData.length > 0) { | ||
121 | this.aroundShow = true | ||
122 | } else { | ||
123 | this.aroundShow = false | ||
124 | } | ||
115 | this.afterUnitData = res.result.filter(item => item.bglx == '2') | 125 | this.afterUnitData = res.result.filter(item => item.bglx == '2') |
126 | if (this.afterUnitData.length > 0) { | ||
127 | this.afterShow = true | ||
128 | } else { | ||
129 | this.afterShow = false | ||
130 | } | ||
116 | this.currentSelectProps = res.result[0]; | 131 | this.currentSelectProps = res.result[0]; |
117 | this.$emit('getCurrentSelectProps', this.currentSelectProps); | 132 | this.$emit('getCurrentSelectProps', this.currentSelectProps); |
118 | this.judgeBatchShow(); | 133 | this.judgeBatchShow(); |
119 | if (!status) { | 134 | if (!status) { |
120 | if (sessionStorage.getItem('keyPath')) { | 135 | if (sessionStorage.getItem('keyPath')) { |
136 | if (this.aroundShow) { | ||
121 | that.unitClick(sessionStorage.getItem('keyPath') - 0) | 137 | that.unitClick(sessionStorage.getItem('keyPath') - 0) |
122 | } else { | 138 | } else { |
139 | that.handleAfterunitClick(sessionStorage.getItem('keyPath') - 0) | ||
140 | } | ||
141 | } else { | ||
142 | if (this.aroundShow) { | ||
123 | that.unitClick(0) | 143 | that.unitClick(0) |
144 | } else { | ||
145 | that.handleAfterunitClick(0) | ||
146 | } | ||
124 | if (that.showBatch) { | 147 | if (that.showBatch) { |
125 | //满足批量查封/批量抵押按钮出现 即先展示批量表单 | 148 | //满足批量查封/批量抵押按钮出现 即先展示批量表单 |
126 | that.batchUnitClick(); | 149 | that.batchUnitClick(); |
... | @@ -133,15 +156,33 @@ | ... | @@ -133,15 +156,33 @@ |
133 | leftMenu(formdata).then((res) => { | 156 | leftMenu(formdata).then((res) => { |
134 | if (res.code === 200 && res.result) { | 157 | if (res.code === 200 && res.result) { |
135 | this.aroundUnitData = res.result.filter(item => item.bglx == '1') | 158 | this.aroundUnitData = res.result.filter(item => item.bglx == '1') |
159 | if (this.aroundUnitData.length > 0) { | ||
160 | this.aroundShow = true | ||
161 | } else { | ||
162 | this.aroundShow = false | ||
163 | } | ||
136 | this.afterUnitData = res.result.filter(item => item.bglx == '2') | 164 | this.afterUnitData = res.result.filter(item => item.bglx == '2') |
165 | if (this.afterUnitData.length > 0) { | ||
166 | this.afterShow = true | ||
167 | } else { | ||
168 | this.afterShow = false | ||
169 | } | ||
137 | this.currentSelectProps = res.result[0]; | 170 | this.currentSelectProps = res.result[0]; |
138 | this.$emit('getCurrentSelectProps', this.currentSelectProps); | 171 | this.$emit('getCurrentSelectProps', this.currentSelectProps); |
139 | this.judgeBatchShow(); | 172 | this.judgeBatchShow(); |
140 | if (!status) { | 173 | if (!status) { |
141 | if (sessionStorage.getItem('keyPath')) { | 174 | if (sessionStorage.getItem('keyPath')) { |
175 | if (this.aroundShow) { | ||
142 | that.unitClick(sessionStorage.getItem('keyPath') - 0) | 176 | that.unitClick(sessionStorage.getItem('keyPath') - 0) |
143 | } else { | 177 | } else { |
178 | that.handleAfterunitClick(sessionStorage.getItem('keyPath') - 0) | ||
179 | } | ||
180 | } else { | ||
181 | if (this.aroundShow) { | ||
144 | that.unitClick(0) | 182 | that.unitClick(0) |
183 | } else { | ||
184 | that.handleAfterunitClick(0) | ||
185 | } | ||
145 | if (that.showBatch) { | 186 | if (that.showBatch) { |
146 | //满足批量查封/批量抵押按钮出现 即先展示批量表单 | 187 | //满足批量查封/批量抵押按钮出现 即先展示批量表单 |
147 | that.batchUnitClick(); | 188 | that.batchUnitClick(); |
... | @@ -175,11 +216,12 @@ | ... | @@ -175,11 +216,12 @@ |
175 | } | 216 | } |
176 | }, | 217 | }, |
177 | /** | 218 | /** |
178 | * @description: 删除左侧列表 | 219 | * @description: 删除左侧列表-变更前 |
179 | * @param {*} item | 220 | * @param {*} item |
180 | * @author: renchao | 221 | * @author: renchao |
181 | */ | 222 | */ |
182 | handleDel (item) { | 223 | handleDel (item, type) { |
224 | let that = this | ||
183 | this.$confirm("确定要删除吗, 是否继续?", "提示", { | 225 | this.$confirm("确定要删除吗, 是否继续?", "提示", { |
184 | confirmButtonText: "确定", | 226 | confirmButtonText: "确定", |
185 | cancelButtonText: "取消", | 227 | cancelButtonText: "取消", |
... | @@ -191,8 +233,15 @@ | ... | @@ -191,8 +233,15 @@ |
191 | formdata.append("bsmSlsq", this.bsmSlsq); | 233 | formdata.append("bsmSlsq", this.bsmSlsq); |
192 | deleteFlow(formdata).then((res) => { | 234 | deleteFlow(formdata).then((res) => { |
193 | if (res.code == 200) { | 235 | if (res.code == 200) { |
194 | this.$message.success("删除成功"); | 236 | that.$message.success("删除成功"); |
195 | this.$parent.updateDialog(); | 237 | that.loadBdcdylist() |
238 | if (type == 'around') { | ||
239 | that.activeIndex = '0' | ||
240 | sessionStorage.setItem('keyPath', '0'); | ||
241 | } else { | ||
242 | that.activeIndex = '0' | ||
243 | sessionStorage.setItem('keyPath', '0'); | ||
244 | } | ||
196 | } else { | 245 | } else { |
197 | this.$message.error(res.message); | 246 | this.$message.error(res.message); |
198 | } | 247 | } |
... | @@ -211,16 +260,19 @@ | ... | @@ -211,16 +260,19 @@ |
211 | */ | 260 | */ |
212 | batchUnitClick () { | 261 | batchUnitClick () { |
213 | window.currentSelect = {} | 262 | window.currentSelect = {} |
214 | this.currentSelectProps.batchOperation = true; | 263 | this.currentSelectProps.batchOperation = true |
215 | // this.activeIndex = "-1"; | 264 | this.activeIndex = "-1" |
216 | this.$parent.stepForm(0); | 265 | this.activeHIndex = "-1" |
266 | this.activeBatchIndex = "0" | ||
267 | this.$parent.stepForm(0) | ||
217 | }, | 268 | }, |
218 | /** | 269 | /** |
219 | * @description: 申请单元点击事件 | 270 | * @description: 申请单元点击事件-变更前 |
220 | * @param {*} index | 271 | * @param {*} index |
221 | * @author: renchao | 272 | * @author: renchao |
222 | */ | 273 | */ |
223 | unitClick (index) { | 274 | unitClick (index) { |
275 | this.activeBatchIndex = "-1" | ||
224 | window.currentSelect = this.aroundUnitData[index] | 276 | window.currentSelect = this.aroundUnitData[index] |
225 | this.activeHIndex = '-1' | 277 | this.activeHIndex = '-1' |
226 | this.currentSelectProps = this.aroundUnitData[index]; | 278 | this.currentSelectProps = this.aroundUnitData[index]; |
... | @@ -238,11 +290,13 @@ | ... | @@ -238,11 +290,13 @@ |
238 | * @author: renchao | 290 | * @author: renchao |
239 | */ | 291 | */ |
240 | handleAfterunitClick (index) { | 292 | handleAfterunitClick (index) { |
293 | this.activeBatchIndex = "-1" | ||
241 | window.currentSelect = this.afterUnitData[index] | 294 | window.currentSelect = this.afterUnitData[index] |
242 | this.activeIndex = '-1' | 295 | this.activeIndex = '-1' |
243 | this.currentSelectProps = this.afterUnitData[index]; | 296 | this.currentSelectProps = this.afterUnitData[index]; |
244 | this.currentSelectProps.batchOperation = false; | 297 | this.currentSelectProps.batchOperation = false; |
245 | this.activeHIndex = index.toString(); | 298 | this.activeHIndex = index.toString(); |
299 | sessionStorage.setItem('keyPath', this.activeHIndex); | ||
246 | //选中表单传递数据 | 300 | //选中表单传递数据 |
247 | this.$emit('getCurrentSelectProps', this.currentSelectProps); | 301 | this.$emit('getCurrentSelectProps', this.currentSelectProps); |
248 | this.$parent.stepForm(index); | 302 | this.$parent.stepForm(index); | ... | ... |
1 | <!-- | 1 | <!-- |
2 | * @Description: | 2 | * @Description: |
3 | * @Autor: renchao | 3 | * @Autor: renchao |
4 | * @LastEditTime: 2023-08-02 09:56:41 | 4 | * @LastEditTime: 2023-10-17 13:29:39 |
5 | --> | 5 | --> |
6 | <template> | 6 | <template> |
7 | <div class="from-clues"> | 7 | <div class="from-clues"> |
... | @@ -59,7 +59,7 @@ | ... | @@ -59,7 +59,7 @@ |
59 | label="选择" | 59 | label="选择" |
60 | width="50"> | 60 | width="50"> |
61 | <template slot-scope="scope"> | 61 | <template slot-scope="scope"> |
62 | <el-radio v-model="radioVal" :label="scope.row.bhqkbsm">{{''}}</el-radio> | 62 | <el-radio v-model="radioVal" @change="handleSelect" @click.native.stop :label="scope.row.bdcdyh">{{''}}</el-radio> |
63 | </template> | 63 | </template> |
64 | </el-table-column> | 64 | </el-table-column> |
65 | <el-table-column | 65 | <el-table-column |
... | @@ -142,7 +142,7 @@ | ... | @@ -142,7 +142,7 @@ |
142 | import store from '@/store/index.js' | 142 | import store from '@/store/index.js' |
143 | import table from "@/utils/mixin/table"; | 143 | import table from "@/utils/mixin/table"; |
144 | import { ywPopupDialog } from "@/utils/popup.js"; | 144 | import { ywPopupDialog } from "@/utils/popup.js"; |
145 | import { datas, datastwo, sendThis } from "../javascript/selectJsydsyqhbfg.js"; | 145 | import { datastwo, sendThis } from "../javascript/selectJsydsyqhbfg.js"; |
146 | import { defaultParameters } from "../javascript/publicDefaultPar.js"; | 146 | import { defaultParameters } from "../javascript/publicDefaultPar.js"; |
147 | import { selectJsydQlxxSplitMergeBefore, selectZdjbxxSplitMergeLast } from "@/api/ywsq.js"; | 147 | import { selectJsydQlxxSplitMergeBefore, selectZdjbxxSplitMergeLast } from "@/api/ywsq.js"; |
148 | import { startBusinessFlow } from "@/api/workFlow.js"; | 148 | import { startBusinessFlow } from "@/api/workFlow.js"; |
... | @@ -158,19 +158,6 @@ | ... | @@ -158,19 +158,6 @@ |
158 | queryForm: defaultParameters.defaultParameters(), | 158 | queryForm: defaultParameters.defaultParameters(), |
159 | // 表格数据 | 159 | // 表格数据 |
160 | tableData: { | 160 | tableData: { |
161 | columns: [{ | ||
162 | label: '选择', | ||
163 | width: '50px', | ||
164 | render: (h, scope) => { | ||
165 | return ( | ||
166 | <div class="orgColumn"> | ||
167 | <el-radio v-model={this.radioVal} label={scope.row.bhqkbsm}> | ||
168 |   | ||
169 | </el-radio> | ||
170 | </div> | ||
171 | ) | ||
172 | } | ||
173 | }].concat(datas.columns()), | ||
174 | data: [], | 161 | data: [], |
175 | columns1: datastwo.columns1(), | 162 | columns1: datastwo.columns1(), |
176 | datastwo: [] | 163 | datastwo: [] |
... | @@ -179,31 +166,22 @@ | ... | @@ -179,31 +166,22 @@ |
179 | radioVal: "" | 166 | radioVal: "" |
180 | } | 167 | } |
181 | }, | 168 | }, |
182 | watch: { | ||
183 | radioVal: { | ||
184 | deep: true, | ||
185 | handler (newVal, oldVal) { | ||
186 | this.close() | ||
187 | } | ||
188 | } | ||
189 | }, | ||
190 | mounted () { | 169 | mounted () { |
191 | sendThis(this) | 170 | sendThis(this) |
192 | }, | 171 | }, |
193 | methods: { | 172 | methods: { |
194 | // 单选事件 | ||
195 | /** | 173 | /** |
196 | * @description: 单选事件 | 174 | * @description: 单选事件 |
197 | * @author: renchao | 175 | * @author: renchao |
198 | */ | 176 | */ |
199 | close () { | 177 | handleSelect () { |
200 | this.tableData.data.forEach(item => { | 178 | this.tableData.data.forEach(item => { |
201 | if (this.radioVal == item.bhqkbsm) { | 179 | if (this.radioVal == item.bdcdyh) { |
202 | item.bglx = '1' | 180 | item.bglx = '1' |
203 | this.bdcdysz[0] = item | 181 | this.bdcdysz[0] = item |
182 | this.queryForm.bhqkbsm = item.bhqkbsm | ||
204 | } | 183 | } |
205 | }) | 184 | }) |
206 | this.queryForm.bhqkbsm = this.radioVal | ||
207 | selectZdjbxxSplitMergeLast({ ...this.queryForm }).then((res) => { | 185 | selectZdjbxxSplitMergeLast({ ...this.queryForm }).then((res) => { |
208 | this.$endLoading(); | 186 | this.$endLoading(); |
209 | if (res.code === 200) { | 187 | if (res.code === 200) { |
... | @@ -302,29 +280,20 @@ | ... | @@ -302,29 +280,20 @@ |
302 | * @author: renchao | 280 | * @author: renchao |
303 | */ | 281 | */ |
304 | handleRowClick (row) { | 282 | handleRowClick (row) { |
305 | // 如果状态是1,那就是单选 | 283 | this.queryForm.bhqkbsm = row.bhqkbsm |
306 | if (this.sqywInfo.sqywdylx == "1") { | 284 | this.radioVal = row.bdcdyh |
307 | const bdcdysz = this.bdcdysz | 285 | selectZdjbxxSplitMergeLast({ ...this.queryForm }).then((res) => { |
308 | this.$refs.table.clearSelection() | 286 | this.$endLoading(); |
309 | if (bdcdysz.length == 1) { | 287 | if (res.code === 200) { |
310 | bdcdysz.forEach(item => { | 288 | this.tableData.datastwo = res.result |
311 | // 判断 如果当前的一行被勾选, 再次点击的时候就会取消选中 | 289 | this.tableData.datastwo.forEach(item => { |
312 | if (item == row) { | 290 | item.bsm = item.zdbsm; |
313 | this.$refs.table.toggleRowSelection(row, false); | 291 | item.bglx = '2' |
314 | } | ||
315 | // 不然就让当前的一行勾选 | ||
316 | else { | ||
317 | this.$refs.table.toggleRowSelection(row, true); | ||
318 | } | ||
319 | }) | 292 | }) |
293 | this.bdcdysz = [row, ...this.tableData.datastwo] | ||
320 | } | 294 | } |
321 | else { | 295 | }) |
322 | this.$refs.table.toggleRowSelection(row, true); | ||
323 | } | ||
324 | } else { | ||
325 | this.$refs.table.toggleRowSelection(row); | ||
326 | } | 296 | } |
327 | }, | ||
328 | } | 297 | } |
329 | } | 298 | } |
330 | </script> | 299 | </script> | ... | ... |
1 | <!-- | 1 | <!-- |
2 | * @Description: | 2 | * @Description: |
3 | * @Autor: renchao | 3 | * @Autor: renchao |
4 | * @LastEditTime: 2023-09-21 10:35:34 | 4 | * @LastEditTime: 2023-10-17 09:29:06 |
5 | --> | 5 | --> |
6 | <template> | 6 | <template> |
7 | <div class="from-clues"> | 7 | <div class="from-clues"> |
... | @@ -161,7 +161,7 @@ | ... | @@ -161,7 +161,7 @@ |
161 | "/workFrameView?bsmSlsq=" + | 161 | "/workFrameView?bsmSlsq=" + |
162 | item.bsmSlsq + | 162 | item.bsmSlsq + |
163 | "&bsmBusiness=" + | 163 | "&bsmBusiness=" + |
164 | item.bsmBusiness | 164 | item.bsmBusiness + '&type=jdcx' |
165 | ); | 165 | ); |
166 | window.open(href, `workFrameView${item.bsmSlsq}`) | 166 | window.open(href, `workFrameView${item.bsmSlsq}`) |
167 | } | 167 | } | ... | ... |
-
Please register or sign in to post a comment