111

src/router/moduleRoutes.js

@@ -1,4 +1,4 @@
-import { h } from 'vue';
+import { h } from 'vue';
 import { RouterView } from 'vue-router';
 import { name } from '../../package.json';
 

src/views/PblmRectify/xjdw_index.vue

@@ -1,4 +1,4 @@
-<template>
+<template>
   <div>
     <a-tabs v-model="activatedTab" type="card" style="height: 100%;">
       <a-tab-pane v-for="tab in tabsForXjdw" :key="tab.value" :tab="tab.label">

src/views/duChaJiHua/addNewNyProCom.vue

@@ -105,6 +105,7 @@
 </template>
 
 <script>
+import { Modal } from 'ant-design-vue';
 import request from '../../utils/gw_ajax_request';
 export default {
   data() {
@@ -185,7 +186,7 @@ export default {
         return;
       }
       try {
-        this.$confirm({
+        Modal.confirm({
           title: '提示',
           content: '确认保存基础信息？?',
           okType: 'warning',
@@ -315,7 +316,7 @@ export default {
 };
 </script>
 
-<style lang="less" scoped>
+<style scoped>
 :deep(form .ant-select) {
   width: 40%;
 }

src/views/duChaJiHua/adjustment.vue

@@ -92,6 +92,7 @@
 </template>
 
 <script>
+import { Modal } from 'ant-design-vue';
 import { Base64 } from 'js-base64';
 import { deleteFileById } from '../../api/duChaAPI.js';
 import { fileUrl, hostUrl, previewUrl } from '../../utils/global_variable.js';
@@ -261,7 +262,7 @@ export default {
     },
     // 删除多媒体文件
     removeFile(id, index) {
-      this.$confirm({
+      Modal.confirm({
         title: '提示',
         content: '此操作将永久删除该文件, 是否继续?',
         okType: 'warning',
@@ -280,7 +281,7 @@ export default {
 };
 </script>
 
-<style lang='less' scoped>
+<style scoped>
 // .ant-carousel>>>.slick-slide {
 //   text-align: center;
 //   height: 160px;

src/views/duChaJiHua/countyzhdcjh.vue

@@ -53,7 +53,7 @@ export default {
 };
 </script>
 
-<style lang='less' scoped>
+<style scoped>
 .content_title {
   span {
     padding: 0 10px;

src/views/duChaJiHua/dataApprove copy.vue

@@ -1,4 +1,4 @@
-<template>
+<template>
   <a-layout>
     <a-layout-content>
       <div class="page" style="display: flex;background-color: #fff;">
@@ -143,6 +143,7 @@
 </template>
 
 <script>
+import { Modal } from 'ant-design-vue';
 import { curAdcode_long } from '../../utils/global_variable';
 import request from '../../utils/gw_ajax_request.js';
 import { dateFormat } from '../../utils/gw_date.js';
@@ -246,9 +247,7 @@ export default {
         selectedRowKeys: this.selectedRowKeys,
         onChange: this.handleSelectionChange,
         getCheckboxProps: (record) => ({
-          props: {
-            disabled: record.button === false,
-          },
+          disabled: record.button === false,
         }),
       };
     },
@@ -331,7 +330,7 @@ export default {
           auditWay: type,
         });
       });
-      this.$confirm({
+      Modal.confirm({
         title: '提示',
         content: `确认要批量${type == '1' ? '同意' : '驳回'}, 是否继续?`,
         okType: 'warning',
@@ -348,7 +347,8 @@ export default {
                 this.searchPlan();
               }
             });
-        },
+                  return Promise.resolve();
+},
         onCancel: () => {
           this.isLoadingBtn = false;
           this.$message.info('已取消删除');
@@ -433,7 +433,7 @@ export default {
 };
 </script>
 
-<style lang='less' scoped>
+<style scoped>
 .active {
    background: #00b0f0;
    color: white;

src/views/duChaJiHua/dataApprove.vue

@@ -1,4 +1,4 @@
-<template>
+<template>
   <a-layout>
     <a-layout-content>
       <div class="page" style="display: flex;background-color: #fff;">
@@ -150,6 +150,7 @@
 </template>
 
 <script>
+import { Modal } from 'ant-design-vue';
 import { curAdcode_long } from '../../utils/global_variable';
 import request from '../../utils/gw_ajax_request.js';
 import { dateFormat } from '../../utils/gw_date.js';
@@ -267,9 +268,7 @@ export default {
         selectedRowKeys: this.selectedRowKeys,
         onChange: this.handleSelectionChange,
         getCheckboxProps: (record) => ({
-          props: {
-            disabled: record.button === false,
-          },
+          disabled: record.button === false,
         }),
       };
     },
@@ -416,7 +415,7 @@ export default {
           auditWay: type,
         });
       });
-      this.$confirm({
+      Modal.confirm({
         title: '提示',
         content: `确认要批量${type == '1' ? '同意' : '驳回'}, 是否继续?`,
         okType: 'warning',
@@ -433,7 +432,8 @@ export default {
                 this.searchPlan();
               }
             });
-        },
+                  return Promise.resolve();
+},
         onCancel: () => {
           this.isLoadingBtn = false;
           this.$message.info('已取消删除');
@@ -492,7 +492,7 @@ export default {
 };
 </script>
 
-<style lang='less' scoped>
+<style scoped>
 .active {
    background: #00b0f0;
    color: white;

src/views/duChaJiHua/dczcjh.vue

@@ -163,6 +163,7 @@
 </template>
 
 <script>
+import { Modal } from 'ant-design-vue';
 import moment from 'moment';
 import { deleteFileById } from '../../api/duChaAPI';
 import {
@@ -415,7 +416,7 @@ export default {
       }
     },
     deleteRow(id) {
-      this.$confirm({
+      Modal.confirm({
         title: '提示',
         content: '此操作将计划从列表中删除，确认删除该计划吗？',
         okType: 'warning',
@@ -494,7 +495,7 @@ export default {
         });
     },
     removeFile(id) {
-      this.$confirm({
+      Modal.confirm({
         title: '提示',
         content: '此操作将永久删除该文件, 是否继续?',
         okType: 'warning',
@@ -675,7 +676,7 @@ export default {
 };
 </script>
 
-<style lang='less' scoped>
+<style scoped>
 /deep/ .ant-layout-sider,
 /deep/ .ant-layout-header,
 /deep/ .ant-layout-content {

src/views/duChaJiHua/editDcdxInfo.vue

@@ -124,7 +124,7 @@
             :data-source="currentShowList"
             @change="handleCurrentChange"
             :loading="loading"
-            rowKey="index"
+            :rowKey="(record) => record.id"
             :pagination="{
               total,
               defaultPageSize: pageSize,
@@ -191,7 +191,7 @@
             :data-source="currentShowList"
             @change="handleCurrentChange"
             :loading="loading"
-            rowKey="index"
+            :rowKey="(record) => record.id"
             :pagination="{
               total,
               defaultPageSize: pageSize,
@@ -267,7 +267,7 @@
             :data-source="currentShowList"
             @change="handleCurrentChange"
             :loading="loading"
-            rowKey="index"
+            :rowKey="(record) => record.id"
             :pagination="{
               total,
               defaultPageSize: pageSize,
@@ -307,7 +307,7 @@
             :data-source="currentShowList"
             @change="handleCurrentChange"
             :loading="loading"
-            rowKey="index"
+            :rowKey="(record) => record.id"
             :pagination="{
               total,
               defaultPageSize: pageSize,
@@ -706,7 +706,7 @@ export default {
           cities: [],
         },
       ],
-      props: {
+      treeProps: {
         value: 'id',
         label: 'label',
         children: 'cities',
@@ -1293,7 +1293,7 @@ export default {
 };
 </script>
 
-<style lang="less" scoped>
+<style scoped>
 :deep(.ant-table-pagination) {
   float: left;
 }

src/views/duChaJiHua/editDcdxInfo_common.vue

@@ -1,4 +1,4 @@
-<template>
+<template>
   <a-modal
     title="添加督查对象"
     :open="dialogFormVisible"
@@ -90,7 +90,7 @@
             :data-source="currentShowList"
             @change="handleCurrentChange"
             :loading="loading"
-            rowKey="index"
+            :rowKey="(record) => record.id"
             :pagination="{
               total,
               defaultPageSize: pageSize,
@@ -253,7 +253,7 @@ export default {
         note: '',
         ownerOfc: '',
       },
-      props: {
+      treeProps: {
         value: 'id',
         label: 'label',
         children: 'cities',
@@ -366,10 +366,7 @@ export default {
         }
       }
       return {
-        prop: {
-          disabled: isChecked,
-          prjType: row.prjType,
-        },
+        disabled: !isChecked,
       };
     },
     getCommonDict() {
@@ -381,10 +378,10 @@ export default {
             this.commonType = res.data;
             this.columns.forEach((item) => {
               if (item.title == '督查类别') {
-                item.customRender = (value, row, index) => {
+                item.customRender = ({ record }) => {
                   let name = '';
                   this.commonType.forEach((item) => {
-                    if (item.dictTypeCd == row.type) {
+                    if (item.dictTypeCd == record.type) {
                       name = item.dictTypeDesc;
                     }
                   });
@@ -674,7 +671,7 @@ export default {
 };
 </script>
 
-<style lang="less" scoped>
+<style scoped>
 :deep(.ant-table-pagination) {
   float: left;
 }

src/views/duChaJiHua/editDcdxInfo_county.vue

@@ -1,4 +1,4 @@
-<template>
+<template>
   <a-modal title="添加督查对象" :open="dialogFormVisible" @ok="saveChange" @cancel="() => { dialogFormVisible = false, type = undefined }" width="80%">
     <a-layout>
       <a-layout-sider width="200px" style="border:1px solid #d5d5ff; background: #fff;">
@@ -32,7 +32,7 @@
             :data-source="currentShowList"
             @change="handleCurrentChange"
             :loading="loading"
-            rowKey="index"
+            :rowKey="(record) => record.id"
             :pagination="{
               current: pageIndex,
               total,
@@ -136,10 +136,10 @@ export default {
             this.commonType = res.data;
             this.columns.forEach((item) => {
               if (item.title == '督查类别') {
-                item.customRender = (value, row, index) => {
+                item.customRender = ({ record }) => {
                   let name = '';
                   this.commonType.forEach((item) => {
-                    if (item.dictTypeNum == row.type) {
+                    if (item.dictTypeNum == record.type) {
                       name = item.nm;
                     }
                   });
@@ -246,7 +246,7 @@ export default {
 };
 </script>
 
-<style lang='less' scoped>
+<style scoped>
 :deep(.ant-table-pagination) {
   float: left;
 }

src/views/duChaJiHua/editDcdxInfo_dfgc.vue

@@ -68,7 +68,7 @@
             :data-source="currentShowList"
             @change="handleCurrentChange"
             :loading="loading"
-            rowKey="index"
+            :rowKey="(record) => record.id"
             :pagination="{
               total,
               defaultPageSize: pageSize,
@@ -89,6 +89,7 @@
 </template>
 
 <script>
+import { Modal } from 'ant-design-vue';
 import { getSupObjListNotInspGroupId } from '../../api/duChaPlan.js';
 import request from '../../utils/gw_ajax_request.js';
 import provTreeList from '../../widgets/provTreeList.vue';
@@ -148,7 +149,7 @@ export default {
         adCode: '',
       },
       currentAdCode: '',
-      props: {
+      treeProps: {
         value: 'id',
         label: 'label',
         children: 'cities',
@@ -376,7 +377,7 @@ export default {
       this.getAreaList();
     },
     deleteHandler(row) {
-      this.$confirm({
+      Modal.confirm({
         title: '提示',
         content: '是否确认删除?',
         okType: 'warning',
@@ -389,7 +390,8 @@ export default {
               this.$message.error('删除失败');
             }
           });
-        },
+                  return Promise.resolve();
+},
         onCancel: () => {
           this.$message.info('已取消删除');
         },
@@ -515,7 +517,7 @@ export default {
 };
 </script>
 
-<style lang="less" scoped>
+<style scoped>
 :deep(.ant-table-pagination) {
   float: left;
 }

src/views/duChaJiHua/editDcdxInfo_dfgcaqdx.vue

@@ -74,7 +74,7 @@
             :data-source="currentShowList"
             @change="handleCurrentChange"
             :loading="loading"
-            rowKey="index"
+            :rowKey="(record) => record.id"
             :pagination="{
               total,
               defaultPageSize: pageSize,
@@ -211,6 +211,7 @@
 </template>
 
 <script>
+import { Modal } from 'ant-design-vue';
 import { getSupObjListNotInspGroupId } from '../../api/duChaPlan';
 import request from '../../utils/gw_ajax_request.js';
 import provTreeList from '../../widgets/provTreeList.vue';
@@ -276,7 +277,7 @@ export default {
         gdY: '',
       },
       currentAdCode: '',
-      props: {
+      treeProps: {
         value: 'id',
         label: 'label',
         children: 'cities',
@@ -501,7 +502,7 @@ export default {
       this.getAreaList();
     },
     deleteHandler(row) {
-      this.$confirm({
+      Modal.confirm({
         title: '提示',
         content: '是否确认删除?',
         okType: 'warning',
@@ -514,7 +515,8 @@ export default {
               this.$message.error('删除失败');
             }
           });
-        },
+                  return Promise.resolve();
+},
         onCancel: () => {
           this.$message.info('已取消删除');
         },
@@ -643,7 +645,7 @@ export default {
 };
 </script>
 
-<style lang="less" scoped>
+<style scoped>
 :deep(.ant-table-pagination) {
   float: left;
 }

src/views/duChaJiHua/editDcdxInfo_dike2022.vue

@@ -74,7 +74,7 @@
             :data-source="currentShowList"
             @change="handleCurrentChange"
             :loading="loading"
-            rowKey="index"
+            :rowKey="(record) => record.id"
             :pagination="{
               total,
               defaultPageSize: pageSize,
@@ -221,6 +221,7 @@
 </template>
 
 <script>
+import { Modal } from 'ant-design-vue';
 import { getSupObjListNotInspGroupId } from '../../api/duChaPlan';
 import request from '../../utils/gw_ajax_request.js';
 import provTreeList from '../../widgets/provTreeList.vue';
@@ -286,7 +287,7 @@ export default {
         gdY: '',
       },
       currentAdCode: '',
-      props: {
+      treeProps: {
         value: 'id',
         label: 'label',
         children: 'cities',
@@ -511,7 +512,7 @@ export default {
       this.getAreaList();
     },
     deleteHandler(row) {
-      this.$confirm({
+      Modal.confirm({
         title: '提示',
         content: '是否确认删除?',
         okType: 'warning',
@@ -524,7 +525,8 @@ export default {
               this.$message.error('删除失败');
             }
           });
-        },
+                  return Promise.resolve();
+},
         onCancel: () => {
           this.$message.info('已取消删除');
         },
@@ -653,7 +655,7 @@ export default {
 };
 </script>
 
-<style lang="less" scoped>
+<style scoped>
 :deep(.ant-table-pagination) {
   float: left;
 }

src/views/duChaJiHua/editDcdxInfo_fhgcfczg.vue

@@ -74,7 +74,7 @@
             :data-source="currentShowList"
             @change="handleCurrentChange"
             :loading="loading"
-            rowKey="index"
+            :rowKey="(record) => record.id"
             :pagination="{
               total,
               defaultPageSize: pageSize,
@@ -162,6 +162,7 @@
 </template>
 
 <script>
+import { Modal } from 'ant-design-vue';
 import { getSupObjListNotInspGroupId } from '../../api/duChaPlan';
 import request from '../../utils/gw_ajax_request.js';
 import provTreeList from '../../widgets/provTreeList.vue';
@@ -216,7 +217,7 @@ export default {
         gdY: '',
       },
       currentAdCode: '',
-      props: {
+      treeProps: {
         value: 'id',
         label: 'label',
         children: 'cities',
@@ -440,7 +441,7 @@ export default {
       this.getAreaList();
     },
     deleteHandler(row) {
-      this.$confirm({
+      Modal.confirm({
         title: '提示',
         content: '是否确认删除?',
         okType: 'warning',
@@ -453,7 +454,8 @@ export default {
               this.$message.error('删除失败');
             }
           });
-        },
+                  return Promise.resolve();
+},
         onCancel: () => {
           this.$message.info('已取消删除');
         },
@@ -582,7 +584,7 @@ export default {
 };
 </script>
 
-<style lang="less" scoped>
+<style scoped>
 :deep(.ant-table-pagination) {
   float: left;
 }

src/views/duChaJiHua/editDcdxInfo_hhws.vue

@@ -68,7 +68,7 @@
             :data-source="currentShowList"
             @change="handleCurrentChange"
             :loading="loading"
-            rowKey="index"
+            :rowKey="(record) => record.id"
             :pagination="{
               total,
               defaultPageSize: pageSize,
@@ -89,6 +89,7 @@
 </template>
 
 <script>
+import { Modal } from 'ant-design-vue';
 import { getSupObjListNotInspGroupId } from '../../api/fujian_api';
 import request from '../../utils/gw_ajax_request.js';
 import provTreeList from '../../widgets/provTreeList.vue';
@@ -151,7 +152,7 @@ export default {
         adCode: '',
       },
       currentAdCode: '',
-      props: {
+      treeProps: {
         value: 'id',
         label: 'label',
         children: 'cities',
@@ -395,7 +396,7 @@ export default {
       this.getAreaList();
     },
     deleteHandler(row) {
-      this.$confirm({
+      Modal.confirm({
         title: '提示',
         content: '是否确认删除?',
         okType: 'warning',
@@ -408,7 +409,8 @@ export default {
               this.$message.error('删除失败');
             }
           });
-        },
+                  return Promise.resolve();
+},
         onCancel: () => {
           this.$message.info('已取消删除');
         },
@@ -534,7 +536,7 @@ export default {
 };
 </script>
 
-<style lang="less" scoped>
+<style scoped>
 :deep(.ant-table-pagination) {
   float: left;
 }

src/views/duChaJiHua/editDcdxInfo_ncgsgc.vue

@@ -81,7 +81,7 @@
             :data-source="currentShowList"
             @change="handleCurrentChange"
             :loading="loading"
-            rowKey="index"
+            :rowKey="(record) => record.id"
             :pagination="{
               total,
               defaultPageSize: pageSize,
@@ -186,6 +186,7 @@
 </template>
 
 <script>
+import { Modal } from 'ant-design-vue';
 import { getSupObjListNotInspGroupId } from '../../api/duChaPlan';
 import request from '../../utils/gw_ajax_request.js';
 import provTreeList from '../../widgets/provTreeList.vue';
@@ -251,7 +252,7 @@ export default {
         supplyType: '',
       },
       currentAdCode: '',
-      props: {
+      treeProps: {
         value: 'id',
         label: 'label',
         children: 'cities',
@@ -482,7 +483,7 @@ export default {
       this.getAreaList();
     },
     deleteHandler(row) {
-      this.$confirm({
+      Modal.confirm({
         title: '提示',
         content: '是否确认删除?',
         okType: 'warning',
@@ -495,7 +496,8 @@ export default {
               this.$message.error('删除失败');
             }
           });
-        },
+                  return Promise.resolve();
+},
         onCancel: () => {
           this.$message.info('已取消删除');
         },
@@ -628,7 +630,7 @@ export default {
 };
 </script>
 
-<style lang="less" scoped>
+<style scoped>
 :deep(.ant-table-pagination) {
   float: left;
 }

src/views/duChaJiHua/editDcdxInfo_ncysaq.vue

@@ -74,7 +74,7 @@
             :data-source="currentShowList"
             @change="handleCurrentChange"
             :loading="loading"
-            rowKey="index"
+            :rowKey="(record) => record.id"
             :pagination="{
               total,
               defaultPageSize: pageSize,
@@ -177,6 +177,7 @@
 </template>
 
 <script>
+import { Modal } from 'ant-design-vue';
 import { getSupObjListNotInspGroupId } from '../../api/duChaPlan';
 import request from '../../utils/gw_ajax_request.js';
 import provTreeList from '../../widgets/provTreeList.vue';
@@ -236,7 +237,7 @@ export default {
         adCode: '',
       },
       currentAdCode: '',
-      props: {
+      treeProps: {
         value: 'id',
         label: 'label',
         children: 'cities',
@@ -459,7 +460,7 @@ export default {
       this.getAreaList();
     },
     deleteHandler(row) {
-      this.$confirm({
+      Modal.confirm({
         title: '提示',
         content: '是否确认删除?',
         okType: 'warning',
@@ -472,6 +473,7 @@ export default {
               this.$message.error('删除失败');
             }
           });
+          return Promise.resolve();
         },
         onCancel: () => {
           this.$message.info('已取消删除');
@@ -601,7 +603,7 @@ export default {
 };
 </script>
 
-<style lang="less" scoped>
+<style scoped>
 :deep(.ant-table-pagination) {
   float: left;
 }

src/views/duChaJiHua/editDcdxInfo_ny.vue

@@ -73,7 +73,7 @@
             :data-source="currentShowList"
             @change="handleCurrentChange"
             :loading="loading"
-            rowKey="index"
+            :rowKey="(record) => record.id"
             :pagination="{
               total,
               defaultPageSize: pageSize,
@@ -121,7 +121,7 @@ export default {
       loading: false,
       showLeftTree: true,
       addRsvrVisible: false,
-      props: {
+      treeProps: {
         value: 'id',
         label: 'label',
         children: 'cities',
@@ -346,7 +346,7 @@ export default {
 };
 </script>
 
-<style lang="less" scoped>
+<style scoped>
 :deep(.ant-table-pagination) {
   float: left;
 }

src/views/duChaJiHua/editDcdxInfo_qsgc.vue

@@ -68,7 +68,7 @@
             :data-source="currentShowList"
             @change="handleCurrentChange"
             :loading="loading"
-            rowKey="index"
+            :rowKey="(record) => record.id"
             :pagination="{
               total,
               defaultPageSize: pageSize,
@@ -89,6 +89,7 @@
 </template>
 
 <script>
+import { Modal } from 'ant-design-vue';
 import { getSupObjListNotInspGroupId } from '../../api/duChaPlan.js';
 import request from '../../utils/gw_ajax_request.js';
 import provTreeList from '../../widgets/provTreeList.vue';
@@ -148,7 +149,7 @@ export default {
         adCode: '',
       },
       currentAdCode: '',
-      props: {
+      treeProps: {
         value: 'id',
         label: 'label',
         children: 'cities',
@@ -369,7 +370,7 @@ export default {
       this.getAreaList();
     },
     deleteHandler(row) {
-      this.$confirm({
+      Modal.confirm({
         title: '提示',
         content: '是否确认删除?',
         okType: 'warning',
@@ -382,7 +383,8 @@ export default {
               this.$message.error('删除失败');
             }
           });
-        },
+                  return Promise.resolve();
+},
         onCancel: () => {
           this.$message.info('已取消删除');
         },
@@ -508,7 +510,7 @@ export default {
 };
 </script>
 
-<style lang="less" scoped>
+<style scoped>
 :deep(.ant-table-pagination) {
   float: left;
 }

src/views/duChaJiHua/editDcdxInfo_siLuan.vue

@@ -68,7 +68,7 @@
             :data-source="currentShowList"
             @change="handleCurrentChange"
             :loading="loading"
-            rowKey="index"
+            :rowKey="(record) => record.id"
             :pagination="{
               total,
               defaultPageSize: pageSize,
@@ -89,6 +89,7 @@
 </template>
 
 <script>
+import { Modal } from 'ant-design-vue';
 import { getSupObjListNotInspGroupId } from '../../api/duChaPlan.js';
 import request from '../../utils/gw_ajax_request.js';
 import provTreeList from '../../widgets/provTreeList.vue';
@@ -148,7 +149,7 @@ export default {
         adCode: '',
       },
       currentAdCode: '',
-      props: {
+      treeProps: {
         value: 'id',
         label: 'label',
         children: 'cities',
@@ -370,7 +371,7 @@ export default {
       this.getAreaList();
     },
     deleteHandler(row) {
-      this.$confirm({
+      Modal.confirm({
         title: '提示',
         content: '是否确认删除?',
         okType: 'warning',
@@ -383,7 +384,8 @@ export default {
               this.$message.error('删除失败');
             }
           });
-        },
+                  return Promise.resolve();
+},
         onCancel: () => {
           this.$message.info('已取消删除');
         },
@@ -509,7 +511,7 @@ export default {
 };
 </script>
 
-<style lang="less" scoped>
+<style scoped>
 :deep(.ant-table-pagination) {
   float: left;
 }

src/views/duChaJiHua/editDcdxInfo_sjss.vue

@@ -68,7 +68,7 @@
             :data-source="currentShowList"
             @change="handleCurrentChange"
             :loading="loading"
-            rowKey="index"
+            :rowKey="(record) => record.id"
             :pagination="{
               total,
               defaultPageSize: pageSize,
@@ -89,6 +89,7 @@
 </template>
 
 <script>
+import { Modal } from 'ant-design-vue';
 import {
   getSupObjListNotInspGroupId,
   getSupObjListNotInspGroupIdByPrj,
@@ -154,7 +155,7 @@ export default {
         adCode: '',
       },
       currentAdCode: '',
-      props: {
+      treeProps: {
         value: 'id',
         label: 'label',
         children: 'cities',
@@ -393,7 +394,7 @@ export default {
       this.getAreaList();
     },
     deleteHandler(row) {
-      this.$confirm({
+      Modal.confirm({
         title: '提示',
         content: '是否确认删除?',
         okType: 'warning',
@@ -406,7 +407,8 @@ export default {
               this.$message.error('删除失败');
             }
           });
-        },
+                  return Promise.resolve();
+},
         onCancel: () => {
           this.$message.info('已取消删除');
         },
@@ -532,7 +534,7 @@ export default {
 };
 </script>
 
-<style lang="less" scoped>
+<style scoped>
 :deep(.ant-table-pagination) {
   float: left;
 }

src/views/duChaJiHua/editDcdxInfo_sjzhdcjh.vue

@@ -1,15 +1,14 @@
-<template>
+<template>
   <a-modal
-    title="添加督查对象"
-    :open="dialogFormVisible"
+    title="添加督查对象123"
+    v-model:open="dialogFormVisible"
     @ok="saveChange"
-    @cancel="() => { dialogFormVisible = false, type = undefined }"
     width="80%"
   >
-    <a-layout>
+    <a-layout style="display: flex; flex-direction: row;">
       <a-layout-sider
         width="200px"
-        style="border:1px solid #d5d5ff; background: #fff;"
+        style="border:1px solid #d5d5ff; background: #fff; flex-shrink: 0;"
       >
         <p
           style="font-weight:bolder;background-color:#d5d5ff;padding:3px;margin: 0;"
@@ -36,7 +35,7 @@
         ></provTreeList>
       </a-layout-sider>
       <a-layout-content
-        style="border:1px solid #d5d5ff;margin-left:5px;padding:0px;"
+        style="border:1px solid #d5d5ff;margin-left:5px;padding:0px;flex:1;overflow:auto;"
       >
         <p
           style="font-weight:bolder;background-color:#d5d5ff;padding:3px;margin: 0;"
@@ -89,8 +88,7 @@
             :columns="columns"
             :data-source="currentShowList"
             @change="handleCurrentChange"
-            :loading="loading"
-            rowKey="index"
+            :rowKey="(record) => record.id"
             :pagination="{
               total,
               defaultPageSize: pageSize,
@@ -98,18 +96,18 @@
             }"
             style="width: 100%;"
           >
-            <template #bodyCell="{ column, record, text, index }">
+            <template #bodyCell="{ column, record }">
               <template v-if="column.dataIndex === 'prjType'">
                 <div style="display: flex; align-items: center; justify-content: center;">
                   <img
                     src="../../assets/images/choucha.png"
                     v-if="record.prjType == 'province'"
-                    style="width: 25px;height:20px;float: left;"
+                    style="width: 25px;height:20px;"
                   />
                   <img
                     src="../../assets/images/zicha.png"
                     v-if="record.prjType == 'other'"
-                    style="width: 25px;height:20px;float: left;"
+                    style="width: 25px;height:20px;"
                   />
                 </div>
               </template>
@@ -256,7 +254,7 @@ export default {
         note: '',
         ownerOfc: '',
       },
-      props: {
+      treeProps: {
         value: 'id',
         label: 'label',
         children: 'cities',
@@ -379,10 +377,7 @@ export default {
         }
       }
       return {
-        prop: {
-          disabled: isChecked,
-          prjType: row.prjType,
-        },
+        disabled: !isChecked,
       };
     },
     getCommonDict() {
@@ -398,10 +393,10 @@ export default {
             this.commonType = res.data;
             this.columns.forEach((item) => {
               if (item.title == '督查类别') {
-                item.customRender = (value, row, index) => {
+                item.customRender = ({ record }) => {
                   let name = '';
                   this.commonType.forEach((item) => {
-                    if (item.dictTypeNum == row.type) {
+                    if (item.dictTypeNum == record.type) {
                       name = item.nm;
                     }
                   });
@@ -539,10 +534,17 @@ export default {
       request.post('/att/gnrl/base/getQueryPageList', params).then((res) => {
         if (res.success) {
           this.loading = false;
-          this.currentShowList = res.data.list;
-          this.currentShowList.forEach((element, index) => {
-            element['index'] = this.pageSize * (this.pageIndex - 1) + index + 1;
-          });
+          try {
+            const list = res.data.list || [];
+            list.forEach((element, index) => {
+              element['index'] = this.pageSize * (this.pageIndex - 1) + index + 1;
+            });
+            this.currentShowList = [...list];
+            console.log(this.currentShowList, 'this.currentShowList')
+          } catch (e) {
+            console.error('数据处理错误:', e);
+            this.currentShowList = [];
+          }
           this.total = res.data.total;
         } else {
           this.$message.error(res.message);
@@ -581,10 +583,17 @@ export default {
       request.post('/att/gnrl/base/getQueryPageList', params).then((res) => {
         if (res.success) {
           this.loading = false;
-          this.currentShowList = res.data.list;
-          this.currentShowList.forEach((element, index) => {
-            element['index'] = this.pageSize * (this.pageIndex - 1) + index + 1;
-          });
+          try {
+            const list = res.data.list || [];
+            list.forEach((element, index) => {
+              element['index'] = this.pageSize * (this.pageIndex - 1) + index + 1;
+            });
+            this.currentShowList = [...list];
+          } catch (e) {
+            console.error('数据处理错误:', e);
+            this.currentShowList = [];
+          }
+          console.log('表格数据:', this.currentShowList.length)
           this.total = res.data.total;
         } else {
           this.$message.error(res.message);
@@ -623,6 +632,7 @@ export default {
       } else {
         this.getTableData_172();
       }
+      console.log(this.currentShowList, 'currentShowList');
     },
     addObjectChange: function () {
       if (this.addOnce) {
@@ -764,7 +774,7 @@ export default {
 };
 </script>
 
-<style lang="less" scoped>
+<style scoped>
 :deep(.ant-table-pagination) {
   float: left;
 }

src/views/duChaJiHua/editDcdxInfo_skfhdd.vue

@@ -74,7 +74,7 @@
             :data-source="currentShowList"
             @change="handleCurrentChange"
             :loading="loading"
-            rowKey="index"
+            :rowKey="(record) => record.id"
             :pagination="{
               total,
               defaultPageSize: pageSize,
@@ -200,6 +200,7 @@
 </template>
 
 <script>
+import { Modal } from 'ant-design-vue';
 import { getSupObjListNotInspGroupId } from '../../api/duChaPlan';
 import request from '../../utils/gw_ajax_request.js';
 import provTreeList from '../../widgets/provTreeList.vue';
@@ -310,7 +311,7 @@ export default {
         centerYGd: '',
       },
       currentAdCode: '',
-      props: {
+      treeProps: {
         value: 'id',
         label: 'label',
         children: 'cities',
@@ -540,7 +541,7 @@ export default {
       this.getAreaList();
     },
     deleteHandler(row) {
-      this.$confirm({
+      Modal.confirm({
         title: '提示',
         content: '是否确认删除?',
         okType: 'warning',
@@ -553,7 +554,8 @@ export default {
               this.$message.error('删除失败');
             }
           });
-        },
+                  return Promise.resolve();
+},
         onCancel: () => {
           this.$message.info('已取消删除');
         },
@@ -685,7 +687,7 @@ export default {
 };
 </script>
 
-<style lang="less" scoped>
+<style scoped>
 :deep(.ant-table-pagination) {
   float: left;
 }

src/views/duChaJiHua/editDcdxInfo_slaqscdpc.vue

@@ -74,7 +74,7 @@
             :data-source="currentShowList"
             @change="handleCurrentChange"
             :loading="loading"
-            rowKey="index"
+            :rowKey="(record) => record.id"
             :pagination="{
               total,
               defaultPageSize: pageSize,
@@ -175,6 +175,7 @@
 </template>
 
 <script>
+import { Modal } from 'ant-design-vue';
 import { getSupObjListNotInspGroupId } from '../../api/duChaPlan';
 import request from '../../utils/gw_ajax_request.js';
 import provTreeList from '../../widgets/provTreeList.vue';
@@ -236,7 +237,7 @@ export default {
         gdY: '',
       },
       currentAdCode: '',
-      props: {
+      treeProps: {
         value: 'id',
         label: 'label',
         children: 'cities',
@@ -464,7 +465,7 @@ export default {
       this.getAreaList();
     },
     deleteHandler(row) {
-      this.$confirm({
+      Modal.confirm({
         title: '提示',
         content: '是否确认删除?',
         okType: 'warning',
@@ -477,7 +478,8 @@ export default {
               this.$message.error('删除失败');
             }
           });
-        },
+                  return Promise.resolve();
+},
         onCancel: () => {
           this.$message.info('已取消删除');
         },
@@ -606,7 +608,7 @@ export default {
 };
 </script>
 
-<style lang="less" scoped>
+<style scoped>
 :deep(.ant-table-pagination) {
   float: left;
 }

src/views/duChaJiHua/editDcdxInfo_sltsn.vue

@@ -82,7 +82,7 @@
             :data-source="currentShowList"
             @change="handleCurrentChange"
             :loading="loading"
-            rowKey="index"
+            :rowKey="(record) => record.id"
             :pagination="{
               total,
               defaultPageSize: pageSize,
@@ -105,6 +105,7 @@
 </template>
 
 <script>
+import { Modal } from 'ant-design-vue';
 import {
   getSupObjListNotInspGroupId,
   getSupObjListNotInspGroupIdByPrj,
@@ -190,7 +191,7 @@ export default {
         adCode: '',
       },
       currentAdCode: '',
-      props: {
+      treeProps: {
         value: 'id',
         label: 'label',
         children: 'cities',
@@ -438,7 +439,7 @@ export default {
       this.getAreaList();
     },
     deleteHandler(row) {
-      this.$confirm({
+      Modal.confirm({
         title: '提示',
         content: '是否确认删除?',
         okType: 'warning',
@@ -451,7 +452,8 @@ export default {
               this.$message.error('删除失败');
             }
           });
-        },
+                  return Promise.resolve();
+},
         onCancel: () => {
           this.$message.info('已取消删除');
         },
@@ -577,7 +579,7 @@ export default {
 };
 </script>
 
-<style lang="less" scoped>
+<style scoped>
 :deep(.ant-table-pagination) {
   float: left;
 }

src/views/duChaJiHua/editDcdxInfo_sxzzf.vue

@@ -68,7 +68,7 @@
             :data-source="currentShowList"
             @change="handleCurrentChange"
             :loading="loading"
-            rowKey="index"
+            :rowKey="(record) => record.id"
             :pagination="{
               total,
               defaultPageSize: pageSize,
@@ -91,6 +91,7 @@
 </template>
 
 <script>
+import { Modal } from 'ant-design-vue';
 import { getSupObjListNotInspGroupId } from '../../api/duChaPlan.js';
 import request from '../../utils/gw_ajax_request.js';
 import provTreeList from '../../widgets/provTreeList.vue';
@@ -150,7 +151,7 @@ export default {
         adCode: '',
       },
       currentAdCode: '',
-      props: {
+      treeProps: {
         value: 'id',
         label: 'label',
         children: 'cities',
@@ -372,7 +373,7 @@ export default {
       this.getAreaList();
     },
     deleteHandler(row) {
-      this.$confirm({
+      Modal.confirm({
         title: '提示',
         content: '是否确认删除?',
         okType: 'warning',
@@ -385,7 +386,8 @@ export default {
               this.$message.error('删除失败');
             }
           });
-        },
+                  return Promise.resolve();
+},
         onCancel: () => {
           this.$message.info('已取消删除');
         },
@@ -512,7 +514,7 @@ export default {
 };
 </script>
 
-<style lang="less" scoped>
+<style scoped>
 :deep(.ant-table-pagination) {
   float: left;
 }

src/views/duChaJiHua/editDcdxInfo_syd.vue

@@ -68,7 +68,7 @@
             :data-source="currentShowList"
             @change="handleCurrentChange"
             :loading="loading"
-            rowKey="index"
+            :rowKey="(record) => record.id"
             :pagination="{
               total,
               defaultPageSize: pageSize,
@@ -111,7 +111,7 @@ export default {
       loading: false,
       showLeftTree: true,
       addRsvrVisible: false,
-      props: {
+      treeProps: {
         value: 'id',
         label: 'label',
         children: 'cities',
@@ -304,7 +304,7 @@ export default {
 };
 </script>
 
-<style lang="less" scoped>
+<style scoped>
 :deep(.ant-table-pagination) {
   float: left;
 }

src/views/duChaJiHua/editDcdxInfo_sz.vue

@@ -67,7 +67,7 @@
             :data-source="currentShowList"
             @change="handleCurrentChange"
             :loading="loading"
-            rowKey="index"
+            :rowKey="(record) => record.id"
             :pagination="{
               total,
               defaultPageSize: pageSize,
@@ -373,7 +373,7 @@ export default {
 };
 </script>
 
-<style lang="less" scoped>
+<style scoped>
 :deep(.ant-table-pagination) {
   float: left;
 }

src/views/duChaJiHua/editDcdxInfo_szygljs.vue

@@ -68,7 +68,7 @@
             :data-source="currentShowList"
             @change="handleCurrentChange"
             :loading="loading"
-            rowKey="index"
+            :rowKey="(record) => record.id"
             :pagination="{
               total,
               defaultPageSize: pageSize,
@@ -91,6 +91,7 @@
 </template>
 
 <script>
+import { Modal } from 'ant-design-vue';
 import { getSupObjListNotInspGroupId } from '../../api/duChaPlan.js';
 import request from '../../utils/gw_ajax_request.js';
 import provTreeList from '../../widgets/provTreeList.vue';
@@ -150,7 +151,7 @@ export default {
         adCode: '',
       },
       currentAdCode: '',
-      props: {
+      treeProps: {
         value: 'id',
         label: 'label',
         children: 'cities',
@@ -371,7 +372,7 @@ export default {
       this.getAreaList();
     },
     deleteHandler(row) {
-      this.$confirm({
+      Modal.confirm({
         title: '提示',
         content: '是否确认删除?',
         okType: 'warning',
@@ -384,7 +385,8 @@ export default {
               this.$message.error('删除失败');
             }
           });
-        },
+                  return Promise.resolve();
+},
         onCancel: () => {
           this.$message.info('已取消删除');
         },
@@ -510,7 +512,7 @@ export default {
 };
 </script>
 
-<style lang="less" scoped>
+<style scoped>
 :deep(.ant-table-pagination) {
   float: left;
 }

src/views/duChaJiHua/editDcdxInfo_villsaf.vue

@@ -74,7 +74,7 @@
             :data-source="currentShowList"
             @change="handleCurrentChange"
             :loading="loading"
-            rowKey="index"
+            :rowKey="(record) => record.id"
             :pagination="{
               total,
               defaultPageSize: pageSize,
@@ -202,6 +202,7 @@
 </template>
 
 <script>
+import { Modal } from 'ant-design-vue';
 import { getSupObjListNotInspGroupId } from '../../api/duChaPlan';
 import request from '../../utils/gw_ajax_request.js';
 import provTreeList from '../../widgets/provTreeList.vue';
@@ -266,7 +267,7 @@ export default {
         gdY: '',
       },
       currentAdCode: '',
-      props: {
+      treeProps: {
         value: 'id',
         label: 'label',
         children: 'cities',
@@ -510,7 +511,7 @@ export default {
       this.getAreaList();
     },
     deleteHandler(row) {
-      this.$confirm({
+      Modal.confirm({
         title: '提示',
         content: '是否确认删除?',
         okType: 'warning',
@@ -523,7 +524,8 @@ export default {
               this.$message.error('删除失败');
             }
           });
-        },
+                  return Promise.resolve();
+},
         onCancel: () => {
           this.$message.info('已取消删除');
         },
@@ -652,7 +654,7 @@ export default {
 };
 </script>
 
-<style lang="less" scoped>
+<style scoped>
 :deep(.ant-table-pagination) {
   float: left;
 }

src/views/duChaJiHua/editDcdxInfo_xshd.vue

@@ -67,7 +67,7 @@
             :data-source="currentShowList"
             @change="handleCurrentChange"
             :loading="loading"
-            rowKey="index"
+            :rowKey="(record) => record.id"
             :pagination="{
               total,
               defaultPageSize: pageSize,
@@ -118,7 +118,7 @@ export default {
       loading: false,
       showLeftTree: true,
       addRsvrVisible: false,
-      props: {
+      treeProps: {
         value: 'id',
         label: 'label',
         children: 'cities',
@@ -322,7 +322,7 @@ export default {
 };
 </script>
 
-<style lang="less" scoped>
+<style scoped>
 :deep(.ant-table-pagination) {
   float: left;
 }

src/views/duChaJiHua/editDcdxInfo_xskbzh.vue

@@ -101,7 +101,7 @@
             :data-source="currentShowList"
             @change="handleCurrentChange"
             :loading="loading"
-            rowKey="index"
+            :rowKey="(record) => record.id"
             :pagination="{
               total,
               defaultPageSize: pageSize,
@@ -370,7 +370,7 @@ export default {
           cities: [],
         },
       ],
-      props: {
+      treeProps: {
         value: 'id',
         label: 'label',
         children: 'cities',
@@ -814,7 +814,7 @@ export default {
 };
 </script>
 
-<style lang="less" scoped>
+<style scoped>
 :deep(.ant-table-pagination) {
   float: left;
 }

src/views/duChaJiHua/editDcdxInfo_yjbysy.vue

@@ -74,7 +74,7 @@
             :data-source="currentShowList"
             @change="handleCurrentChange"
             :loading="loading"
-            rowKey="index"
+            :rowKey="(record) => record.id"
             :pagination="{
               total,
               defaultPageSize: pageSize,
@@ -180,6 +180,7 @@
 </template>
 
 <script>
+import { Modal } from 'ant-design-vue';
 import { getSupObjListNotInspGroupId } from '../../api/duChaPlan';
 import request from '../../utils/gw_ajax_request.js';
 import provTreeList from '../../widgets/provTreeList.vue';
@@ -237,7 +238,7 @@ export default {
         prjPrsg: '',
       },
       currentAdCode: '',
-      props: {
+      treeProps: {
         value: 'id',
         label: 'label',
         children: 'cities',
@@ -457,7 +458,7 @@ export default {
       this.getAreaList();
     },
     deleteHandler(row) {
-      this.$confirm({
+      Modal.confirm({
         title: '提示',
         content: '是否确认删除?',
         okType: 'warning',
@@ -470,7 +471,8 @@ export default {
               this.$message.error('删除失败');
             }
           });
-        },
+                  return Promise.resolve();
+},
         onCancel: () => {
           this.$message.info('已取消删除');
         },
@@ -599,7 +601,7 @@ export default {
 };
 </script>
 
-<style lang="less" scoped>
+<style scoped>
 :deep(.ant-table-pagination) {
   float: left;
 }

src/views/duChaJiHua/editDcdxInfo_zdshgc.vue

@@ -68,7 +68,7 @@
             :data-source="currentShowList"
             @change="handleCurrentChange"
             :loading="loading"
-            rowKey="index"
+            :rowKey="(record) => record.id"
             :pagination="{
               total,
               defaultPageSize: pageSize,
@@ -91,6 +91,7 @@
 </template>
 
 <script>
+import { Modal } from 'ant-design-vue';
 import { getSupObjListNotInspGroupId } from '../../api/duChaPlan.js';
 import request from '../../utils/gw_ajax_request.js';
 import provTreeList from '../../widgets/provTreeList.vue';
@@ -150,7 +151,7 @@ export default {
         adCode: '',
       },
       currentAdCode: '',
-      props: {
+      treeProps: {
         value: 'id',
         label: 'label',
         children: 'cities',
@@ -372,7 +373,7 @@ export default {
       this.getAreaList();
     },
     deleteHandler(row) {
-      this.$confirm({
+      Modal.confirm({
         title: '提示',
         content: '是否确认删除?',
         okType: 'warning',
@@ -385,7 +386,8 @@ export default {
               this.$message.error('删除失败');
             }
           });
-        },
+                  return Promise.resolve();
+},
         onCancel: () => {
           this.$message.info('已取消删除');
         },
@@ -512,7 +514,7 @@ export default {
 };
 </script>
 
-<style lang="less" scoped>
+<style scoped>
 :deep(.ant-table-pagination) {
   float: left;
 }

src/views/duChaJiHua/editDcdxInfo_zdsl.vue

@@ -68,7 +68,7 @@
             :data-source="currentShowList"
             @change="handleCurrentChange"
             :loading="loading"
-            rowKey="index"
+            :rowKey="(record) => record.id"
             :pagination="{
               total,
               defaultPageSize: pageSize,
@@ -111,7 +111,7 @@ export default {
       loading: false,
       showLeftTree: true,
       addRsvrVisible: false,
-      props: {
+      treeProps: {
         value: 'id',
         label: 'label',
         children: 'cities',
@@ -322,7 +322,7 @@ export default {
 };
 </script>
 
-<style lang="less" scoped>
+<style scoped>
 :deep(.ant-table-pagination) {
   float: left;
 }

src/views/duChaJiHua/editDcqyInfo.vue

@@ -14,7 +14,7 @@
         <p
           style="font-weight:bolder;background-color:#d5d5ff;padding:3px;margin: 0;"
         >
-          <a-icon type="share-alt" />所属机构
+          <ShareAltOutlined />所属机构
         </p>
         <provTreeList
           rootCode="000000"
@@ -39,7 +39,7 @@
           :columns="columns"
           :data-source="currentShowList"
           :loading="loading"
-          rowKey="index"
+          :rowKey="(record) => record.areaId || record.adCode || record.index"
           ref="menTable"
         >
         </a-table>
@@ -49,6 +49,7 @@
 </template>
 
 <script>
+import { ShareAltOutlined } from '@ant-design/icons-vue';
 import { addDcqyOthers, getOptionalArea } from '../../api/duChaPlan.js';
 import request from '../../utils/gw_ajax_request.js';
 import provTreeList from '../../widgets/provTreeListAndChina.vue';
@@ -62,6 +63,7 @@ export default {
       pageIndex: 1,
       currentShowList: [],
       multipleSelection: [],
+      currentDczId: '',
       searchProvTreeListCode: '',
       tableHeight: window.innerHeight - 220,
       loading: false,
@@ -132,6 +134,7 @@ export default {
     };
   },
   components: {
+    ShareAltOutlined,
     provTreeList,
   },
   computed: {
@@ -144,16 +147,21 @@ export default {
     this.searchProvTreeListCode = '';
   },
   methods: {
-    showDialog() {
+    showDialog(explicitDczId) {
+      this.currentDczId = explicitDczId || this.dczId;
+      console.log('[editDcqyInfo] showDialog explicitDczId:', explicitDczId, 'currentDczId:', this.currentDczId);
       this.dialogFormVisible = true;
-      this.getTableData();
+      this.getTableData(this.currentDczId);
     },
     handleSelectionChange(val, row) {
       this.bisInspAllRlationParams = val;
       this.multipleSelection = row;
     },
-    getTableData() {
-      getOptionalArea(this.dczId, this.searchProvTreeListCode).then(
+    getTableData(dczIdParam) {
+      const dczId = dczIdParam || this.currentDczId || this.dczId;
+      console.log('[editDcqyInfo] getTableData dczId:', dczId);
+      
+      getOptionalArea(dczId, this.searchProvTreeListCode).then(
         (response) => {
           var arr = response.data;
           arr.forEach((arrItem, index) => {
@@ -170,7 +178,7 @@ export default {
       }
       this.addOnce = true;
       this.multipleSelection.forEach((item, index) => {
-        item.id = this.dczId;
+        item.id = this.currentDczId;
         item['adCode'] = item.AD_CODE;
         item['adName'] = item.AD_NAME;
       });
@@ -198,7 +206,7 @@ export default {
 };
 </script>
 
-<style lang="less" scoped>
+<style scoped>
 :deep(.ant-table-pagination) {
   float: left;
 }

src/views/duChaJiHua/editDczInfo.vue

@@ -41,7 +41,7 @@
           :data-source="currentShowList"
           @change="handleCurrentChange"
           :loading="loading"
-          rowKey="index"
+          :rowKey="(record) => record.guid"
           :pagination="{
             total,
             defaultPageSize: pageSize,
@@ -447,7 +447,7 @@ export default {
 };
 </script>
 
-<style lang="less" scoped>
+<style scoped>
 :deep(.ant-table-pagination) {
   float: left;
 }

src/views/duChaJiHua/editDczInfoCounty.vue

@@ -20,7 +20,7 @@
           :data-source="currentShowList"
           @change="handleCurrentChange"
           :loading="loading"
-          rowKey="index"
+          :rowKey="(record) => record.id"
           :pagination="{current: pageIndex, total, defaultPageSize: pageSize, showTotal: (total) => `共${total}条`, }"
           ref="menTable">
         </a-table>
@@ -277,7 +277,7 @@ export default {
 };
 </script>
 
-<style lang="less" scoped>
+<style scoped>
 :deep(.ant-table-pagination) {
   float: left;
 }

src/views/duChaJiHua/planManageProvinceNew.vue

@@ -1,4 +1,4 @@
-<template>
+<template>
   <a-layout>
     <a-layout-content>
       <p class="content_title">
@@ -113,7 +113,7 @@ export default {
 };
 </script>
 
-<style lang='less' scoped>
+<style scoped>
 .content_title {
   span {
     padding: 0 10px;

src/views/duChaJiHua/planManageProvinceNew/duChaDuiXiangList.vue

@@ -326,7 +326,7 @@ export default {
 };
 </script>
 
-<style lang='less' scoped>
+<style scoped>
 .checkbox_left{
   margin-left: 20px;
 }

src/views/duChaJiHua/planManageProvinceNew/duChaDuiXiangListCounty.vue

@@ -25,7 +25,7 @@
       :columns="columns"
       @change="handleCurrentChange"
       :loading="loading"
-      rowKey="index"
+      :rowKey="(record) => record.id"
       :pagination="{
         current: pageIndex,
         total,
@@ -44,6 +44,7 @@
 </template>
 
 <script>
+import { Modal } from 'ant-design-vue';
 import { deleteDcdxByObjid, getDcdxList1 } from '../../../api/duChaPlan';
 export default {
   props: ['dczId', 'activeContent'],
@@ -155,7 +156,7 @@ export default {
       this.getDcdxList1();
     },
     deleteHandler(item) {
-      this.$confirm({
+      Modal.confirm({
         title: '提示',
         content: '是否确认删除?',
         okType: 'info',
@@ -172,7 +173,8 @@ export default {
               }
             }
           });
-        },
+                  return Promise.resolve();
+},
         onCancel: () => {
           this.$message.info('已取消删除');
         },
@@ -202,7 +204,7 @@ export default {
 };
 </script>
 
-<style lang='less' scoped>
+<style scoped>
 .checkbox_left{
   margin-left: 20px;
 }

src/views/duChaJiHua/planManageProvinceNew/duChaDuiXiangSingle/common.vue

@@ -1,4 +1,4 @@
-<template>
+<template>
   <a-table
     :row-selection="{
       selectedRowKeys: selectedRowKeys,
@@ -8,7 +8,7 @@
     :data-source="tableData"
     @change="handleCurrentChange"
     :loading="loading"
-    rowKey="index"
+    :rowKey="(record) => record.id"
     :pagination="{
       total,
       defaultPageSize: pageSize,
@@ -192,10 +192,10 @@ export default {
             this.commonType = res.data;
             this.columns.forEach((item) => {
               if (item.title == '督查类别') {
-                item.customRender = (value, row, index) => {
+                item.customRender = ({ record }) => {
                   let name = '';
                   this.commonType.forEach((item) => {
-                    if (item.dictTypeCd == row.type) {
+                    if (item.dictTypeCd == record.type) {
                       name = item.dictTypeDesc;
                     }
                   });
@@ -229,7 +229,7 @@ export default {
 };
 </script>
 
-<style lang="less" scoped>
+<style scoped>
 :deep(.ant-table-pagination) {
   float: left;
 }

src/views/duChaJiHua/planManageProvinceNew/duChaDuiXiangSingle/diFangGongCheng.vue

@@ -1,5 +1,5 @@
 <template>
-  <a-table :columns="columns" :data-source="tableData" @change="handleCurrentChange" :loading="loading" rowKey="index" :pagination="{total, defaultPageSize: pageSize, showTotal: total => `共${total}条`}" style="width: 100%;" :style="{height: tableHeight + 'px'}" ref="dcryTable">
+  <a-table :columns="columns" :data-source="tableData" @change="handleCurrentChange" :loading="loading" :rowKey="(record) => record.id" :pagination="{total, defaultPageSize: pageSize, showTotal: total => `共${total}条`}" style="width: 100%;" :style="{height: tableHeight + 'px'}" ref="dcryTable">
     <template #bodyCell="{ column, record }">
       <template v-if="column.dataIndex === 'action'">
         <a v-if="ownPriv('manage')" @click="deleteHandler(record)">删除</a>
@@ -150,7 +150,7 @@ export default {
 };
 </script>
 
-<style lang='less' scoped>
+<style scoped>
 /deep/ .ant-table-pagination {
   float: left;
 }

src/views/duChaJiHua/planManageProvinceNew/duChaDuiXiangSingle/difanggongchengduxun.vue

@@ -1,5 +1,5 @@
 <template>
-  <a-table :columns="columns" :data-source="tableData" @change="handleCurrentChange" :loading="loading" rowKey="index" :pagination="{total, defaultPageSize: pageSize, showTotal: total => `共${total}条`}" style="width: 100%;" :style="{height: tableHeight + 'px'}" ref="dcryTable">
+  <a-table :columns="columns" :data-source="tableData" @change="handleCurrentChange" :loading="loading" :rowKey="(record) => record.id" :pagination="{total, defaultPageSize: pageSize, showTotal: total => `共${total}条`}" style="width: 100%;" :style="{height: tableHeight + 'px'}" ref="dcryTable">
     <template #bodyCell="{ column, record }">
       <template v-if="column.dataIndex === 'action'">
         <a v-if="ownPriv('manage')" @click="deleteHandler(record)">删除</a>
@@ -130,7 +130,7 @@ export default {
 };
 </script>
 
-<style lang='less' scoped>
+<style scoped>
 /deep/ .ant-table-pagination {
   float: left;
 }

src/views/duChaJiHua/planManageProvinceNew/duChaDuiXiangSingle/dike2022.vue

@@ -1,5 +1,5 @@
 <template>
-  <a-table :columns="columns" :data-source="tableData" @change="handleCurrentChange" :loading="loading" rowKey="index" :pagination="{total, defaultPageSize: pageSize, showTotal: total => `共${total}条`}" style="width: 100%;" :style="{height: tableHeight + 'px'}" ref="dcryTable">
+  <a-table :columns="columns" :data-source="tableData" @change="handleCurrentChange" :loading="loading" :rowKey="(record) => record.id" :pagination="{total, defaultPageSize: pageSize, showTotal: total => `共${total}条`}" style="width: 100%;" :style="{height: tableHeight + 'px'}" ref="dcryTable">
     <template #bodyCell="{ column, record }">
       <template v-if="column.dataIndex === 'action'">
         <a v-if="ownPriv('manage')" @click="deleteHandler(record)">删除</a>
@@ -130,7 +130,7 @@ export default {
 };
 </script>
 
-<style lang='less' scoped>
+<style scoped>
 /deep/ .ant-table-pagination {
   float: left;
 }

src/views/duChaJiHua/planManageProvinceNew/duChaDuiXiangSingle/fanghonggongchengfuchazhenggai.vue

@@ -1,5 +1,5 @@
 <template>
-  <a-table :columns="columns" :data-source="tableData" @change="handleCurrentChange" :loading="loading" rowKey="index" :pagination="{total, defaultPageSize: pageSize, showTotal: total => `共${total}条`}" style="width: 100%;" :style="{height: tableHeight + 'px'}" ref="dcryTable">
+  <a-table :columns="columns" :data-source="tableData" @change="handleCurrentChange" :loading="loading" :rowKey="(record) => record.id" :pagination="{total, defaultPageSize: pageSize, showTotal: total => `共${total}条`}" style="width: 100%;" :style="{height: tableHeight + 'px'}" ref="dcryTable">
     <template #bodyCell="{ column, record }">
       <template v-if="column.dataIndex === 'action'">
         <a v-if="ownPriv('manage')" @click="deleteHandler(record)">删除</a>
@@ -130,7 +130,7 @@ export default {
 };
 </script>
 
-<style lang='less' scoped>
+<style scoped>
 /deep/ .ant-table-pagination {
   float: left;
 }

src/views/duChaJiHua/planManageProvinceNew/duChaDuiXiangSingle/hehuweishi.vue

@@ -1,5 +1,5 @@
 <template>
-  <a-table :columns="columns" :data-source="tableData" @change="handleCurrentChange" :loading="loading" rowKey="index" :pagination="{total, defaultPageSize: pageSize, showTotal: total => `共${total}条`}" style="width: 100%;" :style="{height: tableHeight + 'px'}" ref="dcryTable">
+  <a-table :columns="columns" :data-source="tableData" @change="handleCurrentChange" :loading="loading" :rowKey="(record) => record.id" :pagination="{total, defaultPageSize: pageSize, showTotal: total => `共${total}条`}" style="width: 100%;" :style="{height: tableHeight + 'px'}" ref="dcryTable">
     <template #bodyCell="{ column, record }">
       <template v-if="column.dataIndex === 'action'">
         <a v-if="ownPriv('manage')" @click="deleteHandler(record)">删除</a>
@@ -150,7 +150,7 @@ export default {
 };
 </script>
 
-<style lang='less' scoped>
+<style scoped>
 /deep/ .ant-table-pagination {
   float: left;
 }

src/views/duChaJiHua/planManageProvinceNew/duChaDuiXiangSingle/ncgsgc.vue

@@ -1,5 +1,5 @@
 <template>
-  <a-table :columns="columns" :data-source="tableData" @change="handleCurrentChange" :loading="loading" rowKey="index" :pagination="{total, defaultPageSize: pageSize, showTotal: total => `共${total}条`}" style="width: 100%;" :style="{height: tableHeight + 'px'}" ref="dcryTable">
+  <a-table :columns="columns" :data-source="tableData" @change="handleCurrentChange" :loading="loading" :rowKey="(record) => record.id" :pagination="{total, defaultPageSize: pageSize, showTotal: total => `共${total}条`}" style="width: 100%;" :style="{height: tableHeight + 'px'}" ref="dcryTable">
     <template #bodyCell="{ column, record }">
       <template v-if="column.dataIndex === 'action'">
         <a v-if="ownPriv('manage')" @click="deleteHandler(record)">删除</a>
@@ -130,7 +130,7 @@ export default {
 };
 </script>
 
-<style lang='less' scoped>
+<style scoped>
 /deep/ .ant-table-pagination {
   float: left;
 }

src/views/duChaJiHua/planManageProvinceNew/duChaDuiXiangSingle/nongcunyinshuianquan.vue

@@ -1,5 +1,5 @@
 <template>
-  <a-table :columns="columns" :data-source="tableData" @change="handleCurrentChange" :loading="loading" rowKey="index" :pagination="{total, defaultPageSize: pageSize, showTotal: total => `共${total}条`}" style="width: 100%;" :style="{height: tableHeight + 'px'}" ref="dcryTable">
+  <a-table :columns="columns" :data-source="tableData" @change="handleCurrentChange" :loading="loading" :rowKey="(record) => record.id" :pagination="{total, defaultPageSize: pageSize, showTotal: total => `共${total}条`}" style="width: 100%;" :style="{height: tableHeight + 'px'}" ref="dcryTable">
     <template #bodyCell="{ column, record }">
       <template v-if="column.dataIndex === 'action'">
         <a v-if="ownPriv('manage')" @click="deleteHandler(record)">删除</a>
@@ -110,7 +110,7 @@ export default {
 };
 </script>
 
-<style lang='less' scoped>
+<style scoped>
 /deep/ .ant-table-pagination {
   float: left;
 }

src/views/duChaJiHua/planManageProvinceNew/duChaDuiXiangSingle/nongyin.vue

@@ -1,5 +1,5 @@
 <template>
-  <a-table :columns="columns" :data-source="tableData" @change="handleCurrentChange" :loading="loading" rowKey="index" :pagination="{total, defaultPageSize: pageSize, showTotal: total => `共${total}条`}" style="width: 100%;" :style="{height: tableHeight + 'px'}" ref="dcryTable">
+  <a-table :columns="columns" :data-source="tableData" @change="handleCurrentChange" :loading="loading" :rowKey="(record) => record.id" :pagination="{total, defaultPageSize: pageSize, showTotal: total => `共${total}条`}" style="width: 100%;" :style="{height: tableHeight + 'px'}" ref="dcryTable">
     <template #bodyCell="{ column, record }">
       <template v-if="column.dataIndex === 'action'">
         <a v-if="ownPriv('manage')" @click="deleteHandler(record)">删除</a>
@@ -170,7 +170,7 @@ export default {
 };
 </script>
 
-<style lang='less' scoped>
+<style scoped>
 /deep/ .ant-table-pagination {
   float: left;
 }

src/views/duChaJiHua/planManageProvinceNew/duChaDuiXiangSingle/quShuiGongCheng.vue

@@ -1,5 +1,5 @@
 <template>
-  <a-table :columns="columns" :data-source="tableData" @change="handleCurrentChange" :loading="loading" rowKey="index" :pagination="{total, defaultPageSize: pageSize, showTotal: total => `共${total}条`}" style="width: 100%;" :style="{height: tableHeight + 'px'}" ref="dcryTable">
+  <a-table :columns="columns" :data-source="tableData" @change="handleCurrentChange" :loading="loading" :rowKey="(record) => record.id" :pagination="{total, defaultPageSize: pageSize, showTotal: total => `共${total}条`}" style="width: 100%;" :style="{height: tableHeight + 'px'}" ref="dcryTable">
     <template #bodyCell="{ column, record }">
       <template v-if="column.dataIndex === 'action'">
         <a v-if="ownPriv('manage')" @click="deleteHandler(record)">删除</a>
@@ -150,7 +150,7 @@ export default {
 };
 </script>
 
-<style lang='less' scoped>
+<style scoped>
 /deep/ .ant-table-pagination {
   float: left;
 }

src/views/duChaJiHua/planManageProvinceNew/duChaDuiXiangSingle/renyin.vue

@@ -1,5 +1,5 @@
 <template>
-  <a-table :columns="columns" :data-source="tableData" @change="handleCurrentChange" :loading="loading" rowKey="index" :pagination="{total, defaultPageSize: pageSize, showTotal: total => `共${total}条`}" style="width: 100%;" :style="{height: tableHeight + 'px'}" ref="dcryTable">
+  <a-table :columns="columns" :data-source="tableData" @change="handleCurrentChange" :loading="loading" :rowKey="(record) => record.id" :pagination="{total, defaultPageSize: pageSize, showTotal: total => `共${total}条`}" style="width: 100%;" :style="{height: tableHeight + 'px'}" ref="dcryTable">
     <template #bodyCell="{ column, record }">
       <template v-if="column.dataIndex === 'action'">
         <a v-if="ownPriv('manage')" @click="deleteHandler(record)">删除</a>
@@ -170,7 +170,7 @@ export default {
 };
 </script>
 
-<style lang='less' scoped>
+<style scoped>
 /deep/ .ant-table-pagination {
   float: left;
 }

src/views/duChaJiHua/planManageProvinceNew/duChaDuiXiangSingle/shuiZiYuanJieShui.vue

@@ -1,5 +1,5 @@
 <template>
-  <a-table :columns="columns" :data-source="tableData" @change="handleCurrentChange" :loading="loading" rowKey="index" :pagination="{total, defaultPageSize: pageSize, showTotal: total => `共${total}条`}" style="width: 100%;" :style="{height: tableHeight + 'px'}" ref="dcryTable">
+  <a-table :columns="columns" :data-source="tableData" @change="handleCurrentChange" :loading="loading" :rowKey="(record) => record.id" :pagination="{total, defaultPageSize: pageSize, showTotal: total => `共${total}条`}" style="width: 100%;" :style="{height: tableHeight + 'px'}" ref="dcryTable">
     <template #bodyCell="{ column, record }">
       <template v-if="column.dataIndex === 'action'">
         <a v-if="ownPriv('manage')" @click="deleteHandler(record)">删除</a>
@@ -150,7 +150,7 @@ export default {
 };
 </script>
 
-<style lang='less' scoped>
+<style scoped>
 /deep/ .ant-table-pagination {
   float: left;
 }

src/views/duChaJiHua/planManageProvinceNew/duChaDuiXiangSingle/shuihui.vue

@@ -1,5 +1,5 @@
 <template>
-  <a-table :columns="columns" :data-source="tableData" @change="handleCurrentChange" :loading="loading" rowKey="index" :pagination="{total, defaultPageSize: pageSize, showTotal: total => `共${total}条`}" style="width: 100%;" :style="{height: tableHeight + 'px'}" ref="dcryTable">
+  <a-table :columns="columns" :data-source="tableData" @change="handleCurrentChange" :loading="loading" :rowKey="(record) => record.id" :pagination="{total, defaultPageSize: pageSize, showTotal: total => `共${total}条`}" style="width: 100%;" :style="{height: tableHeight + 'px'}" ref="dcryTable">
     <span slot="wtdstState" slot-scope="text">
       <span v-if="text.wtdstState == 1">已修复</span>
       <span v-else>未修复</span>
@@ -154,7 +154,7 @@ export default {
 };
 </script>
 
-<style lang='less' scoped>
+<style scoped>
 /deep/ .ant-table-pagination {
   float: left;
 }

src/views/duChaJiHua/planManageProvinceNew/duChaDuiXiangSingle/shuikufanghongdiaodu.vue

@@ -1,5 +1,5 @@
 <template>
-  <a-table :columns="columns" :data-source="tableData" @change="handleCurrentChange" :loading="loading" rowKey="index" :pagination="{total, defaultPageSize: pageSize, showTotal: total => `共${total}条`}" style="width: 100%;" :style="{height: tableHeight + 'px'}" ref="dcryTable">
+  <a-table :columns="columns" :data-source="tableData" @change="handleCurrentChange" :loading="loading" :rowKey="(record) => record.id" :pagination="{total, defaultPageSize: pageSize, showTotal: total => `共${total}条`}" style="width: 100%;" :style="{height: tableHeight + 'px'}" ref="dcryTable">
     <template #bodyCell="{ column, record }">
       <template v-if="column.dataIndex === 'action'">
         <a v-if="ownPriv('manage')" @click="deleteHandler(record)">删除</a>
@@ -130,7 +130,7 @@ export default {
 };
 </script>
 
-<style lang='less' scoped>
+<style scoped>
 /deep/ .ant-table-pagination {
   float: left;
 }

src/views/duChaJiHua/planManageProvinceNew/duChaDuiXiangSingle/shuilitisunian.vue

@@ -1,5 +1,5 @@
 <template>
-  <a-table :columns="columns" :data-source="tableData" @change="handleCurrentChange" :loading="loading" rowKey="index" :pagination="{total, defaultPageSize: pageSize, showTotal: total => `共${total}条`}" style="width: 100%;" :style="{height: tableHeight + 'px'}" ref="dcryTable">
+  <a-table :columns="columns" :data-source="tableData" @change="handleCurrentChange" :loading="loading" :rowKey="(record) => record.id" :pagination="{total, defaultPageSize: pageSize, showTotal: total => `共${total}条`}" style="width: 100%;" :style="{height: tableHeight + 'px'}" ref="dcryTable">
     <span slot="prjType" slot-scope="text">
       <span v-if="text.prjType == '1'">重点水利工程建设再提速</span>
       <span v-if="text.prjType == '2'">重点水利工程前期再提速</span>
@@ -157,7 +157,7 @@ export default {
 };
 </script>
 
-<style lang='less' scoped>
+<style scoped>
 /deep/ .ant-table-pagination {
   float: left;
 }

src/views/duChaJiHua/planManageProvinceNew/duChaDuiXiangSingle/shuixingzhengzhifa.vue

@@ -1,5 +1,5 @@
 <template>
-  <a-table :columns="columns" :data-source="tableData" @change="handleCurrentChange" :loading="loading" rowKey="index" :pagination="{total, defaultPageSize: pageSize, showTotal: total => `共${total}条`}" style="width: 100%;" :style="{height: tableHeight + 'px'}" ref="dcryTable">
+  <a-table :columns="columns" :data-source="tableData" @change="handleCurrentChange" :loading="loading" :rowKey="(record) => record.id" :pagination="{total, defaultPageSize: pageSize, showTotal: total => `共${total}条`}" style="width: 100%;" :style="{height: tableHeight + 'px'}" ref="dcryTable">
     <template #bodyCell="{ column, record }">
       <template v-if="column.dataIndex === 'action'">
         <a v-if="ownPriv('manage')" @click="deleteHandler(record)">删除</a>
@@ -110,7 +110,7 @@ export default {
 };
 </script>
 
-<style lang='less' scoped>
+<style scoped>
 /deep/ .ant-table-pagination {
   float: left;
 }

src/views/duChaJiHua/planManageProvinceNew/duChaDuiXiangSingle/shuiyuandi.vue

@@ -1,5 +1,5 @@
 <template>
-  <a-table :columns="columns" :data-source="tableData" @change="handleCurrentChange" :loading="loading" rowKey="index" :pagination="{total, defaultPageSize: pageSize, showTotal: total => `共${total}条`}" style="width: 100%;" :style="{height: tableHeight + 'px'}" ref="dcryTable">
+  <a-table :columns="columns" :data-source="tableData" @change="handleCurrentChange" :loading="loading" :rowKey="(record) => record.id" :pagination="{total, defaultPageSize: pageSize, showTotal: total => `共${total}条`}" style="width: 100%;" :style="{height: tableHeight + 'px'}" ref="dcryTable">
     <template #bodyCell="{ column, record }">
       <template v-if="column.dataIndex === 'action'">
         <a v-if="ownPriv('manage')" @click="deleteHandler(record)">删除</a>
@@ -130,7 +130,7 @@ export default {
 };
 </script>
 
-<style lang='less' scoped>
+<style scoped>
 /deep/ .ant-table-pagination {
   float: left;
 }

src/views/duChaJiHua/planManageProvinceNew/duChaDuiXiangSingle/shuizha.vue

@@ -1,5 +1,5 @@
 <template>
-  <a-table :columns="columns" :data-source="tableData" @change="handleCurrentChange" :loading="loading" rowKey="index" :pagination="{total, defaultPageSize: pageSize, showTotal: total => `共${total}条`}" style="width: 100%;" :style="{height: tableHeight + 'px'}" ref="dcryTable">
+  <a-table :columns="columns" :data-source="tableData" @change="handleCurrentChange" :loading="loading" :rowKey="(record) => record.id" :pagination="{total, defaultPageSize: pageSize, showTotal: total => `共${total}条`}" style="width: 100%;" :style="{height: tableHeight + 'px'}" ref="dcryTable">
     <span slot="gateType" slot-scope="text">
       <span v-if="text.gateType == '1'">分(泄)洪闸</span>
       <span v-else-if="text.gateType == '2'">节制闸</span>
@@ -206,7 +206,7 @@ export default {
 };
 </script>
 
-<style lang='less' scoped>
+<style scoped>
 /deep/ .ant-table-pagination {
   float: left;
 }

src/views/duChaJiHua/planManageProvinceNew/duChaDuiXiangSingle/shujunshashi.vue

@@ -1,5 +1,5 @@
 <template>
-  <a-table :columns="columns" :data-source="tableData" @change="handleCurrentChange" :loading="loading" rowKey="index" :pagination="{total, defaultPageSize: pageSize, showTotal: total => `共${total}条`}" style="width: 100%;" :style="{height: tableHeight + 'px'}" ref="dcryTable">
+  <a-table :columns="columns" :data-source="tableData" @change="handleCurrentChange" :loading="loading" :rowKey="(record) => record.id" :pagination="{total, defaultPageSize: pageSize, showTotal: total => `共${total}条`}" style="width: 100%;" :style="{height: tableHeight + 'px'}" ref="dcryTable">
     <template #bodyCell="{ column, record }">
       <template v-if="column.dataIndex === 'action'">
         <a v-if="ownPriv('manage')" @click="deleteHandler(record)">删除</a>
@@ -170,7 +170,7 @@ export default {
 };
 </script>
 
-<style lang='less' scoped>
+<style scoped>
 /deep/ .ant-table-pagination {
   float: left;
 }

src/views/duChaJiHua/planManageProvinceNew/duChaDuiXiangSingle/siLuanQianYi.vue

@@ -1,5 +1,5 @@
 <template>
-  <a-table :columns="columns" :data-source="tableData" @change="handleCurrentChange" :loading="loading" rowKey="index" :pagination="{total, defaultPageSize: pageSize, showTotal: total => `共${total}条`}" style="width: 100%;" :style="{height: tableHeight + 'px'}" ref="dcryTable">
+  <a-table :columns="columns" :data-source="tableData" @change="handleCurrentChange" :loading="loading" :rowKey="(record) => record.id" :pagination="{total, defaultPageSize: pageSize, showTotal: total => `共${total}条`}" style="width: 100%;" :style="{height: tableHeight + 'px'}" ref="dcryTable">
     <template #bodyCell="{ column, record }">
       <template v-if="column.dataIndex === 'action'">
         <a v-if="ownPriv('manage')" @click="deleteHandler(record)">删除</a>
@@ -130,7 +130,7 @@ export default {
 };
 </script>
 
-<style lang='less' scoped>
+<style scoped>
 /deep/ .ant-table-pagination {
   float: left;
 }

src/views/duChaJiHua/planManageProvinceNew/duChaDuiXiangSingle/sjzhdcjh.vue

@@ -1,4 +1,4 @@
-<template>
+<template>
   <a-table
     :row-selection="{
       selectedRowKeys: selectedRowKeys,
@@ -8,7 +8,7 @@
     :data-source="tableData"
     @change="handleCurrentChange"
     :loading="loading"
-    rowKey="index"
+    :rowKey="(record) => record.id"
     :pagination="{
       total,
       defaultPageSize: pageSize,
@@ -192,10 +192,10 @@ export default {
             this.commonType = res.data;
             this.columns.forEach((item) => {
               if (item.title == '督查类别') {
-                item.customRender = (value, row, index) => {
+                item.customRender = ({ record }) => {
                   let name = '';
                   this.commonType.forEach((item) => {
-                    if (item.dictTypeCd == row.type) {
+                    if (item.dictTypeCd == record.type) {
                       name = item.dictTypeDesc;
                     }
                   });
@@ -229,7 +229,7 @@ export default {
 };
 </script>
 
-<style lang="less" scoped>
+<style scoped>
 :deep(.ant-table-pagination) {
   float: left;
 }

src/views/duChaJiHua/planManageProvinceNew/duChaDuiXiangSingle/slaqscdpc.vue

@@ -1,5 +1,5 @@
 <template>
-  <a-table :columns="columns" :data-source="tableData" @change="handleCurrentChange" :loading="loading" rowKey="index" :pagination="{total, defaultPageSize: pageSize, showTotal: total => `共${total}条`}" style="width: 100%;" :style="{height: tableHeight + 'px'}" ref="dcryTable">
+  <a-table :columns="columns" :data-source="tableData" @change="handleCurrentChange" :loading="loading" :rowKey="(record) => record.id" :pagination="{total, defaultPageSize: pageSize, showTotal: total => `共${total}条`}" style="width: 100%;" :style="{height: tableHeight + 'px'}" ref="dcryTable">
     <template #bodyCell="{ column, record }">
       <template v-if="column.dataIndex === 'action'">
         <a v-if="ownPriv('manage')" @click="deleteHandler(record)">删除</a>
@@ -130,7 +130,7 @@ export default {
 };
 </script>
 
-<style lang='less' scoped>
+<style scoped>
 /deep/ .ant-table-pagination {
   float: left;
 }

src/views/duChaJiHua/planManageProvinceNew/duChaDuiXiangSingle/villsaf.vue

@@ -1,5 +1,5 @@
 <template>
-  <a-table :columns="columns" :data-source="tableData" @change="handleCurrentChange" :loading="loading" rowKey="index" :pagination="{total, defaultPageSize: pageSize, showTotal: total => `共${total}条`}" style="width: 100%;" :style="{height: tableHeight + 'px'}" ref="dcryTable">
+  <a-table :columns="columns" :data-source="tableData" @change="handleCurrentChange" :loading="loading" :rowKey="(record) => record.id" :pagination="{total, defaultPageSize: pageSize, showTotal: total => `共${total}条`}" style="width: 100%;" :style="{height: tableHeight + 'px'}" ref="dcryTable">
     <template #bodyCell="{ column, record }">
       <template v-if="column.dataIndex === 'action'">
         <a v-if="ownPriv('manage')" @click="deleteHandler(record)">删除</a>
@@ -130,7 +130,7 @@ export default {
 };
 </script>
 
-<style lang='less' scoped>
+<style scoped>
 /deep/ .ant-table-pagination {
   float: left;
 }

src/views/duChaJiHua/planManageProvinceNew/duChaDuiXiangSingle/xiaoshuidian.vue

@@ -1,5 +1,5 @@
 <template>
-  <a-table :columns="columns" :data-source="tableData" @change="handleCurrentChange" :loading="loading" rowKey="index" :pagination="{total, defaultPageSize: pageSize, showTotal: total => `共${total}条`}" style="width: 100%;" :style="{height: tableHeight + 'px'}" ref="dcryTable">
+  <a-table :columns="columns" :data-source="tableData" @change="handleCurrentChange" :loading="loading" :rowKey="(record) => record.id" :pagination="{total, defaultPageSize: pageSize, showTotal: total => `共${total}条`}" style="width: 100%;" :style="{height: tableHeight + 'px'}" ref="dcryTable">
     <template #bodyCell="{ column, record }">
       <template v-if="column.dataIndex === 'action'">
         <a v-if="ownPriv('manage')" @click="deleteHandler(record)">删除</a>
@@ -150,7 +150,7 @@ export default {
 };
 </script>
 
-<style lang='less' scoped>
+<style scoped>
 /deep/ .ant-table-pagination {
   float: left;
 }

src/views/duChaJiHua/planManageProvinceNew/duChaDuiXiangSingle/xiaoshuiku.vue

@@ -1,5 +1,5 @@
 <template>
-  <a-table :columns="columns" :data-source="tableData" @change="handleCurrentChange" :loading="loading" rowKey="index" :pagination="{total, defaultPageSize: pageSize, showTotal: total => `共${total}条`}" style="width: 100%;" :style="{height: tableHeight + 'px'}" ref="dcryTable">
+  <a-table :columns="columns" :data-source="tableData" @change="handleCurrentChange" :loading="loading" :rowKey="(record) => record.id" :pagination="{total, defaultPageSize: pageSize, showTotal: total => `共${total}条`}" style="width: 100%;" :style="{height: tableHeight + 'px'}" ref="dcryTable">
     <span slot="engScal" slot-scope="text">
       <span v-if="text.engScal == '1'">大（1）型</span>
       <span v-else-if="text.engScal == '2'">大（2）型</span>
@@ -187,7 +187,7 @@ export default {
 };
 </script>
 
-<style lang='less' scoped>
+<style scoped>
 /deep/ .ant-table-pagination {
   float: left;
 }

src/views/duChaJiHua/planManageProvinceNew/duChaDuiXiangSingle/yingjibeiyongshuiyuan.vue

@@ -1,5 +1,5 @@
 <template>
-  <a-table :columns="columns" :data-source="tableData" @change="handleCurrentChange" :loading="loading" rowKey="index" :pagination="{total, defaultPageSize: pageSize, showTotal: total => `共${total}条`}" style="width: 100%;" :style="{height: tableHeight + 'px'}" ref="dcryTable">
+  <a-table :columns="columns" :data-source="tableData" @change="handleCurrentChange" :loading="loading" :rowKey="(record) => record.id" :pagination="{total, defaultPageSize: pageSize, showTotal: total => `共${total}条`}" style="width: 100%;" :style="{height: tableHeight + 'px'}" ref="dcryTable">
     <template #bodyCell="{ column, record }">
       <template v-if="column.dataIndex === 'action'">
         <a v-if="ownPriv('manage')" @click="deleteHandler(record)">删除</a>
@@ -130,7 +130,7 @@ export default {
 };
 </script>
 
-<style lang='less' scoped>
+<style scoped>
 /deep/ .ant-table-pagination {
   float: left;
 }

src/views/duChaJiHua/planManageProvinceNew/duChaDuiXiangSingle/zhongDianShuiHuiGongCheng.vue

@@ -1,5 +1,5 @@
 <template>
-  <a-table :columns="columns" :data-source="tableData" @change="handleCurrentChange" :loading="loading" rowKey="index" :pagination="{total, defaultPageSize: pageSize, showTotal: total => `共${total}条`}" style="width: 100%;" :style="{height: tableHeight + 'px'}" ref="dcryTable">
+  <a-table :columns="columns" :data-source="tableData" @change="handleCurrentChange" :loading="loading" :rowKey="(record) => record.id" :pagination="{total, defaultPageSize: pageSize, showTotal: total => `共${total}条`}" style="width: 100%;" :style="{height: tableHeight + 'px'}" ref="dcryTable">
     <template #bodyCell="{ column, record }">
       <template v-if="column.dataIndex === 'action'">
         <a v-if="ownPriv('manage')" @click="deleteHandler(record)">删除</a>
@@ -150,7 +150,7 @@ export default {
 };
 </script>
 
-<style lang='less' scoped>
+<style scoped>
 /deep/ .ant-table-pagination {
   float: left;
 }

src/views/duChaJiHua/planManageProvinceNew/duChaDuiXiangSingle/zhongDianShuiLi.vue

@@ -1,5 +1,5 @@
 <template>
-  <a-table :columns="columns" :data-source="tableData" @change="handleCurrentChange" :loading="loading" rowKey="index" :pagination="{total, defaultPageSize: pageSize, showTotal: total => `共${total}条`}" style="width: 100%;" :style="{height: tableHeight + 'px'}" ref="dcryTable">
+  <a-table :columns="columns" :data-source="tableData" @change="handleCurrentChange" :loading="loading" :rowKey="(record) => record.id" :pagination="{total, defaultPageSize: pageSize, showTotal: total => `共${total}条`}" style="width: 100%;" :style="{height: tableHeight + 'px'}" ref="dcryTable">
     <template #bodyCell="{ column, record }">
       <template v-if="column.dataIndex === 'action'">
         <a v-if="ownPriv('manage')" @click="deleteHandler(record)">删除</a>
@@ -190,7 +190,7 @@ export default {
 };
 </script>
 
-<style lang='less' scoped>
+<style scoped>
 /deep/ .ant-table-pagination {
   float: left;
 }

src/views/duChaJiHua/planManageProvinceNew/planContent.vue

@@ -64,8 +64,8 @@
     <editDcqyInfo
       ref="editDcqyInfoRef"
       :objType="duChaType"
-      :plnaId="currentSelectTreeNodeId"
       :dczId="currentSelectTreeNodeId"
+      :dczName="currentSelectTreeNodeName"
       @addSuccess="quYuAddSuccessHandler"
     ></editDcqyInfo>
   </div>
@@ -128,6 +128,7 @@ export default {
     },
     currentSelectTreeNodeId() {
       const id = this.currentNodeinfo?.currentSelectTreeNodeId || '';
+      console.log('[planContent] computed currentSelectTreeNodeId:', id);
       return id;
     },
     currentSelectTreeNodeName() {
@@ -185,6 +186,7 @@ export default {
        }, 0);
      },
     duChaType(val) {
+      console.log(val, 'duChaType');
       // 1 小水库  2 人饮  3 水毁  4 水利工程建设  5 地下水  6 水闸  7 水利工程运行  36 大中型水库
       if (val == '1' || val == '2' || val == '3' || val == '36') {
         this.curEditDcdxInfo = 'editDcdxInfo';
@@ -245,13 +247,15 @@ export default {
   },
   methods: {
     showEditDialog(item) {
+      console.log('[planContent] showEditDialog - computed:', this.currentSelectTreeNodeId);
+      console.log('[planContent] showEditDialog - ref.dczId:', this.$refs['editDczInfoRef']?.dczId);
       this.$refs['editDczInfoRef'].showDialog();
     },
     showEditDialog_qy(item) {
-      this.$refs['editDcqyInfoRef'].showDialog();
+      this.$refs['editDcqyInfoRef']?.showDialog(this.currentSelectTreeNodeId);
     },
     showEditDialog_dx(item) {
-      this.$refs['editDcdxInfoRef'].showDialog(this.duChaType);
+      this.$refs['editDcdxInfoRef'].showDialog();
     },
     emitCurrentObjSelectName(item) {
       this.$refs['editDcdxInfoRef'].changeCurrentObjSelectName(item);

src/views/duChaJiHua/planManageProvinceNew/planContentCounty.vue

@@ -62,6 +62,6 @@ export default {
 };
 </script>
 
-<style lang='less' scoped>
+<style scoped>
 
 </style>

src/views/duChaJiHua/planManageProvinceNew/treeGroup.vue

@@ -451,22 +451,23 @@ export default {
       });
     },
     deleteZU(node, data) {
-      this.$confirm('是否删除督查组:' + data.name + '?', '提示', {
+      Modal.confirm({
+        title: '提示',
+        content: '是否删除督查组:' + data.name + '?',
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning',
-      })
-        .then(() => {
-          request
+        onOk: () => {
+          return request
             .post(`/dc/insp/group/delete?id=${node.data.code}`)
             .then((res) => {
-              // this.$refs.jigou_tree.remove(node)
               this.$message.success('删除成功');
             });
-        })
-        .catch(() => {
+        },
+        onCancel: () => {
           this.$message.info('已取消删除');
-        });
+        },
+      });
     },
   },
   watch: {

src/views/duChaJiHua/planManageProvinceNew/treeGroupCounty.vue

@@ -71,6 +71,7 @@
 </template>
 
 <script>
+import { Modal } from 'ant-design-vue';
 import request from '@/utils/gw_ajax_request';
 import { dateFormat } from '@/utils/gw_date';
 import { getTrees } from '@/utils/gw_formatTree';
@@ -232,7 +233,7 @@ export default {
     },
     deletePICI(data) {
       this.deleteFlag = true;
-      this.$confirm({
+      Modal.confirm({
         title: '提示',
         content: '是否删除批次' + data.pnm + '及关联督查组?',
         okType: 'info',
@@ -247,7 +248,8 @@ export default {
               }
             }
           });
-        },
+                  return Promise.resolve();
+},
         onCancel: () => {
           this.$message.info('已取消删除');
         },
@@ -341,7 +343,7 @@ export default {
 };
 </script>
 
-<style lang='less' scoped>
+<style scoped>
 .tree_group{
   .custom-tree-node{
     flex: 1;

src/views/duChaJiHua/reportIndex_zhdcqk.vue

@@ -256,7 +256,7 @@ export default {
 };
 </script>
 
-<style lang="less" scoped>
+<style scoped>
 @import url('../../assets/style/tableScroll.less');
 .main{
    width: 100%;

src/views/duChaTianBao/commonProblemList.vue

@@ -22,7 +22,7 @@
       bordered
       ref="multipleTable"
       :data-source="problemList"
-      row-key="pblmId"
+      :rowKey="(record) => record.pblmId"
       :pagination="false"
       :style="{ height: tableHeight + 'px' }"
       :scroll="{ y: tableHeight - 60 }"
@@ -32,28 +32,26 @@
         selectedRowKeys: selectedRowKeys,
         onChange: handleSelection,
         getCheckboxProps: record => ({
-          props: {
-            disabled: record.workflowStat && record.workflowStat !== '10',
-            name: record.workflowStat
-          }
+          disabled: record.workflowStat && record.workflowStat !== '10',
         })
       }">
-      <span slot="index" slot-scope="text, recode, index">
-        {{ (currentPage - 1) * pageSize + (index + 1) }}
-      </span>
-      <span slot="collTime" slot-scope="text">
-        {{ timestampToTime(text) }}
-      </span>
-      <span slot="action" slot-scope="text">
-        <!-- 通用督查页面需要 立行立改 的 改 -->
-        <template v-if="isTongYong == '1'">
-          <a-button v-if="text.offlineCancellation == '1'" @click="makeChange1(text)" type="link" title="取消立行立改" style="font-weight: bold;color: red;padding: 0 8px;">改</a-button>
-          <a-button v-else @click="makeChange(text)" type="link" title="设置立行立改" style="font-weight: bold;padding: 0 8px;">改</a-button>
-        </template>
-        <a-button icon="eye" title="查看详情" type="link" @click="showDetails(text.pblmId)" />
-        <a-button icon="edit" type="link" title="修改问题" @click="changeSup(text.pblmId)" v-if="openType && !(text.workflowStat && text.workflowStat != '10')" />
-        <a-button icon="delete" type="link" v-if="openType && !(text.workflowStat && text.workflowStat!='10')" title="删除问题" @click="removeSuperviseOne(text.pblmId)" />
-      </span>
+      <template #bodyCell="{ column, record, index }">
+        <span v-if="column.key === 'index'">
+          {{ (currentPage - 1) * pageSize + (index + 1) }}
+        </span>
+        <span v-else-if="column.key === 'collTime'">
+          {{ timestampToTime(record.collTime) }}
+        </span>
+        <span v-else-if="column.key === 'action'">
+          <template v-if="isTongYong == '1'">
+            <a-button v-if="record.offlineCancellation == '1'" @click="makeChange1(record)" type="link" title="取消立行立改" style="font-weight: bold;color: red;padding: 0 8px;">改</a-button>
+            <a-button v-else @click="makeChange(record)" type="link" title="设置立行立改" style="font-weight: bold;padding: 0 8px;">改</a-button>
+          </template>
+          <a-button title="查看详情" type="link" @click="showDetails(record.pblmId)"><EyeOutlined /></a-button>
+          <a-button title="修改问题" type="link" @click="changeSup(record.pblmId)" v-if="openType && !(record.workflowStat && record.workflowStat != '10')"><EditOutlined /></a-button>
+          <a-button type="link" v-if="openType && !(record.workflowStat && record.workflowStat!='10')" title="删除问题" @click="removeSuperviseOne(record.pblmId)"><DeleteOutlined /></a-button>
+        </span>
+      </template>
     </a-table>
     <a-pagination
       show-size-changer
@@ -94,6 +92,7 @@
     <!-- 添加问题组件 -->
     <problem-dialog
       v-if="showAddProblemDialog"
+      ref="problemDialogRef"
       :showAddProblemDialog="showAddProblemDialog"
       :objType="111"
       :rowData="rowData"
@@ -108,16 +107,16 @@
       :flag="flag">
     </problem-dialog>
     <a-modal
-      :open="pblmEascaderVisible"
+      v-model:open="pblmEascaderVisible"
       class="pblmEascader"
       title="新增问题"
       width="60%"
-      @cancel="pblmEascaderVisible = false">
+    >
       <pblmEascader :objType="rowData.type" @modelData="modelData" v-if="pblmEascaderVisible"></pblmEascader>
-      <span slot="footer">
+      <template #footer>
         <a-button @click="pblmEascaderVisible = false">返 回</a-button>
         <a-button type="primary" @click="submitEascader">确 定</a-button>
-      </span>
+      </template>
     </a-modal>
     <a-modal :open="makeChangeVisible" @cancel="makeChangeVisible=false" title="立行立改描述" width="40%">
       <a-form :label-col="{span: 6}" :wrapper-col="{span: 18}" class="demo-form-inline" style="padding-left: 10px;">
@@ -152,6 +151,7 @@
 </template>
 
 <script>
+import { EyeOutlined, EditOutlined, DeleteOutlined } from '@ant-design/icons-vue';
 import request from '../../utils/gw_ajax_request.js';
 import { formatDateTimeD } from '../../utils/gw_date';
 import problemDialog from '../duChaWenTi/addProblem/xiaoshuiku_problem_dialog.vue';
@@ -193,6 +193,7 @@ export default {
       probId: '',
       pblmEascaderVisible: false,
       newModelData: null,
+      dialogKey: 0,
       selectedRowKeys: [],
       columns: [
         {
@@ -251,6 +252,9 @@ export default {
     };
   },
   components: {
+    EyeOutlined,
+    EditOutlined,
+    DeleteOutlined,
     // 详情页
     supervisionDetails,
     // 删除描述页
@@ -404,11 +408,19 @@ export default {
         this.$message.warning('问题不可以为空');
         return;
       }
+      console.log(this.newModelData, '123');
+      setTimeout(() => {
+        this.$refs.problemDialogRef?.setNewModelData?.(this.newModelData);
+      }, 0);
       this.pblmEascaderVisible = false;
       this.showAddProblemDialog = true;
+      
     },
     modelData(val) {
       this.newModelData = val;
+      setTimeout(() => {
+        this.$refs.problemDialogRef?.setNewModelData?.(val);
+      }, 0);
     },
     // 设为立行立改
     makeChange(text) {

src/views/duChaTianBao/commonTab.vue

@@ -136,7 +136,7 @@ export default {
             if (this.pType == 22) {
               url = '/bis/insp/rsml/rgstr';
             }
-            request.post(url, formObj).then((res) => {
+            return request.post(url, formObj).then((res) => {
               if (res.success) {
                 this.$emit('addShuiKuSuccess');
                 this.$message.success('提交成功');
@@ -193,6 +193,6 @@ export default {
 };
 </script>
 
-<style lang='less' scoped>
+<style scoped>
 
 </style>

src/views/duChaTianBao/duChaTianBaoIndex_tydc.vue

@@ -253,6 +253,7 @@
 
 <script>
 import request from '../../utils/gw_ajax_request.js';
+import { Modal } from 'ant-design-vue';
 import { dateFormat } from '../../utils/gw_date.js';
 import { exportModel } from '../../utils/gw_exportModel';
 import addvSearch from '../../widgets/addvSearch.vue';
@@ -606,7 +607,7 @@ export default {
       this.getSkDataList();
     },
     submitHandler(rowData) {
-      this.$confirm({
+      Modal.confirm({
         title: '提示',
         content: '请确认所有信息填报完毕？',
         okType: 'warning',
@@ -615,9 +616,9 @@ export default {
             rgstrId: rowData.rgstrId,
             state: '2',
           };
-          request.post('/bis/insp/gnrl', formObj).then((res) => {
+          return request.post('/bis/insp/gnrl', formObj).then((res) => {
             if (res.success) {
-              request
+              return request
                 .get('/dc/insp/pblm/submit/updateState/' + rowData.objId)
                 .then((res) => {
                   if (res.success) {
@@ -684,12 +685,12 @@ export default {
       });
     },
     deleteMember(obj) {
-      this.$confirm({
+      Modal.confirm({
         title: '提示',
         content: '此操作将督查对象从列表中删除，确认删除该对象吗？',
         okType: 'warning',
         onOk: () => {
-          request
+          return request
             .get(
               `/supervision/plan/cleanObjDataByObjId?objType=111&objId=${obj.objId}&deleteMethod=1`,
             )
@@ -705,7 +706,7 @@ export default {
       });
     },
     revoke(rowData) {
-      this.$confirm({
+      Modal.confirm({
         title: '提示',
         content: '确定要撤销当前信息吗？',
         okType: 'warning',
@@ -714,7 +715,7 @@ export default {
             rgstrId: rowData.rgstrId,
             state: '1',
           };
-          request.post('/bis/insp/gnrl', formObj).then((res) => {
+          return request.post('/bis/insp/gnrl', formObj).then((res) => {
             if (res.success) {
               this.addShuiKuSuccess();
               this.$message.success('提交成功');

src/views/duChaWenTi/addProblem/commonwenti.vue

@@ -5,7 +5,7 @@
       :label-col="{span: 6}"
       :wrapper-col="{span: 18}"
       :rules="rules"
-      ref="problemForm">
+      ref="formRef">
       <a-form-item>
         <a-button type="link" @click="selectPblm" style="float: left;">选择问题</a-button>
       </a-form-item>
@@ -48,15 +48,15 @@
         <upload ref="uploadFile" :url="`/file/insert?bizId=`" @uploadOver="removeNewSupervision"></upload>
       </a-form-item>
       <a-form-item :wrapper-col="{ span: 18, offset: 6 }" style="margin-top: 50px">
-        <a-button type="primary" @click="onSubmit('problemForm')" style="width: 100px;float:right">保存</a-button>
+        <a-button type="primary" @click="onSubmit" style="width: 100px;float:right">保存</a-button>
       </a-form-item>
     </a-form>
-    <a-modal :open="pblmEascaderVisible" class="pblmEascader" title="选择问题" width="60%">
+    <a-modal v-model:open="pblmEascaderVisible" class="pblmEascader" title="选择问题" width="60%">
       <pblmEascader :objType="rowData.type" @modelData="modelData" :vmodelData="newPblmValue" :t3="t3"></pblmEascader>
-      <span slot="footer">
+      <template #footer>
         <a-button @click="pblmEascaderVisible=false">返 回</a-button>
         <a-button type="primary" @click="submitEascader">确 定</a-button>
-      </span>
+      </template>
     </a-modal>
   </div>
 </template>
@@ -160,15 +160,22 @@ export default {
     },
   },
   mounted() {
-    this.newPblmValue = this.newModelData;
-    if (this.newPblmValue) {
-      this.t1 = this.newPblmValue.model[0];
-      this.t2 = this.newPblmValue.model[1];
-      this.t3 = this.newPblmValue.label;
-      this.getYanZhongChengDu();
-    }
+    this.syncNewModel(this.newModelData);
+  },
+  watch: {
+    newModelData(val) {
+      this.syncNewModel(val);
+    },
   },
   methods: {
+    syncNewModel(data) {
+      if (!data) return;
+      this.newPblmValue = data;
+      this.t1 = data.model[0];
+      this.t2 = data.model[1];
+      this.t3 = data.label;
+      this.getYanZhongChengDu();
+    },
     disabledDate(current) {
       return current && current < moment().endOf('day').add(11, 'days');
     },
@@ -186,51 +193,58 @@ export default {
           }
         });
     },
-    onSubmit(problemForm) {
-      this.$refs[problemForm].validate((valid) => {
-        if (valid) {
-          this.problemForm.villType = '0';
-          this.problemForm.recPers = this.recPers;
-          this.problemForm.objId = this.objId;
-          this.problemForm.regid = this.currentObjectRgstrId;
-          this.problemForm.nm = this.objName;
-          this.problemForm.objType = this.objType;
-          this.problemForm.pblmStat = '0';
-          this.problemForm.cwsCode = this.rowData.type;
-          this.problemForm['inspPblmName'] = this.t1;
-          this.problemForm['inspPblmDesc'] = this.problemForm.inspPblmDesc;
-          this.problemForm['inspPlbmType'] = this.t2;
-          // this.problemForm['inspPblmName'] = this.t3.pblmDesc;
-          this.problemForm['inspPblmCode'] = this.t3;
-          this.problemForm['pblmsTypeId'] = this.newPblmValue.model[2];
-          this.problemForm.inspPblmCate = this.inspPblmCate;
-          if (!this.problemForm.inspPblmName) {
-            this.$message.info('问题类别不能为空');
-            return;
-          }
-          if (!this.problemForm.inspPlbmType) {
-            this.$message.info('检查项目不能为空');
-            return;
-          }
-          if (!this.problemForm.inspPblmCode) {
-            this.$message.info('问题描述不能为空');
-            return;
+    async onSubmit() {
+      const form = this.$refs.formRef;
+      if (!form || !form.validate) {
+        this.$refs.formRef = form;
+        this.doSubmit();
+        return;
+      }
+      try {
+        await form.validate();
+        this.doSubmit();
+      } catch (e) {
+        // validation failed
+      }
+    },
+    doSubmit() {
+      this.problemForm.villType = '0';
+      this.problemForm.recPers = this.recPers;
+      this.problemForm.objId = this.objId;
+      this.problemForm.regid = this.currentObjectRgstrId;
+      this.problemForm.nm = this.objName;
+      this.problemForm.objType = this.objType;
+      this.problemForm.pblmStat = '0';
+      this.problemForm.cwsCode = this.rowData.type;
+      this.problemForm['inspPblmName'] = this.t1;
+      this.problemForm['inspPblmDesc'] = this.problemForm.inspPblmDesc;
+      this.problemForm['inspPlbmType'] = this.t2;
+      this.problemForm['inspPblmCode'] = this.t3;
+      this.problemForm['pblmsTypeId'] = this.newPblmValue.model[2];
+      this.problemForm.inspPblmCate = this.inspPblmCate;
+      if (!this.problemForm.inspPblmName) {
+        this.$message.info('问题类别不能为空');
+        return;
+      }
+      if (!this.problemForm.inspPlbmType) {
+        this.$message.info('检查项目不能为空');
+        return;
+      }
+      if (!this.problemForm.inspPblmCode) {
+        this.$message.info('问题描述不能为空');
+        return;
+      }
+      request.post('/dc/insp/pblm', this.problemForm).then((res) => {
+        if (res.success) {
+          const pblmId = res.data.pblmId;
+          console.log('[commonwenti] doSubmit success, pblmId:', pblmId, 'uploadFile:', this.$refs.uploadFile);
+          this.pblmId = pblmId;
+          this.gwComFiles = [];
+          this.pblmStat = res.data.pblmStat;
+          if (this.$refs.uploadFile.submitUpload(pblmId)) {
+            this.removeNewSupervision();
           }
-          // this.problemForm.zgDate = this.problemForm.zgDate ? moment(this.problemForm.zgDate).format('YYYY-MM-DD') : null
-          // this.problemForm.proposeZgDate = this.problemForm.zgDate
-          // this.problemForm.proposeZgZgxx = this.problemForm.pblmSggtn
-          request.post('/dc/insp/pblm', this.problemForm).then((res) => {
-            if (res.success) {
-              this.pblmId = res.data.pblmId;
-              this.gwComFiles = [];
-              this.pblmStat = res.data.pblmStat;
-              if (this.$refs.uploadFile.submitUpload(res.data.pblmId)) {
-                this.removeNewSupervision();
-              }
-            }
-          });
-        } else {
-          return false;
+          this.$emit('closeDialog');
         }
       });
     },
@@ -266,11 +280,7 @@ export default {
       this.currentProblemDescList = item.pblmDescs;
     },
     modelData(val) {
-      this.newPblmValue = val;
-      this.t1 = this.newPblmValue.model[0];
-      this.t2 = this.newPblmValue.model[1];
-      this.t3 = this.newPblmValue.label;
-      this.getYanZhongChengDu();
+      this.syncNewModel(val);
     },
     selectPblm() {
       this.pblmEascaderVisible = true;

src/views/duChaWenTi/addProblem/xiaoshuiku_problem_dialog.vue

@@ -1,11 +1,12 @@
 <template>
   <a-modal
     :open="showAddProblemDialog"
-    @cancel="dialogClose"
+    @update:open="(val) => { if (!val) dialogClose() }"
     :title="objName + '新增问题'"
     class="custom_dialog"
-    style="width: 55%"
-    :footer="null">
+    width="55%"
+    :footer="null"
+  >
     <div style="text-align: center;">
       对象id：{{rowData.objId}}
       <component
@@ -25,7 +26,7 @@
         :regId="regId"
         :currentObjectRgstrId="currentObjectRgstrId"
         @closeDialog="dialogClose"
-        :newModelData="newModelData"
+        :newModelData="localNewModelData"
         :prjType="prjType"
         :flag="flag"></component>
          问题id：{{uuid}}
@@ -142,6 +143,7 @@ export default {
       uuid: simpleUuid(),
       // dialogTableVisible: true,
       curComponent: 'xiaoshuiku',
+      localNewModelData: null,
     };
   },
   mounted() {
@@ -190,9 +192,13 @@ export default {
     } else {
       this.curComponent = 'xiaoshuiku';
     }
-    this.showAddProblemDialog = true;
   },
   methods: {
+    setNewModelData(val) {
+      this.localNewModelData = val;
+      console.log(this.localNewModelData, 'xxxxx222xxxx');
+      
+    },
     dialogClose() {
       this.$emit('closeDialog');
     },

src/views/duChaWenTi/dcwt_ywgfzrwtcz_1.vue

@@ -1,4 +1,4 @@
-<template>
+<template>
   <div class="mainCss">
     <div class="pageRight_none">
       <a-tabs v-model="hasStat" type="card" ref="topContainer" @tabClick="handleClick">

src/views/duChaWenTi/duChaWenTi_dczfzzwtcz.vue

@@ -1,4 +1,4 @@
-<template>
+<template>
   <div>
     <a-tabs
       v-model="activeTab"
@@ -34,12 +34,12 @@
                     title: 'pnm',
                     key: 'pnm',
                   }"
-                  :expandedKeys.sync="expandedKeys"
+                  v-model:expandedKeys="expandedKeys"
                   ref="PTTab_OrgTree"
                   style="height:100%;"
                 >
-                  <template #custom="item">
-                    <span style="float:left;">{{ item.pnm }}</span>
+                  <template #title="{ pnm }">
+                    <span style="float:left;">{{ pnm }}</span>
                     <div
                       style="float:right;display: flex;justify-content: flex-end;align-items: center;width:50%;"
                     >
@@ -380,7 +380,7 @@
                     v-model="currentPage"
                     class="paginationCenter"
                     show-size-changer
-                    :pageSize.sync="pageSize"
+                    v-model:pageSize="pageSize"
                     :total="total"
                     :page-size-options="['10', '20', '50', '100']"
                     :show-total="(total) => `共${total}条`"
@@ -927,12 +927,11 @@
                     key: 'pnm',
                   }"
                   :auto-expand-parent="true"
-                  :expandedKeys.sync="expandedKeys"
+                  v-model:expandedKeys="expandedKeys"
                   ref="OTTab_OrgTree"
                   style="height:100%;"
                 >
-                  <template #custom="item">
-                    <span style="float:left;">{{ item.pnm }}</span>
+                  <template #title="{ pnm }"><span style="float:left;">{{ pnm }}</span>
                     <div
                       style="float:right;display: flex;justify-content: flex-end;align-items: center;width:50%;"
                     >
@@ -1313,7 +1312,7 @@
                     v-model="currentPage"
                     class="paginationCenter"
                     show-size-changer
-                    :pageSize.sync="pageSize"
+                    v-model:pageSize="pageSize"
                     :total="total"
                     :page-size-options="['10', '20', '50', '100']"
                     :show-total="(total) => `共${total}条`"
@@ -1380,12 +1379,11 @@
                     key: 'pnm',
                   }"
                   :auto-expand-parent="true"
-                  :expandedKeys.sync="expandedKeys"
+                  v-model:expandedKeys="expandedKeys"
                   ref="IQLTab_OrgTree"
                   style="height:100%;"
                 >
-                  <template #custom="item">
-                    <span style="float:left;">{{ item.pnm }}</span>
+                  <template #title="{ pnm }"><span style="float:left;">{{ pnm }}</span>
                     <div
                       style="float:right;display: flex;justify-content: flex-end;align-items: center;width:50%;"
                     >
@@ -1723,7 +1721,7 @@
                     v-model="currentPage"
                     class="paginationCenter"
                     show-size-changer
-                    :pageSize.sync="pageSize"
+                    v-model:pageSize="pageSize"
                     :total="total"
                     :page-size-options="['10', '20', '50', '100']"
                     :show-total="(total) => `共${total}条`"
@@ -1803,12 +1801,11 @@
                     key: 'pnm',
                   }"
                   :auto-expand-parent="true"
-                  :expandedKeys.sync="expandedKeys"
+                  v-model:expandedKeys="expandedKeys"
                   ref="FQLTab_OrgTree"
                   style="height:100%;"
                 >
-                  <template #custom="item">
-                    <span style="float:left;">{{ item.pnm }}</span>
+                  <template #title="{ pnm }"><span style="float:left;">{{ pnm }}</span>
                     <div
                       style="float:right;display: flex;justify-content: flex-end;align-items: center;width:50%;"
                     >
@@ -2122,7 +2119,7 @@
                     v-model="currentPage"
                     class="paginationCenter"
                     show-size-changer
-                    :pageSize.sync="pageSize"
+                    v-model:pageSize="pageSize"
                     :total="total"
                     :page-size-options="['10', '20', '50', '100']"
                     :show-total="(total) => `共${total}条`"
@@ -3588,7 +3585,6 @@ export default {
     },
     // 详情弹框
     showDialog(id) {
-      console.log(id, 'showDialog');
       this.currentProblemId = id;
       this.dealprobmleVisible = true;
       this.$nextTick(() => {
@@ -4729,32 +4725,40 @@ export default {
 };
 </script>
 
-<style lang="less" scoped>
+<style scoped>
 @import "./base.css";
 @import url("/src/assets/iconfont/iconfont.css");
 
-/deep/ .ant-table-pagination {
+:deep(.ant-table-pagination) {
   float: left;
 }
 
-/deep/ .ant-layout-sider,
-/deep/ .ant-layout-content {
+:deep(.ant-layout-sider),
+:deep(.ant-layout-content) {
   background: #fff;
 }
 
-/deep/ .ant-table-thead > tr > th,
-/deep/ .ant-table-tbody > tr > td {
+:deep(.ant-form-item) {
+  margin-bottom: 12px;
+}
+
+:deep(.ant-select) {
+  min-width: 200px;
+}
+
+:deep(.ant-table-thead > tr > th),
+:deep(.ant-table-tbody > tr > td) {
   padding: 0;
   height: 50px;
 }
 
-/deep/ .ant-table-scroll {
+:deep(.ant-table-scroll) {
   position: relative;
   z-index: 1;
 }
 
-/deep/.ant-table-fixed-left,
-/deep/ .ant-table-fixed-right {
+:deep(.ant-table-fixed-left),
+:deep(.ant-table-fixed-right) {
   z-index: 2;
 }
 

src/widgets/uploadFileNew.vue

@@ -9,7 +9,7 @@
       :before-upload="beforeUpload"
       ref="upload">
       <p class="ant-upload-drag-icon">
-        <a-icon type="inbox" />
+        <InboxOutlined />
       </p>
       <p class="ant-upload-text">
         将文件拖到此处，或<em>点击添加</em>
@@ -19,8 +19,10 @@
 </template>
 
 <script>
+import { InboxOutlined } from '@ant-design/icons-vue';
 import request from '../utils/gw_ajax_request';
 export default {
+  components: { InboxOutlined },
   props: ['url', 'accept'],
   data() {
     return {
@@ -88,6 +90,6 @@ export default {
 };
 </script>
 
-<style lang='less' scoped>
+<style scoped>
 
 </style>