添加效果评估里面的地下水跟土壤以及新增用户加必填项限制

src/views/dkgl/gkpg/DetailList.vue

@@ -29,6 +29,7 @@
           "
           >查看基本信息</a-button
         >
+
         <template v-if="type == '填报'">
           <a-button type="primary" @click="filling" v-auth="'gkpg-tbz-zltb'">资料填报</a-button>
           <a-button type="primary" @click="add" v-auth="'gkpg-tbz-xzfa'">新增报告</a-button>

src/views/dkgl/gkpg/Exit.vue

@@ -30,7 +30,7 @@
       </template>
       <!--插槽:table标题-->
       <template #tableTitle>
-        <a-button type="primary" @click="skip('zltb')" v-auth="'gkpg-tbz-zltb'">查看报告列表</a-button>
+        <a-button type="primary" @click="skip('zltb')" v-auth="'gkpg-dkdtc-fa'">查看报告列表</a-button>
         <a-button type="primary" @click="skip('qrtc')" v-auth="'gkpg-dkdtc-qrtc'">确认退出</a-button>
         <a-button type="primary" @click="skip('thyps')" v-auth="'gkpg-dkdtc-thyps'">退回已评审</a-button>
       </template>

src/views/dkgl/gkpg/FillingInfor.vue

@@ -80,6 +80,22 @@
           :data="dsInfor.xgpg"
         />
         <template #extra><a-button type="primary" @click.prevent="addGKcs($event)" style="margin-left: 10px">保存</a-button></template>
+        <div
+          >士壤环境检测数据<span class="text-red ml-3">
+            [提示: 检测项编号请参考字典，点击
+            <a-button type="primary" @click.prevent="downloadFile('/upload/static/环境检测报告模板.xlsx', '士壤环境检测数据')">下载</a-button>
+            查看]</span
+          ></div
+        >
+        <PointInfor :data="{ wrdkid: dsInfor.wrdkjbxxb.wrdkid, pointType: 'solid', scjdbm: 'S6', faId: param.id }" />
+        <div
+          >地下水环境检测数据<span class="text-red">
+            [提示: 检测项编号请参考字典，点击
+            <a-button type="primary" @click.prevent="downloadFile('/upload/static/检测项编号字典表.xlsx', '地下水环境检测数据')">下载</a-button>
+            查看]</span
+          ></div
+        >
+        <PointInfor :data="{ wrdkid: dsInfor.wrdkjbxxb.wrdkid, pointType: 'water', scjdbm: 'S6', faId: param.id }" />
       </a-collapse-panel>
       <a-collapse-panel header="风险管控效果评估文件上传" :forceRender="true" key="150000">
         <CdUpload labelFirst="效果评估" :objec="[{ name: '公示截图' }, { name: '评估报告' }]" :data="dsInfor.xgpg" />
@@ -91,7 +107,7 @@
   </div>
 </template>
 <script lang="ts" setup>
-  import { ref } from 'vue';
+  import { ref, nextTick } from 'vue';
   import DkTable from '/@/components/customComponent/DkTable.vue';
   import suBainForm from '/@/components/customComponent/gkpg/pgReport.vue';
   import ControlInformation from '/@/components/customComponent/gkpg/csInfor.vue';
@@ -101,7 +117,8 @@
   import CdUpload from '/@/components/customComponent/CdUpload.vue';
   import { plotDetails, updateBzdw, updateJcdw, delBzdw, delJcdw, saveXgpg } from '/@/api/common/api';
   import { useRouter } from 'vue-router';
-  import { nextTick } from 'vue';
+  import PointInfor from '/@/components/customComponent/PointInfor.vue';
+  import { downloadFile } from '/@/utils/common/renderUtils';
 
   let router = useRouter();
   const { createMessage } = useMessage();

src/views/dkgl/gkpg/ViewDetail.vue

@@ -34,6 +34,22 @@
           </a-collapse-panel>
           <a-collapse-panel key="5" header="风险管控措施信息">
             <MeasureInfoTable :data="data.xgpg" labelFirst="风险管控效果评估" />
