From ed8fed60b5d8276df2acd6f046286850e1beedc3 Mon Sep 17 00:00:00 2001
From: wuhongjian <wuhongjian@hisense.com>
Date: Mon, 26 Dec 2022 16:13:15 +0800
Subject: [PATCH] =?UTF-8?q?254=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 back/src/App.vue                                           | 4 ++--
 back/src/i18n/zh-CN.js                                     | 3 ++-
 back/src/views/modules/activiti/RoomExamineAdminDone.vue   | 4 +++-
 .../views/modules/hasToDoTasks/AbilityResourceShelf.vue    | 7 +++++--
 .../views/modules/hasToDoTasks/AbilityResourcesRemoved.vue | 7 +++++--
 .../hasToDoTasks/ApplicationForCompetencyRequirements.vue  | 7 +++++--
 back/src/views/modules/hasToDoTasks/CommentModeration.vue  | 7 +++++--
 .../views/modules/hasToDoTasks/CompetencyApplication.vue   | 7 +++++--
 8 files changed, 32 insertions(+), 14 deletions(-)

diff --git a/back/src/App.vue b/back/src/App.vue
index 36cb8b9d..482fc825 100644
--- a/back/src/App.vue
+++ b/back/src/App.vue
@@ -24,7 +24,7 @@
     line-height: 32px !important;
     justify-content: center !important;
     min-width: 80px !important;
-    border-radius:2px !important;  
+    border-radius:2px !important;
   } */
   /* .el-button--primary {
     vertical-align: middle !important;
@@ -34,7 +34,7 @@
     line-height: 32px !important;
     justify-content: center !important;
     min-width: 80px !important;
-    border-radius:2px !important;  
+    border-radius:2px !important;
   }  */
 </style>
 <script>
diff --git a/back/src/i18n/zh-CN.js b/back/src/i18n/zh-CN.js
index 4e8b0e9a..708cc8ef 100644
--- a/back/src/i18n/zh-CN.js
+++ b/back/src/i18n/zh-CN.js
@@ -118,6 +118,7 @@ t.model.description = '描述'
 
 t.process = {}
 t.process.name = '名称'
+t.process.userName = '申请人'
 t.process.key = '标识'
 t.process.deployFile = '部署流程文件'
 t.process.id = '流程ID'
@@ -576,4 +577,4 @@ t.infrastructure.street = '所在街道'
 t.infrastructure.department = '所属部门'
 t.infrastructure.associatedApplication = '关联应用'
 
-export default t
\ No newline at end of file
+export default t
diff --git a/back/src/views/modules/activiti/RoomExamineAdminDone.vue b/back/src/views/modules/activiti/RoomExamineAdminDone.vue
index c5664233..2c7176dd 100644
--- a/back/src/views/modules/activiti/RoomExamineAdminDone.vue
+++ b/back/src/views/modules/activiti/RoomExamineAdminDone.vue
@@ -1,6 +1,7 @@
 <template>
   <el-card shadow="never" class="roomBox">
     <div class="roomExamineSearch">
+      <p>会客厅名称： </p>
       <el-input
         v-model="roomNameA"
         style="width: 160px"
