From 70bdda419e374e9c82f558f29e2ac50d85126fcb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E5=A5=89=E6=BA=90?= <1976974459@qq.com>
Date: Fri, 4 Aug 2023 13:52:18 +0800
Subject: [PATCH] 2023-08-04 2

---
 src/views/modules/knifemold/toolCost.vue      |   10 +-
 .../knifemold/toolOperatorRecord_old.vue      | 1094 -----------------
 .../modules/knifemold/toolUseQtyAssess.vue    |    4 +-
 3 files changed, 11 insertions(+), 1097 deletions(-)
 delete mode 100644 src/views/modules/knifemold/toolOperatorRecord_old.vue

diff --git a/src/views/modules/knifemold/toolCost.vue b/src/views/modules/knifemold/toolCost.vue
index e6fff1e..c78368b 100644
--- a/src/views/modules/knifemold/toolCost.vue
+++ b/src/views/modules/knifemold/toolCost.vue
@@ -18,6 +18,12 @@
           <el-form-item :label="'出资方'">
             <el-input style="width: 100px" v-model="queryTool.contributor" ></el-input>
           </el-form-item>
+          <el-form-item :label="'购买日期'">
+            <el-date-picker style="width: 120px" v-model="queryTool.startDate" value-format='yyyy-MM-dd' format = 'yyyy-MM-dd'
+            ></el-date-picker> -
+            <el-date-picker style="width: 120px" v-model="queryTool.endDate" value-format='yyyy-MM-dd' format = 'yyyy-MM-dd'
+            ></el-date-picker>
+          </el-form-item>
           <el-form-item :label="' '">
             <el-button @click="getDataList()" type="primary">查询</el-button>
           </el-form-item>
@@ -97,7 +103,9 @@ export default {
         toolDescription: '',
         toolInstanceId: '',
         customer: '',
-        contributor: ''
+        contributor: '',
+        startDate: '',
+        endDate: ''
       },
       pageIndex: 1,
       pageSize: 50,
