YY 2 年之前
父节点
当前提交
b0a1132d32
共有 2 个文件被更改,包括 12 次插入15 次删除
  1. 7 9
      src/views/dev/role/index.vue
  2. 5 6
      src/views/platGroup/group/index.vue

+ 7 - 9
src/views/dev/role/index.vue

@@ -6,7 +6,7 @@
           <search-1 :form="searchForm" @onSubmit="search" @toReset="toClose"></search-1>
           <search-1 :form="searchForm" @onSubmit="search" @toReset="toClose"></search-1>
         </el-col>
         </el-col>
         <el-col :span="24" class="two">
         <el-col :span="24" class="two">
-          <btn-1 table="role" @toAdd="toAdd" :ids="selected" @search="search"></btn-1>
+          <data-btn :fields="btnList" @add="toAdd"></data-btn>
         </el-col>
         </el-col>
         <el-col :span="24" class="thr">
         <el-col :span="24" class="thr">
           <data-table
           <data-table
@@ -35,19 +35,21 @@
 </template>
 </template>
 
 
 <script>
 <script>
-import btn1 from '@/layout/btn-1.vue';
 import search1 from './parts/search-1.vue';
 import search1 from './parts/search-1.vue';
 import form1 from './parts/form-1.vue';
 import form1 from './parts/form-1.vue';
 import { mapState, createNamespacedHelpers } from 'vuex';
 import { mapState, createNamespacedHelpers } from 'vuex';
 const { mapActions } = createNamespacedHelpers('role');
 const { mapActions } = createNamespacedHelpers('role');
 const { mapActions: menu } = createNamespacedHelpers('menus');
 const { mapActions: menu } = createNamespacedHelpers('menus');
-// const { mapActions: sysdictdata } = createNamespacedHelpers('dictData');
 export default {
 export default {
   name: 'index',
   name: 'index',
   props: {},
   props: {},
-  components: { search1, form1, btn1 },
+  components: {
+    search1,
+    form1,
+  },
   data: function () {
   data: function () {
     return {
     return {
+      btnList: [{ label: '添加', method: 'add' }],
       // 列表
       // 列表
       opera: [
       opera: [
         { label: '修改', method: 'edit' },
         { label: '修改', method: 'edit' },
@@ -84,7 +86,6 @@ export default {
   },
   },
   methods: {
   methods: {
     ...menu({ menuQuery: 'query' }),
     ...menu({ menuQuery: 'query' }),
-    // ...sysdictdata({ sQuery: 'query' }),
     ...mapActions(['query', 'fetch', 'create', 'update', 'delete']),
     ...mapActions(['query', 'fetch', 'create', 'update', 'delete']),
     // 查询
     // 查询
     async search({ skip = 0, limit = this.$limit, ...info } = {}) {
     async search({ skip = 0, limit = this.$limit, ...info } = {}) {
@@ -145,10 +146,7 @@ export default {
     // 查询其他信息
     // 查询其他信息
     async searchOther() {
     async searchOther() {
       let res = await this.menuQuery({ status: '0' });
       let res = await this.menuQuery({ status: '0' });
-      if (this.$checkRes(res)) {
-        let data = res.data;
-        this.$set(this, `menuList`, res.data);
-      }
+      if (this.$checkRes(res)) this.$set(this, `menuList`, res.data);
     },
     },
   },
   },
   computed: {
   computed: {

+ 5 - 6
src/views/platGroup/group/index.vue

@@ -10,7 +10,7 @@
       >
       >
         <span v-if="view === 'list'">
         <span v-if="view === 'list'">
           <data-search :fields="searchFields" v-model="searchInfo" @query="search">
           <data-search :fields="searchFields" v-model="searchInfo" @query="search">
-            <template #goods>
+            <!-- <template #goods>
               <el-select v-model="searchInfo.goods" filterable clearable remote :remote-method="querySearch" placeholder="请选择商品名称" :loading="loading">
               <el-select v-model="searchInfo.goods" filterable clearable remote :remote-method="querySearch" placeholder="请选择商品名称" :loading="loading">
                 <el-option v-for="item in goodsList" :key="item._id" :label="item.name" :value="item._id"> </el-option>
                 <el-option v-for="item in goodsList" :key="item._id" :label="item.name" :value="item._id"> </el-option>
               </el-select>
               </el-select>
@@ -19,7 +19,7 @@
               <el-select v-model="searchInfo.leader" filterable clearable remote :remote-method="leaderSearch" placeholder="请选择团长名称" :loading="loading">
               <el-select v-model="searchInfo.leader" filterable clearable remote :remote-method="leaderSearch" placeholder="请选择团长名称" :loading="loading">
                 <el-option v-for="item in leaderList" :key="item._id" :label="item.name" :value="item._id"> </el-option>
                 <el-option v-for="item in leaderList" :key="item._id" :label="item.name" :value="item._id"> </el-option>
               </el-select>
               </el-select>
-            </template>
+            </template> -->
             <template #status>
             <template #status>
               <el-option v-for="i in statusList" :key="i.value" :label="i.label" :value="i.value"></el-option>
               <el-option v-for="i in statusList" :key="i.value" :label="i.label" :value="i.value"></el-option>
             </template>
             </template>
@@ -78,12 +78,12 @@ export default {
       ],
       ],
       opera: [
       opera: [
         { label: '修改', method: 'edit' },
         { label: '修改', method: 'edit' },
-        { label: '删除', method: 'delete', confirm: true, type: 'danger' },
+        // { label: '删除', method: 'delete', confirm: true, type: 'danger' },
       ],
       ],
       btnList: [{ label: '添加', method: 'add' }],
       btnList: [{ label: '添加', method: 'add' }],
       searchFields: [
       searchFields: [
-        { label: '商品名称', model: 'goods', custom: true },
-        { label: '团长', model: 'leader', custom: true },
+        // { label: '商品名称', model: 'goods', custom: true },
+        // { label: '团长', model: 'leader', custom: true },
         { label: '状态', model: 'status', type: 'select' },
         { label: '状态', model: 'status', type: 'select' },
       ],
       ],
       searchInfo: {},
       searchInfo: {},
@@ -109,7 +109,6 @@ export default {
     ...group(['query', 'delete', 'fetch', 'update', 'create']),
     ...group(['query', 'delete', 'fetch', 'update', 'create']),
     // 查询
     // 查询
     async search({ skip = 0, limit = this.$limit, ...others } = {}) {
     async search({ skip = 0, limit = this.$limit, ...others } = {}) {
-      // others.status = '0';
       let query = { skip, limit, ...others };
       let query = { skip, limit, ...others };
       if (Object.keys(this.searchInfo).length > 0) query = { ...query, ...this.searchInfo };
       if (Object.keys(this.searchInfo).length > 0) query = { ...query, ...this.searchInfo };
       const res = await this.query(query);
       const res = await this.query(query);