优化

src/views/projectManage/bugList/css/index.css

@@ -198,6 +198,7 @@
   font-size: 14px;
   flex-shrink: 0;
 }
+
 .download {
   position: absolute;
   bottom: 25px;
@@ -232,5 +233,5 @@
   color:#409EFF !important;
   cursor: pointer
 }
-      
+
 

src/views/projectManage/requirement/list/index.vue

@@ -71,6 +71,30 @@
               <search-people :value.sync="searchForm.rqmtProposer" :clearable="true" :multiple="false" style="width:72% !important;" />
             </div>
           </el-form>
+          <el-form :model="searchForm" class="flex_start el-from-spacing">
+            <div class="Layout">
+              <div class="queryName">来自望岳</div>
+              <el-select v-model="searchForm.isFromDpm" size="small" clearable filterable placeholder="请选择">
+                <el-option v-for="item in isFromDpmList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </div>
+            <div class="Layout">
+              <div class="queryName" style="margin-left: 2%;">创建时间</div>
+              <el-date-picker
+                v-model="searchForm.date"
+                type="daterange"
+                align="right"
+                unlink-panels
+                range-separator="至"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期"
+                size="small"
+                value-format="yyyy-MM-dd HH:mm:ss"
+                :default-time="['00:00:00','23:59:59']"
+                :picker-options="pickerOptions"
+              />
+            </div>
+          </el-form>
           <div v-if="DemandStatus === true" style="color:#409EFF; cursor: pointer; margin-top: 15px;" @click="DemandSta"><i class="el-icon-circle-plus-outline" /> 添加需求状态停留时长条件</div>
           <el-divider v-if="DemandStatus === false"> 且 </el-divider>
           <div v-if="DemandStatus === false" style=" margin-top: 15px;">
