@@ -136,7 +136,9 @@ export default { | |||
components: { | |||
AddOrUpdate, | |||
}, | |||
created() {}, | |||
created() { | |||
this.listQuery.warehouseId = null; | |||
}, | |||
methods: { | |||
buttonClick(val) { | |||
switch (val.btnName) { | |||
@@ -138,7 +138,7 @@ export default { | |||
AddOrUpdate, | |||
}, | |||
created() { | |||
this.listQuery.warehouseId = this.bId; | |||
this.listQuery.warehouseId = null; | |||
}, | |||
methods: { | |||
buttonClick(val) { | |||
@@ -2,7 +2,7 @@ | |||
* @Author: zwq | |||
* @Date: 2023-08-24 14:47:58 | |||
* @LastEditors: zwq | |||
* @LastEditTime: 2024-02-22 16:48:44 | |||
* @LastEditTime: 2024-04-19 14:30:04 | |||
* @Description: | |||
--> | |||
<template> | |||
@@ -50,9 +50,8 @@ const tableProps = [ | |||
label: '数量', | |||
}, | |||
{ | |||
prop: 'quality', | |||
prop: 'grade', | |||
label: '品质', | |||
filter: codeFilter('quality'), | |||
}, | |||
]; | |||
@@ -2,7 +2,7 @@ | |||
* @Author: zwq | |||
* @Date: 2023-08-22 15:01:55 | |||
* @LastEditors: zwq | |||
* @LastEditTime: 2024-02-22 16:47:31 | |||
* @LastEditTime: 2024-04-19 14:34:09 | |||
* @Description: | |||
--> | |||
<template> | |||
@@ -148,10 +148,8 @@ const tableProps = [ | |||
width: 55, | |||
}, | |||
{ | |||
prop: 'quality', | |||
prop: 'grade', | |||
label: '品质', | |||
filter: codeFilter('quality'), | |||
width: 55, | |||
}, | |||
{ | |||
prop: 'cureTime', | |||
@@ -307,7 +305,7 @@ export default { | |||
}, | |||
addList(data) { | |||
data.productInfo.number = 1; | |||
data.productInfo.quality = data.quality; | |||
data.productInfo.grade = data.grade; | |||
for (let i = 0; i < data.number; i++) { | |||
this.productAttributeList.push(JSON.parse(JSON.stringify(data.productInfo))); | |||
} | |||
@@ -24,8 +24,11 @@ | |||
v-model="dataForm.productInfo" | |||
style="width: 100%" | |||
filterable | |||
remote | |||
:remote-method="remoteMethod" | |||
value-key="id" | |||
placeholder="请选择产品"> | |||
placeholder="请选择产品" | |||
:loading="loading"> | |||
<el-option | |||
v-for="item in productArr" | |||
:key="item.id" | |||
@@ -34,19 +37,12 @@ | |||
:disabled="!item.deactivate" /> | |||
</el-select> | |||
</el-form-item> | |||
<el-form-item label="品质" prop="quality"> | |||
<el-select | |||
v-model="dataForm.quality" | |||
style="width: 100%" | |||
filterable | |||
value-key="id" | |||
placeholder="请选择品质"> | |||
<el-option | |||
v-for="item in qualityArr" | |||
:key="item.id" | |||
:label="item.name" | |||
:value="item.id" /> | |||
</el-select> | |||
<el-form-item label="品质" prop="grade"> | |||
<el-input | |||
v-model="dataForm.grade" | |||
placeholder="请输入品质" | |||
clearable | |||
:style="{ width: '100%' }" /> | |||
</el-form-item> | |||
<el-form-item label="数量" prop="number"> | |||
<el-input-number | |||
@@ -81,31 +77,16 @@ export default { | |||
index: -1, | |||
productInfo: null, | |||
number: 1, | |||
quality: null, | |||
grade: null, | |||
}, | |||
productArr: [], | |||
qualityArr: [ | |||
{ | |||
name: 'C', | |||
id: 2, | |||
}, | |||
{ | |||
name: 'B', | |||
id: 1, | |||
}, | |||
{ | |||
name: 'A', | |||
id: 0, | |||
}, | |||
], | |||
loading: false, | |||
dataRule: { | |||
productInfo: [ | |||
{ required: true, message: '产品不能为空', trigger: 'change' }, | |||
], | |||
number: [{ required: true, message: '数量不能为空', trigger: 'blur' }], | |||
quality: [ | |||
{ required: true, message: '品质不能为空', trigger: 'change' }, | |||
], | |||
grade: [{ required: true, message: '品质不能为空', trigger: 'change' }], | |||
}, | |||
}; | |||
}, | |||
@@ -117,15 +98,24 @@ export default { | |||
this.visible = true; | |||
this.$nextTick(() => { | |||
this.$refs['dataForm'].resetFields(); | |||
}); | |||
}, | |||
remoteMethod(query) { | |||
if (query !== '') { | |||
this.loading = true; | |||
const params = { | |||
pageSize: 100, | |||
pageNo: 1, | |||
warehouseId: this.warehouseId, | |||
goodSpecificationName: query, | |||
// warehouseId: this.warehouseId, | |||
}; | |||
getGoodSpecificationPage(params).then((response) => { | |||
this.loading = false; | |||
this.productArr = response.data.list; | |||
}); | |||
}); | |||
} else { | |||
this.productArr = []; | |||
} | |||
}, | |||
// 表单提交 | |||
dataFormSubmit() { | |||
@@ -144,20 +144,6 @@ const warehouseStorehouseState = [ | |||
id: 2, | |||
}, | |||
]; | |||
const qualityArr = [ | |||
{ | |||
name: 'A', | |||
id: 0, | |||
}, | |||
{ | |||
name: 'B', | |||
id: 1, | |||
}, | |||
{ | |||
name: 'C', | |||
id: 2, | |||
}, | |||
]; | |||
export default { | |||
mixins: [basicPage], | |||
data() { | |||
@@ -168,7 +154,6 @@ export default { | |||
tableData: [], | |||
processArr, | |||
warehouseStorehouseState, | |||
qualityArr, | |||
formConfig: [ | |||
{ | |||
type: 'select', | |||
@@ -216,12 +201,10 @@ export default { | |||
param: 'pname', | |||
}, | |||
{ | |||
type: 'select', | |||
type: 'input', | |||
label: '品质', | |||
selectOptions: qualityArr, | |||
placeholder: '品质', | |||
param: 'quality', | |||
defaultSelect: '', | |||
filterable: true, | |||
}, | |||
{ | |||
type: 'select', | |||
@@ -298,7 +281,7 @@ export default { | |||
this.listQuery.wareLayer = val.wareLayer; | |||
this.listQuery.trayCode = val.code; | |||
this.listQuery.goodName = val.pname; | |||
this.listQuery.quality = val.quality; | |||
this.listQuery.grade = val.quality; | |||
this.listQuery.rollCode = val.rollCode; | |||
this.listQuery.process = val.processId; | |||
this.listQuery.warehouseStorehouseState = | |||
@@ -139,20 +139,6 @@ const warehouseStorehouseState = [ | |||
id: 2, | |||
}, | |||
]; | |||
const qualityArr = [ | |||
{ | |||
name: 'A', | |||
id: 0, | |||
}, | |||
{ | |||
name: 'B', | |||
id: 1, | |||
}, | |||
{ | |||
name: 'C', | |||
id: 2, | |||
}, | |||
]; | |||
export default { | |||
mixins: [basicPage], | |||
data() { | |||
@@ -211,12 +197,10 @@ export default { | |||
param: 'pname', | |||
}, | |||
{ | |||
type: 'select', | |||
type: 'input', | |||
label: '品质', | |||
selectOptions: qualityArr, | |||
placeholder: '品质', | |||
param: 'quality', | |||
defaultSelect: '', | |||
filterable: true, | |||
}, | |||
{ | |||
type: 'select', | |||
@@ -295,7 +279,7 @@ export default { | |||
this.listQuery.trayCode = val.code; | |||
this.listQuery.goodName = val.pname; | |||
this.listQuery.rollCode = val.rollCode; | |||
this.listQuery.quality = val.quality; | |||
this.listQuery.grade = val.quality; | |||
this.listQuery.process = val.processId; | |||
this.listQuery.warehouseStorehouseState = val.warehouseStorehouseStateId; | |||
this.getDataList(); | |||
@@ -188,10 +188,8 @@ const tableProps = [ | |||
width: 55, | |||
}, | |||
{ | |||
prop: 'quality', | |||
prop: 'grade', | |||
label: '品质', | |||
filter: codeFilter('quality'), | |||
width: 55, | |||
}, | |||
{ | |||
prop: 'cureTime', | |||
@@ -411,7 +409,7 @@ export default { | |||
}, | |||
addList(data) { | |||
data.productInfo.number = 1; | |||
data.productInfo.quality = data.quality; | |||
data.productInfo.grade = data.grade; | |||
for (let i = 0; i < data.number; i++) { | |||
this.productAttributeList.push( | |||
JSON.parse(JSON.stringify(data.productInfo)) | |||
@@ -24,8 +24,11 @@ | |||
v-model="dataForm.productInfo" | |||
style="width: 100%" | |||
filterable | |||
remote | |||
:remote-method="remoteMethod" | |||
value-key="id" | |||
placeholder="请选择产品"> | |||
placeholder="请选择产品" | |||
:loading="loading"> | |||
<el-option | |||
v-for="item in productArr" | |||
:key="item.id" | |||
@@ -34,19 +37,12 @@ | |||
:disabled="!item.deactivate" /> | |||
</el-select> | |||
</el-form-item> | |||
<el-form-item label="品质" prop="quality"> | |||
<el-select | |||
v-model="dataForm.quality" | |||
style="width: 100%" | |||
filterable | |||
value-key="id" | |||
placeholder="请选择品质"> | |||
<el-option | |||
v-for="item in qualityArr" | |||
:key="item.id" | |||
:label="item.name" | |||
:value="item.id" /> | |||
</el-select> | |||
<el-form-item label="品质" prop="grade"> | |||
<el-input | |||
v-model="dataForm.grade" | |||
placeholder="请输入品质" | |||
clearable | |||
:style="{ width: '100%' }" /> | |||
</el-form-item> | |||
<el-form-item label="数量" prop="number"> | |||
<el-input-number v-model="dataForm.number" :step="1" :min="1" :max="12"></el-input-number> | |||
@@ -77,23 +73,10 @@ export default { | |||
index: -1, | |||
productInfo: null, | |||
number: 1, | |||
quality: null, | |||
grade: null, | |||
}, | |||
productArr: [], | |||
qualityArr: [ | |||
{ | |||
name: 'C', | |||
id: 2, | |||
}, | |||
{ | |||
name: 'B', | |||
id: 1, | |||
}, | |||
{ | |||
name: 'A', | |||
id: 0, | |||
}, | |||
], | |||
loading: false, | |||
dataRule: { | |||
productInfo: [ | |||
{ required: true, message: '产品不能为空', trigger: 'change' }, | |||
@@ -101,7 +84,7 @@ export default { | |||
number: [ | |||
{ required: true, message: '数量不能为空', trigger: 'blur' }, | |||
], | |||
quality: [ | |||
grade: [ | |||
{ required: true, message: '品质不能为空', trigger: 'change' }, | |||
], | |||
}, | |||
@@ -115,15 +98,24 @@ export default { | |||
this.visible = true; | |||
this.$nextTick(() => { | |||
this.$refs['dataForm'].resetFields(); | |||
}); | |||
}, | |||
remoteMethod(query) { | |||
if (query !== '') { | |||
this.loading = true; | |||
const params = { | |||
pageSize: 100, | |||
pageNo: 1, | |||
warehouseId: this.warehouseId, | |||
goodSpecificationName: query, | |||
// warehouseId: this.warehouseId, | |||
}; | |||
getGoodSpecificationPage(params).then((response) => { | |||
this.loading = false; | |||
this.productArr = response.data.list; | |||
}); | |||
}); | |||
} else { | |||
this.productArr = []; | |||
} | |||
}, | |||
// 表单提交 | |||
dataFormSubmit() { | |||
@@ -170,20 +170,6 @@ const warehouseStorehouseState = [ | |||
id: 2, | |||
}, | |||
]; | |||
const qualityArr = [ | |||
{ | |||
name: 'A', | |||
id: 0, | |||
}, | |||
{ | |||
name: 'B', | |||
id: 1, | |||
}, | |||
{ | |||
name: 'C', | |||
id: 2, | |||
}, | |||
]; | |||
export default { | |||
mixins: [basicPage], | |||
data() { | |||
@@ -242,12 +228,10 @@ export default { | |||
param: 'pname', | |||
}, | |||
{ | |||
type: 'select', | |||
type: 'input', | |||
label: '品质', | |||
selectOptions: qualityArr, | |||
placeholder: '品质', | |||
param: 'quality', | |||
defaultSelect: '', | |||
filterable: true, | |||
}, | |||
{ | |||
type: 'select', | |||
@@ -326,7 +310,7 @@ export default { | |||
this.listQuery.trayCode = val.code; | |||
this.listQuery.goodName = val.pname; | |||
this.listQuery.rollCode = val.rollCode; | |||
this.listQuery.quality = val.quality; | |||
this.listQuery.grade = val.quality; | |||
this.listQuery.process = val.processId; | |||
this.listQuery.warehouseStorehouseState = | |||
val.warehouseStorehouseStateId; | |||
@@ -170,20 +170,6 @@ const warehouseStorehouseState = [ | |||
id: 2, | |||
}, | |||
]; | |||
const qualityArr = [ | |||
{ | |||
name: 'A', | |||
id: 0, | |||
}, | |||
{ | |||
name: 'B', | |||
id: 1, | |||
}, | |||
{ | |||
name: 'C', | |||
id: 2, | |||
}, | |||
]; | |||
export default { | |||
mixins: [basicPage], | |||
data() { | |||
@@ -243,12 +229,10 @@ export default { | |||
param: 'pname', | |||
}, | |||
{ | |||
type: 'select', | |||
type: 'input', | |||
label: '品质', | |||
selectOptions: qualityArr, | |||
placeholder: '品质', | |||
param: 'quality', | |||
defaultSelect: '', | |||
filterable: true, | |||
}, | |||
{ | |||
type: 'select', | |||
@@ -326,7 +310,7 @@ export default { | |||
this.listQuery.wareLayer = val.wareLayer; | |||
this.listQuery.trayCode = val.code; | |||
this.listQuery.goodName = val.pname; | |||
this.listQuery.quality = val.quality; | |||
this.listQuery.grade = val.quality; | |||
this.listQuery.rollCode = val.rollCode; | |||
this.listQuery.process = val.processId; | |||
this.listQuery.warehouseStorehouseState = | |||