20200205lljV6

src/api/WorkshopProcurement/NewArrivalList.js

@@ -62,14 +62,14 @@ export function searchLxMateriel(num, check, num1) {
   })
 }
 // 查询到货单
-export function searchArriveOrder(num8, num9, num6, num7, pageCurrent, pageSize) {
+export function searchArriveOrder(num8, num9, num6, num7, datecheck, starttime, endtime, pageCurrent, pageSize) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '1',
       name: '备料管理_到货单查询_新',
-      param: `供应商流水号_check=${num8}&供应商流水号=${num9}&是否关联_check=${num6}&是否关联=${num7}`,
+      param: `供应商流水号_check=${num8}&供应商流水号=${num9}&是否关联_check=${num6}&是否关联=${num7}&日期check=${datecheck}&开始时间=${starttime}&结束时间=${endtime}`,
       Pagination: pageCurrent + '&' + pageSize
     }
   })

src/views/WorkshopProcurement/NewArrivalList/index.vue

@@ -10,18 +10,20 @@
             :label="item.label"
             :value="item.value"/>
         </el-select>
-        <!--<el-input v-model="Name" placeholder="供应商" size="small" clearable/>-->
+        <span>请款时间段:</span>
-        <!--<span>关联情况:</span>-->
+        <el-date-picker
-        <!--<el-select v-model="PickingValue" placeholder="关联情况" size="small" clearable>-->
+          v-model="dateRange"
-        <!--<el-option-->
+          :picker-options="pickerOptions"
-        <!--v-for="item in Picking"-->
+          size="small"
-        <!--:key="item.value"-->
+          type="daterange"
-        <!--:label="item.label"-->
+          align="center"
-        <!--:value="item.value"/>-->
+          style="width: 300px;margin: 3px 0"
-        <!--</el-select>-->
+          value-format="yyyy-MM-dd"
-        <!--<el-tooltip :open-delay="1200" effect="dark" content="查询到货单" placement="top">-->
+          format="yyyy-MM-dd"
-        <!--<el-button type="success" size="small" icon="el-icon-search" style="margin-left: 10px" @click="pageCurrent4=1;pageSize4=10;total4=0;searchTable4()">查询</el-button>-->
+          range-separator="～"
-        <!--</el-tooltip>-->
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"/>
+        <el-button type="success" size="small" icon="el-icon-search" style="margin-left: 10px" @click="pageCurrent4=1;pageSize4=10;total4=0;searchTable4()">查询</el-button>
         <el-button type="primary" size="small" icon="el-icon-plus" style="margin-left: 10px" @click="addArrivalOrder">新增到货单</el-button>
       </div>
     </el-card>
@@ -245,7 +247,7 @@
     </el-dialog>
     <el-dialog v-el-drag-dialog :visible.sync="dialogVisible10" title="添加到货明细" center style="min-height: 400px" width="1600px">
       <el-form ref="form10" :model="form10" :rules="rules10" label-position="right" label-width="60px">
-        <el-row>
+        <el-row style="background-color: white">
           <el-col :span="5" style="margin-left: 2%">
             <span>供应商</span>
             <el-input v-model="供应商名称" style="width: 250px" size="small" readonly/>
@@ -274,7 +276,7 @@
         </el-row>
         <el-row>
           <div style="width: 20%;float: left;margin-top: 20px">
-            <div style="background: gainsboro">
+            <div style="background: white">
               <el-row style="height: 50px">
                 <el-form-item label="材料" prop="CailiaoValue">
                   <el-input v-model="form10.CailiaoValue" size="small"/>
@@ -505,6 +507,37 @@ import { ExcelWaiGou } from '@/utils/request'
 export default {
   data() {
     return {
+      check1: 0,
+      check2: 0,
+      dateRange: '',
+      expands: [],
+      pickerOptions: {
+        shortcuts: [{
+          text: '上季度',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(end.getTime() - 3600 * 1000 * 24 * 30 * 3)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '过去半年',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(end.getTime() - 3600 * 1000 * 24 * 366 / 2)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '过去一年',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(end.getTime() - 3600 * 1000 * 24 * 365)
+            picker.$emit('pick', [start, end])
+          }
+        }]
+      },
       excle_row: [],
       supplierNameValue: '',
       supplierName: [], // 供应商
@@ -628,7 +661,7 @@ export default {
   created() {
     this.fetchdata()
     this.searchTable2()
-    this.searchTable4()
+    // this.searchTable4()
   },
   methods: {
     saveData(row) {
@@ -711,7 +744,7 @@ export default {
       const sums = []
       columns.forEach((column, index) => {
         if (index === 1) {
-          sums[index] = '总数量：'
+          sums[index] = '总重量：'
           return
         } else if (index === 2) {
           const values = data.map(item => Number(item['数量']))
@@ -804,12 +837,13 @@ export default {
       this.tableData5 = []
       this.tableData6 = []
       this.supplierNameValue ? this.check = 1 : this.check = 0
+      this.dateRange ? this.check1 = 1 : (this.check1 = 0, this.dateRange = '')
       if (this.PickingValue === 0 || this.PickingValue === 1) {
         this.check2 = 1
       } else {
         this.check2 = 0
       }
-      searchArriveOrder(this.check, this.supplierNameValue, this.check2, this.PickingValue, this.pageCurrent4, this.pageSize4).then(response => {
+      searchArriveOrder(this.check, this.supplierNameValue, this.check2, this.PickingValue, this.check1, this.dateRange[0], this.dateRange[1], this.pageCurrent4, this.pageSize4).then(response => {
         this.tableData4 = response.data.rows
         this.total4 = response.data.total
       })