|
@@ -15,34 +15,34 @@
|
|
<a-row :gutter="15">
|
|
<a-row :gutter="15">
|
|
<a-col :md="6" :sm="24">
|
|
<a-col :md="6" :sm="24">
|
|
<a-form-model-item label="货架名称" prop="shelfSn">
|
|
<a-form-model-item label="货架名称" prop="shelfSn">
|
|
- <shelfSList v-model="queryParam.shelfSn" @change="shelfChange"></shelfSList>
|
|
|
|
|
|
+ <shelfSList id="vinAnaly-form-shelfSn" v-model="queryParam.shelfSn" @change="shelfChange"></shelfSList>
|
|
</a-form-model-item>
|
|
</a-form-model-item>
|
|
</a-col>
|
|
</a-col>
|
|
<a-col :md="6" :sm="24">
|
|
<a-col :md="6" :sm="24">
|
|
<a-form-model-item label="扫描时间">
|
|
<a-form-model-item label="扫描时间">
|
|
- <rangeDate ref="rangeDate" v-model="time" @change="dateChange" />
|
|
|
|
|
|
+ <rangeDate id="vinAnaly-form-time" ref="rangeDate" v-model="time" @change="dateChange" />
|
|
</a-form-model-item>
|
|
</a-form-model-item>
|
|
</a-col>
|
|
</a-col>
|
|
<template v-if="advanced">
|
|
<template v-if="advanced">
|
|
<a-col :md="6" :sm="24">
|
|
<a-col :md="6" :sm="24">
|
|
<a-form-model-item label="VIN">
|
|
<a-form-model-item label="VIN">
|
|
- <a-input id="vinAnaly-VIN" v-model.trim="queryParam.vinCode" allowClear placeholder="请输入VIN"/>
|
|
|
|
|
|
+ <a-input id="vinAnaly-form-vinCode" v-model.trim="queryParam.vinCode" allowClear placeholder="请输入VIN"/>
|
|
</a-form-model-item>
|
|
</a-form-model-item>
|
|
</a-col>
|
|
</a-col>
|
|
<a-col :md="6" :sm="24">
|
|
<a-col :md="6" :sm="24">
|
|
<a-form-model-item label="车辆品牌">
|
|
<a-form-model-item label="车辆品牌">
|
|
- <a-input id="vinAnaly-salesBillNo" v-model.trim="queryParam.brandName" allowClear placeholder="请输入车辆品牌"/>
|
|
|
|
|
|
+ <a-input id="vinAnaly-form-brandName" v-model.trim="queryParam.brandName" allowClear placeholder="请输入车辆品牌"/>
|
|
</a-form-model-item>
|
|
</a-form-model-item>
|
|
</a-col>
|
|
</a-col>
|
|
<a-col :md="6" :sm="24">
|
|
<a-col :md="6" :sm="24">
|
|
<a-form-model-item label="车型">
|
|
<a-form-model-item label="车型">
|
|
- <a-input id="vinAnaly-salesManName" v-model.trim="queryParam.modelInfo" allowClear placeholder="请输入车型"/>
|
|
|
|
|
|
+ <a-input id="vinAnaly-form-modelInfo" v-model.trim="queryParam.modelInfo" allowClear placeholder="请输入车型"/>
|
|
</a-form-model-item>
|
|
</a-form-model-item>
|
|
</a-col>
|
|
</a-col>
|
|
</template>
|
|
</template>
|
|
<a-col :md="6" :sm="24" style="margin-bottom: 10px;">
|
|
<a-col :md="6" :sm="24" style="margin-bottom: 10px;">
|
|
- <a-button type="primary" @click="handleSearch" :disabled="disabled" id="vinAnaly-refresh">查询</a-button>
|
|
|
|
- <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="vinAnaly-reset">重置</a-button>
|
|
|
|
|
|
+ <a-button type="primary" @click="handleSearch" :disabled="disabled" id="vinAnaly-form-refresh">查询</a-button>
|
|
|
|
+ <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="vinAnaly-form-reset">重置</a-button>
|
|
<a-button
|
|
<a-button
|
|
type="primary"
|
|
type="primary"
|
|
style="margin-left: 5px"
|
|
style="margin-left: 5px"
|
|
@@ -50,8 +50,8 @@
|
|
:disabled="disabled"
|
|
:disabled="disabled"
|
|
:loading="exportLoading"
|
|
:loading="exportLoading"
|
|
class="button-warning"
|
|
class="button-warning"
|
|
- id="vinAnaly-export-btn">导出</a-button>
|
|
|
|
- <a @click="advanced=!advanced" style="margin-left: 5px">
|
|
|
|
|
|
+ id="vinAnaly-form-export-btn">导出</a-button>
|
|
|
|
+ <a @click="advanced=!advanced" style="margin-left: 5px" id="vinAnaly-form-advanced">
|
|
{{ advanced ? '收起' : '展开' }}
|
|
{{ advanced ? '收起' : '展开' }}
|
|
<a-icon :type="advanced ? 'up' : 'down'"/>
|
|
<a-icon :type="advanced ? 'up' : 'down'"/>
|
|
</a>
|
|
</a>
|
|
@@ -96,7 +96,7 @@
|
|
<!-- vin -->
|
|
<!-- vin -->
|
|
<template slot="vin" slot-scope="text, record">
|
|
<template slot="vin" slot-scope="text, record">
|
|
<div>
|
|
<div>
|
|
- <span class="table-td-link" @click="handleDetail(record)">{{ record.vinCode }}</span>
|
|
|
|
|
|
+ <span :id="'vinAnaly-form-detail-'+record.id" class="table-td-link" @click="handleDetail(record)">{{ record.vinCode }}</span>
|
|
</div>
|
|
</div>
|
|
</template>
|
|
</template>
|
|
</s-table>
|
|
</s-table>
|
|
@@ -127,25 +127,25 @@ export default {
|
|
labelCol: { span: 8 },
|
|
labelCol: { span: 8 },
|
|
wrapperCol: { span: 16 },
|
|
wrapperCol: { span: 16 },
|
|
advanced: true, // 高级搜索 展开/关闭
|
|
advanced: true, // 高级搜索 展开/关闭
|
|
- tableHeight: 0,
|
|
|
|
|
|
+ tableHeight: 0, // 表格高度
|
|
queryParam: { // 查询条件
|
|
queryParam: { // 查询条件
|
|
- beginDate: '',
|
|
|
|
- endDate: '',
|
|
|
|
- vinCode: undefined,
|
|
|
|
- shelfSn: undefined,
|
|
|
|
- brandName: undefined,
|
|
|
|
- modelInfo: undefined
|
|
|
|
|
|
+ beginDate: '', // 开始时间
|
|
|
|
+ endDate: '', // 结束时间
|
|
|
|
+ vinCode: undefined, // vin码
|
|
|
|
+ shelfSn: undefined, // 货架sn
|
|
|
|
+ brandName: undefined, // 品牌
|
|
|
|
+ modelInfo: undefined // 车型
|
|
},
|
|
},
|
|
- airConditionerFilterData: null,
|
|
|
|
|
|
+ airConditionerFilterData: null, // 过滤条件
|
|
airFilterFlagData: null,
|
|
airFilterFlagData: null,
|
|
engineOilFilterFlagData: null,
|
|
engineOilFilterFlagData: null,
|
|
- isSearch: false,
|
|
|
|
- time: [],
|
|
|
|
|
|
+ isSearch: false, // 是否查询
|
|
|
|
+ time: [], // 时间默认值
|
|
rules: {
|
|
rules: {
|
|
'shelfSn': [{ required: true, message: '请选择货架', trigger: 'change' }]
|
|
'shelfSn': [{ required: true, message: '请选择货架', trigger: 'change' }]
|
|
},
|
|
},
|
|
disabled: false, // 查询、重置按钮是否可操作
|
|
disabled: false, // 查询、重置按钮是否可操作
|
|
- exportLoading: false,
|
|
|
|
|
|
+ exportLoading: false, // 导出loading
|
|
// 加载数据方法 必须为 Promise 对象
|
|
// 加载数据方法 必须为 Promise 对象
|
|
loadData: (parameter) => {
|
|
loadData: (parameter) => {
|
|
const dataObj = parameter
|
|
const dataObj = parameter
|
|
@@ -185,17 +185,17 @@ export default {
|
|
return data
|
|
return data
|
|
})
|
|
})
|
|
},
|
|
},
|
|
- queryCountData: null,
|
|
|
|
- shelfName: '',
|
|
|
|
- showColItem: [
|
|
|
|
|
|
+ queryCountData: null, // 合计数据
|
|
|
|
+ shelfName: '', // 货架名称
|
|
|
|
+ showColItem: [ // 筛选类型
|
|
{ label: '空调滤清器', value: 'kt' },
|
|
{ label: '空调滤清器', value: 'kt' },
|
|
{ label: '空气滤清器', value: 'kq' },
|
|
{ label: '空气滤清器', value: 'kq' },
|
|
{ label: '机油滤清器', value: 'jy' }
|
|
{ label: '机油滤清器', value: 'jy' }
|
|
],
|
|
],
|
|
- showCol: ['kt', 'kq', 'jy'],
|
|
|
|
- filters: [{ text: '有', value: 1 }, { text: '无', value: 2 }, { text: '空(--)', value: 0 }],
|
|
|
|
- showDetail: false,
|
|
|
|
- curItem: null
|
|
|
|
|
|
+ showCol: ['kt', 'kq', 'jy'], // 筛选类型值
|
|
|
|
+ filters: [{ text: '有', value: 1 }, { text: '无', value: 2 }, { text: '空(--)', value: 0 }], // 筛选条件
|
|
|
|
+ showDetail: false, // 详情弹框
|
|
|
|
+ curItem: null // 详情数据
|
|
}
|
|
}
|
|
},
|
|
},
|
|
computed: {
|
|
computed: {
|
|
@@ -208,6 +208,7 @@ export default {
|
|
{ title: '车辆品牌', dataIndex: 'brandName', width: '7%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
{ title: '车辆品牌', dataIndex: 'brandName', width: '7%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
{ title: '车型', dataIndex: 'modelInfo', width: '24%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true }
|
|
{ title: '车型', dataIndex: 'modelInfo', width: '24%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true }
|
|
]
|
|
]
|
|
|
|
+ // 隐藏、显示列
|
|
this.showCol.map(item => {
|
|
this.showCol.map(item => {
|
|
if (item == 'kt') {
|
|
if (item == 'kt') {
|
|
arr.push({ title: '空调滤清器适配', dataIndex: 'airConditionerFilterFlagDesc', filters: this.filters, filterMultiple: false, width: '120px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
|
|
arr.push({ title: '空调滤清器适配', dataIndex: 'airConditionerFilterFlagDesc', filters: this.filters, filterMultiple: false, width: '120px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
|
|
@@ -223,6 +224,7 @@ export default {
|
|
}
|
|
}
|
|
},
|
|
},
|
|
methods: {
|
|
methods: {
|
|
|
|
+ // 选择货架
|
|
shelfChange (v, row) {
|
|
shelfChange (v, row) {
|
|
this.shelfName = row ? row.shelfName : ''
|
|
this.shelfName = row ? row.shelfName : ''
|
|
},
|
|
},
|
|
@@ -266,10 +268,8 @@ export default {
|
|
this.time = []
|
|
this.time = []
|
|
this.$refs.rangeDate.resetDate(this.time)
|
|
this.$refs.rangeDate.resetDate(this.time)
|
|
this.$refs.ruleForm.resetFields()
|
|
this.$refs.ruleForm.resetFields()
|
|
- // this.$refs.table.refresh(true)
|
|
|
|
this.handleSearch()
|
|
this.handleSearch()
|
|
},
|
|
},
|
|
-
|
|
|
|
// 导出
|
|
// 导出
|
|
handleExport () {
|
|
handleExport () {
|
|
const _this = this
|
|
const _this = this
|
|
@@ -293,11 +293,11 @@ export default {
|
|
_this.spinning = false
|
|
_this.spinning = false
|
|
})
|
|
})
|
|
} else {
|
|
} else {
|
|
- console.log('error submit!!')
|
|
|
|
return false
|
|
return false
|
|
}
|
|
}
|
|
})
|
|
})
|
|
},
|
|
},
|
|
|
|
+ // 获取详情信息
|
|
handleDetail (row) {
|
|
handleDetail (row) {
|
|
queryDetail({ id: row.id }).then(res => {
|
|
queryDetail({ id: row.id }).then(res => {
|
|
if (res.status == 200) {
|
|
if (res.status == 200) {
|