taoge_xiaodi/td_official
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

设计出图

Browse Source
This commit is contained in:
taoge1020
2025-08-14 02:07:30 +08:00
parent 0872d4ff68 3158dc84f7
commit 8f26476c9b
98 changed files with 641 additions and 403 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/views/materials/appointment/index.vue
View File

@ -165,7 +165,7 @@ onMounted(() => {
//监听项目id刷新数据
const listeningProject = watch(
() => currentProject.value.id,
() => currentProject.value?.id,
(nid, oid) => {
getDeptAllUser(userStore.deptId).then(() => {
designUser();

12
src/views/materials/batchPlan/index.vue
View File

@ -206,7 +206,7 @@ const initFormData: any = {
planCode: undefined,
matCat: undefined,
status: undefined,
projectId: currentProject.value.id
projectId: currentProject.value?.id
},
planList: [
@ -230,13 +230,13 @@ const data = reactive({
pageSize: 10,
planCode: undefined,
projectId: currentProject.value.id
projectId: currentProject.value?.id
},
mainData: {
pageNum: 1,
pageSize: 10,
mrpBaseId: undefined,
projectId: currentProject.value.id
projectId: currentProject.value?.id
}
},
rules: {
@ -316,7 +316,7 @@ const reset = () => {
const status = form.value.mrpBaseBo.status;
form.value = { ...initFormData, status }; // 重置但保留
cailiaoshebeiFormRef.value?.resetFields();
form.value.mrpBaseBo.projectId = currentProject.value.id;
form.value.mrpBaseBo.projectId = currentProject.value?.id;
form.value.planList = [
{
name: undefined,
@ -385,7 +385,7 @@ const submitForm = async () => {
await addCailiaoshebei({
addDataList: cailiaoshebeiList.value,
batchNumber: form.value.batchNumber,
projectId: currentProject.value.id
projectId: currentProject.value?.id
} as any).finally(() => (buttonLoading.value = false));
proxy?.$modal.msgSuccess('操作成功');
dialog.visible = false;
@ -466,7 +466,7 @@ onMounted(() => {
//监听项目id刷新数据
const listeningProject = watch(
() => currentProject.value.id,
() => currentProject.value?.id,
(nid, oid) => {
queryParams.value.mainData.projectId = nid;

2
src/views/materials/batchPlan/indexEdit.vue
View File

@ -149,7 +149,7 @@ const initFormData: any = {
planCode: undefined,
matCat: undefined,
status: undefined,
projectId: currentProject.value.id
projectId: currentProject.value?.id
},
planList: [

10
src/views/materials/cailiaoshebei/index.vue
View File

@ -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;

8
src/views/materials/company/index.vue
View File

@ -134,7 +134,7 @@ const dialog = reactive<DialogOption>({
const initFormData: CompanyForm = {
id: undefined,
companyName: undefined,
projectId: currentProject.value.id,
projectId: currentProject.value?.id,
status: undefined,
remark: undefined,
qualification: undefined,
@ -147,7 +147,7 @@ const data = reactive<PageData<CompanyForm, CompanyQuery>>({
pageNum: 1,
pageSize: 10,
companyName: undefined,
projectId: currentProject.value.id,
projectId: currentProject.value?.id,
status: undefined,
qualification: undefined,
principalPhone: undefined,
@ -226,7 +226,7 @@ const submitForm = () => {
companyFormRef.value?.validate(async (valid: boolean) => {
if (valid) {
buttonLoading.value = true;
form.value.projectId = currentProject.value.id;
form.value.projectId = currentProject.value?.id;
if (form.value.id) {
await updateCompany(form.value).finally(() => (buttonLoading.value = false));
} else {
@ -261,7 +261,7 @@ const handleExport = () => {
//监听项目id刷新数据
const listeningProject = watch(
() => currentProject.value.id,
() => currentProject.value?.id,
(nid, oid) => {
queryParams.value.projectId = nid;
form.value.projectId = nid;

10
src/views/materials/materials/index.vue
View File

@ -177,7 +177,7 @@ const initFormData: MaterialsForm = {
id: undefined,
materialsName: undefined,
companyId: undefined,
projectId: currentProject.value.id,
projectId: currentProject.value?.id,
typeSpecificationName: undefined,
fileOssIdMap: undefined,
usePart: undefined,
@ -193,7 +193,7 @@ const data = reactive<PageData<MaterialsForm, MaterialsQuery>>({
pageSize: 10,
materialsName: undefined,
companyId: undefined,
projectId: currentProject.value.id,
projectId: currentProject.value?.id,
typeSpecificationName: undefined,
fileOssIdMap: undefined,
usePart: undefined,
@ -225,7 +225,7 @@ const getCompanyList = async () => {
const companyRes = await listCompany({
pageNum: 1,
pageSize: 1000,
projectId: currentProject.value.id
projectId: currentProject.value?.id
});
companyOptions.value = companyRes.rows.map((company: CompanyVO) => ({
value: company.id,
@ -295,7 +295,7 @@ const submitForm = () => {
materialsFormRef.value?.validate(async (valid: boolean) => {
if (valid) {
buttonLoading.value = true;
form.value.projectId = currentProject.value.id;
form.value.projectId = currentProject.value?.id;
if (form.value.id) {
await updateMaterials({
...form.value,
@ -354,7 +354,7 @@ const handleOssUpdate = (ossId: string, value: string) => {
//监听项目id刷新数据
const listeningProject = watch(
() => currentProject.value.id,
() => currentProject.value?.id,
(nid, oid) => {
queryParams.value.projectId = nid;
form.value.projectId = nid;

2
src/views/materials/materialsEquipment/partyA/materialIssue/index.vue
View File

@ -450,7 +450,7 @@ onMounted(() => {
});
//监听项目id刷新数据
const listeningProject = watch(
() => currentProject.value.id,
() => currentProject.value?.id,
(nid, oid) => {
queryParams.value.projectId = nid;
form.value.projectId = nid;

2
src/views/materials/materialsEquipment/partyA/materialReceive/index.vue
View File

@ -462,7 +462,7 @@ onMounted(() => {
});
//监听项目id刷新数据
const listeningProject = watch(
() => currentProject.value.id,
() => currentProject.value?.id,
(nid, oid) => {
queryParams.value.projectId = nid;
form.value.projectId = nid;

2
src/views/materials/materialsEquipment/partyB/materialIssue/index.vue
View File

@ -449,7 +449,7 @@ onMounted(() => {
});
//监听项目id刷新数据
const listeningProject = watch(
() => currentProject.value.id,
() => currentProject.value?.id,
(nid, oid) => {
queryParams.value.projectId = nid;
form.value.projectId = nid;

2
src/views/materials/materialsEquipment/partyB/materialReceive/index.vue
View File

@ -453,7 +453,7 @@ onMounted(() => {
});
//监听项目id刷新数据
const listeningProject = watch(
() => currentProject.value.id,
() => currentProject.value?.id,
(nid, oid) => {
queryParams.value.projectId = nid;
form.value.projectId = nid;

8
src/views/materials/materialsInventory/index.vue
View File

@ -179,7 +179,7 @@ const dialog = reactive<DialogOption>({
const initFormData: MaterialsInventoryForm = {
id: undefined,
materialsId: undefined,
projectId: currentProject.value.id,
projectId: currentProject.value?.id,
outPut: undefined,
number: undefined,
outPutTime: undefined,
@ -197,7 +197,7 @@ const data = reactive<PageData<MaterialsInventoryForm, MaterialsInventoryQuery>>
pageNum: 1,
pageSize: 10,
materialsId: undefined,
projectId: currentProject.value.id,
projectId: currentProject.value?.id,
outPut: undefined,
number: undefined,
outPutTime: undefined,
@ -275,7 +275,7 @@ const submitForm = () => {
materialsInventoryFormRef.value?.validate(async (valid: boolean) => {
if (valid) {
buttonLoading.value = true;
form.value.projectId = currentProject.value.id;
form.value.projectId = currentProject.value?.id;
if (form.value.id) {
await updateMaterialsInventory(form.value).finally(() => (buttonLoading.value = false));
} else {
@ -310,7 +310,7 @@ const handleExport = () => {
//监听项目id刷新数据
const listeningProject = watch(
() => currentProject.value.id,
() => currentProject.value?.id,
(nid, oid) => {
queryParams.value.projectId = nid;
form.value.projectId = nid;

14
src/views/materials/orderEquipment/index.vue
View File

@ -192,7 +192,7 @@ const initFormData: CailiaoshebeiForm = {
unit: undefined,
plan: undefined,
realQuantity: undefined,
projectId: currentProject.value.id,
projectId: currentProject.value?.id,
remark: undefined
};
const data = reactive<PageData<any, any>>({
@ -204,7 +204,7 @@ const data = reactive<PageData<any, any>>({
supplierId: undefined,
supplier: undefined,
name: undefined,
projectId: currentProject.value.id,
projectId: currentProject.value?.id,
supply: undefined,
specification: undefined,
signalment: undefined,
@ -300,7 +300,7 @@ const handleSelectionChange = (selection: CailiaoshebeiVO[]) => {
const handleAdd = () => {
reset();
listCailiaoshebei({
projectId: currentProject.value.id
projectId: currentProject.value?.id
}).then((res) => {
cailiaoshebeiAllList.value = res.rows;
});
@ -327,7 +327,7 @@ const onShare = () => {
console.log(getToken());
// 跳转新的地址 传token
let url = `http://192.168.110.142:7788/indexEquipment?projectId=${encodeURIComponent(currentProject.value.id)}&token=${encodeURIComponent(getToken())}&batchNumber=${encodeURIComponent(form.value.batchNumber)}`;
let url = `http://192.168.110.142:7788/indexEquipment?projectId=${encodeURIComponent(currentProject.value?.id)}&token=${encodeURIComponent(getToken())}&batchNumber=${encodeURIComponent(form.value.batchNumber)}`;
window.open(url, '_blank');
};
/** 提交按钮 */
@ -379,7 +379,7 @@ const submitTransferForm = async () => {
/** 新增批次 */
const addBatch = async () => {
await proxy?.$modal.confirm('是否确认新增批次？').finally(() => (loading.value = false));
const res = await getBatch({ projectId: currentProject.value.id });
const res = await getBatch({ projectId: currentProject.value?.id });
console.log('🚀 ~ addBatch ~ res:', res);
await getBatchList();
@ -410,7 +410,7 @@ const handleDelete = async (row?: CailiaoshebeiVO) => {
const supplierOptions = ref([]);
const getSupplierList = async () => {
const res = await listContractor({
projectId: currentProject.value.id,
projectId: currentProject.value?.id,
pageNum: 1,
pageSize: 10000
});
@ -424,7 +424,7 @@ onMounted(() => {
//监听项目id刷新数据
const listeningProject = watch(
() => currentProject.value.id,
() => currentProject.value?.id,
(nid, oid) => {
queryParams.value.projectId = nid;
form.value.projectId = nid;

8
src/views/materials/orderMaterials/index.vue
View File

@ -230,7 +230,7 @@ const initFormData: CailiaoshebeiForm = {
plan: undefined,
file: null, // 确保初始化为null
realQuantity: undefined,
projectId: currentProject.value.id,
projectId: currentProject.value?.id,
bo: {
requiredTime: undefined,
orderTime: undefined,
@ -252,7 +252,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,
@ -436,7 +436,7 @@ const handleChange = (value: number) => {
const supplierOptions = ref([]);
const getSupplierList = async () => {
const res = await listContractor({
projectId: currentProject.value.id,
projectId: currentProject.value?.id,
pageNum: 1,
pageSize: 10000
});
@ -450,7 +450,7 @@ onMounted(() => {
// 监听项目id刷新数据
const listeningProject = watch(
() => currentProject.value.id,
() => currentProject.value?.id,
(nid) => {
queryParams.value.projectId = nid;
form.value.projectId = nid;

6
src/views/materials/repertory/index.vue
View File

@ -118,7 +118,7 @@ const route = useRoute();
const initFormData: RepertoryDetailsForm = {
id: undefined,
projectId: currentProject.value.id,
projectId: currentProject.value?.id,
repertoryId: undefined,
materialsorderId: undefined,
materialCode: undefined,
@ -135,7 +135,7 @@ const data = reactive<PageData<RepertoryDetailsForm, RepertoryDetailsQuery>>({
queryParams: {
pageNum: 1,
pageSize: 10,
projectId: currentProject.value.id,
projectId: currentProject.value?.id,
repertoryId: undefined,
materialsorderId: undefined,
materialCode: undefined,
@ -243,7 +243,7 @@ onMounted(() => {
//监听项目id刷新数据
const listeningProject = watch(
() => currentProject.value.id,
() => currentProject.value?.id,
(nid, oid) => {
queryParams.value.projectId = nid;
form.value.projectId = nid;

2
src/views/materials/repertoryDetails/index.vue
View File

@ -153,7 +153,7 @@ onMounted(() => {
//监听项目id刷新数据
const listeningProject = watch(
() => currentProject.value.id,
() => currentProject.value?.id,
(nid, oid) => {
queryParams.value.projectId = nid;
form.value.projectId = nid;

8
src/views/materials/suppliesprice/index.vue
View File

@ -293,7 +293,7 @@ const initFormData: any = {
unit: undefined,
plan: undefined,
realQuantity: undefined,
projectId: currentProject.value.id,
projectId: currentProject.value?.id,
approvalProject: undefined,
listOfMaterialInventory: [],
@ -308,7 +308,7 @@ const data = reactive<PageData<any, any>>({
supplierId: undefined,
supplier: undefined,
name: undefined,
projectId: currentProject.value.id,
projectId: currentProject.value?.id,
supply: undefined,
specification: undefined,
signalment: undefined,
@ -485,7 +485,7 @@ const handleAudit = async () => {
const supplierOptions = ref([]);
const getSupplierList = async () => {
const res = await listContractor({
projectId: currentProject.value.id,
projectId: currentProject.value?.id,
pageNum: 1,
pageSize: 10000
});
@ -499,7 +499,7 @@ onMounted(() => {
//监听项目id刷新数据
const listeningProject = watch(
() => currentProject.value.id,
() => currentProject.value?.id,
(nid, oid) => {
queryParams.value.projectId = nid;
form.value.projectId = nid;