修改bug
This commit is contained in:
@ -1,7 +1,6 @@
|
||||
<template>
|
||||
<div class="p-2">
|
||||
<transition :enter-active-class="proxy?.animate.searchAnimate.enter"
|
||||
:leave-active-class="proxy?.animate.searchAnimate.leave">
|
||||
<transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
|
||||
<div v-show="showSearch" class="mb-[10px]">
|
||||
<el-card shadow="hover">
|
||||
<el-form ref="queryFormRef" :model="queryParams" :inline="true">
|
||||
@ -12,8 +11,7 @@
|
||||
<el-input v-model="queryParams.projectName" placeholder="请输入工程名称" clearable @keyup.enter="handleQuery" />
|
||||
</el-form-item>
|
||||
<el-form-item label="材料名称" prop="materialName">
|
||||
<el-input v-model="queryParams.materialName" placeholder="请输入设备材料名称" clearable
|
||||
@keyup.enter="handleQuery" />
|
||||
<el-input v-model="queryParams.materialName" placeholder="请输入设备材料名称" clearable @keyup.enter="handleQuery" />
|
||||
</el-form-item>
|
||||
<el-form-item label="合同名称" prop="contractName">
|
||||
<el-input v-model="queryParams.contractName" placeholder="请输入合同名称" clearable @keyup.enter="handleQuery" />
|
||||
@ -25,11 +23,8 @@
|
||||
<el-input v-model="queryParams.supplierUnit" placeholder="请输入供货单位" clearable @keyup.enter="handleQuery" />
|
||||
</el-form-item>
|
||||
<el-form-item>
|
||||
<el-button type="primary" v-hasPermi="['materials:materialReceive:list']" icon="Search"
|
||||
@click="handleQuery">搜索</el-button>
|
||||
|
||||
<el-button icon="Refresh" v-hasPermi="['materials:materialReceive:list']"
|
||||
@click="resetQuery">重置</el-button>
|
||||
<el-button type="primary" v-hasPermi="['materials:materialReceive:list']" icon="Search" @click="handleQuery">搜索</el-button>
|
||||
<el-button icon="Refresh" v-hasPermi="['materials:materialReceive:list']" @click="resetQuery">重置</el-button>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
</el-card>
|
||||
@ -40,12 +35,18 @@
|
||||
<template #header>
|
||||
<el-row :gutter="10" class="mb8">
|
||||
<el-col :span="1.5">
|
||||
<el-button type="primary" plain icon="Plus" @click="handleAdd"
|
||||
v-hasPermi="['materials:materialReceive:add']">新增</el-button>
|
||||
<el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['materials:materialReceive:add']">新增</el-button>
|
||||
</el-col>
|
||||
<el-col :span="1.5">
|
||||
<el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()"
|
||||
v-hasPermi="['materials:materialReceive:remove']">删除</el-button>
|
||||
<el-button
|
||||
type="danger"
|
||||
plain
|
||||
icon="Delete"
|
||||
:disabled="multiple"
|
||||
@click="handleDelete()"
|
||||
v-hasPermi="['materials:materialReceive:remove']"
|
||||
>删除</el-button
|
||||
>
|
||||
</el-col>
|
||||
<right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
|
||||
</el-row>
|
||||
@ -68,22 +69,23 @@
|
||||
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
|
||||
<template #default="scope">
|
||||
<el-tooltip content="查看" placement="top">
|
||||
<el-button link type="primary" icon="View" @click="handleView(scope.row)"
|
||||
v-hasPermi="['materials:materialReceive:query']"></el-button>
|
||||
<el-button link type="primary" icon="View" @click="handleView(scope.row)" v-hasPermi="['materials:materialReceive:query']"></el-button>
|
||||
</el-tooltip>
|
||||
<!-- <el-tooltip content="修改" placement="top">
|
||||
<el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['materials:materialReceive:edit']"></el-button>
|
||||
</el-tooltip> -->
|
||||
<el-tooltip content="删除" placement="top">
|
||||
<el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
|
||||
v-hasPermi="['materials:materialReceive:remove']"></el-button>
|
||||
<el-button
|
||||
link
|
||||
type="primary"
|
||||
icon="Delete"
|
||||
@click="handleDelete(scope.row)"
|
||||
v-hasPermi="['materials:materialReceive:remove']"
|
||||
></el-button>
|
||||
</el-tooltip>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
|
||||
v-model:limit="queryParams.pageSize" @pagination="getList" />
|
||||
<pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
|
||||
</el-card>
|
||||
|
||||
<!-- 添加或修改物料接收单对话框 -->
|
||||
<el-dialog draggable :title="dialog.title" v-model="dialog.visible" width="800px" append-to-body>
|
||||
<el-form ref="materialReceiveFormRef" :model="form" :rules="rules" label-width="110px">
|
||||
@ -92,7 +94,7 @@
|
||||
<el-form-item label="材料来源" prop="materialSource">
|
||||
<el-select v-model="form.materialSource" filterable placeholder="请选择材料来源" style="width: 100%">
|
||||
<el-option label="甲供材料" value="1"></el-option>
|
||||
<el-option label="已供材料" value="2"></el-option>
|
||||
<el-option label="乙供材料" value="2"></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
@ -101,23 +103,26 @@
|
||||
<el-input v-model="form.formCode" placeholder="请输入表单编号" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12"><el-form-item label="采购单编号" prop="docId"><el-select @change="handleSelect"
|
||||
v-model="form.docId" filterable placeholder="请选择采购单" style="width: 100%">
|
||||
<el-option v-for="item in purchaseDocList" :key="item.id" :label="item.docCode"
|
||||
:value="item.id"></el-option> </el-select></el-form-item>
|
||||
<el-col v-if="form.materialSource == '2'" :span="12">
|
||||
<el-form-item label="采购单编号" prop="docId">
|
||||
<el-select @change="handleSelect" v-model="form.docId" filterable placeholder="请选择采购单" style="width: 100%">
|
||||
<el-option v-for="item in purchaseDocList" :key="item.id" :label="item.docCode" :value="item.id"></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-col v-if="form.materialSource == '2'" :span="12">
|
||||
<el-form-item label="供货单位" prop="supplierUnit">
|
||||
<el-input disabled v-model="form.supplierUnit" placeholder="请输入供货单位" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-col v-if="form.materialSource == '2'" :span="12">
|
||||
<el-form-item label="订货单位" prop="orderingUnit">
|
||||
<el-input v-model="form.orderingUnit" placeholder="请输入订货单位" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12"><el-form-item label="工程名称" prop="projectName">
|
||||
<el-input v-model="form.projectName" placeholder="请输入工程名称" />
|
||||
<el-col :span="12">
|
||||
<el-form-item label="工程名称" prop="projectName">
|
||||
<el-input disabled v-model="form.projectName" placeholder="请输入工程名称" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
@ -130,65 +135,79 @@
|
||||
<el-input v-model="form.defectDescription" type="textarea" placeholder="请输入内容" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
|
||||
<!-- 数量验收区域（修复v-for key问题） -->
|
||||
<el-col :span="24">
|
||||
<div class="detail">
|
||||
<div class="detail-header">
|
||||
<span>数量验收</span>
|
||||
<!-- <el-button type="primary" link @click="addItem" icon="Plus">添加数量验收</el-button> -->
|
||||
<el-button type="primary" v-if="form.materialSource == '1'" link @click="addItem" icon="Plus">添加数量验收</el-button>
|
||||
</div>
|
||||
<div v-for="(item, index) in form.itemList" :key="index" class="detail-item">
|
||||
<!-- 关键修复：v-for key改为item.id（唯一标识），而非index -->
|
||||
<div v-for="(item, index) in form.itemList" :key="item.id" class="detail-item">
|
||||
<el-row>
|
||||
<el-col :span="12">
|
||||
<el-form-item disabled label="名称" :prop="`itemList.${index}.name`"
|
||||
:rules="{ required: true, message: '名称不能为空', trigger: 'blur' }">
|
||||
<el-input disabled v-model="item.name" placeholder="请输入名称" />
|
||||
<el-form-item label="名称" :prop="`itemList.${index}.name`" :rules="{ required: true, message: '名称不能为空', trigger: 'blur' }">
|
||||
<el-input :disabled="form.materialSource == '2'" v-model="item.name" placeholder="请输入名称" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="规格" :prop="`itemList.${index}.specification`"
|
||||
:rules="{ required: true, message: '规格不能为空', trigger: 'blur' }">
|
||||
<el-input disabled v-model="item.specification" placeholder="请输入规格" />
|
||||
<el-form-item
|
||||
label="规格"
|
||||
:prop="`itemList.${index}.specification`"
|
||||
:rules="{ required: true, message: '规格不能为空', trigger: 'blur' }"
|
||||
>
|
||||
<el-input :disabled="form.materialSource == '2'" v-model="item.specification" placeholder="请输入规格" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="单位" :prop="`itemList.${index}.unit`"
|
||||
:rules="{ required: true, message: '单位不能为空', trigger: 'blur' }">
|
||||
<el-input disabled v-model="item.unit" placeholder="请输入单位" />
|
||||
<el-form-item label="单位" :prop="`itemList.${index}.unit`" :rules="{ required: true, message: '单位不能为空', trigger: 'blur' }">
|
||||
<el-input :disabled="form.materialSource == '2'" v-model="item.unit" placeholder="请输入单位" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="数量" :prop="`itemList.${index}.quantity`"
|
||||
:rules="{ required: true, message: '数量不能为空', trigger: 'blur' }">
|
||||
<el-input disabled type="number" v-model="item.quantity" placeholder="请输入数量" />
|
||||
<el-form-item
|
||||
label="数量"
|
||||
:prop="`itemList.${index}.quantity`"
|
||||
:rules="{ required: true, message: '数量不能为空', trigger: 'blur' }"
|
||||
>
|
||||
<el-input :disabled="form.materialSource == '2'" type="number" v-model="item.quantity" placeholder="请输入数量" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="验收" :prop="`itemList.${index}.acceptedQuantity`"
|
||||
:rules="{ required: true, message: '验收数量不能为空', trigger: 'blur' }">
|
||||
<el-form-item
|
||||
label="验收"
|
||||
:prop="`itemList.${index}.acceptedQuantity`"
|
||||
:rules="{ required: true, message: '验收数量不能为空', trigger: 'blur' }"
|
||||
>
|
||||
<el-input type="number" v-model="item.acceptedQuantity" placeholder="请输入验收" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="缺件" :prop="`itemList.${index}.shortageQuantity`"
|
||||
:rules="{ required: true, message: '缺件数量不能为空', trigger: 'blur' }">
|
||||
<el-form-item
|
||||
label="缺件"
|
||||
:prop="`itemList.${index}.shortageQuantity`"
|
||||
:rules="{ required: true, message: '缺件数量不能为空', trigger: 'blur' }"
|
||||
>
|
||||
<el-input type="number" v-model="item.shortageQuantity" placeholder="自动计算（数量-验收数量）" readonly />
|
||||
<span class="tips">*自动计算（数量-验收数量）</span>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="备注" prop="remark">
|
||||
<el-form-item label="备注" :prop="`itemList.${index}.remark`">
|
||||
<el-input v-model="item.remark" placeholder="请输入备注" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<!-- <el-col :span="12" v-if="form.itemList.length > 1">
|
||||
<el-col :span="12" v-if="form.itemList.length > 1 && form.materialSource == '1'">
|
||||
<div class="item-actions">
|
||||
<el-button type="danger" link @click="removeItem(index)" icon="Delete">删除</el-button>
|
||||
</div>
|
||||
</el-col> -->
|
||||
</el-col>
|
||||
</el-row>
|
||||
</div>
|
||||
</div>
|
||||
</el-col>
|
||||
|
||||
<el-col :span="12">
|
||||
<el-form-item label="合格证文件" prop="certCountFileId">
|
||||
<file-upload :isShowTip="false" v-model="form.certCountFileId" />
|
||||
@ -210,22 +229,10 @@
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="24">
|
||||
<span
|
||||
style="color: #ff0000ab; margin-bottom: 10px; display: block">注意：请上传doc/xls/ppt/txt/pdf/png/jpg/jpeg/zip格式文件</span>
|
||||
<span style="color: #ff0000ab; margin-bottom: 10px; display: block">注意：请上传doc/xls/ppt/txt/pdf/png/jpg/jpeg/zip格式文件</span>
|
||||
</el-col>
|
||||
<el-col :span="24">
|
||||
<el-form-item label="设备材料入库/移交" prop="storageType">
|
||||
<el-radio-group v-model="form.storageType">
|
||||
<el-radio v-for="dict in storage_type.slice(0, 1)" :key="dict.value" :label="dict.value">
|
||||
{{ dict.label }}
|
||||
</el-radio>
|
||||
</el-radio-group>
|
||||
<!-- <el-checkbox-group v-model="form.storageType">
|
||||
<el-checkbox v-for="dict in storage_type" :key="dict.value" :label="dict.value">
|
||||
{{ dict.label }}
|
||||
</el-checkbox>
|
||||
</el-checkbox-group> -->
|
||||
</el-form-item> </el-col><el-col :span="24"><el-form-item label="备注" prop="remark">
|
||||
<el-form-item label="备注" prop="remark">
|
||||
<el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
@ -254,15 +261,19 @@ import { MaterialReceiveVO, MaterialReceiveQuery, MaterialReceiveForm } from '@/
|
||||
import { useUserStoreHook } from '@/store/modules/user';
|
||||
import wordllReceive from './word/index.vue';
|
||||
import { listPurchaseDoc, purchaseDocPlanList } from '@/api/materials/purchaseDoc';
|
||||
import { watch } from 'vue';
|
||||
import { watch, onMounted, onUnmounted, ref, reactive, computed, toRefs, getCurrentInstance } from 'vue';
|
||||
import type { ComponentInternalInstance, ElFormInstance, DialogOption } from 'element-plus';
|
||||
|
||||
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
|
||||
const { storage_type } = toRefs<any>(proxy?.useDict('storage_type'));
|
||||
// 获取用户 store
|
||||
const userStore = useUserStoreHook();
|
||||
// 从 store 中获取项目列表和当前选中的项目
|
||||
const currentProject = computed(() => userStore.selectedProject);
|
||||
const wordllReceiveRef = ref<InstanceType<typeof wordllReceive>>();
|
||||
|
||||
// 核心修复1：存储每个验收条目的watch停止函数，避免内存泄漏
|
||||
const itemWatchStopFns = ref<Array<() => void>>([]);
|
||||
|
||||
// 列表数据
|
||||
const materialReceiveList = ref<MaterialReceiveVO[]>([]);
|
||||
const buttonLoading = ref(false);
|
||||
const loading = ref(true);
|
||||
@ -272,15 +283,25 @@ const single = ref(true);
|
||||
const multiple = ref(true);
|
||||
const total = ref(0);
|
||||
|
||||
// 表单引用
|
||||
const queryFormRef = ref<ElFormInstance>();
|
||||
const materialReceiveFormRef = ref<ElFormInstance>();
|
||||
const purchaseDocList = ref([]); //物资采购单
|
||||
const purchaseMap = new Map();
|
||||
const purchaseDocList = ref([]); // 物资采购单列表
|
||||
const purchaseMap = new Map(); // 采购单映射（id -> 采购单对象）
|
||||
|
||||
// 对话框配置
|
||||
const dialog = reactive<DialogOption>({
|
||||
visible: false,
|
||||
title: ''
|
||||
});
|
||||
const getInitFormData = () => {
|
||||
|
||||
// 生成验收条目唯一ID（用于v-for key）
|
||||
const generateItemId = () => {
|
||||
return Date.now() + Math.random().toString(36).substr(2, 9);
|
||||
};
|
||||
|
||||
// 初始化表单数据（修复：给验收条目添加唯一ID）
|
||||
const getInitFormData = (): MaterialReceiveForm => {
|
||||
return {
|
||||
id: undefined,
|
||||
projectId: currentProject.value?.id,
|
||||
@ -300,12 +321,13 @@ const getInitFormData = () => {
|
||||
techDocCountFileId: undefined,
|
||||
licenseCount: undefined,
|
||||
licenseCountFileId: undefined,
|
||||
storageType: '',
|
||||
storageType: '1',
|
||||
remark: undefined,
|
||||
docId: undefined,
|
||||
docCode: undefined,
|
||||
itemList: [
|
||||
{
|
||||
id: generateItemId(), // 新增：唯一ID，解决v-for渲染问题
|
||||
name: undefined,
|
||||
specification: undefined,
|
||||
unit: undefined,
|
||||
@ -317,7 +339,8 @@ const getInitFormData = () => {
|
||||
]
|
||||
};
|
||||
};
|
||||
const initFormData: MaterialReceiveForm = {};
|
||||
|
||||
// 响应式数据
|
||||
const data = reactive({
|
||||
form: getInitFormData(),
|
||||
queryParams: {
|
||||
@ -334,17 +357,10 @@ const data = reactive({
|
||||
params: {}
|
||||
},
|
||||
rules: {
|
||||
// 物资采购单
|
||||
docId: [{ required: true, message: '请选择物资采购单', trigger: 'change' }],
|
||||
// 材料来源
|
||||
materialSource: [{ required: true, message: '请选择材料来源', trigger: 'change' }],
|
||||
// 表单编号
|
||||
formCode: [{ required: true, message: '请输入表单编号', trigger: 'blur' }],
|
||||
// 采购单编号
|
||||
docCode: [{ required: true, message: '请输入采购单编号', trigger: 'blur' }],
|
||||
// 供货单位
|
||||
docId: [{ required: true, message: '请选择物资采购单', trigger: 'change' }],
|
||||
supplierUnit: [{ required: true, message: '请输入供货单位', trigger: 'blur' }],
|
||||
// 订货单位
|
||||
orderingUnit: [{ required: true, message: '请输入订货单位', trigger: 'blur' }]
|
||||
}
|
||||
});
|
||||
@ -354,10 +370,13 @@ const { queryParams, form, rules } = toRefs(data);
|
||||
/** 查询物料接收单列表 */
|
||||
const getList = async () => {
|
||||
loading.value = true;
|
||||
const res = await listMaterialReceive(queryParams.value);
|
||||
materialReceiveList.value = res.rows;
|
||||
total.value = res.total;
|
||||
loading.value = false;
|
||||
try {
|
||||
const res = await listMaterialReceive(queryParams.value);
|
||||
materialReceiveList.value = res.rows;
|
||||
total.value = res.total;
|
||||
} finally {
|
||||
loading.value = false;
|
||||
}
|
||||
};
|
||||
|
||||
/** 取消按钮 */
|
||||
@ -366,10 +385,19 @@ const cancel = () => {
|
||||
dialog.visible = false;
|
||||
};
|
||||
|
||||
/** 表单重置 */
|
||||
/** 表单重置（修复：清理验收条目监听） */
|
||||
const reset = () => {
|
||||
// 停止所有验收条目的watch监听
|
||||
itemWatchStopFns.value.forEach((stopFn) => stopFn());
|
||||
itemWatchStopFns.value = [];
|
||||
|
||||
form.value = getInitFormData();
|
||||
materialReceiveFormRef.value?.resetFields();
|
||||
|
||||
// 重新监听初始条目
|
||||
if (form.value.itemList.length > 0) {
|
||||
watchItemChanges(0);
|
||||
}
|
||||
};
|
||||
|
||||
/** 搜索按钮操作 */
|
||||
@ -387,7 +415,7 @@ const resetQuery = () => {
|
||||
/** 多选框选中数据 */
|
||||
const handleSelectionChange = (selection: MaterialReceiveVO[]) => {
|
||||
ids.value = selection.map((item) => item.id);
|
||||
single.value = selection.length != 1;
|
||||
single.value = selection.length !== 1;
|
||||
multiple.value = !selection.length;
|
||||
};
|
||||
|
||||
@ -396,25 +424,34 @@ const handleAdd = () => {
|
||||
reset();
|
||||
dialog.visible = true;
|
||||
dialog.title = '添加物料接收单';
|
||||
// 为初始条目添加监听
|
||||
if (form.value.itemList.length > 0) {
|
||||
watchItemChanges(0);
|
||||
}
|
||||
form.value.projectName = currentProject.value?.name;
|
||||
};
|
||||
|
||||
/** 修改按钮操作 */
|
||||
/** 修改按钮操作（修复：清理旧监听+添加唯一ID） */
|
||||
const handleUpdate = async (row?: MaterialReceiveVO) => {
|
||||
reset();
|
||||
const _id = row?.id || ids.value[0];
|
||||
const res = await getMaterialReceive(_id);
|
||||
Object.assign(form.value, res.data);
|
||||
// 为每个条目添加监听
|
||||
form.value.itemList.forEach((_, index) => {
|
||||
watchItemChanges(index);
|
||||
});
|
||||
|
||||
dialog.visible = true;
|
||||
dialog.title = '修改物料接收单';
|
||||
try {
|
||||
const res = await getMaterialReceive(_id);
|
||||
// 给验收条目补充唯一ID（避免后端返回无ID）
|
||||
const formData = res.data;
|
||||
formData.itemList = formData.itemList.map((item) => ({
|
||||
...item,
|
||||
id: item.id || generateItemId()
|
||||
}));
|
||||
Object.assign(form.value, formData);
|
||||
|
||||
// 重新监听所有条目
|
||||
form.value.itemList.forEach((_, index) => {
|
||||
watchItemChanges(index);
|
||||
});
|
||||
|
||||
dialog.visible = true;
|
||||
dialog.title = '修改物料接收单';
|
||||
} catch (err) {
|
||||
proxy?.$modal.msgError('获取详情失败');
|
||||
}
|
||||
};
|
||||
|
||||
/** 提交按钮 */
|
||||
@ -422,14 +459,20 @@ const submitForm = () => {
|
||||
materialReceiveFormRef.value?.validate(async (valid: boolean) => {
|
||||
if (valid) {
|
||||
buttonLoading.value = true;
|
||||
if (form.value.id) {
|
||||
await updateMaterialReceive({ ...form.value }).finally(() => (buttonLoading.value = false));
|
||||
} else {
|
||||
await addMaterialReceive({ ...form.value }).finally(() => (buttonLoading.value = false));
|
||||
try {
|
||||
if (form.value.id) {
|
||||
await updateMaterialReceive({ ...form.value });
|
||||
} else {
|
||||
await addMaterialReceive({ ...form.value });
|
||||
}
|
||||
proxy?.$modal.msgSuccess('操作成功');
|
||||
dialog.visible = false;
|
||||
await getList();
|
||||
} catch (err) {
|
||||
proxy?.$modal.msgError('操作失败');
|
||||
} finally {
|
||||
buttonLoading.value = false;
|
||||
}
|
||||
proxy?.$modal.msgSuccess('操作成功');
|
||||
dialog.visible = false;
|
||||
await getList();
|
||||
}
|
||||
});
|
||||
};
|
||||
@ -437,15 +480,24 @@ const submitForm = () => {
|
||||
/** 删除按钮操作 */
|
||||
const handleDelete = async (row?: MaterialReceiveVO) => {
|
||||
const _ids = row?.id || ids.value;
|
||||
await proxy?.$modal.confirm('是否确认删除物料接收单编号为"' + _ids + '"的数据项？').finally(() => (loading.value = false));
|
||||
await delMaterialReceive(_ids);
|
||||
proxy?.$modal.msgSuccess('删除成功');
|
||||
await getList();
|
||||
if (!_ids.length) return;
|
||||
|
||||
try {
|
||||
await proxy?.$modal.confirm(`是否确认删除物料接收单编号为"${_ids}"的数据项？`);
|
||||
await delMaterialReceive(_ids);
|
||||
proxy?.$modal.msgSuccess('删除成功');
|
||||
await getList();
|
||||
} catch (err) {
|
||||
// 取消删除时不提示
|
||||
} finally {
|
||||
loading.value = false;
|
||||
}
|
||||
};
|
||||
|
||||
// 添加数量验收条目
|
||||
/** 添加数量验收条目（修复：添加唯一ID+监听） */
|
||||
const addItem = () => {
|
||||
const newItem = {
|
||||
id: generateItemId(), // 唯一ID
|
||||
name: undefined,
|
||||
specification: undefined,
|
||||
unit: undefined,
|
||||
@ -455,110 +507,190 @@ const addItem = () => {
|
||||
remark: undefined
|
||||
};
|
||||
form.value.itemList.push(newItem);
|
||||
// 监听新条目数据变化
|
||||
// 监听新条目变化
|
||||
watchItemChanges(form.value.itemList.length - 1);
|
||||
};
|
||||
|
||||
// 监听条目数据变化，自动计算缺件数量
|
||||
/** 监听验收条目变化，自动计算缺件数量（修复：存储停止函数） */
|
||||
const watchItemChanges = (index: number) => {
|
||||
watch(
|
||||
// 停止该索引已有的监听（避免重复监听）
|
||||
if (itemWatchStopFns.value[index]) {
|
||||
itemWatchStopFns.value[index]();
|
||||
}
|
||||
|
||||
// 监听数量和验收数量变化
|
||||
const stopFn = watch(
|
||||
() => [form.value.itemList[index].quantity, form.value.itemList[index].acceptedQuantity],
|
||||
([quantity, acceptedQuantity]) => {
|
||||
// 确保数量和验收数量都是数字
|
||||
const qty = Number(quantity) || 0;
|
||||
const acceptedQty = Number(acceptedQuantity) || 0;
|
||||
// 计算缺件数量（数量 - 验收数量）
|
||||
form.value.itemList[index].shortageQuantity = qty - acceptedQty;
|
||||
},
|
||||
{ immediate: true }
|
||||
{ immediate: true } // 初始时立即计算
|
||||
);
|
||||
|
||||
// 存储停止函数，用于后续删除时清理
|
||||
itemWatchStopFns.value[index] = stopFn;
|
||||
};
|
||||
|
||||
// 删除数量验收条目
|
||||
/** 删除数量验收条目（修复：清理监听+删除条目） */
|
||||
const removeItem = (index: number) => {
|
||||
if (form.value.itemList.length > 1) {
|
||||
form.value.itemList.splice(index, 1);
|
||||
} else {
|
||||
if (form.value.itemList.length <= 1) {
|
||||
proxy?.$modal.msgWarning('至少需要保留一条数量验收记录');
|
||||
return;
|
||||
}
|
||||
|
||||
// 停止该条目的监听
|
||||
if (itemWatchStopFns.value[index]) {
|
||||
itemWatchStopFns.value[index]();
|
||||
}
|
||||
|
||||
// 删除条目和对应的停止函数
|
||||
form.value.itemList.splice(index, 1);
|
||||
itemWatchStopFns.value.splice(index, 1);
|
||||
};
|
||||
|
||||
const handleView = (row) => {
|
||||
// 查看详情
|
||||
/** 查看详情 */
|
||||
const handleView = (row: MaterialReceiveVO) => {
|
||||
wordllReceiveRef.value?.openDialog(row);
|
||||
};
|
||||
|
||||
/** 查询物资-采购联系单列表 */
|
||||
const getlistPurchase = async () => {
|
||||
const res = await listPurchaseDoc({
|
||||
projectId: currentProject.value?.id,
|
||||
status: 'finish'
|
||||
});
|
||||
|
||||
purchaseDocList.value = res.rows;
|
||||
if (purchaseDocList.value && purchaseDocList.value.length > 0) {
|
||||
try {
|
||||
const res = await listPurchaseDoc({
|
||||
projectId: currentProject.value?.id,
|
||||
status: 'finish'
|
||||
});
|
||||
purchaseDocList.value = res.rows;
|
||||
// 构建采购单映射
|
||||
purchaseDocList.value.forEach((item) => {
|
||||
purchaseMap.set(item.id, item);
|
||||
});
|
||||
} catch (err) {
|
||||
proxy?.$modal.msgError('获取采购单列表失败');
|
||||
}
|
||||
};
|
||||
|
||||
// 通过采购单获取需求信息
|
||||
/** 通过采购单获取需求信息（修复：清理旧监听+添加新监听） */
|
||||
const getdemandInfo = async (docId: string) => {
|
||||
let res = await purchaseDocPlanList(docId);
|
||||
if (res.code == 200) {
|
||||
// 需求表单赋值
|
||||
form.value.itemList = [];
|
||||
// form.value.itemList 清空
|
||||
console.log(form.value.itemList);
|
||||
res.data.forEach((item, index) => {
|
||||
let obj = {
|
||||
quantity: item.demandQuantity,
|
||||
acceptedQuantity: 0,
|
||||
shortageQuantity: item.demandQuantity, // 初始化缺件数量为总数量
|
||||
planId: item.id,
|
||||
...item
|
||||
};
|
||||
obj.id = null;
|
||||
form.value.itemList.push(obj);
|
||||
// 监听每个条目的变化
|
||||
watchItemChanges(form.value.itemList.length - 1);
|
||||
});
|
||||
if (!docId) return;
|
||||
|
||||
try {
|
||||
const res = await purchaseDocPlanList(docId);
|
||||
if (res.code === 200) {
|
||||
// 清空旧监听和条目
|
||||
itemWatchStopFns.value.forEach((stopFn) => stopFn());
|
||||
itemWatchStopFns.value = [];
|
||||
form.value.itemList = [];
|
||||
|
||||
// 赋值需求数据并添加监听
|
||||
res.data.forEach((item, index) => {
|
||||
const qty = Number(item.demandQuantity) || 0;
|
||||
const newItem = {
|
||||
id: generateItemId(), // 唯一ID
|
||||
name: item.name,
|
||||
specification: item.specification,
|
||||
unit: item.unit,
|
||||
quantity: qty,
|
||||
acceptedQuantity: 0,
|
||||
shortageQuantity: qty, // 初始缺件=总数量
|
||||
remark: item.remark,
|
||||
planId: item.id,
|
||||
id: null // 保留后端需要的空id字段
|
||||
};
|
||||
form.value.itemList.push(newItem);
|
||||
// 监听当前条目
|
||||
watchItemChanges(index);
|
||||
});
|
||||
}
|
||||
} catch (err) {
|
||||
proxy?.$modal.msgError('获取采购单需求信息失败');
|
||||
}
|
||||
};
|
||||
|
||||
const handleSelect = (val) => {
|
||||
// 选择设备
|
||||
let obj = purchaseMap.get(val);
|
||||
/** 选择采购单触发 */
|
||||
const handleSelect = (val: string) => {
|
||||
if (!val) return;
|
||||
|
||||
const obj = purchaseMap.get(val);
|
||||
if (obj) {
|
||||
form.value.docCode = obj.docCode || '';
|
||||
form.value.supplierUnit = obj.supplier || '';
|
||||
form.value.materialName = obj.name || '';
|
||||
}
|
||||
|
||||
// 获取采购单对应的需求信息
|
||||
getdemandInfo(val);
|
||||
form.value.docCode = obj?.docCode || '';
|
||||
form.value.supplierUnit = obj?.supplier || '';
|
||||
form.value.materialName = obj?.name || '';
|
||||
};
|
||||
|
||||
/** 核心修复2：监听材料来源变化，重置数量验收列表 */
|
||||
watch(
|
||||
() => form.value.materialSource,
|
||||
(newSource, oldSource) => {
|
||||
if (newSource === oldSource) return;
|
||||
|
||||
// 1. 停止所有验收条目的监听
|
||||
itemWatchStopFns.value.forEach((stopFn) => stopFn());
|
||||
itemWatchStopFns.value = [];
|
||||
|
||||
// 2. 重置数量验收列表为初始状态（1条空记录）
|
||||
form.value.itemList = [
|
||||
{
|
||||
id: generateItemId(),
|
||||
name: undefined,
|
||||
specification: undefined,
|
||||
unit: undefined,
|
||||
quantity: undefined,
|
||||
acceptedQuantity: undefined,
|
||||
shortageQuantity: undefined,
|
||||
remark: undefined
|
||||
}
|
||||
];
|
||||
|
||||
// 3. 重新监听初始条目
|
||||
watchItemChanges(0);
|
||||
|
||||
// 4. 切换到乙供时，清空采购单相关数据
|
||||
if (newSource === '2') {
|
||||
form.value.docId = undefined;
|
||||
form.value.supplierUnit = undefined;
|
||||
form.value.materialName = undefined;
|
||||
form.value.docCode = undefined;
|
||||
}
|
||||
},
|
||||
{ immediate: true }
|
||||
);
|
||||
|
||||
/** 页面挂载时初始化 */
|
||||
onMounted(() => {
|
||||
getList();
|
||||
getlistPurchase();
|
||||
// 为初始条目添加监听
|
||||
// 监听初始验收条目
|
||||
if (form.value.itemList.length > 0) {
|
||||
watchItemChanges(0);
|
||||
}
|
||||
});
|
||||
|
||||
// 监听项目id刷新数据
|
||||
/** 监听项目变化，刷新数据 */
|
||||
const listeningProject = watch(
|
||||
() => currentProject.value?.id,
|
||||
(nid, oid) => {
|
||||
(nid) => {
|
||||
queryParams.value.projectId = nid;
|
||||
form.value.projectId = nid;
|
||||
getList();
|
||||
getlistPurchase();
|
||||
}
|
||||
);
|
||||
|
||||
/** 页面卸载时清理监听 */
|
||||
onUnmounted(() => {
|
||||
listeningProject();
|
||||
// 清理验收条目监听
|
||||
itemWatchStopFns.value.forEach((stopFn) => stopFn());
|
||||
});
|
||||
</script>
|
||||
|
||||
<style scoped lang="scss">
|
||||
.detail {
|
||||
border-bottom: 1px solid #ececec;
|
||||
@ -599,4 +731,8 @@ onUnmounted(() => {
|
||||
color: #666;
|
||||
margin-left: 8px;
|
||||
}
|
||||
|
||||
.mb8 {
|
||||
margin-bottom: 8px;
|
||||
}
|
||||
</style>
|
||||
|
||||
Reference in New Issue
Block a user