优化

src/components/MdpDateRange/index.vue

@@ -100,6 +100,7 @@ export default {
   methods: { 
       
       initData(){
+        debugger;
           this.dateRange=[];
           if(this.value instanceof Array){
               this.dateRange=this.value
@@ -133,6 +134,9 @@ export default {
             }else if(dates && dates.length===0){
                 this.value[this.startKey]=null
                 this.value[this.endKey]=null
+            }else if(!dates){
+               this.value[this.startKey]=null
+               this.value[this.endKey]=null
             }
             this.$emit('input',this.value)
           }else if(this.value instanceof Array){

src/views/xm/core/xmMenu/XmEpicFeatures.vue

@@ -223,7 +223,7 @@
 				xmMenus: [],//查询结果
 				pageInfo:{//分页数据
 					total:0,//服务器端收到0时，会自动计算总记录数，如果上传>0的不自动计算。
-					pageSize:150,//每页数据
+					pageSize:100,//每页数据
 					count:false,//是否需要重新计算总记录数
 					pageNum:1,//当前页码、从1开始计算
 					orderFields:[],//排序列 如 ['sex','student_id']，必须为数据库字段

src/views/xm/core/xmMenu/XmEpicFeaturesSelect.vue

@@ -116,7 +116,7 @@
 				xmMenus: [],//查询结果
 				pageInfo:{//分页数据
 					total:0,//服务器端收到0时，会自动计算总记录数，如果上传>0的不自动计算。
-					pageSize:150,//每页数据
+					pageSize:100,//每页数据
 					count:false,//是否需要重新计算总记录数
 					pageNum:1,//当前页码、从1开始计算
 					orderFields:[],//排序列 如 ['sex','student_id']，必须为数据库字段

src/views/xm/core/xmTask/XmPhase.vue

@@ -461,7 +461,7 @@ export default {
       pageInfo: {
         //分页数据
         total: 0, //服务器端收到0时，会自动计算总记录数，如果上传>0的不自动计算。
-        pageSize: 150, //每页数据
+        pageSize: 100, //每页数据
         count: false, //是否需要重新计算总记录数
         pageNum: 1, //当前页码、从1开始计算
         orderFields: ["sort_level"], //排序列 如 ['sex','student_id']，必须为数据库字段

src/views/xm/core/xmTask/XmPhaseSelect.vue

@@ -167,7 +167,7 @@ export default {
       pageInfo: {
         //分页数据
         total: 0, //服务器端收到0时，会自动计算总记录数，如果上传>0的不自动计算。
-        pageSize: 150, //每页数据
+        pageSize: 100, //每页数据
         count: false, //是否需要重新计算总记录数
         pageNum: 1, //当前页码、从1开始计算
         orderFields: ["sort_level"], //排序列 如 ['sex','student_id']，必须为数据库字段

src/views/xm/core/xmTask/XmTaskMng.vue

@@ -206,19 +206,71 @@
                 >
               </el-col>
               <el-col :span="24" style="padding-top: 5px">
-                <font class="more-label-font">创建时间:</font>
-                <el-date-picker
-                  v-model="dateRanger"
+                <font class="more-label-font">计划开始时间:</font>
+                <mdp-date-range
+                  v-model="filters"
                   type="daterange" 
-                  align="right"
+                  start-key="planStartTimeStart"
+                  end-key="planStartTimeEnd"
                   unlink-panels
                   range-separator="至"
                   start-placeholder="开始日期"
                   end-placeholder="完成日期"
                   value-format="yyyy-MM-dd HH:mm:ss" 
                   :default-time="['00:00:00', '23:59:59']" 
-                  :picker-options="pickerOptions"
-                ></el-date-picker>
+                  :auto-default="false"
+                  key="planStartTime"
+                ></mdp-date-range>
+              </el-col>
+              <el-col :span="24" style="padding-top: 5px">
+                <font class="more-label-font">计划结束时间:</font>
+                <mdp-date-range
+                  v-model="filters"
+                  type="daterange" 
+                  start-key="planEndTimeStart"
+                  end-key="planEndTimeEnd"
+                  unlink-panels
+                  range-separator="至"
+                  start-placeholder="开始日期"
+                  end-placeholder="完成日期"
+                  value-format="yyyy-MM-dd HH:mm:ss" 
+                  :default-time="['00:00:00', '23:59:59']" 
+                  :auto-default="false" 
+                  key="planEndTime"
+                ></mdp-date-range>
+              </el-col>
+              
+              <el-col :span="24" style="padding-top: 5px">
+                <font class="more-label-font">实际开始时间:</font>
+                <mdp-date-range
+                  v-model="filters"
+                  type="daterange" 
+                  start-key="actStartTimeStart"
+                  end-key="actStartTimeEnd"
+                  unlink-panels
+                  range-separator="至"
+                  start-placeholder="开始日期"
+                  end-placeholder="完成日期"
+                  value-format="yyyy-MM-dd HH:mm:ss" 
+                  :default-time="['00:00:00', '23:59:59']" 
+                  :auto-default="false"
+                ></mdp-date-range>
+              </el-col>
+              <el-col :span="24" style="padding-top: 5px">
+                <font class="more-label-font">实际结束时间:</font>
+                <mdp-date-range
+                  v-model="filters"
+                  type="daterange" 
+                  start-key="actEndTimeStart"
+                  end-key="actEndTimeEnd"
+                  unlink-panels
+                  range-separator="至"
+                  start-placeholder="开始日期"
+                  end-placeholder="完成日期"
+                  value-format="yyyy-MM-dd HH:mm:ss" 
+                  :default-time="['00:00:00', '23:59:59']" 
+                  :auto-default="false"
+                ></mdp-date-range>
               </el-col>
               <el-col :span="24" style="padding-top: 10px;">
                 <el-button
@@ -589,37 +641,34 @@
 
           <div class="exector extra">
             <div class="field-label">计划时间</div>
-            <el-date-picker
-              v-model="budgetDateRanger"
-              class="hidden-sm-and-down"
+            <mdp-date-range
+              v-model="editForm"
+              start-key="startTime"
+              end-key="endTime" 
               type="daterange" 
-              align="right"
               unlink-panels
               range-separator="至"
               start-placeholder="计划开始日期"
               end-placeholder="计划完成日期"
               value-format="yyyy-MM-dd HH:mm:ss"
               :default-time="['00:00:00', '23:59:59']" 
-              :picker-options="pickerOptions"
-            ></el-date-picker>
+            ></mdp-date-range>
             共{{ taskTime }}天
           </div>
           <div class="exector extra">
             <div class="field-label">实际时间</div>
-            <el-date-picker
-              v-model="actDateRanger"
-              class="hidden-sm-and-down"
+            <mdp-date-range
+              v-model="editForm"
+              start-key="actStartTime"
+              end-key="actEndTime" 
               type="daterange" 
-              align="right"
               unlink-panels
               range-separator="至"
               start-placeholder="实际开始日期"
               end-placeholder="实际完成日期"
               value-format="yyyy-MM-dd HH:mm:ss"
               :default-time="['00:00:00', '23:59:59']" 
-              :picker-options="pickerOptions"
-            ></el-date-picker>
-            <el-button @click="editTime(editForm)">保存时间</el-button>
+            ></mdp-date-range> 
           </div>
         </el-row>
       </el-row>
@@ -977,6 +1026,14 @@ export default {
         tags: [],
         taskState:'',//任务状态
         lvls:['1','2'],
+        planStartTimeStart:'',
+        planStartTimeEnd:'',
+        planEndTimeStart:'',
+        planEndTimeEnd:'',
+        actStartTimeStart:'',
+        actStartTimeEnd:'',
+        actEndTimeStart:'',
+        actEndTimeEnd:'',
       },
       xmTasks: [], //查询结果
       pageInfo: {
@@ -1032,14 +1089,11 @@ export default {
       projectInfoVisible: false,
       menuVisible: false,
       menuDetailVisible: false, 
-      pickerOptions: util.getPickerOptions(),
       displayType: "table",
       menuStory: false, //需求查询
       showSkillSearchVisible: false, //按技能查询
       tableHeight: 300,
       productSelectVisible: false,  
-      dateRanger: [],
-      pickerOptions: util.getPickerOptions("datarange"),
 
       budgetDateRanger: [],
       actDateRanger: [],
@@ -1949,10 +2003,35 @@ export default {
 			},
     getParams(params) {
 
-      if (this.dateRanger && this.dateRanger.length == 2) {
-        params.createTimeStart = this.dateRanger[0];
-        params.createTimeEnd = this.dateRanger[1];
+      if (this.filters.planStartTimeStart) {
+        params.planStartTimeStart = this.filters.planStartTimeStart 
+      }
+      
+      if (this.filters.planStartTimeEnd) {
+        params.planStartTimeEnd = this.filters.planStartTimeEnd 
       }
+       if (this.filters.planEndTimeStart) {
+        params.planEndTimeStart = this.filters.planEndTimeStart 
+      }
+       if (this.filters.planEndTimeEnd) {
+        params.planEndTimeEnd = this.filters.planEndTimeEnd 
+      }
+
+       if (this.filters.actStartTimeStart) {
+        params.actStartTimeStart = this.filters.actStartTimeStart 
+      }
+      
+      if (this.filters.actStartTimeEnd) {
+        params.actStartTimeEnd = this.filters.actStartTimeEnd 
+      }
+       if (this.filters.actEndTimeStart) {
+        params.actEndTimeStart = this.filters.actEndTimeStart 
+      }
+       if (this.filters.actEndTimeEnd) {
+        params.actEndTimeEnd = this.filters.actEndTimeEnd 
+      }
+
+
       if (
         this.filters.taskType != "all" &&
         this.filters.taskType != "" &&