LiGuang 3 years ago
parent
commit
fd631e0eea

+ 2 - 2
src/views/system/UserList.vue

@@ -150,9 +150,9 @@
                 <a href="javascript:;" @click="handleDetail(record)">详情</a>
               </a-menu-item>
 
-              <a-menu-item v-has='"user:pwd"'>
+              <!-- <a-menu-item v-has='"user:pwd"'>
                 <a href="javascript:;" @click="handleChangePassword(record.username)">密码</a>
-              </a-menu-item>
+              </a-menu-item> -->
 
               <a-menu-item v-has='"user:delete"'>
                 <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">

+ 4 - 4
src/views/system/modules/DeptUserInfo.vue

@@ -6,8 +6,8 @@
       <a-form layout="inline">
         <a-row :gutter="10">
           <a-col :md="10" :sm="12">
-            <a-form-item label="用户号" style="margin-left:8px">
-              <a-input placeholder="请输入账号" v-model="queryParam.username"></a-input>
+            <a-form-item label="用户号" style="margin-left:8px">
+              <a-input placeholder="请输入用户工号" v-model="queryParam.workNo"></a-input>
             </a-form-item>
           </a-col>
           <!--<a-col :md="8" :sm="8">-->
@@ -125,9 +125,9 @@
         currentDeptId: '',
         // 表头
         columns: [{
-            title: '用户号',
+            title: '用户号',
             align: "center",
-            dataIndex: 'username'
+            dataIndex: 'workNo'
           },
           {
             title: '用户名称',

+ 4 - 4
src/views/system/modules/UserModal.vue

@@ -214,19 +214,19 @@
        <!-- <a-form-item label="工作流引擎" :labelCol="labelCol" :wrapperCol="wrapperCol">
           <j-dict-select-tag  v-decorator="['activitiSync', {}]" placeholder="请选择是否同步工作流引擎" :type="'radio'" :triggerChange="true" dictCode="activiti_sync"/>
         </a-form-item> -->
-        <a-form-item label="是否考勤" :labelCol="labelCol" :wrapperCol="wrapperCol">
+        <!-- <a-form-item label="是否考勤" :labelCol="labelCol" :wrapperCol="wrapperCol">
           <a-select v-model="isAttendance" placeholder="请选择是否考勤" :getPopupContainer= "(target) => target.parentNode">
             <a-select-option value="0">是</a-select-option>
             <a-select-option value="1">否</a-select-option>
           </a-select>
-        </a-form-item>
+        </a-form-item> -->
         
-        <a-form-item label="是否算薪" :labelCol="labelCol" :wrapperCol="wrapperCol">
+        <!-- <a-form-item label="是否算薪" :labelCol="labelCol" :wrapperCol="wrapperCol">
           <a-select v-model="isSalary" placeholder="请选择是否算薪" :getPopupContainer= "(target) => target.parentNode">
             <a-select-option value="0">是</a-select-option>
             <a-select-option value="1">否</a-select-option>
           </a-select>
-        </a-form-item>
+        </a-form-item> -->
         
         <a-form-item label="同步信息" :labelCol="labelCol" :wrapperCol="wrapperCol">
           <j-dict-select-tag  v-decorator="['infoSy', {initialValue:3}]" placeholder="请选择同步" :type="'radio'" :triggerChange="true" dictCode="info_sy"/>