From bb512fe0f3b0fac94f86d1062d5b06dc4a0c2653 Mon Sep 17 00:00:00 2001 From: Teo <2642673902@qq.com> Date: Fri, 22 Aug 2025 23:27:17 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=AE=A1=E6=A0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/tender/bidd/index.vue | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/views/tender/bidd/index.vue b/src/views/tender/bidd/index.vue index b0a7cab..c5d9bcd 100644 --- a/src/views/tender/bidd/index.vue +++ b/src/views/tender/bidd/index.vue @@ -38,7 +38,8 @@ 导出excel - 审核 + 审核 + 查看流程 @@ -58,6 +59,7 @@ :step="0.1" :controls="false" v-if="scope.row.quantity && scope.row.quantity != 0" + :disabled="versionsData.status != 'draft'" /> @@ -271,10 +273,10 @@ const handleSave = (row: any) => { }; /** 审核按钮操作 */ -const handleAudit = async () => { +const handleAudit = async (type) => { proxy?.$tab.openPage('/approval/tenderBidd/indexEdit', '审核招标一览', { id: queryForm.value.versions, - type: 'update', + type, activeTab: activeTab.value, status: versionsData.value.status }); From 7e15764ba58aae8c9015e86a0ad81f0a952a30f3 Mon Sep 17 00:00:00 2001 From: Teo <2642673902@qq.com> Date: Fri, 22 Aug 2025 23:30:48 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=90=88=E5=B9=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.env.development b/.env.development index 7203b00..97d3ec6 100644 --- a/.env.development +++ b/.env.development @@ -12,9 +12,9 @@ VITE_APP_ENV = 'development' # 罗成 # VITE_APP_BASE_API = 'http://192.168.110.213:8899' # 朱银 -VITE_APP_BASE_API = 'http://192.168.110.149:8899' +# VITE_APP_BASE_API = 'http://192.168.110.149:8899' #屈展航 -# VITE_APP_BASE_API = 'http://192.168.110.210:8899' +VITE_APP_BASE_API = 'http://192.168.110.210:8899' # VITE_APP_BASE_API = 'http://192.168.110.209:8899' # 无人机接口地址 From 4d0845ee536a00e15be67ab1e951c803060ae609 Mon Sep 17 00:00:00 2001 From: Teo <2642673902@qq.com> Date: Sat, 23 Aug 2025 06:36:17 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E8=AE=BE=E8=AE=A1=E5=8F=98=E6=9B=B4?= =?UTF-8?q?=E5=AE=A1=E6=89=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 4 +- src/api/progress/progressCategory/types.ts | 24 +- src/views/design/designChange/index.vue | 5 +- src/views/design/designChange/indexEdit.vue | 306 ++++++++---- src/views/design/designChange/indexEdit1.vue | 446 ++++++++++++++++++ src/views/design/drawing/indexEdit.vue | 29 +- src/views/design/drawingreview/detailForm.vue | 10 +- src/views/progress/progressCategory/index.vue | 62 ++- 8 files changed, 756 insertions(+), 130 deletions(-) create mode 100644 src/views/design/designChange/indexEdit1.vue diff --git a/.env.development b/.env.development index 97d3ec6..21172c3 100644 --- a/.env.development +++ b/.env.development @@ -8,13 +8,13 @@ VITE_APP_ENV = 'development' # 李陈杰 209 # VITE_APP_BASE_API = 'http://192.168.110.209:8899' # 曾涛 -# VITE_APP_BASE_API = 'http://192.168.110.180:8899' +VITE_APP_BASE_API = 'http://192.168.110.180:8899' # 罗成 # VITE_APP_BASE_API = 'http://192.168.110.213:8899' # 朱银 # VITE_APP_BASE_API = 'http://192.168.110.149:8899' #屈展航 -VITE_APP_BASE_API = 'http://192.168.110.210:8899' +# VITE_APP_BASE_API = 'http://192.168.110.210:8899' # VITE_APP_BASE_API = 'http://192.168.110.209:8899' # 无人机接口地址 diff --git a/src/api/progress/progressCategory/types.ts b/src/api/progress/progressCategory/types.ts index 6e05749..c24a173 100644 --- a/src/api/progress/progressCategory/types.ts +++ b/src/api/progress/progressCategory/types.ts @@ -84,10 +84,10 @@ export interface ProgressCategoryVO { */ remark: string; - /** - * 子对象 - */ - children: ProgressCategoryVO[]; + /** + * 子对象 + */ + children: ProgressCategoryVO[]; } export interface ProgressCategoryForm extends BaseEntity { @@ -95,7 +95,8 @@ export interface ProgressCategoryForm extends BaseEntity { * 主键id */ id?: string | number; - + constructionPrice?: string | number; + ownerPrice?: string | number; /** * 父类别id */ @@ -175,11 +176,9 @@ export interface ProgressCategoryForm extends BaseEntity { * 备注 */ remark?: string; - } export interface ProgressCategoryQuery { - /** * 父类别id */ @@ -255,11 +254,8 @@ export interface ProgressCategoryQuery { */ status?: string; - /** - * 日期范围参数 - */ - params?: any; + /** + * 日期范围参数 + */ + params?: any; } - - - diff --git a/src/views/design/designChange/index.vue b/src/views/design/designChange/index.vue index 1aa02bc..cbf9764 100644 --- a/src/views/design/designChange/index.vue +++ b/src/views/design/designChange/index.vue @@ -74,14 +74,14 @@ link icon="Upload" @click="handleAddChange(scope.row)" - v-if="scope.row.status == 'draft' || scope.row.status == 'back'" + v-if="(scope.row.status == 'finish' || scope.row.costEstimation == '0') && scope.row.auditStatus == 'draft'" >上传 查看 { path: `/approval/drawing/indexEdit`, query: { id: row.id, + costEstimation: row.costEstimation, type: 'view' } }); diff --git a/src/views/design/designChange/indexEdit.vue b/src/views/design/designChange/indexEdit.vue index f48e6f7..2519ac5 100644 --- a/src/views/design/designChange/indexEdit.vue +++ b/src/views/design/designChange/indexEdit.vue @@ -1,15 +1,22 @@ diff --git a/src/views/design/drawing/indexEdit.vue b/src/views/design/drawing/indexEdit.vue index 76c3b5b..0f5489d 100644 --- a/src/views/design/drawing/indexEdit.vue +++ b/src/views/design/drawing/indexEdit.vue @@ -88,12 +88,16 @@ const buttonLoading = ref(false); const loading = ref(true); //路由参数 const routeParams = ref>({}); -const flowCodeOptions = [ +const flowCodeOptions = ref([ { value: currentProject.value?.id + '_designchanged', label: '变更图纸审批' + }, + { + value: currentProject.value?.id + '_moneydesignchanged', + label: '资金设计变更审批' } -]; +]); const flowCode = ref(''); const status = ref(''); @@ -129,6 +133,7 @@ const initFormData = { fileUrl: undefined, fileType: undefined, fileSuffix: undefined, + costEstimation: undefined, originalName: undefined, remark: undefined, fileId: undefined @@ -144,6 +149,7 @@ const data = reactive({ fileSuffix: undefined, fileStatus: undefined, originalName: undefined, + costEstimation: undefined, newest: undefined, params: {} }, @@ -182,8 +188,13 @@ const getInfo = () => { loading.value = true; buttonLoading.value = false; nextTick(async () => { - const res = await getDesignChange(routeParams.value.id); + var id = routeParams.value.id; + if (routeParams.value.type === 'approval') { + id = routeParams.value.id.split('_')[0]; + } + const res = await getDesignChange(id); Object.assign(form.value, res.data); + if (res.data.costEstimation) form.value.status = res.data.auditStatus; loading.value = false; buttonLoading.value = false; }); @@ -248,6 +259,8 @@ const approvalVerifyOpen = async () => { // 图纸上传成功之后 开始提交 const submit = async (status, data) => { form.value = data; + form.value.id = routeParams.value.type == 'add' ? form.value.id + '_' : form.value.id.split('_')[0]; + form.value.status = data.auditStatus ? data.auditStatus : data.status; if (status === 'draft') { buttonLoading.value = false; proxy?.$modal.msgSuccess('暂存成功'); @@ -255,7 +268,13 @@ const submit = async (status, data) => { proxy.$router.go(-1); } else { if ((form.value.status === 'draft' && (flowCode.value === '' || flowCode.value === null)) || routeParams.value.type === 'add') { - flowCode.value = flowCodeOptions[0].value; + if (form.value.costEstimation == '0') { + flowCodeOptions.value = [flowCodeOptions.value[0]]; + } else { + console.log('🚀 ~ submit ~ flowCodeOptions.value:', flowCodeOptions.value[1]); + flowCodeOptions.value = [flowCodeOptions.value[1]]; + } + flowCode.value = flowCodeOptions.value[0].value; dialogVisible.visible = true; return; } @@ -275,6 +294,8 @@ onMounted(() => { loading.value = false; if (routeParams.value.type === 'update' || routeParams.value.type === 'view' || routeParams.value.type === 'approval') { getInfo(); + } else { + form.value.costEstimation = routeParams.value.costEstimation; } }); }); diff --git a/src/views/design/drawingreview/detailForm.vue b/src/views/design/drawingreview/detailForm.vue index 2862788..efa1fe1 100644 --- a/src/views/design/drawingreview/detailForm.vue +++ b/src/views/design/drawingreview/detailForm.vue @@ -277,11 +277,11 @@ const submit = async (businessId, cb) => { cb(); formData.subprojectName = subProjectMap.get(formData.subprojectId); formData.drawingreviewId = businessId; - const res = await drawingreviewReceipts(formData); - if (res.code === 200) { - // // 提交成功处理逻辑 - // console.log('提交成功'); - } + // const res = await drawingreviewReceipts(formData); + // if (res.code === 200) { + // 提交成功处理逻辑 + // console.log('提交成功'); + // } }; onMounted(() => { getSubProject(); diff --git a/src/views/progress/progressCategory/index.vue b/src/views/progress/progressCategory/index.vue index 48594c2..224b281 100644 --- a/src/views/progress/progressCategory/index.vue +++ b/src/views/progress/progressCategory/index.vue @@ -31,7 +31,18 @@ 新增 - 导出 + + 导入 + + + + 导出 展开/折叠 @@ -48,7 +59,7 @@ :tree-props="{ children: 'children', hasChildren: 'hasChildren' }" > - + - + - + - + + + + + + + @@ -91,7 +112,7 @@ - + + + + + + + - - - @@ -175,7 +199,7 @@ const buttonLoading = ref(false); const showSearch = ref(true); const isExpandAll = ref(true); const loading = ref(false); - +const file = ref(); const queryFormRef = ref(); const progressCategoryFormRef = ref(); const progressCategoryTableRef = ref(); @@ -194,6 +218,8 @@ const initFormData: ProgressCategoryForm = { name: undefined, unitType: undefined, unit: undefined, + constructionPrice: undefined, + ownerPrice: undefined, unitPrice: undefined, outputValue: undefined, total: undefined, @@ -236,7 +262,9 @@ const data = reactive>({ unitPrice: [{ required: true, message: '综合单价不能为空', trigger: 'blur' }], outputValue: [{ required: true, message: '产值金额不能为空', trigger: 'blur' }], isDelay: [{ required: true, message: '是否超期不能为空', trigger: 'blur' }], - status: [{ required: true, message: '完成状态不能为空', trigger: 'change' }] + status: [{ required: true, message: '完成状态不能为空', trigger: 'change' }], + constructionPrice: [{ required: true, message: '综合单价(分包)不能为空', trigger: 'change' }], + ownerPrice: [{ required: true, message: '综合单价(业主)不能为空', trigger: 'change' }] } }); @@ -276,6 +304,11 @@ const getList = async () => { } }; +const handleSuccess = () => { + console.log(111); + proxy.$modal.msgSuccess('操作成功'); +}; + /** 查询分项工程单价下拉树结构 */ const getTreeselect = async () => { const res = await listProgressCategory(queryParams.value); @@ -366,12 +399,13 @@ const handleUpdate = async (row: ProgressCategoryVO) => { const handleExport = async () => { const ids = treeRef.value.getCheckedNodes()[0].pathNodes[0].childrenData.map((item) => item.matrixId); + const fileName = treeRef.value.getCheckedNodes()[0].pathNodes[0].label; proxy?.download( '/progress/progressCategory/export', { ids: ids }, - `qualityInspection_${new Date().getTime()}.xlsx`, + `${fileName}分项工程单价导入.xlsx`, true ); };