@@ -229,9 +253,37 @@ export default {
   },
   data() {
     return {
+      pickerOptions: {
+        shortcuts: [{
+          text: '最近一周',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近一个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近三个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
+            picker.$emit('pick', [start, end])
+          }
+        }]
+      },
       newTabOpen: true, // 是否新的tab页打开
       DemandStatus: true, // 筛选需求时长
       extraUrgent: extraUrgent,
+      isFromDpmList: [{ id: true, name: '是' }, { id: false, name: '否' }],
       priorityColors: ['#F56C6C', '#FF8952', '#F5E300', '#7ED321', '#61D3B8', '#69B3FF', '#BDBDBD'],
       formula: [{ code: 0, msg: '>=' }, { code: 1, msg: '<=' }, { code: 2, msg: '>' }, { code: 3, msg: '<' }],
       // currentRow: null,
@@ -309,6 +361,10 @@ export default {
       } else {
         this.searchForm.name = ''
       }
+      if (this.searchForm.date) {
+        this.searchForm.createTimeBegin = this.searchForm.date[0]
+        this.searchForm.createTimeEnd = this.searchForm.date[1]
+      }
       this.searchForm.bizId = this.bizId
       this.loading = true
 
@@ -391,6 +447,9 @@ export default {
     },
     async toSave() {
       const saveObj = deepClone(this.searchForm)
+      if (saveObj.createTimeBegin) {
+        saveObj.date = [saveObj.createTimeBegin, saveObj.createTimeEnd]
+      }
       delete saveObj.curIndex
       delete saveObj.pageSize
       const res = await filterCreateFilter({
@@ -462,6 +521,8 @@ export default {
       this.$set(this.searchForm, 'days', '')
       this.$set(this.searchForm, 'rqmtProposer', '')
       this.$set(this.searchForm, 'sourceTypeList', [])
+      this.$set(this.searchForm, 'isFromDpm', '')
+      this.$set(this.searchForm, 'date', [])
       this.$message({
         message: '已重置',
         type: 'success',

src/views/projectManage/taskList/taskIndex.vue

@@ -61,7 +61,6 @@
         <div>
           <div class="Layout">
             <el-form :model="form_task" class="flex_start">
-
               <div class="Layout">
                 <div class="queryName">所属项目</div>
                 <el-select v-model="form_task.projectId" size="small" clearable filterable placeholder="请选择">
@@ -75,14 +74,20 @@
                 </el-select>
               </div>
               <div class="Layout marginLeft">
-                <div class="queryName">模块</div>
-                <el-cascader v-model="form_task.moduleIds" size="small" clearable collapse-tags :props="props" :options="business_platform_Modular" placeholder="请选择" style="width:77% !important;" @click.native="bugDataGet" />
+                <div class="queryName">来自望岳</div>
+                <el-select v-model="form_task.isFromDpm" size="small" clearable filterable placeholder="请选择">
+                  <el-option v-for="item in isFromDpmList" :key="item.id" :label="item.name" :value="item.id" />
+                </el-select>
               </div>
             </el-form>
           </div>
           <div class="Layout" style="margin: 15px 0;">
             <el-form :model="form_task" class="flex_start">
               <div class="Layout">
+                <div class="queryName">模块</div>
+                <el-cascader v-model="form_task.moduleIds" size="small" clearable collapse-tags :props="props" :options="business_platform_Modular" placeholder="请选择" style="width:77% !important;" @click.native="bugDataGet" />
+              </div>
+              <div class="Layout marginLeft">
                 <div class="queryName">状态</div>
                 <el-select v-model="form_task.status" size="small" clearable filterable placeholder="请选择">
                   <el-option v-for="item in daStatus" :key="item.code" :label="item.msg" :value="item.code" />
@@ -94,8 +99,12 @@
                   <el-option v-for="item in healthStage" :key="item.code" :label="item.msg" :value="item.code" />
                 </el-select>
               </div>
-              <div class="Layout marginLeft">
-                <div class="queryName">创建人</div>
+            </el-form>
+          </div>
+          <div class="Layout" style="margin: 15px 0;">
+            <el-form :model="form_task" class="flex_start">
+              <div class="Layout">
+                <div class="queryName" style="width:86px;">创建人</div>
                 <el-select
                   v-model="form_task.creater"
                   clearable
@@ -105,6 +114,7 @@
                   :remote-method="remoteMethod"
                   :loading="loading"
                   size="small"
+                  style="width: 82%;"
                 >
                   <el-option v-for="item in options" :key="item.idap" :label="item.name" :value="test2(item, 0)">
                     <div class="flex_start">
@@ -115,6 +125,22 @@
                   </el-option>
                 </el-select>
               </div>
+              <div class="Layout marginLeft">
+                <div class="queryName">创建日期</div>
+                <el-date-picker
+                  v-model="form_task.date"
+                  type="daterange"
+                  align="right"
+                  unlink-panels
+                  range-separator="至"
+                  start-placeholder="开始日期"
+                  end-placeholder="结束日期"
+                  size="small"
+                  value-format="yyyy-MM-dd HH:mm:ss"
+                  :default-time="['00:00:00','23:59:59']"
+                  :picker-options="pickerOptions"
+                />
+              </div>
             </el-form>
           </div>
           <div align="right">
@@ -235,9 +261,37 @@ export default {
   },
   data() {
     return {
+      pickerOptions: {
+        shortcuts: [{
+          text: '最近一周',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近一个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近三个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
+            picker.$emit('pick', [start, end])
+          }
+        }]
+      },
       newTabOpen: true, // 是否新的tab页打开
       header_show: true,
       props: { multiple: true },
+      isFromDpmList: [{ id: true, name: '是' }, { id: false, name: '否' }],
       priorityColors: ['#F56C6C', '#FF8952', '#F5E300', '#7ED321', '#61D3B8', '#69B3FF', '#BDBDBD'],
       arr_priority: [{ value: 0, name: 'P0' }, { value: 1, name: 'P1' }, { value: 2, name: 'P2' }, { value: 3, name: 'P3' }],
       dialog_open: false,
@@ -314,6 +368,10 @@ export default {
           delete this.form_task[key]
         }
       }
+      if (this.form_task.date) {
+        this.form_task.createTimeBegin = this.form_task.date[0]
+        this.form_task.createTimeEnd = this.form_task.date[1]
+      }
       taskList(this.form_task).then(res => {
         this.task_table = res.data
         this.total = res.total
@@ -384,6 +442,8 @@ export default {
       this.$set(this.form_task, 'PersonInCharge', '')
       this.$set(this.form_task, 'Participant', '')
       this.$set(this.form_task, 'creater', '')
+      this.$set(this.form_task, 'isFromDpm', '')
+      this.$set(this.form_task, 'date', [])
       this.$message({
         message: '已重置',
         type: 'success',