diff --git a/.env.development b/.env.development index eb8185a..764306d 100644 --- a/.env.development +++ b/.env.development @@ -6,7 +6,7 @@ VITE_APP_ENV = 'development' # 开发环境 # 李陈杰 209 -VITE_APP_BASE_API = 'http://192.168.110.188:8899' +VITE_APP_BASE_API = 'http://192.168.110.149:8899' # 曾涛 # VITE_APP_BASE_API = 'http://192.168.110.180:8899' # 罗成 diff --git a/src/views/biddingManagemen/biddingLimit/index.vue b/src/views/biddingManagemen/biddingLimit/index.vue index eca3c03..4c508ad 100644 --- a/src/views/biddingManagemen/biddingLimit/index.vue +++ b/src/views/biddingManagemen/biddingLimit/index.vue @@ -165,7 +165,8 @@ const getTableData = async () => { loading.value = true; const params = { projectId: currentProject.value?.id, - sheet: queryForm.value.sheet + sheet: queryForm.value.sheet, + versions: queryForm.value.versions }; const res = await getTreeLimit(params); loading.value = false; diff --git a/src/views/contract/division/index.vue b/src/views/contract/division/index.vue index 0bca716..0c7675d 100644 --- a/src/views/contract/division/index.vue +++ b/src/views/contract/division/index.vue @@ -165,7 +165,7 @@ @@ -228,7 +228,7 @@ const rules = ref({ content: [{ required: true, message: '请输入内容', trigger: 'blur' }] }); const loading = ref(false); - +const loadingBtn = ref(); //字典获取数据 const getTabsList = async () => { const res = await getDicts('subcontracting_type'); @@ -457,6 +457,7 @@ const submitForm = async (formEl: FormInstance | undefined) => { }); return; } + loadingBtn.value = true; const newSelectionData = selectionData.value.filter((item) => item.quantity != '' && item.quantity != null); if (newSelectionData.some((item) => item.selectNum == '' || item.selectNum == null)) { ElMessage.error('存在未填写数量的工程或费用名称,请检查'); @@ -488,6 +489,8 @@ const submitForm = async (formEl: FormInstance | undefined) => { } } catch (error) { console.log(error); + } finally { + loadingBtn.value = false; } } else { console.log('error submit!', fields); @@ -544,7 +547,7 @@ const handleDetail = (row: any) => { getDetails(row); }; const getDetails = (row: any) => { - getDetailsList({ id: row.id, type: '1' }).then((res) => { + getDetailsList({ id: row.id, type: '1', projectId: currentProject.value?.id }).then((res) => { if (res.code == 200) { detailData.value = res.data; } diff --git a/src/views/tender/plan/comm/winTheBid.vue b/src/views/tender/plan/comm/winTheBid.vue index f0056d8..db758d3 100644 --- a/src/views/tender/plan/comm/winTheBid.vue +++ b/src/views/tender/plan/comm/winTheBid.vue @@ -6,7 +6,7 @@ - + { getDetails(row); }; const getDetails = (row: any) => { - getTenderPlanDetail({ id: row.id }).then((res) => { + getTenderPlanDetail({ id: row.id, projectId: currentProject.value?.id }).then((res) => { if (res.code == 200) { detailData.value = res.data; }