From ce3aed86d0a3a8c6bdc3ad1f0283590ef4fc57c2 Mon Sep 17 00:00:00 2001
From: jinna <jn517618@163.com>
Date: Thu, 29 Jun 2023 17:59:38 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=B0=E5=BB=BA=E5=B7=A5?=
 =?UTF-8?q?=E5=8D=95=E9=A9=B3=E5=9B=9E=E5=90=8E=E4=BC=A0=E5=8F=82=E5=A4=84?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../plugin/workflow/process/components/detail.vue | 15 +++++++--------
 .../plugin/workflow/process/components/effect.vue |  2 +-
 .../plugin/workflow/process/components/form.vue   |  8 ++++++++
 3 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/src/views/plugin/workflow/process/components/detail.vue b/src/views/plugin/workflow/process/components/detail.vue
index 1ef9a72..b9ffd2e 100644
--- a/src/views/plugin/workflow/process/components/detail.vue
+++ b/src/views/plugin/workflow/process/components/detail.vue
@@ -103,7 +103,6 @@
                 <template slot="xitongmokuaishujubiao">
                   <el-select
                     filterable
-                    allow-create
                     clearable
                     v-model="form.xitongmokuaishujubiao"
                     placeholder=" "
@@ -395,7 +394,6 @@ export default {
         //     );
         // xitongmokuaishujubiao.dicData = res.data.data;
         this.taskTableData = res.data.data;
-        console.log('taskTableData ===>',this.taskTableData)
         if(this.taskTableData.length !== 0){
               // this.form.xitongmokuaishujubiao = xitongmokuaishujubiao.dicData[0].id;
               // this.form.xitongmokuaishujubiao = this.taskTableData[0].id;
@@ -494,7 +492,6 @@ export default {
           }
           option.column.find(item => item.prop == 'renwudengji').dicUrl = ''
           this.option = option;
-          console.log('summary',this.option)
           let detail = this.option.column.find(item => item.label == '详情')
           let colTmp = this.option.column.find(item => item.label == "系统名称/数据库/部门");
           let colTmp1 = this.option.column.find(item => item.label == "管理部门");
@@ -697,7 +694,6 @@ export default {
     },
     // 审核
     handleExamine(pass) {
-      console.log(this.findObject(this.option.column, "guanlibumen").dicData)
       this.submitLoading = true;
       const { form, summaryForm } = this.$refs;
       if (form) {
@@ -714,19 +710,22 @@ export default {
             variables.$renwuzhonglei = this.kindList.find(item => item.id == this.form.renwuzhonglei) ? this.kindList.find(item => item.id == this.form.renwuzhonglei).taskTypeName : '' 
             variables.$chongfumoshi = this.repeatList.find(item => item.id == this.form.chongfumoshi) ? this.repeatList.find(item => item.id == this.form.chongfumoshi).dictValue : '' 
             variables.$guanlibumen = 
-            this.findObject(this.option.column, "guanlibumen").dicData.find(item => item.id == this.form.guanlibumen) ? 
-            this.findObject(this.option.column, "guanlibumen").dicData.find(item => item.id == this.form.guanlibumen).deptName : '' 
+            this.findObject(this.option.column, "guanlibumen").dicData.find(item => item.deptName == this.form.guanlibumen) ? 
+            this.findObject(this.option.column, "guanlibumen").dicData.find(item => item.deptName == this.form.guanlibumen).deptName : '';
+             variables.guanlibumen = 
+            this.findObject(this.option.column, "guanlibumen").dicData.find(item => item.deptName == this.form.guanlibumen) ? 
+            this.findObject(this.option.column, "guanlibumen").dicData.find(item => item.deptName == this.form.guanlibumen).id : '' ; 
             variables.$renwudengji = this.findObject(this.option.column,"renwudengji").dicData.find(item => item.id == this.form.renwudengji) ? 
             this.findObject(this.option.column,"renwudengji").dicData.find(item => item.id == this.form.renwudengji).dictValue : '' 
             variables.$xitongmokuaishujubiao = this.findObject(this.option.column,"xitongmokuaishujubiao").dicData.find(item => item.id == this.form.xitongmokuaishujubiao) ? this.findObject(
               this.option.column,
               "xitongmokuaishujubiao"
             ).dicData.find(item => item.id == this.form.xitongmokuaishujubiao).datatableModuleName : '' 
-            console.log(variables)
             this.handleCompleteTask(pass, variables)
               .then(() => {
                 this.$message.success("处理成功");
-                this.handleCloseTag("/plugin/workflow/process/todo");
+                // this.handleCloseTag("/plugin/workflow/process/todo");
+                this.handleCloseTag("/plugin/workflow/process/workorder");
               })
               .catch(() => {
                 if (typeof done == "function") done();
diff --git a/src/views/plugin/workflow/process/components/effect.vue b/src/views/plugin/workflow/process/components/effect.vue
index 7cfc610..dc53023 100644
--- a/src/views/plugin/workflow/process/components/effect.vue
+++ b/src/views/plugin/workflow/process/components/effect.vue
@@ -230,7 +230,7 @@ export default {
             prop: "remark",
             labelPosition: "top",
             maxlength: 200,
-            showWordLimit:true,
+             showWordLimit:true,
             rules: [{ required: true, message: "请输入实施反馈" }],
             // disabled: (JSON.parse(this.$route.query.form).isFinish === 1 ) ? true : false,
           },
diff --git a/src/views/plugin/workflow/process/components/form.vue b/src/views/plugin/workflow/process/components/form.vue
index 97a5dae..2cb16b4 100644
--- a/src/views/plugin/workflow/process/components/form.vue
+++ b/src/views/plugin/workflow/process/components/form.vue
@@ -54,10 +54,12 @@
           </template>
           <template slot="xitongmingchengshujuku">
             <el-select
+              id="sql_id"
               filterable
               allow-create
               clearable
               v-model="form.xitongmingchengshujuku"
+              :filter-method="inputSubjectLimit()"
               placeholder="请选择部门系统"
               @change="systemChange"
             >
@@ -257,6 +259,12 @@ export default {
     console.log('xinjian')
   },
   methods: {
+    inputSubjectLimit(){
+      var inputSubjectId = document.querySelector('#sql_id')
+      if (inputSubjectId) {
+          inputSubjectId.setAttribute('maxLength', 50)
+      }
+    },
     // 运维公司-查部门
     companyChange(id) {
       // this.form.xitongmingchengshujuku = ''