饼图和盘点记录时间查询

src/api/processMangement/processesCheck/index.js

 import request from '@/utils/request'
 
 // 查询列表
-export function listdevice(query) {
+export function listdevice(queryParams, queryMaps) {
   return request({
     url: '/wbwarehouseinventory/queryWbWarehouseInventoryByPagination',
-    method: 'get',
-    params: query
+    method: 'post',
+    params: queryParams,
+    data: queryMaps,
+    headers: {
+      'Content-Type': 'application/json;charset=UTF-8'
+    }
+  })
+}
+
+export function listLog(queryParams, queryMaps) {
+  return request({
+    url: '/wbwarehouselog/queryWbWarehouseLogByPagination',
+    method: 'post',
+    params: queryParams,
+    data: queryMaps,
+    headers: {
+      'Content-Type': 'application/json;charset=UTF-8'
+    }
   })
 }

src/views/controlPlatform/control.vue

@@ -431,7 +431,7 @@ export default {
 
         const renamedData = res.data.map(item => ({
           ...item,
-          name: item.ptype === '1' ? '设备库' : (item.ptype === '2' ? '工序库' : item.ptype),
+          name: item.ptype === '1' ? '设备库' : (item.ptype === '2' ? '工序库' : (item.ptype === '3' ? '工序样品库' : item.ptype)),
           value: item.sum
         }))
         this.PtypeList = renamedData
@@ -496,7 +496,7 @@ export default {
         this.PtypeList = []
         const renamedData = res.data.findCountIdByPtype.map(item => ({
           ...item,
-          name: item.ptype === '1' ? '设备库' : (item.ptype === '2' ? '工序库' : item.ptype),
+          name: item.ptype === '1' ? '设备库' : (item.ptype === '2' ? '工序库' : (item.ptype === '3' ? '工序样品库' : item.ptype)),
           value: item.sum
         }))
         this.PtypeList = renamedData
@@ -698,7 +698,7 @@ export default {
           trigger: 'item',
           formatter: '{b}数量: {c}'
         },
-        color: ['#46BCF3', '#C760F2'],
+        color: ['#46BCF3', '#C760F2', '#3b53cd'],
         grid: {
           top: 0,
           bottom: 20,

src/views/equipment/equipmentCheck/index.vue

 <template>
   <div class="app-container">
-    <el-form ref="queryForm" style="padding: 0 0 0 10px" :model="queryParams" :inline="true">
+    <el-form ref="queryForm" style="padding: 0 0 0 10px" :model="queryEntity" :inline="true">
       <el-form-item label="pn" prop="pn">
         <el-input
-          v-model="queryParams.pn"
+          v-model="queryEntity.entity.pn"
           placeholder="请输入pn"
           clearable
           :maxlength="30"
@@ -14,7 +14,7 @@
       </el-form-item>
       <el-form-item label="lot" prop="lot">
         <el-input
-          v-model="queryParams.lot"
+          v-model="queryEntity.entity.lot"
           placeholder="请输入设备lot"
           clearable
           size="small"
@@ -23,7 +23,7 @@
         />
       </el-form-item>
       <el-form-item label="盘点状态" prop="status">
-        <el-select v-model="queryParams.status" placeholder="请选择" clearable>
+        <el-select v-model="queryEntity.entity.status" placeholder="请选择" clearable>
           <el-option
             v-for="item in options"
             :key="item.value"
@@ -32,6 +32,20 @@
           </el-option>
         </el-select>
       </el-form-item>
+      <!--      时间选择-->
+      <el-form-item label="时间筛选">
+        <el-date-picker
+          v-model="dateRange"
+          style="width: 240px"
+          value-format="yyyy-MM-dd"
+          type="daterange"
+          range-separator="-"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          clearable
+          @change="handleChange"
+        ></el-date-picker>
+      </el-form-item>
       <el-form-item>
         <el-button type="primary" style="padding: 8px 7px;" size="small" icon="el-icon-search" @click="handleQuery">查询</el-button>
         <el-button style="padding: 8px 7px;" icon="el-icon-refresh" size="small" @click="resetQuery">重置</el-button>
@@ -63,9 +77,9 @@
             {{ scope.row.createName || '-' }}
           </template>
         </el-table-column>
-        <el-table-column label="操作时间" :show-overflow-tooltip="true" align="center" prop="updateDate">
+        <el-table-column label="操作时间" :show-overflow-tooltip="true" align="center" prop="createDate">
           <template slot-scope="scope">
-            <span>{{ scope.row.updateDate | transformDateByFormat('YYYY-MM-DD HH:mm') }}</span>
+            <span>{{ scope.row.createDate | transformDateByFormat('YYYY-MM-DD HH:mm') }}</span>
           </template>
         </el-table-column>
         <el-table-column label="操作" class-name="small-padding fixed-width" width="80px">
@@ -106,8 +120,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label=" 操作时间：" prop="updateDate">
-              <el-input v-model.trim="singleDetails.updateDate" :readonly="true" />
+            <el-form-item label=" 操作时间：" prop="createDate">
+              <el-input v-model.trim="singleDetails.createDate" :readonly="true" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -131,11 +145,13 @@ export default {
         label: '未盘点'
       },
       ],
+      // 日期范围
+      dateRange: [],
       // TODO: 表单里的单项详情参数
       singleDetails: {
         lot: '',
         createBy: '',
-        updateDate: '',
+        createDate: '',
         status: ''
       },
       // 是否显示弹出层（数据详情）
@@ -160,10 +176,23 @@ export default {
       queryParams: {
         page: 1,
         rows: 10,
-        ptype: 1,
-        status: '',
-        pn: '',
-        lot: ''
+        // ptype: 1,
+        // status: '',
+        // pn: '',
+        // lot: '',
+        beginTime: '',
+        endTime: ''
+      },
+      queryEntity: {
+        entity: {
+          // TODO: 设备编码
+          pn: '',
+          // TODO: lot
+          lot: '',
+          // TODO: 库类型 1设备库 2工序库
+          ptype: 1,
+          status: ''
+        }
       },
       // 表单参数
       form: {
@@ -190,6 +219,15 @@ export default {
     this.getList()
   },
   methods: {
+    handleChange() {
+      if (this.dateRange !== null) {
+        this.queryParams.beginTime = this.dateRange[0] + ' 00:00:00'
+        this.queryParams.endTime = this.dateRange[1] + ' 23:59:00'
+      } else {
+        this.queryParams.beginTime = ''
+        this.queryParams.endTime = ''
+      }
+    },
     // TODO: 获取所选行详情信息操作
     handleDetail(row) {
       this.singleDetails = row
@@ -201,20 +239,23 @@ export default {
       // 去除字段默认为0导致0对应的未盘点无法使用问题
       let flag = 0;
       this.loading = true;
-      if (this.queryParams.status === undefined || this.queryParams.status === '') {
+      if (this.queryEntity.entity.status === undefined || this.queryEntity.entity.status === '') {
         flag = 1;
       }
       if (flag === 1) {
-        this.queryParams.status = -1
+        this.queryEntity.entity.status = -1
+      }
+      if (this.queryParams.beginTime === '' || this.queryParams.endTime === '') {
+        this.dateRange = []
       }
-      listdevice(this.queryParams).then(response => {
+      listdevice(this.queryParams, this.addDateRange(this.queryEntity, this.dateRange)).then(response => {
         console.log('list',response)
         this.equipmentList = response.rows
         this.total = response.total
         this.loading = false
       })
       if (flag == 1) {
-        this.queryParams.status = undefined
+        this.queryEntity.entity.status = undefined
         flag = 0;
       }
     },
@@ -242,14 +283,28 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
+      this.queryEntity = {
+        entity: {
+          // TODO: 设备编码
+          pn: '',
+          // TODO: lot
+          lot: '',
+          // TODO: 库类型 1设备库 2工序库
+          ptype: 1,
+          status: ''
+        }
+      }
       this.queryParams = {
         page: 1,
         rows: 10,
-        ptype: 1,
-        pstatus: 0,
-        pn: '',
-        lot: ''
+        beginTime: '',
+        endTime: ''
+        // ptype: 1,
+        // pstatus: 0,
+        // pn: '',
+        // lot: ''
       }
+      this.dateRange = []
       this.resetForm('queryForm')
       this.handleQuery()
     }

src/views/processManagement/processesCheck/index.vue

 <template>
   <div class="app-container">
-    <el-form ref="queryForm" style="padding: 0 0 0 10px" :model="queryParams" :inline="true">
+    <el-form ref="queryForm" style="padding: 0 0 0 10px" :model="queryEntity" :inline="true">
       <el-form-item label="pn" prop="pn">
         <el-input
-          v-model="queryParams.pn"
+          v-model="queryEntity.entity.pn"
           placeholder="请输入pn"
           clearable
           :maxlength="30"
@@ -14,7 +14,7 @@
       </el-form-item>
       <el-form-item label="lot" prop="lot">
         <el-input
-          v-model="queryParams.lot"
+          v-model="queryEntity.entity.lot"
           placeholder="请输入设备lot"
           clearable
           size="small"
@@ -23,7 +23,7 @@
         />
       </el-form-item>
       <el-form-item label="盘点状态" prop="status">
-        <el-select v-model="queryParams.status" placeholder="请选择" clearable>
+        <el-select v-model="queryEntity.entity.status" placeholder="请选择" clearable>
           <el-option
             v-for="item in options"
             :key="item.value"
@@ -32,6 +32,20 @@
           </el-option>
         </el-select>
       </el-form-item>
+      <!--      时间选择-->
+      <el-form-item label="时间筛选">
+        <el-date-picker
+          v-model="dateRange"
+          style="width: 240px"
+          value-format="yyyy-MM-dd"
+          type="daterange"
+          range-separator="-"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          clearable
+          @change="handleChange"
+        ></el-date-picker>
+      </el-form-item>
       <el-form-item>
         <el-button type="primary" style="padding: 8px 7px;" size="small" icon="el-icon-search" @click="handleQuery">查询</el-button>
         <el-button style="padding: 8px 7px;" icon="el-icon-refresh" size="small" @click="resetQuery">重置</el-button>
@@ -63,9 +77,9 @@
             {{ scope.row.createName || '-' }}
           </template>
         </el-table-column>
-        <el-table-column label="操作时间" :show-overflow-tooltip="true" align="center" prop="updateDate">
+        <el-table-column label="操作时间" :show-overflow-tooltip="true" align="center" prop="createDate">
           <template slot-scope="scope">
-            <span>{{ scope.row.updateDate | transformDateByFormat('YYYY-MM-DD HH:mm') }}</span>
+            <span>{{ scope.row.createDate | transformDateByFormat('YYYY-MM-DD HH:mm') }}</span>
           </template>
         </el-table-column>
         <el-table-column label="操作" class-name="small-padding fixed-width" width="80px">
@@ -106,8 +120,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label=" 操作时间：" prop="updateDate">
-              <el-input v-model.trim="singleDetails.updateDate" :readonly="true" />
+            <el-form-item label=" 操作时间：" prop="createDate">
+              <el-input v-model.trim="singleDetails.createDate" :readonly="true" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -124,18 +138,20 @@ export default {
     return {
       // 状态下拉框
       options: [{
-        value: 0,
-        label: '未盘点'
-      }, {
         value: 1,
         label: '已盘点'
+      },{
+        value: 0,
+        label: '未盘点'
       },
       ],
+      // 日期范围
+      dateRange: [],
       // TODO: 表单里的单项详情参数
       singleDetails: {
         lot: '',
         createBy: '',
-        updateDate: '',
+        createDate: '',
         status: ''
       },
       // 是否显示弹出层（数据详情）
@@ -160,10 +176,23 @@ export default {
       queryParams: {
         page: 1,
         rows: 10,
-        ptype: 2,
-        status: '',
-        pn: '',
-        lot: ''
+        // ptype: 1,
+        // status: '',
+        // pn: '',
+        // lot: '',
+        beginTime: '',
+        endTime: ''
+      },
+      queryEntity: {
+        entity: {
+          // TODO: 设备编码
+          pn: '',
+          // TODO: lot
+          lot: '',
+          // TODO: 库类型 1设备库 2工序库
+          ptype: 2,
+          status: ''
+        }
       },
       // 表单参数
       form: {
@@ -190,6 +219,15 @@ export default {
     this.getList()
   },
   methods: {
+    handleChange() {
+      if (this.dateRange !== null) {
+        this.queryParams.beginTime = this.dateRange[0] + ' 00:00:00'
+        this.queryParams.endTime = this.dateRange[1] + ' 23:59:00'
+      } else {
+        this.queryParams.beginTime = ''
+        this.queryParams.endTime = ''
+      }
+    },
     // TODO: 获取所选行详情信息操作
     handleDetail(row) {
       this.singleDetails = row
@@ -201,20 +239,23 @@ export default {
       // 去除字段默认为0导致0对应的未盘点无法使用问题
       let flag = 0;
       this.loading = true;
-      if (this.queryParams.status === undefined || this.queryParams.status === '') {
+      if (this.queryEntity.entity.status === undefined || this.queryEntity.entity.status === '') {
         flag = 1;
       }
       if (flag === 1) {
-        this.queryParams.status = -1
+        this.queryEntity.entity.status = -1
       }
-      listdevice(this.queryParams).then(response => {
-          console.log('list',response)
-          this.equipmentList = response.rows
-          this.total = response.total
-          this.loading = false
-        })
+      if (this.queryParams.beginTime === '' || this.queryParams.endTime === '') {
+        this.dateRange = []
+      }
+      listdevice(this.queryParams, this.addDateRange(this.queryEntity, this.dateRange)).then(response => {
+        console.log('list',response)
+        this.equipmentList = response.rows
+        this.total = response.total
+        this.loading = false
+      })
       if (flag == 1) {
-        this.queryParams.status = undefined
+        this.queryEntity.entity.status = undefined
         flag = 0;
       }
     },
@@ -242,14 +283,28 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
+      this.queryEntity = {
+        entity: {
+          // TODO: 设备编码
+          pn: '',
+          // TODO: lot
+          lot: '',
+          // TODO: 库类型 1设备库 2工序库
+          ptype: 2,
+          status: ''
+        }
+      }
       this.queryParams = {
         page: 1,
         rows: 10,
-        ptype: 2,
-        pstatus: 0,
-        pn: '',
-        lot: ''
+        beginTime: '',
+        endTime: ''
+        // ptype: 1,
+        // pstatus: 0,
+        // pn: '',
+        // lot: ''
       }
+      this.dateRange = []
       this.resetForm('queryForm')
       this.handleQuery()
     }