123

src/utils/gw_hasPriv.js

@@ -10,15 +10,12 @@ export function hasPriv(code) {
   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) {

src/views/duChaGuanLi/duChaRenYuanList.vue

@@ -42,26 +42,24 @@
           <span v-else>{{ record.personType }}</span>
         </template>
         <template v-else-if="column.dataIndex === 'action'">
-          <span>
-            <template v-if="(objType == '1' || objType == '50' || objType == '51' || objType == '52' || objType == '58' || objType == '59' || objType == '60' || objType == '64' || objType == '61' || objType == '63' || objType == '18' || objType == '65' || objType == '66' || objType == '85' || objType == '86' || objType == '87' || objType == '88' || objType == '90' || objType == '92' || objType == '107' || objType == '109' || objType == '111' || objType == '114' || objType == '117' || objType == '1110') && ownPriv('manage')">
-              <a-select v-model:value="record.pertype" @change="(val) => {swzzHandler(record, val)}" placeholder="请选择" size="small" style="width: 100px">
-                <a-select-option v-for="item in options" :key="item.value" :value="item.value">{{ item.label }}</a-select-option>
-              </a-select>
-              <img src="../../assets/img/delete.png" @click="deleteHandler(record)" title="删除" style="cursor:pointer;width: 20px;"></img>
-            </template>
-            <template v-if="objType=='8' && ownPriv('manage')">
-              <a-select v-model:value="record.pertype" @change="(val) => {swzzHandler(record, val)}" placeholder="请选择" size="small" style="width: 100px">
-                <a-select-option v-for="item in options8" :key="item.value" :value="item.value">{{ item.label }}</a-select-option>
-              </a-select>
-              <img src="../../assets/img/delete.png" @click="deleteHandler(record)" title="删除" style="cursor:pointer;width: 20px;"></img>
-            </template>
-            <template v-else-if="ownPriv('manage') && objType != '1' && objType != '8' && objType != '50' && objType != '51' && objType != '52' && objType != '58' && objType != '59' && objType != '60' && objType != '64' && objType != '61' && objType != '63' && objType != '65' && objType != '66' && objType != '18' && objType != '107' && objType != '109' && objType != '111' && objType != '114' && objType != '117' && objType != '1110'">
-              <span v-if="objType != '1' && objType != '8' && objType != '50' && objType != '51' && objType != '52' && objType != '66' && objType != '85' && objType != '86' && objType != '87' && objType != '88' && objType != '90' && objType != '92' && objType != '107' && objType != '109' && objType != '111' && objType != '114' && objType != '117' && objType != '1110'">
-                <img src="../../assets/img/zuzhang.png" v-if="record.pertype != '1'" @change="(val) => {swzzHandler(record, '1')}" title="设为组长" style="cursor:pointer;width: 20px;">
-                <img src="../../assets/img/qxzuzhang.png" v-else @click="qxzzHandler(record)" title="取消组长" style="cursor:pointer;width: 20px;">
-                <img src="../../assets/img/delete.png" @click="deleteHandler(record)" title="删除" style="cursor:pointer;width: 20px;">
-              </span>
-            </template>
+          <span v-if="(objType == '1' || objType == '50' || objType == '51' || objType == '52' || objType == '58' || objType == '59' || objType == '60' || objType == '64' || objType == '61' || objType == '63' || objType == '18' || objType == '65' || objType == '66' || objType == '85' || objType == '86' || objType == '87' || objType == '88' || objType == '90' || objType == '92' || objType == '107' || objType == '109' || objType == '111' || objType == '114' || objType == '117' || objType == '1110') && ownPriv('manage')">
+            <a-select v-model:value="record.pertype" @change="(val) => {swzzHandler(record, val)}" placeholder="请选择" size="small" style="width: 100px">
+              <a-select-option v-for="item in options" :key="item.value" :value="item.value">{{ item.label }}</a-select-option>
+            </a-select>
+            <img src="../../assets/img/delete.png" @click="deleteHandler(record)" title="删除" style="cursor:pointer;width: 20px;">
+          </span>
+          <span v-else-if="objType=='8' && ownPriv('manage')">
+            <a-select v-model:value="record.pertype" @change="(val) => {swzzHandler(record, val)}" placeholder="请选择" size="small" style="width: 100px">
+              <a-select-option v-for="item in options8" :key="item.value" :value="item.value">{{ item.label }}</a-select-option>
+            </a-select>
+            <img src="../../assets/img/delete.png" @click="deleteHandler(record)" title="删除" style="cursor:pointer;width: 20px;">
+          </span>
+          <span v-else-if="ownPriv('manage') && objType != '1' && objType != '8' && objType != '50' && objType != '51' && objType != '52' && objType != '58' && objType != '59' && objType != '60' && objType != '64' && objType != '61' && objType != '63' && objType != '65' && objType != '66' && objType != '18' && objType != '107' && objType != '109' && objType != '111' && objType != '114' && objType != '117' && objType != '1110'">
+            <span v-if="objType != '1' && objType != '8' && objType != '50' && objType != '51' && objType != '52' && objType != '66' && objType != '85' && objType != '86' && objType != '87' && objType != '88' && objType != '90' && objType != '92' && objType != '107' && objType != '109' && objType != '111' && objType != '114' && objType != '117' && objType != '1110'">
+              <img src="../../assets/img/zuzhang.png" v-if="record.pertype != '1'" @change="(val) => {swzzHandler(record, '1')}" title="设为组长" style="cursor:pointer;width: 20px;">
+              <img src="../../assets/img/qxzuzhang.png" v-else @click="qxzzHandler(record)" title="取消组长" style="cursor:pointer;width: 20px;">
+              <img src="../../assets/img/delete.png" @click="deleteHandler(record)" title="删除" style="cursor:pointer;width: 20px;">
+            </span>
           </span>
         </template>
       </template>
@@ -389,6 +387,7 @@ export default {
       localStorage.getItem('isAdmin') ? localStorage.getItem('isAdmin') : '',
   },
   mounted() {
+    console.log('[renYuanList] mounted, dczId:', this.dczId);
     if (this.objType !== '8') {
       this.columns = this.columns
         .filter((item) => item.dataIndex !== 'dppost')
@@ -422,14 +421,16 @@ export default {
       this.pageIndex = 1;
       this.getDcryResult();
     },
-    getDcryResult() {
-      if (!this.dczId) {
+    getDcryResult(explicitDczId) {
+      const id = explicitDczId || this.dczId;
+      console.log('[renYuanList] getDcryResult 被调用, dczId:', id);
+      if (!id) {
         this.loading = false;
         return;
       }
       this.loading = true;
       getDcryList(
-        this.dczId,
+        id,
         this.pageSize,
         this.pageIndex,
         this.isAll,
@@ -533,7 +534,7 @@ export default {
       immediate: true,
       handler(n, o) {
         console.log('[renYuanList] dczId变化:', n, '旧值:', o);
-        this.getDcryResult(n);
+        this.getDcryResult();
       },
     },
     checked(n, o) {

src/views/duChaJiHua/planManageProvinceNew.vue

@@ -108,16 +108,6 @@ export default {
     },
     sendCurrentNodeinfo(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/planContent.vue

@@ -175,13 +175,15 @@ export default {
     this.showRightComponent = true;
   },
   watch: {
-    currentNodeinfo: {
-      deep: true,
-      handler(val) {
-        console.log('[子] currentNodeinfo变化:', val?.currentSelectTreeNodeId);
-        if (!val?.currentSelectTreeNodeId) return;
-      },
-    },
+    currentNodeinfo(val) {
+       console.log('[planContent] watch触发, id:', val?.currentSelectTreeNodeId);
+       if (!val?.currentSelectTreeNodeId) return;
+       setTimeout(() => {
+         this.$refs.renYuanList?.getDcryResult?.(val.currentSelectTreeNodeId);
+         this.$refs.qyList?.getDcqyResult?.(val.currentSelectTreeNodeId);
+         this.$refs.duiXiangList?.getDcdxList1?.(val.currentSelectTreeNodeId);
+       }, 0);
+     },
     duChaType(val) {
       // 1 小水库  2 人饮  3 水毁  4 水利工程建设  5 地下水  6 水闸  7 水利工程运行  36 大中型水库
       if (val == '1' || val == '2' || val == '3' || val == '36') {