Merge branch 'dev'
Showing
19 changed files
with
105 additions
and
116 deletions
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(); | ... | ... |
... | @@ -10,8 +10,7 @@ | ... | @@ -10,8 +10,7 @@ |
10 | v-show="!isLoading" | 10 | v-show="!isLoading" |
11 | ref="processCanvas" | 11 | ref="processCanvas" |
12 | class="process-canvas" | 12 | class="process-canvas" |
13 | style="height: 280px" | 13 | style="height: 280px" /> |
14 | /> | ||
15 | <!-- 自定义箭头样式,用于成功状态下流程连线箭头 --> | 14 | <!-- 自定义箭头样式,用于成功状态下流程连线箭头 --> |
16 | <defs ref="customSuccessDefs"> | 15 | <defs ref="customSuccessDefs"> |
17 | <marker | 16 | <marker |
... | @@ -21,8 +20,7 @@ | ... | @@ -21,8 +20,7 @@ |
21 | ref-y="10" | 20 | ref-y="10" |
22 | marker-width="10" | 21 | marker-width="10" |
23 | marker-height="10" | 22 | marker-height="10" |
24 | orient="auto" | 23 | orient="auto"> |
25 | > | ||
26 | <path | 24 | <path |
27 | class="success-arrow" | 25 | class="success-arrow" |
28 | d="M 1 5 L 11 10 L 1 15 Z" | 26 | d="M 1 5 L 11 10 L 1 15 Z" |
... | @@ -30,8 +28,7 @@ | ... | @@ -30,8 +28,7 @@ |
30 | stroke-width: 1px; | 28 | stroke-width: 1px; |
31 | stroke-linecap: round; | 29 | stroke-linecap: round; |
32 | stroke-dasharray: 10000, 1; | 30 | stroke-dasharray: 10000, 1; |
33 | " | 31 | " /> |
34 | /> | ||
35 | </marker> | 32 | </marker> |
36 | <marker | 33 | <marker |
37 | id="conditional-flow-marker-white-success" | 34 | id="conditional-flow-marker-white-success" |
... | @@ -40,8 +37,7 @@ | ... | @@ -40,8 +37,7 @@ |
40 | ref-y="10" | 37 | ref-y="10" |
41 | marker-width="10" | 38 | marker-width="10" |
42 | marker-height="10" | 39 | marker-height="10" |
43 | orient="auto" | 40 | orient="auto"> |
44 | > | ||
45 | <path | 41 | <path |
46 | class="success-conditional" | 42 | class="success-conditional" |
47 | d="M 0 10 L 8 6 L 16 10 L 8 14 Z" | 43 | d="M 0 10 L 8 6 L 16 10 L 8 14 Z" |
... | @@ -49,8 +45,7 @@ | ... | @@ -49,8 +45,7 @@ |
49 | stroke-width: 1px; | 45 | stroke-width: 1px; |
50 | stroke-linecap: round; | 46 | stroke-linecap: round; |
51 | stroke-dasharray: 10000, 1; | 47 | stroke-dasharray: 10000, 1; |
52 | " | 48 | " /> |
53 | /> | ||
54 | </marker> | 49 | </marker> |
55 | </defs> | 50 | </defs> |
56 | <!-- 自定义箭头样式,用于失败状态下流程连线箭头 --> | 51 | <!-- 自定义箭头样式,用于失败状态下流程连线箭头 --> |
... | @@ -62,8 +57,7 @@ | ... | @@ -62,8 +57,7 @@ |
62 | ref-y="10" | 57 | ref-y="10" |
63 | marker-width="10" | 58 | marker-width="10" |
64 | marker-height="10" | 59 | marker-height="10" |
65 | orient="auto" | 60 | orient="auto"> |
66 | > | ||
67 | <path | 61 | <path |
68 | class="fail-arrow" | 62 | class="fail-arrow" |
69 | d="M 1 5 L 11 10 L 1 15 Z" | 63 | d="M 1 5 L 11 10 L 1 15 Z" |
... | @@ -71,8 +65,7 @@ | ... | @@ -71,8 +65,7 @@ |
71 | stroke-width: 1px; | 65 | stroke-width: 1px; |
72 | stroke-linecap: round; | 66 | stroke-linecap: round; |
73 | stroke-dasharray: 10000, 1; | 67 | stroke-dasharray: 10000, 1; |
74 | " | 68 | " /> |
75 | /> | ||
76 | </marker> | 69 | </marker> |
77 | <marker | 70 | <marker |
78 | id="conditional-flow-marker-white-fail" | 71 | id="conditional-flow-marker-white-fail" |
... | @@ -81,8 +74,7 @@ | ... | @@ -81,8 +74,7 @@ |
81 | ref-y="10" | 74 | ref-y="10" |
82 | marker-width="10" | 75 | marker-width="10" |
83 | marker-height="10" | 76 | marker-height="10" |
84 | orient="auto" | 77 | orient="auto"> |
85 | > | ||
86 | <path | 78 | <path |
87 | class="fail-conditional" | 79 | class="fail-conditional" |
88 | d="M 0 10 L 8 6 L 16 10 L 8 14 Z" | 80 | d="M 0 10 L 8 6 L 16 10 L 8 14 Z" |
... | @@ -90,8 +82,7 @@ | ... | @@ -90,8 +82,7 @@ |
90 | stroke-width: 1px; | 82 | stroke-width: 1px; |
91 | stroke-linecap: round; | 83 | stroke-linecap: round; |
92 | stroke-dasharray: 10000, 1; | 84 | stroke-dasharray: 10000, 1; |
93 | " | 85 | " /> |
94 | /> | ||
95 | </marker> | 86 | </marker> |
96 | </defs> | 87 | </defs> |
97 | 88 | ||
... | @@ -104,8 +95,7 @@ | ... | @@ -104,8 +95,7 @@ |
104 | :plain="true" | 95 | :plain="true" |
105 | :disabled="defaultZoom <= 0.3" | 96 | :disabled="defaultZoom <= 0.3" |
106 | icon="el-icon-zoom-out" | 97 | icon="el-icon-zoom-out" |
107 | @click="processZoomOut()" | 98 | @click="processZoomOut()" /> |
108 | /> | ||
109 | <el-button size="medium" type="default" style="width: 90px">{{ | 99 | <el-button size="medium" type="default" style="width: 90px">{{ |
110 | Math.floor(this.defaultZoom * 10 * 10) + "%" | 100 | Math.floor(this.defaultZoom * 10 * 10) + "%" |
111 | }}</el-button> | 101 | }}</el-button> |
... | @@ -115,14 +105,12 @@ | ... | @@ -115,14 +105,12 @@ |
115 | :plain="true" | 105 | :plain="true" |
116 | :disabled="defaultZoom >= 3.9" | 106 | :disabled="defaultZoom >= 3.9" |
117 | icon="el-icon-zoom-in" | 107 | icon="el-icon-zoom-in" |
118 | @click="processZoomIn()" | 108 | @click="processZoomIn()" /> |
119 | /> | ||
120 | <el-button | 109 | <el-button |
121 | size="medium" | 110 | size="medium" |
122 | type="default" | 111 | type="default" |
123 | icon="el-icon-c-scale-to-original" | 112 | icon="el-icon-c-scale-to-original" |
124 | @click="processReZoom()" | 113 | @click="processReZoom()" /> |
125 | /> | ||
126 | <slot /> | 114 | <slot /> |
127 | </el-button-group> | 115 | </el-button-group> |
128 | </el-row> | 116 | </el-row> |
... | @@ -135,8 +123,7 @@ | ... | @@ -135,8 +123,7 @@ |
135 | v-for="item in selectOptions" | 123 | v-for="item in selectOptions" |
136 | :key="item.value" | 124 | :key="item.value" |
137 | :label="item.label" | 125 | :label="item.label" |
138 | :value="item.value" | 126 | :value="item.value"> |
139 | > | ||
140 | </el-option> | 127 | </el-option> |
141 | </el-select> | 128 | </el-select> |
142 | <el-table | 129 | <el-table |
... | @@ -144,15 +131,13 @@ | ... | @@ -144,15 +131,13 @@ |
144 | :data="taskCommentList" | 131 | :data="taskCommentList" |
145 | size="mini" | 132 | size="mini" |
146 | border | 133 | border |
147 | header-cell-class-name="table-header-gray" | 134 | header-cell-class-name="table-header-gray"> |
148 | > | ||
149 | <el-table-column | 135 | <el-table-column |
150 | label="序号" | 136 | label="序号" |
151 | header-align="center" | 137 | header-align="center" |
152 | align="center" | 138 | align="center" |
153 | type="index" | 139 | type="index" |
154 | width="55px" | 140 | width="55px" /> |
155 | /> | ||
156 | <el-table-column label="流程状态" header-align="center" align="center"> | 141 | <el-table-column label="流程状态" header-align="center" align="center"> |
157 | <template slot-scope="scope"> | 142 | <template slot-scope="scope"> |
158 | <div v-if="scope.row.endTime">已完结</div> | 143 | <div v-if="scope.row.endTime">已完结</div> |
... | @@ -163,35 +148,30 @@ | ... | @@ -163,35 +148,30 @@ |
163 | label="环节名称" | 148 | label="环节名称" |
164 | prop="name" | 149 | prop="name" |
165 | minWidth="100" | 150 | minWidth="100" |
166 | align="center" | 151 | align="center" /> |
167 | /> | ||
168 | <el-table-column | 152 | <el-table-column |
169 | label="办理人" | 153 | label="办理人" |
170 | prop="agent" | 154 | prop="agent" |
171 | minWidth="120" | 155 | minWidth="120" |
172 | align="center" | 156 | align="center" /> |
173 | /> | ||
174 | <el-table-column | 157 | <el-table-column |
175 | label="转入时间" | 158 | label="转入时间" |
176 | prop="createTime" | 159 | prop="createTime" |
177 | :formatter="formatDate" | 160 | :formatter="formatDate" |
178 | width="160" | 161 | width="160" |
179 | align="center" | 162 | align="center" /> |
180 | /> | ||
181 | <el-table-column | 163 | <el-table-column |
182 | label="认领时间" | 164 | label="认领时间" |
183 | prop="claimTime" | 165 | prop="claimTime" |
184 | :formatter="formatDate" | 166 | :formatter="formatDate" |
185 | width="160" | 167 | width="160" |
186 | align="center" | 168 | align="center" /> |
187 | /> | ||
188 | <el-table-column | 169 | <el-table-column |
189 | label="转出时间" | 170 | label="转出时间" |
190 | prop="endTime" | 171 | prop="endTime" |
191 | :formatter="formatDate" | 172 | :formatter="formatDate" |
192 | width="160" | 173 | width="160" |
193 | align="center" | 174 | align="center" /> |
194 | /> | ||
195 | <el-table-column label="操作方式" prop="controls" align="center" /> | 175 | <el-table-column label="操作方式" prop="controls" align="center" /> |
196 | <el-table-column label="意见" prop="idea" align="center" /> | 176 | <el-table-column label="意见" prop="idea" align="center" /> |
197 | </el-table> | 177 | </el-table> |
... | @@ -199,17 +179,17 @@ | ... | @@ -199,17 +179,17 @@ |
199 | </div> | 179 | </div> |
200 | </template> | 180 | </template> |
201 | <script> | 181 | <script> |
202 | import "@/styles/package/theme/index.scss"; | 182 | import "@/styles/package/theme/index.scss"; |
203 | import BpmnViewer from "bpmn-js/lib/Viewer"; | 183 | import BpmnViewer from "bpmn-js/lib/Viewer"; |
204 | import MoveCanvasModule from "diagram-js/lib/navigation/movecanvas"; | 184 | import MoveCanvasModule from "diagram-js/lib/navigation/movecanvas"; |
205 | export default { | 185 | export default { |
206 | props: { | 186 | props: { |
207 | formData: { | 187 | formData: { |
208 | type: Object, | 188 | type: Object, |
209 | default: {}, | 189 | default: {}, |
210 | }, | 190 | }, |
211 | }, | 191 | }, |
212 | data() { | 192 | data () { |
213 | return { | 193 | return { |
214 | dlgTitle: undefined, | 194 | dlgTitle: undefined, |
215 | defaultZoom: 1, | 195 | defaultZoom: 1, |
... | @@ -230,7 +210,7 @@ export default { | ... | @@ -230,7 +210,7 @@ export default { |
230 | selectOptions: [], | 210 | selectOptions: [], |
231 | }; | 211 | }; |
232 | }, | 212 | }, |
233 | created() { | 213 | created () { |
234 | this.$nextTick(() => { | 214 | this.$nextTick(() => { |
235 | // 获取流程记录 | 215 | // 获取流程记录 |
236 | this.getCommentList(); | 216 | this.getCommentList(); |
... | @@ -238,7 +218,7 @@ export default { | ... | @@ -238,7 +218,7 @@ export default { |
238 | this.importXML(this.formData.xml); | 218 | this.importXML(this.formData.xml); |
239 | }); | 219 | }); |
240 | }, | 220 | }, |
241 | destroyed() { | 221 | destroyed () { |
242 | this.clearViewer(); | 222 | this.clearViewer(); |
243 | }, | 223 | }, |
244 | methods: { | 224 | methods: { |
... | @@ -248,7 +228,7 @@ export default { | ... | @@ -248,7 +228,7 @@ export default { |
248 | * @param {*} column | 228 | * @param {*} column |
249 | * @author: renchao | 229 | * @author: renchao |
250 | */ | 230 | */ |
251 | formatDate(row, column) { | 231 | formatDate (row, column) { |
252 | let data = row[column.property]; | 232 | let data = row[column.property]; |
253 | if (data == null) { | 233 | if (data == null) { |
254 | return null; | 234 | return null; |
... | @@ -272,7 +252,7 @@ export default { | ... | @@ -272,7 +252,7 @@ export default { |
272 | * @description: processReZoom | 252 | * @description: processReZoom |
273 | * @author: renchao | 253 | * @author: renchao |
274 | */ | 254 | */ |
275 | processReZoom() { | 255 | processReZoom () { |
276 | this.defaultZoom = 1; | 256 | this.defaultZoom = 1; |
277 | this.bpmnViewer.get("canvas").zoom("fit-viewport", "auto"); | 257 | this.bpmnViewer.get("canvas").zoom("fit-viewport", "auto"); |
278 | }, | 258 | }, |
... | @@ -281,7 +261,7 @@ export default { | ... | @@ -281,7 +261,7 @@ export default { |
281 | * @param {*} zoomStep | 261 | * @param {*} zoomStep |
282 | * @author: renchao | 262 | * @author: renchao |
283 | */ | 263 | */ |
284 | processZoomIn(zoomStep = 0.1) { | 264 | processZoomIn (zoomStep = 0.1) { |
285 | const newZoom = Math.floor(this.defaultZoom * 100 + zoomStep * 100) / 100; | 265 | const newZoom = Math.floor(this.defaultZoom * 100 + zoomStep * 100) / 100; |
286 | if (newZoom > 4) { | 266 | if (newZoom > 4) { |
287 | throw new Error( | 267 | throw new Error( |
... | @@ -296,7 +276,7 @@ export default { | ... | @@ -296,7 +276,7 @@ export default { |
296 | * @param {*} zoomStep | 276 | * @param {*} zoomStep |
297 | * @author: renchao | 277 | * @author: renchao |
298 | */ | 278 | */ |
299 | processZoomOut(zoomStep = 0.1) { | 279 | processZoomOut (zoomStep = 0.1) { |
300 | const newZoom = Math.floor(this.defaultZoom * 100 - zoomStep * 100) / 100; | 280 | const newZoom = Math.floor(this.defaultZoom * 100 - zoomStep * 100) / 100; |
301 | if (newZoom < 0.2) { | 281 | if (newZoom < 0.2) { |
302 | throw new Error( | 282 | throw new Error( |
... | @@ -311,7 +291,7 @@ export default { | ... | @@ -311,7 +291,7 @@ export default { |
311 | * @param {*} type | 291 | * @param {*} type |
312 | * @author: renchao | 292 | * @author: renchao |
313 | */ | 293 | */ |
314 | getOperationTagType(type) { | 294 | getOperationTagType (type) { |
315 | return "success"; | 295 | return "success"; |
316 | }, | 296 | }, |
317 | // 流程图预览清空 | 297 | // 流程图预览清空 |
... | @@ -320,7 +300,7 @@ export default { | ... | @@ -320,7 +300,7 @@ export default { |
320 | * @param {*} e | 300 | * @param {*} e |
321 | * @author: renchao | 301 | * @author: renchao |
322 | */ | 302 | */ |
323 | clearViewer(a) { | 303 | clearViewer (a) { |
324 | if (this.$refs.processCanvas) { | 304 | if (this.$refs.processCanvas) { |
325 | this.$refs.processCanvas.innerHTML = ""; | 305 | this.$refs.processCanvas.innerHTML = ""; |
326 | } | 306 | } |
... | @@ -334,7 +314,7 @@ export default { | ... | @@ -334,7 +314,7 @@ export default { |
334 | * @description: 添加自定义箭头 | 314 | * @description: 添加自定义箭头 |
335 | * @author: renchao | 315 | * @author: renchao |
336 | */ | 316 | */ |
337 | addCustomDefs() { | 317 | addCustomDefs () { |
338 | const canvas = this.bpmnViewer.get("canvas"); | 318 | const canvas = this.bpmnViewer.get("canvas"); |
339 | const svg = canvas._svg; | 319 | const svg = canvas._svg; |
340 | const customSuccessDefs = this.$refs.customSuccessDefs; | 320 | const customSuccessDefs = this.$refs.customSuccessDefs; |
... | @@ -348,7 +328,7 @@ export default { | ... | @@ -348,7 +328,7 @@ export default { |
348 | * @param {*} element | 328 | * @param {*} element |
349 | * @author: renchao | 329 | * @author: renchao |
350 | */ | 330 | */ |
351 | onSelectElement(element) { | 331 | onSelectElement (element) { |
352 | this.selectTaskId = undefined; | 332 | this.selectTaskId = undefined; |
353 | this.dlgTitle = undefined; | 333 | this.dlgTitle = undefined; |
354 | let allfinishedTaskSet = [ | 334 | let allfinishedTaskSet = [ |
... | @@ -378,7 +358,7 @@ export default { | ... | @@ -378,7 +358,7 @@ export default { |
378 | * @param {*} val | 358 | * @param {*} val |
379 | * @author: renchao | 359 | * @author: renchao |
380 | */ | 360 | */ |
381 | handleSelect(val) { | 361 | handleSelect (val) { |
382 | this.taskCommentList = (this.taskList || []).filter((item) => { | 362 | this.taskCommentList = (this.taskList || []).filter((item) => { |
383 | return item.taskDefinitionKey === val; | 363 | return item.taskDefinitionKey === val; |
384 | }); | 364 | }); |
... | @@ -392,7 +372,7 @@ export default { | ... | @@ -392,7 +372,7 @@ export default { |
392 | * @param {*} xml | 372 | * @param {*} xml |
393 | * @author: renchao | 373 | * @author: renchao |
394 | */ | 374 | */ |
395 | async importXML(xml) { | 375 | async importXML (xml) { |
396 | let xmlData = this.$x2js.xml2js(xml).definitions.process; | 376 | let xmlData = this.$x2js.xml2js(xml).definitions.process; |
397 | this.selectOptions = xmlData.userTask.map((item) => { | 377 | this.selectOptions = xmlData.userTask.map((item) => { |
398 | return { value: item._id, label: item._name }; | 378 | return { value: item._id, label: item._name }; |
... | @@ -447,7 +427,7 @@ export default { | ... | @@ -447,7 +427,7 @@ export default { |
447 | * @description: 获取流程记录 | 427 | * @description: 获取流程记录 |
448 | * @author: renchao | 428 | * @author: renchao |
449 | */ | 429 | */ |
450 | getCommentList() { | 430 | getCommentList () { |
451 | this.formData.allCommentList.forEach(async (item, index) => { | 431 | this.formData.allCommentList.forEach(async (item, index) => { |
452 | // item.comments.forEach(element => { | 432 | // item.comments.forEach(element => { |
453 | // if(element.type=="COMPLETE"){ | 433 | // if(element.type=="COMPLETE"){ |
... | @@ -513,7 +493,7 @@ export default { | ... | @@ -513,7 +493,7 @@ export default { |
513 | * @param {*} processNodeInfo | 493 | * @param {*} processNodeInfo |
514 | * @author: renchao | 494 | * @author: renchao |
515 | */ | 495 | */ |
516 | setProcessStatus(processNodeInfo) { | 496 | setProcessStatus (processNodeInfo) { |
517 | this.processNodeInfo = processNodeInfo; | 497 | this.processNodeInfo = processNodeInfo; |
518 | if ( | 498 | if ( |
519 | this.isLoading || | 499 | this.isLoading || |
... | @@ -562,10 +542,10 @@ export default { | ... | @@ -562,10 +542,10 @@ export default { |
562 | } | 542 | } |
563 | }, | 543 | }, |
564 | }, | 544 | }, |
565 | }; | 545 | }; |
566 | </script> | 546 | </script> |
567 | <style scoped lang="scss"> | 547 | <style scoped lang="scss"> |
568 | .information-list { | 548 | .information-list { |
569 | height: 220px; | 549 | height: 220px; |
570 | margin-top: 10px; | 550 | margin-top: 10px; |
571 | 551 | ||
... | @@ -573,12 +553,12 @@ export default { | ... | @@ -573,12 +553,12 @@ export default { |
573 | font-size: 16px; | 553 | font-size: 16px; |
574 | line-height: 24px; | 554 | line-height: 24px; |
575 | } | 555 | } |
576 | } | 556 | } |
577 | /deep/.bjs-powered-by { | 557 | /deep/.bjs-powered-by { |
578 | display: none; | 558 | display: none; |
579 | } | 559 | } |
580 | // /deep/.information-list { | 560 | // /deep/.information-list { |
581 | // height: 170px; | 561 | // height: 170px; |
582 | // overflow: visible; | 562 | // overflow: visible; |
583 | // } | 563 | // } |
584 | </style> | 564 | </style> | ... | ... |
... | @@ -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({ | ... | ... |
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 | } | ... | ... |
-
Please register or sign in to post a comment