调整表单

src/views/achievement/goalTimes/index.vue

@@ -29,21 +29,21 @@
       key: 'date',
       title: '时期',
     },
-    {
+    // {
-      dataIndex: 'planProject',
+    //   dataIndex: 'planProject',
-      key: 'planProject',
+    //   key: 'planProject',
-      title: '规划项目',
+    //   title: '规划项目',
-    },
+    // },
-    {
+    // {
-      dataIndex: 'actualProject',
+    //   dataIndex: 'actualProject',
-      key: 'actualProject',
+    //   key: 'actualProject',
-      title: '实际实施项目',
+    //   title: '实际实施项目',
-    },
+    // },
-    {
+    // {
-      dataIndex: 'projectPercent',
+    //   dataIndex: 'projectPercent',
-      key: 'projectPercent',
+    //   key: 'projectPercent',
-      title: '实施率',
+    //   title: '实施率',
-    },
+    // },
     {
       dataIndex: 'planInvest',
       key: 'planInvest',

src/views/pollution/manage/index.vue

@@ -144,9 +144,20 @@
                   </a-form-item>
                 </a-col>
               </a-row>
-              <div class="title">项目类别填报</div>
+              <div class="title">项目类别</div>
               <a-row>
                 <a-col :span="12">
+                  <a-form-item label="项目类别" name="projectTypeList">
+                    <a-cascader
+                      v-model:value="projectType.projectTypeList"
+                      :options="projectTypeListOptions"
+                      placeholder="请选择"
+                      style="width: 360px"
+                      allowClear
+                    />
+                  </a-form-item>
+                </a-col>
+                <!-- <a-col :span="12">
                   <a-form-item label="城镇污水处理及配套" name="cityFomula">
                     <a-select
                       v-model:value="projectType.cityFomula"
@@ -209,7 +220,7 @@
                       allowClear
                     />
                   </a-form-item>
-                </a-col>
+                </a-col> -->
               </a-row>
               <div class="title">项目技术应用</div>
               <a-row>
@@ -353,12 +364,12 @@
                   </a-form-item>
                 </a-col>
                 <a-col :span="12">
-                  <a-form-item label="目标实现" name="goal">
+                  <a-form-item label="目标实现(%)" name="goal">
                     <a-input
                       v-model:value="projectType.goal"
                       style="width: 360px"
                       allowClear
-                      placeholder="百分制,例如80%"
+                      placeholder="百分制,例如80"
                     />
                   </a-form-item>
                 </a-col>
@@ -397,7 +408,7 @@
                   </a-form-item>
                 </a-col>
                 <a-col :span="12">
-                  <a-form-item label="COD削减量(吨)" name="cod">
+                  <a-form-item label="COD削减率(%)" name="cod">
                     <a-input
                       v-model:value="projectType.cod"
                       style="width: 360px"
@@ -409,7 +420,7 @@
               </a-row>
               <a-row>
                 <a-col :span="12">
-                  <a-form-item label="TN削减量(吨)" name="tn">
+                  <a-form-item label="TN削减(%)" name="tn">
                     <a-input
                       v-model:value="projectType.tn"
                       style="width: 360px"
@@ -419,7 +430,7 @@
                   </a-form-item>
                 </a-col>
                 <a-col :span="12">
-                  <a-form-item label="TP削减量(吨)" name="tp">
+                  <a-form-item label="TP削减率(%)" name="tp">
                     <a-input
                       v-model:value="projectType.tp"
                       style="width: 360px"
@@ -436,7 +447,7 @@
           </a-tab-pane>
           <a-tab-pane key="2" tab="项目前期立项">
             <div v-for="item in earlySet" :key="item.id" style="margin-bottom: 20px">
-              <span style=" right: 20px;margin: 10px 10px 10px 0">{{ item.name }}</span>
+              <span style="right: 20px; margin: 10px 10px 10px 0">{{ item.name }}</span>
               <a-upload action="https://www.mocky.io/v2/5cc8019d300000980a055e76" :max-count="1">
                 <a-button>
                   <upload-outlined />
@@ -447,7 +458,7 @@
           </a-tab-pane>
           <a-tab-pane key="3" tab="联合体招投标">
             <div v-for="item in unitedTenders" :key="item.id" style="margin-bottom: 20px">
-              <span style=" right: 20px;margin: 10px 10px 10px 0">{{ item.name }}</span>
+              <span style="right: 20px; margin: 10px 10px 10px 0">{{ item.name }}</span>
               <a-upload action="https://www.mocky.io/v2/5cc8019d300000980a055e76" :max-count="1">
                 <a-button>
                   <upload-outlined />
@@ -458,7 +469,7 @@
           </a-tab-pane>
           <a-tab-pane key="4" tab="建设实施">
             <div v-for="item in buildEffect" :key="item.id" style="margin-bottom: 20px">
-              <span style=" right: 20px;margin: 10px 10px 10px 0">{{ item.name }}</span>
+              <span style="right: 20px; margin: 10px 10px 10px 0">{{ item.name }}</span>
               <a-upload action="https://www.mocky.io/v2/5cc8019d300000980a055e76" :max-count="1">
                 <a-button>
                   <upload-outlined />
@@ -469,7 +480,7 @@
           </a-tab-pane>
           <a-tab-pane key="5" tab="验收批复">
             <div v-for="item in acceptApproval" :key="item.id" style="margin-bottom: 20px">
-              <span style=" right: 20px;margin: 10px 10px 10px 0">{{ item.name }}</span>
+              <span style="right: 20px; margin: 10px 10px 10px 0">{{ item.name }}</span>
               <a-upload action="https://www.mocky.io/v2/5cc8019d300000980a055e76" :max-count="1">
                 <a-button>
                   <upload-outlined />
@@ -480,7 +491,7 @@
           </a-tab-pane>
           <a-tab-pane key="6" tab="运营管护">
             <div v-for="item in operationProtect" :key="item.id" style="margin-bottom: 20px">
-              <span style=" right: 20px;margin: 10px 10px 10px 0">{{ item.name }}</span>
+              <span style="right: 20px; margin: 10px 10px 10px 0">{{ item.name }}</span>
               <a-upload action="https://www.mocky.io/v2/5cc8019d300000980a055e76" :max-count="1">
                 <a-button>
                   <upload-outlined />
@@ -514,12 +525,13 @@
     district: '',
     controlArea: '',
     riverBasin: '',
-    cityFomula: '',
+    projectTypeList: [],
-    riverDeal: '',
+    // cityFomula: '',
-    villageFomula: '',
+    // riverDeal: '',
-    waterProtect: '',
+    // villageFomula: '',
-    internalDeal: '',
+    // waterProtect: '',
-    overall: '',
+    // internalDeal: '',
+    // overall: '',
     projectTech: '',
     techName: '',
     techCost: '',
@@ -602,56 +614,134 @@
   ];
   const cityFomulaOptions = [
     {
-      value: 'a',
+      value: '城镇污水处理及配套',
       label: '城镇污水处理及配套',
     },
     {
-      value: 'b',
+      value: '排水系统完善建设',
       label: '排水系统完善建设',
     },
     {
-      value: 'c',
+      value: '城镇生活垃圾处理收集',
       label: '城镇生活垃圾处理收集',
     },
   ];
   const riverDealOptions = [
     {
-      value: 'a',
+      value: '生态修复、河道清淤、沿河截污',
       label: '生态修复、河道清淤、沿河截污',
     },
   ];
   const villageFomulaOptions = [
     {
-      value: 'a',
+      value: '农村污水治理',
       label: '农村污水治理',
     },
     {
-      value: 'b',
+      value: '农业面源治理',
       label: '农业面源治理',
     },
   ];
   const waterProtectOptions = [
     {
-      value: 'a',
+      value: '饮用水源保护',
       label: '饮用水源保护',
     },
   ];
   const internalDealOptions = [
     {
-      value: 'a',
+      value: '内源治理',
       label: '内源治理',
     },
   ];
   const overallOptions = [
     {
-      value: 'a',
+      value: '水资源综合利用',
       label: '水资源综合利用',
     },
     {
-      value: 'b',
+      value: '水资源调度',
       label: '水资源调度',
     },
   ];
