页面修改

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

@@ -2,7 +2,7 @@
   <q-dialog v-model="persistent" content-class="bg-grey-1" persistent transition-show="scale" transition-hide="scale">
     <q-card style="width: 800px;max-width:900px;">
       <q-card-section>
-        <div class="text-h6">{{objOption.StuId==0?'新增管理者信息':'修改管理者信息'}}</div>
+        <div class="text-h6">{{objOption.AccountId==0?'新增员工信息':'修改员工信息'}}</div>
       </q-card-section>
       <q-card-section class="q-pt-none scroll" style="max-height: 70vh">
         <div class="text-caption q-mb-md q-px-xs text-grey-6">基本资料</div>
@@ -10,12 +10,12 @@
           <q-select filled v-if="isEditShow" stack-label option-value="SId" @input="queryDeptTree(objOption.School_Id)"
             option-label="SName" v-model="objOption.School_Id" ref="School_Id" :options="schoolList" label="所属校区"
             :dense="false" class="col-6 q-pb-lg q-pr-lg" emit-value map-options />
-          <selectTree :treeData='DeptList' v-if="isEditShow" :defaultArray="returnString" nodeKey="DeptId" :multiple="false"
-            labelKey="DeptName" childrenKey="ChildList" tipText="选择部门" @getChild="getChild"
+          <selectTree :treeData='DeptList' v-if="isEditShow" :defaultArray="returnString" nodeKey="DeptId"
+            :multiple="false" labelKey="DeptName" childrenKey="ChildList" tipText="选择部门" @getChild="getChild"
             classStr="col-6 q-pr-lg q-pb-lg"></selectTree>
-          <q-select filled stack-label v-if="isEditShow" option-value="PostId" option-label="PostName" v-model="objOption.Post_Id"
-            ref="Post_Id" :options="PostList" label="岗位" :dense="false" class="col-6 q-pr-lg q-pb-lg" emit-value
-            map-options />
+          <q-select filled stack-label v-if="isEditShow" option-value="PostId" option-label="PostName"
+            v-model="objOption.Post_Id" ref="Post_Id" :options="PostList" label="岗位" :dense="false"
+            class="col-6 q-pr-lg q-pb-lg" emit-value map-options />
           <q-input filled stack-label maxlength="20" :dense="false" v-model="objOption.EmployeeName" ref="EmployeeName"
             class="col-6 q-pr-lg q-pb-lg" label="管理者名称" :rules="[val => !!val || '请填写管理者姓名']" />
 
@@ -39,7 +39,8 @@
               </q-icon>
             </template>
           </q-input>
-          <q-input filled v-model="objOption.LeaveTime" class="col-6 q-pr-lg q-pb-lg" mask="date" label="离职时间">
+          <q-input v-if="objOption.AccountId>0" filled v-model="objOption.LeaveTime" class="col-6 q-pr-lg q-pb-lg"
+            mask="date" label="离职时间">
             <template v-slot:append>
               <q-icon name="event" class="cursor-pointer">
                 <q-popup-proxy ref="qDateProxy2" transition-show="scale" transition-hide="scale">
@@ -57,29 +58,25 @@
               </q-icon>
             </template>
           </q-input>
-          <q-input filled stack-label maxlength="20" :dense="false" v-model="objOption.Address" ref="Address"
+          <q-input filled stack-label maxlength="100" :dense="false" v-model="objOption.Address" ref="Address"
             class="col-6 q-pr-lg q-pb-lg" label="地址" :rules="[val => !!val || '地址']" />
-
           <q-input filled stack-label maxlength="20" :dense="false" v-model="objOption.Account" ref="Account"
             class="col-6 q-pr-lg q-pb-lg" label="账号" :rules="[val => !!val || '账号']" />
-
           <q-input filled stack-label maxlength="20" :dense="false" v-model="objOption.Password" ref="Password"
             class="col-6 q-pr-lg q-pb-lg" label="密码" :rules="[val => !!val || '密码']" />
