标签管理 修复 分页问题、高级搜索弹窗关闭后搜索条件没有清空的问题

src/App.vue

@@ -312,4 +312,11 @@
       background-color: #fff;
     }
   }
+
+  // 修复样式
+  .el-tree-node__content {
+    .el-checkbox {
+      margin-right: 8px !important;
+    }
+  }
 </style>

src/components/brokerage/index.vue

@@ -10,7 +10,10 @@
           <li v-for="item2 in item1.children" class="brokerage-item">
             <div class="brokerage-item-header clearfix">
               {{filterName(item2.value, 'BROKERAGE_COURSE_TYPE')}}
-              <el-button @click="itemAdd(item1.value, item2.value)" class="fr" type="success" plain size="small">新增</el-button>
+              <el-button
+                v-if="!$store.state.readonly"
+                @click="itemAdd(item1.value, item2.value)"
+                class="fr" type="success" plain size="small">新增</el-button>
             </div>
             <el-table border :data="item2.data">
 
@@ -42,9 +45,12 @@
                 <template slot-scope="scope">
                   <div style="display: flex;">
                     <el-button
+                      v-if="!$store.state.readonly"
                       :disabled="!((typeof scope.row.min_money == 'number') && (typeof scope.row.max_money == 'number') && (typeof scope.row.scale == 'number'))"
-                      v-if="true" size="small" plain type="primary" @click="itemSave(scope.row)">保存</el-button>
-                    <el-button v-if="true" size="small" plain type="danger" @click="itemDelete(scope.row)">删除</el-button>
+                      size="small" plain type="primary" @click="itemSave(scope.row)">保存</el-button>
+                    <el-button
+                      v-if="!$store.state.readonly && $store.state.deletePermission"
+                      size="small" plain type="danger" @click="itemDelete(scope.row)">删除</el-button>
                   </div>
                 </template>
               </el-table-column>
@@ -231,6 +237,9 @@
       background-color: #fff;
       .brokerage-item-header {
         padding-bottom: 10px;
+        line-height: 32px;
+        color: #333333;
+        font-size: 16px;
       }
     }
   }

src/components/login/index.vue

@@ -68,7 +68,6 @@
             };
             // debugger
             loginApi(json).then(res => {
-              debugger
               if (res.teacher_info) {
                 let data = JSON.stringify(res.teacher_info)
                 localStorage.setItem("phoneNum", data)

src/components/system/tag.vue

@@ -10,7 +10,7 @@
         <el-form-item>
           <div class="search-btn-wrapper">
             <!--<el-button @click="onSearch" type="primary" plain>搜索</el-button>-->
-            <el-button @click="dialogUser.show = !dialogUser.show;" type="warning" plain>高级搜索</el-button>
+            <el-button @click="advancedOpen" type="warning" plain>高级搜索</el-button>
             <!--<el-button v-if="!$store.state.readonly" @click="onAdd" type="success" plain>新增标签</el-button>-->
           </div>
         </el-form-item>
@@ -73,6 +73,7 @@
       <div style="display: flex;margin-bottom: 20px;">
         <el-button style="margin-right: 20px; width: 70px;" type="primary" v-if="!$store.state.readonly && $store.state.export" plain :disabled="!tableData.length" @click="exportExcel">导出</el-button>
         <el-cascader
+          v-model="tagValue"
           style="width: calc(100% - 90px)" placeholder="选择标签" clearable @change="conditionsChange"
           :options="treeDataOrigin" :props="{ value: 'id', label: 'name', multiple: true, checkStrictly: true }"></el-cascader>
       </div>
@@ -106,6 +107,8 @@
         tagExpanded: [0],
         tagExpandedWait: '',
 
+        tagValue: [], // 用于清空
+
         tableData: [],
         treeData: [],
         treeDataOrigin: [],
@@ -171,7 +174,8 @@
           page: this.nowPage
         }
         getTagUserApi(json).then(res=>{
-          this.tableData = res.list
+          this.tableData = res.list;
+          this.total = res.total;
         })
       },
 
@@ -191,12 +195,9 @@
       },
       dialogReset(callback) {
         this.$nextTick(()=>{
-          this.$refs['dialogForm'].resetFields();
-            //this.$nextTick(()=>{
-              callback && callback();
-            //})
-          //this.dialog.form.id = '';
-          //this.dialog.form.pid = '';
+          this.conditions = arr;
+          this.tableData = [];
+          this.total = 0
         })
       },
       dialogSave() {
@@ -300,9 +301,18 @@
         } else {
           this.conditions = arr;
           this.tableData = [];
+          this.total = 0
         }
       },
 
+      advancedOpen() {
+        this.tagValue = [];
+        this.conditions = [];
+        this.tableData = [];
+        this.total = 0;
+        this.dialogUser.show = !this.dialogUser.show
+      },
+
       exportExcel() {
         let json = {
           conditions: JSON.stringify(this.conditions),