修改bug
This commit is contained in:
@ -126,11 +126,11 @@
|
||||
<el-col :span="12">
|
||||
<el-form-item
|
||||
label="名称"
|
||||
:prop="`itemList.${index}.name`"
|
||||
:prop="`itemList.${index}.materialsId`"
|
||||
:rules="[{ required: true, message: '名称不能为空', trigger: 'blur' }]"
|
||||
>
|
||||
<el-select v-model="item.inventoryId" placeholder="请选择名称" @change="(value) => getNameChange(value, index, item)">
|
||||
<el-option v-for="opt in optionsName" :key="opt.id" :label="opt.materialsName" :value="opt.id" />
|
||||
<el-select v-model="item.materialsId" placeholder="请选择名称" @change="(value) => getNameChange(value, index, item)">
|
||||
<el-option v-for="opt in optionsName" :key="opt.id" :label="`${opt.materialsName}_${opt.createTime}`" :value="opt.id" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
@ -171,13 +171,9 @@
|
||||
</el-col> -->
|
||||
<el-col :span="12">
|
||||
<el-form-item label="领取" :prop="`itemList.${index}.issuedQuantity`">
|
||||
<el-input
|
||||
v-model.number="item.issuedQuantity"
|
||||
disabled
|
||||
placeholder="请输入领取数量"
|
||||
@input="handleIssuedChange(index)"
|
||||
@blur="handleIssuedChange(index)"
|
||||
/>
|
||||
<el-select v-model="item.issuedQuantity" placeholder="请选择数量">
|
||||
<el-option v-for="opt in item.outList" :key="opt.id" :label="opt.number" :value="opt.number" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<!-- <el-col :span="12">
|
||||
@ -311,6 +307,7 @@ const getInitFormData = () => {
|
||||
itemList: [
|
||||
{
|
||||
id: undefined,
|
||||
|
||||
specification: undefined,
|
||||
unit: undefined,
|
||||
stockQuantity: undefined,
|
||||
@ -318,7 +315,8 @@ const getInitFormData = () => {
|
||||
remainingQuantity: undefined,
|
||||
name: undefined, // 数量验收的名称
|
||||
remark: undefined,
|
||||
materialsId: undefined
|
||||
materialsId: undefined,
|
||||
outList: []
|
||||
}
|
||||
]
|
||||
};
|
||||
@ -369,7 +367,7 @@ const computeMaterialName = () => {
|
||||
.map((item) => item.name.trim())
|
||||
.filter((name, index, self) => self.indexOf(name) === index); // 去重(如需保留重复则删除这行)
|
||||
|
||||
form.value.materialName = validNames.join(',');
|
||||
// form.value.materialName = validNames.join(',');
|
||||
};
|
||||
|
||||
/** 查询物料领料单列表 */
|
||||
@ -408,6 +406,7 @@ const getNameChange = (value, index, item) => {
|
||||
item.unit = selected.weightId;
|
||||
item.issuedQuantity = selected.number;
|
||||
item.stockQuantity = Number(selected.inventoryNumber) || 0;
|
||||
item.outList = selected.outList || [];
|
||||
// calculateRemaining(index); // 计算剩余数量
|
||||
}
|
||||
};
|
||||
@ -620,6 +619,7 @@ const submitForm = () => {
|
||||
remainingQuantity: Number(item.remainingQuantity)
|
||||
}))
|
||||
};
|
||||
console.log('提交数据:', submitData);
|
||||
|
||||
if (form.value.id) {
|
||||
await updateMaterialIssue(submitData);
|
||||
@ -661,10 +661,13 @@ const addItem = () => {
|
||||
// 删除数量验收条目
|
||||
const removeItem = (index: number) => {
|
||||
if (form.value.itemList.length > 1) {
|
||||
console.log(111111);
|
||||
console.log(itemWatchStopFns.value[index]);
|
||||
|
||||
// 停止该条目的监听
|
||||
if (itemWatchStopFns.value[index]) {
|
||||
itemWatchStopFns.value[index]();
|
||||
}
|
||||
// if (itemWatchStopFns.value[index]) {
|
||||
// itemWatchStopFns.value[index]();
|
||||
// }
|
||||
form.value.itemList.splice(index, 1);
|
||||
itemWatchStopFns.value.splice(index, 1);
|
||||
// 删除后重新计算材料名称
|
||||
|
@ -42,7 +42,7 @@
|
||||
<thead>
|
||||
<tr>
|
||||
<th colspan="2">领料单位</th>
|
||||
<td class="th-bg" colspan="2">{{ formData.placeholder }}</td>
|
||||
<td class="th-bg" colspan="2">{{ formData.issueUnit }}</td>
|
||||
<th colspan="2">保管单位</th>
|
||||
<td class="th-bg" colspan="2">{{ formData.storageUnit }}</td>
|
||||
</tr>
|
||||
|
Reference in New Issue
Block a user