From 340e40b6d188423886dbff8f2493a32dca1b190c Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Tue, 21 Jun 2022 10:58:33 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=9A=E5=91=98=E7=A7=AF=E5=88=86=E6=98=8E?=
 =?UTF-8?q?=E7=BB=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sanjianxi/apps/AppPartyScore/psList.vue   | 238 ++----------------
 .../apps/AppScoreRules/AppScoreRules.vue      |  89 ++-----
 2 files changed, 31 insertions(+), 296 deletions(-)

diff --git a/project/sanjianxi/apps/AppPartyScore/psList.vue b/project/sanjianxi/apps/AppPartyScore/psList.vue
index b8e4eac6..903f0503 100644
--- a/project/sanjianxi/apps/AppPartyScore/psList.vue
+++ b/project/sanjianxi/apps/AppPartyScore/psList.vue
@@ -3,35 +3,16 @@
     <ai-list>
       <ai-title slot="title" title="党员积分" isShowBottomBorder/>
       <template #left>
-        <div class="patyCode-left">
-          <div class="patyCode-left__title">
-            <h2>组织目录</h2>
-          </div>
-          <div class="organization-left__list">
-            <div class="organization-left__list--title">
-              <el-input
-                  class="organization-left__list--search"
-                  size="mini"
-                  clearable
-                  placeholder="请输入组织名称"
-                  v-model="organizationName"
-                  suffix-icon="iconfont iconSearch">
-              </el-input>
-            </div>
-            <el-tree
-                :filter-node-method="filterNode"
-                ref="tree"
-                :props="defaultProps"
-                node-key="id"
-                :data="organizationTree"
-                highlight-current
-                :current-node-key="search.organizationName"
-                :default-expanded-keys="defaultExpanded"
-                :default-checked-keys="defaultChecked"
-                @current-change="onTreeChange">
-            </el-tree>
-          </div>
-        </div>
+
+        <ai-tree-menu title="组织目录" searchPlaceholder="请输入党组织名称" @search="onSearch">
+          <ai-party-tree
+              :filter-node-method="filterNode"
+              ref="tree"
+              :instance="instance"
+              :root="user.info.organizationId"
+              :current-node-key="user.info.id"
+              @select="onTreeChange"/>
+        </ai-tree-menu>
       </template>
       <template #content>
         <ai-search-bar>
@@ -70,7 +51,7 @@
 </template>
 
 <script>
-import {mapState} from "vuex";
+import { mapState } from "vuex";
 
 export default {
   name: "psList",
@@ -140,38 +121,9 @@ export default {
         }
       })
     },
