diff --git a/.env.development b/.env.development index 16ed89f..3180e66 100644 --- a/.env.development +++ b/.env.development @@ -7,8 +7,12 @@ VITE_APP_ENV = 'development' # 开发环境 VITE_APP_BASE_API = 'http://192.168.110.180:8899' # 李陈杰 209 +<<<<<<< HEAD +VITE_APP_BASE_API = 'http://192.168.110.210:8899' +======= # VITE_APP_BASE_API = 'http://192.168.110.209:8899' +>>>>>>> 3e4b85fc48f6514704aee4b444285b90935b0cd2 # 曾涛 # 罗成 diff --git a/src/views/ctr/index.vue b/src/views/ctr/index.vue index 96f5c49..98b913d 100644 --- a/src/views/ctr/index.vue +++ b/src/views/ctr/index.vue @@ -24,7 +24,8 @@ - + @@ -37,17 +38,15 @@ - + - + @@ -61,35 +60,36 @@ - + - 选择招标 + 选择招标 - + + v-model="form.amount" placeholder="请输入合同金额" disabled /> - + @@ -208,7 +208,7 @@ const payRatioComputed = computed({ return total; }, // 只读 - set: () => {} + set: () => { } }); const checkContractType = (type) => { contract_type.value = type; @@ -280,7 +280,6 @@ const resetForm = () => { }; fileList.value = []; tempFileList.value = []; - contract_type.value = ''; setTimeout(() => { localStorage.removeItem('tempContractForm'); }, 0); @@ -399,6 +398,7 @@ const getInfoByProjectIdList = async () => { form.value.contractOwner = res.data.planDuration; }; onMounted(() => { + contract_type.value = ''; getInfoByProjectIdList(); const tempForm = localStorage.getItem('tempContractForm'); diff --git a/src/views/design/volumeCatalog/index.vue b/src/views/design/volumeCatalog/index.vue index 478716d..afc7deb 100644 --- a/src/views/design/volumeCatalog/index.vue +++ b/src/views/design/volumeCatalog/index.vue @@ -68,6 +68,7 @@ 查看文件 + @@ -171,8 +172,8 @@ - + + - - + + + + - - + + + + - + +