From 9e5313a660678c9d26d9308ba85b60b2745d4e22 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=9F=B9=E5=8F=8B?= <17852335869@163.com>
Date: Wed, 22 Feb 2023 14:57:44 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/maintenance/database1.vue           |  6 ++---
 src/views/maintenance/system.vue              |  8 +++----
 src/views/maintenance/task.vue                | 20 ++++++++--------
 src/views/plugin/workflow/mixins/ex-form.js   | 23 ++++++++++---------
 .../workflow/process/components/button.vue    |  8 +++++++
 .../workflow/process/components/examForm.vue  | 20 ++++------------
 .../workflow/process/components/form.vue      |  8 +++----
 src/views/plugin/workflow/process/todo.vue    |  3 +--
 8 files changed, 46 insertions(+), 50 deletions(-)

diff --git a/src/views/maintenance/database1.vue b/src/views/maintenance/database1.vue
index b92ed72..3161224 100644
--- a/src/views/maintenance/database1.vue
+++ b/src/views/maintenance/database1.vue
@@ -2,7 +2,7 @@
   <div class="cus-container">
     <el-form :model="searchForm">
       <div class="search">
-        <div style="display: flex; align-items: center">
+        <div >
           <el-select
             v-model="searchForm.dataBaseName"
             placeholder="数据库实例名"
@@ -55,14 +55,12 @@
             >
             </el-option>
           </el-select>
-          <div style="display: flex">
             <el-button class="search-btn" @click="searchHandle(1)"
               >查询</el-button
             >
             <div class="search-reset" @click="searchHandle(2)">
               <i class="el-icon-refresh-right" style="font-size: 20px"></i>
             </div>
-          </div>
         </div>
         <div style="display: flex">
           <el-button class="search-btn" @click="download">下载模板</el-button>
