From 7ab2e0ae3279b13ff2de03aa85483cd3f7864bd1 Mon Sep 17 00:00:00 2001 From: fengsen <2548667232@qq.com> Date: Tue, 19 Aug 2025 20:08:27 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=B7=A5=E7=A8=8B=E9=87=8F=E6=B8=85?= =?UTF-8?q?=E5=8D=95=E6=B7=BB=E5=8A=A0=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/design/billofQuantities/index.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/views/design/billofQuantities/index.vue b/src/views/design/billofQuantities/index.vue index 0564912..669ba41 100644 --- a/src/views/design/billofQuantities/index.vue +++ b/src/views/design/billofQuantities/index.vue @@ -77,6 +77,7 @@ + From 0a790aebb541c91fde20645d9b07a4c900e367c3 Mon Sep 17 00:00:00 2001 From: fengsen <2548667232@qq.com> Date: Tue, 19 Aug 2025 21:16:31 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=8A=95=E6=A0=87=E5=B7=A5=E7=A8=8B?= =?UTF-8?q?=E9=87=8F=E5=AE=A1=E6=89=B9=E3=80=81=E9=99=90=E4=BB=B7=E5=B7=A5?= =?UTF-8?q?=E7=A8=8B=E9=87=8F=E6=B8=85=E5=8D=95=E3=80=81=E6=8B=9B=E9=87=87?= =?UTF-8?q?=E5=B7=A5=E7=A8=8B=E9=87=8F=E6=B8=85=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 2 +- src/views/design/billofQuantities/index.vue | 72 ++-- .../design/billofQuantities/indexEdit0.vue | 357 ++++++++++++++++++ .../design/billofQuantities/indexEdit1.vue | 357 ++++++++++++++++++ .../design/billofQuantities/indexEdit2.vue | 357 ++++++++++++++++++ .../{indexEdit.vue => indexEdit3.vue} | 2 +- 6 files changed, 1101 insertions(+), 46 deletions(-) create mode 100644 src/views/design/billofQuantities/indexEdit0.vue create mode 100644 src/views/design/billofQuantities/indexEdit1.vue create mode 100644 src/views/design/billofQuantities/indexEdit2.vue rename src/views/design/billofQuantities/{indexEdit.vue => indexEdit3.vue} (99%) diff --git a/.env.development b/.env.development index b59befd..8849f99 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.213:8899' # 无人机接口地址 diff --git a/src/views/design/billofQuantities/index.vue b/src/views/design/billofQuantities/index.vue index 669ba41..0a406dd 100644 --- a/src/views/design/billofQuantities/index.vue +++ b/src/views/design/billofQuantities/index.vue @@ -7,7 +7,8 @@ - + @@ -24,9 +25,13 @@ + 审核 + 查看流程 @@ -34,46 +39,23 @@ - + - - - - 审核 - 查看流程 + 导入excel + 审核 + 查看流程 - + @@ -81,7 +63,8 @@ - + @@ -109,7 +92,7 @@ const currentProject = computed(() => userStore.selectedProject); const { proxy } = getCurrentInstance(); const { work_order_type } = toRefs(proxy?.useDict('work_order_type')); const tableRef = ref({}); -console.log(currentProject.value); +console.log(work_order_type); // tableData // 版本号 @@ -139,6 +122,7 @@ const state = reactive({ }); // tab切换 const handleTabChange = (tab) => { + console.log('tab',tab); state.tableData = []; state.options = []; state.sheets = []; @@ -172,10 +156,10 @@ async function getVersionNums(isSheet = true) { state.options = rows || []; if (state.options.length > 0) { state.queryForm.versions = state.options[0].versions; - if (state.work_order_type == 3) { - state.versionsData = state.options[0] || []; - console.log('state.versionsData', state.versionsData); - } + // if (state.work_order_type == 3) { + state.versionsData = state.options[0] || []; + // console.log('state.versionsData', state.versionsData); + // } // 等待表名加载完成 console.log(isSheet, state.sheets.length); if (isSheet) { @@ -318,7 +302,7 @@ function handleArr(arr, flag, table) { function clickApprovalSheet(row) { proxy.$tab.closePage(proxy.$route); proxy.$router.push({ - path: `/approval/billofQuantities/indexEdit`, + path: `/approval/billofQuantities/indexEdit`+state.work_order_type, query: { id: state.queryForm.versions, type: 'update' @@ -328,7 +312,7 @@ function clickApprovalSheet(row) { // 审核流程 function lookApprovalFlow(row) { proxy.$router.push({ - path: `/approval/billofQuantities/indexEdit`, + path: `/approval/billofQuantities/indexEdit`+state.work_order_type, query: { id: state.queryForm.versions, type: 'view' diff --git a/src/views/design/billofQuantities/indexEdit0.vue b/src/views/design/billofQuantities/indexEdit0.vue new file mode 100644 index 0000000..c09bda7 --- /dev/null +++ b/src/views/design/billofQuantities/indexEdit0.vue @@ -0,0 +1,357 @@ + + + + diff --git a/src/views/design/billofQuantities/indexEdit1.vue b/src/views/design/billofQuantities/indexEdit1.vue new file mode 100644 index 0000000..97076a8 --- /dev/null +++ b/src/views/design/billofQuantities/indexEdit1.vue @@ -0,0 +1,357 @@ + + + + diff --git a/src/views/design/billofQuantities/indexEdit2.vue b/src/views/design/billofQuantities/indexEdit2.vue new file mode 100644 index 0000000..c4b1ed9 --- /dev/null +++ b/src/views/design/billofQuantities/indexEdit2.vue @@ -0,0 +1,357 @@ + + + + diff --git a/src/views/design/billofQuantities/indexEdit.vue b/src/views/design/billofQuantities/indexEdit3.vue similarity index 99% rename from src/views/design/billofQuantities/indexEdit.vue rename to src/views/design/billofQuantities/indexEdit3.vue index 905580e..094df79 100644 --- a/src/views/design/billofQuantities/indexEdit.vue +++ b/src/views/design/billofQuantities/indexEdit3.vue @@ -114,7 +114,7 @@ const approvalRecordRef = ref>(); const flowCodeOptions = [ { value: currentProject.value?.id + '_equipmentList', - label: '工程量清单审核' + label: '物资设备清单审核' } ];