Merge branch 'fyh' of yinet2020/YinetOASystemWeb into master

src/api/system/meapply/meapply.js

@@ -47,14 +47,15 @@ export function ActManager(query) {
 
 }
 //删除
-export function deleteTask(id,actkey,dispose) {
+export function deleteTask(id,actkey,dispose,cause) {
   return request({
     url: '/act/interface/deleteTask',
     method: 'get',
     params: {
-      'taskId': id,
+      'processInstanceId': id,
       'actkey': actkey,
-      'dispose':dispose
+      'dispose':dispose,
+      'cause':cause
 
     }
   })

src/views/system/actwork/actManager.vue

@@ -80,8 +80,6 @@
         </el-tab-pane>
         <el-tab-pane>
           <span slot="label"><i class="el-icon-date"></i> 审批历史</span>
-
-
           <el-table border :data="historyExamine" @selection-change="handleSelectionChange">
             <el-table-column label="序号" type="index" width="130" align="center"></el-table-column>
             <el-table-column label="任务名称" width="180" align="center" prop="activityName"/>
@@ -123,6 +121,32 @@
       <component :is="actForm" :data="details":actOpen="actOpen" @getList="getAllList" ></component>
     </el-dialog>
 
+
+    <!-- 删除原因 -->
+    <el-dialog   :visible.sync="qsshow" width="500px" append-to-body>
+
+      <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="100px"  v-loading="xxloading" >
+        <el-form-item label="删除原因" prop="cause">
+        <el-input
+          type="textarea"
+          :rows="3"
+          placeholder="请输入删除原因"
+          v-model="ruleForm.cause">
+        </el-input>
+        </el-form-item>
+
+        <el-form-item>
+          <el-button type="primary" @click="confirm('ruleForm')">确 定</el-button>
+          <el-button @click="cancel">关 闭</el-button>
+        </el-form-item>
+      </el-form>
+<!--      <div slot="footer" class="dialog-footer">-->
+<!--        <el-button type="primary" @click="confirm('ruleForm')">确 定</el-button>-->
+<!--        <el-button type="primary" @click="cancel">关 闭</el-button>-->
+<!--      </div>-->
+
+    </el-dialog>
+
   </div>
 </template>
 
@@ -134,6 +158,19 @@
     name: 'meapply',
     data() {
       return {
+        ruleForm: {
+          //删除流程实例的原因
+          cause: '',
+        },
+        rules: {
+          cause: [
+            { required: true, message: '删除原因不能为空', trigger: 'blur' },
+          ]},
+
+        // 删除原因弹出层弹出层
+        qsshow: false,
+        //删除原因
+
         //流程遮罩层
         actOpen: false,
         //传入到下一页面的值
@@ -208,7 +245,10 @@
         // 表单参数
         form: {},
         // 表单校验
-        rules: {}
+        // rules: {},
+        deleteActkey:'',
+        deleteId:'',
+        deleteDispose:''
       }
     },
     created() {
@@ -221,9 +261,7 @@
         formdata.append('pProcessInstanceId', row)
         //进度查看
         recordImg(formdata).then(response => {
-
           this.picUrl = window.URL.createObjectURL(response)
-
         })
 
         examineHistory(row,businessKey).then(response => {
@@ -234,19 +272,6 @@
 
         this.dialogVisible = true
       },
-      // detern(actkey,id){
-      //   let vue = this
-      //   actkey=actkey.split(":")[0];
-      //   this.details.getactkey = actkey//动态传参到下面的页面
-      //   this.details.formId = id//动态传参到下面的页面
-      //   getStartFormKey(actkey).then(response => {
-      //     var path = response.msg
-      //     this.actForm = () => Promise.resolve().then(() => require(`@/views/${path}`))
-      //   })
-      //   this.actOpen = true
-      //   return vue.actForm = this.actForm
-      // },
-
       detern(actkey,id) {
         let vue = this
         actkey=actkey.split(":")[0];
@@ -260,18 +285,43 @@
         return vue.actForm = this.actForm
       },
       deleteTask(actkey,id,dispose) {
-        this.$confirm('是否确认删除?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
 
-          return deleteTask(actkey,id,dispose);
-        }).then(() => {
+        this.qsshow=true;
+        this.$refs["ruleForm"].resetFields();
+        this.deleteActkey=actkey;
+        this.deleteId=id,
+        this.deleteDispose=dispose;
+        this.cause='';
+
+      },
+      confirm(formName){
+        this.$refs[formName].validate((valid) => {
+          if (valid) {
+            var deleteActkey=this.deleteActkey;
+            var deleteId=this.deleteId;
+            var deleteDispose=this.deleteDispose;
+            var cause=this.cause;
+            // deleteTask(deleteActkey,deleteId,deleteDispose,cause).then(response => {
+            // alert("删除成功")
+            // })
+            this.$confirm('删除将无法恢复，是否确认删除?', "警告", {
+              confirmButtonText: "确定",
+              cancelButtonText: "取消",
+              type: "warning"
+            }).then(function() {
+              return deleteTask(deleteActkey,deleteId,deleteDispose,cause);
+            }).then(() => {
+              this.qsshow=false
+              this.getAllList();
+              this.msgSuccess("删除成功");
+            }).catch(function() {});
+          } else {
+            console.log('error submit!!');
+            return false;
+          }
+        });
+
 
-          this.getAllList();
-          this.msgSuccess("删除成功");
-        }).catch(function() {});
       },
       /** 所有申请流程列表 */
       getAllList() {
@@ -288,6 +338,7 @@
         this.reset()
         this.dialogVisible = false
         this.actOpen = false;
+        this.qsshow=false;
       },
       // 表单重置
       reset() {