Commit 057ced88 authored by zhengke's avatar zhengke

修改

parent e15077b5
...@@ -40,7 +40,17 @@ ...@@ -40,7 +40,17 @@
            <template v-slot:control>             <template v-slot:control>
              <el-date-picker v-model="dateListOne" @change="resetSearch()" value-format="yyyy-MM-dd" type="daterange"               <el-date-picker v-model="dateListOne" @change="resetSearch()" value-format="yyyy-MM-dd" type="daterange"
 style="border:none;"  style="border:none;"
                range-separator="至" start-placeholder="入职日期" end-placeholder="入职结束">                 range-separator="至" start-placeholder="入职开始日期" end-placeholder="入职结束日期">
              </el-date-picker>
            </template>
          </q-field>
</div>
<div class="col-3 Sysuser_Date">
<q-field filled class="col-6 q-pr-lg q-pb-lg">
            <template v-slot:control>
              <el-date-picker v-model="dateListThree" @change="resetSearch()" value-format="yyyy-MM-dd" type="daterange"
 style="border:none;"
                range-separator="至" start-placeholder="离职开始日期" end-placeholder="离职结束日期">
              </el-date-picker>               </el-date-picker>
            </template>             </template>
          </q-field>           </q-field>
...@@ -271,6 +281,7 @@ ...@@ -271,6 +281,7 @@
LeaveStatusList: [], //在职状态 LeaveStatusList: [], //在职状态
dateListOne: [], //入职-离职日期 dateListOne: [], //入职-离职日期
dateListTwo: [], //生日开始-结束日期 dateListTwo: [], //生日开始-结束日期
dateListThree:[], //开始-结束离职日期
} }
}, },
mounted() { mounted() {
...@@ -415,6 +426,13 @@ ...@@ -415,6 +426,13 @@
this.msg.StartBirthDate = ''; this.msg.StartBirthDate = '';
this.msg.EndBirthDate = ''; this.msg.EndBirthDate = '';
} }
if (this.dateListThree && this.dateListThree.length > 0) {
this.msg.StartLeaveTime = this.dateListThree[0];
this.msg.EndLeaveTime = this.dateListThree[1];
} else {
this.msg.StartLeaveTime = '';
this.msg.EndLeaveTime = '';
}
queryManagerPage(this.msg).then(res => { queryManagerPage(this.msg).then(res => {
this.loading = false; this.loading = false;
this.data = res.Data.PageData; this.data = res.Data.PageData;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment