修改

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

@@ -7,13 +7,13 @@
       <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>
         <div class="row wrap">
-          <q-select filled stack-label option-value="SId" @input="queryDeptTree(objOption.School_Id)"
+          <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' :defaultArray="returnString" nodeKey="DeptId" :multiple="false"
+          <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 option-value="PostId" option-label="PostName" v-model="objOption.Post_Id"
+          <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"
@@ -161,6 +161,7 @@
         }],
         EducationList: [], //学历数组
         LeaveStatusList: [], //在职状态
+        isEditShow:false, //是否显示修改应该隐藏
       }
     },
     created() {
@@ -214,6 +215,7 @@
         console.log("this.saveObj", this.saveObj);
         if (this.saveObj) {
           this.optionTitle = "修改员工信息"
+          this.isEditShow=false;  //是否显示修改隐藏项
           queryEmployeeInfo({
             Id: this.saveObj.Id,
             AccountId: this.saveObj.AccountId,
@@ -245,7 +247,8 @@
             this.$forceUpdate();
           })
         } else {
-          this.optionTitle = "新增管理者"
+          this.optionTitle = "新增管理者";
+          this.isEditShow=true;
         }
       },
       getSchool() {

src/pages/school/sysuser.vue

@@ -3,8 +3,8 @@
     <div class="page-search row items-center">
       <div class="col row wrap q-mr-lg q-col-gutter-md">
         <div class="col-3">
-          <q-input @input="resetSearch" class="col-6 q-pr-lg q-pr-lg" clearable standout="bg-primary text-white" v-model="msg.EmployeeName"
-            label="员工姓名/账号" />
+          <q-input @input="resetSearch" class="col-6 q-pr-lg q-pr-lg" clearable standout="bg-primary text-white"
+            v-model="msg.EmployeeName" label="员工姓名/账号" />
         </div>
         <div class="col-3">
           <q-select filled stack-label @input="getDepartList(msg.School_Id),resetSearch()" option-value="SId"
@@ -27,48 +27,14 @@
             class="col-6 q-pr-lg q-pb-lg" emit-value map-options />
         </div>
         <div class="col-3">
-          <q-input filled v-model="msg.StartEntryTime" clearable @input="resetSearch" 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="qDateProxy1" transition-show="scale" transition-hide="scale">
-                  <q-date v-model="msg.StartEntryTime" @input="resetSearch(),() => $refs.qDateProxy1.hide()" />
-                </q-popup-proxy>
-              </q-icon>
-            </template>
-          </q-input>
+          <el-date-picker v-model="dateListOne" @change="resetSearch()" value-format="yyyy-MM-dd" type="daterange" range-separator="至"
+            start-placeholder="入职日期" end-placeholder="离职日期">
+          </el-date-picker>
         </div>
         <div class="col-3">
-          <q-input filled v-model="msg.EndEntryTime" clearable @input="resetSearch" 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">
-                  <q-date v-model="msg.EndEntryTime" @input="resetSearch(),() => $refs.qDateProxy2.hide()" />
-                </q-popup-proxy>
-              </q-icon>
-            </template>
-          </q-input>
-        </div>
-        <div class="col-3">
-          <q-input filled v-model="msg.StartBirthDate" clearable @input="resetSearch" class="col-3 q-pr-lg q-pb-lg" mask="date" label="生日开始日期">
-            <template v-slot:append>
-              <q-icon name="event" class="cursor-pointer">
-                <q-popup-proxy ref="qDateProxy3" transition-show="scale" transition-hide="scale">
-                  <q-date v-model="msg.StartBirthDate" @input="resetSearch(),() => $refs.qDateProxy3.hide()" />
-                </q-popup-proxy>
-              </q-icon>
-            </template>
-          </q-input>
-        </div>
-        <div class="col-3">
-          <q-input filled v-model="msg.EndBirthDate" clearable @input="resetSearch" class="col-3 q-pr-lg q-pb-lg" mask="date" label="生日结束日期">
-            <template v-slot:append>
-              <q-icon name="event" class="cursor-pointer">
-                <q-popup-proxy ref="qDateProxy4" transition-show="scale" transition-hide="scale">
-                  <q-date v-model="msg.EndBirthDate" @input="resetSearch(),() => $refs.qDateProxy4.hide()" />
-                </q-popup-proxy>
-              </q-icon>
-            </template>
-          </q-input>
+          <el-date-picker v-model="dateListTwo" @change="resetSearch()" type="monthrange" value-format="yyyy-MM" range-separator="至"
+            start-placeholder="生日开始月" end-placeholder="生日结束月">
+          </el-date-picker>
         </div>
         <!-- <div class="col-3">
           <q-input @input="resetSearch" clearable standout="bg-primary text-white" v-model="msg.MTel" label="电话" />
@@ -266,7 +232,7 @@
           School_Id: 0, //校区
           Dept_Id: 0, //部门
           Post_Id: 0, //岗位编号
-          LeaveStatus: -1, //在职状态
+          LeaveStatus: 0, //在职状态
           StartEntryTime: "", //入职开始时间
           EndEntryTime: "", //入职结束时间
           StartLeaveTime: "", //开始离职时间
@@ -285,6 +251,8 @@
         returnString: [], //默认岗位
         PostList: [], //岗位
         LeaveStatusList: [], //在职状态
+        dateListOne: [], //入职-离职日期
+        dateListTwo: [], //生日开始-结束日期
       }
     },
     mounted() {
@@ -415,6 +383,20 @@
       },
       getManager() {
         this.loading = true;
+        if (this.dateListOne && this.dateListOne.length > 0) {
+          this.msg.StartEntryTime = this.dateListOne[0];
+          this.msg.EndEntryTime = this.dateListOne[1];
+        } else {
+          this.msg.StartEntryTime = '';
+          this.msg.EndEntryTime = '';
+        }
+        if (this.dateListTwo && this.dateListTwo.length > 0) {
+          this.msg.StartBirthDate = this.dateListTwo[0];
+          this.msg.EndBirthDate = this.dateListTwo[1];
+        } else {
+          this.msg.StartBirthDate = '';
+          this.msg.EndBirthDate = '';
+        }
         queryManagerPage(this.msg).then(res => {
           this.loading = false;
           this.data = res.Data.PageData;