111

src/App.vue

@@ -1,4 +1,4 @@
-<template>
+<template>
   <a-layout class="layout">
     <a-layout-header class="header">
       <div class="logo">

src/api/duChaPlan.js

@@ -219,6 +219,7 @@ export function addDczOthersMens(addArr, inspGroupId, mohurd, psn) {
   return request({
     url: '/dc/pers/base/addManByInspGroupIdAndManId',
     method: 'POST',
+    headers: { Authorization: '1' },
     params: {
       manIds: addArr,
       inspGroupId: inspGroupId,

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/utils/gw_hasPriv.js

@@ -1,21 +1,36 @@
 export function hasPriv(code) {
-  const privObj = JSON.parse(sessionStorage.getItem('privItem'));
+  let raw = sessionStorage.getItem('privItem');
+  if (!raw) {
+    raw = sessionStorage.getItem('privCollect');
+  }
+  if (!raw) return false;
+  const privObj = JSON.parse(raw);
   if (!privObj) return false;
+  // 根节点可能是数组，遍历所有顶层节点
+  if (Array.isArray(privObj)) {
+    for (const item of privObj) {
+      if (hasPermission(item, code)) {
+        console.log('[hasPriv] code:', code, 'result: true');
+        return true;
+      }
+    }
+    console.log('[hasPriv] code:', code, 'result: false');
+    return false;
+  }
   const result = hasPermission(privObj, code);
+  console.log('[hasPriv] code:', code, 'result:', result);
   return result;
 }
 function hasPermission(privItem, code) {
   if (!privItem) return false;
   if (code == privItem.code) {
     return true;
-  } else {
-    if (privItem.privList.length && privItem.privList.length > 0) {
-      for (var index = 0; index < privItem.privList.length; index++) {
-        var result = hasPermission(privItem.privList[index], code);
-        if (result) {
-          return true;
-        }
-      }
+  }
+  const children = privItem.privList || [];
+  for (var index = 0; index < children.length; index++) {
+    var result = hasPermission(children[index], code);
+    if (result) {
+      return true;
     }
   }
   return false;

src/views/duChaGuanLi/duChaQuYuList.vue

@@ -66,6 +66,7 @@
 </template>
 
 <script>
+import { Modal } from 'ant-design-vue';
 import {
   deleteDcqy,
   getDcqyList,
@@ -264,18 +265,19 @@ export default {
       this.itemInfo = row;
     },
     deleteHandler() {
-      this.$confirm({
+      Modal.confirm({
         title: '提示',
         content: '是否确认删除?',
         okType: 'warning',
         onOk: () => {
           deleteDcqy(this.itemInfo.areaId, this.isDeleteObj).then(
             (response) => {
-              this.getDcqyResult(); // 删除成功之后  刷新表格数据
+              this.getDcqyResult();
               this.$message.success('删除成功');
               this.confirmDialogVisible = false;
             },
           );
+          return Promise.resolve();
         },
         onCancel: () => {
           this.$message.info('已取消删除');
@@ -284,8 +286,12 @@ export default {
     },
   },
   watch: {
-    dczId: function (n, o) {
-      this.getDcqyResult(n);
+    dczId: {
+      immediate: true,
+      handler(n, o) {
+        console.log('[duChaQuYuList] dczId变化:', n);
+        this.getDcqyResult(n);
+      },
     },
     checked(n, o) {
       if (n == true) {

src/views/duChaGuanLi/duChaRenYuanList.vue

@@ -70,6 +70,7 @@
 </template>
 
 <script>
+import { Modal } from 'ant-design-vue';
 import { deleteMember, getDcryList, setHeadMan } from '../../api/duChaPlan';
 export default {
   props: ['objType', 'dczId', 'dczName'],
@@ -492,7 +493,7 @@ export default {
       });
     },
     deleteHandler(item) {
-      this.$confirm({
+      Modal.confirm({
         title: '提示',
         content: '是否确认删除?',
         okType: 'info',
@@ -509,6 +510,7 @@ export default {
               }
             }
           });
+          return Promise.resolve();
         },
         onCancel: () => {
           this.$message.info('已取消删除');
@@ -527,8 +529,12 @@ export default {
     },
   },
   watch: {
-    dczId: function (n, o) {
-      this.getDcryResult(n);
+    dczId: {
+      immediate: true,
+      handler(n, o) {
+        console.log('[renYuanList] dczId变化:', n, '旧值:', o);
+        this.getDcryResult(n);
+      },
     },
     checked(n, o) {
       if (n == true) {

src/views/duChaJiHua/editDcdxInfo_common.vue

@@ -1,4 +1,4 @@
-<template>
+<template>
   <a-modal
     title="添加督查对象"
     :open="dialogFormVisible"

src/views/duChaJiHua/editDcdxInfo_sjzhdcjh.vue

@@ -1,4 +1,4 @@
-<template>
+<template>
   <a-modal
     title="添加督查对象"
     :open="dialogFormVisible"

src/views/duChaJiHua/editDczInfo.vue

@@ -321,6 +321,7 @@ export default {
       } else {
         if (this.addArr) {
           try {
+            sessionStorage.setItem('Authorization', '1');
             addDczOthersMens(
               this.addArr,
               this.dcGroupId,

src/views/duChaJiHua/planManageProvinceNew.vue

@@ -14,13 +14,12 @@
         </a-select>
         <span class="hrs"></span>
       </p>
-
       <a-row :gutter="10">
         <a-col :span="leftWidth">
           <tree-group :orgType="orgType" @sendCurrentNodeinfo="sendCurrentNodeinfo"></tree-group>
         </a-col>
         <a-col :span="rightWidth" style="position: relative;">
-          <plan-content :duChaType="duChaType" :currentSelectTreeNodePsn="currentNodeinfo.currentSelectTreeNodePsn" :currentSelectTreeNodeId="currentNodeinfo.currentSelectTreeNodeId" :currentSelectTreeNodeName="currentNodeinfo.currentSelectTreeNodeName"></plan-content>
+          <plan-content ref="planContentRef" :duChaType="duChaType" :currentNodeinfo="currentNodeinfo"></plan-content>
           <div class="open_board">
             <a-icon type="left" v-if="isOpen" @click="closeLeft"/>
             <a-icon type="right" v-else @click="openLeft"/>
@@ -108,7 +107,17 @@ export default {
       );
     },
     sendCurrentNodeinfo(data) {
-      this.currentNodeinfo = data;
+      this.currentNodeinfo = { ...data };
+      this.$nextTick(() => {
+        const pc = this.$refs.planContentRef;
+        if (pc) {
+          const current = pc.activeContent;
+          pc.activeContent = current === 'first' ? 'second' : 'first';
+          pc.$nextTick(() => {
+            pc.activeContent = current;
+          });
+        }
+      });
     },
   },
 };

src/views/duChaJiHua/planManageProvinceNew/duChaDuiXiangList.vue

@@ -1,4 +1,4 @@
-<template>
+<template>
   <div style="height:100%;max-height:100%;overflow-y:hidden;display:flex;flex-direction:column;justify-content:space-between;">
     <div class="box-card" style="background-color: #ECF8FF; height: 40px; font-size: small; line-height: 30px; display: flex; justify-content: space-between; align-items: center;">
       <div style="display:flex;" class="checkbox_left">
@@ -35,6 +35,7 @@
 </template>
 
 <script>
+import { Modal } from 'ant-design-vue';
 import { deleteDcdxByObjid, getDcdxList } from '../../../api/duChaPlan';
 import common from './duChaDuiXiangSingle/common.vue';
 import diFangGongCheng from './duChaDuiXiangSingle/diFangGongCheng.vue';
@@ -249,7 +250,7 @@ export default {
     },
     deleteHandler(item) {
       const type = this.objType == '1110' ? '111' : this.objType;
-      this.$confirm({
+      Modal.confirm({
         title: '提示',
         content: '是否确认删除?',
         okType: 'warning',
@@ -257,7 +258,7 @@ export default {
           if (type == '111') {
             deleteDcdxByObjid(item.objId, type, '1').then((res) => {
               if (res.success) {
-                this.getDcdxList1(); // 删除成功之后  刷新表格数据
+                this.getDcdxList1();
                 this.$message.success('删除成功');
               } else {
                 if (res.message == '请先删除登记表') {
@@ -270,7 +271,7 @@ export default {
           } else {
             deleteDcdxByObjid(item.objId, type).then((res) => {
               if (res.success) {
-                this.getDcdxList1(); // 删除成功之后  刷新表格数据
+                this.getDcdxList1();
                 this.$message.success('删除成功');
               } else {
                 if (res.message == '请先删除登记表') {
@@ -281,6 +282,7 @@ export default {
               }
             });
           }
+          return Promise.resolve();
         },
         onCancel: () => {
           this.$message.info('已取消删除');
@@ -299,8 +301,11 @@ export default {
     objTypeName(n, o) {
       this.$emit('emitCurrentObjSelectName', n);
     },
-    dczId(n, o) {
-      this.getDcdxList1();
+    dczId: {
+      immediate: true,
+      handler(n, o) {
+        this.getDcdxList1();
+      },
     },
     checked(n, o) {
       if (n == true) {

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

@@ -1,4 +1,4 @@
-<template>
+<template>
   <a-table
     :row-selection="{
       selectedRowKeys: selectedRowKeys,
@@ -18,9 +18,11 @@
     :style="{ height: tableHeight + 'px' }"
     ref="dcryTable"
   >
-    <span v-if="ownPriv('manage')" slot="action" slot-scope="text">
-      <a @click="deleteHandler(text)">删除</a>
-    </span>
+    <template #bodyCell="{ column, record }">
+      <template v-if="column.dataIndex === 'action'">
+        <a v-if="ownPriv('manage')" @click="deleteHandler(record)">删除</a>
+      </template>
+    </template>
   </a-table>
 </template>
 

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

@@ -1,8 +1,10 @@
 <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">
-    <span v-if="ownPriv('manage')" slot="action" slot-scope="text">
-      <a @click="deleteHandler(text)">删除</a>
-    </span>
+    <template #bodyCell="{ column, record }">
+      <template v-if="column.dataIndex === 'action'">
+        <a v-if="ownPriv('manage')" @click="deleteHandler(record)">删除</a>
+      </template>
+    </template>
   </a-table>
 </template>
 

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

@@ -1,8 +1,10 @@
 <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">
-    <span v-if="ownPriv('manage')" slot="action" slot-scope="text">
-      <a @click="deleteHandler(text)">删除</a>
-    </span>
+    <template #bodyCell="{ column, record }">
+      <template v-if="column.dataIndex === 'action'">
+        <a v-if="ownPriv('manage')" @click="deleteHandler(record)">删除</a>
+      </template>
+    </template>
   </a-table>
 </template>
 

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

@@ -1,8 +1,10 @@
 <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">
-    <span v-if="ownPriv('manage')" slot="action" slot-scope="text">
-      <a @click="deleteHandler(text)">删除</a>
-    </span>
+    <template #bodyCell="{ column, record }">
+      <template v-if="column.dataIndex === 'action'">
+        <a v-if="ownPriv('manage')" @click="deleteHandler(record)">删除</a>
+      </template>
+    </template>
   </a-table>
 </template>
 

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

@@ -1,8 +1,10 @@
 <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">
-    <span v-if="ownPriv('manage')" slot="action" slot-scope="text">
-      <a @click="deleteHandler(text)">删除</a>
-    </span>
+    <template #bodyCell="{ column, record }">
+      <template v-if="column.dataIndex === 'action'">
+        <a v-if="ownPriv('manage')" @click="deleteHandler(record)">删除</a>
+      </template>
+    </template>
   </a-table>
 </template>
 

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

@@ -1,8 +1,10 @@
 <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">
-    <span v-if="ownPriv('manage')" slot="action" slot-scope="text">
-      <a @click="deleteHandler(text)">删除</a>
-    </span>
+    <template #bodyCell="{ column, record }">
+      <template v-if="column.dataIndex === 'action'">
+        <a v-if="ownPriv('manage')" @click="deleteHandler(record)">删除</a>
+      </template>
+    </template>
   </a-table>
 </template>
 

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

@@ -1,8 +1,10 @@
 <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">
-    <span v-if="ownPriv('manage')" slot="action" slot-scope="text">
-      <a @click="deleteHandler(text)">删除</a>
-    </span>
+    <template #bodyCell="{ column, record }">
+      <template v-if="column.dataIndex === 'action'">
+        <a v-if="ownPriv('manage')" @click="deleteHandler(record)">删除</a>
+      </template>
+    </template>
   </a-table>
 </template>
 

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

@@ -1,8 +1,10 @@
 <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">
-    <span v-if="ownPriv('manage')" slot="action" slot-scope="text">
-      <a @click="deleteHandler(text)">删除</a>
-    </span>
+    <template #bodyCell="{ column, record }">
+      <template v-if="column.dataIndex === 'action'">
+        <a v-if="ownPriv('manage')" @click="deleteHandler(record)">删除</a>
+      </template>
+    </template>
   </a-table>
 </template>
 

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

@@ -1,8 +1,10 @@
 <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">
-    <span v-if="ownPriv('manage')" slot="action" slot-scope="text">
-      <a @click="deleteHandler(text)">删除</a>
-    </span>
+    <template #bodyCell="{ column, record }">
+      <template v-if="column.dataIndex === 'action'">
+        <a v-if="ownPriv('manage')" @click="deleteHandler(record)">删除</a>
+      </template>
+    </template>
   </a-table>
 </template>
 

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

@@ -1,8 +1,10 @@
 <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">
-    <span v-if="ownPriv('manage')" slot="action" slot-scope="text">
-      <a @click="deleteHandler(text)">删除</a>
-    </span>
+    <template #bodyCell="{ column, record }">
+      <template v-if="column.dataIndex === 'action'">
+        <a v-if="ownPriv('manage')" @click="deleteHandler(record)">删除</a>
+      </template>
+    </template>
   </a-table>
 </template>
 

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

@@ -1,8 +1,10 @@
 <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">
-    <span v-if="ownPriv('manage')" slot="action" slot-scope="text">
-      <a @click="deleteHandler(text)">删除</a>
-    </span>
+    <template #bodyCell="{ column, record }">
+      <template v-if="column.dataIndex === 'action'">
+        <a v-if="ownPriv('manage')" @click="deleteHandler(record)">删除</a>
+      </template>
+    </template>
   </a-table>
 </template>
 

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

@@ -1,8 +1,10 @@
 <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">
-    <span v-if="ownPriv('manage')" slot="action" slot-scope="text">
-      <a @click="deleteHandler(text)">删除</a>
-    </span>
+    <template #bodyCell="{ column, record }">
+      <template v-if="column.dataIndex === 'action'">
+        <a v-if="ownPriv('manage')" @click="deleteHandler(record)">删除</a>
+      </template>
+    </template>
   </a-table>
 </template>
 

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

@@ -4,9 +4,11 @@
       <span v-if="text.wtdstState == 1">已修复</span>
       <span v-else>未修复</span>
     </span>
-    <span v-if="ownPriv('manage')" slot="action" slot-scope="text">
-      <a @click="deleteHandler(text)">删除</a>
-    </span>
+    <template #bodyCell="{ column, record }">
+      <template v-if="column.dataIndex === 'action'">
+        <a v-if="ownPriv('manage')" @click="deleteHandler(record)">删除</a>
+      </template>
+    </template>
   </a-table>
 </template>
 

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

@@ -1,8 +1,10 @@
 <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">
-    <span v-if="ownPriv('manage')" slot="action" slot-scope="text">
-      <a @click="deleteHandler(text)">删除</a>
-    </span>
+    <template #bodyCell="{ column, record }">
+      <template v-if="column.dataIndex === 'action'">
+        <a v-if="ownPriv('manage')" @click="deleteHandler(record)">删除</a>
+      </template>
+    </template>
   </a-table>
 </template>
 

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

@@ -7,9 +7,11 @@
       <span v-if="text.prjType == '4'">面上水利工程未开工</span>
       <span v-if="text.prjType == '5' || text.prjType == null">县级水利项目建设提速年实施方案</span>
     </span>
-    <span v-if="ownPriv('manage')" slot="action" slot-scope="text">
-      <a @click="deleteHandler(text)">删除</a>
-    </span>
+    <template #bodyCell="{ column, record }">
+      <template v-if="column.dataIndex === 'action'">
+        <a v-if="ownPriv('manage')" @click="deleteHandler(record)">删除</a>
+      </template>
+    </template>
   </a-table>
 </template>
 

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

@@ -1,8 +1,10 @@
 <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">
-    <span v-if="ownPriv('manage')" slot="action" slot-scope="text">
-      <a @click="deleteHandler(text)">删除</a>
-    </span>
+    <template #bodyCell="{ column, record }">
+      <template v-if="column.dataIndex === 'action'">
+        <a v-if="ownPriv('manage')" @click="deleteHandler(record)">删除</a>
+      </template>
+    </template>
   </a-table>
 </template>
 

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

@@ -1,8 +1,10 @@
 <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">
-    <span v-if="ownPriv('manage')" slot="action" slot-scope="text">
-      <a @click="deleteHandler(text)">删除</a>
-    </span>
+    <template #bodyCell="{ column, record }">
+      <template v-if="column.dataIndex === 'action'">
+        <a v-if="ownPriv('manage')" @click="deleteHandler(record)">删除</a>
+      </template>
+    </template>
   </a-table>
 </template>
 

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

@@ -16,9 +16,11 @@
       <span v-else-if="text.engScal == '3'">小型</span>
       <span v-else></span>
     </span>
-    <span v-if="ownPriv('manage')" slot="action" slot-scope="text">
-      <a @click="deleteHandler(text)">删除</a>
-    </span>
+    <template #bodyCell="{ column, record }">
+      <template v-if="column.dataIndex === 'action'">
+        <a v-if="ownPriv('manage')" @click="deleteHandler(record)">删除</a>
+      </template>
+    </template>
   </a-table>
 </template>
 

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

@@ -1,8 +1,10 @@
 <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">
-    <span v-if="ownPriv('manage')" slot="action" slot-scope="text">
-      <a @click="deleteHandler(text)">删除</a>
-    </span>
+    <template #bodyCell="{ column, record }">
+      <template v-if="column.dataIndex === 'action'">
+        <a v-if="ownPriv('manage')" @click="deleteHandler(record)">删除</a>
+      </template>
+    </template>
   </a-table>
 </template>
 

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

@@ -1,8 +1,10 @@
 <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">
-    <span v-if="ownPriv('manage')" slot="action" slot-scope="text">
-      <a @click="deleteHandler(text)">删除</a>
-    </span>
+    <template #bodyCell="{ column, record }">
+      <template v-if="column.dataIndex === 'action'">
+        <a v-if="ownPriv('manage')" @click="deleteHandler(record)">删除</a>
+      </template>
+    </template>
   </a-table>
 </template>
 

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

@@ -18,9 +18,11 @@
     :style="{ height: tableHeight + 'px' }"
     ref="dcryTable"
   >
-    <span v-if="ownPriv('manage')" slot="action" slot-scope="text">
-      <a @click="deleteHandler(text)">删除</a>
-    </span>
+    <template #bodyCell="{ column, record }">
+      <template v-if="column.dataIndex === 'action'">
+        <a v-if="ownPriv('manage')" @click="deleteHandler(record)">删除</a>
+      </template>
+    </template>
   </a-table>
 </template>
 

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

@@ -1,8 +1,10 @@
 <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">
-    <span v-if="ownPriv('manage')" slot="action" slot-scope="text">
-      <a @click="deleteHandler(text)">删除</a>
-    </span>
+    <template #bodyCell="{ column, record }">
+      <template v-if="column.dataIndex === 'action'">
+        <a v-if="ownPriv('manage')" @click="deleteHandler(record)">删除</a>
+      </template>
+    </template>
   </a-table>
 </template>
 

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

@@ -1,8 +1,10 @@
 <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">
-    <span v-if="ownPriv('manage')" slot="action" slot-scope="text">
-      <a @click="deleteHandler(text)">删除</a>
-    </span>
+    <template #bodyCell="{ column, record }">
+      <template v-if="column.dataIndex === 'action'">
+        <a v-if="ownPriv('manage')" @click="deleteHandler(record)">删除</a>
+      </template>
+    </template>
   </a-table>
 </template>
 

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

@@ -1,8 +1,10 @@
 <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">
-    <span v-if="ownPriv('manage')" slot="action" slot-scope="text">
-      <a @click="deleteHandler(text)">删除</a>
-    </span>
+    <template #bodyCell="{ column, record }">
+      <template v-if="column.dataIndex === 'action'">
+        <a v-if="ownPriv('manage')" @click="deleteHandler(record)">删除</a>
+      </template>
+    </template>
   </a-table>
 </template>
 

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

@@ -17,9 +17,11 @@
       <span v-else-if="text.rsAdmDep == 7">环保部门</span>
       <span v-else>其他部门</span>
     </span>
-    <span v-if="ownPriv('manage')" slot="action" slot-scope="text">
-      <a @click="deleteHandler(text)">删除</a>
-    </span>
+    <template #bodyCell="{ column, record }">
+      <template v-if="column.dataIndex === 'action'">
+        <a v-if="ownPriv('manage')" @click="deleteHandler(record)">删除</a>
+      </template>
+    </template>
   </a-table>
 </template>
 

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

@@ -1,8 +1,10 @@
 <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">
-    <span v-if="ownPriv('manage')" slot="action" slot-scope="text">
-      <a @click="deleteHandler(text)">删除</a>
-    </span>
+    <template #bodyCell="{ column, record }">
+      <template v-if="column.dataIndex === 'action'">
+        <a v-if="ownPriv('manage')" @click="deleteHandler(record)">删除</a>
+      </template>
+    </template>
   </a-table>
 </template>
 

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

@@ -1,8 +1,10 @@
 <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">
-    <span v-if="ownPriv('manage')" slot="action" slot-scope="text">
-      <a @click="deleteHandler(text)">删除</a>
-    </span>
+    <template #bodyCell="{ column, record }">
+      <template v-if="column.dataIndex === 'action'">
+        <a v-if="ownPriv('manage')" @click="deleteHandler(record)">删除</a>
+      </template>
+    </template>
   </a-table>
 </template>
 

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

@@ -1,8 +1,10 @@
 <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">
-    <span v-if="ownPriv('manage')" slot="action" slot-scope="text">
-      <a @click="deleteHandler(text)">删除</a>
-    </span>
+    <template #bodyCell="{ column, record }">
+      <template v-if="column.dataIndex === 'action'">
+        <a v-if="ownPriv('manage')" @click="deleteHandler(record)">删除</a>
+      </template>
+    </template>
   </a-table>
 </template>
 

src/views/duChaJiHua/planManageProvinceNew/planContent.vue

@@ -2,7 +2,7 @@
   <div class="grid-content bg-purple" style="height: 100%;">
     <a-card class="box-card" style="height: 100%">
       <a-tabs
-        v-model="activeContent"
+        v-model:activeKey="activeContent"
         type="card"
         style="height:100%;width: 100%;"
       >
@@ -108,16 +108,14 @@ import duChaDuiXiangList from './duChaDuiXiangList.vue';
 export default {
   props: [
     'duChaType',
-    'currentSelectTreeNodeId',
-    'currentSelectTreeNodeName',
-    'currentSelectTreeNodePsn',
+    'currentNodeinfo',
   ],
   data() {
     return {
       tabContentHeight: window.innerHeight - 260,
       showRightComponent: false,
       activeContent: 'first',
-      plnaTreeCode: '', // 也许不需要？
+      plnaTreeCode: '',
       curEditDcdxInfo: 'editDcdxInfo', // 根据duChaType判断当前添加对象的弹窗类型
     };
   },
@@ -128,6 +126,16 @@ export default {
     hideArea() {
       return this.duChaType == '23';
     },
+    currentSelectTreeNodeId() {
+      const id = this.currentNodeinfo?.currentSelectTreeNodeId || '';
+      return id;
+    },
+    currentSelectTreeNodeName() {
+      return this.currentNodeinfo?.currentSelectTreeNodeName || '';
+    },
+    currentSelectTreeNodePsn() {
+      return this.currentNodeinfo?.currentSelectTreeNodePsn || '';
+    },
   },
   components: {
     duChaRenYuanList,
@@ -166,30 +174,14 @@ export default {
   mounted() {
     this.showRightComponent = true;
   },
-  methods: {
-    showEditDialog(item) {
-      this.$refs['editDczInfoRef'].showDialog();
-    },
-    showEditDialog_qy(item) {
-      this.$refs['editDcqyInfoRef'].showDialog();
-    },
-    showEditDialog_dx(item) {
-      this.$refs['editDcdxInfoRef'].showDialog(this.duChaType);
-    },
-    emitCurrentObjSelectName(item) {
-      this.$refs['editDcdxInfoRef'].changeCurrentObjSelectName(item);
-    },
-    RenYuanaAddSuccessHandler: function () {
-      this.$refs['renYuanList'].getDcryResult();
-    },
-    DuiXiangAddSuccessHandler: function () {
-      this.$refs['duiXiangList'].getDcdxList1();
-    },
-    quYuAddSuccessHandler: function () {
-      this.$refs['qyList'].getDcqyResult();
-    },
-  },
   watch: {
+    currentNodeinfo: {
+      deep: true,
+      handler(val) {
+        console.log('[子] currentNodeinfo变化:', val?.currentSelectTreeNodeId);
+        if (!val?.currentSelectTreeNodeId) return;
+      },
+    },
     duChaType(val) {
       // 1 小水库  2 人饮  3 水毁  4 水利工程建设  5 地下水  6 水闸  7 水利工程运行  36 大中型水库
       if (val == '1' || val == '2' || val == '3' || val == '36') {
@@ -249,7 +241,30 @@ export default {
       }
     },
   },
+  methods: {
+    showEditDialog(item) {
+      this.$refs['editDczInfoRef'].showDialog();
+    },
+    showEditDialog_qy(item) {
+      this.$refs['editDcqyInfoRef'].showDialog();
+    },
+    showEditDialog_dx(item) {
+      this.$refs['editDcdxInfoRef'].showDialog(this.duChaType);
+    },
+    emitCurrentObjSelectName(item) {
+      this.$refs['editDcdxInfoRef'].changeCurrentObjSelectName(item);
+    },
+    RenYuanaAddSuccessHandler: function () {
+      this.$refs['renYuanList'].getDcryResult();
+    },
+    DuiXiangAddSuccessHandler: function () {
+      this.$refs['duiXiangList'].getDcdxList1();
+    },
+    quYuAddSuccessHandler: function () {
+      this.$refs['qyList'].getDcqyResult();
+    },
+  },
 };
 </script>
 
-<style lang="less" scoped></style>
+<style scoped></style>

src/views/duChaJiHua/planManageProvinceNew/treeGroup.vue

@@ -11,25 +11,26 @@
           :auto-expand-parent="true"
           :expanded-keys="expandedKeys"
           @update:expandedKeys="expandedKeys = $event"
+          v-model:selectedKeys="selectedKeys"
           ref="jigou_tree">
           <template #title="{ dataRef }">
             <span v-if="!dataRef" style="display:flex; align-items:center;"></span>
             <span v-else style="display:flex; align-items:center; justify-content:space-between; width:100%;">
               <span style="display:flex; align-items:center; min-width:0; flex:1;">
-                <span v-if="dataRef.id && dataRef.id.length >= 12 && userInThisGroup(dataRef)" style="flex-shrink:0;">
+                <span v-if="dataRef.id && dataRef.id.length >= 12 && userInThisGroup(dataRef) && ownPriv('manage')" style="flex-shrink:0;">
                   <img src="../../../assets/images/choucha.png" v-if="dataRef.chkType == '0'" style="width:25px; height:20px;"/>
                   <img src="../../../assets/images/zicha.png" v-if="dataRef.chkType=='1'" style="width:25px; height:20px;"/>
                 </span>
                 <span v-if="orgType == '1110'" :style="{color: dataRef.colour, overflow:'hidden', textOverflow:'ellipsis', whiteSpace:'nowrap'}">{{ dataRef.pnm ? (dataRef.pnm.length > 12 ? (dataRef.pnm.substring(0, 10)) + '...' : dataRef.pnm) : '' }}</span>
                 <span v-else style="overflow:hidden; text-overflow:ellipsis; white-space:nowrap;">{{ dataRef.pnm ? (dataRef.pnm.length > 12 ? (dataRef.pnm.substring(0, 10)) + '...' : dataRef.pnm) : '' }}</span>
                 <a-button
-                  v-if="dataRef.id && dataRef.id.length > 6 && userInThisGroup(dataRef)"
+                  v-if="dataRef.id && dataRef.id.length > 6 && userInThisGroup(dataRef) && ownPriv('manage')"
                   type="danger"
                   ghost
                   size="small"
                   shape="circle"
                   @click="() => deletePICI(dataRef)"
-                  style="border:0; margin-left:4px; flex-shrink:0;"></a-button>
+                  style="border:0; margin-left:4px; flex-shrink:0;"><CloseCircleOutlined /></a-button>
               </span>
               <span style="display:flex; align-items:center; gap:4px; flex-shrink:0; margin-left:8px;">
                 <a-button
@@ -84,18 +85,20 @@
 <script>
 import moment from 'moment';
 import request from '@/utils/gw_ajax_request';
+import { Modal } from 'ant-design-vue';
 import { dateFormat } from '@/utils/gw_date';
 import { getTrees } from '@/utils/gw_formatTree';
-import { EditOutlined, ClockCircleOutlined } from '@ant-design/icons-vue';
+import { EditOutlined, ClockCircleOutlined, CloseCircleOutlined } from '@ant-design/icons-vue';
 export default {
   emits: ['sendCurrentNodeinfo'],
   props: ['orgType'],
-  components: { EditOutlined, ClockCircleOutlined },
+  components: { EditOutlined, ClockCircleOutlined, CloseCircleOutlined },
   data() {
     return {
       treeHeight: window.innerHeight - 190,
       treeData: [],
       expandedKeys: [],
+      selectedKeys: [],
       treeInfoOrigin: null, // 原始后台返回的树数据结构
       currentSelectTreeNode: {
         currentSelectTreeNodeName: '',
@@ -142,7 +145,7 @@ export default {
         : '';
     },
     currentSelectTreeNodeId() {
-      return this.currentSelectTreeNode.currentSelectTreeNodeId;
+       return this.currentSelectTreeNode.currentSelectTreeNodeId;
     },
   },
   created() {},
@@ -216,7 +219,7 @@ export default {
           this.expandedKeys.push(data[0].id);
           this.currentSelectTreeNode.currentSelectTreeNodeId =
             this.treeData[0].id;
-          this.$emit('sendCurrentNodeinfo', this.currentSelectTreeNode);
+          this.$emit('sendCurrentNodeinfo', { ...this.currentSelectTreeNode });
         });
     },
     userInThisGroup(item) {
@@ -251,7 +254,7 @@ export default {
       this.currentSelectTreeNode.currentSelectTreeNodeType = data.type;
       this.currentSelectTreeNode.currentSelectTreeNodeId = data.id;
       this.currentSelectTreeNode.currentSelectTreeNodePsn = data.psn;
-      this.$emit('sendCurrentNodeinfo', this.currentSelectTreeNode);
+      this.$emit('sendCurrentNodeinfo', { ...this.currentSelectTreeNode });
       if (data.type == '3') {
         this.plnaTreeCode = data.code;
         this.plnaTreeName = data.name;
@@ -264,7 +267,7 @@ export default {
       this.currentSelectTreeNode.currentSelectTreeNodeCode = data.code;
       this.currentSelectTreeNode.currentSelectTreeNodeType = data.type;
       this.currentSelectTreeNode.currentSelectTreeNodeId = data.id;
-      this.$emit('sendCurrentNodeinfo', this.currentSelectTreeNode);
+      this.$emit('sendCurrentNodeinfo', { ...this.currentSelectTreeNode });
       if (data.type == '3') {
         this.plnaTreeCode = data.code;
         this.plnaTreeName = data.name;
@@ -273,7 +276,7 @@ export default {
     },
     deletePICI(data) {
       this.deleteFlag = true;
-      this.$confirm({
+      Modal.confirm({
         title: '提示',
         content: '是否删除批次' + data.pnm + '及关联督查组?',
         okType: 'info',
@@ -283,12 +286,12 @@ export default {
               if (res.message == '请先删除人员或对象') {
                 this.$message.warning('请先删除组内人员、对象及区域!');
               } else {
-                // this.searchOption(data, this.treeData)
                 this.$message.success('删除成功!');
                 this.getLeftTreeData();
               }
             }
           });
+          return Promise.resolve();
         },
         onCancel: () => {
           this.$message.info('已取消删除');
@@ -476,7 +479,7 @@ export default {
 };
 </script>
 
-<style lang='less' scoped>
+<style scoped>
 .tree_group{
   .custom-tree-node{
     flex: 1;
@@ -487,4 +490,10 @@ export default {
     padding-right: 8px;
   }
 }
+::v-deep .ant-tree-node-content-wrapper.ant-tree-node-selected {
+  background-color: #e6f7ff !important;
+}
+::v-deep .ant-tree-treenode-selected {
+  background-color: #e6f7ff !important;
+}
 </style>

src/views/duChaTianBao/commonTab.vue

@@ -1,4 +1,4 @@
-<template>
+<template>
   <div id="shuikutianbaoId">
     <a-modal :title="currentObjectName + '督查填报'" :footer="null" width="60%" :open="dialogFormVisible" @cancel="closeDialog">
       督查对象id：{{rowData.objId}}
@@ -31,6 +31,7 @@
 
 <script>
 import request from '../../utils/gw_ajax_request';
+import { Modal } from 'ant-design-vue';
 import jichuxinxi from './common/jichuxinxi';
 import problemList from './commonProblemList';
 export default {
@@ -122,7 +123,7 @@ export default {
           this.$message.warning('走访用户状态！');
           return;
         }
-        this.$confirm({
+        Modal.confirm({
           title: '提示',
           content: '请确认所有信息填报完毕？',
           okType: 'warning',
@@ -171,12 +172,13 @@ export default {
       this.$emit('addShuiKuSuccess');
     },
     closeDialog() {
-      this.$confirm({
+      Modal.confirm({
         title: '提示',
         content: '确认退出吗？',
         okType: 'warning',
         onOk: () => {
           this.$emit('cancelHandler');
+          return Promise.resolve();
         },
       });
     },

src/views/duChaTianBao/duChaTianBaoIndex_tydc.vue

@@ -120,7 +120,7 @@
                 <div>
                   <a-button size="small" type="primary" v-if="!record.rgstrId" ghost @click="toAddMember('填报',record)">填报</a-button>
                   <a-button size="small" type="primary" v-if="record.rgstrId" ghost @click="toAddMember('编辑',record)" :disabled="record.state=='2'&&record.chkType!='1'">督查</a-button>
-                  <a-button size="small" type="danger" v-if="record.rgstrId&&record.chkType!='1'" ghost @click="submitHandler(record)" :disabled="record.state=='2'">提交</a-button>
+                  <a-button size="small" type="primary  v-if="record.rgstrId&&record.chkType!='1'" ghost @click="submitHandler(record)" :disabled="record.state=='2'" >提交</a-button>
                   <a-button size="small" type="primary" v-if="record.rgstrId&&record.state=='2'" ghost @click="toCheck(record)">查看</a-button>
                   <a-button type="primary" size="small" v-if="record.rgstrId&&(record.adjustState=='1'||record.adjustState=='0'||!record.adjustState)" @click="showEditDialog(record)">信息调整</a-button>
                   <a-button size="small" type="primary" @click="showRecord(record)">记录</a-button>
@@ -128,9 +128,9 @@
               </div>
               <div style="display:flex;justify-content:center;" v-else>
                 <a-button size="small" type="primary" v-if="record.rgstrId" ghost @click="toAddMember('编辑',record)" :disabled="record.state=='2'">督查</a-button>
-                <a-button size="small" type="danger" v-if="record.rgstrId" ghost @click="submitHandler(record)" :disabled="record.state=='2'">提交</a-button>
+                <a-button size="small" type="primary" v-if="record.rgstrId" ghost @click="submitHandler(record)" :disabled="record.state=='2'">提交</a-button>
                 <a-button size="small" type="primary" v-if="record.rgstrId&&record.state=='2'" ghost @click="toCheck(record)">查看</a-button>
-                <a-button size="small" type="danger" v-if="record.rgstrId&&record.state=='2'" ghost @click="revoke(record)">撤回</a-button>
+                <a-button size="small" type="primary" v-if="record.rgstrId&&record.state=='2'" ghost @click="revoke(record)">撤回</a-button>
               </div>
             </template>
           </template>
@@ -867,8 +867,13 @@ export default {
   },
 };
 </script>
-
+<style scoped>
+.ant-btn-dangerous.ant-btn-background-ghost[disabled] {
+  opacity: 0.5;
+}
+</style>
 <style lang='less' scoped>
+
 /deep/ .ant-layout-sider,
 /deep/ .ant-layout-content {
   background: #fff;

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/xiTongGuanLi/dcjcxx.vue

@@ -1,4 +1,4 @@
-<template>
+<template>
   <div id="" style="width: 100%;height: 100%;">
     <a-layout>
       <a-layout-sider