Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev

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>

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
+export default t

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 {

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>

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>

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>

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>

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>