From 4d3aa32de81cbb219c15bbae1312de5ede3195d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=9F=B9=E5=8F=8B?= <17852335869@163.com>
Date: Mon, 20 Mar 2023 17:28:15 +0800
Subject: [PATCH] =?UTF-8?q?1.=20=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9=202.?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E7=88=B6=E7=B1=BB=E4=B9=8B=E7=B1=BB=E6=94=B9?=
 =?UTF-8?q?=E9=80=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/const/workflow/workorder.js               |  2 +-
 src/styles/custom/custom.scss                 |  7 ++
 .../workflow/process/components/detail.vue    | 27 ++++---
 .../workflow/process/components/form.vue      | 81 ++++++++++++-------
 .../plugin/workflow/process/workorder.vue     |  2 +-
 5 files changed, 81 insertions(+), 38 deletions(-)

diff --git a/src/const/workflow/workorder.js b/src/const/workflow/workorder.js
index ac9baaf..8b2f2f5 100644
--- a/src/const/workflow/workorder.js
+++ b/src/const/workflow/workorder.js
@@ -7,7 +7,7 @@ export const tableOption = {
   gutter: 60, //设置input的大小
   headerAlign: "left",
   align: "left",
-  menuAlign:'center',
+  menuAlign:'left',
   menuHeaderAlign:'center',
   menuBtn: true,
   editBtn: false,
diff --git a/src/styles/custom/custom.scss b/src/styles/custom/custom.scss
index 4f5b200..13051a0 100644
--- a/src/styles/custom/custom.scss
+++ b/src/styles/custom/custom.scss
@@ -141,3 +141,10 @@
   color: #000;
 }
 