+  const projectTypeListOptions = [
+    {
+      value: '城镇污水处理及配套',
+      label: '城镇污水处理及配套',
+      children: [
+        {
+          value: '城镇污水处理及配套',
+          label: '城镇污水处理及配套',
+        },
+        {
+          value: '排水系统完善建设',
+          label: '排水系统完善建设',
+        },
+        {
+          value: '城镇生活垃圾处理收集',
+          label: '城镇生活垃圾处理收集',
+        },
+      ],
+    },
+    {
+      value: '河道整治',
+      label: '河道整治',
+      children: [
+        {
+          value: '生态修复、河道清淤、沿河截污',
+          label: '生态修复、河道清淤、沿河截污',
+        },
+      ],
+    },
+    {
+      value: '农业农村面源污染治理',
+      label: '农业农村面源污染治理',
+      children: [
+        {
+          value: '农村污水治理',
+          label: '农村污水治理',
+        },
+        {
+          value: '农业面源治理',
+          label: '农业面源治理',
+        },
+      ],
+    },
+    {
+      value: '饮用水源地保护建设',
+      label: '饮用水源地保护建设',
+      children: [
+        {
+          value: '饮用水源保护',
+          label: '饮用水源保护',
+        },
+      ],
+    },
+    {
+      value: '内源治理',
+      label: '内源治理',
+      children: [
+        {
+          value: '内源治理',
+          label: '内源治理',
+        },
+      ],
+    },
+    {
+      value: '水资源综合利用及调度',
+      label: '水资源综合利用及调度',
+      children: [
+        {
+          value: '水资源综合利用',
+          label: '水资源综合利用',
+        },
+        {
+          value: '水资源调度',
+          label: '水资源调度',
+        },
+      ],
+    },
+  ];
   const projectTechOptions = [
     {
       value: '水环境监测预警与管理技术',