This commit is contained in:
ljx
2025-08-30 06:39:31 +08:00
parent 4f2eec9468
commit a74419c288
5 changed files with 11 additions and 7 deletions

View File

@ -6,7 +6,7 @@ VITE_APP_ENV = 'development'
# 开发环境 # 开发环境
# 李陈杰 209 # 李陈杰 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' # VITE_APP_BASE_API = 'http://192.168.110.180:8899'
# 罗成 # 罗成

View File

@ -165,7 +165,8 @@ const getTableData = async () => {
loading.value = true; loading.value = true;
const params = { const params = {
projectId: currentProject.value?.id, projectId: currentProject.value?.id,
sheet: queryForm.value.sheet sheet: queryForm.value.sheet,
versions: queryForm.value.versions
}; };
const res = await getTreeLimit(params); const res = await getTreeLimit(params);
loading.value = false; loading.value = false;

View File

@ -165,7 +165,7 @@
</el-row> </el-row>
<template #footer> <template #footer>
<el-button @click="closeDialog">取消</el-button> <el-button @click="closeDialog">取消</el-button>
<el-button type="primary" @click="submitForm(formRef)">确定</el-button> <el-button type="primary" @click="submitForm(formRef)" :loading="loadingBtn">确定</el-button>
</template> </template>
</el-dialog> </el-dialog>
<el-dialog title="详情" v-model="detailDialog" width="75%" draggable> <el-dialog title="详情" v-model="detailDialog" width="75%" draggable>
@ -228,7 +228,7 @@ const rules = ref({
content: [{ required: true, message: '请输入内容', trigger: 'blur' }] content: [{ required: true, message: '请输入内容', trigger: 'blur' }]
}); });
const loading = ref(false); const loading = ref(false);
const loadingBtn = ref();
//字典获取数据 //字典获取数据
const getTabsList = async () => { const getTabsList = async () => {
const res = await getDicts('subcontracting_type'); const res = await getDicts('subcontracting_type');
@ -457,6 +457,7 @@ const submitForm = async (formEl: FormInstance | undefined) => {
}); });
return; return;
} }
loadingBtn.value = true;
const newSelectionData = selectionData.value.filter((item) => item.quantity != '' && item.quantity != null); const newSelectionData = selectionData.value.filter((item) => item.quantity != '' && item.quantity != null);
if (newSelectionData.some((item) => item.selectNum == '' || item.selectNum == null)) { if (newSelectionData.some((item) => item.selectNum == '' || item.selectNum == null)) {
ElMessage.error('存在未填写数量的工程或费用名称,请检查'); ElMessage.error('存在未填写数量的工程或费用名称,请检查');
@ -488,6 +489,8 @@ const submitForm = async (formEl: FormInstance | undefined) => {
} }
} catch (error) { } catch (error) {
console.log(error); console.log(error);
} finally {
loadingBtn.value = false;
} }
} else { } else {
console.log('error submit!', fields); console.log('error submit!', fields);
@ -544,7 +547,7 @@ const handleDetail = (row: any) => {
getDetails(row); getDetails(row);
}; };
const getDetails = (row: any) => { 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) { if (res.code == 200) {
detailData.value = res.data; detailData.value = res.data;
} }

View File

@ -6,7 +6,7 @@
<el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value" /> <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value" />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="标文件" prop="name"> <el-form-item label="标文件" prop="name">
<file-upload <file-upload
v-model="form.costEstimationFile" v-model="form.costEstimationFile"
:fileSize="100" :fileSize="100"

View File

@ -665,7 +665,7 @@ const handleDetail = (row: any) => {
getDetails(row); getDetails(row);
}; };
const getDetails = (row: any) => { const getDetails = (row: any) => {
getTenderPlanDetail({ id: row.id }).then((res) => { getTenderPlanDetail({ id: row.id, projectId: currentProject.value?.id }).then((res) => {
if (res.code == 200) { if (res.code == 200) {
detailData.value = res.data; detailData.value = res.data;
} }