From be080a7df5766cdb40b9fd81b19bc78c4178d5c3 Mon Sep 17 00:00:00 2001
From: yxt_djz <313618925@qq.com>
Date: Mon, 25 Jul 2022 18:30:14 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=96=E9=87=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../workflow/baseoutsourcingapplication.vue   | 43 +++++++++++--------
 .../baseoutsourcingapplicationAdd.vue         |  2 +-
 2 files changed, 27 insertions(+), 18 deletions(-)

diff --git a/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/workflow/baseoutsourcingapplication.vue b/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/workflow/baseoutsourcingapplication.vue
index d379ab097e..416054d2be 100644
--- a/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/workflow/baseoutsourcingapplication.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/workflow/baseoutsourcingapplication.vue
@@ -107,7 +107,7 @@
         </el-row>
         <el-row  >
           <el-col :span="3" class="tleftb">
-            <span><span class="icon">*</span>备注</span>
+            <span>备注</span>
           </el-col>
           <el-col :span="21" class="trightb">
             <el-form-item prop="remarks">
@@ -178,6 +178,21 @@
           <el-button type="info " size="mini"  @click="closeNodeDialog">取 消</el-button>
         </div>
       </el-form>
+    </el-dialog>
+    <!-- 选择待办人 的弹出框-->
+    <el-dialog title="填写审批意见"  :visible.sync="nodeDialogVisibleForstop" width="80%">
+      <el-form label-position="right" class="formadd" >
+        <el-row>
+          <el-col :span="4" class="tleftb">意见</el-col>
+          <el-col :span="20" class="trightb">
+            <el-input size="small" v-model="formobj.comment" placeholder="审批意见"  class="addinputw" clearable ></el-input>
+          </el-col>
+        </el-row>
+        <div style="text-align:center;margin-top: 20px;">
+          <el-button type="primary" size="mini"  @click="handleStop()">确 定</el-button>
+          <el-button type="info " size="mini"  @click="closeNodeDialog">取 消</el-button>
+        </div>
+      </el-form>
     </el-dialog>
 	</div>
 </template>
@@ -201,6 +216,7 @@ export default {
 		  //选择待办人弹框
       nodeDialogVisible:false,
       nodeDialogVisibleForReject:false,
+      nodeDialogVisibleForstop:false,
       //选择用户弹框
       nodeUserDialogVisible:false,
       // 模型xml数据
@@ -330,24 +346,12 @@ export default {
     closeNodeDialog(){
       this.nodeDialogVisible = false
       this.nodeDialogVisibleForReject=false
+      this.nodeDialogVisibleForstop=false
     },
 
     // 终止
     openStop() {
-      this.$confirm('是否确认执行终止操作', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      })
-        .then(() => {
-          this.handleStop()
-        })
-        .catch(() => {
-          this.$message({
-            type: 'info',
-            message: '已取消终止'
-          })
-        })
+      this.nodeDialogVisibleForstop=true
     },
     // 驳回
     openReject() {
@@ -376,7 +380,6 @@ export default {
           this.nodeDialogVisible = true
         }
       });
-
     },
 		handleReturn() {
 			this.$emit('doback')
@@ -424,6 +427,7 @@ export default {
     reject(){
       if(this.formobj.comment==''){
         alert('请填写审批意见!');
+        return false;
       }
       this.handleReject();
     },
@@ -431,6 +435,7 @@ export default {
    agree() {
       if(this.formobj.comment==''){
         alert('请填写审批意见!');
+        return false;
       }
       //意见
      //下一环节的用户sid
@@ -487,7 +492,11 @@ export default {
     } ,
     /** 终止任务 */
     handleStop() {
-      this.stopList.comment = this.comment
+      if(this.formobj.comment==''){
+        alert('请填写审批意见!');
+        return false;
+      }
+      this.stopList.comment = this.formobj.comment
       req.breakTask(this.stopList).then((response) => {
         if (response.code === '200') {
           this.$notify({
diff --git a/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/workflow/baseoutsourcingapplicationAdd.vue b/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/workflow/baseoutsourcingapplicationAdd.vue
index 9c61c3c871..3822dd0219 100644
--- a/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/workflow/baseoutsourcingapplicationAdd.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/workflow/baseoutsourcingapplicationAdd.vue
@@ -135,7 +135,7 @@
 
         <el-row  >
           <el-col :span="3" class="tleftb">
-            <span><span class="icon">*</span>备注</span>
+            <span>备注</span>
           </el-col>
           <el-col :span="21" class="trightb">
             <el-form-item prop="remarks"><el-input size="small" v-model="formobj.remarks" placeholder="备注" class="addinputw" clearable /></el-form-item>