+            <div
+              >士壤环境检测数据<span class="text-red ml-3">
+                [提示: 检测项编号请参考字典，点击
+                <a-button type="primary" @click.prevent="downloadFile('/upload/static/环境检测报告模板.xlsx', '士壤环境检测数据')">下载</a-button>
+                查看]</span
+              ></div
+            >
+            <PointInfor type="view" :data="{ wrdkid: data.wrdkjbxxb.wrdkid, pointType: 'solid', scjdbm: 'S6', faId: param.id }" />
+            <div
+              >地下水环境检测数据<span class="text-red">
+                [提示: 检测项编号请参考字典，点击
+                <a-button type="primary" @click.prevent="downloadFile('/upload/static/检测项编号字典表.xlsx', '地下水环境检测数据')">下载</a-button>
+                查看]</span
+              ></div
+            >
+            <PointInfor type="view" :data="{ wrdkid: data.wrdkjbxxb.wrdkid, pointType: 'water', scjdbm: 'S6', faId: param.id }" />
           </a-collapse-panel>
           <a-collapse-panel key="6" header="风险管控效果评估文件上传">
             <CdUpload labelFirst="效果评估" :objec="[{ name: '公示截图' }, { name: '评估报告' }]" :data="data.xgpg" />
@@ -91,9 +107,10 @@
   import { useUserStore } from '/@/store/modules/user';
   import AdviceModal from '@/components/customComponent/AdviceModal.vue';
   import History from '@/components/customComponent/History.vue';
-
   import { useRouter } from 'vue-router';
   import { plotDetails } from '/@/api/common/api';
+  import PointInfor from '/@/components/customComponent/PointInfor.vue';
+  import { downloadFile } from '/@/utils/common/renderUtils';
 
   let router = useRouter(); // 注册路由
   const data = ref<any>({});
@@ -124,6 +141,7 @@
     const arrays = [data.value.bzdw, data.value.jcdw];
     for (let i = 0; i < arrays.length; i++) {
       arrays[i].forEach((el, index) => {
+        console.log(el);
         activeKey.value.push(prefixes[i] + index);
       });
     }

src/views/dkgl/gkxfpg/FillingInfor.vue

@@ -87,6 +87,22 @@
           :data="dsInfor.xgpg"
         />
         <template #extra><a-button type="primary" @click.prevent="addGKcs($event)" style="margin-left: 10px">保存</a-button></template>
+        <div
+          >士壤环境检测数据<span class="text-red ml-3">
+            [提示: 检测项编号请参考字典，点击
+            <a-button type="primary" @click.prevent="downloadFile('/upload/static/环境检测报告模板.xlsx', '士壤环境检测数据')">下载</a-button>
+            查看]</span
+          ></div
+        >
+        <PointInfor :data="{ wrdkid: dsInfor.wrdkjbxxb.wrdkid, pointType: 'solid', scjdbm: 'S6', faId: params.id }" />
+        <div
+          >地下水环境检测数据<span class="text-red">
+            [提示: 检测项编号请参考字典，点击
+            <a-button type="primary" @click.prevent="downloadFile('/upload/static/检测项编号字典表.xlsx', '地下水环境检测数据')">下载</a-button>
+            查看]</span
+          ></div
+        >
+        <PointInfor :data="{ wrdkid: dsInfor.wrdkjbxxb.wrdkid, pointType: 'water', scjdbm: 'S6', faId: params.id }" />
       </a-collapse-panel>
       <a-collapse-panel header="管控及修复效果评估文件上传" :forceRender="true" key="150000">
         <CdUpload ref="chilrenReportxx" labelFirst="效果评估" :objec="[{ name: '公示截图' }, { name: '评估报告' }]" :data="dsInfor.xgpg" />
@@ -98,7 +114,7 @@
   </div>
 </template>
 <script lang="ts" setup>
-  import { ref } from 'vue';
+  import { ref, nextTick } from 'vue';
   import DkTable from '/@/components/customComponent/DkTable.vue';
   import suBainForm from '/@/components/customComponent/gkpg/pgReport.vue';
   import ControlInformation from '/@/components/customComponent/gkpg/csInfor.vue';
@@ -108,7 +124,8 @@
   import { useMessage } from '/@/hooks/web/useMessage';
   import { plotDetails, updateBzdw, updateJcdw, delBzdw, delJcdw, saveXgpg } from '/@/api/common/api';
   import { useRouter } from 'vue-router';
-  import { nextTick } from 'vue';
+  import PointInfor from '/@/components/customComponent/PointInfor.vue';
+  import { downloadFile } from '/@/utils/common/renderUtils';
 
   let router = useRouter();
   const saveFlg = ref(true);

src/views/dkgl/gkxfpg/ViewDetail.vue

@@ -34,6 +34,22 @@
           </a-collapse-panel>
           <a-collapse-panel key="5" header="管控及修复措施信息">
             <MeasureInfoTable :data="data.xgpg" labelFirst="风险管控及修复效果评估" />
