Skip to content

bdc / bdcdj-web

Go to a project
Toggle navigation
Toggle navigation pinning
6379e605 by xiaomiao
Options

--no commit message

1 parent 311c676b
Inline Side-by-side
Showing 6 changed files with 178 additions and 183 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"
8 v-model="value">
9 <div class="from-clues"> 7 <div class="from-clues">
10 <!-- 表单部分 --> 8 <!-- 表单部分 -->
11 <div class="from-clues-header"> 9 <div class="from-clues-header">
12 <el-form :model="queryForm" ref="queryForm" label-width="120px"> 10 <el-form ref="queryForm" label-width="180px" v-if="this.formData.obj">
13 <el-form-item label="下一环节名称:"> 11 <el-form-item label="下一环节名称:">
14 {{this.tableData.taskName}} 12 {{ this.formData.obj.taskName }}
15 </el-form-item> 13 </el-form-item>
16 <el-form-item label="下一环节办理人:"> 14 <el-form-item label="下一环节办理人:">
17 {{this.usernames}} 15 {{ this.formData.obj.usernames.join("，") }}
16 </el-form-item>
17 </el-form>
18 <el-form ref="queryForm" label-width="180px" v-else>
19 <el-form-item label="">
20 此环节为流程最后环节，转出后流程将结束
18 </el-form-item> 21 </el-form-item>
19
20 </el-form> 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 >
21 </div> 34 </div>
22 </div> 35 </div>
23 </dialogBox>
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 {
30 }, 42 components: {},
31 props: { 43 props: {
32 value: { type: Boolean, default: false }, 44 formData: {
33 queryForm: { type: Object, default: false } 45 type: Object,
46 default: {},
47 },
34 }, 48 },
35 data () { 49 data() {
36 return { 50 return {
37 tableData: {}, 51 queryForm: {},
38 usernames: '', 52 shyj: "",
39 } 53 };
40 }, 54 },
41 methods: { 55 mounted() {
42 /** 56 // this.queryForm= this.queryForm.obj
43 * @description: tablelistFn 57 console.log("formDataformDataformData", this.formData);
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 }, 58 },
59 methods: {
56 /** 60 /**
57 * @description: submitForm 61 * @description: submitForm
58 * @author: renchao 62 * @author: renchao
59 */ 63 */
60 submitForm () { 64 submitForm() {
61 completeTask(this.queryForm).then(res => { 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) => {
62 if (res.code === 200) { 72 if (res.code === 200) {
63 this.$message.success('转件成功') 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();
64 setTimeout(() => { 81 setTimeout(() => {
65 window.opener = null; 82 // window.opener.location.reload(); //刷新父窗口
66 window.open("about:blank", "_self"); 83 if (window.opener && window.opener.getBpageList) {
84 window.opener.getBpageList();
85 } else {
86 window.opener.frames[0].getBpageList();
87 }
67 window.close(); 88 window.close();
68 this.$emit('input', false) 89 this.$emit("input", false);
69 }, 1000); 90 }, 1000);
91 }else{
92 this.$message.error(res.message);
70 } 93 }
71 }) 94 });
72 }, 95 },
73 /** 96 /**
74 * @description: closeDialog 97 * @description: closeDialog
75 * @author: renchao 98 * @author: renchao
76 */ 99 */
77 closeDialog () { 100 cancelBack() {
78 this.$emit("input", false); 101 popupCacel();
79 }, 102 },
80 } 103 },
81 } 104 };
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,70 +4,109 @@ ...@@ -4,70 +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"
8 v-model="value">
9 <div class="from-clues"> 7 <div class="from-clues">
10 <!-- 表单部分 --> 8 <!-- 表单部分 -->
11 <div class="from-clues-header"> 9 <div class="from-clues-header">
12 <el-form :model="queryForm" ref="queryForm" label-width="120px"> 10 <el-form ref="queryForm" label-width="180px" v-if="this.formData.obj">
13 <el-form-item label="下一环节名称:"> 11 <el-form-item label="下一环节名称:">
14 {{this.tableData.taskName}} 12 {{ this.formData.obj.taskName }}
15 </el-form-item> 13 </el-form-item>
16 <el-form-item label="下一环节办理人:"> 14 <el-form-item label="下一环节办理人:">
17 {{this.usernames}} 15 {{ this.formData.obj.usernames.join("，") }}
16 </el-form-item>
17 </el-form>
18 <el-form ref="queryForm" label-width="180px" v-else>
19 <el-form-item label="">
20 此环节为流程最后环节，转出后流程将结束
18 </el-form-item> 21 </el-form-item>
19
20 </el-form> 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 >
21 </div> 34 </div>
22 </div> 35 </div>
23 </dialogBox>
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 {
30 }, 42 components: {},
31 props: { 43 props: {
32 value: { type: Boolean, default: false }, 44 formData: {
33 queryForm: { type: Object, default: false } 45 type: Object,
46 default: {},
47 },
34 }, 48 },
35 data () { 49 data() {
36 return { 50 return {
37 tableData: {}, 51 queryForm: {},
38 usernames: '', 52 shyj: "",
39 } 53 };
40 }, 54 },
41 methods: { 55 mounted() {
42 tablelistFn () { 56 // this.queryForm= this.queryForm.obj
43 getNextLinkInfo(this.queryForm).then(res => { 57 console.log("formDataformDataformData", this.formData);
44 if (res.code === 200) {
45 this.tableData = res.result
46 if (res.result.usernames) {
47 this.usernames = String(res.result.usernames)
48 }
49 }
50 })
51 }, 58 },
52 submitForm () { 59 methods: {
53 completeTask(this.queryForm).then(res => { 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) => {
54 if (res.code === 200) { 72 if (res.code === 200) {
55 this.$message.success('转件成功') 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();
56 setTimeout(() => { 81 setTimeout(() => {
57 window.opener = null; 82 // window.opener.location.reload(); //刷新父窗口
58 window.open("about:blank", "_self"); 83 if (window.opener && window.opener.getBpageList) {
84 window.opener.getBpageList();
85 } else {
86 window.opener.frames[0].getBpageList();
87 }
59 window.close(); 88 window.close();
60 this.$emit('input', false) 89 this.$emit("input", false);
61 }, 1000); 90 }, 1000);
91 }else{
92 this.$message.error(res.message);
62 } 93 }
63 }) 94 });
64 }, 95 },
65 closeDialog () { 96 /**
66 this.$emit("input", false); 97 * @description: closeDialog
98 * @author: renchao
99 */
100 cancelBack() {
101 popupCacel();
67 }, 102 },
68 } 103 },
69 } 104 };
70 </script> 105 </script>
71 <style scoped lang="scss"> 106 <style scoped lang="scss">
72 @import "~@/styles/mixin.scss"; 107 @import "~@/styles/mixin.scss";
108 .el-button {
109 margin-top: 20px;
110 margin-right: 10px;
111 }
73 </style> 112 </style>
......
...@@ -255,99 +255,29 @@ export default { ...@@ -255,99 +255,29 @@ export default {
255 }); 255 });
256 }, 256 },
257 //发送下一个环节 257 //发送下一个环节
258 /**
259 * @description: 发送下一个环节
260 * @param {*} obj
261 * @author: renchao
262 */
258 sendToNext (obj) { 263 sendToNext (obj) {
259 const h = this.$createElement; 264 this.$popupDialog("转出", "djbworkflow/components/zc", {
260 this.$msgbox({ 265 obj:obj,
261 title: "您确定转出吗?",
262 message: h("div", { style: "margin: auto" }, [
263 h("span", null, "下个环节名称："),
264 h("i", { style: "color: teal" }, obj.taskName),
265 h("div", null, ""),
266 h("span", null, "下个环节经办人： "),
267 h("i", { style: "color: teal" }, obj.usernames.join("，")),
268 ]),
269 showCancelButton: true,
270 beforeClose: (action, instance, done) => {
271 if (action === "confirm") {
272 instance.confirmButtonLoading = true;
273 instance.confirmButtonText = "执行中...";
274 completeTask({
275 bsmSlsq: this.bsmSlsq, 266 bsmSlsq: this.bsmSlsq,
276 shyj: "this.bestepid", 267 tabList: this.tabList
277 stepform: JSON.stringify(this.tabList), 268 }, '800px', true)
278 }).then((res) => {
279 if (res.code === 200) {
280 instance.confirmButtonLoading = false;
281 this.$message.success("转件成功");
282 // window.opener.location.reload(); //刷新父窗口
283 if (window.opener && window.opener.getBpageList) {
284 window.opener.getBpageList();
285 } else {
286 window.opener.frames[0].getBpageList();
287 }
288 window.close();
289 this.$emit("input", false);
290 } else {
291 instance.confirmButtonLoading = false;
292 instance.confirmButtonText = "确定";
293 this.$message.error(res.message);
294 }
295 });
296 } else {
297 done();
298 }
299 },
300 }).then((action) => {
301 this.$message({
302 type: "info",
303 message: "action: " + action,
304 });
305 });
306 }, 269 },
270 //转出最后一个流程
271 /**
272 * @description: 转出最后一个流程
273 * @author: renchao
274 */
307 sendToEnd () { 275 sendToEnd () {
308 let that = this 276 this.$popupDialog("转出", "djbworkflow/components/zc", {
309 const h = this.$createElement; 277 obj:"",
310 this.$msgbox({
311 title: "您确定转出吗？",
312 message: "此环节为流程最后环节，转出后流程将结束",
313 showCancelButton: true,
314 beforeClose: (action, instance, done) => {
315 if (action === "confirm") {
316 instance.confirmButtonLoading = true;
317 instance.confirmButtonText = "执行中...";
318 completeTask({
319 bsmSlsq: this.bsmSlsq, 278 bsmSlsq: this.bsmSlsq,
320 shyj: "this.bestepid", 279 tabList: this.tabList
321 stepform: JSON.stringify(this.tabList), 280 }, '800px', true)
322 }).then((res) => {
323 if (res.code === 200) {
324 instance.confirmButtonLoading = false;
325 that.$message.success("转件成功");
326 localStorage.setItem('transfer', true)
327 // window.opener.location.reload(); //刷新父窗口
328 if (window.opener && window.opener.getBpageList) {
329 window.opener.getBpageList();
330 } else {
331 window.opener.frames[0].getBpageList();
332 }
333 window.close();
334 that.$emit("input", false);
335 } else {
336 instance.confirmButtonLoading = false;
337 instance.confirmButtonText = "确定";
338 this.$message.error(res.message);
339 }
340 })
341 } else {
342 done();
343 }
344 },
345 }).then((action) => {
346 this.$message({
347 type: "info",
348 message: "action: " + action
349 })
350 })
351 }, 281 },
352 //批量操作 282 //批量操作
353 handleBatchDel () { 283 handleBatchDel () {
......