From 7b8db0f19f98adc1216bfb73dbaeb7cd91706c3b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Tue, 21 Feb 2023 00:31:43 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=99=E7=94=A8=E6=88=B7=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=98=AF=E5=90=A6=E7=BB=8F=E7=90=86=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jshERP-web/src/views/system/UserList.vue          | 5 +++--
 jshERP-web/src/views/system/modules/UserModal.vue | 8 +++++++-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/jshERP-web/src/views/system/UserList.vue b/jshERP-web/src/views/system/UserList.vue
index 84ddf008..4b2a4896 100644
--- a/jshERP-web/src/views/system/UserList.vue
+++ b/jshERP-web/src/views/system/UserList.vue
@@ -130,13 +130,14 @@
             dataIndex: 'action',
             scopedSlots: {customRender: 'action'},
             align: "center",
-            width: 260
+            width: 160
           },
           { title: '登录名称', dataIndex: 'loginName', width: 100, align: "left"},
           { title: '用户姓名', dataIndex: 'username', width: 100, align: "left"},
           { title: '用户类型', dataIndex: 'userType', width: 80, align: "left" },
           { title: '角色', dataIndex: 'roleName', width: 100, align: "left"},
-          { title: '机构', dataIndex: 'orgAbr', width: 115, align: "left"},
+          { title: '机构', dataIndex: 'orgAbr', width: 140, align: "left"},
+          { title: '是否经理', dataIndex: 'leaderFlagStr', width: 80, align: "left"},
           { title: '电话号码', dataIndex: 'phonenum', width: 120, align: "left"},
           { title: '排序', dataIndex: 'userBlngOrgaDsplSeq', width: 60, align: "left"},
           { title: '状态',dataIndex: 'status',width:70,align:"center",
diff --git a/jshERP-web/src/views/system/modules/UserModal.vue b/jshERP-web/src/views/system/modules/UserModal.vue
index faaa880b..b814f8fb 100644
--- a/jshERP-web/src/views/system/modules/UserModal.vue
+++ b/jshERP-web/src/views/system/modules/UserModal.vue
@@ -44,6 +44,12 @@
           <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="职位">
             <a-input placeholder="请输入职位" v-decorator.trim="[ 'position' ]" />
           </a-form-item>
+          <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="是否经理">
+            <a-select placeholder="请选择是否经理" v-decorator="[ 'leaderFlag' ]">
+              <a-select-option value="1">是</a-select-option>
+              <a-select-option value="0">否</a-select-option>
+            </a-select>
+          </a-form-item>
           <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="电话号码">
             <a-input placeholder="请输入电话号码" v-decorator.trim="[ 'phonenum' ]" />
           </a-form-item>
@@ -139,7 +145,7 @@
         this.visible = true;
         this.model = Object.assign({}, record);
         this.$nextTick(() => {
-          this.form.setFieldsValue(pick(this.model,'loginName','username','roleId','orgaId','position',
+          this.form.setFieldsValue(pick(this.model,'loginName','username','roleId','orgaId','position','leaderFlag',
             'phonenum','email','userBlngOrgaDsplSeq','description'))
           autoJumpNextInput('userModal')
         });