From 2e64b29843df1c279bbfdb37383fdd03b231ef7b Mon Sep 17 00:00:00 2001
From: jinna <jn517618@163.com>
Date: Thu, 25 May 2023 17:58:59 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B5=E9=9D=A2=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=E6=B7=BB=E5=8A=A0=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/const/workflow/implementation.js          | 15 +++---
 .../workflow/process/components/detail.vue    | 54 ++++++++++++++-----
 .../workflow/process/components/effect.vue    | 24 ++++++++-
 .../workflow/process/components/form.vue      |  6 +--
 4 files changed, 75 insertions(+), 24 deletions(-)

diff --git a/src/const/workflow/implementation.js b/src/const/workflow/implementation.js
index e4d6eaa..7750edd 100644
--- a/src/const/workflow/implementation.js
+++ b/src/const/workflow/implementation.js
@@ -1,14 +1,14 @@
 export const tableOption = {
   index: true,
   indexLabel: "序号",
-  indexWidth:120,
+  indexWidth: 120,
   selection: false,
   border: false,
   gutter: 60, //设置input的大小
   headerAlign: "left",
   align: "left",
-  menuAlign:'left',
-  menuHeaderAlign:'left',
+  menuAlign: "left",
+  menuHeaderAlign: "left",
   menuBtn: true,
   editBtn: false,
   delBtn: false,
@@ -19,7 +19,7 @@ export const tableOption = {
   refreshBtn: false,
   // dialogCustomClass: "custom",
   header: false,
-  menuWidth:120,
+  menuWidth: 120,
   column: [
     {
       type: "input",
@@ -37,12 +37,13 @@ export const tableOption = {
     },
     {
       type: "input",
-      label: "操作模块",
+      // label: "操作模块",
+      label: "操作对象",
       prop: "operateSysName",
       align: "left",
       overHidden: true,
     },
-  
+
     {
       type: "input",
       label: "管理部门",
@@ -96,4 +97,4 @@ export const tableOption = {
       valueFormat: "yyyy-MM-dd HH:mm:ss",
     },
   ],
-}
+};
diff --git a/src/views/plugin/workflow/process/components/detail.vue b/src/views/plugin/workflow/process/components/detail.vue
index 7775ac6..9b81a13 100644
--- a/src/views/plugin/workflow/process/components/detail.vue
+++ b/src/views/plugin/workflow/process/components/detail.vue
@@ -87,7 +87,7 @@
                     allow-create
                     clearable
                     v-model="form.xitongmingchengshujuku"
-                    placeholder="请选择系统名称/数据库/别名"
+                    placeholder=" "
                     :disabled="sqlDisabled"
                     @change="systemChange"
                   >
@@ -100,6 +100,24 @@
                     </el-option>
                   </el-select>
                 </template>
+                <template slot="xitongmokuaishujubiao">
+                  <el-select
+                    filterable
+                    allow-create
+                    clearable
+                    v-model="form.xitongmokuaishujubiao"
+                    placeholder=" "
+                    :disabled="sqlDisabled"
+                  >
+                    <el-option
+                      v-for="item in taskTableData"
+                      :key="item.id"
+                      :label="item.datatableModuleName"
+                      :value="item.id"
+                    >
+                    </el-option>
+                  </el-select>
+                </template>
                 <template slot="uploadrecord">
                   <el-table
                     v-if="form.uploadrecord && form.uploadrecord.length > 0"
@@ -272,6 +290,7 @@ export default {
       sqlDisabled:false,//数据库/系统名称是否禁用
       kindDisabled:false, //任务种类是否禁用
       repeatList:[],//重复模式数组
+      taskTableData:[], //数据模块数据表
     };
   },
   computed: {
@@ -369,13 +388,16 @@ export default {
       getDatabaseTab({
         id: id,
       }).then(res =>{
-         let xitongmokuaishujubiao = this.findObject(
-              this.option.column,
-              "xitongmokuaishujubiao"
-            );
-        xitongmokuaishujubiao.dicData = res.data.data;
+        //  let xitongmokuaishujubiao = this.findObject(
+        //       this.option.column,
+        //       "xitongmokuaishujubiao"
+        //     );
+        // xitongmokuaishujubiao.dicData = res.data.data;
+        this.taskTableData = res.data.data;
+        console.log('taskTableData ===>',this.taskTableData)
         if(xitongmokuaishujubiao.dicData.length !== 0){
-              this.form.xitongmokuaishujubiao = xitongmokuaishujubiao.dicData[0].id;
+              // this.form.xitongmokuaishujubiao = xitongmokuaishujubiao.dicData[0].id;
+              this.form.xitongmokuaishujubiao = this.taskTableData[0].id;
             }else{
               this.form.xitongmokuaishujubiao = ''
             }
@@ -467,10 +489,17 @@ export default {
           }
           option.column.find(item => item.prop == 'renwudengji').dicUrl = ''
           this.option = option;
+          let colTmp = this.option.column.find(item => item.label == "系统名称/数据库/部门");
+          if(colTmp) {
+            colTmp.label = '部门系统'
+          }
+          console.log('option ===>',this.option)
           this.vars = vars;
           // 运维公司
           const { yunweigongsi, renwufulei, xitongmingchengshujuku } =
             variables;
+
+            console.log('status ==>',status)
           // 其它下拉字典匹配
           if(status !== 'todo'){
             const companyData = await getCompany({isDetail:1});
@@ -552,11 +581,12 @@ export default {
             const moduleAndDataTableData = await getDatabaseTab({
               id: obj.id,
             });
-            let xitongmokuaishujubiao = this.findObject(
-              this.option.column,
-              "xitongmokuaishujubiao"
-            );
-            xitongmokuaishujubiao.dicData = moduleAndDataTableData.data.data;
+            // let xitongmokuaishujubiao = this.findObject(
+            //   this.option.column,
+            //   "xitongmokuaishujubiao"
+            // );
+            // xitongmokuaishujubiao.dicData = moduleAndDataTableData.data.data;
+           this.taskTableData = moduleAndDataTableData.data.data;
           }
           // const moduleAndDataTableData = await getModuleAndDataTable({
           //   id: obj.id,
diff --git a/src/views/plugin/workflow/process/components/effect.vue b/src/views/plugin/workflow/process/components/effect.vue
index ff0f095..178edd9 100644
--- a/src/views/plugin/workflow/process/components/effect.vue
+++ b/src/views/plugin/workflow/process/components/effect.vue
@@ -71,6 +71,7 @@ export default {
             type: "input",
             label: "运维公司",
             span: 7,
+            placeholder:'  ',
             display: true,
             prop: "maintenanceCompanyName",
             labelPosition: "top",
@@ -79,6 +80,7 @@ export default {
           {
             type: "input",
             label: "管理部门",
+            placeholder:'  ',
             span: 7,
             display: true,
             prop: "managementName",
@@ -89,6 +91,7 @@ export default {
             type: "input",
             label: "任务父类",
             span: 7,
+            placeholder:'  ',
             display: true,
             prop: "taskParentName",
             labelPosition: "top",
@@ -97,6 +100,7 @@ export default {
           {
             type: "input",
             label: "任务种类",
+            placeholder:'  ',
             span: 7,
             display: true,
             prop: "taskTypeName",
@@ -105,6 +109,7 @@ export default {
           },
           {
             type: "input",
+            placeholder:'  ',
             label: "任务等级",
             span: 7,
             display: true,
@@ -114,7 +119,9 @@ export default {
           },
           {
             type: "input",
-            label: "系统名称/数据库/部门",
+            // label: "系统名称/数据库/部门",
+            label: "部门系统",
+            placeholder:'  ',
             span: 7,
             display: true,
             prop: "operateSys",
@@ -124,8 +131,10 @@ export default {
           },
           {
             type: "input",
-            label: "系统名称/数据库/部门",
+            // label: "系统名称/数据库/部门",
+             label: "部门系统",
             span: 7,
+            placeholder:' ',
             display: true,
             prop: "operateSysName",
             labelPosition: "top",
@@ -135,6 +144,7 @@ export default {
           {
             type: "input",
             label: "数据模块/数据表",
+            placeholder:'  ',
             span: 7,
             display: true,
             prop: "operateModuleName",
@@ -144,6 +154,7 @@ export default {
           {
             type: "datetime",
             label: "期望完成时间",
+            placeholder:' ',
             span: 7,
             display: true,
             format: "yyyy-MM-dd HH:mm",
@@ -154,6 +165,7 @@ export default {
           },
           {
             type: "input",
+            placeholder:' ',
             label: "重复模式",
             span: 7,
             display: true,
@@ -171,6 +183,7 @@ export default {
             prop: "detail",
             labelPosition: "top",
             disabled: true,
+            placeholder:' '
           },
           // {
           //   type: "textarea",
@@ -265,6 +278,9 @@ export default {
     this.option.column.find(item => item.prop == 'remark').disabled = (JSON.parse(this.$route.query.form).isFinish === 1 ||
       JSON.parse(this.$route.query.form).maintenanceCompany !== this.userInfo.user_id
     ) ? true : false;
+    this.option.column.find(item => item.prop == 'remark').placeholder = (JSON.parse(this.$route.query.form).isFinish === 1 ||
+      JSON.parse(this.$route.query.form).maintenanceCompany !== this.userInfo.user_id
+    ) ? " " : "请输入实施反馈";
      this.option.column.find(item => item.prop == 'shangchuan').display = (JSON.parse(this.$route.query.form).isFinish === 1 ||
       JSON.parse(this.$route.query.form).maintenanceCompany !== this.userInfo.user_id
     ) ? false : true
@@ -339,4 +355,8 @@ export default {
   display: flex;
   justify-content: center;
 }
+
+/deep/ .el-textarea.is-disabled .el-textarea__inner {
+  color: #333;
+}
 </style>
diff --git a/src/views/plugin/workflow/process/components/form.vue b/src/views/plugin/workflow/process/components/form.vue
index 6606a85..8f661d1 100644
--- a/src/views/plugin/workflow/process/components/form.vue
+++ b/src/views/plugin/workflow/process/components/form.vue
@@ -292,8 +292,8 @@ export default {
            this.isDraft = false
         }else{
           if(this.taskAndDataBaseList.length !== 0){
-            this.form.xitongmingchengshujuku = this.taskAndDataBaseList[0].id
-            this.systemChange(this.taskAndDataBaseList[0].id,-1)
+            // this.form.xitongmingchengshujuku = this.taskAndDataBaseList[0].id
+            // this.systemChange(this.taskAndDataBaseList[0].id,-1)
           }else{
             this.form.xitongmingchengshujuku = ''
             const xitongmokuaishujubiao = this.findObject(
@@ -353,7 +353,7 @@ export default {
           if (index !== 1) {
             this.form.xitongmokuaishujubiao = "";
             if(xitongmokuaishujubiao.dicData.length !== 0){
-              this.form.xitongmokuaishujubiao = xitongmokuaishujubiao.dicData[0].id;
+              // this.form.xitongmokuaishujubiao = xitongmokuaishujubiao.dicData[0].id;
             }else{
               this.form.xitongmokuaishujubiao = ''
             }