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 @@ - + + 查看单据 - - + + + + 审核查看单据 - - + + + + 下载 - + + @@ -699,6 +700,7 @@ onUnmounted(() => { border-collapse: collapse; //合并为一个单一的边框 border-color: rgba(199, 199, 199, 1); //边框颜色按实际自定义即可 } + thead { tr { th { @@ -708,16 +710,19 @@ onUnmounted(() => { letter-spacing: 5px; padding: 15px; } + td { text-align: left; height: 35px; //设置单元格最小高度 padding: 15px; } + .th-bg { background-color: rgba(247, 247, 247, 1); } } } + tbody { tr { td { @@ -725,6 +730,7 @@ onUnmounted(() => { height: 40px; //设置单元格最小高度 padding: 15px; } + th { height: 35px; //设置单元格最小高度 text-align: center; @@ -733,6 +739,7 @@ onUnmounted(() => { } } } + .table-content { box-shadow: 0px 0px 10px #ddd; padding: 20px; diff --git a/src/views/formalities/formalitiesAreConsolidated/index.vue b/src/views/formalities/formalitiesAreConsolidated/index.vue index 834f4cd..841f2d8 100644 --- a/src/views/formalities/formalitiesAreConsolidated/index.vue +++ b/src/views/formalities/formalitiesAreConsolidated/index.vue @@ -1,6 +1,7 @@ - + @@ -11,25 +12,15 @@ --> - + - + @@ -101,51 +95,52 @@ - 查看 + + + + + 查看 + + + + + + + + - 修改 - 上传 - 修改状态 + v-hasPermi="['formalities:formalitiesAreConsolidated:edit']">修改 + 上传 + 修改状态 - + - + - + @@ -167,7 +162,8 @@ - + {{ scope.row.fileName || '查看文件' }} @@ -178,13 +174,8 @@ - + 关闭 @@ -194,18 +185,9 @@ - + @@ -233,21 +215,19 @@ - + - + + + @@ -268,7 +248,8 @@ - + diff --git a/src/views/formalities/listOfFormalities/index.vue b/src/views/formalities/listOfFormalities/index.vue index 5bcd5b9..fa8c725 100644 --- a/src/views/formalities/listOfFormalities/index.vue +++ b/src/views/formalities/listOfFormalities/index.vue @@ -1,7 +1,9 @@ - + - + @@ -21,22 +23,24 @@ - 新增 + 新增 - 确认 + 确认 - + - +