增加

src/components/school/manager/manager-form.vue

@@ -8,7 +8,7 @@
         <div class="text-caption q-mb-md q-px-xs text-grey-6">基本资料</div>
         <div class="row wrap">
           <q-select filled v-if="isEditShow" stack-label option-value="SId" option-label="SName"
-            v-model="objOption.School_Id" ref="School_Id" :options="schoolList" label="所属校区" :dense="false"
+            v-model="objOption.School_Id" ref="School_Id" :options="schoolList" label="所属校区"
             class="col-6 q-pb-lg q-pr-lg" emit-value map-options @input="schoolChagne" />
           <selectTree :treeData='DeptList' v-if="isEditShow" :defaultArray="returnString" nodeKey="DeptId"
             :multiple="false" labelKey="DeptName" childrenKey="ChildList" tipText="选择部门" @getChild="getChild"
@@ -59,7 +59,7 @@
             :rules="[val => !!val || '密码']" />
           <q-select filled stack-label option-value="Id" option-label="Name" v-model="objOption.LeaveStatus" @input='getLeave'
             ref="Education" :options="LeaveStatusList" label="在职状态" :dense="false" class="col-6 q-pr-lg q-pb-lg"
-            emit-value map-options /> 
+            emit-value map-options />   
           <q-input v-show="objOption.AccountId>0 && objOption.LeaveStatus==4" filled v-model="objOption.LeaveTime"
             class="col-6 q-pr-lg q-pb-lg" mask="date" label="离职时间">
             <template v-slot:append>
@@ -70,19 +70,21 @@
               </q-icon>
             </template>
           </q-input>
-          <div class="col-6 q-pb-lg" style="margin-top:20px;">
-            <q-uploader style="display: inline-block;max-height: 320px;max-width: 100%; background-repeat:no-repeat"
-              :style="{'background-image':'url(' + objOption.UserIcon + ')'}" max-files="1" hide-upload-btn
-              @rejected="onRejected" label="头像" accept=".jpg, image/*" auto-upload :factory="uploadFile" no-thumbnails>
-            </q-uploader>
-          </div>
           <q-select filled stack-label :disable="objOption.AccountId==0?false:true" option-value="Id"
             option-label="Value" ref="ID" v-model="objOption.AccountType" :options="AccountTypeList" label="用户类型"
             :dense="false" class="col-6 q-pr-lg q-pb-lg" emit-value map-options />
-
           <q-select filled stack-label option-value="Id" option-label="EmployeeName" ref="ID"
             v-model="objOption.DirectSupervisor" :options="EmployeeList" label="直属上级" :dense="false"
             class="col-6 q-pr-lg q-pb-lg" emit-value map-options />
+          <q-select filled stack-label option-value="Id" option-label="Name" ref="UserRole"
+              v-model="objOption.UserRole" :options="roleList" label="用户角色" :dense="false"
+              class="col-6 q-pr-lg q-pb-lg" emit-value map-options />
+          <div class="col-6 q-pb-lg" style="margin-top:20px;">
+            <q-uploader style="display: inline-block;max-height: 320px;max-width: 100%; background-repeat:no-repeat"
+              :style="{'background-image':'url(' + objOption.UserIcon + ')'}" max-files="1" hide-upload-btn
+              @rejected="onRejected" label="头像" accept=".jpg, image/*" auto-upload :factory="uploadFile" no-thumbnails>
+            </q-uploader>
+          </div>
         </div>
       </q-card-section>
       <q-separator />
@@ -153,7 +155,8 @@
           AccountType: 1, // 是否是老师
           AccountId: 0, //账号对应的表主键编号
           Email: "", //邮箱
-          DirectSupervisor: 0 //直属上级
+          DirectSupervisor: 0, //直属上级
+          UserRole: '' //用户角色(1-市场人员，2-课程顾问)
         },
         optionTitle: "",
         schoolList: [],
@@ -168,6 +171,13 @@
           Id: 1,
           Name: '女'
         }],
+        roleList:[{
+          Id:1,
+          Name:'市场人员'
+        },{
+          Id:2,
+          Name:'课程顾问'
+        }],
         EducationList: [], //学历数组
         LeaveStatusList: [], //在职状态
         isEditShow: false, //是否显示修改应该隐藏
@@ -322,6 +332,7 @@
             this.objOption.AccountId = res.Data.AccountId;
             this.objOption.Email = res.Data.Email;
             this.objOption.DirectSupervisor = res.Data.DirectSupervisor;
+            this.objOption.UserRole = res.Data.UserRole;
             if (this.objOption.School_Id) {
               this.queryDeptTree();
             }