1.ico 2.取消申请

public/index.html

@@ -18,7 +18,7 @@
   <link rel="stylesheet" href="<%= BASE_URL %>cdn/avue/2.9.12/index.css">
   <script src="<%= BASE_URL %>cdn/xlsx/FileSaver.min.js"></script>
   <script src="<%= BASE_URL %>cdn/xlsx/xlsx.full.min.js"></script>
-  <link rel="icon" href="<%= BASE_URL %>favicon.png">
+  <link rel="icon" href="<%= BASE_URL %>favicon.ico">
   <title>工单系统</title>
   <style>
     html,

src/views/plugin/workflow/mixins/ex-form.js

@@ -242,7 +242,7 @@ export default {
             if (typeof form.uploadrecord == "string") {
               form.uploadrecord = form.uploadrecord.split("");
             }
-            startProcess({...form,forcestart: "0",isauto:"0"})
+            startProcess({ ...form, forcestart: "0", isauto: "0" })
               .then((res) => {
                 if (res.data.data === "类似任务已经发起过，是否要强制发起") {
                   this.$confirm(res.data.data + "?", "提示", {
@@ -252,7 +252,7 @@ export default {
                   })
                     .then(() => {
                       // 强制发起重复任务
-                      startProcess({ ...form, forcestart: "1",isauto:"0" })
+                      startProcess({ ...form, forcestart: "1", isauto: "0" })
                         .then((res) => {
                           if (isExForm === true) {
                             resolve(done);
@@ -337,6 +337,7 @@ export default {
      * @param pass 驳回/通过
      */
     handleCompleteTask(pass, variables) {
+      console.log(variables);
       return new Promise((resolve, reject) => {
         const { comment, copyUser, assignee, attachment } =
           this.$refs.examineForm.examineForm;
@@ -350,6 +351,7 @@ export default {
             return;
           }
         }
+
         if (!pass && !comment) {
           this.$message.error("请填写意见");
           this.submitLoading = false;
@@ -484,35 +486,56 @@ export default {
       }
       this.$refs["user-select"].visible = false;
     },
-    handleWithdrawTask() {
+    handleWithdrawTask(index) {
       const { taskId } = this.process;
-      this.$confirm(
-        '<p><span style="color: red;">撤销：</span>撤销终止此流程</p><p><span style="color: red;">撤回：</span>撤回到发起人重新提交，若当前流程不存在发起人节点，功能同撤销</p>',
-        "请选择撤销/撤回操作",
-        {
-          type: "warning",
-          distinguishCancelAndClose: true,
-          confirmButtonText: "撤销",
-          cancelButtonText: "撤回",
-          dangerouslyUseHTMLString: true,
-        }
-      )
-        .then(() => {
+      if (index === 1) {
+        this.$confirm(
+          '<p><span style="color: red;">撤销：</span>撤销终止此流程</p>',
+          "确定要撤销终止此流程吗？",
+          {
+            type: "warning",
+            distinguishCancelAndClose: true,
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            dangerouslyUseHTMLString: true,
+          }
+        ).then(() => {
           withdrawTask({ taskId, withdrawType: "wf_withdraw_end" }).then(() => {
             this.$message.success("操作成功");
-            this.handleCloseTag("/plugin/workflow/process/todo");
+            this.handleCloseTag("/plugin/workflow/process/workorder");
           });
-        })
-        .catch((action) => {
-          if (action == "cancel") {
-            withdrawTask({ taskId, withdrawType: "wf_withdraw_start" }).then(
+        });
+      } else {
+        this.$confirm(
+          '<p><span style="color: red;">撤销：</span>撤销终止此流程</p><p><span style="color: red;">撤回：</span>撤回到发起人重新提交，若当前流程不存在发起人节点，功能同撤销</p>',
+          "请选择撤销/撤回操作",
+          {
+            type: "warning",
+            distinguishCancelAndClose: true,
+            confirmButtonText: "撤销",
+            cancelButtonText: "撤回",
+            dangerouslyUseHTMLString: true,
+          }
+        )
+          .then(() => {
+            withdrawTask({ taskId, withdrawType: "wf_withdraw_end" }).then(
               () => {
                 this.$message.success("操作成功");
-                this.handleCloseTag("/plugin/workflow/process/todo");
+                this.handleCloseTag("/plugin/workflow/process/workorder");
               }
             );
-          }
-        });
+          })
+          .catch((action) => {
+            if (action == "cancel") {
+              withdrawTask({ taskId, withdrawType: "wf_withdraw_start" }).then(
+                () => {
+                  this.$message.success("操作成功");
+                  this.handleCloseTag("/plugin/workflow/process/todo");
+                }
+              );
+            }
+          });
+      }
     },
     handlePrint() {
       // 打印

src/views/plugin/workflow/process/components/button.vue

@@ -1,156 +1,219 @@
 <template>
   <div>
-    <div style="height: 120px;"></div>
-    <el-row class="foot-item avue-affix"
-            :style="{width: isCollapse? 'calc(100% - 80px)': 'calc(100% - 260px)' }"
-            id="avue-view">
+    <div style="height: 120px"></div>
+    <el-row
+      class="foot-item avue-affix"
+      :style="{
+        width: isCollapse ? 'calc(100% - 80px)' : 'calc(100% - 260px)',
+      }"
+      id="avue-view"
+    >
       <template v-if="process.status == 'todo'">
-        <el-button v-if="getButton('wf_pass')"
-                   type="success"
-                   size="medium"
-                   v-loading="loading"
-                   @click="$emit('examine', true)">
-          <span v-if="['recall', 'reject'].includes(process.processIsFinished)">重新提交</span>
-          <span v-else>{{getButton('wf_pass').name}}</span>
+        <el-button
+          v-if="getButton('wf_pass')"
+          type="success"
+          size="medium"
+          v-loading="loading"
+          @click="$emit('examine', true)"
+        >
+          <span v-if="['recall', 'reject'].includes(process.processIsFinished)"
+            >重新提交</span
+          >
+          <span v-else>{{ getButton("wf_pass").name }}</span>
         </el-button>
-        <el-button v-if="getButton('wf_effect') && !['recall', 'reject'].includes(process.processIsFinished)"
-                   type="success"
-                   size="medium"
-                   v-loading="loading"
-                   @click="$emit('examine', true)">
-          <span >{{getButton('wf_effect').name}}</span>
+        <el-button
+          v-if="
+            getButton('wf_effect') &&
+            !['recall', 'reject'].includes(process.processIsFinished)
+          "
+          type="success"
+          size="medium"
+          v-loading="loading"
+          @click="$emit('examine', true)"
+        >
+          <span>{{ getButton("wf_effect").name }}</span>
         </el-button>
-        <el-button v-if="getButton('wf_reject')"
-                   type="danger"
-                   size="medium"
-                   v-loading="loading"
-                   @click="$emit('examine', false)">
-          <span v-if="backNodes.length > 1">{{getButton('wf_reject').name}}</span>
-          <span v-else>取消申请</span>
+        <el-button
+          v-if="getButton('wf_reject') && backNodes.length > 1"
+          type="danger"
+          size="medium"
+          v-loading="loading"
+          @click="$emit('examine', false)"
+        >
+          <span v-if="backNodes.length > 1">{{
+            getButton("wf_reject").name
+          }}</span>
         </el-button>
-        <el-button v-if="getButton('wf_transfer')"
-                   type="primary"
-                   size="medium"
-                   v-loading="loading"
-                   @click="$emit('user-select', {type: 'transfer', checkType: 'radio'})">{{getButton('wf_transfer').name}}</el-button>
-        <el-button v-if="getButton('wf_delegate')"
-                   type="warning"
-                   size="medium"
-                   v-loading="loading"
-                   @click="$emit('user-select', {type: 'delegate', checkType: 'radio'})">{{getButton('wf_delegate').name}}</el-button>
-        <el-button v-if="getButton('wf_rollback')"
-                   type="success"
-                   size="medium"
-                   v-loading="loading"
-                   @click="handleRollback">{{getButton('wf_rollback').name}}</el-button>
-        <el-button v-if="getButton('wf_terminate')"
-                   type="danger"
-                   size="medium"
-                   v-loading="loading"
-                   @click="$emit('terminate')">{{getButton('wf_terminate').name}}</el-button>
-        <el-button v-if="process.isMultiInstance && getButton('wf_add_instance')"
-                   type="primary"
-                   size="medium"
-                   v-loading="loading"
-                   @click="$emit('user-select', {type: 'addInstance', checkType: 'checkbox'})">{{getButton('wf_add_instance').name}}</el-button>
+        <el-button
+          v-if="getButton('wf_reject') && backNodes.length == 1"
+          type="danger"
+          size="medium"
+          v-loading="loading"
+          @click="$emit('withdraw', 1)"
+        >
+          <span>取消申请</span>
+        </el-button>
+        <el-button
+          v-if="getButton('wf_transfer')"
+          type="primary"
+          size="medium"
+          v-loading="loading"
+          @click="
+            $emit('user-select', { type: 'transfer', checkType: 'radio' })
+          "
+          >{{ getButton("wf_transfer").name }}</el-button
+        >
+        <el-button
+          v-if="getButton('wf_delegate')"
+          type="warning"
+          size="medium"
+          v-loading="loading"
+          @click="
+            $emit('user-select', { type: 'delegate', checkType: 'radio' })
+          "
+          >{{ getButton("wf_delegate").name }}</el-button
+        >
+        <el-button
+          v-if="getButton('wf_rollback')"
+          type="success"
+          size="medium"
+          v-loading="loading"
+          @click="handleRollback"
+          >{{ getButton("wf_rollback").name }}</el-button
+        >
+        <el-button
+          v-if="getButton('wf_terminate')"
+          type="danger"
+          size="medium"
+          v-loading="loading"
+          @click="$emit('terminate')"
+          >{{ getButton("wf_terminate").name }}</el-button
+        >
+        <el-button
+          v-if="process.isMultiInstance && getButton('wf_add_instance')"
+          type="primary"
+          size="medium"
+          v-loading="loading"
+          @click="
+            $emit('user-select', { type: 'addInstance', checkType: 'checkbox' })
+          "
+          >{{ getButton("wf_add_instance").name }}</el-button
+        >
       </template>
-      <el-button v-if="permission.wf_process_withdraw && process.isOwner && process.isReturnable && !['recall', 'reject'].includes(process.processIsFinished)"
-                 type="warning"
-                 size="medium"
-                 v-loading="loading"
-                 @click="$emit('withdraw')">撤销</el-button>
-      <el-button v-if="getButton('wf_print')"
-                 type="info"
-                 size="medium"
-                 v-loading="loading"
-                 @click="$emit('print')">{{getButton('wf_print').name}}</el-button>
+      <el-button
+        v-if="
+          permission.wf_process_withdraw &&
+          process.isOwner &&
+          process.isReturnable &&
+          !['recall', 'reject'].includes(process.processIsFinished)
+        "
+        type="warning"
+        size="medium"
+        v-loading="loading"
+        @click="$emit('withdraw')"
+        >撤销</el-button
+      >
+      <el-button
+        v-if="getButton('wf_print')"
+        type="info"
+        size="medium"
+        v-loading="loading"
+        @click="$emit('print')"
+        >{{ getButton("wf_print").name }}</el-button
+      >
     </el-row>
-    <el-dialog :visible.sync="nodeVisible"
-               append-to-body
-               title="选择回退节点">
-      <avue-form v-if="nodeVisible"
-                 v-model="nodeForm"
-                 :option="nodeOption"
-                 @submit="handleNodeSubmit"></avue-form>
+    <el-dialog :visible.sync="nodeVisible" append-to-body title="选择回退节点">
+      <avue-form
+        v-if="nodeVisible"
+        v-model="nodeForm"
+        :option="nodeOption"
+        @submit="handleNodeSubmit"
+      ></avue-form>
     </el-dialog>
   </div>
 </template>
 
 <script>
-import { backNodes } from '@/api/plugin/workflow/process'
+import { backNodes } from "@/api/plugin/workflow/process";
 
-import { mapGetters } from 'vuex'
+import { mapGetters } from "vuex";
 
 export default {
-  name: 'wf-button',
+  name: "wf-button",
   computed: {
-    ...mapGetters(['isCollapse', 'permission']),
+    ...mapGetters(["isCollapse", "permission"]),
   },
   props: {
     loading: {
       type: Boolean,
-      default: false
+      default: false,
     },
     buttonList: {
       type: Array,
       default: () => {
-        return []
-      }
+        return [];
+      },
     },
     process: Object,
-    comment: String
+    comment: String,
   },
   data() {
     return {
       nodeVisible: false,
       nodeForm: {},
       nodeOption: {
-        column: [{
-          label: '节点',
-          prop: 'nodeId',
-          type: 'select',
-          props: {
-            label: 'nodeName',
-            value: 'nodeId'
+        column: [
+          {
+            label: "节点",
+            prop: "nodeId",
+            type: "select",
+            props: {
+              label: "nodeName",
+              value: "nodeId",
+            },
+            span: 24,
+            rules: [
+              { required: true, message: "请选择回退节点", trigger: "change" },
+            ],
           },
-          span: 24,
-          rules: [{ required: true, message: '请选择回退节点', trigger: 'change' }]
-        }]
+        ],
       },
-      backNodes: []
-    }
+      backNodes: [],
+    };
   },
   watch: {
-    'process.taskId': {
+    "process.taskId": {
       handler(val) {
         if (val) {
-          backNodes({ taskId: val }).then(res => {
-            const list = res.data.data
-            this.backNodes = list
-            this.findObject(this.nodeOption.column, 'nodeId').dicData = list
-          })
+          backNodes({ taskId: val }).then((res) => {
+            const list = res.data.data;
+            this.backNodes = list;
+            this.findObject(this.nodeOption.column, "nodeId").dicData = list;
+          });
         }
       },
-      immediate: true
-    }
+      immediate: true,
+    },
   },
   methods: {
-    handleRollback() { // 指定回退
+    handleRollback() {
+      // 指定回退
       if (!this.comment) {
-        this.$message.error("请填写批复意见")
-        return
+        this.$message.error("请填写批复意见");
+        return;
       }
-      this.nodeVisible = true
+      this.nodeVisible = true;
     },
-    handleNodeSubmit() { // 指定回退确定
-      const { nodeId } = this.nodeForm
-      this.$emit('rollback', nodeId)
+    handleNodeSubmit() {
+      // 指定回退确定
+      const { nodeId } = this.nodeForm;
+      this.$emit("rollback", nodeId);
     },
     getButton(key) {
-      return this.buttonList.find(b => b.buttonKey == key)
-    }
-  }
-}
+      return this.buttonList.find((b) => b.buttonKey == key);
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>
@@ -170,4 +233,4 @@ export default {
   -webkit-box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
   box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
 }
-</style>
+</style>

src/views/plugin/workflow/process/components/form.vue

@@ -268,12 +268,14 @@ export default {
         renwuzhonglei.dicData = res.data.data;
       });
     },
-    systemChange(id) {
+    systemChange(id, index) {
       let obj = this.taskAndDataBaseList.find(function (i) {
         return i.id === id;
       });
       getModuleAndDataTable({ id: obj.id, type: obj.type }).then((res) => {
-        this.form.xitongmokuaishujubiao = "";
+        if (index !== 1) {
+          this.form.xitongmokuaishujubiao = "";
+        }
         const xitongmokuaishujubiao = this.findObject(
           this.option.column,
           "xitongmokuaishujubiao"
@@ -317,7 +319,7 @@ export default {
         this.form.uploadrecord.splice(index, 1);
       });
     },
-     getForm(processId, processDefKey) {
+    getForm(processId, processDefKey) {
       let param;
       let method;
       if (processId) {
@@ -327,7 +329,7 @@ export default {
         param = processDefKey;
         method = "getStartFormByProcessDefKey";
       }
-      this[method](param).then(async(res) => {
+      this[method](param).then(async (res) => {
         let { process, form, startForm } = res;
         this.form.processId = process.id;
         if (form) {
@@ -348,14 +350,14 @@ export default {
           option.group = groupArr;
           this.option = option;
           // 运维公司
-          const companyData = await getCompany()
+          const companyData = await getCompany();
           this.companyList = companyData.data.data;
           if (companyData.data.data.length > 0) {
             const id = companyData.data.data[0].id;
             this.form.yunweigongsi = id;
             this.companyChange(id);
           }
-          const taskParentData =  await getTaskParent()
+          const taskParentData = await getTaskParent();
           this.taskParentList = taskParentData.data.data;
           if (this.$route.query.parent) {
             const id = this.$route.query.parent;
@@ -376,8 +378,9 @@ export default {
             this.initDraft(process.id).then((data) => {
               this.$confirm("是否恢复之前保存的草稿？", "提示", {})
                 .then(() => {
-                  this.form = JSON.parse(data);
-                  this.systemChange(this.form.xitongmingchengshujuku);
+                  const form = JSON.parse(data);
+                  this.systemChange(form.xitongmingchengshujuku, 1);
+                  this.form = form
                 })
                 .catch(() => {});
             });