up

src/views/productService/classifyManage.vue

@@ -49,6 +49,10 @@ export default {
         {
           prop:'level',
           label:'排序'
+        },
+        {
+          prop:'id',
+          label:'id'
         }
       ]
     }

src/views/productService/components/confinement/addConfinementClub.vue

@@ -466,7 +466,7 @@
       async getMerchants() {
         const res = await merchantIndex({
           page: 1,
-          pageSize: 999
+          page_size: 999
         })
         //console.log(res)
         this.merchants = res?.data

src/views/productService/productServiceManage.vue

@@ -49,7 +49,7 @@
                 </div>
               </template>
             </xy-selectors>
-            <Button type="primary" @click="getProducts">查询</Button>
+            <Button type="primary" @click="searchProducts">查询</Button>
             <Button type="primary" @click="$refs['addProduct'].isShow = true,$refs['addProduct'].type = 'add'" style="margin-left: 10px;">新增</Button>
           </div>
 <!--          <div class="selector">-->

src/views/userManage/memberManage.vue

@@ -17,14 +17,21 @@
             </div>
             <div class="selector-item">
               <div class="selector-item__label">建卡医院：</div>
-              <Input clearable v-model="select.hospital" style="width: 200px;" placeholder="建卡医院搜索"/>
+              <Input clearable v-model="select.hospital" style="width: 200px;" placeholder="建卡医院搜索" />
             </div>
+            <div class="selector-item">
+              <el-checkbox v-model="select.is_phone">存在手机号</el-checkbox>
+            </div>
+
+
+
 
             <div class="selector-item">
-              <Button type="primary" @click="getMembers">查询</Button>
+              <Button type="primary" @click="doSearch">查询</Button>
             </div>
             <div class="selector-item">
-              <Button type="primary" @click="$refs['addMember'].isShow = true,$refs['addMember'].type = 'add'">新增会员</Button>
+              <Button type="primary"
+                @click="$refs['addMember'].isShow = true,$refs['addMember'].type = 'add'">新增会员</Button>
             </div>
             <div class="selector-item">
               <Button type="primary" @click="exportExel">导出</Button>
@@ -34,151 +41,173 @@
       </lx-header>
     </div>
 
-    <xy-table :total="total" @pageSizeChange="pageSizeChange" @pageIndexChange="pageChange" :list="list" :table-item="table" @editor="editorShow" @delete="deleteMember"></xy-table>
+    <xy-table :total="total" @pageSizeChange="pageSizeChange" @pageIndexChange="pageChange" :list="list"
+      :table-item="table" @editor="editorShow" @delete="deleteMember"></xy-table>
 
     <addMember ref="addMember" @refresh="getMembers"></addMember>
   </div>
 </template>
 
 <script>
-import {index,destroy} from '@/api/member'
+  import {
-import {parseTime} from "@/utils"
+    index,
-import {download} from '@/utils/downloadRequest'
+    destroy
-
+  } from '@/api/member'
-import addMember from './component/addMember'
+  import {
-import { Message } from 'element-ui'
+    parseTime
-export default {
+  } from "@/utils"
-  components:{
+  import {
+    download
+  } from '@/utils/downloadRequest'
+
+  import addMember from './component/addMember'
+  import {
+    Message
+  } from 'element-ui'
+  export default {
+    components: {
       addMember
     },
     data() {
       return {
-      select:{
+        select: {
-        pageSize:10,
+          pageSize: 10,
-        pageIndex:1,
+          pageIndex: 1,
-        keywords:"",
+          keywords: "",
-        area:"",
+          area: "",
-        hospital:""
+          hospital: "",
-      },
+          is_phone: true
-      areas:["吴中区", "吴江区", "姑苏区", "工业园区", "高新区", "相城区", "昆山", "常熟", "张家港", "太仓"],
+        },
-
+        areas: ["吴中区", "吴江区", "姑苏区", "工业园区", "高新区", "相城区", "昆山", "常熟", "张家港", "太仓"],
-      total:0,
+
-      list:[],
+        total: 0,
-      table:[
+        list: [],
-        {
+        table: [{
-          prop:'name',
+            prop: 'name',
-          label:'姓名',
+            label: '姓名',
-          width:180,
+            width: 180,
-          sortable:false,
+            sortable: false,
-          fixed:'left'
+            fixed: 'left'
           },
           {
-          prop:'phone',
+            prop: 'phone',
-          label:'电话',
+            label: '电话',
-          width:220
+            width: 220
           },
           {
-          prop:'due_date',
+            prop: 'due_date',
-          label:'预产期',
+            label: '预产期',
             width: 200
           },
           {
-          prop:'area',
+            prop: 'area',
-          label:'所属区域',
+            label: '所属区域',
             width: 160,
           },
           {
-          prop:'address',
+            prop: 'address',
-          label:'住址',
+            label: '住址',
-          align:'left',
+            align: 'left',
             minWidth: 300
           },
           {
-          prop:'hospital',
+            prop: 'hospital',
-          label:'建卡医院',
+            label: '建卡医院',
             width: 200
           },
           {
-          prop:'promotion',
+            prop: 'promotion',
-          label:'推广人员',
+            label: '推广人员',
-          width:140,
+            width: 140,
-          customFn:(row)=>{
+            customFn: (row) => {
-            return (<Tag color={row.promotion == 1 ? 'success' : 'error'}>{row.promotion == 1 ? '是' : '否'}</Tag>)
+              return ( < Tag color = {
+                  row.promotion == 1 ? 'success' : 'error'
+                } > {
+                  row.promotion == 1 ? '是' : '否'
+                } < /Tag>)
               }
             },
             {
-          prop:'created_at',
+              prop: 'created_at',
-          label:'注册日期',
+              label: '注册日期',
-          width:200,
+              width: 200,
-          formatter:(cell,data,value)=>{
+              formatter: (cell, data, value) => {
-            return parseTime(new Date(value),'{y}-{m}-{d}')
+                return parseTime(new Date(value), '{y}-{m}-{d}')
               }
             }
           ]
         }
       },
       methods: {
-    pageSizeChange(e){
+          pageSizeChange(e) {
 
             this.select.pageSize = e
             this.doSearch();
           },
-    doSearch(){
+          doSearch() {
             this.select.pageIndex = 1
             this.getMembers()
           },
-    pageChange(e){
+          pageChange(e) {
             this.select.pageIndex = e
             this.getMembers()
           },
 
-    async getMembers(){
+          async getMembers() {
             const res = await index({
-        page_size:this.select.pageSize,
+              page_size: this.select.pageSize,
-        page:this.select.pageIndex,
+              page: this.select.pageIndex,
-        keyword:this.select.keywords,
+              keyword: this.select.keywords,
-        hospital:this.select.hospital,
+              hospital: this.select.hospital,
-        area:this.select.area
+              area: this.select.area,
+              is_phone: this.select.is_phone ? 1 : ""
             })
             this.total = res.total
             this.list = res.data
           },
 
-    editorShow(row){
+          editorShow(row) {
             this.$refs['addMember'].id = row.id
             this.$refs['addMember'].type = 'editor'
             this.$refs['addMember'].isShow = true
           },
-    deleteMember(row){
+          deleteMember(row) {
             destroy({
-        id:row.id
+              id: row.id
             }).then(res => {
               Message({
-          type:'success',
+                type: 'success',
-          message:'删除会员成功'
+                message: '删除会员成功'
               })
               this.getMembers()
             })
           },
 
-    exportExel(){
+          exportExel() {
-      download('/api/admin/member/index','get',{is_export:1},'用户列表.xlsx')
+            download('/api/admin/member/index', 'get', {
+              is_export: 1,
+              keyword: this.select.keywords,
+              hospital: this.select.hospital,
+              area: this.select.area,
+              is_phone: this.select.is_phone ? 1 : ""
+            }, '用户列表.xlsx')
           }
         },
         mounted() {
           this.getMembers()
         }
 
-}
+    }
 </script>
 
 <style scoped lang="scss">
-.selector{
+  .selector {
     display: flex;
     flex-wrap: wrap;
     align-items: center;
     align-content: center;
-  &-item{
+
+    &-item {
       display: flex;
       align-items: center;
       align-content: center;
@@ -186,9 +215,9 @@ export default {
       margin-top: 6px;
       margin-right: 10px;
 
-    &__label{
+      &__label {
         word-break: keep-all;
       }
     }
-}
+  }
 </style>