+.el-upload-dragger {
+  height: 120px;
+}
+.el-upload-dragger .el-icon-upload {
+  margin: 0;
+  margin-top: 14px;
+}
diff --git a/src/views/plugin/workflow/process/components/detail.vue b/src/views/plugin/workflow/process/components/detail.vue
index 3522275..179fd96 100644
--- a/src/views/plugin/workflow/process/components/detail.vue
+++ b/src/views/plugin/workflow/process/components/detail.vue
@@ -300,16 +300,16 @@ export default {
           const guanlibumen = this.findObject(option.column, "guanlibumen");
           guanlibumen.dicData = deptDate.data.data;
           // 任务父类
-          const taskParent = await getTaskParent();
-          const rwfl = this.findObject(option.column, "renwufulei");
-          rwfl.dicData = taskParent.data.data;
+          // const taskParent = await getTaskParent();
+          // const rwfl = this.findObject(option.column, "renwufulei");
+          // rwfl.dicData = taskParent.data.data;
           // 任务种类
-          const taskTypeData = await getTaskTypeData({ parentId: renwufulei });
-          const renwuzhonglei = this.findObject(
-            this.option.column,
-            "renwuzhonglei"
-          );
-          renwuzhonglei.dicData = taskTypeData.data.data;
+          // const taskTypeData = await getTaskTypeData({ parentId: renwufulei });
+          // const renwuzhonglei = this.findObject(
+          //   this.option.column,
+          //   "renwuzhonglei"
+          // );
+          // renwuzhonglei.dicData = taskTypeData.data.data;
           // 数据库
           const taskAndDataBaseData = await getTaskAndDataBase({
             id: yunweigongsi,
@@ -457,4 +457,13 @@ export default {
   justify-content: space-between;
   padding: 0 10px 10px 0;
 }
+/deep/ .el-textarea.is-disabled .el-textarea__inner {
+  color: #333;
+}
+/deep/ .el-table tr {
+  color: #333;
+}
+/deep/ .el-table td {
+  color: #333;
+}
 </style>
diff --git a/src/views/plugin/workflow/process/components/form.vue b/src/views/plugin/workflow/process/components/form.vue
index 2b8f8c7..f51e235 100644
--- a/src/views/plugin/workflow/process/components/form.vue
+++ b/src/views/plugin/workflow/process/components/form.vue
@@ -37,7 +37,7 @@
             </el-select>
           </template>
 
-          <template slot="renwufulei">
+          <!-- <template slot="renwufulei">
             <el-select
               v-model="form.renwufulei"
               placeholder="请选择任务父类"
@@ -51,7 +51,7 @@
               >
               </el-option>
             </el-select>
-          </template>
+          </template> -->
           <template slot="xitongmingchengshujuku">
             <el-select
               filterable
@@ -164,7 +164,7 @@ import {
   downloadFile,
   getCompany,
   getDepts,
-  getTaskParent,
+  // getTaskParent,
   // getTaskLevel,
   getTaskTypeData,
   getTaskAndDataBase,
@@ -174,7 +174,7 @@ import WfExamineForm from "./examForm.vue";
 import WfUserSelect from "./user-select";
 import exForm from "../../mixins/ex-form";
 import draft from "../../mixins/draft";
-import { dateFormat } from "@/util/date"
+// import { dateFormat } from "@/util/date";
 import { mapGetters } from "vuex";
 export default {
   components: {
@@ -362,27 +362,28 @@ export default {
             this.form.yunweigongsi = id;
             this.companyChange(id);
           }
-          const taskParentData = await getTaskParent();
-          this.taskParentList = taskParentData.data.data;
-          if (this.$route.query.parent) {
-            const id = this.$route.query.parent;
-            this.form.renwufulei = id;
-            this.taskParentChange(id);
-          }
-          const time = this.findObject(
-            this.option.column,
-            "qiwangwanchengshijian"
-          );
+          // const taskParentData = await getTaskParent();
+          // this.taskParentList = taskParentData.data.data;
+          // if (this.$route.query.parent) {
+          //   const id = this.$route.query.parent;
+          //   this.form.renwufulei = id;
+          //   this.taskParentChange(id);
+          // }
+          this.form.renwufulei = this.$route.query.parent;
+          // const time = this.findObject(
+          //   this.option.column,
+          //   "qiwangwanchengshijian"
+          // );
           // 期望完成时间限制
-          time.pickerOptions = {
-            disabledDate(time) {
-              return time.getTime() < Date.now() - 24 * 60 * 60 * 1000;
-            },
-          };
+          // time.pickerOptions = {
+          //   disabledDate(time) {
+          //     return time.getTime() < Date.now() - 24 * 60 * 60 * 1000;
+          //   },
+          // };
           // 重复模式默认值
-          let addHour = new Date().setHours(new Date().getHours() + 48);
-          time.value = dateFormat(new Date(addHour));
-          this.form.chongfumoshi = "1627589799957266433";
+          // let addHour = new Date().setHours(new Date().getHours() + 48);
+          // time.value = dateFormat(new Date(addHour));
+          // this.form.chongfumoshi = "1627589799957266433";
           if (this.permission.wf_process_draft) {
             // 查询是否有草稿箱
             this.initDraft(process.id).then((data) => {
@@ -400,10 +401,36 @@ export default {
         this.waiting = false;
       });
     },
-    // 任务等级
-    gradeChange() {
-      console.log(this.examineForm);
-    },
+    // 运维公司关联代码
+    // gradeChange() {
+    //   axios.get("/api/blade-user/maintenanceCompany").then((res) => {
+    //     let companyList = res.data.data;
+    //     if (companyList.length > 0) {
+    //       this.form.yunweigongsi = value ? value : companyList[0].id;
+    //     }
+    //     if (companyList.length === 1) {
+    //       this.option.column.find(
+    //         (item) => item.prop == "yunweigongsi"
+    //       ).disabled = true;
+    //     }
+
+    //     let obj = companyList.find(function (i) {
+    //       return i.id === value ? value : companyList[0].id;
+    //     });
+
+    //     axios
+    //       .get("/api/blade-system/dept/getDepts?id=" + obj.deptId)
+    //       .then((res) => {
+    //         let deptList = res.data.data;
+    //         this.option.column.find(
+    //           (item) => item.prop == "guanlibumen"
+    //         ).dicData = deptList;
+    //         if (deptList.length === 1) {
+    //           this.form.guanlibumen = deptList[0].id;
+    //         }
+    //       });
+    //   });
+    // },
   },
 };
 </script>
diff --git a/src/views/plugin/workflow/process/workorder.vue b/src/views/plugin/workflow/process/workorder.vue
index 9893b8e..d975140 100644
--- a/src/views/plugin/workflow/process/workorder.vue
+++ b/src/views/plugin/workflow/process/workorder.vue
@@ -143,7 +143,7 @@
       >
         <template slot-scope="{ row }" slot="menu">
           <el-button @click="dynamicRoute(row, 'detail')" >详情</el-button>
-          <el-button @click="effect(row)" style="margin-left:8px;">实施详情</el-button>
+          <el-button @click="effect(row)" style="margin-left:8px;" v-if="row.status == '已完成'">实施详情</el-button>
         </template>
         <template slot-scope="scope" slot="status">
           <span