Merge branch 'demo_' of http://123.60.19.203:8088/hitch/hitch-antd into demo_

src/api/report/sbinfo.js

@@ -0,0 +1,35 @@
+import { axios } from '@/utils/request'
+import { stringify } from 'qs'
+
+/**
+ * page func
+ * parameter: { }
+ * @param parameter
+ * @returns {*}
+ */
+export function getMonthReport (parameter) {
+  return axios({
+    url: '/report/sb/infos?' + stringify(parameter),
+    method: 'get',
+    headers: {
+      'Content-Type': 'application/json;charset=UTF-8'
+    }
+  })
+}
+
+/**
+ * export file
+ * parameter: { }
+ * @param parameter :
+  * @returns {*}
+ */
+export function exportMonthReport (parameter) {
+  return axios({
+    url: '/report/sb/infos/export?' + stringify(parameter),
+    method: 'get',
+    headers: {
+      'Content-Type': 'application/json;charset=UTF-8'
+    },
+    responseType: 'blob'
+  })
+}

src/router/generator-platform-routers.js

@@ -323,7 +323,8 @@ const constantRouterComponents = {
   // 报表
   'AnalysisSbInfo': () => import('@/views/dashboard/AnalysisSbInfo'), // 保养任务完成率报表
   'CheckJobReport': () => import('@/views/dashboard/CheckJobReport'), // 保养任务完成率报表
-  'MeasureLogReport': () => import('@/views/dashboard/MeasureLogReport'), // 检定记录完成率报表
+  'MeasureLogReport': () => import('@/views/dashboard/MeasureLogReport'), // 检定记录月完成数量报表
+  'SbInfoTypeReport': () => import('@/views/dashboard/SbInfoTypeReport'), // 设备类型占比统计
   'CheckJobReportWeek': () => import('@/views/dashboard/CheckJobReportWeek'), // 保养任务周工作负荷统计报表
   'RepairReport': () => import('@/views/dashboard/RepairReport'), // >24小时停机次数按月统计
   'RepairReportSbAll': () => import('@/views/dashboard/RepairReportSbAll'), // 设备故障次数按月统计

src/utils/dict.js

@@ -476,8 +476,11 @@ DictCache.VALUE = {
    * 位置类型
    */
   SBPOSITION_TYPE: {
-    YUANQU: 1, // 园区
-    SHENGCHANXIAN: 2 // 生产线
+    YUANQU: 1, // 厂区
+    SHENGCHANXIAN: 2, // 车间
+    LOUCENG: 3, // 楼层
+    LINE: 4, // 生产线
+    FANGWEN: 5 // 位号
   },
   /**
    * 折旧方式

src/views/dashboard/SbInfoTypeReport.vue

@@ -0,0 +1,256 @@
+<template>
+  <div class="page-header-index-wide">
+    <a-card title="设备类型统计报表" :loading="loading" v-show="visible" :bordered="false" :body-style="{padding: '0'}">
+      <div class="salesCard">
+        <a-tabs default-active-key="1" size="large" :tab-bar-style="{marginBottom: '24px', paddingLeft: '16px'}">
+          <div class="table-operator" style="margin-bottom: 8px;margin-top: 8px;" slot="tabBarExtraContent">
+            <a-select style="margin-left: 8px" v-model="queryParam.useType" placeholder="请选择">
+              <a-select-option
+                v-for="(label,value) in useTypeMap"
+                :key="value"
+                :label="label"
+                :value="parseInt(value)">{{ label }}
+              </a-select-option>
+            </a-select>
+            <a-button style="margin-left: 8px" type="default" @click="getData()">查询</a-button>
+            <a-button style="margin-left: 8px" type="primary" @click="handlePrint()">打印</a-button>
+            <a-button style="margin-left: 8px" type="primary" @click="doExport()">导出</a-button>
+          </div>
+          <a-tab-pane loading="true" tab="图形统计" key="1">
+            <a-row>
+              <a-col :xl="24" :lg="24" :md="24" :sm="24" :xs="24">
+                <div style="padding: 10px">
+                  <div id="container"></div>
+                </div>
+              </a-col>
+            </a-row>
+          </a-tab-pane>
+          <a-tab-pane loading="true" tab="表格统计" key="2">
+            <a-row>
+              <a-col :xl="24" :lg="24" :md="24" :sm="24" :xs="24">
+                <div style="padding: 10px">
+                  <a-table
+                    bordered
+                    :data-source="chartsData"
+                    :columns="columns"
+                    :pageSize="12"
+                    tableLayout="auto"
+                    :scroll="{x: 1, y: BaseTool.Constant.scrollY }"
+                    rowKey="month">
+                    <span slot="action" slot-scope="record">
+                      <template>
+                        <!--                        <a @click="handleView(record)">查看明细</a>
+                        <a-divider type="vertical" />-->
+                        <a @click="doExportDetail(record)">导出</a>
+                      </template>
+                    </span>
+                  </a-table>
+                </div>
+              </a-col>
+            </a-row>
+          </a-tab-pane>
+        </a-tabs>
+      </div>
+    </a-card>
+    <print-in-sb-info-type-report ref="basePrintModal" @ok="handleOk"/>
+    <detail-measure-log-report ref="detailModal" @ok="handleOk"/>
+  </div>
+</template>
+
+<script>
+import { getMonthReport, exportMonthReport } from '@/api/report/sbinfo'
+import { Chart } from '@antv/g2'
+import PrintInSbInfoTypeReport from '@/views/dashboard/modules/PrintInSbInfoTypeReport'
+import DetailMeasureLogReport from '@/views/dashboard/modules/DetailMeasureLogReport'
+import moment from 'moment'
+
+export default {
+  name: 'MeasureLogReport',
+  components: {
+    PrintInSbInfoTypeReport,
+    Chart,
+    DetailMeasureLogReport
+  },
+  props: {
+    title: {
+      type: String,
+      default: '设备类型占比统计报表'
+    }
+  },
+  data () {
+    return {
+      loading: false,
+      useTypeMap: {},
+      queryParam: {
+        useType: 4
+      },
+      visible: true,
+      chart: null, // 创建一个chart变量
+      chartsData: [],
+      // 表头
+      columns: [
+        {
+          title: '类型名称',
+          width: 180,
+          dataIndex: 'typeName'
+        },
+        {
+          title: '数量',
+          width: 120,
+          dataIndex: 'totalNum'
+        },
+        /* {
+          title: '完成数量',
+          width: 120,
+          dataIndex: 'totalFinishNum'
+        },
+        {
+          title: '未完成数量',
+          width: 120,
+          dataIndex: 'totalWaitNum'
+        },
+        {
+          title: '完成率',
+          width: 120,
+          dataIndex: 'finishRate'
+        }, */
+        {
+          title: '操作',
+          key: 'action',
+          width: '200px',
+          align: 'center',
+          scopedSlots: { customRender: 'action' }
+        }
+      ]
+    }
+  },
+  created () {
+    this.useTypeMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.SB_USE_TYPE)
+  },
+  mounted () {
+    this.$nextTick(function () {
+      this.getData()
+    })
+  },
+  methods: {
+    moment,
+    changeUseType (value) {
+      this.queryParam.useType = value
+      this.getData()
+    },
+    getData () {
+      getMonthReport(this.queryParam)
+        .then(res => {
+          this.chartsData = res.data
+          // 需要将数据分组：总数，完成数
+          const groupData = []
+          this.chartsData.forEach(function (data) {
+            groupData.push({ name: '类型数量', month: data.typeName + '', num: data.totalNum })
+            // groupData.push({ name: '完成数', month: data.month + '', num: data.totalFinishNum })
+          })
+          this.getCharts('container', groupData)// 调用统计图
+        })
+    },
+    getCharts (id, data) {
+      this.chart && this.chart.destroy()// 防止点击搜索按钮新增一个
+      this.chart = new Chart({
+        container: 'container',
+        autoFit: true,
+        height: 400
+      })
+      this.chart.data(data)
+      this.chart.scale('num', {
+        nice: true
+      })
+      this.chart.tooltip({
+        showMarkers: false,
+        shared: true
+      })
+      this.chart.interval().position('month*num').color('name').adjust([
+        {
+          type: 'dodge',
+          marginRatio: 0
+        }
+      ])
+      this.chart.interaction('active-region')
+      this.chart.legend({
+        position: 'bottom'
+      })
+      this.chart.render()
+    },
+    doExport () {
+      const parameter = {
+        ...this.queryParam
+      }
+      exportMonthReport(parameter).then(file => {
+        this.BaseTool.UPLOAD.downLoadExportExcel(file)
+      })
+    },
+    doExportDetail (record) {
+      const parameter = {
+        ...this.queryParam
+      }
+      exportMonthReport(parameter).then(file => {
+        this.BaseTool.UPLOAD.downLoadExportExcel(file)
+      })
+    },
+    handlePrint (record) {
+      const modal = this.$refs.basePrintModal
+      this.visible = false
+      modal.base({ startMonth: this.queryParam.startMonth, endMonth: this.queryParam.endMonth, title: this.title, data: this.chartsData })
+    },
+    handleView (record) {
+      const modal = this.$refs.detailModal
+      modal.base(record)
+    },
+    handleOk () {
+      this.visible = true
+    }
+  }
+}
+</script>
+
+<style lang="less" scoped>
+.extra-wrapper {
+  line-height: 55px;
+  padding-right: 24px;
+
+  .extra-item {
+    display: inline-block;
+    margin-right: 24px;
+
+    a {
+      margin-left: 24px;
+    }
+  }
+}
+
+.antd-pro-pages-dashboard-analysis-twoColLayout {
+  position: relative;
+  display: flex;
+  display: block;
+  flex-flow: row wrap;
+}
+
+.antd-pro-pages-dashboard-analysis-salesCard {
+  height: calc(100% - 24px);
+  /deep/ .ant-card-head {
+    position: relative;
+  }
+}
+
+.dashboard-analysis-iconGroup {
+  i {
+    margin-left: 16px;
+    color: rgba(0,0,0,.45);
+    cursor: pointer;
+    transition: color .32s;
+    color: black;
+  }
+}
+.analysis-salesTypeRadio {
+  position: absolute;
+  right: 54px;
+  bottom: 12px;
+}
+</style>

