Merge branch 'master' of http://123.56.95.229:10010/r/高精
This commit is contained in:
@@ -1,20 +1,27 @@
|
||||
<template>
|
||||
<div class="app-container">
|
||||
<el-card>
|
||||
<el-select v-model="machineValue" placeholder="机床图号" style="width: 150px" filterable size="small">
|
||||
<el-select v-model="machineValue" placeholder="机床图号" style="width: 150px" filterable size="small" @change="searchModel()">
|
||||
<el-option
|
||||
v-for="item in machine"
|
||||
:key="item.value"
|
||||
:label="item.label"
|
||||
:value="item.value"/>
|
||||
</el-select>
|
||||
<el-select v-model="groupValue" placeholder="组号" style="width: 150px;margin-top: 10px;margin-bottom: 5px" filterable size="small">
|
||||
<el-select v-model="groupValue" placeholder="组号" style="width: 150px;margin-top: 10px;margin-bottom: 5px" filterable size="small" clearable="" @change="searchModel()">
|
||||
<el-option
|
||||
v-for="item in group"
|
||||
:key="item.value"
|
||||
:label="item.label"
|
||||
:value="item.value"/>
|
||||
</el-select>
|
||||
<el-select v-model="ModelValue" placeholder="规格" style="width: 150px;margin-top: 10px;margin-bottom: 5px" filterable size="small" clearable="">
|
||||
<el-option
|
||||
v-for="item in Model"
|
||||
:key="item.value"
|
||||
:label="item.label"
|
||||
:value="item.value"/>
|
||||
</el-select>
|
||||
<el-button icon="el-icon-search" type="primary" plain size="small" @click="pageCurrentWB = 1;pageSizeWB = 1000;pageCurrent = 1;pageSize = 1000;getTableData()">查询</el-button>
|
||||
</el-card>
|
||||
<el-card>
|
||||
@@ -278,7 +285,7 @@
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import { machineSelect, groupSelect, basicPartsData, deleteBasicParts, purchasePartsData, deletePurchaseData, getFileData } from '@/api/TechnologyCenter/QueryParts'
|
||||
import { machineSelect, groupSelect, basicPartsData, deleteBasicParts, purchasePartsData, deletePurchaseData, getFileData, searchModel } from '@/api/TechnologyCenter/QueryParts'
|
||||
import { mapGetters } from 'vuex'
|
||||
import { ServerIP } from '@/utils/request'
|
||||
export default {
|
||||
@@ -290,6 +297,8 @@ export default {
|
||||
groupValue: '',
|
||||
group: [],
|
||||
group1: [],
|
||||
ModelValue: '', // 规格型号
|
||||
Model: [], // 规格型号组
|
||||
loading: false,
|
||||
loadingWB: false,
|
||||
dialogFormVisible: false,
|
||||
@@ -375,14 +384,26 @@ export default {
|
||||
this.form.组号 = ''
|
||||
this.getSelect(groupSelect, ['组号', '组件流水号'], 'group1', this.form.机床号)
|
||||
},
|
||||
searchModel() {
|
||||
const machine_check = this.machineValue ? 1 : 0
|
||||
const group_check = this.groupValue ? 1 : 0
|
||||
var param = []
|
||||
param[0] = machine_check
|
||||
param[1] = this.machineValue
|
||||
param[2] = group_check
|
||||
param[3] = this.groupValue
|
||||
this.getSelect(searchModel, ['规格', '规格'], 'Model', param)
|
||||
console.log(this.Model, 989898)
|
||||
},
|
||||
getTableData() {
|
||||
this.getFileData(this.machineValue)
|
||||
console.log(this.hadFile, 88899)
|
||||
if (this.machineValue) {
|
||||
const machine_check = this.machineValue ? 1 : 0
|
||||
const group_check = this.groupValue ? 1 : 0
|
||||
const Model_check = this.ModelValue ? 1 : 0
|
||||
this.loading = true
|
||||
basicPartsData(machine_check, this.machineValue, group_check, this.groupValue, this.pageSize, this.pageCurrent).then(response => {
|
||||
basicPartsData(machine_check, this.machineValue, group_check, this.groupValue, Model_check, this.ModelValue, this.pageSize, this.pageCurrent).then(response => {
|
||||
this.loading = false
|
||||
const res = response.data
|
||||
this.total = res.total
|
||||
|
||||
Reference in New Issue
Block a user