Skip to content

bdc / bdcdj-web

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

Merge branch 'dev'

2 parents b412b6f7 ac7ad931
Inline Side-by-side
Showing 2 changed files with 11 additions and 8 deletions
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-05-17 10:41:57 4 * @LastEditTime: 2023-08-02 14:24:20
5 --> 5 -->
6 <template> 6 <template>
7 <div class="from-clues"> 7 <div class="from-clues">
...@@ -73,17 +73,17 @@ ...@@ -73,17 +73,17 @@
73 * @author: renchao 73 * @author: renchao
74 */ 74 */
75 onSubmit () { 75 onSubmit () {
76 if(!this.outstepopinion){ 76 if (!this.outstepopinion) {
77 this.$message.error("请填写退回意见"); 77 this.$message.error("请填写退回意见");
78 }else{ 78 } else {
79 sendBackTask({ 79 sendBackTask({
80 bsmSlsq: this.formData.bsmSlsq, 80 bsmSlsq: this.formData.bsmSlsq,
81 backNodeList: [this.selectItem], 81 backNodeList: [this.selectItem],
82 message:this.outstepopinion 82 message: this.outstepopinion
83 }).then((res) => { 83 }).then((res) => {
84 if (res.code == 200) {
84 this.$message.success("退回成功"); 85 this.$message.success("退回成功");
85 setTimeout(() => { 86 setTimeout(() => {
86 // window.opener.location.reload(); //刷新父窗口
87 if (window.opener && window.opener.getBpageList) { 87 if (window.opener && window.opener.getBpageList) {
88 window.opener.getBpageList(); 88 window.opener.getBpageList();
89 } else { 89 } else {
...@@ -92,6 +92,9 @@ ...@@ -92,6 +92,9 @@
92 window.close(); 92 window.close();
93 this.$emit("input", false); 93 this.$emit("input", false);
94 }, 1000); 94 }, 1000);
95 } else {
96 this.$message.error(res.message);
97 }
95 }); 98 });
96 } 99 }
97 }, 100 },
...@@ -113,7 +116,7 @@ ...@@ -113,7 +116,7 @@
113 getTaskBackNode(this.formData).then((res) => { 116 getTaskBackNode(this.formData).then((res) => {
114 if (res.code == 200) { 117 if (res.code == 200) {
115 this.dataList = res.result; 118 this.dataList = res.result;
116 console.log("this.dataList",this.dataList); 119 console.log("this.dataList", this.dataList);
117 if (res.result) { 120 if (res.result) {
118 this.selectActivity = res.result[0].activityId; 121 this.selectActivity = res.result[0].activityId;
119 this.selectItem = res.result[0]; 122 this.selectItem = res.result[0];
......
1 /* 1 /*
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-08-01 18:05:25 4 * @LastEditTime: 2023-08-02 14:08:27
5 */ 5 */
6 export default { 6 export default {
7 data () { 7 data () {
...@@ -11,7 +11,7 @@ export default { ...@@ -11,7 +11,7 @@ export default {
11 watch: { 11 watch: {
12 'ruleForm.sldy.gyfs': { 12 'ruleForm.sldy.gyfs': {
13 handler: function (val, oldVal) { 13 handler: function (val, oldVal) {
14 if (val == '0' && this.ruleForm.qlrList.length > 1) { 14 if (val == '0' && this.ruleForm.qlrList.length > 1 && oldVal) {
15 this.ruleForm.sldy.gyfs = oldVal 15 this.ruleForm.sldy.gyfs = oldVal
16 this.$message({ 16 this.$message({
17 message: '单独所有只能选择一个，请先删除再切换', 17 message: '单独所有只能选择一个，请先删除再切换',
......