From c4a3f9fa76d8ad5d2ef263fe6b4598bd427a5536 Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Fri, 4 Mar 2022 14:32:59 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=AE=A1=E7=90=86=E3=80=81?=
 =?UTF-8?q?=E8=A7=92=E8=89=B2=E7=AE=A1=E7=90=86=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/common/lang/en-us.js             |  2 +-
 jero-web/src/views/system/DepartList.vue      | 90 ++++++++++---------
 jero-web/src/views/system/RoleUserList.vue    | 62 ++++++++++---
 jero-web/src/views/system/UserList.vue        | 18 ++--
 .../src/views/system/modules/DeptUserInfo.vue | 22 ++---
 5 files changed, 121 insertions(+), 73 deletions(-)

diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js
index b3fbb05b0..47e57ad62 100644
--- a/jero-web/src/common/lang/en-us.js
+++ b/jero-web/src/common/lang/en-us.js
@@ -35,7 +35,7 @@ module.exports = {
   freezePassword: 'Are you sure to freeze?',
   youThaw: 'Are you sure to thaw?',
   freezePasManagementPage: 'This is the user management page?',
-  serialNumber: 'serial number',
+  serialNumber: 'number',
   userAccount: 'user account',
   userName: 'User name',
   department: 'department',
diff --git a/jero-web/src/views/system/DepartList.vue b/jero-web/src/views/system/DepartList.vue
index bed61935b..71e4c0c9b 100644
--- a/jero-web/src/views/system/DepartList.vue
+++ b/jero-web/src/views/system/DepartList.vue
@@ -102,27 +102,33 @@
                 :labelCol="labelCol"
                 :wrapperCol="wrapperCol"
                 :label="$t('OrganizationType')">
-                <template v-if="orgCategoryDisabled">
-                  <a-radio-group v-decorator="['orgCategory',validatorRules.orgCategory]"
-                                 :disabled="disable"
-                                 :placeholder="$t('PleaseSelectOrganizationType')">
-                    <a-radio value="1">
-                      {{$t('company')}}
-                    </a-radio>
-                  </a-radio-group>
-                </template>
-                <template v-else>
-                  <a-radio-group v-decorator="['orgCategory',validatorRules.orgCategory]"
-                                 :disabled="disable"
-                                 :placeholder="$t('PleaseSelectOrganizationType')">
-                    <a-radio value="2">
-                      {{$t('department')}}
-                    </a-radio>
-                    <a-radio value="3">
-                      {{$t('post')}}
-                    </a-radio>
-                  </a-radio-group>
-                </template>
+                <j-dict-select-tag class="box-input"
+                                   v-decorator="['orgCategory',validatorRules.orgCategory]"
+                                   :disabled="disable"
+                                   :placeholder="$t('pleaseSelect')+$t('OrganizationType')"
+                                   :type="'select'"
+                                   triggerChange dictCode="org_category"/>
+                <!--                <template v-if="orgCategoryDisabled">-->
+                <!--                  <a-radio-group v-decorator="['orgCategory',validatorRules.orgCategory]"-->
+                <!--                                 :disabled="disable"-->
+                <!--                                 :placeholder="$t('PleaseSelectOrganizationType')">-->
+                <!--                    <a-radio value="1">-->
+                <!--                      {{$t('company')}}-->
+                <!--                    </a-radio>-->
+                <!--                  </a-radio-group>-->
+                <!--                </template>-->
+                <!--                <template v-else>-->
+                <!--                  <a-radio-group v-decorator="['orgCategory',validatorRules.orgCategory]"-->
+                <!--                                 :disabled="disable"-->
+                <!--                                 :placeholder="$t('PleaseSelectOrganizationType')">-->
+                <!--                    <a-radio value="2">-->
+                <!--                      {{$t('department')}}-->
+                <!--                    </a-radio>-->
+                <!--                    <a-radio value="3">-->
+                <!--                      {{$t('post')}}-->
+                <!--                    </a-radio>-->
+                <!--                  </a-radio-group>-->
+                <!--                </template>-->
               </a-form-item>
               <a-form-item
                 :labelCol="labelCol"
@@ -130,27 +136,27 @@
                 :label="$t('sort')">
                 <a-input-number :disabled="disable" v-decorator="[ 'departOrder',{'initialValue':0}]"/>
               </a-form-item>
-              <a-form-item
-                :labelCol="labelCol"
-                :wrapperCol="wrapperCol"
-                :label="$t('phoneNumber')">
-                <a-input :disabled="disable" :placeholder="$t('enterMobileNumber')"
-                         v-decorator="['mobile', {'initialValue':''}]"/>
-              </a-form-item>
-              <a-form-item
-                :labelCol="labelCol"
-                :wrapperCol="wrapperCol"
-                :label="$t('address')">
-                <a-input :disabled="disable" :placeholder="$t('enterAddress')"
-                         v-decorator="['address', {'initialValue':''}]"/>
-              </a-form-item>
-              <a-form-item
-                :labelCol="labelCol"
-                :wrapperCol="wrapperCol"
-                :label="$t('remarks')">
-                <a-textarea :disabled="disable" :placeholder="$t('enterComments')"
-                            v-decorator="['memo', {'initialValue':''}]"/>
-              </a-form-item>
+              <!--              <a-form-item-->
+              <!--                :labelCol="labelCol"-->
+              <!--                :wrapperCol="wrapperCol"-->
+              <!--                :label="$t('phoneNumber')">-->
+              <!--                <a-input :disabled="disable" :placeholder="$t('enterMobileNumber')"-->
+              <!--                         v-decorator="['mobile', {'initialValue':''}]"/>-->
+              <!--              </a-form-item>-->
+              <!--              <a-form-item-->
+              <!--                :labelCol="labelCol"-->
+              <!--                :wrapperCol="wrapperCol"-->
+              <!--                :label="$t('address')">-->
+              <!--                <a-input :disabled="disable" :placeholder="$t('enterAddress')"-->
+              <!--                         v-decorator="['address', {'initialValue':''}]"/>-->
+              <!--              </a-form-item>-->
+              <!--              <a-form-item-->
+              <!--                :labelCol="labelCol"-->
+              <!--                :wrapperCol="wrapperCol"-->
+              <!--                :label="$t('remarks')">-->
+              <!--                <a-textarea :disabled="disable" :placeholder="$t('enterComments')"-->
+              <!--                            v-decorator="['memo', {'initialValue':''}]"/>-->
+              <!--              </a-form-item>-->
             </a-form>
             <!--            <div class="anty-form-btn">-->
             <!--              <a-button @click="emptyCurrForm" type="default" htmlType="button" icon="sync">{{$t('reset')}}</a-button>-->
diff --git a/jero-web/src/views/system/RoleUserList.vue b/jero-web/src/views/system/RoleUserList.vue
index 198684a45..a8e3f4f5b 100644
--- a/jero-web/src/views/system/RoleUserList.vue
+++ b/jero-web/src/views/system/RoleUserList.vue
@@ -6,18 +6,20 @@
       <a-form layout="inline" @keyup.enter.native="searchQuery">
         <a-row :gutter="24">
           <a-col :md="6" :sm="8">
-            <a-form-item :label="$t('roleName')">
-              <a-input placeholder="" v-model="queryParam.roleName"></a-input>
-            </a-form-item>
+            <div class="box-title-text">
+              <div class="title-text" :title="$t('roleName')">
+                <span>{{$t('roleName')}}</span>
+              </div>
+              <j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('roleName')"
+                       v-model="queryParam.roleName"></j-input>
+            </div>
           </a-col>
-          <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
-            <a-col :md="6" :sm="24">
-               <a-button type="primary" @click="searchQuery" icon="search"
-                         style="margin-left: 21px">{{$t('query')}}</a-button>
-              <a-button type="primary" @click="searchReset" icon="reload"
-                        style="margin-left: 8px">{{$t('reset')}}</a-button>
-            </a-col>
-          </span>
+          <span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
+               <a-col :md="6" :sm="24">
+                  <a-button class="box-button" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
+                  <a-button class="box-button" style="margin-left: 8px" @click="searchReset">{{$t('reset')}}</a-button>
+               </a-col>
+      </span>
         </a-row>
       </a-form>
     </div>
@@ -28,7 +30,10 @@
       <!--          <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">-->
       <!--            <a-button type="primary" icon="import">{{$t('import')}}</a-button>-->
       <!--          </a-upload>-->
-      <!--          <a-button type="primary" icon="download" @click="handleExportXls($t('RoleManagement'))">{{$t('export')}}</a-button>-->
+      <div  @click="handleExportXls($t('RoleManagement'))" class="operator-text">
+        <a-icon type="export" :rotate="-90"/>
+        {{$t('export')}}
+      </div>
     </div>
 
     <!--        <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">-->
@@ -364,4 +369,37 @@
   .ant-btn {
     margin-left: 8px
   }
+  .box-title-text {
+    line-height: 1.4;
+    display: flex;
+    align-items: center;
+    margin-bottom: 10px;
+  }
+
+  .title-text {
+    width: 20%;
+    min-width: 90px;
+    color: #000F16;
+    display: inline-block;
+    font-weight: 500;
+    font-size: 14px;
+    margin-right: 16px;
+    margin-top: 3px;
+    text-align: right;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+  }
+
+  .box-input {
+    display: inline-block;
+    width: 70%;
+    height: 38px;
+    margin-top: 2px;
+  }
+
+  .box-button {
+    height: 38px;
+    /*margin-top: 2px;*/
+  }
 </style>
\ No newline at end of file
diff --git a/jero-web/src/views/system/UserList.vue b/jero-web/src/views/system/UserList.vue
index 771ac1267..436f5110b 100644
--- a/jero-web/src/views/system/UserList.vue
+++ b/jero-web/src/views/system/UserList.vue
@@ -10,8 +10,8 @@
               <div class="title-text" :title="$t('account')">
                 <span>{{$t('account')}}</span>
               </div>
-              <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('account')"
-                       v-model="queryParam.username"></a-input>
+              <j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('account')"
+                       v-model="queryParam.username"></j-input>
             </div>
           </a-col>
           <a-col :md="6" :sm="8">
@@ -19,8 +19,8 @@
               <div class="title-text" :title="$t('RealName')">
                 <span>{{$t('RealName')}}</span>
               </div>
-              <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('RealName')"
-                       v-model="queryParam.realname"></a-input>
+              <j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('RealName')"
+                       v-model="queryParam.realname"></j-input>
             </div>
           </a-col>
           <a-col :md="6" :sm="8">
@@ -28,8 +28,8 @@
               <div class="title-text" :title="$t('EmployeeNumber')">
                 <span>{{$t('EmployeeNumber')}}</span>
               </div>
-              <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('EmployeeNumber')"
-                       v-model="queryParam.workNo"></a-input>
+              <j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('EmployeeNumber')"
+                       v-model="queryParam.workNo"></j-input>
             </div>
           </a-col>
           <a-col :md="6" :sm="8">
@@ -67,13 +67,17 @@
     </div>
 
     <!-- 操作按钮区域 -->
-    <div class="table-operator" style="border-top: 5px">
+    <div class="table-operator">
       <!--      <a-button @click="handleAdd" type="primary" icon="plus" >{{$t('addUser')}}</a-button>-->
       <!--      <a-button type="primary" icon="download" @click="handleExportXls($t('userInformation'))">{{$t('export')}}</a-button>-->
       <!--      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">-->
       <!--        <a-button type="primary" icon="import">{{$t('import')}}</a-button>-->
       <!--      </a-upload>-->
       <!--      <a-button type="primary" icon="hdd" @click="recycleBinVisible=true">{{$t('recycleBin')}}</a-button>-->
+      <div @click="handleExportXls($t('userInformation'))" class="operator-text">
+        <a-icon type="export" :rotate="-90"/>
+        {{$t('export')}}
+      </div>
     </div>
 
     <!-- table区域-begin -->
diff --git a/jero-web/src/views/system/modules/DeptUserInfo.vue b/jero-web/src/views/system/modules/DeptUserInfo.vue
index 99d469784..5fe935b5e 100644
--- a/jero-web/src/views/system/modules/DeptUserInfo.vue
+++ b/jero-web/src/views/system/modules/DeptUserInfo.vue
@@ -7,7 +7,7 @@
         <a-row :gutter="10">
           <a-col :md="10" :sm="12">
             <a-form-item :label="$t('userAccount')" style="margin-left:8px">
-              <a-input :placeholder="$t('enterAccountNumber')" v-model="queryParam.username"></a-input>
+              <j-input :placeholder="$t('enterAccountNumber')" v-model="queryParam.username"></j-input>
             </a-form-item>
           </a-col>
           <span style="float: left;overflow: hidden;margin-top: 1px" class="table-page-search-submitButtons">
@@ -129,16 +129,16 @@
             align: "center",
             dataIndex: 'orgCode'
           },
-          {
-            title: this.$t('Gender'),
-            align: "center",
-            dataIndex: 'sex_dictText'
-          },
-          {
-            title: this.$t('phoneNumber'),
-            align: "center",
-            dataIndex: 'phone'
-          },
+          // {
+          //   title: this.$t('Gender'),
+          //   align: "center",
+          //   dataIndex: 'sex_dictText'
+          // },
+          // {
+          //   title: this.$t('phoneNumber'),
+          //   align: "center",
+          //   dataIndex: 'phone'
+          // },
           // {
           //   title: this.$t('operation'),
           //   dataIndex: 'action',