From 3eb8a592c3231dc812b87d6292ea30187bd26c91 Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Thu, 25 Aug 2022 15:28:12 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=9A=E5=BB=BA=E7=A7=AF=E5=88=86=E5=92=8C?=
 =?UTF-8?q?=E5=85=9A=E7=BB=84=E7=BB=87=E4=B8=8B=E6=8C=82=E5=85=9A=E5=B0=8F?=
 =?UTF-8?q?=E7=BB=84=20=E6=8C=89=E9=92=AE=E6=8E=A7=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/partymember/icpartyorgtree.vue    |  8 ++++----
 .../modules/workSys/pointAditive/rule.vue     | 20 ++++++++++---------
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/src/views/modules/partymember/icpartyorgtree.vue b/src/views/modules/partymember/icpartyorgtree.vue
index d61f13ce6..4b8a5179e 100644
--- a/src/views/modules/partymember/icpartyorgtree.vue
+++ b/src/views/modules/partymember/icpartyorgtree.vue
@@ -19,22 +19,22 @@
           <el-table-column prop="partyOrgName" label="党组织名称"></el-table-column>
           <el-table-column label="操作" align="center" width="300">
               <template slot-scope="scope">
-                <el-button v-if="scope.row.agencyId == agencyId || scope.row.agencyPids.includes(agencyId)"
+                <el-button v-if="(scope.row.agencyId == agencyId || scope.row.agencyPids.includes(agencyId)) && scope.row.partyOrgType != '6'"
                           @click="handleLook(scope.row.agencyPids, scope.row.id, scope.row)"
                           type="text"
                           size="small"
                           class="div-table-button--detail">{{'查看党员'}}</el-button>
-                <el-button v-if="(scope.row.agencyId == agencyId || scope.row.agencyPids.includes(agencyId)) && scope.row.partyOrgType != '5'"
+                <el-button v-if="(scope.row.agencyId == agencyId || scope.row.agencyPids.includes(agencyId)) && scope.row.partyOrgType != '5' && scope.row.partyOrgType != '6'"
                           @click="addOrUpdateHandle('', scope.row.id, scope.row.orgPids, scope.row.agencyId, scope.row.partyOrgType, scope.row.partyOrgName)"
                           type="text"
                           size="small"
                           class="div-table-button--add">新增下级</el-button>
-                <el-button  v-if="scope.row.agencyId == agencyId || scope.row.agencyPids.includes(agencyId)"
+                <el-button  v-if="(scope.row.agencyId == agencyId || scope.row.agencyPids.includes(agencyId)) && scope.row.partyOrgType != '6'"
                           @click="addOrUpdateHandle(scope.row.id, '', '', scope.row.pid, '', '')"
                           type="text"
                           size="small"
                           class="div-table-button--edit">修改</el-button>
-                <el-button  v-if="scope.row.agencyId == agencyId || scope.row.agencyPids.includes(agencyId)"
+                <el-button  v-if="(scope.row.agencyId == agencyId || scope.row.agencyPids.includes(agencyId))&& scope.row.partyOrgType != '6'"
                             @click="deleteAgency(scope.row.id)"
                             type="text"
                             size="small"
diff --git a/src/views/modules/workSys/pointAditive/rule.vue b/src/views/modules/workSys/pointAditive/rule.vue
index d6ba85d9b..64b744cd0 100644
--- a/src/views/modules/workSys/pointAditive/rule.vue
+++ b/src/views/modules/workSys/pointAditive/rule.vue
@@ -30,7 +30,7 @@
                        type="text"
                        size="small"
                        class="btn-color-1j">添加二级分类</el-button>
-            <el-button v-if="scope.row.pid != 0 && scope.row.categoryName"
+            <el-button v-if="scope.row.pid != 0 && scope.row.categoryName && scope.row.editFlag === '1'"
                        @click="handleAdd('3', 'add', scope.row.id, scope.row.pid, scope.row.categoryName)"
                        type="text"
                        size="small"
@@ -40,7 +40,7 @@
                        type="text"
                        size="small"
                        class="btn-color-edit">修改</el-button>
-            <el-button v-if="scope.row.pid != 0"
+            <el-button v-if="scope.row.pid != 0 && scope.row.editFlag === '1'"
                        @click="handleDel(scope.row)"
                        type="text"
                        size="small"
@@ -66,7 +66,7 @@
                       v-model="form.pid"
                       placeholder="请选择"
                       size="small"
-                      :disabled="addLevel == '2' || addLevel == '3' || addLevel == '4' || addLevel == '5' ? true : false"
+                      :disabled="addLevel == '2' || addLevel == '3' || addLevel == '4' || addLevel == '5'? true : false"
                       clearable>
             <el-option v-for="item in typeList"
                         :key="item.value"
@@ -78,11 +78,11 @@
         </el-form-item>
         <el-form-item label="类别名称"
                       prop="categoryName">
-          <el-input :disabled="addLevel == '3' || addLevel == '5' ? true : false" v-model="form.categoryName"
+          <el-input :disabled="addLevel == '3' || addLevel == '5' || editFlag ==='0'? true : false" v-model="form.categoryName"
                     size="small"
                     style="width: 180px;"></el-input>
         </el-form-item>
-        <el-form-item v-if="addLevel == '3'  || addLevel == '5'" label="规则名称"
+        <el-form-item v-if="(addLevel == '3'  || addLevel == '5') && editFlag ==='1'" label="规则名称"
                       prop="ruleName">
           <el-input v-model="form.ruleName"
                     size="small"
@@ -100,8 +100,8 @@
                       label="居民端积分申请"
                       prop="applyFlag"
                       label-width="140px">
-            <el-radio v-model="form.applyFlag" label="0">允许申请</el-radio>
-            <el-radio v-model="form.applyFlag" label="1">不允许申请</el-radio>
+            <el-radio v-model="form.applyFlag" label="0" :disabled="editFlag=='0'">允许申请</el-radio>
+            <el-radio v-model="form.applyFlag" label="1" :disabled="editFlag=='0'">不允许申请</el-radio>
         </el-form-item>
       </el-form>
       <div class="resi-btns">
@@ -129,6 +129,7 @@ export default {
       tableData: [],
       sHeight: 0,
       addLevel: '1',
+      editFlag: '1',
       addType: 'add',
       tableHeader: [
         {
@@ -148,7 +149,7 @@ export default {
         newPid: '', // 添加积分规则用到的pid
         ruleName: '', // 积分规则名称
         pointValue: '', // 加减积分
-        applyFlag: '0' // 允许申请0，不允许申请1
+        applyFlag: '0', // 允许申请0，不允许申请1
       },
       ruleform:{}, // 积分规则查询相关数据，由于只是修改名称/分值/是否申请 所以之前的数据不做改变只做展示用 全部放在form里面
       typeform: {}, // 积分二级分类
@@ -205,7 +206,7 @@ export default {
     },
     // 列表修改点击事件
     async handleEdit (row, addType, level) {
-      console.log(addType, level)
+      console.log(addType, level,row.editFlag)
       let url = ''
       if (level === '4') {
         url = `/point/additiverule/categorydetail/${row.id}`
@@ -222,6 +223,7 @@ export default {
           }
         })
       }
+      this.editFlag = row.editFlag;
       this.addLevel = level
       this.addType = addType
       this.dialogVisible = true