Skip to content

bdc / bdcdj-web

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

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

2 parents c8b8aa4f ed20099f
Inline Side-by-side
Showing 11 changed files with 120 additions and 116 deletions
1 <!--
2 * @Description:
3 * @Autor: renchao
4 * @LastEditTime: 2023-05-17 10:41:45
5 -->
6 <template>
7 <div class="from-clues">
8 <div class="invalid-title">
9 <i class="el-icon-question invalid-icon"></i>
10 <div class="invalid-body">您是否确定终止该业务办理？</div>
11 </div>
12 <div class="invalid-reson">终止原因：</div>
13 <el-input
14 v-model="stopMessage"
15 placeholder="请输入终止原因"
16 type="textarea"
17 :rows="4"></el-input>
18 <el-button style="float: right">取消</el-button>
19 <el-button type="primary" @click="onSubmit" style="float: right">退件</el-button>
20 </div>
21 </template>
22
23 <script>
24 import { stopTask } from "@/api/workFlow.js";
25 export default {
26 props: {
27 formData: {
28 type: Object,
29 default: {},
30 },
31 },
32 data () {
33 return {
34 stopMessage: "",
35 };
36 },
37 methods: {
38 /**
39 * @description: onSubmit
40 * @author: renchao
41 */
42 onSubmit () {
43 stopTask({
44 bsmSlsq: this.formData.bsmSlsq,
45 bestepid: this.formData.bestepid,
46 stopMessage: this.stopMessage,
47 }).then((res) => {
48 this.$message.success("终止成功");
49 setTimeout(() => {
50 // window.opener.location.reload(); //刷新父窗口
51 if (window.opener && window.opener.getBpageList) {
52 window.opener.getBpageList();
53 } else {
54 window.opener.frames[0].getBpageList();
55 }
56 window.close();
57 this.$emit("input", false);
58 }, 1000);
59 });
60 },
61 },
62 };
63 </script>
64 <style scoped lang="scss">
65 @import "~@/styles/mixin.scss";
66 .invalid-title {
67 display: flex;
68 align-content: center;
69
70 .invalid-icon {
71 color: rgb(254, 148, 0);
72 font-size: 34px;
73 margin-right: 10px;
74 }
75
76 .invalid-body {
77 line-height: 40px;
78 margin-bottom: 10px;
79 }
80 }
81
82 .invalid-reson {
83 margin-bottom: 10px;
84 }
85
86 .dialog-footer {
87 margin-top: 10px;
88 display: flex;
89 justify-content: flex-end;
90 }
91 </style>
...@@ -17,16 +17,18 @@ ...@@ -17,16 +17,18 @@
17 </el-form> 17 </el-form>
18 <el-form ref="queryForm" label-width="180px" v-else> 18 <el-form ref="queryForm" label-width="180px" v-else>
19 <el-form-item label=""> 19 <el-form-item label="">
20 此环节为流程最后环节，转出后流程将结束 20 此环节为流程最后环节，转出后流程将结束
21 </el-form-item> 21 </el-form-item>
22 </el-form> 22 </el-form>
23 <div class="invalid-reson">转出原因：</div> 23 <div class="invalid-reson">审批意见：</div>
24 <el-input 24 <el-input
25 class="opinion"
25 v-model="shyj" 26 v-model="shyj"
26 placeholder="请输入转出原因" 27 placeholder="请输入审批意见"
27 type="textarea" 28 type="textarea"
28 :rows="4" 29 :rows="4"
29 ></el-input> 30 ></el-input>
31 <!-- <el-button class="opinion_btn" @click="commonOpinion">常用意见</el-button> -->
30 <el-button style="float: right" @click="cancelBack">取消转出</el-button> 32 <el-button style="float: right" @click="cancelBack">取消转出</el-button>
31 <el-button type="primary" @click="submitForm" style="float: right" 33 <el-button type="primary" @click="submitForm" style="float: right"
32 >确定转出</el-button 34 >确定转出</el-button
...@@ -38,36 +40,56 @@ ...@@ -38,36 +40,56 @@
38 <script> 40 <script>
39 import { completeTask, getNextLinkInfo } from "@/api/workFlow.js"; 41 import { completeTask, getNextLinkInfo } from "@/api/workFlow.js";
40 import { popupCacel } from "@/utils/popup.js"; 42 import { popupCacel } from "@/utils/popup.js";
43 import { mapGetters } from "vuex";
41 export default { 44 export default {
42 components: {}, 45 computed: {
46 },
43 props: { 47 props: {
44 formData: { 48 formData: {
45 type: Object, 49 type: Object,
46 default: {}, 50 default: {},
47 }, 51 },
48 }, 52 },
53
49 data() { 54 data() {
50 return { 55 return {
51 queryForm: {}, 56 queryForm: {},
52 shyj: "", 57 shyj: "",
53 }; 58 };
54 }, 59 },
60
61 watch: {
62 yjsqOptions: {
63 handler(val) {
64 this.add(val);
65 },
66 deep: true,
67 immediate: true,
68 },
69 },
55 mounted() { 70 mounted() {
56 // this.queryForm= this.queryForm.obj 71 // this.queryForm= this.queryForm.obj
57 console.log("formDataformDataformData", this.formData);
58 }, 72 },
59 methods: { 73 methods: {
60 /** 74 /**
61 * @description: submitForm 75 * @description: submitForm
62 * @author: renchao 76 * @author: renchao
63 */ 77 */
78 commonOpinion() {
79 this.$popup('常用意见',"workflow/components/dialog/commonOpinion",{
80 title:"常用意见",
81 width: '75%', // 初始化75% 不需要改的话 可以直接不要
82 formData:{}, // 父组件传给子组件的参数
83 cancel: function () {}, //取消事件的回调 没有按钮可以不需要
84 confirm: function () {} //确认事件的回调 没有按钮可以不需要
85 })
86 },
64 submitForm() { 87 submitForm() {
65 this.queryForm = { 88 this.queryForm = {
66 bsmSlsq: this.formData.bsmSlsq, 89 bsmSlsq: this.formData.bsmSlsq,
67 shyj: this.shyj, 90 shyj: this.shyj,
68 stepform: JSON.stringify(this.formData.tabList), 91 stepform: JSON.stringify(this.formData.tabList),
69 }; 92 };
70 console.log("this.queryForm", this.queryForm);
71 completeTask(this.queryForm).then((res) => { 93 completeTask(this.queryForm).then((res) => {
72 if (res.code === 200) { 94 if (res.code === 200) {
73 this.$message.success("转件成功"); 95 this.$message.success("转件成功");
...@@ -77,8 +99,8 @@ export default { ...@@ -77,8 +99,8 @@ export default {
77 // window.close(); 99 // window.close();
78 // this.$emit("input", false); 100 // this.$emit("input", false);
79 // }, 1000); 101 // }, 1000);
80 popupCacel(); 102 popupCacel();
81 setTimeout(() => { 103 setTimeout(() => {
82 // window.opener.location.reload(); //刷新父窗口 104 // window.opener.location.reload(); //刷新父窗口
83 if (window.opener && window.opener.getBpageList) { 105 if (window.opener && window.opener.getBpageList) {
84 window.opener.getBpageList(); 106 window.opener.getBpageList();
...@@ -88,12 +110,23 @@ export default { ...@@ -88,12 +110,23 @@ export default {
88 window.close(); 110 window.close();
89 this.$emit("input", false); 111 this.$emit("input", false);
90 }, 1000); 112 }, 1000);
91 }else{ 113 } else {
92 this.$message.error(res.message); 114 this.$message.error(res.message);
93 } 115 }
94 }); 116 });
95 }, 117 },
96 /** 118 /**
119 * @description: add
120 * @param {*} val
121 * @author: renchao
122 */
123 add(val) {
124 if (val != "") {
125 this.shyj;
126 }
127 },
128
129 /**
97 * @description: closeDialog 130 * @description: closeDialog
98 * @author: renchao 131 * @author: renchao
99 */ 132 */
...@@ -109,4 +142,15 @@ export default { ...@@ -109,4 +142,15 @@ export default {
109 margin-top: 20px; 142 margin-top: 20px;
110 margin-right: 10px; 143 margin-right: 10px;
111 } 144 }
145
146 .opinion {
147 position: relative;
148 font-size: 14px;
149 }
150
151 .opinion_btn {
152 position: absolute;
153 right: 35px;
154 bottom: 80px;
155 }
112 </style> 156 </style>
......
...@@ -476,7 +476,7 @@ export default { ...@@ -476,7 +476,7 @@ export default {
476 */ 476 */
477 ssQlxxchange(val) { 477 ssQlxxchange(val) {
478 this.ruleForm.ssQlxx = val; 478 this.ruleForm.ssQlxx = val;
479 this.ruleForm.qlxx.ssywh = val.ssywh; 479 this.ruleForm.qlxx.ssywh = val.ywh;
480 }, 480 },
481 /** 481 /**
482 * @description: djlxchange 482 * @description: djlxchange
......
...@@ -654,7 +654,7 @@ export default { ...@@ -654,7 +654,7 @@ export default {
654 */ 654 */
655 ssQlxxchange(val) { 655 ssQlxxchange(val) {
656 this.ruleForm.ssQlxx = val; 656 this.ruleForm.ssQlxx = val;
657 this.ruleForm.qlxx.ssywh = val.ssywh; 657 this.ruleForm.qlxx.ssywh = val.ywh;
658 }, 658 },
659 djlxchange(val) { 659 djlxchange(val) {
660 if (val == null || val == 100) { 660 if (val == null || val == 100) {
......
...@@ -405,7 +405,7 @@ export default { ...@@ -405,7 +405,7 @@ export default {
405 */ 405 */
406 ssQlxxchange(val) { 406 ssQlxxchange(val) {
407 this.ruleForm.ssQlxx = val; 407 this.ruleForm.ssQlxx = val;
408 this.ruleForm.qlxx.ssywh = val.ssywh; 408 this.ruleForm.qlxx.ssywh = val.ywh;
409 }, 409 },
410 /** 410 /**
411 * @description: djlxchange 411 * @description: djlxchange
......
...@@ -465,7 +465,7 @@ ...@@ -465,7 +465,7 @@
465 */ 465 */
466 ssQlxxchange (val) { 466 ssQlxxchange (val) {
467 this.ruleForm.ssQlxx = val; 467 this.ruleForm.ssQlxx = val;
468 this.ruleForm.qlxx.ssywh = val.ssywh; 468 this.ruleForm.qlxx.ssywh = val.ywh;
469 }, 469 },
470 /** 470 /**
471 * @description: djlxchange 471 * @description: djlxchange
......
...@@ -367,7 +367,7 @@ export default { ...@@ -367,7 +367,7 @@ export default {
367 */ 367 */
368 ssQlxxchange(val) { 368 ssQlxxchange(val) {
369 this.ruleForm.ssQlxx = val; 369 this.ruleForm.ssQlxx = val;
370 this.ruleForm.qlxx.ssywh = val.ssywh; 370 this.ruleForm.qlxx.ssywh = val.ywh;
371 }, 371 },
372 /** 372 /**
373 * @description: djlxchange 373 * @description: djlxchange
......
...@@ -422,7 +422,7 @@ export default { ...@@ -422,7 +422,7 @@ export default {
422 */ 422 */
423 ssQlxxchange(val) { 423 ssQlxxchange(val) {
424 this.ruleForm.ssQlxx = val; 424 this.ruleForm.ssQlxx = val;
425 this.ruleForm.qlxx.ssywh = val.ssywh; 425 this.ruleForm.qlxx.ssywh = val.ywh;
426 }, 426 },
427 /** 427 /**
428 * @description: djlxchange 428 * @description: djlxchange
......
...@@ -445,7 +445,7 @@ export default { ...@@ -445,7 +445,7 @@ export default {
445 */ 445 */
446 ssQlxxchange(val) { 446 ssQlxxchange(val) {
447 this.ruleForm.ssQlxx = val; 447 this.ruleForm.ssQlxx = val;
448 this.ruleForm.qlxx.ssywh = val.ssywh; 448 this.ruleForm.qlxx.ssywh = val.ywh;
449 }, 449 },
450 /** 450 /**
451 * @description: djlxchange 451 * @description: djlxchange
......
...@@ -15,13 +15,14 @@ ...@@ -15,13 +15,14 @@
15 placeholder="请输入终止原因" 15 placeholder="请输入终止原因"
16 type="textarea" 16 type="textarea"
17 :rows="4"></el-input> 17 :rows="4"></el-input>
18 <el-button style="float: right">取消</el-button> 18 <el-button style="float: right" @click="cancelBack">取消</el-button>
19 <el-button type="primary" @click="onSubmit" style="float: right">退件</el-button> 19 <el-button type="primary" @click="onSubmit" style="float: right">退件</el-button>
20 </div> 20 </div>
21 </template> 21 </template>
22 22
23 <script> 23 <script>
24 import { stopTask } from "@/api/workFlow.js"; 24 import { stopTask } from "@/api/workFlow.js";
25 import { popupCacel } from "@/utils/popup.js";
25 export default { 26 export default {
26 props: { 27 props: {
27 formData: { 28 formData: {
...@@ -58,6 +59,13 @@ ...@@ -58,6 +59,13 @@
58 }, 1000); 59 }, 1000);
59 }); 60 });
60 }, 61 },
62 /**
63 * @description: closeDialog
64 * @author: renchao
65 */
66 cancelBack() {
67 popupCacel();
68 },
61 }, 69 },
62 }; 70 };
63 </script> 71 </script>
......
...@@ -17,16 +17,22 @@ ...@@ -17,16 +17,22 @@
17 </el-form> 17 </el-form>
18 <el-form ref="queryForm" label-width="180px" v-else> 18 <el-form ref="queryForm" label-width="180px" v-else>
19 <el-form-item label=""> 19 <el-form-item label="">
20 此环节为流程最后环节，转出后流程将结束 20 此环节为流程最后环节，转出后流程将结束
21 </el-form-item> 21 </el-form-item>
22 </el-form> 22 </el-form>
23 <div class="invalid-reson">转出原因：</div> 23 <div class="invalid-reson">审批意见：</div>
24 <el-input 24 <el-input
25 class="opinion"
25 v-model="shyj" 26 v-model="shyj"
26 placeholder="请输入转出原因" 27 placeholder="请输入审批意见"
27 type="textarea" 28 type="textarea"
28 :rows="4" 29 :rows="4"
29 ></el-input> 30 ></el-input>
31 <!-- <el-button
32 class="opinion_btn"
33 @click="commonOpinion"
34 >常用意见</el-button
35 > -->
30 <el-button style="float: right" @click="cancelBack">取消转出</el-button> 36 <el-button style="float: right" @click="cancelBack">取消转出</el-button>
31 <el-button type="primary" @click="submitForm" style="float: right" 37 <el-button type="primary" @click="submitForm" style="float: right"
32 >确定转出</el-button 38 >确定转出</el-button
...@@ -38,36 +44,59 @@ ...@@ -38,36 +44,59 @@
38 <script> 44 <script>
39 import { completeTask, getNextLinkInfo } from "@/api/workFlow.js"; 45 import { completeTask, getNextLinkInfo } from "@/api/workFlow.js";
40 import { popupCacel } from "@/utils/popup.js"; 46 import { popupCacel } from "@/utils/popup.js";
47 import { mapGetters } from 'vuex'
41 export default { 48 export default {
42 components: {}, 49 components: {},
50
43 props: { 51 props: {
44 formData: { 52 formData: {
45 type: Object, 53 type: Object,
46 default: {}, 54 default: {},
47 }, 55 },
48 }, 56 },
57 computed: {
58 ...mapGetters(['yjsqOptions'])
59 },
49 data() { 60 data() {
50 return { 61 return {
51 queryForm: {}, 62 queryForm: {},
52 shyj: "", 63 shyj: "",
53 }; 64 };
54 }, 65 },
66
67 watch: {
68 // yjsqOptions: {
69 // handler (val) {
70 // if(val){
71 // this.shyj = val
72 // }
73
74 // },
75 // },
76 },
55 mounted() { 77 mounted() {
56 // this.queryForm= this.queryForm.obj 78 // this.queryForm= this.queryForm.obj
57 console.log("formDataformDataformData", this.formData);
58 }, 79 },
59 methods: { 80 methods: {
60 /** 81 /**
61 * @description: submitForm 82 * @description: submitForm
62 * @author: renchao 83 * @author: renchao
63 */ 84 */
85 commonOpinion() {
86 this.$popupDialog(
87 "常用意见",
88 "workflow/components/dialog/commonOpinion",
89 {},
90 "70%",
91 true
92 );
93 },
64 submitForm() { 94 submitForm() {
65 this.queryForm = { 95 this.queryForm = {
66 bsmSlsq: this.formData.bsmSlsq, 96 bsmSlsq: this.formData.bsmSlsq,
67 shyj: this.shyj, 97 shyj: this.shyj,
68 stepform: JSON.stringify(this.formData.tabList), 98 stepform: JSON.stringify(this.formData.tabList),
69 }; 99 };
70 console.log("this.queryForm", this.queryForm);
71 completeTask(this.queryForm).then((res) => { 100 completeTask(this.queryForm).then((res) => {
72 if (res.code === 200) { 101 if (res.code === 200) {
73 this.$message.success("转件成功"); 102 this.$message.success("转件成功");
...@@ -77,8 +106,8 @@ export default { ...@@ -77,8 +106,8 @@ export default {
77 // window.close(); 106 // window.close();
78 // this.$emit("input", false); 107 // this.$emit("input", false);
79 // }, 1000); 108 // }, 1000);
80 popupCacel(); 109 popupCacel();
81 setTimeout(() => { 110 setTimeout(() => {
82 // window.opener.location.reload(); //刷新父窗口 111 // window.opener.location.reload(); //刷新父窗口
83 if (window.opener && window.opener.getBpageList) { 112 if (window.opener && window.opener.getBpageList) {
84 window.opener.getBpageList(); 113 window.opener.getBpageList();
...@@ -88,11 +117,12 @@ export default { ...@@ -88,11 +117,12 @@ export default {
88 window.close(); 117 window.close();
89 this.$emit("input", false); 118 this.$emit("input", false);
90 }, 1000); 119 }, 1000);
91 }else{ 120 } else {
92 this.$message.error(res.message); 121 this.$message.error(res.message);
93 } 122 }
94 }); 123 });
95 }, 124 },
125
96 /** 126 /**
97 * @description: closeDialog 127 * @description: closeDialog
98 * @author: renchao 128 * @author: renchao
...@@ -109,4 +139,17 @@ export default { ...@@ -109,4 +139,17 @@ export default {
109 margin-top: 20px; 139 margin-top: 20px;
110 margin-right: 10px; 140 margin-right: 10px;
111 } 141 }
142
143 .opinion {
144 position: relative;
145 font-size: 14px;
146
147
148 }
149
150 .opinion_btn {
151 position: absolute;
152 right: 35px;
153 bottom: 80px;
154 }
112 </style> 155 </style>
......