@@ -222,6 +220,7 @@ export default {
 .search {
   display: flex;
   justify-content: space-between;
+  flex-wrap: wrap;
 }
 .search-select {
   width: 150px;
@@ -238,6 +237,7 @@ export default {
   margin: 0 20px;
 }
 .search-reset {
+  display: inline-block;
   width: 46px;
   height: 44px !important;
   background: #ff9130;
diff --git a/src/views/maintenance/system.vue b/src/views/maintenance/system.vue
index 3cda062..7353591 100644
--- a/src/views/maintenance/system.vue
+++ b/src/views/maintenance/system.vue
@@ -2,6 +2,7 @@
   <div class="cus-container">
     <el-form :model="searchForm">
       <div class="search">
+        <div>
           <el-select
             v-model="searchForm.projectInfoId"
             placeholder="系统名称"
@@ -60,14 +61,13 @@
           <div class="search-reset" @click="searchHandle(2)">
             <i class="el-icon-refresh-right" style="font-size: 20px"></i>
           </div>
-           <div>
+          </div>
             <el-button
             class="search-btn"
             style="margin: 0; background: #2ee27c;"
             @click="addHandle"
             >新增</el-button
           >
-           </div>
       </div>
     </el-form>
     <div style="margin-top: 30px">
@@ -263,9 +263,9 @@ export default {
 </script>
 <style lang="scss" scoped>
 .search {
-  border:1px solid red;
   display:flex;
-  
+  justify-content: space-between;
+  flex-wrap: wrap;
 }
 .search-select {
   width: 150px;
diff --git a/src/views/maintenance/task.vue b/src/views/maintenance/task.vue
index 9e6745f..ba0c913 100644
--- a/src/views/maintenance/task.vue
+++ b/src/views/maintenance/task.vue
@@ -64,14 +64,13 @@
           <div class="search-reset" @click="searchHandle(2)">
             <i class="el-icon-refresh-right" style="font-size: 20px"></i>
           </div>
-           <el-button
-            class="search-btn"
-            style="margin: 0; background: #2ee27c;margin-left:5vw;"
-            @click="addHandle"
-            >新增</el-button
-          >
         </div>
-         
+        <el-button
+          class="search-btn"
+          style="margin: 0; background: #2ee27c;"
+          @click="addHandle"
+          >新增</el-button
+        >
       </div>
     </el-form>
     <div style="margin-top: 30px">
@@ -106,7 +105,7 @@ import {
   remove,
   getTaskParent,
   getTaskLevel,
-  getTaskTypeData
+  getTaskTypeData,
 } from "@/api/maintenance/task.js";
 import { tableOption } from "@/const/maintenance/task.js";
 export default {
@@ -147,7 +146,7 @@ export default {
         column.dicData = res.data.data;
       });
       getTaskTypeData().then((res) => {
-         this.taskTypeList = res.data.data;
+        this.taskTypeList = res.data.data;
       });
     },
     // 列表
@@ -270,6 +269,7 @@ export default {
 .search {
   display: flex;
   justify-content: space-between;
+  flex-wrap: wrap;
 }
 .search-select {
   width: 150px;
@@ -287,7 +287,7 @@ export default {
   margin-right: 20px;
 }
 .search-reset {
-  display:inline-block;
+  display: inline-block;
   width: 46px;
   height: 44px !important;
   background: #ff9130;
diff --git a/src/views/plugin/workflow/mixins/ex-form.js b/src/views/plugin/workflow/mixins/ex-form.js
index 9e4422b..f79180a 100644
--- a/src/views/plugin/workflow/mixins/ex-form.js
+++ b/src/views/plugin/workflow/mixins/ex-form.js
@@ -225,14 +225,6 @@ export default {
       return new Promise((resolve) => {
         this.loading = true;
         this.$refs.form.validate((valid, done, msg) => {
-          // if (this.$refs.examineForm && this.$refs.examineForm.examineForm) {
-          //   let flag = this.$refs.examineForm.examineForm.$assignee
-          //   if(flag === "") {
-          //     this.$message.error("请指定审批人！")
-          //     return;
-          //   }
-          // }
-
           let form = this.deepClone(this.form);
           if (this.$refs.examineForm && this.$refs.examineForm.examineForm) {
             const { copyUser, assignee } = this.$refs.examineForm.examineForm;
@@ -245,13 +237,15 @@ export default {
               this.$message.error("请指定审批人！");
               done();
               this.loading = false;
+              return;
             }
             // 判断是不是数组
             if (typeof form.uploadrecord == "string") {
               form.uploadrecord = form.uploadrecord.split("");
             }
             startProcess(form)
-              .then(() => {
+              .then((res) => {
+                console.log(res)
                 // let item = 1;
                 // if (item === 1) {
                 //   this.visible = true;
@@ -321,8 +315,15 @@ export default {
      */
     handleCompleteTask(pass, variables) {
       return new Promise((resolve, reject) => {
-        const { comment, copyUser, assignee, attachment } =
-          this.$refs.examineForm.examineForm;
+        const { comment, copyUser, assignee, attachment } = this.$refs.examineForm.examineForm;
+        // false隐藏  判断是否需要选择审批人
+        let flag = this.$refs.examineForm.flag
+        if (flag && assignee === undefined) {
+          this.$message.error("请指定审批人！");
+          reject();
+          this.submitLoading = false;
+          return;
+        }
         if (!pass && !comment) {
           this.$message.error("请填写批复意见");
           this.submitLoading = false;
diff --git a/src/views/plugin/workflow/process/components/button.vue b/src/views/plugin/workflow/process/components/button.vue
index 7f02dc5..783c553 100644
--- a/src/views/plugin/workflow/process/components/button.vue
+++ b/src/views/plugin/workflow/process/components/button.vue
@@ -13,6 +13,14 @@
           <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')"
+                   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_effect').name}}</span>
+        </el-button>
         <el-button v-if="getButton('wf_reject')"
                    type="danger"
                    size="medium"
diff --git a/src/views/plugin/workflow/process/components/examForm.vue b/src/views/plugin/workflow/process/components/examForm.vue
index fa8aa01..a85b33f 100644
--- a/src/views/plugin/workflow/process/components/examForm.vue
+++ b/src/views/plugin/workflow/process/components/examForm.vue
@@ -42,9 +42,10 @@ export default {
         // 1624973130579636225 一般
         if((this.userInfo.role_name === "运维公司" && val === "1625035000825049090") || (this.userInfo.role_name === "技术员" && val === "1624973130579636225")||(['运维公司执行任务','领导审批'].includes(this.process.taskName))) {
           this.findObject(this.examineOption.column, '$assignee').display = false
-          console.log("val",val)
+          this.flag = false
         }else {
           this.findObject(this.examineOption.column, '$assignee').display = true
+          this.flag = true
         }
       },
       immediate: true,
@@ -86,22 +87,8 @@ export default {
               this.$emit('update:comment', val)
             }
           },
-          display: true
+          display: true,
         },
-        // {
-        //   label: '抄送人',
-        //   prop: '$copyUser',
-        //   placeholder: '请选择 抄送人',
-        //   readonly: true,
-        //   append: '+',
-        //   span: 24,
-        //   event: {
-        //     click: () => {
-        //       this.$emit('user-select', { type: 'copy', checkType: 'checkbox' })
-        //     }
-        //   },
-        //   display: true
-        // }, 
         {
           label: '指定审批人',
           prop: '$assignee',
@@ -118,6 +105,7 @@ export default {
         }
         ]
       },
+      flag: true
     }
   },
     computed: {
diff --git a/src/views/plugin/workflow/process/components/form.vue b/src/views/plugin/workflow/process/components/form.vue
index d85e848..2b5b556 100644
--- a/src/views/plugin/workflow/process/components/form.vue
+++ b/src/views/plugin/workflow/process/components/form.vue
@@ -304,16 +304,16 @@ export default {
       let res = await downloadFile({
         path: row.path,
       });
-      const fileName = res.headers["content-disposition"].split(";");
-      const filename2 = fileName[1].split("=");
-      const filename3 = decodeURIComponent(filename2[1]);
+      // const fileName = res.headers["content-disposition"].split(";");
+      // const filename2 = fileName[1].split("=");
+      // const filename3 = decodeURIComponent(filename2[1]);
       let blob = new Blob([res.data], {
         type: res.type,
       });
       let downloadElement = document.createElement("a");
       let href = window.URL.createObjectURL(blob);
       downloadElement.href = href;
-      downloadElement.download = filename3;
+      downloadElement.download = row.name;
       document.body.appendChild(downloadElement);
       downloadElement.click();
       window.URL.revokeObjectURL(href);
diff --git a/src/views/plugin/workflow/process/todo.vue b/src/views/plugin/workflow/process/todo.vue
index 9bc4f22..e6147e1 100644
--- a/src/views/plugin/workflow/process/todo.vue
+++ b/src/views/plugin/workflow/process/todo.vue
@@ -2,7 +2,6 @@
   <div class="cus-container">
     <el-form :model="searchForm">
       <div class="search">
-        <div style="display: flex; align-item: center">
           <el-select
             v-model="searchForm.taskParent"
             placeholder="任务父类"
@@ -103,7 +102,6 @@
           >
           <div class="search-reset" @click="searchHandle(2)">
             <i class="el-icon-refresh-right" style="font-size: 20px"></i>
-          </div>
         </div>
       </div>
     </el-form>
@@ -267,6 +265,7 @@ export default {
   margin: 0 20px;
 }
 .search-reset {
+  display: inline-block;
   width: 46px;
   height: 44px !important;
   background: #ff9130;