-    getTree() {
-      this.instance.post(`/admin/area/queryAllArea?id=${this.user.info.areaId}`).then(res => {
-        if (res.code === 0) {
-          let parent = res.data.map(v => {
-            v.label = v.name
-            v.children = []
-
-            return v
-          }).filter(e => !e.parentid)[0]
-          this.defaultExpanded = [parent.id]
-          this.defaultChecked = [parent.id]
-          this.search.areaId = parent.id
-          this.addChild(parent, res.data)
-          this.organizationTree = [parent]
-
-          this.$nextTick(() => {
-            this.$refs.tree.setCurrentKey(parent.id)
-          })
-        }
-      })
-    },
-
-    addChild(parent, list) {
-      for (let i = 0; i < list.length; i++) {
-        if (list[i].parentId === parent.id) {
-          parent.children.push(list[i])
-        }
-      }
-
-      if (list.length > 0) {
-        parent['children'].map(v => this.addChild(v, list))
-      }
+    
+    onSearch(v) {
+      this.orgTree.filter(v)
     },
 
     onTreeChange(e) {
@@ -212,7 +164,6 @@ export default {
   },
   created() {
     this.getTableData()
-    // this.getTree()
   }
 }
 </script>
@@ -221,165 +172,6 @@ export default {
 .psList {
   height: 100%;
 
-  .organization-left__list {
-    height: calc(100% - 40px);
-    padding: 8px 8px;
-    overflow: auto;
-
-    .organization-left__tags--item {
-      display: flex;
-      align-items: center;
-      justify-content: space-between;
-      height: 40px;
-      padding: 0 8px 0 16px;
-      color: #222222;
-
-      &.organization-left__tags--item-active, &:hover {
-        background: #E8EFFF;
-        color: #2266FF;
-
-        i, span {
-          color: #2266FF;
-        }
-      }
-
-      span {
-        font-size: 14px;
-      }
-
-      i {
-        cursor: pointer;
-        color: #8e9ebf;
-        font-size: 16px;
-      }
-    }
-
-    .organization-left__list--title {
-      display: flex;
-      align-items: center;
-      margin-bottom: 8px;
-
-      .organization-left__list--search {
-        flex: 1;
-
-        ::v-deep input {
-          width: 100%;
-        }
-      }
-
-      .el-button {
-        width: 84px;
-        flex-shrink: 1;
-        margin-right: 8px;
-      }
-    }
-
-    span {
-      color: #222222;
-      font-size: 14px;
-    }
-
-    ::v-deep .el-tree {
-      background: transparent;
-
-      .el-tree-node__expand-icon.is-leaf {
-        color: transparent !important;
-      }
-
-      .el-tree-node__content > .el-tree-node__expand-icon {
-        padding: 4px;
-      }
-
-      .el-tree-node__content {
-        height: 32px;
-      }
-
-      .el-tree__empty-text {
-        color: #222;
-        font-size: 14px;
-      }
-
-      .el-tree-node__children .el-tree-node__content {
-        height: 32px;
-      }
-
-      .el-tree-node__content:hover {
-        background: #E8EFFF;
-        color: #222222;
-        border-radius: 2px;
-      }
-
-      .is-current > .el-tree-node__content {
-        &:hover {
-          background: #2266FF;
-          color: #fff;
-        }
-
-        background: #2266FF;
-
-        span {
-          color: #fff;
-        }
-      }
-    }
-  }
-
-  ::v-deep .ai-list__content--left {
-    margin-right: 2px;
-  }
-
-  .patyCode-left {
-    width: 100%;
-    height: auto;
-    background: #FAFAFB;
-
-    .patyCode-left__title {
-      display: flex;
-      align-items: center;
-      height: 40px;
-      padding: 0 16px;
-      background: #fff;
-
-      h2 {
-        color: #222;
-        font-size: 14px;
-      }
-    }
-
-    .patyCode-left__list {
-      height: calc(100% - 40px);
-      padding: 8px 0;
-      overflow: auto;
-
-      span {
-        display: block;
-        height: 40px;
-        line-height: 40px;
-        padding: 0 24px;
-        color: #222222;
-        font-size: 14px;
-        cursor: pointer;
-        border-right: 2px solid transparent;
-        background: transparent;
-
-        &:hover {
-          color: #2266FF;
-          background: #E8EFFF;
-        }
-
-        &.left-active {
-          color: #2266FF;
-          border-color: #2266FF;
-          background: #E8EFFF;
-        }
-      }
-    }
-  }
-
-  ::v-deep .ai-list__content--right {
-    .ai-list__content--right-wrapper {
-      min-height: 100%;
-    }
-  }
+  
 }
 </style>
diff --git a/project/sanjianxi/apps/AppScoreRules/AppScoreRules.vue b/project/sanjianxi/apps/AppScoreRules/AppScoreRules.vue
index 84ce589a..2be2a9af 100644
--- a/project/sanjianxi/apps/AppScoreRules/AppScoreRules.vue
+++ b/project/sanjianxi/apps/AppScoreRules/AppScoreRules.vue
@@ -100,27 +100,9 @@
           </el-form-item>
 
           <el-form-item label="积分分值" prop="integral" v-if="form.pass == 1">
-            <div class="flex">
-              <div class="from">
-                <el-input
-                  ref="input_from"
-                  v-model="integralFrom"
-                  placeholder="最小值"
-                  @input="handleInputFrom"
-                ></el-input>
-              </div>
-              <div class="center">
-                <span>至</span>
-              </div>
-              <div class="to">
-                <el-input
-                  ref="input_to"
-                  v-model="integralTo"
-                  placeholder="最大值"
-                  @input="handleInputTo"
-                ></el-input>
-              </div>
-            </div>
+            <ai-range v-model="form.num" ref="resetagefoo" />
+              <!-- @change="search.current = 1, getList()"
+                      @closeVal="search.age = []"/ -->
           </el-form-item>
           
           <el-form-item label="积分分值" prop="integral" v-if="form.pass == 2">
@@ -137,7 +119,7 @@
           </el-form-item>
 
           <el-dialog width="30%" title="添加积分分值" :visible.sync="innerVisible" append-to-body>
-            <el-form ref="DialogForm" :model="forms" :rules="formRules" size="small" label-suffix="：" label-width="100px">
+            <el-form ref="innerForm" :model="table" :rules="formRules" size="small" label-suffix="：" label-width="100px">
               <el-form-item label="加分项" prop="integral">
                 <el-input placeholder="请输入" v-model="form.integral" clearable/>
               </el-form-item>
@@ -148,7 +130,7 @@
 
             <div slot="footer" class="dialog-footer">
               <el-button @click="innerVisible = false">取 消</el-button>
-              <el-button type="primary" @click="innerVisible = false">提交</el-button>
+              <el-button type="primary" @click="save">保存</el-button>
             </div>
           </el-dialog>
         </el-form>
@@ -225,7 +207,7 @@ export default {
       integralTo: '',
       integralData: [],
       innerVisible: false,
-      forms: {},
+      table: {},
     };
   },
   created() {
@@ -262,6 +244,15 @@ export default {
         })
       })
     },
+    // 保存
+    save() {
+      this.$refs.innerForm.validate((valid)=>{
+        if (valid) {
+          this.innerData.push(this.table)
+        }
+        this.innerVisible = false
+      })
+    },
 
     typeChange() {
       this.form.integral = ''
@@ -359,55 +350,7 @@ export default {
   height: 100%;
   background: #f3f6f9;
 
-  ::v-deep .ai-list__content--right {
-    width: 100%;
-  }
-
-  ::v-deep .ai-dialog {
-    .el-cascader {
-      width: 100%;
-    }
-
-    .tableInput {
-      & > input {
-        text-align: center;
-        border: none;
-        background: transparent;
-      }
-    }
-  }
-
-
-  ::v-deep .el-input--mini .el-input__inner {
-    border: 0px;
-    margin: 0;
-    padding: 0 15px;
-    background-color: transparent;
-  }
-  .input-number-range {
-    background-color: #fff;
-    border: 1px solid #dcdfe6;
-    border-radius: 4px;
-  }
-
-  .flex {
-    display: flex;
-    flex-direction: row;
-    width: 100%;
-    // justify-content: space-between;
-    align-items: center;
-
-    .center {
-      margin: 0 20px;
-      margin-top: 1px;
-    }
-  }
-  .is-disabled {
-    background-color: #eef0f6;
-    border-color: #e4e7ed;
-    color: #c0c4cc;
-    cursor: not-allowed;
-  }
+  
 
 }
 </style>