From 62ab2a4672038753dd2be4bb01fbfea8ccb7c5e1 Mon Sep 17 00:00:00 2001
From: fengsen <2548667232@qq.com>
Date: Fri, 29 Aug 2025 20:57:49 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.env.development | 2 +-
src/api/design/volumeCatalog/index.ts | 11 ++
.../biddingManagemen/appointment/index.vue | 2 +-
src/views/design/appointment/index.vue | 10 +-
src/views/design/volumeCatalog/index.vue | 49 +++---
.../materialIssue/index.vue | 8 +-
.../materialReceive/index.vue | 161 +++++++++---------
7 files changed, 131 insertions(+), 112 deletions(-)
diff --git a/.env.development b/.env.development
index faff5a9..9ab76bb 100644
--- a/.env.development
+++ b/.env.development
@@ -6,7 +6,7 @@ VITE_APP_ENV = 'development'
# 开发环境
# 李陈杰 209
-VITE_APP_BASE_API = 'http://192.168.110.210:8899'
+VITE_APP_BASE_API = 'http://192.168.110.180:8899'
# 曾涛
# VITE_APP_BASE_API = 'http://192.168.110.180:8899'
# 罗成
diff --git a/src/api/design/volumeCatalog/index.ts b/src/api/design/volumeCatalog/index.ts
index c7c3a01..be533ae 100644
--- a/src/api/design/volumeCatalog/index.ts
+++ b/src/api/design/volumeCatalog/index.ts
@@ -116,6 +116,17 @@ export const getileDetail = (id) => {
method: 'get'
});
};
+/**
+ * 获取专业列表
+ * @param query
+ */
+export const majorList = (params) => {
+ return request({
+ url: '/design/volumeCatalog/majorList',
+ method: 'get',
+ params: params
+ });
+};
/**
* 获取二维码信息
* @param query
diff --git a/src/views/biddingManagemen/appointment/index.vue b/src/views/biddingManagemen/appointment/index.vue
index 835b495..a76ea00 100644
--- a/src/views/biddingManagemen/appointment/index.vue
+++ b/src/views/biddingManagemen/appointment/index.vue
@@ -21,7 +21,7 @@
diff --git a/src/views/design/appointment/index.vue b/src/views/design/appointment/index.vue
index 54d4f92..58cc90f 100644
--- a/src/views/design/appointment/index.vue
+++ b/src/views/design/appointment/index.vue
@@ -76,7 +76,7 @@
label-width="60px"
label="专业"
>
-
-
-
-
-
-
+
-
-
+
+
-
+
@@ -253,7 +253,7 @@ import {
delVolumeCatalog,
addVolumeCatalog,
updateVolumeCatalog,
- uploadVolumeFile,
+ uploadVolumeFile,majorList,
getVolumeCatafileList,
volumeFileList
} from '@/api/design/volumeCatalog';
@@ -264,9 +264,10 @@ import TableContent from './comm/tableContent.vue';
const fileList = ref([]);
import { designUserList } from '@/api/design/appointment';
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
-const { design_state, wf_business_status, des_user_major } = toRefs(proxy?.useDict('design_state', 'wf_business_status', 'des_user_major'));
+const { design_state, wf_business_status, } = toRefs(proxy?.useDict('design_state', 'wf_business_status'));
import { drawingreviewReceiptsDetail, drawingreviewReceiptsList } from '@/api/design/drawingreview';
const volumeCatalogList = ref([]);
+const des_user_major= ref([]);
const buttonLoading = ref(false);
const loading = ref(true);
const showSearch = ref(true);
@@ -356,13 +357,28 @@ const data = reactive({
rules: {
design: [{ required: true, message: '主键ID不能为空', trigger: 'blur' }],
projectId: [{ required: true, message: '项目ID不能为空', trigger: 'blur' }],
+ designSubitem: [{ required: true, message: '子项不能为空', trigger: 'blur' }],
volumeNumber: [{ required: true, message: '卷册号不能为空', trigger: 'blur' }],
- documentName: [{ required: true, message: '资料名称不能为空', trigger: 'blur' }]
+ documentName: [{ required: true, message: '资料名称不能为空', trigger: 'blur' }],
+ plannedCompletion: [{ required: true, message: '计划出图事件不能为空', trigger: 'blur' }],
+ principal: [{ required: true, message: '设计人员不能为空', trigger: 'blur' }],
+ specialty: [{ required: true, message: '专业不能为空', trigger: 'blur' }],
}
});
const { queryParams, form, rules } = toRefs(data);
-
+const changeSpecialty=(val)=>{
+ form.value.principal = ''; //清空
+ getUserAppList(val);
+}
+// 获取专业列表
+const getSpecialtyList = async () => {
+ const res = await majorList({ projectId: currentProject.value?.id ,userType:2});
+ console.log(res);
+ if (res.code === 200) {
+ des_user_major.value = res.data;
+ }
+};
/** 查询卷册目录列表 */
const getList = async () => {
loading.value = true;
@@ -374,17 +390,10 @@ const getList = async () => {
loading.value = false;
}
};
-const getUserAppList = async () => {
- const res = await designUserList({ projectId: currentProject.value?.id });
+const getUserAppList = async (userMajor) => {
+ const res = await designUserList({ projectId: currentProject.value?.id ,userType:2,userMajor});
if (res.code === 200) {
- console.log(res.rows);
-
- res.rows.forEach((item: any) => {
- if (item.userType == 2) {
- //设计人员
- userAppList.value.push(item);
- }
- });
+ userAppList.value = res.rows;
}
};
const handleViewHistory = async (row) => {
@@ -647,7 +656,7 @@ const handleAuditInfo = (row) => {
// 审核图纸
};
onMounted(() => {
- getUserAppList();
+ getSpecialtyList();
getList();
});
@@ -657,7 +666,7 @@ const listeningProject = watch(
(nid, oid) => {
queryParams.value.projectId = nid;
form.value.projectId = nid;
- getUserAppList();
+ getSpecialtyList();
getList();
}
);
diff --git a/src/views/materials/materialsEquipment/materialIssue/index.vue b/src/views/materials/materialsEquipment/materialIssue/index.vue
index 1a0e899..37efac6 100644
--- a/src/views/materials/materialsEquipment/materialIssue/index.vue
+++ b/src/views/materials/materialsEquipment/materialIssue/index.vue
@@ -7,9 +7,6 @@
-
-
-
@@ -45,7 +42,6 @@
-
@@ -82,7 +78,7 @@
-
+
@@ -295,7 +291,7 @@ const getInitFormData = () => {
projectId: currentProject.value?.id,
materialSource: '1',
formCode: undefined,
- projectName: undefined,
+ projectName: currentProject.value?.name,
materialName: '', // 初始化为空字符串
orderingUnit: undefined,
supplierUnit: undefined,
diff --git a/src/views/materials/materialsEquipment/materialReceive/index.vue b/src/views/materials/materialsEquipment/materialReceive/index.vue
index 78d9741..3f1d4c0 100644
--- a/src/views/materials/materialsEquipment/materialReceive/index.vue
+++ b/src/views/materials/materialsEquipment/materialReceive/index.vue
@@ -1,20 +1,23 @@
-
+
-
-
+
+
+
+
+
+
-
-
-
-
+
@@ -35,7 +38,8 @@
- 新增
+ 新增
@@ -44,11 +48,24 @@
-
+
+
+ {{ scope.row.materialSource == '1' ?
+ '甲供材料' : '乙供材料' }}
+
+
-
-
+
+
+ {{ scope.row.orderingUnit || '-' }}
+
+
+
+
+ {{ scope.row.supplierUnit || '-' }}
+
+
@@ -60,28 +77,20 @@
- 查看
- 删除
+ 查看
+ 删除
-
+
-
+
@@ -99,8 +108,10 @@
-
-
+
+
@@ -119,15 +130,11 @@
-
+
-
+
@@ -142,59 +149,48 @@
-
+
-
-
+
+
-
+
-
-
+
+
-
-
+
+
-
+
*自动计算(数量-验收数量)
@@ -216,22 +212,26 @@
-
+
-
+
-
+
-
+
@@ -357,7 +357,7 @@ const data = reactive({
pageNum: 1,
pageSize: 10,
projectId: currentProject.value?.id,
- materialSource: '1',
+ materialSource: '0',
formCode: undefined,
projectName: undefined,
materialName: undefined,
@@ -412,6 +412,9 @@ const { queryParams, form, rules } = toRefs(data);
const getList = async () => {
loading.value = true;
try {
+ if(queryParams.value.materialSource=='0'){
+ delete queryParams.value.materialSource;
+ }
const res = await listMaterialReceive(queryParams.value);
materialReceiveList.value = res.rows;
total.value = res.total;
@@ -503,9 +506,9 @@ const handleUpdate = async (row?: MaterialReceiveVO) => {
watchItemChanges(index);
// 手动触发当前条目的数量、验收数量、缺件数量验证
if (materialReceiveFormRef.value) {
- materialReceiveFormRef.value.validateField(`itemList.${index}.quantity`, () => {});
- materialReceiveFormRef.value.validateField(`itemList.${index}.acceptedQuantity`, () => {});
- materialReceiveFormRef.value.validateField(`itemList.${index}.shortageQuantity`, () => {});
+ materialReceiveFormRef.value.validateField(`itemList.${index}.quantity`, () => { });
+ materialReceiveFormRef.value.validateField(`itemList.${index}.acceptedQuantity`, () => { });
+ materialReceiveFormRef.value.validateField(`itemList.${index}.shortageQuantity`, () => { });
}
});
@@ -616,9 +619,9 @@ const handleAcceptedInput = (index: number) => {
// 手动验证数量和验收数量字段
const validateQuantityField = (index: number) => {
if (materialReceiveFormRef.value) {
- materialReceiveFormRef.value.validateField(`itemList.${index}.quantity`, () => {});
- materialReceiveFormRef.value.validateField(`itemList.${index}.acceptedQuantity`, () => {});
- materialReceiveFormRef.value.validateField(`itemList.${index}.shortageQuantity`, () => {});
+ materialReceiveFormRef.value.validateField(`itemList.${index}.quantity`, () => { });
+ materialReceiveFormRef.value.validateField(`itemList.${index}.acceptedQuantity`, () => { });
+ materialReceiveFormRef.value.validateField(`itemList.${index}.shortageQuantity`, () => { });
}
};
From ba2b8444afb27e21d325a94df7f37648105f3173 Mon Sep 17 00:00:00 2001
From: Teo <2642673902@qq.com>
Date: Fri, 29 Aug 2025 20:59:59 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.env.development | 2 +-
.../overallPlanMaterialSupply/index.vue | 69 +++++++++++++++----
.../usageMaterials/purchase/index.vue | 27 ++------
3 files changed, 62 insertions(+), 36 deletions(-)
diff --git a/.env.development b/.env.development
index faff5a9..beee2bd 100644
--- a/.env.development
+++ b/.env.development
@@ -6,7 +6,7 @@ VITE_APP_ENV = 'development'
# 开发环境
# 李陈杰 209
-VITE_APP_BASE_API = 'http://192.168.110.210:8899'
+VITE_APP_BASE_API = 'http://192.168.110.209:8899'
# 曾涛
# VITE_APP_BASE_API = 'http://192.168.110.180:8899'
# 罗成
diff --git a/src/views/materials/overallPlanMaterialSupply/index.vue b/src/views/materials/overallPlanMaterialSupply/index.vue
index f0920b1..4106dc8 100644
--- a/src/views/materials/overallPlanMaterialSupply/index.vue
+++ b/src/views/materials/overallPlanMaterialSupply/index.vue
@@ -11,9 +11,6 @@
查看流程
-
- 保存
-
- 导入
+ 导入
- 导出
+ 导出
+
+
+ 一键全部保存
@@ -42,40 +44,77 @@
border
:tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
>
-
+
-
-
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
diff --git a/src/views/materials/usageMaterials/purchase/index.vue b/src/views/materials/usageMaterials/purchase/index.vue
index e2778d1..8377948 100644
--- a/src/views/materials/usageMaterials/purchase/index.vue
+++ b/src/views/materials/usageMaterials/purchase/index.vue
@@ -1,25 +1,13 @@
-
-
- 新增
-
-
- 刷新
-
+
+
+
+ 新增
+
+
+
-
Date: Sat, 30 Aug 2025 00:01:14 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.env.development | 2 +-
src/components/Process/submitVerify.vue | 2 +-
src/views/cory/template/indexEdit.vue | 80 +++++++++++++------
src/views/design/designChange/indexEdit.vue | 3 +
src/views/design/volumeCatalog/index.vue | 36 ++++-----
.../usageMaterials/purchase/index.vue | 1 +
src/views/out/purchase/comm/purchPage.vue | 7 +-
7 files changed, 83 insertions(+), 48 deletions(-)
diff --git a/.env.development b/.env.development
index 9ab76bb..eb8185a 100644
--- a/.env.development
+++ b/.env.development
@@ -6,7 +6,7 @@ VITE_APP_ENV = 'development'
# 开发环境
# 李陈杰 209
-VITE_APP_BASE_API = 'http://192.168.110.180:8899'
+VITE_APP_BASE_API = 'http://192.168.110.188:8899'
# 曾涛
# VITE_APP_BASE_API = 'http://192.168.110.180:8899'
# 罗成
diff --git a/src/components/Process/submitVerify.vue b/src/components/Process/submitVerify.vue
index f678b11..3fefa25 100644
--- a/src/components/Process/submitVerify.vue
+++ b/src/components/Process/submitVerify.vue
@@ -546,7 +546,7 @@ const handleTerminationTask = async () => {
if (isDrawing.value) {
isShowTermination.value = true;
nextTick(() => {
- detailFormTeRef.value.getInfo(props.businessId);
+ detailFormTeRef.value.getInfo(props.businessId1);
});
return;
}
diff --git a/src/views/cory/template/indexEdit.vue b/src/views/cory/template/indexEdit.vue
index 91e3fe6..8c689fe 100644
--- a/src/views/cory/template/indexEdit.vue
+++ b/src/views/cory/template/indexEdit.vue
@@ -36,7 +36,7 @@
-
+
@@ -45,12 +45,42 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
@@ -62,27 +92,11 @@
-
-
-
-
-
-
-
-
-
-
- 上传附件
-
-
-
-
-
-
-
-
+
+
+ 上传附件
+
-
@@ -177,6 +191,7 @@ import { useUserStoreHook } from '@/store/modules/user';
import { listByIds } from '@/api/system/oss';
import { addContactnotice, getContactnotice, updateContactnotice } from '@/api/cory/contactnotice';
const { des_user_major } = toRefs(proxy?.useDict('des_user_major'));
+import { catalogList } from '@/api/design/designChange';
// 获取用户 store
const userStore = useUserStoreHook();
@@ -221,7 +236,7 @@ const initFormData = {
id: undefined,
projectId: currentProject.value?.id,
projectType: '',
- projectName: '',
+ projectName: currentProject.value?.name,
serialNumber: '',
to: '',
subject: '',
@@ -275,13 +290,27 @@ const handleClose = () => {
buttonLoading.value = false;
};
const { form, rules } = toRefs(data);
-
+const volumeCatalogList = ref([]);
+let volumeMap = new Map();
/** 表单重置 */
const reset = () => {
form.value = { ...initFormData };
leaveFormRef.value?.resetFields();
};
-
+// 获取卷册号列表
+const getJuance = async () => {
+ const res = await catalogList(currentProject.value?.id);
+ volumeCatalogList.value = res.data;
+ volumeCatalogList.value.forEach((e) => {
+ volumeMap.set(e.volumeNumber, e);
+ });
+};
+const handleSelect = (val) => {
+ let obj = volumeMap.get(val);
+ console.log(obj);
+ form.value.volumeName = obj.documentName;
+ form.value.specialty = obj.specialty;
+};
/** 获取详情 */
const getInfo = () => {
loading.value = true;
@@ -402,6 +431,7 @@ onMounted(() => {
routeParams.value = proxy.$route.query;
thumbnailUrl.value = proxy.$route.query.thumbnailUrl;
reset();
+ getJuance();
loading.value = false;
if (routeParams.value.type === 'update' || routeParams.value.type === 'view' || routeParams.value.type === 'approval') {
getInfo();
diff --git a/src/views/design/designChange/indexEdit.vue b/src/views/design/designChange/indexEdit.vue
index 428be39..90718bc 100644
--- a/src/views/design/designChange/indexEdit.vue
+++ b/src/views/design/designChange/indexEdit.vue
@@ -381,8 +381,11 @@ const submitForm = (status1: string) => {
if (valid) {
buttonLoading.value = true;
var res;
+ delete form.value.id;
res = await addDesignChange({ ...form.value, changeReason, saveFile }).finally(() => (buttonLoading.value = false));
if (res.code == 200) {
+ routeParams.value.type = 'update';
+ form.value = res.data;
if (form.value.costEstimation == '0') {
ElMessage.success('通知成功');
goBack();
diff --git a/src/views/design/volumeCatalog/index.vue b/src/views/design/volumeCatalog/index.vue
index e3dcf79..f7d77df 100644
--- a/src/views/design/volumeCatalog/index.vue
+++ b/src/views/design/volumeCatalog/index.vue
@@ -109,7 +109,12 @@
-
+
@@ -146,13 +151,7 @@
/>
-
+
@@ -253,7 +252,8 @@ import {
delVolumeCatalog,
addVolumeCatalog,
updateVolumeCatalog,
- uploadVolumeFile,majorList,
+ uploadVolumeFile,
+ majorList,
getVolumeCatafileList,
volumeFileList
} from '@/api/design/volumeCatalog';
@@ -264,10 +264,10 @@ import TableContent from './comm/tableContent.vue';
const fileList = ref([]);
import { designUserList } from '@/api/design/appointment';
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
-const { design_state, wf_business_status, } = toRefs(proxy?.useDict('design_state', 'wf_business_status'));
+const { design_state, wf_business_status } = toRefs(proxy?.useDict('design_state', 'wf_business_status'));
import { drawingreviewReceiptsDetail, drawingreviewReceiptsList } from '@/api/design/drawingreview';
const volumeCatalogList = ref([]);
-const des_user_major= ref([]);
+const des_user_major = ref([]);
const buttonLoading = ref(false);
const loading = ref(true);
const showSearch = ref(true);
@@ -362,21 +362,21 @@ const data = reactive({
documentName: [{ required: true, message: '资料名称不能为空', trigger: 'blur' }],
plannedCompletion: [{ required: true, message: '计划出图事件不能为空', trigger: 'blur' }],
principal: [{ required: true, message: '设计人员不能为空', trigger: 'blur' }],
- specialty: [{ required: true, message: '专业不能为空', trigger: 'blur' }],
+ specialty: [{ required: true, message: '专业不能为空', trigger: 'blur' }]
}
});
const { queryParams, form, rules } = toRefs(data);
-const changeSpecialty=(val)=>{
+const changeSpecialty = (val) => {
form.value.principal = ''; //清空
getUserAppList(val);
-}
+};
// 获取专业列表
const getSpecialtyList = async () => {
- const res = await majorList({ projectId: currentProject.value?.id ,userType:2});
+ const res = await majorList({ projectId: currentProject.value?.id, userType: 2 });
console.log(res);
if (res.code === 200) {
- des_user_major.value = res.data;
+ des_user_major.value = res.data;
}
};
/** 查询卷册目录列表 */
@@ -391,7 +391,7 @@ const getList = async () => {
}
};
const getUserAppList = async (userMajor) => {
- const res = await designUserList({ projectId: currentProject.value?.id ,userType:2,userMajor});
+ const res = await designUserList({ projectId: currentProject.value?.id, userType: 2, userMajor });
if (res.code === 200) {
userAppList.value = res.rows;
}
@@ -656,7 +656,7 @@ const handleAuditInfo = (row) => {
// 审核图纸
};
onMounted(() => {
- getSpecialtyList();
+ getSpecialtyList();
getList();
});
diff --git a/src/views/materials/usageMaterials/purchase/index.vue b/src/views/materials/usageMaterials/purchase/index.vue
index 8377948..4078def 100644
--- a/src/views/materials/usageMaterials/purchase/index.vue
+++ b/src/views/materials/usageMaterials/purchase/index.vue
@@ -8,6 +8,7 @@
+
-
-
+
+
@@ -76,7 +76,8 @@ const initFormData = {
valueType: undefined,
planAuditStatus: undefined,
completeAuditStatus: undefined,
- unitPrice: undefined
+ unitPrice: undefined,
+ acceptedQuantity: undefined
};
const data = reactive({
form: { ...initFormData },