+）现场监督页面晚上

src/views/xcjd/Supervise/components/api.ts

@@ -2,8 +2,8 @@ import { defHttp } from '/@/utils/http/axios';
 import { Modal } from 'ant-design-vue';
 
 enum Api {
-  list = '/qdgl/fxgkList', // 初步调查-分页列表查询(填报中、待受理、待评审、评审通过、评审不通过、评审中不待完善)
-  save = '/dkgl/gWrdkjbxxb/add',
+  list = '/xcjd/getDkhjdList',
+  getXcjdList = '/Soil/xcjd/getXcjdList',
   edit = '/dkgl/gWrdkjbxxb/edit',
   deleteOne = '/dkgl/gWrdkjbxxb/delete',
   deleteBatch = '/dkgl/gWrdkjbxxb/deleteBatch',
@@ -22,26 +22,9 @@ export const getImportUrl = Api.importExcel;
 /**
  * 列表接口
  * @param params
- * T1 填报中
- * DSL 待受理
- * T2 待评审
- * SH 评审通过
- * SHBTG 评审不通过
- * SHHDWS 评审后待完善
- * BPS 不评审
- * DKDTC 地块待退出
- * DKYTC 地块已退出
  */
-export const fillingList = (params) => defHttp.get({ url: Api.list + '?jdnzt=T1', params }); // 填报中
-export const acceptanceList = (params) => defHttp.get({ url: Api.list + '?jdnzt=DSL', params }); // 待受理
-export const reviewList = (params) => defHttp.get({ url: Api.list + '?jdnzt=T2', params }); // 待评审
-export const approvedList = (params) => defHttp.get({ url: Api.list + '?jdnzt=SH', params }); // 评审通过
-export const failedList = (params) => defHttp.get({ url: Api.list + '?jdnzt=SHBTG', params }); // 评审不通过
-export const noImprovedList = (params) => defHttp.get({ url: Api.list + '?jdnzt=BPS', params }); // 不评审
-export const improvedList = (params) => defHttp.get({ url: Api.list + '?jdnzt=SHHDWS', params }); // 评审中不待完善
-export const stayQuit = (params) => defHttp.get({ url: Api.list + '?jdnzt=DKDTC', params }); // 地块待退出
-export const finishQuit = (params) => defHttp.get({ url: Api.list + '?jdnzt=DKYTC', params }); // 地块已退出
-
+export const getDkhjdList = (params) => defHttp.get({ url: Api.list, params });
+export const getXcjdList = (params) => defHttp.get({ url: Api.getXcjdList, params });
 /**
  * 删除单个
  * @param params

src/views/xcjd/Supervise/components/data.ts

@@ -47,6 +47,10 @@ export const columns: BasicColumn[] = [
     title: '地块编码',
     dataIndex: 'wrdkbm',
   },
+  {
+    title: '监督管理标题',
+    dataIndex: 'jdglbt',
+  },
   {
     title: '市',
     dataIndex: 'cityName',
@@ -60,19 +64,11 @@ export const columns: BasicColumn[] = [
     dataIndex: 'hylb',
   },
   {
-    title: '政策依据',
-    dataIndex: 'faliYiju',
-  },
-  {
-    title: '地块类型',
-    dataIndex: 'dklx',
-  },
-  {
-    title: '更新时间',
-    dataIndex: 'createTsamp',
+    title: '最新监督管理日期',
+    dataIndex: 'jdglsj',
   },
   {
-    title: '登录帐号',
+    title: '监督管理状态',
     dataIndex: 'userId',
   },
 ];

src/views/xcjd/Supervise/components/formData.vue

@@ -12,7 +12,7 @@
     </div>
 </template>
   
-<script lang="ts" setup>
+<script lang="ts" name="xcjd-Supervise-LookData-form" setup>
 // import { dictName } from "/@/utils/domUtils";
 import { useRouter } from 'vue-router';
 import  roleTable  from "./roleTable.vue";

src/views/xcjd/Supervise/components/lookData.vue

 <template>
-  <div style="margin-top: 30px;">
+  <div style="width: 95%;margin:0 auto;margin-top: 30px;">
     <!--引用表格-->
-    <BasicTable @register="registerTable" :rowSelection="rowSelection">
+    <BasicTable @register="registerTable">
       <!--插槽:table标题-->
       <template #tableTitle>
         <a-button type="primary" @click="router.back()" v-auth="'dkdc-tbz-zltb'">返回</a-button>
@@ -15,13 +15,13 @@
   </div>
 </template>
   
-<script lang="ts" name="xcjd-xcjd-xcjd" setup>
+<script lang="ts" name="xcjd-Supervise-LookData" setup>
 import { BasicTable, TableAction, TableActionType } from '/@/components/Table';
 import { useListPage } from '/@/hooks/system/useListPage';
 import { useRouter, useRoute } from 'vue-router';
 import { useMessage } from '/@/hooks/web/useMessage';
 import { columns, searchFormSchema, useSuspectsData, useCategoryData } from './data';
-import { fillingList, getImportUrl, getExportUrl } from './api';
+import { getXcjdList, getImportUrl, getExportUrl } from './api';
 // import { useModal } from '/@/components/Modal';
 import { ref } from "vue";
 //注册model
@@ -29,19 +29,21 @@ import { ref } from "vue";
 // let isEdit = ref(true)
 let router = useRouter();
 let route = useRoute();
+const { createMessage } = useMessage();
 
 //注册table数据
 const { tableContext } = useListPage({
   tableProps: {
     title: '现场监督-现场监督-现场监督列表',
-    api: fillingList,
+    api: getXcjdList,
     columns,
     canResize: false,
     //定义rowSelection的类型，默认是checkbox多选，可以设置成radio单选
     rowKey: 'wrdkid',
-    rowSelection: { type: 'radio' },
-    clickToRowSelect: true,
+    // rowSelection: { type: 'radio' },
+    // clickToRowSelect: true,
     useSearchForm: false,
+    showIndexColumn: true,
     //   formConfig: {
     //     labelWidth: 120,
     //     schemas: searchFormSchema,
@@ -52,17 +54,16 @@ const { tableContext } = useListPage({
       width: 120,
       fixed: 'right'
     },
-  },
-  exportConfig: {
-    name: '风险管控-填报中',
-    url: getExportUrl,
-  },
-  importConfig: {
-    url: getImportUrl,
+    beforeFetch(params) {
+      if (route.query.wrdkid) {
+        params.wrdkid = route.query.wrdkid;
+      } else {
+        createMessage.error('内容错误，请返回重试')
+      }
+    },
   },
 });
 const [registerTable, { reload }, { rowSelection, selectedRowKeys }] = tableContext;
-// const { createMessage } = useMessage();
 //删除事件
 function handleDelete(record) {
   reload();

src/views/xcjd/Supervise/components/lookform.vue

@@ -62,7 +62,7 @@
 </div>
 </template>
   
-<script lang="ts" setup>
+<script lang="ts" name="xcjd-Supervise-LookData-look" setup>
 // import { dictName } from "/@/utils/domUtils";
 import { useRoute,useRouter } from 'vue-router';
 import { ref } from 'vue';

src/views/xcjd/Supervise/index.vue

 <template>
     <div>
       <!--引用表格-->
-      <BasicTable @register="registerTable" :rowSelection="rowSelection">
+      <BasicTable @register="registerTable" >
         <!-- 行业分类 -->
         <template #form-suspect="{ model, field }">
           <a-select v-model:value="model[field]" placeholder="请选择行业分类" :fieldNames="{ label: 'text', value: 'value' }"
@@ -27,13 +27,13 @@
     </div>
   </template>
   
-  <script lang="ts" name="xcjd-xcjd-xcjd" setup>
+  <script lang="ts" name="xcjd-Supervise" setup>
   import { BasicTable,TableAction,TableActionType } from '/@/components/Table';
   import { useListPage } from '/@/hooks/system/useListPage';
   import { useRouter } from 'vue-router';
   import { useMessage } from '/@/hooks/web/useMessage';
   import { columns, searchFormSchema, useSuspectsData, useCategoryData } from './components/data';
-  import { fillingList, getImportUrl, getExportUrl } from './components/api';
+  import { getDkhjdList } from './components/api';
   import { useModal } from '/@/components/Modal';
   let router = useRouter();
   
@@ -43,13 +43,14 @@
   const { tableContext } = useListPage({
     tableProps: {
       title: '现场监督-现场监督',
-      api: fillingList,
+      api: getDkhjdList,
       columns,
       canResize: false,
       //定义rowSelection的类型，默认是checkbox多选，可以设置成radio单选
       rowKey: 'wrdkid',
-      rowSelection: { type: 'radio' },
-      clickToRowSelect: true,
+      // rowSelection: { type: 'radio' },
+      showIndexColumn:true,
+      clickToRowSelect: false,
       formConfig: {
         labelWidth: 120,
         schemas: searchFormSchema,
@@ -61,40 +62,27 @@
         fixed:'right'
       },
     },
-    exportConfig: {
-      name: '风险管控-填报中',
-      url: getExportUrl,
-    },
-    importConfig: {
-      url: getImportUrl,
-    },
+    // exportConfig: {
+    //   name: '风险管控-填报中',
+    //   url: getExportUrl,
+    // },
+    // importConfig: {
+    //   url: getImportUrl,
+    // },
   });
   const isSuspectOptions = useSuspectsData().data; // 行业分类
   const useCategory = useCategoryData();
   const treeData = useCategory.data; // 行业类别-数据
   const changeSuspect = useCategory.changeIsSuspect; // 行业类别-方法
-  const [registerTable, { }, { rowSelection, selectedRowKeys }] = tableContext;
+  const [registerTable, { }, {  selectedRowKeys }] = tableContext;
   const { createMessage } = useMessage();
-  // 点击基本信息跳转
-  function skip() {
-    if (selectedRowKeys.value.length == 0) {
-      createMessage.info('请选择需要处理的内容，每次只能选中一条');
-      return
-    }
-    router.push(`/dkgl/fxgk/DetailList?wrdkid=${selectedRowKeys.value[0]}`)
-  }
   //编辑事件
    function handleEdit(record) {
-    router.push({path: `/xcjd/Supervise/LookData`,query:{id:11,scjdbm:'S2',type:'edit'}})
-    // openModal(true, {
-    //   record,
-    //   isUpdate: true,
-    //   showFooter: true,
-    // });
+    router.push({path: `/xcjd/Supervise/LookData`,query:{wrdkid:record.wrdkid,type:'edit'}})
   }
   // 查看事件
   function handleLook(record){
-    router.push({path: `/xcjd/Supervise/LookData`,query:{id:11,scjdbm:'S2',type:'look'}})
+    router.push({path: `/xcjd/Supervise/LookData`,query:{wrdkid:record.wrdkid,type:'look'}})
   }
     /**
    * 操作栏