src/views/dashboard/modules/PrintInSbInfoTypeReport.vue

@@ -0,0 +1,224 @@
+<template>
+  <div class="print-content" v-show="visible">
+    <a-row :gutter="48" slot="extra">
+      <a-col :md="48" :sm="48">
+        <span class="table-page-search-submitButtons" style="float: right">
+          <a-button type="primary" v-print="'#print-container2'" :disabled="disabled">打印</a-button>
+          <a-button style="margin-left: 8px" @click="handleCancel()">返回列表</a-button>
+        </span>
+      </a-col>
+    </a-row>
+    <div class="container" id="print-container2">
+      <div class="text-center" style="position:relative;font-size:20px;font-weight:bold">
+        思康新材料<br/> 设备类型统计报表
+      </div>
+      <div>
+        <div class="col-md-4 text-center" style="padding: 0">统计周期: {{ record.startMonth }} 至 {{ record.endMonth }}</div>
+      </div>
+      <table class="gridtable list">
+        <tbody>
+          <tr>
+            <td class="text-center">类型名称</td>
+            <td class="text-center">总数</td>
+          </tr>
+          <tr :key="index" v-for="(item,index) in items">
+            <td class="text-center">{{ item.typeName}}</td>
+            <td class="text-center">{{ item.totalNum }}</td>
+          </tr>
+        </tbody>
+      </table>
+      <div class="row">
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import { formatDate } from '@/utils/util'
+
+export default {
+  name: 'PrintSbInfoTypeReport',
+  components: { },
+  data () {
+    return {
+      visible: false,
+      disabled: true,
+      record: {},
+      count: 0,
+      items: [],
+      user: this.$store.getters.userInfo
+      // 下拉框map
+    }
+  },
+  props: {},
+  created () {
+    // 下拉框map
+  },
+  computed: {
+  },
+  methods: {
+    base (record) {
+      this.disabled = true
+      this.visible = true
+      this.record = record
+      this.items = record.data
+      this.disabled = false
+    },
+    formatDateEn (value) {
+      return formatDate(new Date(value), 'yyyy-MM-dd')
+    },
+    handleCancel (values) {
+      this.visible = false
+      this.$emit('ok', values)
+    }
+  }
+}
+</script>
+<style media=print>
+/* 应用这个样式的在打印时隐藏 */
+.noPrint {
+  display: none;
+}
+
+/* 应用这个样式的，从那个标签结束开始另算一页，之后在遇到再起一页，以此类推 */
+.page {
+  page-break-after: always;
+}
+</style>
+<style>
+.print-content{
+  width: 1123px;
+  background-color: #fff;
+}
+
+#print-container2 * {
+  font-family: SimHei !important;
+  color: #333447;
+  line-height: 1.5;
+}
+
+.container {
+  width: 95%;
+  padding-right: 15px;
+  padding-left: 15px;
+  margin-right: auto;
+  margin-left: auto;
+}
+
+.col-xs-1, .col-sm-1, .col-md-1, .col-lg-1, .col-xs-2, .col-sm-2, .col-md-2, .col-lg-2, .col-xs-3, .col-sm-3, .col-md-3, .col-lg-3, .col-xs-4, .col-sm-4, .col-md-4, .col-lg-4, .col-xs-5, .col-sm-5, .col-md-5, .col-lg-5, .col-xs-6, .col-sm-6, .col-md-6, .col-lg-6, .col-xs-7, .col-sm-7, .col-md-7, .col-lg-7, .col-xs-8, .col-sm-8, .col-md-8, .col-lg-8, .col-xs-9, .col-sm-9, .col-md-9, .col-lg-9, .col-xs-10, .col-sm-10, .col-md-10, .col-lg-10, .col-xs-11, .col-sm-11, .col-md-11, .col-lg-11, .col-xs-12, .col-sm-12, .col-md-12, .col-lg-12 {
+  position: relative;
+  min-height: 1px;
+  padding-right: 15px;
+  padding-left: 15px;
+}
+
+.text-left {
+  text-align: left;
+}
+
+.text-right {
+  text-align: right;
+}
+
+.text-center {
+  text-align: center;
+}
+
+table.gridtable {
+  width: 100%;
+  font-family: verdana, arial, sans-serif;
+  font-size: 11px;
+  color: #333333;
+  border-width: 1px;
+  border-color: #666666;
+  border-collapse: collapse;
+}
+
+table.gridtable th {
+  border-width: 1px;
+  padding: 8px;
+  border-style: solid;
+  border-color: #666666;
+  background-color: #dedede;
+}
+
+table.gridtable td {
+  border-width: 1px;
+  padding: 8px;
+  border-style: solid;
+  border-color: #666666;
+  background-color: #ffffff;
+}
+
+table.content td {
+  height: 95px;
+}
+
+.row {
+  margin-right: -15px;
+  margin-left: -15px;
+}
+
+.container:before,
+.container:after,
+.row:before, .row:after {
+  display: table;
+  content: " ";
+}
+
+.container:after, .row:after {
+  clear: both;
+}
+
+.col-md-1, .col-md-2, .col-md-3, .col-md-4, .col-md-5, .col-md-6, .col-md-7, .col-md-8, .col-md-9, .col-md-10, .col-md-11, .col-md-12 {
+  float: left;
+}
+
+.col-md-12 {
+  width: 100%;
+}
+
+.col-md-11 {
+  width: 91.66666667%;
+}
+
+.col-md-10 {
+  width: 83.33333333%;
+}
+
+.col-md-9 {
+  width: 75%;
+}
+
+.col-md-8 {
+  width: 66.66666667%;
+}
+
+.col-md-7 {
+  width: 58.33333333%;
+}
+
+.col-md-6 {
+  width: 50%;
+}
+
+.col-md-5 {
+  width: 41.66666667%;
+}
+
+.col-md-4 {
+  width: 33.33333333%;
+}
+
+.col-md-3 {
+  width: 25%;
+}
+
+.col-md-2 {
+  width: 16.66666667%;
+}
+
+.col-md-1 {
+  width: 8.33333333%;
+}
+</style>

