|
|
@@ -1,7 +1,7 @@
|
|
|
<template>
|
|
|
<a-card :bordered="false">
|
|
|
<a-row :gutter="8" v-show="visible">
|
|
|
- <a-col :span="4">
|
|
|
+<!-- <a-col :span="4">
|
|
|
<a-tree
|
|
|
@expand="onExpand"
|
|
|
:expandedKeys="expandedKeys"
|
|
|
@@ -10,20 +10,54 @@
|
|
|
:selectedKeys="selectedKeys"
|
|
|
:treeData="treeData"
|
|
|
/>
|
|
|
- </a-col>
|
|
|
- <a-col :span="20">
|
|
|
+ </a-col>-->
|
|
|
+ <a-col :span="24">
|
|
|
<div>
|
|
|
<div class="table-page-search-wrapper">
|
|
|
<a-form layout="inline">
|
|
|
<a-row :gutter="48">
|
|
|
- <a-col :md="6" :sm="24">
|
|
|
+ <a-col :md="8" :sm="24">
|
|
|
<a-form-item label="关键字">
|
|
|
<a-input v-model="queryParam.keyword" placeholder="请输入名称/设备新号"/>
|
|
|
</a-form-item>
|
|
|
</a-col>
|
|
|
- <a-col :md="6" :sm="24">
|
|
|
+ <a-col :md="8" :sm="24">
|
|
|
<a-form-item label="设备旧号">
|
|
|
- <a-input v-model="queryParam.zbh" placeholder="请输入设备旧号"/>
|
|
|
+ <a-input v-model="queryParam.zbh"/>
|
|
|
+ </a-form-item>
|
|
|
+ </a-col>
|
|
|
+ <a-col :md="8" :sm="24">
|
|
|
+ <a-form-item label="测量设备编号">
|
|
|
+ <a-input v-model="queryParam.cardNo" />
|
|
|
+ </a-form-item>
|
|
|
+ </a-col>
|
|
|
+ <a-col :md="8" :sm="24">
|
|
|
+ <a-form-item label="使用部门">
|
|
|
+ <a-select v-model="queryParam.cardNo" placeholder="请选择">
|
|
|
+ <a-select-option
|
|
|
+ v-for="item in deptUserList"
|
|
|
+ :key="item.userId"
|
|
|
+ :label="item.realName"
|
|
|
+ :value="item.userId">{{ item.realName }}
|
|
|
+ </a-select-option>
|
|
|
+ </a-select>
|
|
|
+ </a-form-item>
|
|
|
+ </a-col>
|
|
|
+ <a-col :md="8" :sm="24">
|
|
|
+ <a-form-item label="出厂编号">
|
|
|
+ <a-input v-model="queryParam.zzh"/>
|
|
|
+ </a-form-item>
|
|
|
+ </a-col>
|
|
|
+ <a-col :md="8" :sm="24">
|
|
|
+ <a-form-item label="ABC分类">
|
|
|
+ <a-select v-model="queryParam.zbh" placeholder="请选择">
|
|
|
+ <a-select-option
|
|
|
+ v-for="(label,value) in levelMap"
|
|
|
+ :key="value"
|
|
|
+ :label="label"
|
|
|
+ :value="parseInt(value)">{{ label }}
|
|
|
+ </a-select-option>
|
|
|
+ </a-select>
|
|
|
</a-form-item>
|
|
|
</a-col>
|
|
|
<a-col :md="8" :sm="24">
|
|
|
@@ -38,9 +72,14 @@
|
|
|
</a-select>
|
|
|
</a-form-item>
|
|
|
</a-col>
|
|
|
+ <a-col :md="10" :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>
|
|
|
@@ -132,6 +171,7 @@ import { queryDept, getDeptsAllByParentId } from '@/api/upms/dept'
|
|
|
import { fetchSbTypeTree } from '@/api/sb/type'
|
|
|
import ImportFormAdd from './modules/ImportFormAdd'
|
|
|
import PrintSbCode from '@/views/sb/info/modules/PrintSbCode'
|
|
|
+import { queryUserDept } from '@/api/upms/user-dept'
|
|
|
|
|
|
export default {
|
|
|
name: 'MeasureSbInfoList',
|
|
|
@@ -153,6 +193,8 @@ export default {
|
|
|
},
|
|
|
data () {
|
|
|
return {
|
|
|
+ dateRange: [],
|
|
|
+ deptUserList: [],
|
|
|
// 查询参数
|
|
|
queryParam: {
|
|
|
filter: this.filter,
|
|
|
@@ -195,6 +237,12 @@ export default {
|
|
|
width: 120,
|
|
|
checked: true
|
|
|
},
|
|
|
+ {
|
|
|
+ title: '测量设备编号',
|
|
|
+ dataIndex: 'cardNo',
|
|
|
+ width: 150,
|
|
|
+ checked: true
|
|
|
+ },
|
|
|
{
|
|
|
title: '设备类型',
|
|
|
checked: true,
|
|
|
@@ -327,6 +375,9 @@ export default {
|
|
|
this.unitMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.SBINFO_UNIT)
|
|
|
this.sourceTypeMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.SBTYPE_SOURCETYPE)
|
|
|
this.useTypeMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.SB_USE_TYPE)
|
|
|
+ queryUserDept({ deptCode: this.DictCache.VALUE.SYS_DEPT_CODE.CHANG_NEI_WEI_XIU_ZU, userStatus: 1 }).then(res2 => {
|
|
|
+ this.deptUserList = res2.data
|
|
|
+ })
|
|
|
},
|
|
|
methods: {
|
|
|
tableOption () {
|
|
|
@@ -432,6 +483,13 @@ 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
|
|
|
+
|
|
|
+ }
|
|
|
this.$refs.table.refresh()
|
|
|
},
|
|
|
onSelectChange (selectedRowKeys, selectedRows) {
|
xiongchao