diff --git a/src/views/modules/knifemold/toolOperatorRecord_old.vue b/src/views/modules/knifemold/toolOperatorRecord_old.vue
deleted file mode 100644
index 4c55861..0000000
--- a/src/views/modules/knifemold/toolOperatorRecord_old.vue
+++ /dev/null
@@ -1,1094 +0,0 @@
-<template>
-  <div class="mod-config">
-    <el-form :inline="true" label-position="top">
-      <el-form-item :label="'工具编码'">
-        <el-input style="width: 100px" v-model="queryTool.toolId" ></el-input>
-      </el-form-item>
-      <el-form-item :label="'工具实例编码'">
-        <el-input style="width: 100px" v-model="queryTool.toolInstanceId" ></el-input>
-      </el-form-item>
-      <el-form-item :label="'库位编码'">
-        <el-input style="width: 100px" v-model="queryTool.locationId"></el-input>
-      </el-form-item>
-      <el-form-item :label="'操作日期'">
-        <el-date-picker style="width: 120px" v-model="queryTool.startDate" value-format='yyyy-MM-dd' format = 'yyyy-MM-dd'></el-date-picker> -
-        <el-date-picker style="width: 120px" v-model="queryTool.endDate" value-format='yyyy-MM-dd' format = 'yyyy-MM-dd'></el-date-picker>
-      </el-form-item>
-      <el-form-item label="操作类型">
-        <el-select v-model="queryTool.typeFlag" style="width: 120px">
-          <el-option label="工具入库" value="TR"></el-option>
-          <el-option label="工具出库" value="TC"></el-option>
-          <el-option label="工具报废" value="TB"></el-option>
-          <el-option label="工具维修" value="TW"></el-option>
-          <el-option label="工具维修返回" value="TWF"></el-option>
-          <el-option label="工具借用" value="TJ"></el-option>
-          <el-option label="工具借用返回" value="TJF"></el-option>
-          <el-option label="工具领用" value="TL"></el-option>
-          <el-option label="工具领用返回" value="TLF"></el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item :label="' '">
-        <el-button @click="getDataList()" type="primary">查询</el-button>
-        <download-excel
-          :fields="fields()"
-          :data="exportData"
-          type="xls"
-          :name="exportName"
-          :header="exportHeader"
-          :footer="exportFooter"
-          :defaultValue="exportDefaultValue"
-          :fetch="createExportData"
-          :before-generate="startDownload"
-          :before-finish="finishDownload"
-          worksheet="导出信息"
-          class="el-button el-button--primary el-button--medium">
-          导出
-        </download-excel>
-      </el-form-item>
-    </el-form>
-
-    <el-table
-      :height="height"
-      :data="dataList"
-      border
-      v-loading="dataListLoading"
-      style="width: 100%;">
-      <el-table-column v-if="queryTool.typeFlag === 'TW'"
-                       v-for="(item,index) in toolRepairList" :key="index"
-                       :sortable="item.columnSortable"
-                       :prop="item.columnProp"
-                       :header-align="item.headerAlign"
-                       :show-overflow-tooltip="item.showOverflowTooltip"
-                       :align="item.align"
-                       :fixed="item.fixed==''?false:item.fixed"
-                       :min-width="item.columnWidth"
-                       :label="item.columnLabel">
-        <template slot-scope="scope">
-          <span v-if="!item.columnHidden"> {{ scope.row[item.columnProp] }}</span>
-          <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span>
-        </template>
-      </el-table-column>
-      <el-table-column v-if="queryTool.typeFlag === 'TWF'"
-                       v-for="(item,index) in toolRepairReturnList" :key="index"
-                       :sortable="item.columnSortable"
-                       :prop="item.columnProp"
-                       :header-align="item.headerAlign"
-                       :show-overflow-tooltip="item.showOverflowTooltip"
-                       :align="item.align"
-                       :fixed="item.fixed==''?false:item.fixed"
-                       :min-width="item.columnWidth"
-                       :label="item.columnLabel">
-        <template slot-scope="scope">
-          <span v-if="!item.columnHidden"> {{ scope.row[item.columnProp] }}</span>
-          <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span>
-        </template>
-      </el-table-column>
-      <el-table-column v-if="queryTool.typeFlag === 'TJ'"
-                       v-for="(item,index) in toolBorrowingList" :key="index"
-                       :sortable="item.columnSortable"
-                       :prop="item.columnProp"
-                       :header-align="item.headerAlign"
-                       :show-overflow-tooltip="item.showOverflowTooltip"
-                       :align="item.align"
-                       :fixed="item.fixed==''?false:item.fixed"
-                       :min-width="item.columnWidth"
-                       :label="item.columnLabel">
-        <template slot-scope="scope">
-          <span v-if="!item.columnHidden"> {{ scope.row[item.columnProp] }}</span>
-          <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span>
-        </template>
-      </el-table-column>
-      <el-table-column v-if="queryTool.typeFlag === 'TJF' || this.queryTool.typeFlag === 'TR' || this.queryTool.typeFlag === 'TB' || this.queryTool.typeFlag === 'TLF'"
-                       v-for="(item,index) in toolBorrowingReturnList" :key="index"
-                       :sortable="item.columnSortable"
-                       :prop="item.columnProp"
-                       :header-align="item.headerAlign"
-                       :show-overflow-tooltip="item.showOverflowTooltip"
-                       :align="item.align"
-                       :fixed="item.fixed==''?false:item.fixed"
-                       :min-width="item.columnWidth"
-                       :label="item.columnLabel">
-        <template slot-scope="scope">
-          <span v-if="!item.columnHidden"> {{ scope.row[item.columnProp] }}</span>
-          <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span>
-        </template>
-      </el-table-column>
-      <el-table-column v-if="queryTool.typeFlag === 'TC'"
-                       v-for="(item,index) in toolOutOfLibraryList" :key="index"
-                       :sortable="item.columnSortable"
-                       :prop="item.columnProp"
-                       :header-align="item.headerAlign"
-                       :show-overflow-tooltip="item.showOverflowTooltip"
-                       :align="item.align"
-                       :fixed="item.fixed==''?false:item.fixed"
-                       :min-width="item.columnWidth"
-                       :label="item.columnLabel">
-        <template slot-scope="scope">
-          <span v-if="!item.columnHidden"> {{ scope.row[item.columnProp] }}</span>
-          <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span>
-        </template>
-      </el-table-column>
-      <el-table-column v-if="queryTool.typeFlag === 'TL'"
-                       v-for="(item,index) in toolRequisitionList" :key="index"
-                       :sortable="item.columnSortable"
-                       :prop="item.columnProp"
-                       :header-align="item.headerAlign"
-                       :show-overflow-tooltip="item.showOverflowTooltip"
-                       :align="item.align"
-                       :fixed="item.fixed==''?false:item.fixed"
-                       :min-width="item.columnWidth"
-                       :label="item.columnLabel">
-        <template slot-scope="scope">
-          <span v-if="!item.columnHidden"> {{ scope.row[item.columnProp] }}</span>
-          <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span>
-        </template>
-      </el-table-column>
-    </el-table>
-
-    <el-pagination
-      @size-change="sizeChangeHandle"
-      @current-change="currentChangeHandle"
-      :current-page="pageIndex"
-      :page-sizes="[100, 200, 500]"
-      :page-size="pageSize"
-      :total="totalPage"
-      layout="total, sizes, prev, pager, next, jumper">
-    </el-pagination>
-  </div>
-</template>
-
-<script>
-import getLodop from '@/utils/LodopFuncs.js'
-import {queryToolOperatorRecord} from '@/api/knifemold/tool-info.js'
-export default {
-  data () {
-    return {
-      height: 0,
-      // 数据查询属性
-      tagNo: '',
-      dataListLoading: false,
-      queryTool: {
-        limit: 500,
-        page: 1,
-        supplierId: '',
-        toolId: '',
-        toolInstanceId: '',
-        locationId: '',
-        startDate: '',
-        endDate: '',
-        typeFlag: 'TR'
-      },
-      pageIndex: 1,
-      pageSize: 100,
-      totalPage: 0,
-      // 数据集
-      dataList: [],
-      // 展示列集
-      columnList: [
-        {
-          userId: this.$store.state.user.name,
-          serialNumber: 'toolDetail1101ToolId',
-          tableId: 'toolOIRecord',
-          tableName: 'common',
-          columnProp: 'toolId',
-          headerAlign: 'center',
-          align: 'left',
-          columnLabel: '工具编码',
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: 'left',
-          columnWidth: 140
-        },
-        {
-          userId: this.$store.state.user.name,
-          serialNumber: 'toolDetail1101ToolInstanceId',
-          tableId: 'toolOIRecord',
-          tableName: 'common',
-          columnProp: 'toolInstanceId',
-          headerAlign: 'center',
-          align: 'left',
-          columnLabel: '工具实例编码',
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: '',
-          columnWidth: 140
-        },
-        {
-          userId: this.$store.state.user.name,
-          serialNumber: 'toolOIRecordtype',
-          tableId: 'toolOIRecord',
-          tableName: 'common',
-          columnProp: 'toolDescription',
-          headerAlign: 'center',
-          align: 'left',
-          columnLabel: '工具名称',
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: '',
-          columnWidth: 200
-        },
-        {
-          userId: this.$store.state.user.name,
-          serialNumber: 'toolOIRecordCreateDate',
-          tableId: 'toolOIRecord',
-          tableName: 'common',
-          columnProp: 'createDate',
-          headerAlign: 'center',
-          align: 'left',
-          columnLabel: '接收日期',
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: '',
-          columnWidth: 120
-        },
-        {
-          userId: this.$store.state.user.name,
-          serialNumber: 'toolOIRecordStatus',
-          tableId: 'toolOIRecord',
-          tableName: 'common',
-          columnProp: 'status',
-          headerAlign: 'center',
-          align: 'left',
-          columnLabel: '状态',
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: '',
-          columnWidth: 100
-        },
-        {
-          userId: this.$store.state.user.name,
-          serialNumber: 'toolOIRecordCurrLocationId',
-          tableId: 'toolOIRecord',
-          tableName: 'common',
-          columnProp: 'currLocationId',
-          headerAlign: 'center',
-          align: 'left',
-          columnLabel: '库位编码',
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: '',
-          columnWidth: 120
-        },
-        {
-          userId: this.$store.state.user.name,
-          serialNumber: 'toolOIRecordCurrLocationId',
-          tableId: 'toolOIRecord',
-          tableName: 'common',
-          columnProp: 'locationName',
-          headerAlign: 'center',
-          align: 'left',
-          columnLabel: '库位名称',
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: '',
-          columnWidth: 160
-        },
-        {
-          userId: this.$store.state.user.name,
-          serialNumber: 'toolOIRecordActualuseQty',
-          tableId: 'toolOIRecord',
-          tableName: 'common',
-          columnProp: 'actualuseQty',
-          headerAlign: 'center',
-          align: 'right',
-          columnLabel: '已使用寿命',
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: '',
-          columnWidth: 100
-        },
-        {
-          userId: this.$store.state.user.name,
-          serialNumber: 'toolOIRecordEstuseQty',
-          tableId: 'toolOIRecord',
-          tableName: 'common',
-          columnProp: 'estuseQty',
-          headerAlign: 'center',
-          align: 'right',
-          columnLabel: '预计使用寿命',
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: '',
-          columnWidth: 100
-        },
-        {
-          userId: this.$store.state.user.name,
-          serialNumber: 'toolOIRecordProp',
-          tableId: 'toolOIRecord',
-          tableName: 'common',
-          columnProp: 'prop',
-          headerAlign: 'center',
-          align: 'right',
-          columnLabel: '使用比例',
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: '',
-          columnWidth: 100
-        }
-      ],
-      // ------------ 页面属性 end ----------
-      // 导出 start
-      exportData: [],
-      exportName: this.$route.meta.title,
-      exportHeader: [this.$route.meta.title],
-      exportFooter: [],
-      exportDefaultValue: '',
-      toolRepairList: [
-        {
-          columnProp: 'transNo',
-          headerAlign: 'center',
-          align: 'center',
-          columnLabel: '单号',
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false
-        },
-        {
-          columnProp: 'toolInstanceId',
-          headerAlign: 'center',
-          align: 'center',
-          columnLabel: '工具实例编码',
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false
-        },
-        {
-          columnProp: 'transQty',
-          headerAlign: 'center',
-          align: 'center',
-          columnLabel: '出入库数量',
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false
-        },
-        {
-          columnProp: 'wareHouseId',
-          headerAlign: 'center',
-          align: 'center',
-          columnLabel: '库房编码',
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false
-        },
-        {
-          columnProp: 'locationId',
-          headerAlign: 'center',
-          align: 'center',
-          columnLabel: '库位编码',
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false
-        },
-        {
-          columnProp: 'supplierId',
-          headerAlign: 'center',
-          align: 'center',
-          columnLabel: '供应商编码',
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false
-        },
-        {
-          columnProp: 'remark',
-          headerAlign: 'center',
-          align: 'center',
-          columnLabel: '备注',
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false
-        },
-        {
-          columnProp: 'createdBy',
-          headerAlign: 'center',
-          align: 'center',
-          columnLabel: '操作人',
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false
-        },
-        {
-          columnProp: 'createdDate',
-          headerAlign: 'center',
-          align: 'center',
-          columnLabel: '操作时间',
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false
-        }
-      ],
-      toolRepairReturnList: [
-        {
-          columnProp: 'transNo',
-          headerAlign: 'center',
-          align: 'center',
-          columnLabel: '单号',
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false
-        },
-        {
-          columnProp: 'toolInstanceId',
-          headerAlign: 'center',
-          align: 'center',
-          columnLabel: '工具实例编码',
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false
-        },
-        {
-          columnProp: 'transQty',
-          headerAlign: 'center',
-          align: 'center',
-          columnLabel: '出入库数量',
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false
-        },
-        {
-          columnProp: 'wareHouseId',
-          headerAlign: 'center',
-          align: 'center',
-          columnLabel: '库房编码',
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false
-        },
-        {
-          columnProp: 'locationId',
-          headerAlign: 'center',
-          align: 'center',
-          columnLabel: '库位编码',
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false
-        },
-        {
-          columnProp: 'estUseQty',
-          headerAlign: 'center',
-          align: 'center',
-          columnLabel: '维修寿命',
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false
-        },
-        {
-          columnProp: 'transPrice',
-          headerAlign: 'center',
-          align: 'center',
-          columnLabel: '维修金额',
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false
-        },
-        {
-          columnProp: 'remark',
-          headerAlign: 'center',
-          align: 'center',
-          columnLabel: '备注',
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false
-        },
-        {
-          columnProp: 'createdBy',
-          headerAlign: 'center',
-          align: 'center',
-          columnLabel: '操作人',
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false
-        },
-        {
-          columnProp: 'createdDate',
-          headerAlign: 'center',
-          align: 'center',
-          columnLabel: '操作时间',
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false
-        }
-      ],
-      toolBorrowingList: [
-        {
-          columnProp: 'transNo',
-          headerAlign: 'center',
-          align: 'center',
-          columnLabel: '单号',
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false
-        },
-        {
-          columnProp: 'toolInstanceId',
-          headerAlign: 'center',
-          align: 'center',
-          columnLabel: '工具实例编码',
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false
-        },
-        {
-          columnProp: 'transQty',
-          headerAlign: 'center',
-          align: 'center',
-          columnLabel: '出入库数量',
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false
-        },
-        {
-          columnProp: 'wareHouseId',
-          headerAlign: 'center',
-          align: 'center',
-          columnLabel: '库房编码',
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false
-        },
-        {
-          columnProp: 'locationId',
-          headerAlign: 'center',
-          align: 'center',
-          columnLabel: '库位编码',
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false
-        },
-        {
-          columnProp: 'supplierId',
-          headerAlign: 'center',
-          align: 'center',
-          columnLabel: '借用部门',
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false
-        },
-        {
-          columnProp: 'remark',
-          headerAlign: 'center',
-          align: 'center',
-          columnLabel: '备注',
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false
-        },
-        {
-          columnProp: 'createdBy',
-          headerAlign: 'center',
-          align: 'center',
-          columnLabel: '操作人',
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false
-        },
-        {
-          columnProp: 'createdDate',
-          headerAlign: 'center',
-          align: 'center',
-          columnLabel: '操作时间',
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false
-        }
-      ],
-      toolBorrowingReturnList: [
-        {
-          columnProp: 'transNo',
-          headerAlign: 'center',
-          align: 'center',
-          columnLabel: '单号',
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false
-        },
-        {
-          columnProp: 'toolInstanceId',
-          headerAlign: 'center',
-          align: 'center',
-          columnLabel: '工具实例编码',
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false
-        },
-        {
-          columnProp: 'transQty',
-          headerAlign: 'center',
-          align: 'center',
-          columnLabel: '出入库数量',
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false
-        },
-        {
-          columnProp: 'wareHouseId',
-          headerAlign: 'center',
-          align: 'center',
-          columnLabel: '库房编码',
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false
-        },
-        {
-          columnProp: 'locationId',
-          headerAlign: 'center',
-          align: 'center',
-          columnLabel: '库位编码',
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false
-        },
-        {
-          columnProp: 'remark',
-          headerAlign: 'center',
-          align: 'center',
-          columnLabel: '备注',
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false
-        },
-        {
-          columnProp: 'createdBy',
-          headerAlign: 'center',
-          align: 'center',
-          columnLabel: '操作人',
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false
-        },
-        {
-          columnProp: 'createdDate',
-          headerAlign: 'center',
-          align: 'center',
-          columnLabel: '操作时间',
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false
-        }
-      ],
-      toolOutOfLibraryList: [
-        {
-          columnProp: 'transNo',
-          headerAlign: 'center',
-          align: 'center',
-          columnLabel: '单号',
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false
-        },
-        {
-          columnProp: 'toolInstanceId',
-          headerAlign: 'center',
-          align: 'center',
-          columnLabel: '工具实例编码',
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false
-        },
-        {
-          columnProp: 'transQty',
-          headerAlign: 'center',
-          align: 'center',
-          columnLabel: '出入库数量',
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false
-        },
-        {
-          columnProp: 'wareHouseId',
-          headerAlign: 'center',
-          align: 'center',
-          columnLabel: '库房编码',
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false
-        },
-        {
-          columnProp: 'locationId',
-          headerAlign: 'center',
-          align: 'center',
-          columnLabel: '库位编码',
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false
-        },
-        {
-          columnProp: 'supplierId',
-          headerAlign: 'center',
-          align: 'center',
-          columnLabel: '机台编码',
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false
-        },
-        {
-          columnProp: 'remark',
-          headerAlign: 'center',
-          align: 'center',
-          columnLabel: '备注',
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false
-        },
-        {
-          columnProp: 'createdBy',
-          headerAlign: 'center',
-          align: 'center',
-          columnLabel: '操作人',
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false
-        },
-        {
-          columnProp: 'createdDate',
-          headerAlign: 'center',
-          align: 'center',
-          columnLabel: '操作时间',
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false
-        }
-      ],
-      toolRequisitionList: [
-        {
-          columnProp: 'transNo',
-          headerAlign: 'center',
-          align: 'center',
-          columnLabel: '单号',
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false
-        },
-        {
-          columnProp: 'toolInstanceId',
-          headerAlign: 'center',
-          align: 'center',
-          columnLabel: '工具实例编码',
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false
-        },
-        {
-          columnProp: 'transQty',
-          headerAlign: 'center',
-          align: 'center',
-          columnLabel: '出入库数量',
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false
-        },
-        {
-          columnProp: 'wareHouseId',
-          headerAlign: 'center',
-          align: 'center',
-          columnLabel: '库房编码',
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false
-        },
-        {
-          columnProp: 'locationId',
-          headerAlign: 'center',
-          align: 'center',
-          columnLabel: '库位编码',
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false
-        },
-        {
-          columnProp: 'supplierName',
-          headerAlign: 'center',
-          align: 'center',
-          columnLabel: '领用人',
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false
-        },
-        {
-          columnProp: 'remark',
-          headerAlign: 'center',
-          align: 'center',
-          columnLabel: '备注',
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false
-        },
-        {
-          columnProp: 'createdBy',
-          headerAlign: 'center',
-          align: 'center',
-          columnLabel: '操作人',
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false
-        },
-        {
-          columnProp: 'createdDate',
-          headerAlign: 'center',
-          align: 'center',
-          columnLabel: '操作时间',
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false
-        }
-      ]
-    }
-  },
-  created () {
-    this.getDataList()
-  },
-  mounted () {
-    this.$nextTick(() => {
-      this.height = window.innerHeight - 220
-    })
-  },
-  methods: {
-    // ---------------  业务  -------------------
-    getDataList () {
-      this.dataListLoading = true
-      this.queryTool.limit = this.pageSize
-      this.queryTool.page = this.pageIndex
-      queryToolOperatorRecord(this.queryTool).then(({data}) => {
-        if (data.code === 0) {
-          console.log(data.page.list)
-          this.dataList = data.page.list
-          this.pageIndex = data.page.currPage
-          this.pageSize = data.page.pageSize
-          this.totalPage = data.page.totalCount
-        }
-        this.dataListLoading = false
-      })
-    },
-    //  --------- 分页 ----------
-    // 每页数
-    sizeChangeHandle (val) {
-      this.pageSize = val
-      this.pageIndex = 1
-      this.getDataList()
-    },
-    // 当前页
-    currentChangeHandle (val) {
-      this.pageIndex = val
-      this.getDataList()
-    },
-    //  --------- 分页 end ----------
-    //  --------- 导出 ----------
-    fields () {
-      let json = '{'
-      this.columnList.forEach((item, index) => {
-        if (index == this.columnList.length - 1) {
-          json += '"' + item.columnLabel + '"' + ':' + '"' + item.columnProp + '"'
-        } else {
-          json += '"' + item.columnLabel + '"' + ':' + '"' + item.columnProp + '"' + ','
-        }
-      })
-      json += '}'
-      let s = eval('(' + json + ')')
-      return s
-    },
-    createExportData () {
-      // 点击导出按钮之后,开始导出数据之前的执行函数,返回值为需要下载的数据
-      return this.dataList
-    },
-    startDownload () {
-    },
-    finishDownload () {
-    }
-    //  --------- 导出 end ----------
-  }
-}
-</script>
-<style>
-
-</style>
diff --git a/src/views/modules/knifemold/toolUseQtyAssess.vue b/src/views/modules/knifemold/toolUseQtyAssess.vue
index b759477..9165812 100644
--- a/src/views/modules/knifemold/toolUseQtyAssess.vue
+++ b/src/views/modules/knifemold/toolUseQtyAssess.vue
@@ -13,9 +13,9 @@
 <!--            <el-input style="width: 100px" v-model="queryTool.toolDescription"></el-input>-->
 <!--          </el-form-item>-->
           <el-form-item :label="'申请日期'">
-            <el-date-picker style="width: 120px" v-model="queryTool.startDate" value-format='yyyy-MM-dd 00:00:00' format = 'yyyy-MM-dd'
+            <el-date-picker style="width: 120px" v-model="queryTool.startDate" value-format='yyyy-MM-dd' format = 'yyyy-MM-dd'
             ></el-date-picker> -
-            <el-date-picker style="width: 120px" v-model="queryTool.endDate" value-format='yyyy-MM-dd 23:59:59' format = 'yyyy-MM-dd'
+            <el-date-picker style="width: 120px" v-model="queryTool.endDate" value-format='yyyy-MM-dd' format = 'yyyy-MM-dd'
             ></el-date-picker>
           </el-form-item>
           <el-form-item :label="' '">