diff --git a/.env.development b/.env.development index 8849f99..b59befd 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.213:8899' +VITE_APP_BASE_API = 'http://192.168.110.180:8899' # 无人机接口地址 diff --git a/src/api/design/Professional/index.ts b/src/api/design/Professional/index.ts index 7f13895..977300e 100644 --- a/src/api/design/Professional/index.ts +++ b/src/api/design/Professional/index.ts @@ -31,3 +31,11 @@ export const getFileList = (id) => { method: 'get' }); }; +// 获取专业 +export const extractUserMajor = (params) => { + return request({ + url: '/design/extract/userMajor', + method: 'get', + params + }); +}; diff --git a/src/views/biddingManagemen/biddingLimit/index.vue b/src/views/biddingManagemen/biddingLimit/index.vue index d272e71..9f0fe93 100644 --- a/src/views/biddingManagemen/biddingLimit/index.vue +++ b/src/views/biddingManagemen/biddingLimit/index.vue @@ -27,6 +27,9 @@ 导出excel + + 审核 + @@ -123,28 +126,24 @@ const changeSheet = () => { //获取表名 const getSheetName = async () => { - try { - const params = { - projectId: currentProject.value?.id - // versions: queryForm.value.versions - }; - const res = await sheetList(params); - if (res.code == 200) { - sheets.value = res.data; - if (res.data.length > 0) { - queryForm.value.sheet = res.data[0]; - } else { - queryForm.value.sheet = ''; - } - getTableData(); + const params = { + projectId: currentProject.value?.id + // versions: queryForm.value.versions + }; + const res = await sheetList(params); + if (res.code == 200) { + sheets.value = res.data; + if (res.data.length > 0) { + queryForm.value.sheet = res.data[0]; + } else { + queryForm.value.sheet = ''; } - } catch (error) {} + getTableData(); + } }; //获取表格 const getTableData = async () => { loading.value = true; - console.log(212121); - const params = { projectId: currentProject.value?.id, sheet: queryForm.value.sheet @@ -154,7 +153,6 @@ const getTableData = async () => { if (res.code == 200) { tableData.value = [res.data[0]]; } - console.log(loading.value); }; //修改单价 const handleSave = (row: any) => { @@ -228,6 +226,11 @@ const handleExport = () => { `限价一览表${queryForm.value.sheet}.xlsx` ); }; +// 审核 +const handleAudit = (row: any) => { + // +}; + onUnmounted(() => { listeningProject(); }); diff --git a/src/views/biddingManagemen/listOfWinningBids/index copy.vue b/src/views/biddingManagemen/listOfWinningBids/index copy.vue new file mode 100644 index 0000000..cd2f39a --- /dev/null +++ b/src/views/biddingManagemen/listOfWinningBids/index copy.vue @@ -0,0 +1,344 @@ + + + diff --git a/src/views/biddingManagemen/listOfWinningBids/index.vue b/src/views/biddingManagemen/listOfWinningBids/index.vue index cd2f39a..2eabee4 100644 --- a/src/views/biddingManagemen/listOfWinningBids/index.vue +++ b/src/views/biddingManagemen/listOfWinningBids/index.vue @@ -1,94 +1,50 @@ - + + diff --git a/src/views/design/Professional/indexEdit.vue b/src/views/design/Professional/indexEdit.vue index 7334669..fae1a5e 100644 --- a/src/views/design/Professional/indexEdit.vue +++ b/src/views/design/Professional/indexEdit.vue @@ -31,7 +31,7 @@ - + @@ -42,7 +42,6 @@ -
@@ -152,7 +151,7 @@ import { StartProcessBo } from '@/api/workflow/workflowCommon/types'; import { ComponentInternalInstance, nextTick, ref, reactive, computed, toRefs, onMounted } from 'vue'; import { useUserStoreHook } from '@/store/modules/user'; import { systemUserList } from '@/api/design/appointment'; -import { extractBatch, extractDetail } from '@/api/design/Professional'; +import { extractBatch, extractDetail, extractUserMajor } from '@/api/design/Professional'; import { listVolumeCatalog } from '@/api/design/volumeCatalog'; import { catalogList } from '@/api/design/designChange'; import { getUser } from '@/api/system/user'; @@ -197,7 +196,8 @@ const userInfo = ref({ phonenumber: '', userId: '' }); -const { des_user_major } = toRefs(proxy?.useDict('des_user_major')); +// const { des_user_major } = toRefs(proxy?.useDict('des_user_major')); +const des_user_major = ref([]); const buttonLoading = ref(false); const loading = ref(true); const disableAll = ref(false); @@ -440,7 +440,14 @@ const getDeptAllUser = async (deptId: any) => { ElMessage.error('获取用户列表失败'); } }; - +// 获取专业 +const getMajor = async () => { + let res = await extractUserMajor({ userId: userId.value, projectId: currentProject.value?.id }); + if (res.code == 200) { + des_user_major.value = res.data; + console.log(des_user_major.value); + } +}; /** 回显表单数据（编辑/查看/审批场景） */ const byProjectIdAll = async () => { loading.value = true; @@ -532,6 +539,7 @@ onMounted(() => { // 编辑/查看/审批场景：加载已有数据 const { type } = routeParams.value; + await getMajor(); if (type === 'update' || type === 'view' || type === 'approval') { await getDeptAllUser(userStore.deptId); await byProjectIdAll(); diff --git a/src/views/design/appointment/index.vue b/src/views/design/appointment/index.vue index e3dbba0..7e58d1f 100644 --- a/src/views/design/appointment/index.vue +++ b/src/views/design/appointment/index.vue @@ -220,23 +220,17 @@
-
+
确认提交 - + 重置