-
           <q-select filled stack-label option-value="Id" option-label="Name" v-model="objOption.LeaveStatus"
             ref="Education" :options="LeaveStatusList" 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="管理者头像" :max-file-size="512*1024" accept=".jpg, image/*" auto-upload
+              @rejected="onRejected" label="头像" :max-file-size="512*1024" accept=".jpg, image/*" auto-upload
               :factory="uploadFile" no-thumbnails>
             </q-uploader>
           </div>
-          <q-toggle size="md" label="是否是老师" color="primary" :false-value="1" :true-value="0"
-            v-model="objOption.AccountType" />
-
+          <q-select filled stack-label 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 />
         </div>
       </q-card-section>
       <q-separator />
@@ -144,7 +141,7 @@
           Account: '', //账号
           Password: '', //密码
           AccountType: 1, // 是否是老师
-          AccountId:0,//账号对应的表主键编号
+          AccountId: 0, //账号对应的表主键编号
         },
         optionTitle: "",
         schoolList: [],
@@ -161,20 +158,32 @@
         }],
         EducationList: [], //学历数组
         LeaveStatusList: [], //在职状态
-        isEditShow:false, //是否显示修改应该隐藏
+        isEditShow: false, //是否显示修改应该隐藏
+        //账号类型
+        AccountTypeList: [{
+            Id: 1,
+            Value: "后台用户"
+          },
+          {
+            Id: 2,
+            Value: "教师"
+          },
+          {
+            Id: 3,
+            Value: "助教"
+          },
+        ],
       }
     },
     created() {
       this.queryDeptTree(0);
       this.queryPostList(0);
       this.getSchool();
-
       this.getEducationList();
       this.getLeaveState();
     },
     mounted() {
       this.initObj();
-
     },
     methods: {
       getChild(deptArray) {
@@ -212,16 +221,14 @@
         })
       },
       initObj() {
-        console.log("this.saveObj", this.saveObj);
         if (this.saveObj) {
           this.optionTitle = "修改员工信息"
-          this.isEditShow=false;  //是否显示修改隐藏项
+          this.isEditShow = false; //是否显示修改隐藏项
           queryEmployeeInfo({
             Id: this.saveObj.Id,
             AccountId: this.saveObj.AccountId,
             AccountType: this.saveObj.AccountType
           }).then(res => {
-            console.log("res", res);
             this.objOption.Id = res.Data.Id;
             this.objOption.School_Id = res.Data.School_Id;
             this.objOption.EmployeeName = res.Data.EmployeeName;
@@ -239,7 +246,7 @@
             this.objOption.LeaveStatus = res.Data.LeaveStatus;
             this.objOption.Account = res.Data.Account;
             this.objOption.AccountType = res.Data.AccountType;
-            this.objOption.AccountId=res.Data.AccountId;
+            this.objOption.AccountId = res.Data.AccountId;
             this.returnString.push(res.Data.Dept_Id.toString());
             if (this.objOption.Dept_Id && this.objOption.Dept_Id > 0) {
               this.queryPostList();
@@ -247,8 +254,8 @@
             this.$forceUpdate();
           })
         } else {
-          this.optionTitle = "新增管理者";
-          this.isEditShow=true;
+          this.optionTitle = "新增员工";
+          this.isEditShow = true;
         }
       },
       getSchool() {

src/pages/school/sysuser.vue

@@ -70,7 +70,7 @@
         </div>
       </div>
       <div class="page-option">
-        <q-btn color="accent" class="q-mr-md" icon="add" label="新增管理者" @click="EditManager(null)" />
+        <q-btn color="accent" class="q-mr-md" icon="add" label="新增员工" @click="EditManager(null)" />
         <q-btn-dropdown outline color="dark" label="更多">
           <q-list>
             <q-item clickable v-close-popup @click="getType(1)">