src/views/sb/info/MeasureSbInfoWarn.vue

@@ -1,6 +1,7 @@
 <template>
   <SbInfo :use-type="4" :measure-status="1">
-  </sbinfo></template>
+  </sbinfo>
+</template>
 
 <script>
 import SbInfo from './SbInfo'

src/views/sb/info/SbInfo.vue

@@ -87,7 +87,7 @@
                   </a-col>
                   <a-col :md="6" :sm="24">
                     <a-form-item label="生产商">
-                      <a-input v-model="queryParam.producerName" placeholder="生产商名称"/>
+                      <a-input v-model="queryParam.producerId" placeholder="生产商名称"/>
                     </a-form-item>
                   </a-col>
                   <a-col :md="6" :sm="24">
@@ -126,9 +126,19 @@
                       </a-select>
                     </a-form-item>
                   </a-col>
+                  <a-col :md="8" :sm="24">
+                    <a-form-item label="检定日期范围">
+                      <a-range-picker v-model="dateRangeCheck" :style="{width: '256px'}" />
+                    </a-form-item>
+                  </a-col>
+                  <a-col :md="8" :sm="24">
+                    <a-form-item label="有效日期范围">
+                      <a-range-picker v-model="dateRange" :style="{width: '256px'}" />
+                    </a-form-item>
+                  </a-col>
                   <a-col :md="6 || 24" :sm="24">
                     <span class="table-page-search-submitButtons">
