xqs

src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue

@@ -41,6 +41,19 @@
               <b style="float: right; color: #8492a6; font-size: 13px">{{ item.name }}</b>
             </el-option>
           </el-select>
+          <span>时间段:</span>
+          <el-date-picker
+            v-model="dateRange"
+            :picker-options="pickerOptions"
+            size="small"
+            type="daterange"
+            align="center"
+            value-format="yyyy-MM-dd"
+            format="yyyy-MM-dd"
+            range-separator="～"
+            style="width:300px"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期"/>
           <el-button
             type="success"
             size="small"
@@ -70,18 +83,22 @@
           <span style="margin-right: -10px">物料状态:</span>
           <el-cascader :options="materialStatus" :props="{ checkStrictly: true }" v-model="materialStatusValue" size="small" style="margin-left: 10px"/>
           <div style="float:right;padding-top:10px;">
-            <el-button
-              type="primary"
-              size="small"
-              icon="el-icon-menu"
-              style="margin-left: 10px"
-              @click="allocateTask1">分配</el-button>
-            <el-button
-              type="danger"
-              size="small"
-              icon="el-icon-back"
-              style="margin-left: 10px"
-              @click="executeReturn1">退回</el-button>
+            <el-tooltip :open-delay="1000" effect="dark" content="选择采购员后，将物料分配给所选的采购员" placement="top">
+              <el-button
+                type="primary"
+                size="small"
+                icon="el-icon-menu"
+                style="margin-left: 10px"
+                @click="allocateTask1">分配</el-button>
+            </el-tooltip>
+            <el-tooltip :open-delay="1000" effect="dark" content="退回勾选的未分配的物料至车间" placement="top">
+              <el-button
+                type="danger"
+                size="small"
+                icon="el-icon-back"
+                style="margin-left: 10px"
+                @click="executeReturn1">退回</el-button>
+            </el-tooltip>
           </div>
         </el-row>
         <el-row style="margin-bottom: 15px">
@@ -646,6 +663,34 @@ export default {
   name: '', // 采购任务分配
   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])
+          }
+        }]
+      },
+      dateRange: '',
       timer2: '',
       machines: [],
       source: [
@@ -861,13 +906,14 @@ export default {
       this.MaterialCategoryValue ? this.check1 = 1 : this.check1 = 0
       this.MaterialVarietyValue ? this.check2 = 1 : this.check2 = 0
       this.projectValue ? this.check3 = 1 : this.check3 = 0
-      let check0, check1, check2, check3
+      let check0, check1, check2, check3, check4
       this.machineValue ? check0 = 1 : check0 = 0
       this.groupValue ? check1 = 1 : check1 = 0
       this.materialName ? this.check4 = 1 : this.check4 = 0
       this.materialSpec ? check2 = 1 : check2 = 0
       this.materialModel ? check3 = 1 : check3 = 0
-      searchTable1(this.pageCurrent0, this.pageSize0, this.check1, this.MaterialCategoryValue, this.check2, this.MaterialVarietyValue, this.check3, this.projectValue, check0, this.machineValue, check1, this.groupValue, this.check4, this.materialName, this.materialStatusValue[this.materialStatusValue.length - 1], check2, this.materialSpec, check3, this.materialModel, 1).then(response => {
+      this.dateRange ? check4 = 1 : (check4 = 0, this.dateRange = '')
+      searchTable1(this.pageCurrent0, this.pageSize0, this.check1, this.MaterialCategoryValue, this.check2, this.MaterialVarietyValue, this.check3, this.projectValue, check0, this.machineValue, check1, this.groupValue, this.check4, this.materialName, this.materialStatusValue[this.materialStatusValue.length - 1], check2, this.materialSpec, check3, this.materialModel, 1, check4, this.dateRange[0], this.dateRange[1]).then(response => {
         this.tableData0 = response.data.rows
         this.total0 = response.data.total
       })