Skip to content

bdc / bdcdj-web

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

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

2 parents 3aac49e3 48b69ebe
Inline Side-by-side
Showing 6 changed files with 220 additions and 252 deletions
...@@ -4,82 +4,109 @@ ...@@ -4,82 +4,109 @@
4 * @LastEditTime: 2023-05-17 10:42:01 4 * @LastEditTime: 2023-05-17 10:42:01
5 --> 5 -->
6 <template> 6 <template>
7 <dialogBox title="转出" @submitForm="submitForm" saveButton="确认转出" width="45%" height='30%' @closeDialog="closeDialog" 7 <div class="from-clues">
8 v-model="value"> 8 <!-- 表单部分 -->
9 <div class="from-clues"> 9 <div class="from-clues-header">
10 <!-- 表单部分 --> 10 <el-form ref="queryForm" label-width="180px" v-if="this.formData.obj">
11 <div class="from-clues-header"> 11 <el-form-item label="下一环节名称:">
12 <el-form :model="queryForm" ref="queryForm" label-width="120px"> 12 {{ this.formData.obj.taskName }}
13 <el-form-item label="下一环节名称:"> 13 </el-form-item>
14 {{this.tableData.taskName}} 14 <el-form-item label="下一环节办理人:">
15 </el-form-item> 15 {{ this.formData.obj.usernames.join("，") }}
16 <el-form-item label="下一环节办理人:"> 16 </el-form-item>
17 {{this.usernames}} 17 </el-form>
18 </el-form-item> 18 <el-form ref="queryForm" label-width="180px" v-else>
19 19 <el-form-item label="">
20 </el-form> 20 此环节为流程最后环节，转出后流程将结束
21 </div> 21 </el-form-item>
22 </el-form>
23 <div class="invalid-reson">转出原因：</div>
24 <el-input
25 v-model="shyj"
26 placeholder="请输入转出原因"
27 type="textarea"
28 :rows="4"
29 ></el-input>
30 <el-button style="float: right" @click="cancelBack">取消转出</el-button>
31 <el-button type="primary" @click="submitForm" style="float: right"
32 >确定转出</el-button
33 >
22 </div> 34 </div>
23 </dialogBox> 35 </div>
24 </template> 36 </template>
25 37
26 <script> 38 <script>
27 import { completeTask, getNextLinkInfo } from "@/api/workFlow.js" 39 import { completeTask, getNextLinkInfo } from "@/api/workFlow.js";
28 export default { 40 import { popupCacel } from "@/utils/popup.js";
29 components: { 41 export default {
42 components: {},
43 props: {
44 formData: {
45 type: Object,
46 default: {},
30 }, 47 },
31 props: { 48 },
32 value: { type: Boolean, default: false }, 49 data() {
33 queryForm: { type: Object, default: false } 50 return {
51 queryForm: {},
52 shyj: "",
53 };
54 },
55 mounted() {
56 // this.queryForm= this.queryForm.obj
57 console.log("formDataformDataformData", this.formData);
58 },
59 methods: {
60 /**
61 * @description: submitForm
62 * @author: renchao
63 */
64 submitForm() {
65 this.queryForm = {
66 bsmSlsq: this.formData.bsmSlsq,
67 shyj: this.shyj,
68 stepform: JSON.stringify(this.formData.tabList),
69 };
70 console.log("this.queryForm", this.queryForm);
71 completeTask(this.queryForm).then((res) => {
72 if (res.code === 200) {
73 this.$message.success("转件成功");
74 // setTimeout(() => {
75 // window.opener = null;
76 // window.open("about:blank", "_self");
77 // window.close();
78 // this.$emit("input", false);
79 // }, 1000);
80 popupCacel();
81 setTimeout(() => {
82 // window.opener.location.reload(); //刷新父窗口
83 if (window.opener && window.opener.getBpageList) {
84 window.opener.getBpageList();
85 } else {
86 window.opener.frames[0].getBpageList();
87 }
88 window.close();
89 this.$emit("input", false);
90 }, 1000);
91 }else{
92 this.$message.error(res.message);
93 }
94 });
34 }, 95 },
35 data () { 96 /**
36 return { 97 * @description: closeDialog
37 tableData: {}, 98 * @author: renchao
38 usernames: '', 99 */
39 } 100 cancelBack() {
101 popupCacel();
40 }, 102 },
41 methods: { 103 },
42 /** 104 };
43 * @description: tablelistFn
44 * @author: renchao
45 */
46 tablelistFn () {
47 getNextLinkInfo(this.queryForm).then(res => {
48 if (res.code === 200) {
49 this.tableData = res.result
50 if (res.result.usernames) {
51 this.usernames = String(res.result.usernames)
52 }
53 }
54 })
55 },
56 /**
57 * @description: submitForm
58 * @author: renchao
59 */
60 submitForm () {
61 completeTask(this.queryForm).then(res => {
62 if (res.code === 200) {
63 this.$message.success('转件成功')
64 setTimeout(() => {
65 window.opener = null;
66 window.open("about:blank", "_self");
67 window.close();
68 this.$emit('input', false)
69 }, 1000);
70 }
71 })
72 },
73 /**
74 * @description: closeDialog
75 * @author: renchao
76 */
77 closeDialog () {
78 this.$emit("input", false);
79 },
80 }
81 }
82 </script> 105 </script>
83 <style scoped lang="scss"> 106 <style scoped lang="scss">
84 @import "~@/styles/mixin.scss"; 107 @import "~@/styles/mixin.scss";
108 .el-button {
109 margin-top: 20px;
110 margin-right: 10px;
111 }
85 </style> 112 </style>
......
...@@ -403,7 +403,7 @@ export default { ...@@ -403,7 +403,7 @@ export default {
403 djjgrules: [{ required: true, message: "登记机构", trigger: "blur" }], 403 djjgrules: [{ required: true, message: "登记机构", trigger: "blur" }],
404 dbrrules: [{ required: true, message: "登簿人", trigger: "blur" }], 404 dbrrules: [{ required: true, message: "登簿人", trigger: "blur" }],
405 djsjrules: [{ required: true, message: "登记时间", trigger: "blur" }], 405 djsjrules: [{ required: true, message: "登记时间", trigger: "blur" }],
406 djlxrules: [{ required: true, message: "登记类型", trigger: "blur" }], 406 djlxrules: [{ required: true, message: "登记类型", trigger: "change" }],
407 }, 407 },
408 }; 408 };
409 }, 409 },
......
...@@ -325,18 +325,25 @@ export default { ...@@ -325,18 +325,25 @@ export default {
325 * @author: renchao 325 * @author: renchao
326 */ 326 */
327 sendToNext (obj) { 327 sendToNext (obj) {
328 this.$popupDialog("转出", "workflow/components/zc", { 328 this.$popupDialog("转出", "djbworkflow/components/zc", {
329 obj:obj,
329 bsmSlsq: this.bsmSlsq, 330 bsmSlsq: this.bsmSlsq,
330 bestepid: this.bestepid 331 tabList: this.tabList
331 }, '800px', true) 332 }, '800px', true)
332 }, 333 },
334 //转出最后一个流程
333 /** 335 /**
334 * @description: sendToEnd 336 * @description: 转出最后一个流程
335 * @author: renchao 337 * @author: renchao
336 */ 338 */
337 sendToEnd () { 339 sendToEnd () {
338 340 this.$popupDialog("转出", "djbworkflow/components/zc", {
341 obj:"",
342 bsmSlsq: this.bsmSlsq,
343 tabList: this.tabList
344 }, '800px', true)
339 }, 345 },
346
340 //批量操作 347 //批量操作
341 /** 348 /**
342 * @description: 批量操作 349 * @description: 批量操作
......
...@@ -154,18 +154,10 @@ ...@@ -154,18 +154,10 @@
154 } 154 }
155 }) 155 })
156 } 156 }
157
158
159
160 }); 157 });
161
162
163
164
165 }); 158 });
166 } 159 }
167 }, 160 },
168
169 // 获取右侧选项卡 161 // 获取右侧选项卡
170 /** 162 /**
171 * @description: 获取右侧选项卡 163 * @description: 获取右侧选项卡
......
...@@ -4,82 +4,109 @@ ...@@ -4,82 +4,109 @@
4 * @LastEditTime: 2023-05-17 10:42:01 4 * @LastEditTime: 2023-05-17 10:42:01
5 --> 5 -->
6 <template> 6 <template>
7 <dialogBox title="转出" @submitForm="submitForm" saveButton="确认转出" width="45%" height='30%' @closeDialog="closeDialog" 7 <div class="from-clues">
8 v-model="value"> 8 <!-- 表单部分 -->
9 <div class="from-clues"> 9 <div class="from-clues-header">
10 <!-- 表单部分 --> 10 <el-form ref="queryForm" label-width="180px" v-if="this.formData.obj">
11 <div class="from-clues-header"> 11 <el-form-item label="下一环节名称:">
12 <el-form :model="queryForm" ref="queryForm" label-width="120px"> 12 {{ this.formData.obj.taskName }}
13 <el-form-item label="下一环节名称:"> 13 </el-form-item>
14 {{this.tableData.taskName}} 14 <el-form-item label="下一环节办理人:">
15 </el-form-item> 15 {{ this.formData.obj.usernames.join("，") }}
16 <el-form-item label="下一环节办理人:"> 16 </el-form-item>
17 {{this.usernames}} 17 </el-form>
18 </el-form-item> 18 <el-form ref="queryForm" label-width="180px" v-else>
19 19 <el-form-item label="">
20 </el-form> 20 此环节为流程最后环节，转出后流程将结束
21 </div> 21 </el-form-item>
22 </el-form>
23 <div class="invalid-reson">转出原因：</div>
24 <el-input
25 v-model="shyj"
26 placeholder="请输入转出原因"
27 type="textarea"
28 :rows="4"
29 ></el-input>
30 <el-button style="float: right" @click="cancelBack">取消转出</el-button>
31 <el-button type="primary" @click="submitForm" style="float: right"
32 >确定转出</el-button
33 >
22 </div> 34 </div>
23 </dialogBox> 35 </div>
24 </template> 36 </template>
25 37
26 <script> 38 <script>
27 import { completeTask, getNextLinkInfo } from "@/api/workFlow.js" 39 import { completeTask, getNextLinkInfo } from "@/api/workFlow.js";
28 export default { 40 import { popupCacel } from "@/utils/popup.js";
29 components: { 41 export default {
42 components: {},
43 props: {
44 formData: {
45 type: Object,
46 default: {},
30 }, 47 },
31 props: { 48 },
32 value: { type: Boolean, default: false }, 49 data() {
33 queryForm: { type: Object, default: false } 50 return {
51 queryForm: {},
52 shyj: "",
53 };
54 },
55 mounted() {
56 // this.queryForm= this.queryForm.obj
57 console.log("formDataformDataformData", this.formData);
58 },
59 methods: {
60 /**
61 * @description: submitForm
62 * @author: renchao
63 */
64 submitForm() {
65 this.queryForm = {
66 bsmSlsq: this.formData.bsmSlsq,
67 shyj: this.shyj,
68 stepform: JSON.stringify(this.formData.tabList),
69 };
70 console.log("this.queryForm", this.queryForm);
71 completeTask(this.queryForm).then((res) => {
72 if (res.code === 200) {
73 this.$message.success("转件成功");
74 // setTimeout(() => {
75 // window.opener = null;
76 // window.open("about:blank", "_self");
77 // window.close();
78 // this.$emit("input", false);
79 // }, 1000);
80 popupCacel();
81 setTimeout(() => {
82 // window.opener.location.reload(); //刷新父窗口
83 if (window.opener && window.opener.getBpageList) {
84 window.opener.getBpageList();
85 } else {
86 window.opener.frames[0].getBpageList();
87 }
88 window.close();
89 this.$emit("input", false);
90 }, 1000);
91 }else{
92 this.$message.error(res.message);
93 }
94 });
34 }, 95 },
35 data () { 96 /**
36 return { 97 * @description: closeDialog
37 tableData: {}, 98 * @author: renchao
38 usernames: '', 99 */
39 } 100 cancelBack() {
101 popupCacel();
40 }, 102 },
41 methods: { 103 },
42 /** 104 };
43 * @description: tablelistFn
44 * @author: renchao
45 */
46 tablelistFn () {
47 getNextLinkInfo(this.queryForm).then(res => {
48 if (res.code === 200) {
49 this.tableData = res.result
50 if (res.result.usernames) {
51 this.usernames = String(res.result.usernames)
52 }
53 }
54 })
55 },
56 /**
57 * @description: submitForm
58 * @author: renchao
59 */
60 submitForm () {
61 completeTask(this.queryForm).then(res => {
62 if (res.code === 200) {
63 this.$message.success('转件成功')
64 setTimeout(() => {
65 window.opener = null;
66 window.open("about:blank", "_self");
67 window.close();
68 this.$emit('input', false)
69 }, 1000);
70 }
71 })
72 },
73 /**
74 * @description: closeDialog
75 * @author: renchao
76 */
77 closeDialog () {
78 this.$emit("input", false);
79 },
80 }
81 }
82 </script> 105 </script>
83 <style scoped lang="scss"> 106 <style scoped lang="scss">
84 @import "~@/styles/mixin.scss"; 107 @import "~@/styles/mixin.scss";
108 .el-button {
109 margin-top: 20px;
110 margin-right: 10px;
111 }
85 </style> 112 </style>
......
...@@ -267,116 +267,31 @@ export default { ...@@ -267,116 +267,31 @@ export default {
267 }); 267 });
268 }); 268 });
269 }, 269 },
270 //发送下一个环节 270 //发送下一个环节
271 /** 271 /**
272 * @description: 发送下一个环节 272 * @description: 发送下一个环节
273 * @param {*} obj 273 * @param {*} obj
274 * @author: renchao 274 * @author: renchao
275 */ 275 */
276 sendToNext (obj) { 276 sendToNext (obj) {
277 const h = this.$createElement; 277 this.$popupDialog("转出", "djbworkflow/components/zc", {
278 this.$msgbox({ 278 obj:obj,
279 title: "您确定转出吗?", 279 bsmSlsq: this.bsmSlsq,
280 message: h("div", { style: "margin: auto" }, [ 280 tabList: this.tabList
281 h("span", null, "下个环节名称："), 281 }, '800px', true)
282 h("i", { style: "color: teal" }, obj.taskName),
283 h("div", null, ""),
284 h("span", null, "下个环节经办人： "),
285 h("i", { style: "color: teal" }, obj.usernames.join("，")),
286 ]),
287 showCancelButton: true,
288 beforeClose: (action, instance, done) => {
289 if (action === "confirm") {
290 instance.confirmButtonLoading = true;
291 instance.confirmButtonText = "执行中...";
292 completeTask({
293 bsmSlsq: this.bsmSlsq,
294 shyj: "this.bestepid",
295 stepform: JSON.stringify(this.tabList),
296 }).then((res) => {
297 if (res.code === 200) {
298 instance.confirmButtonLoading = false;
299 this.$message.success("转件成功");
300 // window.opener.location.reload(); //刷新父窗口
301 if (window.opener && window.opener.getBpageList) {
302 window.opener.getBpageList();
303 } else {
304 window.opener.frames[0].getBpageList();
305 }
306 window.close();
307 this.$emit("input", false);
308 } else {
309 instance.confirmButtonLoading = false;
310 instance.confirmButtonText = "确定";
311 let msgArr = res.message.split('；'),
312 listMsg = []
313 msgArr.forEach(item => {
314 let parts = item.split('：')
315 listMsg.push({ ywh: parts[0], msg: parts[1] })
316 })
317 this.$msgbox.close()
318 ywPopupDialog("转出错误明细", "workflow/components/dialog/dblist", { result: listMsg }, '33%', true)
319 }
320 });
321 } else {
322 done();
323 }
324 },
325 }).then((action) => {
326 this.$message({
327 type: "info",
328 message: "action: " + action,
329 });
330 });
331 }, 282 },
283 //转出最后一个流程
332 /** 284 /**
333 * @description: sendToEnd 285 * @description: 转出最后一个流程
286 * @param {*} obj
334 * @author: renchao 287 * @author: renchao
335 */ 288 */
336 sendToEnd () { 289 sendToNext (obj) {
337 let that = this 290 this.$popupDialog("转出", "djbworkflow/components/zc", {
338 const h = this.$createElement; 291 obj:"",
339 this.$msgbox({ 292 bsmSlsq: this.bsmSlsq,
340 title: "您确定转出吗？", 293 tabList: this.tabList
341 message: "此环节为流程最后环节，转出后流程将结束", 294 }, '800px', true)
342 showCancelButton: true,
343 beforeClose: (action, instance, done) => {
344 if (action === "confirm") {
345 instance.confirmButtonLoading = true;
346 instance.confirmButtonText = "执行中...";
347 completeTask({
348 bsmSlsq: this.bsmSlsq,
349 shyj: "this.bestepid",
350 stepform: JSON.stringify(this.tabList),
351 }).then((res) => {
352 if (res.code === 200) {
353 instance.confirmButtonLoading = false;
354 that.$message.success("转件成功");
355 localStorage.setItem('transfer', true)
356 // window.opener.location.reload(); //刷新父窗口
357 if (window.opener && window.opener.getBpageList) {
358 window.opener.getBpageList();
359 } else {
360 window.opener.frames[0].getBpageList();
361 }
362 window.close();
363 that.$emit("input", false);
364 } else {
365 instance.confirmButtonLoading = false;
366 instance.confirmButtonText = "确定";
367 this.$message.error(res.message);
368 }
369 })
370 } else {
371 done();
372 }
373 },
374 }).then((action) => {
375 this.$message({
376 type: "info",
377 message: "action: " + action
378 })
379 })
380 }, 295 },
381 //批量操作 296 //批量操作
382 /** 297 /**
......