-                      <a-button type="primary" @click="$refs.table.refresh(true)">查询</a-button>
+                      <a-button type="primary" @click="handleOk">查询</a-button>
                       <a-button style="margin-left: 8px" @click="resetSearchForm">重置</a-button>
                     </span>
                   </a-col>
@@ -319,6 +329,8 @@ export default {
       },
       depreciationTypeMap: {},
       visible: true,
+      dateRange: [],
+      dateRangeCheck: [],
       sbPositionData: [],
       levelMap: {},
       lineMap: {},
@@ -418,7 +430,7 @@ export default {
         },
         {
           title: '生产商',
-          dataIndex: 'producerName',
+          dataIndex: 'producerId',
           width: 120,
           checked: true
         },
@@ -746,6 +758,18 @@ export default {
     handleOk () {
       this.visible = true
       this.setTree()
+      if (this.dateRange != null) {
+        this.queryParam.nextCheckDateStart = this.dateRange[0]
+        this.queryParam.nextCheckDateEnd = this.dateRange[1]
+        this.queryParam.nextCheckDateStart = this.queryParam.nextCheckDateStart ? this.queryParam.nextCheckDateStart.format(this.BaseTool.Date.PICKER_NORM_DATE_PATTERN) : null
+        this.queryParam.nextCheckDateEnd = this.queryParam.nextCheckDateEnd ? this.queryParam.nextCheckDateEnd.format(this.BaseTool.Date.PICKER_NORM_DATE_PATTERN) : null
+      }
+      if (this.dateRangeCheck != null) {
+        this.queryParam.checkDateStart = this.dateRangeCheck[0]
+        this.queryParam.checkDateEnd = this.dateRangeCheck[1]
+        this.queryParam.checkDateStart = this.queryParam.checkDateStart ? this.queryParam.checkDateStart.format(this.BaseTool.Date.PICKER_NORM_DATE_PATTERN) : null
+        this.queryParam.checkDateEnd = this.queryParam.checkDateEnd ? this.queryParam.checkDateEnd.format(this.BaseTool.Date.PICKER_NORM_DATE_PATTERN) : null
+      }
       this.$refs.table.refresh()
     },
     onSelectChange (selectedRowKeys, selectedRows) {
@@ -822,7 +846,7 @@ export default {
       this.$refs.importModalUpdate.base(null, 1)
     },
     doImportForUpdate () {
-      this.$refs.importModalUpdate.base(null, 4)
+      this.$refs.importModalUpdate.base(null, 2)
     }
   }
 }