+            <div
+              >士壤环境检测数据<span class="text-red ml-3">
+                [提示: 检测项编号请参考字典，点击
+                <a-button type="primary" @click.prevent="downloadFile('/upload/static/环境检测报告模板.xlsx', '士壤环境检测数据')">下载</a-button>
+                查看]</span
+              ></div
+            >
+            <PointInfor type="view" :data="{ wrdkid: data.wrdkjbxxb.wrdkid, pointType: 'solid', scjdbm: 'S6', faId: param.id }" />
+            <div
+              >地下水环境检测数据<span class="text-red">
+                [提示: 检测项编号请参考字典，点击
+                <a-button type="primary" @click.prevent="downloadFile('/upload/static/检测项编号字典表.xlsx', '地下水环境检测数据')">下载</a-button>
+                查看]</span
+              ></div
+            >
+            <PointInfor type="view" :data="{ wrdkid: data.wrdkjbxxb.wrdkid, pointType: 'water', scjdbm: 'S6', faId: param.id }" />
           </a-collapse-panel>
           <a-collapse-panel key="6" header="地块边界文件">
             <!-- <dkbjfileUpload labelFirst="风险" /> -->
@@ -94,6 +110,8 @@
   import { useUserStore } from '/@/store/modules/user';
   import AdviceModal from '@/components/customComponent/AdviceModal.vue';
   import History from '@/components/customComponent/History.vue';
+  import PointInfor from '/@/components/customComponent/PointInfor.vue';
+  import { downloadFile } from '/@/utils/common/renderUtils';
 
   let router = useRouter(); // 注册路由
   const data = ref<any>({});
@@ -124,6 +142,7 @@
     const arrays = [data.value.bzdw, data.value.jcdw];
     for (let i = 0; i < arrays.length; i++) {
       arrays[i].forEach((el, index) => {
+        console.log(el);
         activeKey.value.push(prefixes[i] + index);
       });
     }

src/views/dkgl/xfpg/FillingInfor.vue

@@ -74,6 +74,22 @@
           :data="dsInfor.xgpg"
         />
         <template #extra><a-button type="primary" @click.prevent="addGKcs($event)">保存</a-button></template>
+        <div
+          >士壤环境检测数据<span class="text-red ml-3">
+            [提示: 检测项编号请参考字典，点击
+            <a-button type="primary" @click.prevent="downloadFile('/upload/static/环境检测报告模板.xlsx', '士壤环境检测数据')">下载</a-button>
+            查看]</span
+          ></div
+        >
+        <PointInfor :data="{ wrdkid: dsInfor.wrdkjbxxb.wrdkid, pointType: 'solid', scjdbm: 'S6', faId: param.id }" />
+        <div
+          >地下水环境检测数据<span class="text-red">
+            [提示: 检测项编号请参考字典，点击
+            <a-button type="primary" @click.prevent="downloadFile('/upload/static/检测项编号字典表.xlsx', '地下水环境检测数据')">下载</a-button>
+            查看]</span
+          ></div
+        >
+        <PointInfor :data="{ wrdkid: dsInfor.wrdkjbxxb.wrdkid, pointType: 'water', scjdbm: 'S6', faId: param.id }" />
       </a-collapse-panel>
       <a-collapse-panel header="修复文件上传" :forceRender="true" key="150000">
         <CdUpload labelFirst="效果评估" :objec="[{ name: '公示截图' }, { name: '修复方案' }]" :data="dsInfor.xgpg" />
@@ -85,7 +101,7 @@
   </div>
 </template>
 <script lang="ts" setup>
-  import { ref } from 'vue';
+  import { ref ,nextTick} from 'vue';
   import { useMessage } from '/@/hooks/web/useMessage';
   import DkTable from '/@/components/customComponent/DkTable.vue';
   import suBainForm from '/@/components/customComponent/gkpg/pgReport.vue';
@@ -95,7 +111,8 @@
   import CdUpload from '/@/components/customComponent/CdUpload.vue';
   import { plotDetails, updateBzdw, updateJcdw, delBzdw, delJcdw, saveXgpg } from '/@/api/common/api';
   import { useRouter } from 'vue-router';
-  import { nextTick } from 'vue';
+  import PointInfor from '/@/components/customComponent/PointInfor.vue';
+  import { downloadFile } from '/@/utils/common/renderUtils';
 
   let router = useRouter();
   const { createMessage } = useMessage();

src/views/dkgl/xfpg/ViewDetail.vue

@@ -35,6 +35,22 @@
           </a-collapse-panel>
           <a-collapse-panel header="修复措施信息" key="8">
             <MeasureInfoTable :data="data.xgpg" labelFirst="修复效果评估" />
