sunyize 2 rokov pred
rodič
commit
849373e8d8

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

@@ -249,13 +249,13 @@
           //   scopedSlots: {customRender: "avatarslot"}
           // },
 
-          {
-            title: '性别',
-            align: "center",
-            width: 80,
-            dataIndex: 'sex_dictText',
-            sorter: true
-          },
+          // {
+          //   title: '性别',
+          //   align: "center",
+          //   width: 80,
+          //   dataIndex: 'sex_dictText',
+          //   sorter: true
+          // },
           // {
           //   title: '生日',
           //   align: "center",
@@ -270,17 +270,17 @@
             dataIndex: 'phone'
           },
           {
-            title: '部门',
+            title: '归属部门',
             align: "center",
             width: 180,
             dataIndex: 'orgCodeTxt'
           },
-          {
-            title: '负责部门',
-            align: "center",
-            width: 180,
-            dataIndex: 'departIds_dictText'
-          },
+          // {
+          //   title: '负责部门',
+          //   align: "center",
+          //   width: 180,
+          //   dataIndex: 'departIds_dictText'
+          // },
           {
             title: '状态',
             align: "center",

+ 22 - 20
src/views/system/modules/UserModal.vue

@@ -62,21 +62,23 @@
           <j-select-depart v-model="model.selecteddeparts" :multi="true" @back="backDepartInfo" :backDepart="true" :treeOpera="true">></j-select-depart>
         </a-form-model-item>
 
-
-        <a-form-model-item label="身份" :labelCol="labelCol" :wrapperCol="wrapperCol">
-          <a-radio-group  v-model="model.userIdentity"  @change="identityChange">
-            <a-radio :value="1">普通用户</a-radio>
-            <a-radio :value="2">上级</a-radio>
-          </a-radio-group>
-        </a-form-model-item>
-        <a-form-model-item label="负责部门" :labelCol="labelCol" :wrapperCol="wrapperCol"  v-if="departIdShow==true">
-          <j-multi-select-tag
-            :disabled="disableSubmit"
-            v-model="model.departIds"
-            :options="nextDepartOptions"
-            placeholder="请选择负责部门">
-          </j-multi-select-tag>
+        <a-form-model-item label="人员岗位" :labelCol="labelCol" :wrapperCol="wrapperCol"  >
+          <a-input placeholder="请输入人员岗位" v-model="model.position" />
         </a-form-model-item>
+<!--        <a-form-model-item label="身份" :labelCol="labelCol" :wrapperCol="wrapperCol">-->
+<!--          <a-radio-group  v-model="model.userIdentity"  @change="identityChange">-->
+<!--            <a-radio :value="1">普通用户</a-radio>-->
+<!--            <a-radio :value="2">上级</a-radio>-->
+<!--          </a-radio-group>-->
+<!--        </a-form-model-item>-->
+<!--        <a-form-model-item label="负责部门" :labelCol="labelCol" :wrapperCol="wrapperCol"  v-if="departIdShow==true">-->
+<!--          <j-multi-select-tag-->
+<!--            :disabled="disableSubmit"-->
+<!--            v-model="model.departIds"-->
+<!--            :options="nextDepartOptions"-->
+<!--            placeholder="请选择负责部门">-->
+<!--          </j-multi-select-tag>-->
+<!--        </a-form-model-item>-->
 
 <!--        <a-form-model-item label="生日" :labelCol="labelCol" :wrapperCol="wrapperCol">-->
 <!--          <a-date-picker-->
@@ -87,12 +89,12 @@
 <!--            :getCalendarContainer="node => node.parentNode"/>-->
 <!--        </a-form-model-item>-->
 
-        <a-form-model-item label="性别" :labelCol="labelCol" :wrapperCol="wrapperCol">
-          <a-select  v-model="model.sex"  placeholder="请选择性别" :getPopupContainer= "(target) => target.parentNode">
-            <a-select-option :value="1">男</a-select-option>
-            <a-select-option :value="2">女</a-select-option>
-          </a-select>
-        </a-form-model-item>
+<!--        <a-form-model-item label="性别" :labelCol="labelCol" :wrapperCol="wrapperCol">-->
+<!--          <a-select  v-model="model.sex"  placeholder="请选择性别" :getPopupContainer= "(target) => target.parentNode">-->
+<!--            <a-select-option :value="1">男</a-select-option>-->
+<!--            <a-select-option :value="2">女</a-select-option>-->
+<!--          </a-select>-->
+<!--        </a-form-model-item>-->
 
         <a-form-model-item label="邮箱" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="email">
           <a-input placeholder="请输入邮箱" v-model="model.email" />