src/views/sb/info/SbInfoDebug.vue

@@ -289,7 +289,7 @@ export default {
         },
         {
           title: '生产商',
-          dataIndex: 'producerName',
+          dataIndex: 'producerId',
           width: 120,
           checked: true
         },

src/views/sb/info/SbInfoForLocation.vue

@@ -198,10 +198,7 @@ export default {
           title: '生产商',
           dataIndex: 'producerId',
           width: 200,
-          checked: true,
-          customRender: (text, record, index) => {
-            return record.producerName
-          }
+          checked: true
         },
         {
           title: '设备来源方式',

src/views/sb/info/SbInfoForPartInfo.vue

@@ -198,10 +198,7 @@ export default {
           title: '生产商',
           dataIndex: 'producerId',
           width: 200,
-          checked: true,
-          customRender: (text, record, index) => {
-            return record.producerName
-          }
+          checked: true
         },
         {
           title: '设备来源方式',

src/views/sb/info/SbInfoStandard.vue

@@ -292,7 +292,7 @@ export default {
 
         {
           title: '生产商',
-          dataIndex: 'producerName',
+          dataIndex: 'producerId',
           width: 120,
           checked: true
         },

src/views/sb/info/modules/BaseForm.vue

@@ -233,26 +233,14 @@
       </a-row>
 
       <a-row class="form-row" :gutter="BaseTool.Constant.row.gutter">
-
         <a-col :lg="12" :md="24" :sm="24">
           <a-form-item
             label="生产商"
             :labelCol="BaseTool.Constant.labelCol"
             :wrapperCol="BaseTool.Constant.wrapperCol"
           >
-            <a-select
-              show-search
-              option-filter-prop="children"
-              :filter-option="filterOptionProducer"
-              v-decorator="['producerId']"
-              placeholder="请选择">
-              <a-select-option
-                v-for="({id, name}) in producerList"
-                :key="id"
-                :label="name"
-                :value="id">{{ name }}
-              </a-select-option>
-            </a-select>
+            <a-input
+              v-decorator="['producerId']" />
           </a-form-item>
         </a-col>
       </a-row>

src/views/sb/info/modules/Detail.vue

@@ -163,7 +163,7 @@
                 {{ BaseTool.Object.getField(useTypeMap,model.useType) }}
               </a-descriptions-item>
               <a-descriptions-item label="生产商">
-                {{ model.producerName }}
+                {{ model.producerId }}
               </a-descriptions-item>
               <a-descriptions-item label="大小尺寸">
                 {{ model.zz }}
@@ -429,7 +429,7 @@ export default {
         'parentName': null,
         'createdUserName': null,
         'typeName': null,
-        'producerName': null,
+        'producerId': null,
         'zzh': null,
         'fdjxh': null,
         'fdjh': null,

src/views/sb/position/SbPosition.vue

@@ -127,10 +127,10 @@ export default {
             return this.BaseTool.Object.getField(this.positionTypeMap, text)
           }
         },
-        {
+        /*      {
           title: '父子关联编码',
           dataIndex: 'code'
-        },
+        }, */
         {
           title: '排序',
           dataIndex: 'sort'

src/views/sb/position/modules/BaseForm.vue

@@ -13,12 +13,12 @@
       </a-form-item>
 
       <a-form-item
-        label="编码"
+        label="位号"
         :labelCol="BaseTool.Constant.labelCol"
         :wrapperCol="BaseTool.Constant.wrapperCol"
       >
         <a-input
-          v-decorator="['no', {rules: [{required: true, message: '编码不能为空'}]}]" />
+          v-decorator="['no', {rules: [{required: true, message: '位号不能为空'}]}]" />
       </a-form-item>
       <a-form-item
         label="名称"
@@ -58,14 +58,14 @@
         >
         </a-tree-select>
       </a-form-item>
-      <a-form-item
+<!--      <a-form-item
         label="父子关联编码"
         :labelCol="BaseTool.Constant.labelCol"
         :wrapperCol="BaseTool.Constant.wrapperCol"
       >
         <a-input
           v-decorator="['code', {rules: [{required: true, message: '父子关联编码不能为空'}]}]" />
-      </a-form-item>
+      </a-form-item>-->
       <a-form-item
         label="区域维修负责人"
         :labelCol="BaseTool.Constant.labelCol"

src/views/store/sparestore/modules/SpareStoreSelectModalYY.vue

@@ -23,56 +23,29 @@
           <div class="table-page-search-wrapper">
             <a-form layout="inline">
               <a-row :gutter="48">
-                <a-col :md="8" :sm="24">
-                  <a-form-item label="关键字">
-                    <a-input v-model.trim="queryParam.keyword" placeholder="请输入备件名称"/>
+                <a-col :md="6" :sm="24">
+                  <a-form-item label="仓库编码">
+                    <a-input v-model.trim="queryParam.storeNo" placeholder="仓库编码"/>
                   </a-form-item>
                 </a-col>
-                <a-col :md="8" :sm="24">
-                  <a-form-item label="类型">
-                    <a-tree-select
-                      style="width: 100%"
-                      :dropdownStyle="{ maxHeight: '400px', overflow: 'auto' }"
-                      :treeData="spareTypeTreeData"
-                      :treeNodeFilterProp="'title'"
-                      :showSearch="true"
-                      v-model="queryParam.typeId"
-                      placeholder="请选择"
-                    >
-                    </a-tree-select>
+                <a-col :md="6" :sm="24">
+                  <a-form-item label="仓库名称">
+                    <a-input v-model.trim="queryParam.storeName" placeholder="仓库名称"/>
                   </a-form-item>
                 </a-col>
-                <a-col :md="8" :sm="24">
-                  <a-form-item label="规格型号">
-                    <a-input v-model="queryParam.ggxh" placeholder="模糊查询"/>
-                  </a-form-item>
-                </a-col>
-                <a-col :md="8" :sm="24">
-                  <a-form-item label="原厂编号">
-                    <a-input v-model="queryParam.initNo" placeholder="模糊查询"/>
+                <a-col :md="6" :sm="24">
+                  <a-form-item label="存货编码">
+                    <a-input v-model.trim="queryParam.spareNo" placeholder="存货名称"/>
                   </a-form-item>
                 </a-col>
-                <a-col :md="8" :sm="24">
-                  <a-form-item label="关联设备">
-                    <a-input v-model="queryParam.model" placeholder="新号/旧号/名称/规格"/>
+                <a-col :md="6" :sm="24">
+                  <a-form-item label="存货名称">
+                    <a-input v-model.trim="queryParam.spareName" placeholder="存货名称"/>
                   </a-form-item>
                 </a-col>
-                <a-col :md="8" :sm="24">
-                  <a-form-item
-                    label="仓库"
-                    :labelCol="BaseTool.Constant.labelCol"
-                    :wrapperCol="BaseTool.Constant.wrapperCol"
-                  >
-                    <a-tree-select
-                      style="width: 100%"
-                      :dropdownStyle="{ maxHeight: '400px', overflow: 'auto' }"
-                      :treeData="storeTreeDate"
-                      :treeNodeFilterProp="'title'"
-                      :showSearch="true"
-                      v-model="queryParam.storeId"
-                      placeholder="请选择"
-                    >
-                    </a-tree-select>
+                <a-col :md="6" :sm="24">
+                  <a-form-item label="规格型号">
+                    <a-input v-model.trim="queryParam.ggxh" placeholder="规格型号"/>
                   </a-form-item>
                 </a-col>
                 <a-col :md="8 || 24" :sm="24">
@@ -168,11 +141,11 @@ export default {
           }
         },
         {
-          title: '备件编号',
+          title: '存货编号',
           dataIndex: 'no'
         },
         {
-          title: '备件名称',
+          title: '存货名称',
           dataIndex: 'spareName'
         },
         {
@@ -290,10 +263,7 @@ export default {
       this.selectedRows = selectedRows
     },
     resetSearchForm () {
-      this.queryParam.keyword = null
-      this.queryParam.typeId = null
-      this.queryParam.model = null
-      this.queryParam.storeId = null
+      this.queryParam = {}
       this.$refs.table.refresh(true)
     },
     base (record, queryParam = {}) {