Reviewed-on: http://git.picaiba.com/mt-fe-group/yudao-dev/pulls/96pull/106/head
@@ -2,7 +2,7 @@ | |||
* @Author: zwq | |||
* @Date: 2023-08-01 13:52:10 | |||
* @LastEditors: zwq | |||
* @LastEditTime: 2023-11-17 09:52:17 | |||
* @LastEditTime: 2023-11-20 15:54:28 | |||
* @Description: | |||
--> | |||
<template> | |||
@@ -15,31 +15,31 @@ | |||
label-width="100px"> | |||
<el-row :gutter="20"> | |||
<el-col :span="12"> | |||
<el-form-item label="名称" prop="name"> | |||
<el-form-item label="物品名称" prop="name"> | |||
<el-input | |||
v-model="dataForm.name" | |||
clearable | |||
placeholder="请输入名称" /> | |||
placeholder="请输入物品名称" /> | |||
</el-form-item> | |||
</el-col> | |||
<el-col :span="12"> | |||
<el-form-item label="编码" prop="code"> | |||
<el-form-item label="物品编码" prop="code"> | |||
<el-input | |||
v-model="dataForm.code" | |||
clearable | |||
placeholder="请输入编码" /> | |||
placeholder="请输入物品编码" /> | |||
</el-form-item> | |||
</el-col> | |||
<el-col :span="12"> | |||
<el-form-item label="规格" prop="spec"> | |||
<el-form-item label="物品规格" prop="spec"> | |||
<el-input | |||
v-model="dataForm.spec" | |||
clearable | |||
placeholder="请输入规格" /> | |||
placeholder="请输入物品规格" /> | |||
</el-form-item> | |||
</el-col> | |||
<el-col :span="12"> | |||
<el-form-item label="单位" prop="unit"> | |||
<el-form-item label="物品单位" prop="unit"> | |||
<el-select | |||
v-model="dataForm.unit" | |||
filterable | |||
@@ -57,6 +57,7 @@ | |||
<el-col :span="12"> | |||
<el-form-item label="单日消耗量" prop="dailyUse"> | |||
<el-input-number | |||
:min="0" | |||
v-model="dataForm.dailyUse" | |||
clearable | |||
placeholder="请输入单日消耗量" /> | |||
@@ -65,9 +66,10 @@ | |||
<el-col :span="12"> | |||
<el-form-item label="允许留存时间" prop="allowTime"> | |||
<el-input-number | |||
:min="0" | |||
v-model="dataForm.allowTime" | |||
clearable | |||
placeholder="请输入允许留存时间" /> | |||
placeholder="请输入允许留存时间" /> (天) | |||
</el-form-item> | |||
</el-col> | |||
<el-col :span="12"> | |||
@@ -134,10 +136,10 @@ export default { | |||
}, | |||
dataRule: { | |||
code: [ | |||
{ required: true, message: '库位编码不能为空', trigger: 'blur' }, | |||
{ required: true, message: '物品编码不能为空', trigger: 'blur' }, | |||
], | |||
name: [ | |||
{ required: true, message: '库位名称不能为空', trigger: 'blur' }, | |||
{ required: true, message: '物品名称不能为空', trigger: 'blur' }, | |||
], | |||
}, | |||
isorno: [ | |||
@@ -57,19 +57,19 @@ import { publicFormatter } from '@/utils/dict'; | |||
const tableProps = [ | |||
{ | |||
prop: 'name', | |||
label: '名称', | |||
label: '物品名称', | |||
}, | |||
{ | |||
prop: 'code', | |||
label: '编码', | |||
label: '物品编码', | |||
}, | |||
{ | |||
prop: 'spec', | |||
label: '规格', | |||
label: '物品规格', | |||
}, | |||
{ | |||
prop: 'unit', | |||
label: '单位', | |||
label: '物品单位', | |||
filter: publicFormatter('unit_dict') | |||
}, | |||
{ | |||
@@ -121,8 +121,8 @@ export default { | |||
formConfig: [ | |||
{ | |||
type: 'input', | |||
label: '名称', | |||
placeholder: '名称', | |||
label: '物品名称', | |||
placeholder: '物品名称', | |||
param: 'name', | |||
}, | |||
{ | |||
@@ -2,7 +2,6 @@ | |||
<div class="app-container"> | |||
<!-- 搜索工作栏 --> | |||
<search-bar | |||
:isFold="true" | |||
:formConfigs="formConfig" | |||
ref="searchBarForm" | |||
@headBtnClick="buttonClick" /> | |||
@@ -2,7 +2,7 @@ | |||
* @Author: zwq | |||
* @Date: 2023-08-01 13:52:10 | |||
* @LastEditors: zwq | |||
* @LastEditTime: 2023-11-04 16:32:54 | |||
* @LastEditTime: 2023-11-20 15:14:18 | |||
* @Description: | |||
--> | |||
<template> | |||
@@ -68,7 +68,6 @@ | |||
v-model="dataForm.goodsBatch" | |||
filterable | |||
clearable | |||
@change="setBatchInfo" | |||
placeholder="请选择物品名称"> | |||
<el-option | |||
v-for="(item, index) in Batch" | |||
@@ -79,13 +78,12 @@ | |||
</el-form-item> | |||
</el-col> | |||
<el-col :span="12"> | |||
<el-form-item label="入库数量" prop="numDet"> | |||
<el-form-item :label="dataForm.id?'出库数量':'入库数量'" prop="numDet"> | |||
<el-input-number | |||
v-model="dataForm.numDet" | |||
clearable | |||
:min="0" | |||
:max="max?max:9999999" | |||
placeholder="请输入入库数量" /> | |||
placeholder="请输入数量" /> | |||
</el-form-item> | |||
</el-col> | |||
</el-row> | |||
@@ -130,7 +128,6 @@ export default { | |||
}, | |||
goodsArr: [], | |||
Batch: [], | |||
max: 0, | |||
dataRule: { | |||
goodsId: [ | |||
{ required: true, message: '物品名称不能为空', trigger: 'change' }, | |||
@@ -143,7 +140,7 @@ export default { | |||
}, | |||
], | |||
numDet: [ | |||
{ required: true, message: '入库数量不能为空', trigger: 'blur' }, | |||
{ required: true, message: '数量不能为空', trigger: 'blur' }, | |||
], | |||
}, | |||
}; | |||
@@ -172,13 +169,6 @@ export default { | |||
} | |||
}); | |||
}, | |||
setBatchInfo(){ | |||
this.Batch.forEach((item) => { | |||
if (item.goodsBatch === this.dataForm.goodsBatch) { | |||
this.max = item.numDet | |||
} | |||
}); | |||
}, | |||
outWare(data) { | |||
this.getArr(); | |||
this.visible = true; | |||
@@ -29,6 +29,7 @@ | |||
<el-option | |||
v-for="item in productArr" | |||
:key="item.id" | |||
:disabled="!item.enabled" | |||
:label="item.name" | |||
:value="item" /> | |||
</el-select> | |||
@@ -2,7 +2,7 @@ | |||
* @Author: zwq | |||
* @Date: 2023-08-01 13:52:10 | |||
* @LastEditors: zwq | |||
* @LastEditTime: 2023-11-17 09:51:59 | |||
* @LastEditTime: 2023-11-20 15:54:39 | |||
* @Description: | |||
--> | |||
<template> | |||
@@ -15,31 +15,31 @@ | |||
label-width="100px"> | |||
<el-row :gutter="20"> | |||
<el-col :span="12"> | |||
<el-form-item label="名称" prop="name"> | |||
<el-form-item label="物品名称" prop="name"> | |||
<el-input | |||
v-model="dataForm.name" | |||
clearable | |||
placeholder="请输入名称" /> | |||
placeholder="请输入物品名称" /> | |||
</el-form-item> | |||
</el-col> | |||
<el-col :span="12"> | |||
<el-form-item label="编码" prop="code"> | |||
<el-form-item label="物品编码" prop="code"> | |||
<el-input | |||
v-model="dataForm.code" | |||
clearable | |||
placeholder="请输入编码" /> | |||
placeholder="请输入物品编码" /> | |||
</el-form-item> | |||
</el-col> | |||
<el-col :span="12"> | |||
<el-form-item label="规格" prop="spec"> | |||
<el-form-item label="物品规格" prop="spec"> | |||
<el-input | |||
v-model="dataForm.spec" | |||
clearable | |||
placeholder="请输入规格" /> | |||
placeholder="请输入物品规格" /> | |||
</el-form-item> | |||
</el-col> | |||
<el-col :span="12"> | |||
<el-form-item label="单位" prop="unit"> | |||
<el-form-item label="物品单位" prop="unit"> | |||
<el-select | |||
v-model="dataForm.unit" | |||
filterable | |||
@@ -57,6 +57,7 @@ | |||
<el-col :span="12"> | |||
<el-form-item label="单日消耗量" prop="dailyUse"> | |||
<el-input-number | |||
:min="0" | |||
v-model="dataForm.dailyUse" | |||
clearable | |||
placeholder="请输入单日消耗量" /> | |||
@@ -65,9 +66,10 @@ | |||
<el-col :span="12"> | |||
<el-form-item label="允许留存时间" prop="allowTime"> | |||
<el-input-number | |||
:min="0" | |||
v-model="dataForm.allowTime" | |||
clearable | |||
placeholder="请输入允许留存时间" /> | |||
placeholder="请输入允许留存时间" /> (天) | |||
</el-form-item> | |||
</el-col> | |||
<el-col :span="12"> | |||
@@ -134,10 +136,10 @@ export default { | |||
}, | |||
dataRule: { | |||
code: [ | |||
{ required: true, message: '库位编码不能为空', trigger: 'blur' }, | |||
{ required: true, message: '物品编码不能为空', trigger: 'blur' }, | |||
], | |||
name: [ | |||
{ required: true, message: '库位名称不能为空', trigger: 'blur' }, | |||
{ required: true, message: '物品名称不能为空', trigger: 'blur' }, | |||
], | |||
}, | |||
isorno: [ | |||
@@ -57,19 +57,19 @@ import { publicFormatter } from '@/utils/dict'; | |||
const tableProps = [ | |||
{ | |||
prop: 'name', | |||
label: '名称', | |||
label: '物品名称', | |||
}, | |||
{ | |||
prop: 'code', | |||
label: '编码', | |||
label: '物品编码', | |||
}, | |||
{ | |||
prop: 'spec', | |||
label: '规格', | |||
label: '物品规格', | |||
}, | |||
{ | |||
prop: 'unit', | |||
label: '单位', | |||
label: '物品单位', | |||
filter: publicFormatter('unit_dict') | |||
}, | |||
{ | |||
@@ -121,8 +121,8 @@ export default { | |||
formConfig: [ | |||
{ | |||
type: 'input', | |||
label: '名称', | |||
placeholder: '名称', | |||
label: '物品名称', | |||
placeholder: '物品名称', | |||
param: 'name', | |||
}, | |||
{ | |||
@@ -2,7 +2,6 @@ | |||
<div class="app-container"> | |||
<!-- 搜索工作栏 --> | |||
<search-bar | |||
:isFold="true" | |||
:formConfigs="formConfig" | |||
ref="searchBarForm" | |||
@headBtnClick="buttonClick" /> | |||
@@ -2,7 +2,7 @@ | |||
* @Author: zwq | |||
* @Date: 2023-08-01 13:52:10 | |||
* @LastEditors: zwq | |||
* @LastEditTime: 2023-11-04 16:24:41 | |||
* @LastEditTime: 2023-11-20 15:14:00 | |||
* @Description: | |||
--> | |||
<template> | |||
@@ -68,7 +68,6 @@ | |||
v-model="dataForm.goodsBatch" | |||
filterable | |||
clearable | |||
@change="setBatchInfo" | |||
placeholder="请选择物品名称"> | |||
<el-option | |||
v-for="(item, index) in Batch" | |||
@@ -79,13 +78,12 @@ | |||
</el-form-item> | |||
</el-col> | |||
<el-col :span="12"> | |||
<el-form-item label="入库数量" prop="numDet"> | |||
<el-form-item :label="dataForm.id?'出库数量':'入库数量'" prop="numDet"> | |||
<el-input-number | |||
v-model="dataForm.numDet" | |||
clearable | |||
:min="0" | |||
:max="max?max:9999999" | |||
placeholder="请输入入库数量" /> | |||
placeholder="请输入数量" /> | |||
</el-form-item> | |||
</el-col> | |||
</el-row> | |||
@@ -130,7 +128,6 @@ export default { | |||
}, | |||
goodsArr: [], | |||
Batch: [], | |||
max: 0, | |||
dataRule: { | |||
goodsId: [ | |||
{ required: true, message: '物品名称不能为空', trigger: 'change' }, | |||
@@ -143,7 +140,7 @@ export default { | |||
}, | |||
], | |||
numDet: [ | |||
{ required: true, message: '入库数量不能为空', trigger: 'blur' }, | |||
{ required: true, message: '数量不能为空', trigger: 'blur' }, | |||
], | |||
}, | |||
}; | |||
@@ -172,13 +169,6 @@ export default { | |||
} | |||
}); | |||
}, | |||
setBatchInfo(){ | |||
this.Batch.forEach((item) => { | |||
if (item.goodsBatch === this.dataForm.goodsBatch) { | |||
this.max = item.numDet | |||
} | |||
}); | |||
}, | |||
outWare(data) { | |||
this.getArr(); | |||
this.visible = true; | |||
@@ -29,6 +29,7 @@ | |||
<el-option | |||
v-for="item in productArr" | |||
:key="item.id" | |||
:disabled="!item.enabled" | |||
:label="item.name" | |||
:value="item" /> | |||
</el-select> | |||
@@ -2,7 +2,7 @@ | |||
* @Author: zwq | |||
* @Date: 2023-08-01 13:52:10 | |||
* @LastEditors: zwq | |||
* @LastEditTime: 2023-11-17 09:51:44 | |||
* @LastEditTime: 2023-11-20 15:54:49 | |||
* @Description: | |||
--> | |||
<template> | |||
@@ -15,31 +15,31 @@ | |||
label-width="100px"> | |||
<el-row :gutter="20"> | |||
<el-col :span="12"> | |||
<el-form-item label="名称" prop="name"> | |||
<el-form-item label="物品名称" prop="name"> | |||
<el-input | |||
v-model="dataForm.name" | |||
clearable | |||
placeholder="请输入名称" /> | |||
placeholder="请输入物品名称" /> | |||
</el-form-item> | |||
</el-col> | |||
<el-col :span="12"> | |||
<el-form-item label="编码" prop="code"> | |||
<el-form-item label="物品编码" prop="code"> | |||
<el-input | |||
v-model="dataForm.code" | |||
clearable | |||
placeholder="请输入编码" /> | |||
placeholder="请输入物品编码" /> | |||
</el-form-item> | |||
</el-col> | |||
<el-col :span="12"> | |||
<el-form-item label="规格" prop="spec"> | |||
<el-form-item label="物品规格" prop="spec"> | |||
<el-input | |||
v-model="dataForm.spec" | |||
clearable | |||
placeholder="请输入规格" /> | |||
placeholder="请输入物品规格" /> | |||
</el-form-item> | |||
</el-col> | |||
<el-col :span="12"> | |||
<el-form-item label="单位" prop="unit"> | |||
<el-form-item label="物品单位" prop="unit"> | |||
<el-select | |||
v-model="dataForm.unit" | |||
filterable | |||
@@ -57,6 +57,7 @@ | |||
<el-col :span="12"> | |||
<el-form-item label="单日消耗量" prop="dailyUse"> | |||
<el-input-number | |||
:min="0" | |||
v-model="dataForm.dailyUse" | |||
clearable | |||
placeholder="请输入单日消耗量" /> | |||
@@ -65,9 +66,10 @@ | |||
<el-col :span="12"> | |||
<el-form-item label="允许留存时间" prop="allowTime"> | |||
<el-input-number | |||
:min="0" | |||
v-model="dataForm.allowTime" | |||
clearable | |||
placeholder="请输入允许留存时间" /> | |||
placeholder="请输入允许留存时间" /> (天) | |||
</el-form-item> | |||
</el-col> | |||
<el-col :span="12"> | |||
@@ -134,10 +136,10 @@ export default { | |||
}, | |||
dataRule: { | |||
code: [ | |||
{ required: true, message: '库位编码不能为空', trigger: 'blur' }, | |||
{ required: true, message: '物品编码不能为空', trigger: 'blur' }, | |||
], | |||
name: [ | |||
{ required: true, message: '库位名称不能为空', trigger: 'blur' }, | |||
{ required: true, message: '物品名称不能为空', trigger: 'blur' }, | |||
], | |||
}, | |||
isorno: [ | |||
@@ -57,19 +57,19 @@ import { publicFormatter } from '@/utils/dict'; | |||
const tableProps = [ | |||
{ | |||
prop: 'name', | |||
label: '名称', | |||
label: '物品名称', | |||
}, | |||
{ | |||
prop: 'code', | |||
label: '编码', | |||
label: '物品编码', | |||
}, | |||
{ | |||
prop: 'spec', | |||
label: '规格', | |||
label: '物品规格', | |||
}, | |||
{ | |||
prop: 'unit', | |||
label: '单位', | |||
label: '物品单位', | |||
filter: publicFormatter('unit_dict') | |||
}, | |||
{ | |||
@@ -121,8 +121,8 @@ export default { | |||
formConfig: [ | |||
{ | |||
type: 'input', | |||
label: '名称', | |||
placeholder: '名称', | |||
label: '物品名称', | |||
placeholder: '物品名称', | |||
param: 'name', | |||
}, | |||
{ | |||
@@ -2,7 +2,6 @@ | |||
<div class="app-container"> | |||
<!-- 搜索工作栏 --> | |||
<search-bar | |||
:isFold="true" | |||
:formConfigs="formConfig" | |||
ref="searchBarForm" | |||
@headBtnClick="buttonClick" /> | |||
@@ -2,7 +2,7 @@ | |||
* @Author: zwq | |||
* @Date: 2023-08-01 13:52:10 | |||
* @LastEditors: zwq | |||
* @LastEditTime: 2023-11-04 14:17:39 | |||
* @LastEditTime: 2023-11-20 15:13:37 | |||
* @Description: | |||
--> | |||
<template> | |||
@@ -68,7 +68,6 @@ | |||
v-model="dataForm.goodsBatch" | |||
filterable | |||
clearable | |||
@change="setBatchInfo" | |||
placeholder="请选择物品名称"> | |||
<el-option | |||
v-for="(item, index) in Batch" | |||
@@ -79,13 +78,12 @@ | |||
</el-form-item> | |||
</el-col> | |||
<el-col :span="12"> | |||
<el-form-item label="入库数量" prop="numDet"> | |||
<el-form-item :label="dataForm.id?'出库数量':'入库数量'" prop="numDet"> | |||
<el-input-number | |||
v-model="dataForm.numDet" | |||
clearable | |||
:min="0" | |||
:max="max?max:9999999" | |||
placeholder="请输入入库数量" /> | |||
placeholder="请输入数量" /> | |||
</el-form-item> | |||
</el-col> | |||
</el-row> | |||
@@ -130,7 +128,6 @@ export default { | |||
}, | |||
goodsArr: [], | |||
Batch: [], | |||
max: 0, | |||
dataRule: { | |||
goodsId: [ | |||
{ required: true, message: '物品名称不能为空', trigger: 'change' }, | |||
@@ -143,7 +140,7 @@ export default { | |||
}, | |||
], | |||
numDet: [ | |||
{ required: true, message: '入库数量不能为空', trigger: 'blur' }, | |||
{ required: true, message: '数量不能为空', trigger: 'blur' }, | |||
], | |||
}, | |||
}; | |||
@@ -172,13 +169,6 @@ export default { | |||
} | |||
}); | |||
}, | |||
setBatchInfo(){ | |||
this.Batch.forEach((item) => { | |||
if (item.goodsBatch === this.dataForm.goodsBatch) { | |||
this.max = item.numDet | |||
} | |||
}); | |||
}, | |||
outWare(data) { | |||
this.getArr(); | |||
this.visible = true; | |||
@@ -29,6 +29,7 @@ | |||
<el-option | |||
v-for="item in productArr" | |||
:key="item.id" | |||
:disabled="!item.enabled" | |||
:label="item.name" | |||
:value="item" /> | |||
</el-select> | |||
@@ -2,7 +2,7 @@ | |||
* @Author: zwq | |||
* @Date: 2023-08-01 13:52:10 | |||
* @LastEditors: zwq | |||
* @LastEditTime: 2023-11-17 09:51:29 | |||
* @LastEditTime: 2023-11-20 15:54:59 | |||
* @Description: | |||
--> | |||
<template> | |||
@@ -15,31 +15,31 @@ | |||
label-width="100px"> | |||
<el-row :gutter="20"> | |||
<el-col :span="12"> | |||
<el-form-item label="名称" prop="name"> | |||
<el-form-item label="物品名称" prop="name"> | |||
<el-input | |||
v-model="dataForm.name" | |||
clearable | |||
placeholder="请输入名称" /> | |||
placeholder="请输入物品名称" /> | |||
</el-form-item> | |||
</el-col> | |||
<el-col :span="12"> | |||
<el-form-item label="编码" prop="code"> | |||
<el-form-item label="物品编码" prop="code"> | |||
<el-input | |||
v-model="dataForm.code" | |||
clearable | |||
placeholder="请输入编码" /> | |||
placeholder="请输入物品编码" /> | |||
</el-form-item> | |||
</el-col> | |||
<el-col :span="12"> | |||
<el-form-item label="规格" prop="spec"> | |||
<el-form-item label="物品规格" prop="spec"> | |||
<el-input | |||
v-model="dataForm.spec" | |||
clearable | |||
placeholder="请输入规格" /> | |||
placeholder="请输入物品规格" /> | |||
</el-form-item> | |||
</el-col> | |||
<el-col :span="12"> | |||
<el-form-item label="单位" prop="unit"> | |||
<el-form-item label="物品单位" prop="unit"> | |||
<el-select | |||
v-model="dataForm.unit" | |||
filterable | |||
@@ -57,6 +57,7 @@ | |||
<el-col :span="12"> | |||
<el-form-item label="单日消耗量" prop="dailyUse"> | |||
<el-input-number | |||
:min="0" | |||
v-model="dataForm.dailyUse" | |||
clearable | |||
placeholder="请输入单日消耗量" /> | |||
@@ -65,9 +66,10 @@ | |||
<el-col :span="12"> | |||
<el-form-item label="允许留存时间" prop="allowTime"> | |||
<el-input-number | |||
:min="0" | |||
v-model="dataForm.allowTime" | |||
clearable | |||
placeholder="请输入允许留存时间" /> | |||
placeholder="请输入允许留存时间" /> (天) | |||
</el-form-item> | |||
</el-col> | |||
<el-col :span="12"> | |||
@@ -134,10 +136,10 @@ export default { | |||
}, | |||
dataRule: { | |||
code: [ | |||
{ required: true, message: '库位编码不能为空', trigger: 'blur' }, | |||
{ required: true, message: '物品编码不能为空', trigger: 'blur' }, | |||
], | |||
name: [ | |||
{ required: true, message: '库位名称不能为空', trigger: 'blur' }, | |||
{ required: true, message: '物品名称不能为空', trigger: 'blur' }, | |||
], | |||
}, | |||
isorno: [ | |||
@@ -57,19 +57,19 @@ import { publicFormatter } from '@/utils/dict'; | |||
const tableProps = [ | |||
{ | |||
prop: 'name', | |||
label: '名称', | |||
label: '物品名称', | |||
}, | |||
{ | |||
prop: 'code', | |||
label: '编码', | |||
label: '物品编码', | |||
}, | |||
{ | |||
prop: 'spec', | |||
label: '规格', | |||
label: '物品规格', | |||
}, | |||
{ | |||
prop: 'unit', | |||
label: '单位', | |||
label: '物品单位', | |||
filter: publicFormatter('unit_dict') | |||
}, | |||
{ | |||
@@ -121,8 +121,8 @@ export default { | |||
formConfig: [ | |||
{ | |||
type: 'input', | |||
label: '名称', | |||
placeholder: '名称', | |||
label: '物品名称', | |||
placeholder: '物品名称', | |||
param: 'name', | |||
}, | |||
{ | |||
@@ -2,7 +2,6 @@ | |||
<div class="app-container"> | |||
<!-- 搜索工作栏 --> | |||
<search-bar | |||
:isFold="true" | |||
:formConfigs="formConfig" | |||
ref="searchBarForm" | |||
@headBtnClick="buttonClick" /> | |||
@@ -2,7 +2,7 @@ | |||
* @Author: zwq | |||
* @Date: 2023-08-01 13:52:10 | |||
* @LastEditors: zwq | |||
* @LastEditTime: 2023-11-04 16:24:26 | |||
* @LastEditTime: 2023-11-20 15:12:43 | |||
* @Description: | |||
--> | |||
<template> | |||
@@ -68,7 +68,6 @@ | |||
v-model="dataForm.goodsBatch" | |||
filterable | |||
clearable | |||
@change="setBatchInfo" | |||
placeholder="请选择物品名称"> | |||
<el-option | |||
v-for="(item, index) in Batch" | |||
@@ -79,13 +78,12 @@ | |||
</el-form-item> | |||
</el-col> | |||
<el-col :span="12"> | |||
<el-form-item label="入库数量" prop="numDet"> | |||
<el-form-item :label="dataForm.id?'出库数量':'入库数量'" prop="numDet"> | |||
<el-input-number | |||
v-model="dataForm.numDet" | |||
clearable | |||
:min="0" | |||
:max="max?max:9999999" | |||
placeholder="请输入入库数量" /> | |||
placeholder="请输入数量" /> | |||
</el-form-item> | |||
</el-col> | |||
</el-row> | |||
@@ -130,7 +128,6 @@ export default { | |||
}, | |||
goodsArr: [], | |||
Batch: [], | |||
max: 0, | |||
dataRule: { | |||
goodsId: [ | |||
{ required: true, message: '物品名称不能为空', trigger: 'change' }, | |||
@@ -143,7 +140,7 @@ export default { | |||
}, | |||
], | |||
numDet: [ | |||
{ required: true, message: '入库数量不能为空', trigger: 'blur' }, | |||
{ required: true, message: '数量不能为空', trigger: 'blur' }, | |||
], | |||
}, | |||
}; | |||
@@ -172,13 +169,6 @@ export default { | |||
} | |||
}); | |||
}, | |||
setBatchInfo(){ | |||
this.Batch.forEach((item) => { | |||
if (item.goodsBatch === this.dataForm.goodsBatch) { | |||
this.max = item.numDet | |||
} | |||
}); | |||
}, | |||
outWare(data) { | |||
this.getArr(); | |||
this.visible = true; | |||
@@ -29,6 +29,7 @@ | |||
<el-option | |||
v-for="item in productArr" | |||
:key="item.id" | |||
:disabled="!item.enabled" | |||
:label="item.name" | |||
:value="item" /> | |||
</el-select> | |||
@@ -2,7 +2,7 @@ | |||
* @Author: zwq | |||
* @Date: 2023-08-01 13:52:10 | |||
* @LastEditors: zwq | |||
* @LastEditTime: 2023-11-17 09:50:55 | |||
* @LastEditTime: 2023-11-20 15:54:15 | |||
* @Description: | |||
--> | |||
<template> | |||
@@ -15,31 +15,31 @@ | |||
label-width="100px"> | |||
<el-row :gutter="20"> | |||
<el-col :span="12"> | |||
<el-form-item label="名称" prop="name"> | |||
<el-form-item label="物品名称" prop="name"> | |||
<el-input | |||
v-model="dataForm.name" | |||
clearable | |||
placeholder="请输入名称" /> | |||
placeholder="请输入物品名称" /> | |||
</el-form-item> | |||
</el-col> | |||
<el-col :span="12"> | |||
<el-form-item label="编码" prop="code"> | |||
<el-form-item label="物品编码" prop="code"> | |||
<el-input | |||
v-model="dataForm.code" | |||
clearable | |||
placeholder="请输入编码" /> | |||
placeholder="请输入物品编码" /> | |||
</el-form-item> | |||
</el-col> | |||
<el-col :span="12"> | |||
<el-form-item label="规格" prop="spec"> | |||
<el-form-item label="物品规格" prop="spec"> | |||
<el-input | |||
v-model="dataForm.spec" | |||
clearable | |||
placeholder="请输入规格" /> | |||
placeholder="请输入物品规格" /> | |||
</el-form-item> | |||
</el-col> | |||
<el-col :span="12"> | |||
<el-form-item label="单位" prop="unit"> | |||
<el-form-item label="物品单位" prop="unit"> | |||
<el-select | |||
v-model="dataForm.unit" | |||
filterable | |||
@@ -57,6 +57,7 @@ | |||
<el-col :span="12"> | |||
<el-form-item label="单日消耗量" prop="dailyUse"> | |||
<el-input-number | |||
:min="0" | |||
v-model="dataForm.dailyUse" | |||
clearable | |||
placeholder="请输入单日消耗量" /> | |||
@@ -65,9 +66,10 @@ | |||
<el-col :span="12"> | |||
<el-form-item label="允许留存时间" prop="allowTime"> | |||
<el-input-number | |||
:min="0" | |||
v-model="dataForm.allowTime" | |||
clearable | |||
placeholder="请输入允许留存时间" /> | |||
placeholder="请输入允许留存时间" /> (天) | |||
</el-form-item> | |||
</el-col> | |||
<el-col :span="12"> | |||
@@ -134,10 +136,10 @@ export default { | |||
}, | |||
dataRule: { | |||
code: [ | |||
{ required: true, message: '库位编码不能为空', trigger: 'blur' }, | |||
{ required: true, message: '物品编码不能为空', trigger: 'blur' }, | |||
], | |||
name: [ | |||
{ required: true, message: '库位名称不能为空', trigger: 'blur' }, | |||
{ required: true, message: '物品名称不能为空', trigger: 'blur' }, | |||
], | |||
}, | |||
isorno: [ | |||
@@ -57,19 +57,19 @@ import { publicFormatter } from '@/utils/dict'; | |||
const tableProps = [ | |||
{ | |||
prop: 'name', | |||
label: '名称', | |||
label: '物品名称', | |||
}, | |||
{ | |||
prop: 'code', | |||
label: '编码', | |||
label: '物品编码', | |||
}, | |||
{ | |||
prop: 'spec', | |||
label: '规格', | |||
label: '物品规格', | |||
}, | |||
{ | |||
prop: 'unit', | |||
label: '单位', | |||
label: '物品单位', | |||
filter: publicFormatter('unit_dict') | |||
}, | |||
{ | |||
@@ -121,8 +121,8 @@ export default { | |||
formConfig: [ | |||
{ | |||
type: 'input', | |||
label: '名称', | |||
placeholder: '名称', | |||
label: '物品名称', | |||
placeholder: '物品名称', | |||
param: 'name', | |||
}, | |||
{ | |||
@@ -2,7 +2,6 @@ | |||
<div class="app-container"> | |||
<!-- 搜索工作栏 --> | |||
<search-bar | |||
:isFold="true" | |||
:formConfigs="formConfig" | |||
ref="searchBarForm" | |||
@headBtnClick="buttonClick" /> | |||
@@ -2,7 +2,7 @@ | |||
* @Author: zwq | |||
* @Date: 2023-08-01 13:52:10 | |||
* @LastEditors: zwq | |||
* @LastEditTime: 2023-11-04 14:17:39 | |||
* @LastEditTime: 2023-11-20 15:12:13 | |||
* @Description: | |||
--> | |||
<template> | |||
@@ -68,7 +68,6 @@ | |||
v-model="dataForm.goodsBatch" | |||
filterable | |||
clearable | |||
@change="setBatchInfo" | |||
placeholder="请选择物品名称"> | |||
<el-option | |||
v-for="(item, index) in Batch" | |||
@@ -79,13 +78,13 @@ | |||
</el-form-item> | |||
</el-col> | |||
<el-col :span="12"> | |||
<el-form-item label="入库数量" prop="numDet"> | |||
<el-form-item :label="dataForm.id?'出库数量':'入库数量'" prop="numDet"> | |||
<el-input-number | |||
v-model="dataForm.numDet" | |||
clearable | |||
:min="0" | |||
:max="max?max:9999999" | |||
placeholder="请输入入库数量" /> | |||
placeholder="请输入数量" /> | |||
<!-- :max="max?max:9999999" --> | |||
</el-form-item> | |||
</el-col> | |||
</el-row> | |||
@@ -130,7 +129,7 @@ export default { | |||
}, | |||
goodsArr: [], | |||
Batch: [], | |||
max: 0, | |||
//max: 0, | |||
dataRule: { | |||
goodsId: [ | |||
{ required: true, message: '物品名称不能为空', trigger: 'change' }, | |||
@@ -143,7 +142,7 @@ export default { | |||
}, | |||
], | |||
numDet: [ | |||
{ required: true, message: '入库数量不能为空', trigger: 'blur' }, | |||
{ required: true, message: '数量不能为空', trigger: 'blur' }, | |||
], | |||
}, | |||
}; | |||
@@ -172,13 +171,13 @@ export default { | |||
} | |||
}); | |||
}, | |||
setBatchInfo(){ | |||
this.Batch.forEach((item) => { | |||
if (item.goodsBatch === this.dataForm.goodsBatch) { | |||
this.max = item.numDet | |||
} | |||
}); | |||
}, | |||
// setBatchInfo(){ | |||
// this.Batch.forEach((item) => { | |||
// if (item.goodsBatch === this.dataForm.goodsBatch) { | |||
// this.max = item.numDet | |||
// } | |||
// }); | |||
// }, | |||
outWare(data) { | |||
this.getArr(); | |||
this.visible = true; | |||
@@ -29,6 +29,7 @@ | |||
<el-option | |||
v-for="item in productArr" | |||
:key="item.id" | |||
:disabled="!item.enabled" | |||
:label="item.name" | |||
:value="item" /> | |||
</el-select> | |||
@@ -18,7 +18,7 @@ | |||
@click.native="setWareInfo(item)" | |||
:style="{ | |||
background: item.id === wareInfo.warehouseId ? '#37D97F' : '', | |||
color: item.id === wareInfo.warehouseId ? 'white' : '' | |||
color: item.id === wareInfo.warehouseId ? 'white' : '', | |||
}" | |||
class="ware-card"> | |||
{{ item.name }} | |||
@@ -263,7 +263,7 @@ export default { | |||
this.dataListLoading = true; | |||
this.urlOptions.getDataListURL(this.listQuery).then((response) => { | |||
this.tableData = response.data.list; | |||
this.total = response.data.total; | |||
this.listQuery.total = response.data.total; | |||
this.dataListLoading = false; | |||
}); | |||
}, | |||