合并
This commit is contained in:
@ -287,7 +287,7 @@ const initFormData: CailiaoshebeiForm = {
|
||||
plan: undefined,
|
||||
realQuantity: undefined,
|
||||
approvalDesign: undefined,
|
||||
projectId: currentProject.value.id,
|
||||
projectId: currentProject.value?.id,
|
||||
remark: undefined
|
||||
};
|
||||
const data = reactive<PageData<CailiaoshebeiForm, CailiaoshebeiQuery>>({
|
||||
@ -299,7 +299,7 @@ const data = reactive<PageData<CailiaoshebeiForm, CailiaoshebeiQuery>>({
|
||||
supplierId: undefined,
|
||||
supplier: undefined,
|
||||
name: undefined,
|
||||
projectId: currentProject.value.id,
|
||||
projectId: currentProject.value?.id,
|
||||
supply: undefined,
|
||||
specification: undefined,
|
||||
signalment: undefined,
|
||||
@ -454,7 +454,7 @@ const submitForm = () => {
|
||||
const addBatch = async () => {
|
||||
await proxy?.$modal.confirm('是否确认新增批次?').finally(() => (loading.value = false));
|
||||
queryParams.value.batchNumber = '';
|
||||
await getBatch({ projectId: currentProject.value.id });
|
||||
await getBatch({ projectId: currentProject.value?.id });
|
||||
await getBatchList();
|
||||
proxy?.$modal.msgSuccess('新增成功');
|
||||
};
|
||||
@ -494,7 +494,7 @@ const handleExport = () => {
|
||||
const supplierOptions = ref([]);
|
||||
const getSupplierList = async () => {
|
||||
const res = await listContractor({
|
||||
projectId: currentProject.value.id,
|
||||
projectId: currentProject.value?.id,
|
||||
pageNum: 1,
|
||||
pageSize: 10000
|
||||
});
|
||||
@ -522,7 +522,7 @@ onMounted(() => {
|
||||
|
||||
//监听项目id刷新数据
|
||||
const listeningProject = watch(
|
||||
() => currentProject.value.id,
|
||||
() => currentProject.value?.id,
|
||||
(nid, oid) => {
|
||||
queryParams.value.projectId = nid;
|
||||
form.value.projectId = nid;
|
||||
|
||||
Reference in New Issue
Block a user