Skip to content

bdc / bdcdj-web

Go to a project
Toggle navigation
Toggle navigation pinning
1f60e8e5 by renchao@pashanhoo.com
Options

Merge branch 'dev' of http://yun.pashanhoo.com:9090/bdc/bdcdj-web into dev

2 parents cc58aaa2 3f23e484
Expand all
Inline Side-by-side
Showing 37 changed files with 911 additions and 340 deletions
1
2
3 var qlxxPage = [
4 { qllx: "A01", id: "jsydsyq", form: "jsydsyq.vue", label: "集体土地所有权" },
5 { qllx: "A02", id: "jsydsyq", form: "jsydsyq.vue", label: "国家土地所有权" },
6 { qllx: "A03", id: "jsydsyq", form: "jsydsyq.vue", label: "国有建设用地使用权" },
7 { qllx: "A04", id: "", form: "", label: "国有建设用地使用权/房屋所有权" },
8 { qllx: "A05", id: "jsydsyq", form: "jsydsyq.vue", label: "宅基地使用权" },
9 { qllx: "A06", id: "", form: "", label: "宅基地使用权/房屋所有权" },
10 { qllx: "A07", id: "jsydsyq", form: "jsydsyq.vue", label: "集体建设用地使用权" },
11 { qllx: "A08", id: "", form: "", label: "集体建设用地使用权/房屋所有权" },
12 { qllx: "A09", id: "jsydsyq", form: "jsydsyq.vue", label: "土地承包经营权" },
13 { qllx: "A11", id: "jsydsyq", form: "jsydsyq.vue", label: "林地使用权" },
14 { qllx: "A12", id: "jsydsyq", form: "jsydsyq.vue", label: "林地使用权/森林、林木使用权" },
15 { qllx: "A13", id: "jsydsyq", form: "jsydsyq.vue", label: "草原使用权" },
16 { qllx: "A14", id: "jsydsyq", form: "jsydsyq.vue", label: "水域滩涂养殖权" },
17 { qllx: "A15", id: "jsydsyq", form: "jsydsyq.vue", label: "海域使用权" },
18 { qllx: "A16", id: "jsydsyq", form: "jsydsyq.vue", label: "海域使用权/建（构）筑物所有权" },
19 { qllx: "A17", id: "jsydsyq", form: "jsydsyq.vue", label: "海域使用权（无居民海岛）" },
20 { qllx: "A18", id: "jsydsyq", form: "jsydsyq.vue", label: "海域使用权（无居民海岛）/建筑物（设施）使用权" },
21 { qllx: "A19", id: "diyiq", form: "diyiq.vue", label: "地役权" },
22 { qllx: "A23", id: "jsydsyq", form: "jsydsyq.vue", label: "国有农用地的使用权" },
23 { qllx: "A24", id: "jsydsyq", form: "jsydsyq.vue", label: "国有建设用地使用权/构筑物所有权" },
24 { qllx: "A25", id: "jsydsyq", form: "jsydsyq.vue", label: "宅基地使用权/构筑物所有权" },
25 { qllx: "A26", id: "jsydsyq", form: "jsydsyq.vue", label: "集体建设用地使用权/构筑物所有权" },
26 { qllx: "A29", id: "jsydsyq", form: "jsydsyq.vue", label: "国有未利用地的使用权" },
27 { qllx: "A30", id: "jsydsyq", form: "jsydsyq.vue", label: "集体农用地使用权" },
28 { qllx: "A31", id: "jsydsyq", form: "jsydsyq.vue", label: "土地承包经营权/森林、林木使用权" },
29 { qllx: "A33", id: "jsydsyq", form: "jsydsyq.vue", label: "林地经营权/林木所有权" },
30 { qllx: "A34", id: "jsydsyq", form: "jsydsyq.vue", label: "林地经营权/林木使用权" },
31 { qllx: "A35", id: "jsydsyq", form: "jsydsyq.vue", label: "林地承包经营权/林木所有权" },
32 { qllx: "A36", id: "jsydsyq", form: "jsydsyq.vue", label: "林地使用权/林木所有权" },
33 { qllx: "A37", id: "diyaq", form: "diyaq.vue", label: "抵押权" },
34 { qllx: "B37", id: "diyaq", form: "diyaq.vue", label: "抵押权" },
35 { qllx: "B38", id: "yydj", form: "yydj.vue", label: "异议登记" },
36 { qllx: "B39", id: "cfdj", form: "cfdj.vue", label: "查封登记" },
37 { qllx: "B40", id: "ygdj", form: "ygdj.vue", label: "预告登记" },
38 { qllx: "B41", id: "ygdj", form: "ygdj.vue", label: "预告登记" },
39 ];
40
41 //组装登记簿树形结构
42 export function loadTreeData(qlxxData, bdcdyh) {
43 let treedata = [];
44 //加载封面
45 treedata.push({ id: "djbfm", form: "djbfm.vue", label: "登记簿封面" });
46 treedata.push({ id: "zdjbxx", form: "zdjbxx.vue", label: "宗地基本信息\n(" + bdcdyh.substring(0, 19) + ")", children: [] });
47 treedata[1].children.push({ id: "bdcqldjml", form: "bdcqldjml.vue", label: "不动产权利登记目录", children: [] });
48 treedata[1].children[0].children.push({
49 id: "bdcqljqtsx", form: "bdcqljqtsx.vue", label: "不动产权利及其他事项\n (" + bdcdyh.slice(19) + ")", children: [],
50 });
51 //主体权利
52 treedata[1].children[0].children[0].children.push(getNode(qlxxData.ztqllx, qlxxData.ztql, qlxxData.bdcdylx));
53 //抵押权
54 treedata[1].children[0].children[0].children.push(getNode("A37", qlxxData.diyaq, ''));
55 //地役权
56 treedata[1].children[0].children[0].children.push(getNode("A19", qlxxData.diyiq, ''));
57 //预告登记
58 treedata[1].children[0].children[0].children.push(getNode("B40", qlxxData.ygdj, ''));
59 //异议登记
60 treedata[1].children[0].children[0].children.push(getNode("B38", qlxxData.yydj, ''));
61 //查封登记
62 treedata[1].children[0].children[0].children.push(getNode("B39", qlxxData.cfdj, ''));
63
64 return treedata;
65 }
66
67 //获取权利类型、不动产单元类型对应的树形节点信息
68 export function getNode(qllx, qlxx, bdcdylx) {
69 let node;
70 for (var i = 0; i < qlxxPage.length; i++) {
71 if (qlxxPage[i].qllx == qllx) {
72 if (qllx == "A04" || qllx == "A06" || qllx == "A08") {
73 if (bdcdylx == "4") {
74 node = { id: "fdcq1", form: "fdcq1.vue", label: qlxxPage[i].label + "(临:" + qlxx.linShi + "，现:" + qlxx.xianShi + "，历:" + qlxx.liShi +")"};
75 } else {
76 node = { id: "fdcq2", form: "fdcq2.vue", label: qlxxPage[i].label + "(临:" + qlxx.linShi + "，现:" + qlxx.xianShi + "，历:" + qlxx.liShi +")"};
77 }
78 } else {
79 node = { id: qlxxPage[i].id, form: qlxxPage[i].form, label: qlxxPage[i].label + "(临:" + qlxx.linShi + "，现:" + qlxx.xianShi + "，历:" + qlxx.liShi +")"};
80 }
81 break;
82 }
83 };
84 return node;
85 }
86
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-05-17 10:40:46 4 * @LastEditTime: 2023-05-17 10:40:46
5 --> 5 -->
...@@ -533,4 +533,4 @@ ...@@ -533,4 +533,4 @@
533 } 533 }
534 } 534 }
535 } 535 }
536 </style>
...\ No newline at end of file ...\ No newline at end of file
536 </style>
......
...@@ -43,7 +43,7 @@ export function loadTreeData(qlxxData, bdcdyh) { ...@@ -43,7 +43,7 @@ export function loadTreeData(qlxxData, bdcdyh) {
43 let treedata = []; 43 let treedata = [];
44 //加载封面 44 //加载封面
45 treedata.push({ id: "djbfm", form: "djbfm.vue", label: "登记簿封面" }); 45 treedata.push({ id: "djbfm", form: "djbfm.vue", label: "登记簿封面" });
46 treedata.push({ id: "zdjbxx", form: "zdjbxx.vue", label: "宗地基本信息\n(" + bdcdyh.substring(0, 19) + ")", children: [] }); 46 treedata.push({ id: "zdjbxx", form: "zdjbxx.vue", label: "宗地基本信息", children: [] });
47 treedata[1].children.push({ id: "bdcqldjml", form: "bdcqldjml.vue", label: "不动产权利登记目录", children: [] }); 47 treedata[1].children.push({ id: "bdcqldjml", form: "bdcqldjml.vue", label: "不动产权利登记目录", children: [] });
48 treedata[1].children[0].children.push({ 48 treedata[1].children[0].children.push({
49 id: "bdcqljqtsx", form: "bdcqljqtsx.vue", label: "不动产权利及其他事项\n (" + bdcdyh.slice(19) + ")", children: [], 49 id: "bdcqljqtsx", form: "bdcqljqtsx.vue", label: "不动产权利及其他事项\n (" + bdcdyh.slice(19) + ")", children: [],
...@@ -71,12 +71,12 @@ export function getNode(qllx, qlxx, bdcdylx) { ...@@ -71,12 +71,12 @@ export function getNode(qllx, qlxx, bdcdylx) {
71 if (qlxxPage[i].qllx == qllx) { 71 if (qlxxPage[i].qllx == qllx) {
72 if (qllx == "A04" || qllx == "A06" || qllx == "A08") { 72 if (qllx == "A04" || qllx == "A06" || qllx == "A08") {
73 if (bdcdylx == "4") { 73 if (bdcdylx == "4") {
74 node = { id: "fdcq1", form: "fdcq1.vue", label: qlxxPage[i].label + "(临:" + qlxx.linShi + "，现:" + qlxx.xianShi + "，历:" + qlxx.liShi +")"}; 74 node = { id: "fdcq1", form: "fdcq1.vue", label: qlxxPage[i].label};
75 } else { 75 } else {
76 node = { id: "fdcq2", form: "fdcq2.vue", label: qlxxPage[i].label + "(临:" + qlxx.linShi + "，现:" + qlxx.xianShi + "，历:" + qlxx.liShi +")"}; 76 node = { id: "fdcq2", form: "fdcq2.vue", label: qlxxPage[i].label};
77 } 77 }
78 } else { 78 } else {
79 node = { id: qlxxPage[i].id, form: qlxxPage[i].form, label: qlxxPage[i].label + "(临:" + qlxx.linShi + "，现:" + qlxx.xianShi + "，历:" + qlxx.liShi +")"}; 79 node = { id: qlxxPage[i].id, form: qlxxPage[i].form, label: qlxxPage[i].label};
80 } 80 }
81 break; 81 break;
82 } 82 }
......
...@@ -6,12 +6,28 @@ ...@@ -6,12 +6,28 @@
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 <div class="title"> 9 <el-menu :default-active="activeIndex" @select="djbClick" class="title-batch">
10 登记簿补录业务列表 10 <el-menu-item index="-1" key="-1" class="menus">
11 </div> 11 <div>登记簿</div>
12 <el-tree ref="tree" :data="treedata" :props="defaultProps" @node-click="handleNodeClick" 12 </el-menu-item>
13 :default-expand-all="true" :expand-on-click-node="false" node-key="id" :default-checked-keys="[showTab]"> 13 </el-menu>
14 </el-tree> 14 <div class="blxx">
15 <el-menu :default-active="activeIndex" @select="blxxClick" class="title-batch">
16 <el-menu-item index="-1" key="-1" class="menus">
17 <div>补录信息</div>
18 </el-menu-item>
19 </el-menu>
20 <el-menu :default-active="activeIndex" @select="unitClick">
21 <el-menu-item v-for="(item, index) in supplementarylist" :index="index.toString()" :key="index">
22 <div>
23 <p>{{ item.bdcdyh }}</p>
24 <p class="title-detail">{{ item.zl }}</p>
25 </div>
26 <i class="el-icon-delete" v-if="supplementarylist.length > 1" @click.stop="handleDel(item)"></i>
27 </el-menu-item>
28 </el-menu>
29 </div>
30
15 </div> 31 </div>
16 <div class="map-drawer-click map-drawer" v-if="!isShowdrawer" @click=" 32 <div class="map-drawer-click map-drawer" v-if="!isShowdrawer" @click="
17 () => { 33 () => {
...@@ -34,6 +50,7 @@ import { loadTreeData, getNode } from "./djbFrameData.js"; ...@@ -34,6 +50,7 @@ import { loadTreeData, getNode } from "./djbFrameData.js";
34 export default { 50 export default {
35 data () { 51 data () {
36 return { 52 return {
53 supplementarylist:[],
37 //受理申请标识码 54 //受理申请标识码
38 bsmSlsq: this.$route.query.bsmSlsq, 55 bsmSlsq: this.$route.query.bsmSlsq,
39 //当前流程所在环节 56 //当前流程所在环节
...@@ -47,8 +64,6 @@ import { loadTreeData, getNode } from "./djbFrameData.js"; ...@@ -47,8 +64,6 @@ import { loadTreeData, getNode } from "./djbFrameData.js";
47 activeIndex: '0', 64 activeIndex: '0',
48 // 折叠 65 // 折叠
49 isShowdrawer: true, 66 isShowdrawer: true,
50 // 批量操作
51 showBatch: false,
52 //批量操作按钮名称 67 //批量操作按钮名称
53 batchButtonName: '', 68 batchButtonName: '',
54 //左侧菜单数据集合 69 //左侧菜单数据集合
...@@ -87,26 +102,97 @@ import { loadTreeData, getNode } from "./djbFrameData.js"; ...@@ -87,26 +102,97 @@ import { loadTreeData, getNode } from "./djbFrameData.js";
87 }, 102 },
88 // 获取登记簿菜单 103 // 获取登记簿菜单
89 loadData () { 104 loadData () {
90 getBdcqljqtsx({ 105 this.supplementarylist=[{
91 bdcdyid: this.bdcdyid, 106 "zl": "抵押权",
92 bdcdyh: this.bdcdyh, 107 },{
93 }).then((res) => { 108 "zl": "抵押权",
94 if (res.code === 200) { 109 },{
95 this.treedata = loadTreeData(res.result, this.bdcdyh); 110 "zl": "抵押权",
96 this.$nextTick(function () { 111 },{
97 this.defaultNode = getNode(this.qllx, { linShi: 0, xianShi: 0, liShi: 0 }, ""); 112 "zl": "抵押权",
98 this.$refs.tree.setCurrentKey(this.defaultNode.id); //data[0].id为默认选中的节点 113 },{
99 this.$parent.loadComponent(this.currentSelectProps,this.defaultNode); 114 "zl": "抵押权",
100 }); 115 },{
101 } 116 "zl": "抵押权",
102 }); 117 },{
103 this.currentSelectProps = { 118 "zl": "抵押权",
104 bdcdyid: this.bdcdyid, 119 },{
105 bdcdyh: this.bdcdyh, 120 "zl": "抵押权",
106 qllx: this.qllx, 121 },{
107 bsmQlxx: this.bsmQlxx, 122 "zl": "抵押权",
108 bestepid:this.bestepid 123 },{
109 }; 124 "zl": "抵押权",
125 },{
126 "zl": "抵押权",
127 },{
128 "zl": "抵押权",
129 },{
130 "zl": "抵押权",
131 },{
132 "zl": "抵押权",
133 },{
134 "zl": "抵押权",
135 },{
136 "zl": "抵押权",
137 },{
138 "zl": "抵押权",
139 },{
140 "zl": "抵押权",
141 },{
142 "zl": "抵押权",
143 },{
144 "zl": "抵押权",
145 },{
146 "zl": "抵押权",
147 },{
148 "zl": "抵押权",
149 },{
150 "zl": "抵押权",
151 },{
152 "zl": "抵押权",
153 },{
154 "zl": "抵押权",
155 },{
156 "zl": "抵押权",
157 },{
158 "zl": "抵押权",
159 },{
160 "zl": "抵押权",
161 },{
162 "zl": "抵押权",
163 },{
164 "zl": "抵押权",
165 },{
166 "zl": "抵押权",
167 },{
168 "zl": "抵押权",
169 },{
170 "zl": "抵押权",
171 },{
172 "zl": "抵押权",
173 },{
174 "zl": "抵押权",
175 }]
176 // getBdcqljqtsx({
177 // bdcdyid: this.bdcdyid,
178 // bdcdyh: this.bdcdyh,
179 // }).then((res) => {
180 // if (res.code === 200) {
181 // this.treedata = loadTreeData(res.result, this.bdcdyh);
182 // this.$nextTick(function () {
183 // this.defaultNode = getNode(this.qllx, { linShi: 0, xianShi: 0, liShi: 0 }, "");
184 // this.$refs.tree.setCurrentKey(this.defaultNode.id); //data[0].id为默认选中的节点
185 // this.$parent.loadComponent(this.currentSelectProps,this.defaultNode);
186 // });
187 // }
188 // });
189 // this.currentSelectProps = {
190 // bdcdyid: this.bdcdyid,
191 // bdcdyh: this.bdcdyh,
192 // qllx: this.qllx,
193 // bsmQlxx: this.bsmQlxx,
194 // bestepid:this.bestepid
195 // };
110 // this.$parent.stepForm(); 196 // this.$parent.stepForm();
111 }, 197 },
112 handleNodeClick (data, node, elem) { 198 handleNodeClick (data, node, elem) {
...@@ -115,7 +201,28 @@ import { loadTreeData, getNode } from "./djbFrameData.js"; ...@@ -115,7 +201,28 @@ import { loadTreeData, getNode } from "./djbFrameData.js";
115 this.$parent.loadComponent(this.currentSelectProps,data); 201 this.$parent.loadComponent(this.currentSelectProps,data);
116 this.$parent.tabset(); 202 this.$parent.tabset();
117 }, 203 },
204 //申请单元点击事件
205 unitClick (index) {
206 this.$parent.tabset()
207 // this.currentSelectProps = this.unitData[index];
208 // this.currentSelectProps.batchOperation = false;
209 // this.activeIndex = index.toString();
210 // //选中表单传递数据
211 // this.$emit('getCurrentSelectProps', this.currentSelectProps);
212 // this.$parent.stepForm(index);
213 // this.$store.dispatch('user/refreshPage', false);
214 },
215 //登记簿点击事件
216 djbClick () {
217 this.currentSelectProps.batchOperation = true;
218 this.$parent.getdjblist()
219
220 },
221 //补录信息点击事件
222 blxxClick () {
223 this.$parent.tabset()
118 224
225 },
119 } 226 }
120 } 227 }
121 </script> 228 </script>
...@@ -177,8 +284,10 @@ import { loadTreeData, getNode } from "./djbFrameData.js"; ...@@ -177,8 +284,10 @@ import { loadTreeData, getNode } from "./djbFrameData.js";
177 color: #0079fe; 284 color: #0079fe;
178 border-right: 4px solid #0079fe; 285 border-right: 4px solid #0079fe;
179 } 286 }
180 .title-batch{ 287 .menus{
181 background-color: salmon; 288 background-color: #e7f4fe;
182 289 }
290 .blxx{
291 border:#b0d9f8 solid 1px;
183 } 292 }
184 </style> 293 </style>
......
...@@ -63,7 +63,7 @@ ...@@ -63,7 +63,7 @@
63 <div v-else>已完结</div> 63 <div v-else>已完结</div>
64 </template> 64 </template>
65 </el-table-column> 65 </el-table-column>
66 <el-table-column label="环节名称" prop="taskName" minWidth="100" align="center" /> 66 <el-table-column label="环节名称" prop="name" minWidth="100" align="center" />
67 <el-table-column label="办理人" prop="agent" minWidth="120" align="center" /> 67 <el-table-column label="办理人" prop="agent" minWidth="120" align="center" />
68 <el-table-column label="处理时间" prop="createTime" width="160" align="center" /> 68 <el-table-column label="处理时间" prop="createTime" width="160" align="center" />
69 <el-table-column label="办结时间" prop="finishTime" width="160" align="center" /> 69 <el-table-column label="办结时间" prop="finishTime" width="160" align="center" />
...@@ -76,7 +76,6 @@ ...@@ -76,7 +76,6 @@
76 <script> 76 <script>
77 import '@/styles/package/theme/index.scss' 77 import '@/styles/package/theme/index.scss'
78 import BpmnViewer from 'bpmn-js/lib/Viewer' 78 import BpmnViewer from 'bpmn-js/lib/Viewer'
79 import { getusername } from "@/api/getusername.js";
80 import MoveCanvasModule from 'diagram-js/lib/navigation/movecanvas' 79 import MoveCanvasModule from 'diagram-js/lib/navigation/movecanvas'
81 export default { 80 export default {
82 props: { 81 props: {
...@@ -107,7 +106,6 @@ ...@@ -107,7 +106,6 @@
107 } 106 }
108 }, 107 },
109 created () { 108 created () {
110
111 this.$nextTick(() => { 109 this.$nextTick(() => {
112 // 获取流程记录 110 // 获取流程记录
113 this.getCommentList() 111 this.getCommentList()
...@@ -177,18 +175,18 @@ ...@@ -177,18 +175,18 @@
177 this.dlgTitle = element.businessObject ? element.businessObject.name : undefined 175 this.dlgTitle = element.businessObject ? element.businessObject.name : undefined
178 // 计算当前悬浮任务审批记录，如果记录为空不显示弹窗 176 // 计算当前悬浮任务审批记录，如果记录为空不显示弹窗
179 this.taskCommentList = (this.taskList || []).filter(item => { 177 this.taskCommentList = (this.taskList || []).filter(item => {
180 return item.taskDefKey === this.selectTaskId 178 return item.taskDefinitionKey === this.selectTaskId
181 }) 179 })
182 if (this.selectTaskId.length > 3) { 180 if (this.taskCommentList.length==0) {
183 this.taskCommentList = this.taskList; 181 this.taskCommentList = this.taskList;
184 } 182 }
185 }, 183 },
186 // 下拉列表切换 184 // 下拉列表切换
187 handleSelect (val) { 185 handleSelect (val) {
188 this.taskCommentList = (this.taskList || []).filter(item => { 186 this.taskCommentList = (this.taskList || []).filter(item => {
189 return item.taskDefKey === val 187 return item.taskDefinitionKey === val
190 }) 188 })
191 if (val.length > 3) { 189 if (this.taskCommentList.length==0) {
192 this.taskCommentList = this.taskList; 190 this.taskCommentList = this.taskList;
193 } 191 }
194 }, 192 },
...@@ -239,32 +237,13 @@ ...@@ -239,32 +237,13 @@
239 // 获取流程记录 237 // 获取流程记录
240 getCommentList() { 238 getCommentList() {
241 this.formData.allCommentList.forEach(async (item,index) => { 239 this.formData.allCommentList.forEach(async (item,index) => {
242 var arr=item.assigneeName.split(","); 240 this.formData.allCommentList[index].agent=item.assignee.name
243 // 获取用户名
244 let res = await getusername(arr)
245 if(res){
246 let str=""
247 res.data.content.forEach((el,i) => {
248 if(str==""){
249 str=el.name;
250 }else{
251 str += ","+el.name;
252
253 }
254 this.formData.allCommentList[index].agent=str
255 })
256 }
257
258 }) 241 })
259 setTimeout(() => { 242 setTimeout(() => {
260 this.taskList =this.formData.allCommentList; 243 this.taskList =this.formData.allCommentList;
261 // 处理数据之后赋值 244 // 处理数据之后赋值
262 this.taskCommentList=this.taskList 245 this.taskCommentList=this.taskList
263 }, 100) 246 }, 100)
264 // this.$nextTick(() => {
265 // this.taskList =this.formData.allCommentList;
266 // this.taskCommentList=this.taskList
267 // })
268 }, 247 },
269 248
270 // 设置流程图元素状态 249 // 设置流程图元素状态
......
1 <!-- 1 <!--
2 * @Description :查封登记信息 2 * @Description :查封登记信息
3 * @Autor : miaofang 3 * @Autor : miaofang
4 * @LastEditTime : 2023-06-02 14:41:22 4 * @LastEditTime : 2023-06-08 17:04:19
5 --> 5 -->
6 <template> 6 <template>
7 <div class="djxxTable"> 7 <div class="djxxTable">
...@@ -113,13 +113,13 @@ export default { ...@@ -113,13 +113,13 @@ export default {
113 return name; 113 return name;
114 }, 114 },
115 AddDialog(row){ 115 AddDialog(row){
116 this.$popupDialog("新增", "djbBook/components/djbeditDialog", { 116 this.$popupDialog("新增", "djbworkflow/djbBook/components/djbeditDialog", {
117 datalist:this.columns, 117 datalist:this.columns,
118 data: '' 118 data: ''
119 }) 119 })
120 }, 120 },
121 editDialog(row){ 121 editDialog(row){
122 this.$popupDialog("编辑", "djbBook/components/djbeditDialog", { 122 this.$popupDialog("编辑", "djbworkflow/djbBook/components/djbeditDialog", {
123 datalist:this.columns, 123 datalist:this.columns,
124 data: row, 124 data: row,
125 125
......
...@@ -5,11 +5,11 @@ ...@@ -5,11 +5,11 @@
5 --> 5 -->
6 <template> 6 <template>
7 <div class="clmlmx-box"> 7 <div class="clmlmx-box">
8 <div class="title">申请材料目录</div> 8 <div class="title">申请材料目录1111</div>
9 <lb-table :column="column" :key="key" :heightNumSetting="true" :pagination="false" :data="formData.data"> 9 <lb-table :column="column" :key="key" :heightNumSetting="true" :pagination="false" :data="formData.data">
10 </lb-table> 10 </lb-table>
11 <div class="text-center"> 11 <div class="text-center">
12 <el-button @click="$popupCacel">取消</el-button> 12 <el-button @click="$popupCacel">取消11111</el-button>
13 </div> 13 </div>
14 </div> 14 </div>
15 </template> 15 </template>
......
...@@ -249,7 +249,7 @@ ...@@ -249,7 +249,7 @@
249 import imagePreview from '@/views/components/imagePreview.vue' 249 import imagePreview from '@/views/components/imagePreview.vue'
250 import { InitClml, saveClml, deleteSjClml, moveClml } from "@/api/clxx.js"; 250 import { InitClml, saveClml, deleteSjClml, moveClml } from "@/api/clxx.js";
251 export default { 251 export default {
252 components: { clxxAddDialog}, 252 components: { clxxAddDialog, imagePreview },
253 props: { 253 props: {
254 formData: { 254 formData: {
255 type: Object, 255 type: Object,
...@@ -326,7 +326,6 @@ export default { ...@@ -326,7 +326,6 @@ export default {
326 this.datalist = JSON.parse(JSON.stringify(this.formData.datalist)); 326 this.datalist = JSON.parse(JSON.stringify(this.formData.datalist));
327 this.datalist.shift(); 327 this.datalist.shift();
328 this.datalist.shift(); 328 this.datalist.shift();
329 console.log("this.datalist", this.datalist);
330 }, 329 },
331 330
332 methods: { 331 methods: {
...@@ -523,7 +522,7 @@ export default { ...@@ -523,7 +522,7 @@ export default {
523 //查看明细 522 //查看明细
524 viewDetail () { 523 viewDetail () {
525 console.log("查看明细"); 524 console.log("查看明细");
526 this.$popupDialog("查看明细", "djbBook/components/clxxDetailDialog", { 525 this.$popupDialog("查看明细", "djbworkflow/djbBook/components/clxxDetailDialog", {
527 data: this.tableData 526 data: this.tableData
528 }, "60%") 527 }, "60%")
529 }, 528 },
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
4 * @LastEditTime: 2023-05-09 09:20:10 4 * @LastEditTime: 2023-05-09 09:20:10
5 --> 5 -->
6 <template> 6 <template>
7 <dialogBox title="新建材料信息" width="20%" isMain v-model="myValue" @closeDialog="closeDialog" @submitForm="handleSubmit" 7 <dialogBox title="新建材料信息1111111" width="20%" isMain v-model="myValue" @closeDialog="closeDialog" @submitForm="handleSubmit"
8 :isFullscreen="false"> 8 :isFullscreen="false">
9 <el-form :model="ruleForm" ref="ruleForm" label-width="70px"> 9 <el-form :model="ruleForm" ref="ruleForm" label-width="70px">
10 <el-row> 10 <el-row>
...@@ -48,6 +48,7 @@ ...@@ -48,6 +48,7 @@
48 }, 48 },
49 watch: { 49 watch: {
50 value (val) { 50 value (val) {
51 console.log("进去新增材料弹框");
51 this.myValue = val; 52 this.myValue = val;
52 }, 53 },
53 }, 54 },
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
9 <!-- 材料预览 --> 9 <!-- 材料预览 -->
10 <div class="clyl-box"> 10 <div class="clyl-box">
11 <div class="menu-tree"> 11 <div class="menu-tree">
12 <el-button type="primary" native-type="submit" @click="viewDetail" style="width:100%;margin-top:10px;">查看明细</el-button> 12 <el-button type="primary" native-type="submit" @click="viewDetail" style="width:100%;margin-top:10px;">查看明细111111</el-button>
13 <div class="item"> 13 <div class="item">
14 材料目录({{tableData.length}}) 14 材料目录({{tableData.length}})
15 <div style="margin-top:10px"> 15 <div style="margin-top:10px">
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
6 <template> 6 <template>
7 <div class='spyj loadingtext'> 7 <div class='spyj loadingtext'>
8 <div class="box"> 8 <div class="box">
9 <b class="spyj_title">审批表</b> 9 <b class="spyj_title">审批表11112222</b>
10 <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="120px"> 10 <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="120px">
11 <div class="spyj_form" v-for="(item, index) in tableData" :key="index"> 11 <div class="spyj_form" v-for="(item, index) in tableData" :key="index">
12 <div class="item_left"> 12 <div class="item_left">
......
...@@ -106,12 +106,12 @@ export default { ...@@ -106,12 +106,12 @@ export default {
106 return name; 106 return name;
107 }, 107 },
108 AddDialog(row){ 108 AddDialog(row){
109 this.$popupDialog("新增", "djbBook/components/djbeditDialog", { 109 this.$popupDialog("新增", "djbworkflow/djbBook/components/djbeditDialog", {
110 data: '' 110 data: ''
111 }) 111 })
112 }, 112 },
113 editDialog(row){ 113 editDialog(row){
114 this.$popupDialog("编辑", "djbBook/components/djbeditDialog", { 114 this.$popupDialog("编辑", "djbworkflow/djbBook/components/djbeditDialog", {
115 datalist:this.columns, 115 datalist:this.columns,
116 data: row, 116 data: row,
117 117
......
1 <!-- 1 <!--
2 * @Description : 地役权登记信息 2 * @Description : 地役权登记信息
3 * @Autor : miaofang 3 * @Autor : miaofang
4 * @LastEditTime : 2023-06-02 14:45:17 4 * @LastEditTime : 2023-06-08 08:46:10
5 --> 5 -->
6 <template> 6 <template>
7 <div class="djxxTable"> 7 <div class="djxxTable">
...@@ -106,12 +106,12 @@ export default { ...@@ -106,12 +106,12 @@ export default {
106 return name; 106 return name;
107 }, 107 },
108 AddDialog(row){ 108 AddDialog(row){
109 this.$popupDialog("新增", "djbBook/components/djbeditDialog", { 109 this.$popupDialog("新增", "djbworkflow/djbBook/components/djbeditDialog", {
110 data: '' 110 data: ''
111 }) 111 })
112 }, 112 },
113 editDialog(row){ 113 editDialog(row){
114 this.$popupDialog("编辑", "djbBook/components/djbeditDialog", { 114 this.$popupDialog("编辑", "djbworkflow/djbBook/components/djbeditDialog", {
115 datalist:this.columns, 115 datalist:this.columns,
116 data: row, 116 data: row,
117 117
......
...@@ -111,12 +111,12 @@ ...@@ -111,12 +111,12 @@
111 return name; 111 return name;
112 }, 112 },
113 AddDialog(row){ 113 AddDialog(row){
114 this.$popupDialog("新增", "djbBook/components/djbeditDialog", { 114 this.$popupDialog("新增", "djbworkflow/djbBook/components/djbeditDialog", {
115 data: '' 115 data: ''
116 }) 116 })
117 }, 117 },
118 editDialog(row){ 118 editDialog(row){
119 this.$popupDialog("编辑", "djbBook/components/djbeditDialog", { 119 this.$popupDialog("编辑", "djbworkflow/djbBook/components/djbeditDialog", {
120 datalist:this.columns, 120 datalist:this.columns,
121 data: row, 121 data: row,
122 122
......
...@@ -106,12 +106,12 @@ export default { ...@@ -106,12 +106,12 @@ export default {
106 return name; 106 return name;
107 }, 107 },
108 AddDialog(row){ 108 AddDialog(row){
109 this.$popupDialog("新增", "djbBook/components/djbeditDialog", { 109 this.$popupDialog("新增", "djbworkflow/djbBook/components/djbeditDialog", {
110 data: '' 110 data: ''
111 }) 111 })
112 }, 112 },
113 editDialog(row){ 113 editDialog(row){
114 this.$popupDialog("编辑", "djbBook/components/djbeditDialog", { 114 this.$popupDialog("编辑", "djbworkflow/djbBook/components/djbeditDialog", {
115 datalist:this.columns, 115 datalist:this.columns,
116 data: row, 116 data: row,
117 117
......
1 <!-- 1 <!--
2 * @Description :国有建设用地使用权 2 * @Description :国有建设用地使用权
3 * @Autor : miaofang 3 * @Autor : miaofang
4 * @LastEditTime : 2023-06-05 15:40:51 4 * @LastEditTime : 2023-06-09 13:33:38
5 --> 5 -->
6 <template> 6 <template>
7 <div class="djxxTable"> 7 <div class="djxxTable">
...@@ -86,6 +86,7 @@ ...@@ -86,6 +86,7 @@
86 }).then((res) => { 86 }).then((res) => {
87 if (res.code === 200) { 87 if (res.code === 200) {
88 this.tableData = res.result; 88 this.tableData = res.result;
89 console.log("111111111111this.tableDat1",this.tableData);
89 if (this.tableData.length < datas.columns().emptycolNum) { 90 if (this.tableData.length < datas.columns().emptycolNum) {
90 this.emptycolNum = 91 this.emptycolNum =
91 datas.columns().emptycolNum - this.tableData.length; 92 datas.columns().emptycolNum - this.tableData.length;
...@@ -94,6 +95,7 @@ ...@@ -94,6 +95,7 @@
94 } 95 }
95 } 96 }
96 }); 97 });
98
97 }, 99 },
98 checkChange () { 100 checkChange () {
99 if (this.checkList.length === 0) { 101 if (this.checkList.length === 0) {
...@@ -114,14 +116,14 @@ ...@@ -114,14 +116,14 @@
114 return name; 116 return name;
115 }, 117 },
116 AddDialog(row){ 118 AddDialog(row){
117 this.$popupDialog("新增", "djbBook/components/djbeditDialog", { 119 this.$popupDialog("新增", "djbworkflow/djbBook/components/djbeditDialog", {
118 datalist:this.columns, 120 datalist:this.columns,
119 data: '' 121 data: ''
120 122
121 }) 123 })
122 }, 124 },
123 editDialog(row){ 125 editDialog(row){
124 this.$popupDialog("编辑", "djbBook/components/djbeditDialog", { 126 this.$popupDialog("编辑", "djbworkflow/djbBook/components/djbeditDialog", {
125 datalist:this.columns, 127 datalist:this.columns,
126 data: row, 128 data: row,
127 129
......
...@@ -140,12 +140,12 @@ ...@@ -140,12 +140,12 @@
140 return name; 140 return name;
141 }, 141 },
142 AddDialog(row){ 142 AddDialog(row){
143 this.$popupDialog("新增", "djbBook/components/djbeditDialog", { 143 this.$popupDialog("新增", "djbworkflow/djbBook/components/djbeditDialog", {
144 data: '' 144 data: ''
145 }) 145 })
146 }, 146 },
147 editDialog(row){ 147 editDialog(row){
148 this.$popupDialog("编辑", "djbBook/components/djbeditDialog", { 148 this.$popupDialog("编辑", "djbworkflow/djbBook/components/djbeditDialog", {
149 datalist:this.columns, 149 datalist:this.columns,
150 data: row, 150 data: row,
151 151
......
...@@ -209,4 +209,4 @@ ...@@ -209,4 +209,4 @@
209 margin-left: 2px; 209 margin-left: 2px;
210 } 210 }
211 } 211 }
212 }
...\ No newline at end of file ...\ No newline at end of file
212 }
......
1 <template>
2 <div class="from-clues-header">
3 <div>受理信息</div>
4 <el-form ref="form" :model="form" label-width="160px">
5 <el-row>
6 <el-col :span="12">
7 <el-form-item label="权属状态" label-width="140px">
8 <el-select v-model="form.qszt">
9 <el-option
10 v-for="item in qsztList"
11 :key="item.value"
12 :label="item.label"
13 :value="item.value"
14 >
15 </el-option>
16 </el-select>
17 </el-form-item>
18 </el-col>
19 <el-col :span="12" v-for="item in datalist" :key="item.bdcdyh">
20 <el-form-item
21 :prop="item.prop"
22 :label="item.label"
23 label-width="140px"
24 >
25 <el-input v-model="form[item.prop]"></el-input>
26 </el-form-item>
27 </el-col>
28 </el-row>
29 </el-form>
30 <div class="btn">
31 <el-button type="primary" @click="slxxsubmitForm">保存</el-button>
32 <el-button @click="closeDialog">取消</el-button>
33 </div>
34 </div>
35 </template>
36 <script>
37 import { mapGetters } from "vuex";
38 export default {
39
40 props: {
41 formData: {
42 type: Object,
43 default: () => {},
44 },
45 },
46 data() {
47 return {
48 //传递参数
49 propsParam: this.$attrs,
50 activeName: "slxx",
51 form: {},
52 datalist: [],
53 qsztList: [
54 {
55 value: "1",
56 label: "现势",
57 },
58 {
59 value: "2",
60 label: "历史",
61 },
62 ],
63 label: "",
64 isshow: true,
65 };
66 },
67 computed: {
68
69 ...mapGetters(["dictData"])
70 },
71 created () {
72 console.log("this.propsParam",this.propsParam);
73 // this.clmlInitList(1)
74 },
75 mounted() {
76
77 if (this.formData.data) {
78 this.$nextTick(() => {
79 this.form = Object.assign({}, this.formData.data);
80 // this.datalist = Object.assign([], this.formData.datalist)
81 this.form.qszt =
82 this.form.qszt == "0"
83 ? "临时"
84 : this.form.qszt == "1"
85 ? "现势"
86 : "历史";
87 });
88 }
89
90 // this.datalist = this.formData.datalist
91 this.datalist = JSON.parse(JSON.stringify(this.formData.datalist));
92 this.datalist.shift();
93 this.datalist.shift();
94 console.log("this.datalist", this.datalist);
95 },
96
97 methods: {
98 // 受理信息保存
99 slxxsubmitForm() {
100 this.$refs.form.validate((valid) => {
101 if (valid) {
102 // addUserCommonOpinion({ commonOpinion: this.form.commonOpinion }).then(res => {
103 // if (res.code == 200) {
104 // this.$message.success("新增成功")
105 // this.closeaddDiglog();
106 // this.getList()
107 // } else {
108 // this.$message.error(res.message)
109 // }
110 // })
111 } else {
112 return false;
113 }
114 });
115 this.isshow = false;
116 },
117 closeDialog(){
118
119 }
120
121 },
122 };
123 </script>
124 <style scoped lang="scss">
125 @import "~@/styles/mixin.scss";
126 @import "~@/styles/public.scss";
127
128 .from-clues-header {
129 @include flex;
130 flex-direction: column;
131 overflow-y: hidden;
132 height: 620px;
133 padding: 0 2px;
134
135 .btn {
136 margin-top: 40px;
137 margin-bottom: 20px;
138 text-align: center;
139 }
140 }
141
142 // 审批意见样式
143
144 .spyj {
145 .box {
146 overflow-x: auto;
147 width: 100%;
148 height: 95%;
149 background: #fff;
150 text-align: center;
151 padding: 4px;
152 overflow-y: scroll;
153 padding-top: 20px;
154 padding: 20px 40px;
155 /deep/.el-input__inner {
156 width: 200px;
157 border:none;
158 }
159 }
160 .spyj_title {
161 line-height: 68px;
162 border: 1px solid $borderColor;
163 text-align: center;
164 font-size: 22px;
165 font-weight: 400;
166 background-color: #eceef2;
167 display: block;
168 border-bottom: none;
169 }
170
171 /deep/.el-form-item {
172 margin-bottom: 0;
173 }
174
175 .bottom10 {
176 margin-bottom: 15px;
177 }
178
179 .spyj_form {
180 display: flex;
181 border: 1px solid $borderColor;
182
183 .item_left {
184 width: 150px;
185 background-color: #f8f8fa;
186 color: #606266;
187 display: flex;
188 font-size: 14px;
189 text-indent: 80px;
190 align-items: center;
191 border-right: 1px solid $borderColor;
192 }
193
194 .item_right {
195 flex: 1;
196 width: 100%;
197
198 /deep/.el-form-item__label {
199 background-color: #f8f8fa;
200 }
201 /deep/.el-form-item__content {
202 display: block;
203 text-align: left;
204 text-indent: 10px;
205 }
206 .opinion_item {
207 /deep/.el-form-item__error {
208 margin-top: -16px !important;
209 left: 3px;
210 }
211
212 border-bottom: 1px solid $borderColor;
213 }
214
215 .opinion {
216 position: relative;
217 font-size: 14px;
218
219 /deep/.el-textarea__inner {
220 border: none;
221 }
222 }
223
224 .opinion_btn {
225 position: absolute;
226 right: 15px;
227 bottom: 10px;
228 }
229 }
230 }
231
232 .submit_button {
233 text-align: center;
234 margin: 15px 0;
235 }
236 }
237
238 // 材料信息样式
239 .active {
240 background: $light-blue !important;
241 color: #fff;
242 }
243
244 .required {
245 font-size: 12px;
246 color: $pink;
247 float: left;
248 }
249
250 .cl_number {
251 float: right;
252 }
253
254 .clxx {
255 width: 100%;
256 display: flex;
257 padding-left: 5px;
258 height: calc(100vh - 125px);
259
260 .left {
261 display: flex;
262 flex-direction: column;
263 justify-content: space-between;
264
265 .item {
266 width: 28px;
267 height: 49%;
268 @include flex-center;
269 background-color: #e4e7ed;
270 border-bottom-right-radius: 10px;
271 padding: 5px;
272 cursor: pointer;
273 transition: all 0.3s;
274
275 &:hover {
276 @extend .active;
277 }
278 }
279 }
280
281 .right {
282 width: 100%;
283 height: 100%;
284
285 .clmlmx-box {
286 margin: 0 auto;
287
288 .title {
289 text-align: center;
290 height: 60px;
291 line-height: 60px;
292 border: 1px solid #dfe6ec;
293 font-size: 20px;
294 background: #81d3f81a;
295 margin-bottom: -1px;
296 }
297 }
298
299 .clyl-box {
300 width: 100%;
301 height: 100%;
302 display: flex;
303
304 .menu-tree {
305 width: 20%;
306 min-width: 160px;
307 height: 100%;
308 margin-right: 10px;
309 border-right: 1px dotted #d9d9d9;
310 padding: 0 15px;
311
312 .item {
313 line-height: 30px;
314 padding-top: 5px;
315 border-bottom: 1px solid #e8e8e8;
316 font-size: 16px;
317 text-align: center;
318 color: $light-blue;
319
320 .itemIcon {
321 float: right;
322 line-height: 60px;
323 cursor: pointer;
324 }
325
326 .child {
327 line-height: 32px;
328 border-bottom: 1px solid #e8e8e8;
329 padding-left: 10px;
330 color: #6b6b6b;
331 cursor: pointer;
332 box-sizing: border-box;
333 border-radius: 6px;
334 line-height: 20px;
335 transition: all 0.3s;
336 padding: 8px 0;
337 }
338
339 .child:hover {
340 color: $light-blue;
341 transform: scale(1.1);
342 }
343
344 .checked {
345 border: 1px solid $light-blue;
346 color: $light-blue;
347 }
348 }
349 }
350
351 .clyl-img {
352 width: 75%;
353 height: 100%;
354 background: #f3f4f7;
355 margin: 0 auto;
356 position: relative;
357 }
358 }
359 }
360 }
361 </style>
1 <!--
2 * @Description: 审批意见
3 * @Autor: renchao
4 * @LastEditTime: 2023-05-17 10:41:24
5 -->
6 <template>
7 <div class='spyj loadingtext'>
8 <div class="box">
9 <b class="spyj_title">审批表11111111111111111111</b>
10 <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="120px">
11 <div class="spyj_form" v-for="(item, index) in tableData" :key="index">
12 <div class="item_left">
13 {{ item.jdmc }}意见
14 </div>
15 <div class="item_right">
16 <el-row>
17 <el-col :span="24">
18 <el-form-item label-width="0" class="opinion_item" prop="shyj">
19 <el-input type="textarea" :rows="4" class="opinion" placeholder="请输入审批意见"
20 v-if="item.stepShjy == '1' && ableOperation" v-model="ruleForm.shyj"></el-input>
21 <el-input type="textarea" :rows="4" class="opinion" v-model="item.shyj" v-else :disabled="true">
22 </el-input>
23 <el-button class="opinion_btn" @click="commonOpinion"
24 v-if="item.stepShjy == '1' && ableOperation">常用意见</el-button>
25 </el-form-item>
26 </el-col>
27 </el-row>
28 <el-row>
29 <el-col :span="16">
30 <el-form-item label="审查人" prop="shryxm">
31 {{ item.shryxm }}
32 </el-form-item>
33 </el-col>
34 <el-col :span="8">
35 <el-form-item label="审核时间" prop="shjssj" :key="refresh">
36 {{ item.shjssj }}
37 </el-form-item>
38 </el-col>
39 </el-row>
40 </div>
41 </div>
42 <div class="submit_button" v-if="ableOperation">
43 <el-button type="primary" @click="onSubmit">保存</el-button>
44 </div>
45 </el-form>
46 </div>
47 <el-empty v-if="isNoData" description="暂无数据"></el-empty>
48 </div>
49 </template>
50 <script>
51 import { getSpyjList, saveSpyj, saveSpyjBySlsq } from "@/api/fqsq.js";
52 import { mapGetters } from 'vuex'
53 export default {
54 computed: {
55 ...mapGetters(['userData', 'yjsqOptions'])
56 },
57 data () {
58 return {
59 isNoData: false,
60 bsmSlsq: '',
61 //刷新值
62 refresh: 10,
63 ableOperation: true,
64 bsmSlsq: this.$route.query.bsmSlsq,
65 bestepid: this.$route.query.bestepid,
66 ruleForm: {},
67 rules: {
68 shyj: [
69 { required: true, message: '请输入审批意见', trigger: 'blur' }
70 ],
71 },
72 tableData: [],
73 propsParam: {}
74 }
75 },
76 watch: {
77 yjsqOptions: {
78 handler (val) {
79 this.ruleForm.shyj = val
80 },
81 deep: true,
82 immediate: true
83 },
84 },
85 mounted () {
86 this.propsParam = this.$attrs;
87 if (this.$route.query.viewtype) {
88 this.ableOperation = false
89 }
90 this.list();
91 },
92 methods: {
93 //审批意见数据初始化
94 list () {
95 let that = this
96 this.$startLoading()
97 var formdata = new FormData();
98 formdata.append("bsmBusiness", this.propsParam.bsmBusiness);
99 formdata.append("bestepid", this.$route.query.bestepid);
100 formdata.append("ableOperation", this.ableOperation)
101 getSpyjList(formdata).then((res) => {
102 this.$endLoading()
103 if (res.code === 200 && res.result) {
104 this.tableData = res.result ? res.result : []
105 if (res.result.length == 0) {
106 that.isNoData = true
107 }
108 this.ruleForm = res.result[res.result.length - 1]
109 }
110 })
111 },
112 onSubmit () {
113 this.ruleForm.bsmSlsq = this.bsmSlsq
114 this.ruleForm.bestepid = this.bestepid
115 saveSpyjBySlsq(this.ruleForm).then(res => {
116 if (res.code === 200) {
117 this.$message.success("保存成功")
118 this.refresh += 1
119 } else {
120 this.$message.error(res.message)
121 }
122 })
123 },
124 //打开常用意见列表弹窗
125 commonOpinion () {
126 this.$popupDialog("常用意见", "workflow/components/dialog/commonOpinion", {}, "70%", true)
127 },
128 //使用常用意见
129 useOpinion (opinion) {
130 this.ruleForm.shyj = opinion
131 }
132 }
133 }
134 </script>
135 <style scoped lang='scss'>
136 @import "~@/styles/mixin.scss";
137
138 .spyj {
139 width: 100%;
140 height: 100%;
141 background-color: #f5f5f5;
142 padding: 5px;
143 .box {
144 overflow-x: auto;
145 width: 100%;
146 height: 95%;
147 background: #fff;
148 text-align: center;
149 padding: 4px;
150 overflow-y: scroll;
151 padding-top: 20px;
152 padding: 20px 40px;
153 }
154 .spyj_title {
155 line-height: 68px;
156 border: 1px solid $borderColor;
157 text-align: center;
158 font-size: 22px;
159 font-weight: 400;
160 background-color: #eceef2;
161 display: block;
162 border-bottom: none;
163 }
164
165 /deep/.el-form-item {
166 margin-bottom: 0;
167 }
168
169 .bottom10 {
170 margin-bottom: 15px;
171 }
172
173 .spyj_form {
174 display: flex;
175 border: 1px solid $borderColor;
176
177 .item_left {
178 width: 150px;
179 background-color: #f8f8fa;
180 color: #606266;
181 display: flex;
182 font-size: 14px;
183 text-indent: 80px;
184 align-items: center;
185 border-right: 1px solid $borderColor;
186 }
187
188 .item_right {
189 flex: 1;
190 width: 100%;
191
192 /deep/.el-form-item__label {
193 background-color: #f8f8fa;
194 }
195 /deep/.el-form-item__content {
196 display: block;
197 text-align: left;
198 text-indent: 10px;
199 }
200 .opinion_item {
201 /deep/.el-form-item__error {
202 margin-top: -16px !important;
203 left: 3px;
204 }
205
206 border-bottom: 1px solid $borderColor;
207 }
208
209 .opinion {
210 position: relative;
211 font-size: 14px;
212
213 /deep/.el-textarea__inner {
214 border: none;
215 }
216 }
217
218 .opinion_btn {
219 position: absolute;
220 right: 15px;
221 bottom: 10px;
222 }
223 }
224 }
225
226 .submit_button {
227 text-align: center;
228 margin: 15px 0;
229 }
230 }
231 </style>
1 <!-- 1 <!--
2 * @Description :预告登记信息 2 * @Description :预告登记
3 * @Autor : miaofang 3 * @Autor : miaofang
4 * @LastEditTime : 2023-06-02 14:44:18 4 * @LastEditTime : 2023-06-12 09:17:17
5 --> 5 -->
6 <template> 6 <template>
7 <div class="djxxTable"> 7 <div class="djxxTable">
...@@ -106,12 +106,12 @@ export default { ...@@ -106,12 +106,12 @@ export default {
106 return name; 106 return name;
107 }, 107 },
108 AddDialog(row){ 108 AddDialog(row){
109 this.$popupDialog("新增", "djbBook/components/djbeditDialog", { 109 this.$popupDialog("新增", "djbworkflow/djbBook/components/djbeditDialog", {
110 data: '' 110 data: ''
111 }) 111 })
112 }, 112 },
113 editDialog(row){ 113 editDialog(row){
114 this.$popupDialog("编辑", "djbBook/components/djbeditDialog", { 114 this.$popupDialog("编辑", "djbworkflow/djbBook/components/djbeditDialog", {
115 datalist:this.columns, 115 datalist:this.columns,
116 data: row, 116 data: row,
117 117
......
1 <!-- 1 <!--
2 * @Description :异议登记信息 2 * @Description :异议登记
3 * @Autor : miaofang 3 * @Autor : miaofang
4 * @LastEditTime : 2023-06-02 14:41:03 4 * @LastEditTime : 2023-06-09 13:55:42
5 --> 5 -->
6 <template> 6 <template>
7 <div class="djxxTable"> 7 <div class="djxxTable">
...@@ -67,6 +67,7 @@ export default { ...@@ -67,6 +67,7 @@ export default {
67 }; 67 };
68 }, 68 },
69 created () { 69 created () {
70 console.log("异议登记");
70 this.loadData(); 71 this.loadData();
71 }, 72 },
72 methods: { 73 methods: {
...@@ -106,12 +107,12 @@ export default { ...@@ -106,12 +107,12 @@ export default {
106 return name; 107 return name;
107 }, 108 },
108 AddDialog(row){ 109 AddDialog(row){
109 this.$popupDialog("新增", "djbBook/components/djbeditDialog", { 110 this.$popupDialog("新增", "djbworkflow/djbBook/components/djbeditDialog", {
110 data: '' 111 data: ''
111 }) 112 })
112 }, 113 },
113 editDialog(row){ 114 editDialog(row){
114 this.$popupDialog("编辑", "djbBook/components/djbeditDialog", { 115 this.$popupDialog("编辑", "djbworkflow/djbBook/components/djbeditDialog", {
115 datalist:this.columns, 116 datalist:this.columns,
116 data: row, 117 data: row,
117 118
......
...@@ -33,7 +33,7 @@ export function getForm (tabName, djywbm) { ...@@ -33,7 +33,7 @@ export function getForm (tabName, djywbm) {
33 break; 33 break;
34 case "diyaqSlxx": 34 case "diyaqSlxx":
35 form = require("@/views/ywbl/slsqxx/diyaq/slxx.vue"); 35 form = require("@/views/ywbl/slsqxx/diyaq/slxx.vue");
36 break; 36 break;
37 case "clxx": 37 case "clxx":
38 form = require("@/views/djbworkflow/components/clxxUnify.vue"); 38 form = require("@/views/djbworkflow/components/clxxUnify.vue");
39 break; 39 break;
...@@ -41,7 +41,7 @@ export function getForm (tabName, djywbm) { ...@@ -41,7 +41,7 @@ export function getForm (tabName, djywbm) {
41 form = require("@/views/djbworkflow/components/spyj.vue"); 41 form = require("@/views/djbworkflow/components/spyj.vue");
42 break; 42 break;
43 case "zdjbxx": 43 case "zdjbxx":
44 form = require("@/views/djbBook/zdjbxx.vue"); 44 form = require("@/views/djbworkflow/djbBook/zdjbxx.vue");
45 break; 45 break;
46 case "ygmm100": 46 case "ygmm100":
47 form = require("@/views/ywbl/slsqxx/ygdj/slxx.vue"); 47 form = require("@/views/ywbl/slsqxx/ygdj/slxx.vue");
...@@ -56,24 +56,33 @@ export function getForm (tabName, djywbm) { ...@@ -56,24 +56,33 @@ export function getForm (tabName, djywbm) {
56 case "zjgcdyqSlxx": 56 case "zjgcdyqSlxx":
57 form = require("@/views/ywbl/slsqxx/zjgcdy/slxx.vue"); 57 form = require("@/views/ywbl/slsqxx/zjgcdy/slxx.vue");
58 break; 58 break;
59 case "cfdjxx": 59 case "cfdj":
60 form = require("@/views/djbBook/cfdj.vue"); 60 form = require("@/views/djbworkflow/djbBook/cfdj.vue");
61 break;
62 case "jsydsyq":
63 form = require("@/views/djbworkflow/djbBook/jsydsyq.vue");
61 break; 64 break;
62 case "jsydsyqQlxx": 65 case "nydsyq":
63 form = require("@/views/djbBook/jsydsyq.vue"); 66 form = require("@/views/djbworkflow/djbBook/nydsyq.vue");
64 break; 67 break;
65 case "nydsyqQlxx": 68 case "fdcq2":
66 form = require("@/views/djbBook/nydsyq.vue"); 69 form = require("@/views/djbworkflow/djbBook/fdcq2.vue");
67 break; 70 break;
68 case "fdcq2Qlxx": 71 case "diyaq":
69 form = require("@/views/djbBook/fdcq2.vue"); 72 form = require("@/views/djbworkflow/djbBook/diyaq.vue");
70 break; 73 break;
71 case "diyaqQlxx": 74 case "ygdj":
72 form = require("@/views/djbBook/diyaq.vue"); 75 form = require("@/views/djbworkflow/djbBook/ygdj.vue");
73 break; 76 break;
74 case "ygdjQlxx": 77 case "diyiq":
75 form = require("@/views/djbBook/ygdj.vue"); 78 form = require("@/views/djbworkflow/djbBook/diyiq.vue");
76 break; 79 break;
80 case "djbfm":
81 form = require("@/views/djbworkflow/djbBook/djbfm.vue");
82 break;
83 case "yydj":
84 form = require("@/views/djbworkflow/djbBook/yydj.vue");
85 break;
77 case "szxx": 86 case "szxx":
78 form = require("@/views/djbworkflow/components/szxx.vue"); 87 form = require("@/views/djbworkflow/components/szxx.vue");
79 break; 88 break;
...@@ -83,6 +92,15 @@ export function getForm (tabName, djywbm) { ...@@ -83,6 +92,15 @@ export function getForm (tabName, djywbm) {
83 case "zdt": 92 case "zdt":
84 form = require("@/views/djbworkflow/components/zdt.vue"); 93 form = require("@/views/djbworkflow/components/zdt.vue");
85 break; 94 break;
95 case "slxx":
96 form = require("@/views/djbworkflow/djbBook/slxx.vue");
97 break;
98 // case "spyj":
99 // form = require("@/views/djbworkflow/djbBook/spyj.vue");
100 // break;
101 // case "clxx":
102 // form = require("@/views/djbworkflow/djbBook/clxx.vue");
103 // break;
86 default: 104 default:
87 form = require("@/views/error-page/404.vue"); 105 form = require("@/views/error-page/404.vue");
88 break; 106 break;
......
1 /* 1 /*
2 * @Description: 2 * @Description:workFramezu.vue组件的方法
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-05-18 15:01:31 4 * @LastEditTime: 2023-05-18 15:01:31
5 */ 5 */
...@@ -16,6 +16,7 @@ import { ...@@ -16,6 +16,7 @@ import {
16 getNextLinkInfo, 16 getNextLinkInfo,
17 } from "@/api/fqsq.js"; 17 } from "@/api/fqsq.js";
18 import { mapGetters } from 'vuex' 18 import { mapGetters } from 'vuex'
19 import { log } from "bpmn-js-token-simulation";
19 export default { 20 export default {
20 data () { 21 data () {
21 return { 22 return {
...@@ -48,9 +49,12 @@ export default { ...@@ -48,9 +49,12 @@ export default {
48 formdata.append("bestepid", this.bestepid); 49 formdata.append("bestepid", this.bestepid);
49 stepExpandInfo(formdata).then((res) => { 50 stepExpandInfo(formdata).then((res) => {
50 if (res.code === 200) { 51 if (res.code === 200) {
51 this.leftButtonList = res.result.button; 52 this.leftButtonList =[];
52 this.rightButtonList = res.result.operation; 53 this.rightButtonList = res.result.operation;
53 this.slsq = res.result.slsq 54 this.slsq = res.result.slsq
55 console.log("this.slsq",this.slsq);
56 console.log("this.rightButtonList",this.rightButtonList);
57 this.rightButtonList.splice(0,2)
54 } 58 }
55 }) 59 })
56 60
...@@ -70,10 +74,10 @@ export default { ...@@ -70,10 +74,10 @@ export default {
70 this.$popupDialog("流程图", "workflow/components/processViewer", { 74 this.$popupDialog("流程图", "workflow/components/processViewer", {
71 xml: result.xml, 75 xml: result.xml,
72 finishedInfo: { 76 finishedInfo: {
73 finishedTaskSet: result.finishedTaskSet, 77 finishedTaskSet: result.finishedActivityIds,
74 unfinishedTaskSet: result.unfinishedTaskSet, 78 unfinishedTaskSet: result.runningActivityIds,
75 rejectedTaskSet: result.rejectedTaskSet, 79 rejectedTaskSet: result.rejectedTaskSet,
76 finishedSequenceFlowSet: result.finishedSequenceFlowSet 80 finishedSequenceFlowSet: result.finishedSequenceFlowIds
77 }, 81 },
78 allCommentList: result.historyTaskList 82 allCommentList: result.historyTaskList
79 }, '80%', true) 83 }, '80%', true)
......
...@@ -26,23 +26,11 @@ export default { ...@@ -26,23 +26,11 @@ export default {
26 getHomeNoticeList().then(res => { 26 getHomeNoticeList().then(res => {
27 if (res.result) { 27 if (res.result) {
28 this.noticeList = res.result.noticeList 28 this.noticeList = res.result.noticeList
29 console.log("this.noticeList11111111111111111111111111111111111",this.noticeList);
29 } 30 }
30 }) 31 })
31 }, 32 },
32 //右侧表单选项卡事件 33
33 beforeLeave (activeName, oldActiveName) { 34
34 if (activeName && activeName != 0) this.getFromRouter(activeName)
35 },
36 //切换选项卡内容组件
37 getFromRouter (tabname) {
38 //根据tabname获取选中的表单 此操作为了获取后端返回的表单对象，使用里面的是否可操作的属性
39 for (let item of this.tabList) {
40 if (item.value === tabname) {
41 this.currentSelectTab = item
42 break;
43 }
44 }
45 this.componentTag = getForm(tabname, this.$route.query.sqywbm);
46 }
47 } 35 }
48 } 36 }
......
...@@ -28,11 +28,11 @@ ...@@ -28,11 +28,11 @@
28 <span class="iconName">{{ item.name }}</span> 28 <span class="iconName">{{ item.name }}</span>
29 </li> 29 </li>
30 </ul> 30 </ul>
31 <NoticeBar 31 <!-- <NoticeBar
32 class="NoticeBar" 32 class="NoticeBar"
33 :noticeList="noticeList" 33 :noticeList="noticeList"
34 v-if="noticeList.length > 0" 34 v-if="noticeList.length > 0"
35 /> 35 /> -->
36 </div> 36 </div>
37 <!-- 内容框架 --> 37 <!-- 内容框架 -->
38 <div class="containerFrame"> 38 <div class="containerFrame">
...@@ -70,16 +70,16 @@ ...@@ -70,16 +70,16 @@
70 </style> 70 </style>
71 <script> 71 <script>
72 import WorkFlow from "./mixin/index"; 72 import WorkFlow from "./mixin/index";
73 import publicFlow from "./mixin/public.js"; 73 // import publicFlow from "./mixin/public.js";
74 // import { getStepFormInfo } from "@/api/fqsq.js" 74 // import { getStepFormInfo } from "@/api/fqsq.js"
75 // import { getForm } from "./flowform" 75 import { getForm } from "./flowform"
76 import NoticeBar from "@/components/NoticeBar/index"; 76 import NoticeBar from "@/components/NoticeBar/index";
77 import { unClaimTask } from "@/api/ywbl.js"; 77 import { unClaimTask } from "@/api/ywbl.js";
78 import ProcessViewer from "./components/processViewer.vue"; 78 import ProcessViewer from "./components/processViewer.vue";
79 // 引入左侧菜单 79 // 引入左侧菜单
80 import ordinaryMenu from "./components/leftmenu/ordinaryMenu.vue"; 80 import ordinaryMenu from "./components/leftmenu/ordinaryMenu.vue";
81 import selectBdc from "@/views/ywbl/ywsq/selectBdc.vue"; 81 import selectBdc from "@/views/ywbl/ywsq/selectBdc.vue";
82 import { loadTreeData, getNode } from "./components/leftmenu/djbFrameData"; 82 import { loadTreeData, getNode } from "./components/leftmenu/djbFrameData.js";
83 // 登记簿数据信息 83 // 登记簿数据信息
84 84
85 import { getBdcqljqtsx } from "@/api/registerBook.js"; 85 import { getBdcqljqtsx } from "@/api/registerBook.js";
...@@ -90,10 +90,9 @@ export default { ...@@ -90,10 +90,9 @@ export default {
90 ProcessViewer, 90 ProcessViewer,
91 ordinaryMenu, 91 ordinaryMenu,
92 }, 92 },
93 mixins: [WorkFlow, publicFlow], 93 mixins: [WorkFlow],
94 data() { 94 data() {
95 return { 95 return {
96 isDialog: false,
97 bsmSlsq: this.$route.query.bsmSlsq, 96 bsmSlsq: this.$route.query.bsmSlsq,
98 //当前流程所在环节 97 //当前流程所在环节
99 bestepid: this.$route.query.bestepid, 98 bestepid: this.$route.query.bestepid,
...@@ -104,124 +103,109 @@ export default { ...@@ -104,124 +103,109 @@ export default {
104 qllx: this.$route.query.qllx, 103 qllx: this.$route.query.qllx,
105 //设置那个表单选中 104 //设置那个表单选中
106 tabName: "", 105 tabName: "",
107 //设置那个表单选择
108 currentSelectTab: {},
109 //表单集合 106 //表单集合
110 tabList: [], 107 tabList: [],
111 //选择加载哪一个组件 108 //选择加载哪一个组件
112 componentTag: "", 109 componentTag: "",
113 //设置表单传递数据 110 //设置表单传递数据
114 currentSelectProps: {}, 111 currentSelectProps: {},
115 //材料分屏表单
116 clxxForm: "",
117 //材料信息选择卡索引 112 //材料信息选择卡索引
118 clxxIndex: "", 113 clxxIndex: "",
119 //材料信息选项卡对象 114 //材料信息选项卡对象
120 clxxTab: {}, 115 clxxTab: {},
121 //页面监听时间 116 //页面监听时间
122 _beforeUnload_time: "", 117 _beforeUnload_time: "",
118 treedata:{},
119 tabdata:[],
120 defaultNode:{}
123 }; 121 };
124 }, 122 },
125 mounted() { 123 mounted() {
126 this.$store.dispatch("user/refreshPage", false); 124 this.getdjblist()
127 //添加页面监听事件
128 window.addEventListener("beforeunload", (e) => this.beforeunloadHandler(e));
129 window.addEventListener("unload", (e) => this.unloadHandler(e));
130 this.tabset()
131 }, 125 },
132 destroyed() {
133 126
134 window.removeEventListener("beforeunload", (e) =>
135 this.beforeunloadHandler(e)
136 );
137 window.removeEventListener("unload", (e) => this.unloadHandler(e));
138 },
139 methods: { 127 methods: {
140 getCurrentSelectProps(val) { 128 getCurrentSelectProps (val) {
141 // this.loadData(); 129 this.currentSelectProps = val
142 }, 130 },
131 getdjblist(){
132 getBdcqljqtsx({
133 bdcdyid: this.bdcdyid,
134 bdcdyh: this.bdcdyh,
135 }).then((res) => {
136 if (res.code === 200) {
137 this.treedata = loadTreeData(res.result, this.bdcdyh);
138 this.$nextTick(function () {
139 this.defaultNode = getNode(this.qllx, { linShi: 0, xianShi: 0, liShi: 0 }, "");
140 console.log("this.defaultNode.idssssssssssssssssss",this.defaultNode.id);
141 this.tabName =this.defaultNode.id; //data[0].id为默认选中的节点
142 });
143 }
144 });
145 this.currentSelectProps = {
146 bdcdyid: this.bdcdyid,
147 bdcdyh: this.bdcdyh,
148 qllx: this.qllx,
149 bsmQlxx: this.bsmQlxx,
150 bestepid:this.bestepid
151 };
152 setTimeout(() => {
153 let settree=JSON.parse(JSON.stringify(this.treedata))
154 console.log("settreesettreesettree",settree);
155 this.tabdata=
156 this.tabdata=[...settree,...settree[1].children[0].children[0].children]
157 console.log("this.tabdata",this.tabdata);
158 this.tabdata.forEach((item,index,arr) => {
159 arr[index].name=item.label;
160 arr[index].value=item.id
161 })
162 this.tabList=this.tabdata
143 163
144 beforeunloadHandler() { 164 }, 200)
145 this._beforeUnload_time = new Date().getTime(); 165
146 }, 166
147 unloadHandler(e) { 167 // this.tabdatalet
148 this._gap_time = new Date().getTime() - this._beforeUnload_time;
149 //判断是窗口关闭还是刷新
150 if (this._gap_time <= 10) {
151 //取消认领
152 unClaimTask(this.bsmSlsq, this.bestepid);
153 }
154 }, 168 },
155 tabset(){ 169 tabset(){
170 console.log("补录信息");
156 this.tabList = [ 171 this.tabList = [
157 { 172 {
158 name: "受理情况", 173 name: "受理信息",
159 value: "plfdcq2", 174 value: "slxx",
160 sort: 1, 175 sort: 1,
161 }, 176 },
177 {
178 name: "审批意见",
179 value: "spyj",
180 sort: 2,
181 },
162 { 182 {
163 name: "材料信息", 183 name: "材料信息",
164 value: "clxx", 184 value: "clxx",
165 sort: 2, 185 sort: 2,
166 }, 186 },
167 ]; 187 ];
168 this.tabName = 'plfdcq2'; 188 this.tabName = 'slxx';
169 }, 189 },
170 190
171 // 获取登记簿菜单 191 // stepForm(index){
172 // loadData() { 192 // console.log("stepForm()",11111111111111111,index);
173 // getBdcqljqtsx({ 193 // },
174 // bdcdyid: this.bdcdyid,
175 // bdcdyh: this.bdcdyh,
176 // }).then((res) => {
177 // if (res.code === 200) {
178 // this.treedata = loadTreeData(res.result, this.bdcdyh);
179 // this.$nextTick(function () {
180 // this.defaultNode = getNode(
181 // this.qllx,
182 // { linShi: 0, xianShi: 0, liShi: 0 },
183 // ""
184 // );
185 // this.$refs.tree.setCurrentKey(this.defaultNode.id); //data[0].id为默认选中的节点
186 // // this.$parent.loadComponent(this.currentSelectProps,this.defaultNode);
187 // });
188 // }
189
190 // });
191 // this.currentSelectProps = {
192 // bdcdyid: this.bdcdyid,
193 // bdcdyh: this.bdcdyh,
194 // qllx: this.qllx,
195 // bsmQlxx: this.bsmQlxx,
196 // };
197 // // this.$parent.stepForm();
198 // },
199
200 loadComponent(currentSelectProps, data) {
201 this.tabset()
202 this.currentSelectProps = currentSelectProps;
203 this.componentTag = (r) =>
204 require.ensure([], () => r(require("@/views/djbBook/" + data.form)));
205 194
195 //右侧表单选项卡事件
196 beforeLeave (activeName, oldActiveName) {
197 if (activeName && activeName != 0) this.getFromRouter(activeName)
206 }, 198 },
207 // openDialog() { 199 //切换选项卡内容组件
208 // this.$store.dispatch("user/refreshPage", false); 200 getFromRouter (tabname) {
209 // let data = JSON.parse(localStorage.getItem("ywbl")); 201 for (let item of this.tabList) {
210 // let title; 202 if (item.value === tabname) {
211 // if (data?.sqywmc) { 203 this.currentSelectTab = item
212 // title = "申请业务：" + data?.sqywmc; 204 break;
213 // } else { 205 }
214 // title = "申请业务：" + data?.djywmc; 206 }
215 // } 207 this.componentTag = getForm(tabname, this.$route.query.sqywbm);
216 208 }
217 // this.$popupDialog(
218 // title,
219 // "ywbl/ywsq/selectBdc",
220 // { djywbm: this.$route.query.sqywbm, isJump: true, sqywInfo: data },
221 // "80%",
222 // true
223 // );
224 // },
225 }, 209 },
226 }; 210 };
227 </script> 211 </script>
......
...@@ -86,6 +86,7 @@ export default { ...@@ -86,6 +86,7 @@ export default {
86 leftMenu(formdata).then((res) => { 86 leftMenu(formdata).then((res) => {
87 if (res.code === 200 && res.result) { 87 if (res.code === 200 && res.result) {
88 this.unitData = res.result; 88 this.unitData = res.result;
89 console.log("this.unitData",this.unitData);
89 this.currentSelectProps = res.result[0]; 90 this.currentSelectProps = res.result[0];
90 this.$emit('getCurrentSelectProps', this.currentSelectProps); 91 this.$emit('getCurrentSelectProps', this.currentSelectProps);
91 this.judgeBatchShow(); 92 this.judgeBatchShow();
......
...@@ -63,7 +63,7 @@ ...@@ -63,7 +63,7 @@
63 <div v-else>已完结</div> 63 <div v-else>已完结</div>
64 </template> 64 </template>
65 </el-table-column> 65 </el-table-column>
66 <el-table-column label="环节名称" prop="taskName" minWidth="100" align="center" /> 66 <el-table-column label="环节名称" prop="name" minWidth="100" align="center" />
67 <el-table-column label="办理人" prop="agent" minWidth="120" align="center" /> 67 <el-table-column label="办理人" prop="agent" minWidth="120" align="center" />
68 <el-table-column label="处理时间" prop="createTime" width="160" align="center" /> 68 <el-table-column label="处理时间" prop="createTime" width="160" align="center" />
69 <el-table-column label="办结时间" prop="finishTime" width="160" align="center" /> 69 <el-table-column label="办结时间" prop="finishTime" width="160" align="center" />
...@@ -76,7 +76,6 @@ ...@@ -76,7 +76,6 @@
76 <script> 76 <script>
77 import '@/styles/package/theme/index.scss' 77 import '@/styles/package/theme/index.scss'
78 import BpmnViewer from 'bpmn-js/lib/Viewer' 78 import BpmnViewer from 'bpmn-js/lib/Viewer'
79 import { getusername } from "@/api/getusername.js";
80 import MoveCanvasModule from 'diagram-js/lib/navigation/movecanvas' 79 import MoveCanvasModule from 'diagram-js/lib/navigation/movecanvas'
81 export default { 80 export default {
82 props: { 81 props: {
...@@ -107,7 +106,6 @@ ...@@ -107,7 +106,6 @@
107 } 106 }
108 }, 107 },
109 created () { 108 created () {
110
111 this.$nextTick(() => { 109 this.$nextTick(() => {
112 // 获取流程记录 110 // 获取流程记录
113 this.getCommentList() 111 this.getCommentList()
...@@ -177,18 +175,18 @@ ...@@ -177,18 +175,18 @@
177 this.dlgTitle = element.businessObject ? element.businessObject.name : undefined 175 this.dlgTitle = element.businessObject ? element.businessObject.name : undefined
178 // 计算当前悬浮任务审批记录，如果记录为空不显示弹窗 176 // 计算当前悬浮任务审批记录，如果记录为空不显示弹窗
179 this.taskCommentList = (this.taskList || []).filter(item => { 177 this.taskCommentList = (this.taskList || []).filter(item => {
180 return item.taskDefKey === this.selectTaskId 178 return item.taskDefinitionKey === this.selectTaskId
181 }) 179 })
182 if (this.selectTaskId.length > 3) { 180 if (this.taskCommentList.length==0) {
183 this.taskCommentList = this.taskList; 181 this.taskCommentList = this.taskList;
184 } 182 }
185 }, 183 },
186 // 下拉列表切换 184 // 下拉列表切换
187 handleSelect (val) { 185 handleSelect (val) {
188 this.taskCommentList = (this.taskList || []).filter(item => { 186 this.taskCommentList = (this.taskList || []).filter(item => {
189 return item.taskDefKey === val 187 return item.taskDefinitionKey === val
190 }) 188 })
191 if (val.length > 3) { 189 if (this.taskCommentList.length==0) {
192 this.taskCommentList = this.taskList; 190 this.taskCommentList = this.taskList;
193 } 191 }
194 }, 192 },
...@@ -239,32 +237,13 @@ ...@@ -239,32 +237,13 @@
239 // 获取流程记录 237 // 获取流程记录
240 getCommentList() { 238 getCommentList() {
241 this.formData.allCommentList.forEach(async (item,index) => { 239 this.formData.allCommentList.forEach(async (item,index) => {
242 var arr=item.assigneeName.split(","); 240 this.formData.allCommentList[index].agent=item.assignee.name
243 // 获取用户名
244 let res = await getusername(arr)
245 if(res){
246 let str=""
247 res.data.content.forEach((el,i) => {
248 if(str==""){
249 str=el.name;
250 }else{
251 str += ","+el.name;
252
253 }
254 this.formData.allCommentList[index].agent=str
255 })
256 }
257
258 }) 241 })
259 setTimeout(() => { 242 setTimeout(() => {
260 this.taskList =this.formData.allCommentList; 243 this.taskList =this.formData.allCommentList;
261 // 处理数据之后赋值 244 // 处理数据之后赋值
262 this.taskCommentList=this.taskList 245 this.taskCommentList=this.taskList
263 }, 100) 246 }, 100)
264 // this.$nextTick(() => {
265 // this.taskList =this.formData.allCommentList;
266 // this.taskCommentList=this.taskList
267 // })
268 }, 247 },
269 248
270 // 设置流程图元素状态 249 // 设置流程图元素状态
......
...@@ -71,12 +71,12 @@ export default { ...@@ -71,12 +71,12 @@ export default {
71 this.$popupDialog("流程图", "workflow/components/processViewer", { 71 this.$popupDialog("流程图", "workflow/components/processViewer", {
72 xml: result.xml, 72 xml: result.xml,
73 finishedInfo: { 73 finishedInfo: {
74 finishedTaskSet: result.finishedTaskSet, 74 finishedTaskSet: result.finishedActivityIds,
75 unfinishedTaskSet: result.unfinishedTaskSet, 75 unfinishedTaskSet: result.runningActivityIds,
76 rejectedTaskSet: result.rejectedTaskSet, 76 rejectedTaskSet: {},
77 finishedSequenceFlowSet: result.finishedSequenceFlowSet 77 finishedSequenceFlowSet: result.finishedSequenceFlowIds
78 }, 78 },
79 allCommentList: result.historyTaskList 79 allCommentList: result.finishedTasks
80 }, '80%', true) 80 }, '80%', true)
81 }) 81 })
82 break; 82 break;
......