@@ -328,9 +329,10 @@ export default {
   }
   .roomExamineSearch {
     display: flex;
-    width: 240px;
+    width: 340px;
     margin-bottom: 20px;
     justify-content: space-between;
+    align-items: baseline;
   }
 }
 .dialog-footer {
diff --git a/back/src/views/modules/hasToDoTasks/AbilityResourceShelf.vue b/back/src/views/modules/hasToDoTasks/AbilityResourceShelf.vue
index 0b2fbbc3..f6f8157d 100644
--- a/back/src/views/modules/hasToDoTasks/AbilityResourceShelf.vue
+++ b/back/src/views/modules/hasToDoTasks/AbilityResourceShelf.vue
@@ -7,10 +7,13 @@
         :model="dataForm"
         @keyup.enter.native="getDataList()"
       >
+      <el-form-item>
+          <span>{{ $t('process.userName') + ':'}}</span>
+        </el-form-item>
         <el-form-item>
           <el-input
-            v-model="dataForm.processDefinitionId"
-            :placeholder="$t('process.name')"
+            v-model="dataForm.userName"
+            :placeholder="$t('process.userName')"
             clearable
           ></el-input>
         </el-form-item>
diff --git a/back/src/views/modules/hasToDoTasks/AbilityResourcesRemoved.vue b/back/src/views/modules/hasToDoTasks/AbilityResourcesRemoved.vue
index a2eb4a62..bb197b8f 100644
--- a/back/src/views/modules/hasToDoTasks/AbilityResourcesRemoved.vue
+++ b/back/src/views/modules/hasToDoTasks/AbilityResourcesRemoved.vue
@@ -7,10 +7,13 @@
         :model="dataForm"
         @keyup.enter.native="getDataList()"
       >
+      <el-form-item>
+          <span>{{ $t('process.userName') + ':'}}</span>
+        </el-form-item>
         <el-form-item>
           <el-input
-            v-model="dataForm.processDefinitionId"
-            :placeholder="$t('process.name')"
+            v-model="dataForm.userName"
+            :placeholder="$t('process.userName')"
             clearable
           ></el-input>
         </el-form-item>
diff --git a/back/src/views/modules/hasToDoTasks/ApplicationForCompetencyRequirements.vue b/back/src/views/modules/hasToDoTasks/ApplicationForCompetencyRequirements.vue
index f0aebf5b..fbf0b86c 100644
--- a/back/src/views/modules/hasToDoTasks/ApplicationForCompetencyRequirements.vue
+++ b/back/src/views/modules/hasToDoTasks/ApplicationForCompetencyRequirements.vue
@@ -7,10 +7,13 @@
         :model="dataForm"
         @keyup.enter.native="getDataList()"
       >
+      <el-form-item>
+          <span>{{ $t('process.userName') + ':'}}</span>
+        </el-form-item>
         <el-form-item>
           <el-input
-            v-model="dataForm.processDefinitionId"
-            :placeholder="$t('process.name')"
+            v-model="dataForm.userName"
+            :placeholder="$t('process.userName')"
             clearable
           ></el-input>
         </el-form-item>
diff --git a/back/src/views/modules/hasToDoTasks/CommentModeration.vue b/back/src/views/modules/hasToDoTasks/CommentModeration.vue
index 9f9597ae..d8b5ce91 100644
--- a/back/src/views/modules/hasToDoTasks/CommentModeration.vue
+++ b/back/src/views/modules/hasToDoTasks/CommentModeration.vue
@@ -7,10 +7,13 @@
         :model="dataForm"
         @keyup.enter.native="getDataList()"
       >
+      <el-form-item>
+          <span>{{ $t('process.userName') + ':'}}</span>
+        </el-form-item>
         <el-form-item>
           <el-input
-            v-model="dataForm.processDefinitionId"
-            :placeholder="$t('process.name')"
+            v-model="dataForm.userName"
+            :placeholder="$t('process.userName')"
             clearable
           ></el-input>
         </el-form-item>
diff --git a/back/src/views/modules/hasToDoTasks/CompetencyApplication.vue b/back/src/views/modules/hasToDoTasks/CompetencyApplication.vue
index 99bc8075..f6e93a94 100644
--- a/back/src/views/modules/hasToDoTasks/CompetencyApplication.vue
+++ b/back/src/views/modules/hasToDoTasks/CompetencyApplication.vue
@@ -7,10 +7,13 @@
         :model="dataForm"
         @keyup.enter.native="getDataList()"
       >
+      <el-form-item>
+          <span>{{ $t('process.userName') + ':'}}</span>
+        </el-form-item>
         <el-form-item>
           <el-input
-            v-model="dataForm.processDefinitionId"
-            :placeholder="$t('process.name')"
+            v-model="dataForm.userName"
+            :placeholder="$t('process.userName')"
             clearable
           ></el-input>
         </el-form-item>