+            <div
+              >士壤环境检测数据<span class="text-red ml-3">
+                [提示: 检测项编号请参考字典，点击
+                <a-button type="primary" @click.prevent="downloadFile('/upload/static/环境检测报告模板.xlsx', '士壤环境检测数据')">下载</a-button>
+                查看]</span
+              ></div
+            >
+            <PointInfor type="view" :data="{ wrdkid: data.wrdkjbxxb.wrdkid, pointType: 'solid', scjdbm: 'S6', faId: param.id }" />
+            <div
+              >地下水环境检测数据<span class="text-red">
+                [提示: 检测项编号请参考字典，点击
+                <a-button type="primary" @click.prevent="downloadFile('/upload/static/检测项编号字典表.xlsx', '地下水环境检测数据')">下载</a-button>
+                查看]</span
+              ></div
+            >
+            <PointInfor type="view" :data="{ wrdkid: data.wrdkjbxxb.wrdkid, pointType: 'water', scjdbm: 'S6', faId: param.id }" />
           </a-collapse-panel>
           <a-collapse-panel header="地块边界文件" key="9">
             <CdUpload labelFirst="效果评估" :objec="[{ name: '公示截图' }, { name: '修复方案' }]" :data="data.xgpg" />
@@ -94,6 +110,8 @@
   import { useUserStore } from '/@/store/modules/user';
   import AdviceModal from '@/components/customComponent/AdviceModal.vue';
   import History from '@/components/customComponent/History.vue';
+  import PointInfor from '/@/components/customComponent/PointInfor.vue';
+  import { downloadFile } from '/@/utils/common/renderUtils';
 
   let router = useRouter(); // 注册路由
   const data = ref<any>({});
@@ -126,6 +144,7 @@
     const arrays = [data.value.bzdw, data.value.jcdw];
     for (let i = 0; i < arrays.length; i++) {
       arrays[i].forEach((el, index) => {
+        console.log(el);
         activeKey.value.push(prefixes[i] + index);
       });
     }

src/views/system/user/user.data.ts

@@ -101,14 +101,14 @@ export const searchFormSchema: FormSchema[] = [
     field: 'userIdentity',
     colProps: { span: 6 },
     component: 'ApiSelect',
-    componentProps: ({  }) => {
+    componentProps: ({ }) => {
       {
         return {
           api: dict,
           params: { key: 'user_levle' },
           labelField: 'text',
           valueField: 'value',
-    
+
         }
       }
     }
@@ -125,7 +125,7 @@ export const searchFormSchema: FormSchema[] = [
     },
     colProps: { span: 6 },
   },
-  
+
   {
     label: '用户状态',
     field: 'status',
@@ -144,11 +144,11 @@ export const searchFormSchema: FormSchema[] = [
     colProps: { span: 6 },
     componentProps: ({ formModel, formActionType }) => {
       {
-   
+
         return {
           url: '/sys/api/tree/xzbm',
           isdisabled: formModel.userIdentity,
-          value:'440000'
+          value: '440000'
         }
       }
     }
@@ -199,8 +199,8 @@ export const formSchema: FormSchema[] = [
     label: '角色',
     field: 'selectedroles',
     component: 'ApiSelect',
+    required: true,
     componentProps: {
-      mode: 'multiple',
       api: '',
       labelField: 'roleName',
       valueField: 'id',
@@ -257,6 +257,7 @@ export const formSchema: FormSchema[] = [
     label: '用户等级',
     field: 'userIdentity',
     component: 'ApiSelect',
+    required: true,
     componentProps: ({ formModel, formActionType }) => {
       {
         return {
@@ -283,12 +284,13 @@ export const formSchema: FormSchema[] = [
   {
     label: '行政区划',
     field: 'codeRegion',
+    required: true,
     component: 'JTreeSelect',
     componentProps: ({ formModel, formActionType }) => {
-      console.log(formModel.codeRegion,'44444')
+      console.log(formModel.codeRegion, '44444')
       {
         return {
-          url:'/sys/api/tree/xzbm',
+          url: '/sys/api/tree/xzbm',
           isdisabled: formModel.userIdentity
         }
       }
@@ -298,6 +300,7 @@ export const formSchema: FormSchema[] = [
   {
     label: '用户类型',
     field: 'userType',
+    required: true,
     component: 'ApiSelect',
     componentProps: {
       api: dict,
@@ -534,7 +537,7 @@ export const userTenantFormSchema: FormSchema[] = [
 
 // 获取用户类型以及用户等级
 const uerType = ref()
-const userLevle= ref()
+const userLevle = ref()
 async function getUSER() {
   uerType.value = await dict({ key: 'dk_user_type' })
   userLevle.value = await dict({ key: 'user_levle' })