From ab68bbcd40a678c3cf2fa4445d03ab3db06574ab Mon Sep 17 00:00:00 2001 From: ljx <15723110242@139.com> Date: Wed, 27 Aug 2025 11:17:30 +0800 Subject: [PATCH 01/21] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=B8=80=E9=94=AE?= =?UTF-8?q?=E7=A1=AE=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 4 +- .../biddingManagemen/biddingLimit/index.vue | 9 +-- src/views/contract/bidCost/index.vue | 74 ++++++++++++----- src/views/contract/limitPrice/index.vue | 63 +++++++++++---- .../formalitiesAreConsolidated/index.vue | 2 +- src/views/out/outDesignTableVS/index.vue | 2 +- src/views/tender/bidd/index.vue | 79 ++++++++++++++----- 7 files changed, 164 insertions(+), 69 deletions(-) diff --git a/.env.development b/.env.development index 4c056ae..c1b3fa0 100644 --- a/.env.development +++ b/.env.development @@ -8,11 +8,11 @@ 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.149:8899' #曾涛 # VITE_APP_BASE_API = 'http://192.168.110.171:8899' diff --git a/src/views/biddingManagemen/biddingLimit/index.vue b/src/views/biddingManagemen/biddingLimit/index.vue index ce13de3..eca3c03 100644 --- a/src/views/biddingManagemen/biddingLimit/index.vue +++ b/src/views/biddingManagemen/biddingLimit/index.vue @@ -63,14 +63,7 @@ diff --git a/src/views/contract/bidCost/index.vue b/src/views/contract/bidCost/index.vue index 46e9499..98442a5 100644 --- a/src/views/contract/bidCost/index.vue +++ b/src/views/contract/bidCost/index.vue @@ -32,6 +32,15 @@ 导出excel + + 一键确定 + 确定 { } } }; -//修改单价 -const handleSave = (row: any) => { +const modifyPrice = new Map(); + +const changePrice = (row: any) => { + modifyPrice.set(row.id, row); + // if (!row.unitPrice) { + // modifyPrice.delete(row.id); + // } +}; +//修改单价 biddingLimitListUpdate +const handleSave = (row?: any, type?: any) => { try { - if (!row.unitPrice) { - ElMessage({ - message: '请输入单价', - type: 'warning' + if (type == 'single') { + loading.value = true; + const list = [{ ...row }]; + biddingLimitListUpdate(list).then((res) => { + if (res.code == 200) { + ElMessage({ + message: '修改成功', + type: 'success' + }); + getTableData(); + } + }); + } + if (type == 'all') { + loading.value = true; + const list = []; + modifyPrice.forEach((item) => { + list.push({ ...item }); + }); + biddingLimitListUpdate(list).then((res) => { + if (res.code == 200) { + ElMessage({ + message: '修改成功', + type: 'success' + }); + getTableData(); + } }); - return; } - loading.value = true; - biddingLimitListUpdate(row).then((res) => { - if (res.code == 200) { - ElMessage({ - message: '修改成功', - type: 'success' - }); - getTableData(); - } - }); } catch (error) { ElMessage({ message: '修改失败', type: 'error' }); + } finally { + loading.value = false; } }; const tableRef = ref(); diff --git a/src/views/contract/limitPrice/index.vue b/src/views/contract/limitPrice/index.vue index 2c56ace..ac418f1 100644 --- a/src/views/contract/limitPrice/index.vue +++ b/src/views/contract/limitPrice/index.vue @@ -35,6 +35,15 @@ 导出excel + + 一键确定 + 审核 @@ -65,6 +74,7 @@ @change=" (val) => { scope.row.unitPrice = val; + changePrice(scope.row); } " :precision="2" @@ -87,7 +97,7 @@ type="primary" size="small" :disabled="reviewStatus != 'draft'" - @click="handleSave(scope.row)" + @click="handleSave(scope.row, 'single')" v-if="scope.row.quantity && scope.row.quantity != 0" v-hasPermi="['tender:billofquantitiesLimitList:edit']" >确定 { loading.value = false; } }; +const modifyPrice = new Map(); + +const changePrice = (row: any) => { + modifyPrice.set(row.id, row); +}; //修改单价 -const handleSave = (row: any) => { +const handleSave = (row?: any, type?: any) => { try { - if (!row.unitPrice) { - ElMessage({ - message: '请输入单价', - type: 'warning' + if (type == 'single') { + loading.value = true; + const list = [{ ...row, type: '1' }]; + updatePrice(list).then((res) => { + if (res.code == 200) { + ElMessage({ + message: '修改成功', + type: 'success' + }); + getTableData(); + } + }); + } + if (type == 'all') { + loading.value = true; + const list = []; + modifyPrice.forEach((item) => { + list.push({ ...item, type: '1' }); + }); + updatePrice(list).then((res) => { + if (res.code == 200) { + ElMessage({ + message: '修改成功', + type: 'success' + }); + getTableData(); + } }); - return; } - loading.value = true; - updatePrice({ ...row, type: '1' }).then((res) => { - if (res.code == 200) { - ElMessage({ - message: '修改成功', - type: 'success' - }); - getTableData(); - } - }); } catch (error) { ElMessage({ message: '修改失败', type: 'error' }); + } finally { + loading.value = false; } }; const tableRef = ref(); diff --git a/src/views/formalities/formalitiesAreConsolidated/index.vue b/src/views/formalities/formalitiesAreConsolidated/index.vue index f4918d9..918ce8d 100644 --- a/src/views/formalities/formalitiesAreConsolidated/index.vue +++ b/src/views/formalities/formalitiesAreConsolidated/index.vue @@ -67,7 +67,7 @@ - + @@ -258,6 +284,7 @@ import { editStatus, getTemplateTreeList } from '@/api/formalities/formalitiesAreConsolidated'; +import { listListOfFormalities, addFormalities } from '@/api/formalities/listOfFormalities'; import { FormalitiesAreConsolidatedVO, FormalitiesAreConsolidatedQuery, @@ -294,6 +321,7 @@ const dialog = reactive({ visible: false, title: '' }); + const file = ref(null); const fileParams = reactive({ pageNum: 1, @@ -411,7 +439,39 @@ const handleAdd = async () => { tempTreeList.value = res.data; templateVisbile.value = true; }; - +const tempDialogVisible = ref(false); +const formTemplate: any = ref({ + formalitiesPid: '', + formalitiesName: '' +}); +const listOfFormalitiesList: any = ref([]); +//新增模版 +const addTemplate = async () => { + tempDialogVisible.value = true; + const res = await listListOfFormalities(); + listOfFormalitiesList.value = res.data; +}; +//确定信息 +const submitFormTemplate = async () => { + const params = { + projectId: currentProject.value.id, + addBusFormalitiesAreConsolidatedBo: { + ...formTemplate.value + } + }; + const res = await addFormalities(params); + if (res.code == 200) { + proxy?.$modal.msgSuccess('操作成功'); + templateCancel(); + getList(); + } +}; +//取消 +const templateCancel = () => { + tempDialogVisible.value = false; + formTemplate.value.formalitiesPid = ''; + formTemplate.value.formalitiesName = ''; +}; // 选择模板 const setTemp = async () => { // form.value.formalitiesPid = tempValue.value[tempValue.value.length - 1]; diff --git a/src/views/formalities/listOfFormalities/index.vue b/src/views/formalities/listOfFormalities/index.vue index 2a563a2..5bcd5b9 100644 --- a/src/views/formalities/listOfFormalities/index.vue +++ b/src/views/formalities/listOfFormalities/index.vue @@ -1,6 +1,5 @@