diff --git a/src/views/goverment/huizhou/progressManagement/planFinishSituation/components/transformInfo1.vue b/src/views/goverment/huizhou/progressManagement/planFinishSituation/components/transformInfo1.vue index 6ff745c..dd9c210 100644 --- a/src/views/goverment/huizhou/progressManagement/planFinishSituation/components/transformInfo1.vue +++ b/src/views/goverment/huizhou/progressManagement/planFinishSituation/components/transformInfo1.vue @@ -16,12 +16,12 @@ :data="recordData" class="el-table" :span-method="arraySpanMethod" - :row-style="{ height: '40px' }" - :header-cell-style="{ height: '40px' }" - :cell-style="{ height: '40px' }" + :row-style="{ textAlign: 'center', height: '40px' }" + :header-cell-style="{ textAlign: 'center', height: '40px' }" + :cell-style="{ textAlign: 'center', height: '40px' }" > - + - - - + + + diff --git a/src/views/goverment/huizhou/progressManagement/planFinishSituation/index.vue b/src/views/goverment/huizhou/progressManagement/planFinishSituation/index.vue index 92ee5cf..e10d1a1 100644 --- a/src/views/goverment/huizhou/progressManagement/planFinishSituation/index.vue +++ b/src/views/goverment/huizhou/progressManagement/planFinishSituation/index.vue @@ -45,6 +45,9 @@ + diff --git a/src/views/goverment/huizhou/projectMonitoring/projectApproval/components/ProjectSupervision/overview.vue b/src/views/goverment/huizhou/projectMonitoring/projectApproval/components/ProjectSupervision/overview.vue index 7d209a0..17acb3d 100644 --- a/src/views/goverment/huizhou/projectMonitoring/projectApproval/components/ProjectSupervision/overview.vue +++ b/src/views/goverment/huizhou/projectMonitoring/projectApproval/components/ProjectSupervision/overview.vue @@ -247,7 +247,7 @@ diff --git a/src/views/goverment/huizhou/projectMonitoring/projectApproval/components/readonlyDialog/index.vue b/src/views/goverment/huizhou/projectMonitoring/projectApproval/components/readonlyDialog/index.vue index 533731d..a8a1206 100644 --- a/src/views/goverment/huizhou/projectMonitoring/projectApproval/components/readonlyDialog/index.vue +++ b/src/views/goverment/huizhou/projectMonitoring/projectApproval/components/readonlyDialog/index.vue @@ -145,7 +145,8 @@ @@ -159,6 +160,14 @@ + @@ -203,9 +212,10 @@
@@ -224,6 +234,15 @@ + +
@@ -234,7 +253,7 @@ @@ -261,7 +280,7 @@ @@ -350,7 +369,6 @@ onMounted(async () => { // background-color: #fff; flex: 1; .form { - background-color: #fff; padding: 40px 12% 0 8%; .row { display: flex; @@ -421,7 +439,6 @@ onMounted(async () => { display: flex; flex-direction: column; padding: 2% 8% 0 6%; - background-color: #fff; h4 { position: relative; padding-left: 6px; @@ -445,6 +462,8 @@ onMounted(async () => { .littleTitle { border-left: 3px solid #008bff; padding-left: 6px; + color: var(--el-menu-text-color); + font-size: 20px; } .form { padding: 2% 14% 0 8%; @@ -467,7 +486,7 @@ onMounted(async () => { width: 33.33%; text-align: center; // background: #fff; - color: #333; + color: var(--el-menu-text-color); font-size: 16px; border: 1px solid #aeaeae; @@ -475,7 +494,7 @@ onMounted(async () => { } .el-tabs__item.is-active { background-color: #008bff; - color: #fff; + color: var(--el-menu-text-color); font-size: 16px; } } diff --git a/src/views/goverment/huizhou/projectMonitoring/projectApproval/index.vue b/src/views/goverment/huizhou/projectMonitoring/projectApproval/index.vue index 996fe05..b77e5ff 100644 --- a/src/views/goverment/huizhou/projectMonitoring/projectApproval/index.vue +++ b/src/views/goverment/huizhou/projectMonitoring/projectApproval/index.vue @@ -40,6 +40,12 @@ > + + @@ -52,6 +58,7 @@ import { ColumnProps } from "@/components/ProTable/interface"; import ProTable from "@/components/ProTable/index.vue"; import ProjectSupervision from "./components/ProjectSupervision/index.vue"; import readonlyDialog from "./components/readonlyDialog/index.vue"; +import editDialog from "./components/editDialog/index.vue"; import { getEngineeringApproveList, getEngineeringApproveArea, @@ -126,29 +133,20 @@ const columns: ColumnProps[] = [ const relativeId = ref(""); const detailsDialog = ref(false); const approvalTitle = ref(""); +const childrenDataUpdate = () => { + console.log(666); + proTable.value.getTableList(); +}; // 获取 ProTable 元素,调用其获取刷新数据方法(还能获取到当前查询参数,方便导出携带参数) const proTable = ref(); -const onSee = async row => { +const onSee = row => { relativeId.value = row.id; ennMEssageVisible.value = true; }; -const onEdit = async row => { - // 标记 - const data1 = await getIdEngApprovettable({ id: row.id }); - editProjectName.value = data1.result.projectName; - - const data = await getDicList({ dictType: "engineering_type" }); - engineeringTypeOptions.value = data.result; - const res = await getDicList({ dictType: "engineering_purpose" }); //工程用途 - engineeringPurpose.value = res.result; - addressList.value = { - province: row.province, - city: row.city, - district: row.district - }; +const onEdit = row => { + relativeId.value = row.id; editennMEssageVisible.value = true; - editFormData.value = reactive({ ...row }); }; const getDicStatusList = async () => { const { result } = await getDicList({ dictType: "engineering_state" });