b796307e by renchao@pashanhoo.com

Merge branch 'dev'

2 parents a8214033 820e4384
...@@ -117,9 +117,9 @@ ...@@ -117,9 +117,9 @@
117 .catch(() => { 117 .catch(() => {
118 this.$message({ 118 this.$message({
119 type: "info", 119 type: "info",
120 message: "已取消删除", 120 message: "已取消删除"
121 }); 121 })
122 }); 122 })
123 } 123 }
124 } 124 }
125 } 125 }
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-07-24 14:12:17 4 * @LastEditTime: 2023-07-25 09:27:43
5 --> 5 -->
6 <template> 6 <template>
7 <div class="from-clues"> 7 <div class="from-clues">
...@@ -122,10 +122,10 @@ ...@@ -122,10 +122,10 @@
122 this.$message({ 122 this.$message({
123 type: 'info', 123 type: 'info',
124 message: '已取消删除' 124 message: '已取消删除'
125 }); 125 })
126 }); 126 })
127 }, 127 }
128 }, 128 }
129 }; 129 };
130 </script> 130 </script>
131 <style scoped lang="scss"> 131 <style scoped lang="scss">
......
...@@ -76,7 +76,6 @@ ...@@ -76,7 +76,6 @@
76 * @author: renchao 76 * @author: renchao
77 */ 77 */
78 handleSubmit () { 78 handleSubmit () {
79 debugger
80 this.$refs['ruleForm'].validate((valid) => { 79 this.$refs['ruleForm'].validate((valid) => {
81 if (valid) { 80 if (valid) {
82 this.$parent.addSave(this.ruleForm); 81 this.$parent.addSave(this.ruleForm);
......
1 <!-- 1 <!--
2 * @Description: 页面提供插件下载 2 * @Description: 页面提供插件下载
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-06-13 15:49:55 4 * @LastEditTime: 2023-07-25 09:25:56
5 --> 5 -->
6 <template> 6 <template>
7 <div class='downLoad'> 7 <div class='downLoad'>
...@@ -21,6 +21,10 @@ ...@@ -21,6 +21,10 @@
21 } 21 }
22 }, 22 },
23 methods: { 23 methods: {
24 /**
25 * @description:
26 * @author: renchao
27 */
24 handleDown () { 28 handleDown () {
25 let a = document.createElement('a') 29 let a = document.createElement('a')
26 a.style.display = 'none' 30 a.style.display = 'none'
......
1 <!-- 1 <!--
2 * @Description: 流程图 2 * @Description: 流程图
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-07-19 16:04:34 4 * @LastEditTime: 2023-07-25 09:26:01
5 --> 5 -->
6 <template> 6 <template>
7 <div class='flowChart'> 7 <div class='flowChart'>
...@@ -9,7 +9,6 @@ ...@@ -9,7 +9,6 @@
9 </div> 9 </div>
10 </template> 10 </template>
11 <script> 11 <script>
12
13 export default { 12 export default {
14 props: { 13 props: {
15 formData: { 14 formData: {
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-07-24 10:15:01 4 * @LastEditTime: 2023-07-25 09:26:10
5 --> 5 -->
6 <template> 6 <template>
7 <div class="from-clues"> 7 <div class="from-clues">
...@@ -79,6 +79,10 @@ ...@@ -79,6 +79,10 @@
79 } 79 }
80 }) 80 })
81 }, 81 },
82 /**
83 * @description:
84 * @author: renchao
85 */
82 zslqClick () { 86 zslqClick () {
83 this.$popupDialog("不动产权证领取", "workflow/components/dialog/zslq", {}, '80%', true) 87 this.$popupDialog("不动产权证领取", "workflow/components/dialog/zslq", {}, '80%', true)
84 } 88 }
......
1 <!-- 1 <!--
2 * @Description: workFrame左侧菜单列表-普通 2 * @Description: workFrame左侧菜单列表-普通
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-07-24 14:14:01 4 * @LastEditTime: 2023-07-25 14:14:04
5 --> 5 -->
6 <template> 6 <template>
7 <div class="leftmenu" :class="{ 'animation-map-drawer': isShowdrawer }"> 7 <div class="leftmenu" :class="{ 'animation-map-drawer': isShowdrawer }">
...@@ -177,9 +177,8 @@ ...@@ -177,9 +177,8 @@
177 * @author: renchao 177 * @author: renchao
178 */ 178 */
179 batchUnitClick () { 179 batchUnitClick () {
180 debugger
181 this.currentSelectProps.batchOperation = true; 180 this.currentSelectProps.batchOperation = true;
182 // this.activeIndex = "-1"; 181 this.activeIndex = "-1";
183 this.$parent.stepForm(0); 182 this.$parent.stepForm(0);
184 183
185 }, 184 },
...@@ -201,7 +200,7 @@ ...@@ -201,7 +200,7 @@
201 * @author: renchao 200 * @author: renchao
202 */ 201 */
203 unitClick (index) { 202 unitClick (index) {
204 if(this.unitData.length==0) return 203 if (this.unitData.length == 0) return
205 this.currentSelectProps = this.unitData[index]; 204 this.currentSelectProps = this.unitData[index];
206 this.currentSelectProps.batchOperation = false; 205 this.currentSelectProps.batchOperation = false;
207 this.activeIndex = index.toString(); 206 this.activeIndex = index.toString();
......
...@@ -158,6 +158,7 @@ ...@@ -158,6 +158,7 @@
158 this.fresh++; 158 this.fresh++;
159 //获取单元对应的所有表单信息 159 //获取单元对应的所有表单信息
160 this.tabList = res.result; 160 this.tabList = res.result;
161 console.log(res.result, 'res.result');
161 //默认加载第一个表单信息 162 //默认加载第一个表单信息
162 let arr = res.result.filter(item => item.defaultForm) 163 let arr = res.result.filter(item => item.defaultForm)
163 if (arr.length > 0) { 164 if (arr.length > 0) {
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-07-24 15:03:20 4 * @LastEditTime: 2023-07-25 09:21:53
5 --> 5 -->
6 <template> 6 <template>
7 <div class="from-clues"> 7 <div class="from-clues">
...@@ -264,10 +264,10 @@ ...@@ -264,10 +264,10 @@
264 } else { 264 } else {
265 this.$message.error("用户任务权限判断失败,请联系管理员"); 265 this.$message.error("用户任务权限判断失败,请联系管理员");
266 } 266 }
267 }); 267 })
268 }, 268 }
269 }, 269 }
270 }; 270 }
271 </script> 271 </script>
272 <style scoped lang="scss"> 272 <style scoped lang="scss">
273 @import "~@/styles/public.scss"; 273 @import "~@/styles/public.scss";
......
1 <!-- 1 <!--
2 * @Description: 受理信息 2 * @Description: 受理信息
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-07-21 14:27:15 4 * @LastEditTime: 2023-07-25 09:22:40
5 --> 5 -->
6 <template> 6 <template>
7 <div class="slxx"> 7 <div class="slxx">
...@@ -332,7 +332,6 @@ ...@@ -332,7 +332,6 @@
332 upDateYwrxxList (val) { 332 upDateYwrxxList (val) {
333 this.ruleForm.ywrList = _.cloneDeep(val); 333 this.ruleForm.ywrList = _.cloneDeep(val);
334 }, 334 },
335
336 /** 335 /**
337 * @description: onSubmit 336 * @description: onSubmit
338 * @author: renchao 337 * @author: renchao
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-07-20 09:32:18 4 * @LastEditTime: 2023-07-25 09:23:05
5 --> 5 -->
6 <template> 6 <template>
7 <!-- 受理信息 --> 7 <!-- 受理信息 -->
...@@ -296,9 +296,9 @@ ...@@ -296,9 +296,9 @@
296 console.log(res); 296 console.log(res);
297 //this.ruleForm = { ...res.result, ...res.result.zdjbxxdatas, ...res.result.qlxxdatas, ...res.result.jsydsyqdatas } 297 //this.ruleForm = { ...res.result, ...res.result.zdjbxxdatas, ...res.result.qlxxdatas, ...res.result.jsydsyqdatas }
298 } 298 }
299 }); 299 })
300 }, 300 }
301 }, 301 }
302 }; 302 };
303 </script> 303 </script>
304 <style scoped lang='scss'> 304 <style scoped lang='scss'>
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-07-14 11:09:33 4 * @LastEditTime: 2023-07-25 09:23:20
5 --> 5 -->
6 <template> 6 <template>
7 <!-- 受理信息 --> 7 <!-- 受理信息 -->
...@@ -320,7 +320,10 @@ ...@@ -320,7 +320,10 @@
320 }) 320 })
321 } 321 }
322 } 322 }
323 console.log("this.ruleFormmmmmmmmm", this.ruleForm); 323 /**
324 * @description: saveData
325 * @author: renchao
326 */
324 saveData(this.ruleForm).then((res) => { 327 saveData(this.ruleForm).then((res) => {
325 if (res.code === 200) { 328 if (res.code === 200) {
326 this.$message({ 329 this.$message({
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
2 <!-- 2 <!--
3 * @Description: 3 * @Description:
4 * @Autor: renchao 4 * @Autor: renchao
5 * @LastEditTime: 2023-05-25 08:59:49 5 * @LastEditTime: 2023-07-25 09:23:42
6 --> 6 -->
7 <template> 7 <template>
8 <!-- 受理信息 --> 8 <!-- 受理信息 -->
...@@ -334,10 +334,10 @@ export default { ...@@ -334,10 +334,10 @@ export default {
334 { propsParam: this.propsParam }, 334 { propsParam: this.propsParam },
335 "80%", 335 "80%",
336 true 336 true
337 ); 337 )
338 }, 338 }
339 }, 339 }
340 }; 340 }
341 </script> 341 </script>
342 <style scoped lang="scss"> 342 <style scoped lang="scss">
343 @import "~@/styles/public.scss"; 343 @import "~@/styles/public.scss";
......
...@@ -352,8 +352,8 @@ ...@@ -352,8 +352,8 @@
352 }) 352 })
353 this.ruleForm.nydsyq.ydyhflmc = itemLx.dname; 353 this.ruleForm.nydsyq.ydyhflmc = itemLx.dname;
354 } 354 }
355 }, 355 }
356 }; 356 }
357 </script> 357 </script>
358 <style scoped lang='scss'> 358 <style scoped lang='scss'>
359 @import "~@/styles/public.scss"; 359 @import "~@/styles/public.scss";
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-07-20 09:30:51 4 * @LastEditTime: 2023-07-25 09:24:18
5 --> 5 -->
6 <template> 6 <template>
7 <!-- 受理信息 --> 7 <!-- 受理信息 -->
...@@ -472,6 +472,10 @@ ...@@ -472,6 +472,10 @@
472 }); 472 });
473 } 473 }
474 } 474 }
475 /**
476 * @description: saveData
477 * @author: renchao
478 */
475 saveData(this.ruleForm).then((res) => { 479 saveData(this.ruleForm).then((res) => {
476 if (res.code === 200) { 480 if (res.code === 200) {
477 this.$message({ 481 this.$message({
......
...@@ -244,9 +244,9 @@ ...@@ -244,9 +244,9 @@
244 }); 244 });
245 } 245 }
246 }); 246 });
247 }, 247 }
248 }, 248 }
249 }; 249 }
250 </script> 250 </script>
251 <style scoped lang='scss'> 251 <style scoped lang='scss'>
252 @import "~@/styles/public.scss"; 252 @import "~@/styles/public.scss";
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-07-24 15:03:46 4 * @LastEditTime: 2023-07-25 09:21:40
5 --> 5 -->
6 <template> 6 <template>
7 <div class="from-clues"> 7 <div class="from-clues">
...@@ -232,11 +232,9 @@ ...@@ -232,11 +232,9 @@
232 ); 232 );
233 window.open(href, `workFrameView${item.bsmSlsq}`); 233 window.open(href, `workFrameView${item.bsmSlsq}`);
234 } 234 }
235 235 }
236 236 }
237 }, 237 }
238 },
239 };
240 </script> 238 </script>
241 <style scoped lang="scss"> 239 <style scoped lang="scss">
242 @import "~@/styles/public.scss"; 240 @import "~@/styles/public.scss";
......
...@@ -391,7 +391,6 @@ ...@@ -391,7 +391,6 @@
391 <style scoped lang='scss'> 391 <style scoped lang='scss'>
392 @import "~@/styles/mixin.scss"; 392 @import "~@/styles/mixin.scss";
393 @import "./ywsq.scss"; 393 @import "./ywsq.scss";
394
395 /deep/.el-collapse-item__content { 394 /deep/.el-collapse-item__content {
396 padding-bottom: 0; 395 padding-bottom: 0;
397 } 396 }
......