This commit is contained in:
parent
bba91d423e
commit
8ff796775e
|
|
@ -80,14 +80,10 @@
|
|||
v-model.trim="queryParams.originalCode"
|
||||
/>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item prop="manufacturer" label="生产厂家">
|
||||
<el-input
|
||||
clearable
|
||||
style="width: 240px"
|
||||
placeholder="请输入内容"
|
||||
v-model.trim="queryParams.manufacturer"
|
||||
/>
|
||||
<el-form-item prop="manufacturerId" label="生产厂家">
|
||||
<el-select v-model="queryParams.manufacturerId" placeholder="请选择生产厂家" clearable filterable style="width: 240px">
|
||||
<el-option v-for="item in manufacturerList" :key="item.id" :label="item.label" :value="item.id"/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item prop="productionDate" label="出厂日期">
|
||||
|
|
@ -307,6 +303,7 @@ import {
|
|||
equipmentDelApiNew,
|
||||
equipmentPassAndRejectApiNew
|
||||
} from '@/api/EquipmentEntryApply/index'
|
||||
import { getManufacturerSelectApi } from '@/api/EquipmentLedger/index.js'
|
||||
|
||||
export default {
|
||||
name: 'EquipmentDetailList',
|
||||
|
|
@ -327,7 +324,7 @@ export default {
|
|||
specificationModel: '',
|
||||
originalCode: '',
|
||||
manufacturer: '',
|
||||
|
||||
manufacturerId: '',
|
||||
minBuyPrice: '',
|
||||
maxBuyPrice: '',
|
||||
orderId: '',
|
||||
|
|
@ -335,6 +332,7 @@ export default {
|
|||
pageNum: 1,
|
||||
pageSize: 10
|
||||
},
|
||||
manufacturerList: [],
|
||||
tableData: [],
|
||||
columns2: [],
|
||||
columns: [
|
||||
|
|
@ -370,12 +368,22 @@ export default {
|
|||
this.orderStatus = status || orderStatus
|
||||
}
|
||||
this.getEquipmentApplyList()
|
||||
this.getManufacturerSelectList()
|
||||
},
|
||||
methods: {
|
||||
goBack() {
|
||||
// this.$router.go(-1)
|
||||
this.$router.push({ path: '/equipment/equipment-entry-approval' })
|
||||
},
|
||||
// 获取厂家
|
||||
getManufacturerSelectList() {
|
||||
getManufacturerSelectApi().then((res) => {
|
||||
console.log('🚀 ~ getManufacturerSelectList ~ res:', res)
|
||||
if (res.code === 200) {
|
||||
this.manufacturerList = res.data
|
||||
}
|
||||
})
|
||||
},
|
||||
/**
|
||||
* 获取装备申请列表
|
||||
*/
|
||||
|
|
|
|||
Loading…
Reference in New Issue