From 4ad2b0c6dc4adb1edc8e633b36f8160e37d10f13 Mon Sep 17 00:00:00 2001 From: ljx <15723110242@139.com> Date: Tue, 16 Sep 2025 20:25:23 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 2 +- .../constructionSchedulePlan/index.ts | 17 +++++++++++++++- .../constructionSchedulePlan/index.vue | 20 +++++++++++++++++-- 3 files changed, 35 insertions(+), 4 deletions(-) diff --git a/.env.development b/.env.development index dfa167d..a8ebcf8 100644 --- a/.env.development +++ b/.env.development @@ -5,7 +5,7 @@ VITE_APP_TITLE = 煤科建管平台 VITE_APP_ENV = 'development' # 开发环境 -VITE_APP_BASE_API = 'http://192.168.110.180:8899' +# VITE_APP_BASE_API = 'http://192.168.110.180:8899' # 李陈杰 209 # VITE_APP_BASE_API = 'http://192.168.110.209:8899' # 李陈杰 209 diff --git a/src/api/progress/constructionSchedulePlan/index.ts b/src/api/progress/constructionSchedulePlan/index.ts index fec34f8..45790e6 100644 --- a/src/api/progress/constructionSchedulePlan/index.ts +++ b/src/api/progress/constructionSchedulePlan/index.ts @@ -1,6 +1,10 @@ import request from '@/utils/request'; import { AxiosPromise } from 'axios'; -import { ConstructionSchedulePlanVO, ConstructionSchedulePlanForm, ConstructionSchedulePlanQuery } from '@/api/progress/constructionSchedulePlan/types'; +import { + ConstructionSchedulePlanVO, + ConstructionSchedulePlanForm, + ConstructionSchedulePlanQuery +} from '@/api/progress/constructionSchedulePlan/types'; /** * 查询施工进度计划列表 @@ -71,3 +75,14 @@ export const getProjectStructure = (id: string | number | Array method: 'get' }); }; + +/** + * 施工进度计划完成 + * @param id + */ +export const finishConstructionSchedulePlan = (id: string | number | Array) => { + return request({ + url: '/progress/constructionSchedulePlan/finish/' + id, + method: 'put' + }); +}; diff --git a/src/views/progress/constructionSchedulePlan/index.vue b/src/views/progress/constructionSchedulePlan/index.vue index 3d4f00a..b4eeb5f 100644 --- a/src/views/progress/constructionSchedulePlan/index.vue +++ b/src/views/progress/constructionSchedulePlan/index.vue @@ -102,6 +102,15 @@ v-hasPermi="['progress:constructionSchedulePlan:remove']" /> + + 确定 + @@ -172,7 +181,8 @@ import { delConstructionSchedulePlan, addConstructionSchedulePlan, updateConstructionSchedulePlan, - getProjectStructure + getProjectStructure, + finishConstructionSchedulePlan } from '@/api/progress/constructionSchedulePlan'; import { ConstructionSchedulePlanVO, @@ -282,7 +292,13 @@ const cancel = () => { reset(); dialog.visible = false; }; - +const handleFinish = async (row: ConstructionSchedulePlanVO) => { + const res = await finishConstructionSchedulePlan(row.id); + if (res.code === 200) { + proxy.$modal.msgSuccess('操作成功'); + getList(); + } +}; const handleExport = async () => { const ids = queryParams.value.projectId; proxy?.download('/progress/constructionSchedulePlan/exportTemplate/' + ids, {}, `施工里程碑计划模版.xlsx`, true); From de0e0d5cfcd0531efa4ecb81427a0e4226affc00 Mon Sep 17 00:00:00 2001 From: ljx <15723110242@139.com> Date: Wed, 17 Sep 2025 09:11:29 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.env.development b/.env.development index 090b058..d8d5b20 100644 --- a/.env.development +++ b/.env.development @@ -11,11 +11,9 @@ VITE_APP_ENV = 'development' # 李陈杰 209 # VITE_APP_BASE_API = 'http://192.168.110.209:8899' # 曾涛 -<<<<<<<<< Temporary merge branch 1 -# VITE_APP_BASE_API = 'http://192.168.110.149:8899' -========= + VITE_APP_BASE_API = 'http://192.168.110.209:8899' ->>>>>>>>> Temporary merge branch 2 + # 罗成 # VITE_APP_BASE_API = 'http://192.168.110.188:8899' # 朱银 From 139eaf84cf9723d915542c4f217ac5edbd7d5cd1 Mon Sep 17 00:00:00 2001 From: ljx <15723110242@139.com> Date: Wed, 17 Sep 2025 10:20:38 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mechanical/mechanicalrewriting/types.ts | 18 ++++++++---------- src/views/mechanism/ledger/index.vue | 5 ++++- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/src/api/mechanical/mechanicalrewriting/types.ts b/src/api/mechanical/mechanicalrewriting/types.ts index d673aeb..a87cff9 100644 --- a/src/api/mechanical/mechanicalrewriting/types.ts +++ b/src/api/mechanical/mechanicalrewriting/types.ts @@ -98,7 +98,6 @@ export interface MechanicalrewritingVO { * 备注 */ remark: string; - } export interface MechanicalrewritingForm extends BaseEntity { @@ -201,11 +200,9 @@ export interface MechanicalrewritingForm extends BaseEntity { * 备注 */ remark?: string; - } export interface MechanicalrewritingQuery extends PageQuery { - /** * 项目ID */ @@ -295,12 +292,13 @@ export interface MechanicalrewritingQuery extends PageQuery { * 检验报告 */ verificationReport?: string; + /** + * 工区 + */ + workArea?: string; - /** - * 日期范围参数 - */ - params?: any; + /** + * 日期范围参数 + */ + params?: any; } - - - diff --git a/src/views/mechanism/ledger/index.vue b/src/views/mechanism/ledger/index.vue index 05e9520..d5db138 100644 --- a/src/views/mechanism/ledger/index.vue +++ b/src/views/mechanism/ledger/index.vue @@ -7,7 +7,9 @@ - + + + 搜索 重置 @@ -160,6 +162,7 @@ const data = reactive