43b08aa5 by renchao@pashanhoo.com

Merge branch 'dev'

2 parents 959de99f 81084b6b
1 <!-- 1 <!--
2 * @Description: workFrame左侧菜单列表-普通 2 * @Description: workFrame左侧菜单列表-普通
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-10-10 09:00:12 4 * @LastEditTime: 2023-10-18 14:06:31
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 <div v-if="this.isShowdrawer"> 8 <div v-if="this.isShowdrawer">
9 <el-menu 9 <el-menu
10 @select="djbClick" 10 @select="djbClick"
11 :default-active="activeIndex"
11 class="title-batch"> 12 class="title-batch">
12 <el-menu-item index="-1" key="-1" class="menus"> 13 <el-menu-item index="-1" key="-1" class="menus">
13 <div>登记簿</div> 14 <div>登记簿</div>
...@@ -205,6 +206,7 @@ ...@@ -205,6 +206,7 @@
205 * @author: renchao 206 * @author: renchao
206 */ 207 */
207 handleDel (row) { 208 handleDel (row) {
209 let that = this
208 this.$confirm("此操作将永久删除该条补录记录, 是否继续?", "提示", { 210 this.$confirm("此操作将永久删除该条补录记录, 是否继续?", "提示", {
209 confirmButtonText: "确定", 211 confirmButtonText: "确定",
210 cancelButtonText: "取消", 212 cancelButtonText: "取消",
...@@ -217,6 +219,10 @@ ...@@ -217,6 +219,10 @@
217 message: "删除成功!", 219 message: "删除成功!",
218 }); 220 });
219 this.$nextTick(() => { 221 this.$nextTick(() => {
222 if (that.activeIndex != '-1') {
223 this.activeIndex = "0"
224 sessionStorage.setItem('keyPath', '0');
225 }
220 this.getleftMenubl(); 226 this.getleftMenubl();
221 if (!this.supplementarylist.length) { 227 if (!this.supplementarylist.length) {
222 getdjblist() 228 getdjblist()
......
...@@ -26,45 +26,43 @@ ...@@ -26,45 +26,43 @@
26 v-model="shyj" 26 v-model="shyj"
27 placeholder="请输入审批意见" 27 placeholder="请输入审批意见"
28 type="textarea" 28 type="textarea"
29 :rows="4" 29 :rows="4"></el-input>
30 ></el-input>
31 <!-- <el-button 30 <!-- <el-button
32 class="opinion_btn" 31 class="opinion_btn"
33 @click="commonOpinion" 32 @click="commonOpinion"
34 >常用意见</el-button 33 >常用意见</el-button
35 > --> 34 > -->
36 <el-button style="float: right" @click="cancelBack">取消转出</el-button> 35 <el-button style="float: right" @click="cancelBack">取消转出</el-button>
37 <el-button type="primary" @click="submitForm" style="float: right" 36 <el-button type="primary" @click="submitForm" :loading="loading" style="float: right">确定转出</el-button>
38 >确定转出</el-button
39 >
40 </div> 37 </div>
41 </div> 38 </div>
42 </template> 39 </template>
43 40
44 <script> 41 <script>
45 import { completeTask, getNextLinkInfo } from "@/api/workFlow.js"; 42 import { completeTask, getNextLinkInfo } from "@/api/workFlow.js";
46 import { popupCacel } from "@/utils/popup.js"; 43 import { popupCacel } from "@/utils/popup.js";
47 import { mapGetters } from 'vuex' 44 import { mapGetters } from 'vuex'
48 export default { 45 export default {
49 components: {}, 46 components: {},
50 47
51 props: { 48 props: {
52 formData: { 49 formData: {
53 type: Object, 50 type: Object,
54 default: {}, 51 default: {},
52 },
55 }, 53 },
56 },
57 computed: { 54 computed: {
58 ...mapGetters(['yjsqOptions']) 55 ...mapGetters(['yjsqOptions'])
59 }, 56 },
60 data() { 57 data () {
61 return { 58 return {
62 queryForm: {}, 59 loading: false,
63 shyj: "", 60 queryForm: {},
64 }; 61 shyj: "",
65 }, 62 };
63 },
66 64
67 watch: { 65 watch: {
68 // yjsqOptions: { 66 // yjsqOptions: {
69 // handler (val) { 67 // handler (val) {
70 // if(val){ 68 // if(val){
...@@ -74,82 +72,78 @@ export default { ...@@ -74,82 +72,78 @@ export default {
74 // }, 72 // },
75 // }, 73 // },
76 }, 74 },
77 mounted() { 75 mounted () {
78 // this.queryForm= this.queryForm.obj 76 // this.queryForm= this.queryForm.obj
79 },
80 methods: {
81 /**
82 * @description: submitForm
83 * @author: renchao
84 */
85 commonOpinion() {
86 this.$popupDialog(
87 "常用意见",
88 "workflow/components/dialog/commonOpinion",
89 {},
90 "70%",
91 true
92 );
93 },
94 submitForm() {
95 this.queryForm = {
96 bsmSlsq: this.formData.bsmSlsq,
97 shyj: this.shyj,
98 stepform: JSON.stringify(this.formData.tabList),
99 };
100 completeTask(this.queryForm).then((res) => {
101 if (res.code === 200) {
102 this.$message.success("转件成功");
103 // setTimeout(() => {
104 // window.opener = null;
105 // window.open("about:blank", "_self");
106 // window.close();
107 // this.$emit("input", false);
108 // }, 1000);
109 popupCacel();
110 setTimeout(() => {
111 // window.opener.location.reload(); //刷新父窗口
112 if (window.opener && window.opener.getBpageList) {
113 window.opener.getBpageList();
114 } else {
115 window.opener.frames[0].getBpageList();
116 }
117 window.close();
118 this.$emit("input", false);
119 }, 1000);
120 } else {
121 this.$message.error(res.message);
122 }
123 });
124 }, 77 },
78 methods: {
79 /**
80 * @description: submitForm
81 * @author: renchao
82 */
83 commonOpinion () {
84 this.$popupDialog(
85 "常用意见",
86 "workflow/components/dialog/commonOpinion",
87 {},
88 "70%",
89 true
90 );
91 },
92 submitForm () {
93 this.loading = true
94 this.queryForm = {
95 bsmSlsq: this.formData.bsmSlsq,
96 shyj: this.shyj,
97 stepform: JSON.stringify(this.formData.tabList),
98 };
99 completeTask(this.queryForm).then((res) => {
100 this.loading = false
101 if (res.code === 200) {
102 this.$message.success("转件成功");
103 popupCacel();
104 setTimeout(() => {
105 // window.opener.location.reload(); //刷新父窗口
106 if (window.opener && window.opener.getBpageList) {
107 window.opener.getBpageList();
108 } else {
109 window.opener.frames[0].getBpageList();
110 }
111 window.close();
112 this.$emit("input", false);
113 }, 1000);
114 } else {
115 this.$message.error(res.message);
116 }
117 }).catch(() => {
118 this.loading = false
119 })
120 },
125 121
126 /** 122 /**
127 * @description: closeDialog 123 * @description: closeDialog
128 * @author: renchao 124 * @author: renchao
129 */ 125 */
130 cancelBack() { 126 cancelBack () {
131 popupCacel(); 127 popupCacel();
128 },
132 }, 129 },
133 }, 130 };
134 };
135 </script> 131 </script>
136 <style scoped lang="scss"> 132 <style scoped lang="scss">
137 @import "~@/styles/mixin.scss"; 133 @import "~@/styles/mixin.scss";
138 .el-button { 134 .el-button {
139 margin-top: 20px; 135 margin-top: 20px;
140 margin-right: 10px; 136 margin-right: 10px;
141 } 137 }
142
143 .opinion {
144 position: relative;
145 font-size: 14px;
146
147 138
148 } 139 .opinion {
140 position: relative;
141 font-size: 14px;
142 }
149 143
150 .opinion_btn { 144 .opinion_btn {
151 position: absolute; 145 position: absolute;
152 right: 35px; 146 right: 35px;
153 bottom: 80px; 147 bottom: 80px;
154 } 148 }
155 </style> 149 </style>
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-10-18 13:24:57 4 * @LastEditTime: 2023-10-18 15:46:39
5 --> 5 -->
6 <template> 6 <template>
7 <div class="container"> 7 <div class="container">
...@@ -110,7 +110,6 @@ ...@@ -110,7 +110,6 @@
110 import { getStepFormInfo, unClaimTask, getZdInfo } from "@/api/workFlow.js"; 110 import { getStepFormInfo, unClaimTask, getZdInfo } from "@/api/workFlow.js";
111 import { getForm } from "./flowform"; 111 import { getForm } from "./flowform";
112 import NoticeBar from "@/components/NoticeBar/index"; 112 import NoticeBar from "@/components/NoticeBar/index";
113 // import ProcessViewer from "./components/processViewer.vue"
114 // 引入左侧菜单 113 // 引入左侧菜单
115 import ordinaryMenu from "./components/leftmenu/ordinaryMenu.vue"; 114 import ordinaryMenu from "./components/leftmenu/ordinaryMenu.vue";
116 // 引入左侧菜单 115 // 引入左侧菜单
......
1 <!-- 1 <!--
2 * @Author: yangwei 2 * @Author: yangwei
3 * @Date: 2023-09-06 09:20:11 3 * @Date: 2023-09-06 09:20:11
4 * @LastEditors: yangwei 4 * @LastEditors: Please set LastEditors
5 * @LastEditTime: 2023-09-06 09:20:44
6 * @FilePath: \bdcdj-web\src\views\ywbl\ycsl\ycsl.vue
7 * @Description:
8 *
9 * Copyright (c) 2023 by yangwei, All Rights Reserved.
10 --> 5 -->
11 <template> 6 <template>
12 <div></div> 7 <div> <el-empty description="正在开发"></el-empty></div>
13 </template> 8 </template>
14 9
15 <script> 10 <script>
16 export default { 11 export default {
17 name: "BdcdjWebYcsl", 12 name: "BdcdjWebYcsl",
18 13
19 data() { 14 data () {
20 return {}; 15 return {};
21 }, 16 },
22 17
23 mounted() {}, 18 mounted () { },
24 19
25 methods: {}, 20 methods: {},
26 }; 21 };
27 </script> 22 </script>
28 23
29 <style lang="scss" scoped></style> 24 <style lang="scss" scoped></style>
......
1 <!-- 1 <!--
2 * @Author: yangwei 2 * @Author: yangwei
3 * @Date: 2023-09-06 09:19:56 3 * @Date: 2023-09-06 09:19:56
4 * @LastEditors: yangwei 4 * @LastEditors: Please set LastEditors
5 * @LastEditTime: 2023-09-06 09:20:51 5 * @LastEditTime: 2023-10-18 13:51:00
6 * @FilePath: \bdcdj-web\src\views\ywbl\ydsq\ydsq.vue
7 * @Description:
8 *
9 * Copyright (c) 2023 by yangwei, All Rights Reserved.
10 --> 6 -->
11 <template> 7 <template>
12 <div></div> 8 <div>
9 <el-empty description="正在开发"></el-empty>
10 </div>
13 </template> 11 </template>
14 12
15 <script> 13 <script>
16 export default { 14 export default {
17 name: "BdcdjWebYcsl", 15 name: "BdcdjWebYcsl",
18 16
19 data() { 17 data () {
20 return {}; 18 return {};
21 }, 19 },
22 20
23 mounted() {}, 21 mounted () { },
24 22
25 methods: {}, 23 methods: {},
26 }; 24 };
27 </script> 25 </script>
28 26
29 <style lang="scss" scoped></style> 27 <style lang="scss" scoped></style>
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-08-02 09:59:44 4 * @LastEditTime: 2023-10-18 15:11:12
5 --> 5 -->
6 <template> 6 <template>
7 <!-- 主体权利信息查询 --> 7 <!-- 主体权利信息查询 -->
...@@ -196,8 +196,16 @@ ...@@ -196,8 +196,16 @@
196 this.$refs.table.toggleRowSelection(row); 196 this.$refs.table.toggleRowSelection(row);
197 } 197 }
198 }, 198 },
199 }, 199 handleLpbClick (item) {
200 }; 200 ywPopupDialog('楼盘表', 'lpb/index', {
201 bsm: item.zrzbsm,
202 bsmSqyw: this.sqywInfo.bsmSqyw,
203 onlyShow: false,
204 scyclx: 1
205 }, '85%', true, false)
206 }
207 }
208 }
201 </script> 209 </script>
202 <style scoped lang="scss"> 210 <style scoped lang="scss">
203 @import "~@/styles/mixin.scss"; 211 @import "~@/styles/mixin.scss";
......
...@@ -201,7 +201,6 @@ ...@@ -201,7 +201,6 @@
201 this.btnDisabled = true; 201 this.btnDisabled = true;
202 } 202 }
203 }, 203 },
204 //获取下个节点类型数据
205 /** 204 /**
206 * @description: 获取下个节点类型数据 205 * @description: 获取下个节点类型数据
207 * @param {*} bsmSqyw 206 * @param {*} bsmSqyw
...@@ -226,7 +225,6 @@ ...@@ -226,7 +225,6 @@
226 }) 225 })
227 }, 226 },
228 227
229 //获取下个节点类型数据
230 /** 228 /**
231 * @description: 获取下个节点类型数据 229 * @description: 获取下个节点类型数据
232 * @author: renchao 230 * @author: renchao
...@@ -305,7 +303,6 @@ ...@@ -305,7 +303,6 @@
305 }) 303 })
306 item.cselect = !item.cselect 304 item.cselect = !item.cselect
307 }, 305 },
308 // 登记类型
309 /** 306 /**
310 * @description: 登记类型 307 * @description: 登记类型
311 * @param {*} item 308 * @param {*} item
......
...@@ -30,6 +30,7 @@ class data extends filter { ...@@ -30,6 +30,7 @@ class data extends filter {
30 { 30 {
31 prop: "status", 31 prop: "status",
32 label: "状态", 32 label: "状态",
33 width: '120',
33 render: (h, scope) => { 34 render: (h, scope) => {
34 return ( 35 return (
35 <div> 36 <div>
......
1 /* 1 /*
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-10-13 15:28:40 4 * @LastEditTime: 2023-10-18 15:03:39
5 */ 5 */
6 import filter from '@/utils/filter.js' 6 import filter from '@/utils/filter.js'
7 let vm = null 7 let vm = null
......
1 <!-- 1 <!--
2 * @Description: 选择不动产单元号 2 * @Description: 选择不动产单元号
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-05-18 10:59:48[文件:bdcdj-index.html] 4 * @LastEditTime: 2023-10-18 14:03:27
5 --> 5 -->
6 <template> 6 <template>
7 <component :is="router" :sqywInfo="formData.sqywInfo" :isJump="formData.isJump ? formData.isJump : false" 7 <component :is="router" :sqywInfo="formData.sqywInfo" :isJump="formData.isJump ? formData.isJump : false"
...@@ -23,7 +23,6 @@ ...@@ -23,7 +23,6 @@
23 } 23 }
24 }, 24 },
25 mounted () { 25 mounted () {
26 console.log(this.formData, 'this.formData');
27 if (this.formData?.sqywInfo?.djywbm || this.formData?.djywbm) { 26 if (this.formData?.sqywInfo?.djywbm || this.formData?.djywbm) {
28 let view = queueDjywmc(this.formData?.sqywInfo?.djywbm || this.formData?.djywbm, this.formData?.sqywInfo?.nodecode || this.formData?.nodecode); 27 let view = queueDjywmc(this.formData?.sqywInfo?.djywbm || this.formData?.djywbm, this.formData?.sqywInfo?.nodecode || this.formData?.nodecode);
29 this.router = this.loadView(view); 28 this.router = this.loadView(view);
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-09-21 10:41:10 4 * @LastEditTime: 2023-10-18 14:49:25
5 --> 5 -->
6 <template> 6 <template>
7 <div class="from-clues"> 7 <div class="from-clues">
...@@ -103,12 +103,6 @@ ...@@ -103,12 +103,6 @@
103 * @author: renchao 103 * @author: renchao
104 */ 104 */
105 openDialog (item) { 105 openDialog (item) {
106 // bdcqzPreview(item).then(res => {
107 // this.$popupDialog("证书证明预览", "workflow/components/dialog/zsylxq", {
108 // bsmSlsq: item.bsmSlsq,
109 // bsmBdcqz: item.bsmBdcqz
110 // }, '1230px', true)
111 // })
112 this.$popupDialog("证书证明预览", "workflow/components/dialog/zsylxq", { 106 this.$popupDialog("证书证明预览", "workflow/components/dialog/zsylxq", {
113 bsmSlsq: item.bsmSlsq, 107 bsmSlsq: item.bsmSlsq,
114 bsmBdcqz: item.bsmBdcqz 108 bsmBdcqz: item.bsmBdcqz
......