会员管理、商品管理

CallCenterWeb.UI/src/views/commodityManagement/commodityList/components/bulkRemoval.vue

@@ -130,7 +130,4 @@ export default {
 </script>
 
 <style rel="stylesheet/scss" lang="scss">
-.order_form .form_select{
-	width: 100%;
-}
 </style>

CallCenterWeb.UI/src/views/commodityManagement/commodityList/components/changeShippingTemplate.vue

@@ -130,7 +130,5 @@ export default {
 </script>
 
 <style rel="stylesheet/scss" lang="scss">
-.order_form .form_select{
-	width: 100%;
-}
+
 </style>

CallCenterWeb.UI/src/views/memberManagement/memberList/components/addOrEdit.vue

@@ -1,11 +1,11 @@
 <template>
   <div v-loading="loading">
     <el-form ref="ruleForm" :model="ruleForm" :rules="rules" label-width="150px" class="order_form">
-      <el-form-item label="标签名称" prop="labelName">
-        <el-input v-model="ruleForm.labelName" placeholder="请输入标签名称"/>
+      <el-form-item label="商户名称" prop="businessName">
+        <el-input v-model="ruleForm.businessName" placeholder="请输入商户名称"/>
       </el-form-item>
-      <el-form-item label="标签说明" prop="labelDescription">
-        <el-input v-model="ruleForm.labelDescription" placeholder="请输入客户电话"/>
+      <el-form-item label="会员卡标题" prop="memberCardTitle">
+        <el-input v-model="ruleForm.memberCardTitle" placeholder="请输入会员卡标题"/>
       </el-form-item>
       <el-form-item>
         <el-button type="primary" @click="submitForm">保存</el-button>
@@ -48,14 +48,19 @@ export default {
       ruleForm: {
         unique_id: '', //		否	string	callid
         ordercode: '',
-        labelName: '',
-        labelDescription: '',
+        businessName: '',
+        memberCardTitle: '',
       },
       rules: {
-        labelName: [{
+        businessName: [{
           required: true,
           trigger: 'blur',
-          message: '请输入标签姓名',
+          message: '请输入商户名称',
+        }],
+        memberCardTitle: [{
+          required: true,
+          trigger: 'blur',
+          message: '请输入会员卡标题',
         }]
       },
       loading: false
@@ -130,7 +135,4 @@ export default {
 </script>
 
 <style rel="stylesheet/scss" lang="scss">
-.order_form .form_select{
-	width: 100%;
-}
 </style>

CallCenterWeb.UI/src/views/memberManagement/memberList/components/detail.vue

@@ -0,0 +1,323 @@
+<template>
+  <div class="order_detail">
+    <el-row :gutter="20">
+      <el-col :md="24" class="order_detail_body">
+        <el-card shadow="hover">
+          <el-col :md="3">
+            <div class="round_img">
+              <img :src="avatar" alt="头像">
+            </div>
+          </el-col>
+          <el-col :md="21">
+            <h1 class="title"><svg-icon class="title_icon" icon-class="hongqi" />工单编号：{{ ordercode }}</h1>
+            <!-- <p class="title_sub"><span class="green">{{ name }}</span> {{ createtime }}</p> -->
+            <p class="title_sub"><span class="green">{{ name }}</span> 	河南阜外华中心血管病医院 {{ createtime }}</p>
+            <p class="title_sub">催单次数：<span class="red">10</span>次 | 工单状态： <span class="done">已完成</span></p>
+          </el-col>
+          <el-col :md="24" class="order_detail_content">
+            <el-col :md="6" class="order_detail_item">
+              客户电话：{{ phone }}
+            </el-col>
+            <el-col :md="6" class="order_detail_item">
+              客户性别：{{ sex }}
+            </el-col>
+            <el-col :md="6" class="order_detail_item">
+              工单来源：{{ sourcename }}
+            </el-col>
+            <el-col :md="6" class="order_detail_item">
+              工单类型：{{ sourcetype }}
+            </el-col>
+            <el-col :md="6" class="order_detail_item">
+              地址：{{ address }}
+            </el-col>
+            <el-col :md="6" class="order_detail_item">
+              创建人：{{ createuser }}
+            </el-col>
+            <el-col :md="24" class="order_detail_item">
+              工单内容：
+              <div class="order_content" v-html="content"/>
+            </el-col>
+            <el-col v-if="fileList.length > 0" :md="24" class="order_detail_item">
+              <p>附件：<span class="yellow">（可以下载查看）</span></p>
+
+              <el-col v-for="(item, index) in fileList" :md="3" :key="index">
+                <el-card class="order_file">
+                  <span class="img_mask">
+                    <a :href="item.fileurl" download="filename" title="点击下载">
+                      <i class="el-icon-download"/>
+                    </a>
+                  </span>
+                  <img v-if="item.filesmallurl" :src="item.filesmallurl" :large="item.fileurl" :preview-text="item.filename" preview="0" height="68" width="80%">
+                  <i v-else class="el-icon-document file_icon"/>
+                  <p :title="item.filename"> {{ item.filename }} </p>
+                </el-card>
+              </el-col>
+
+            </el-col>
+            <el-col :md="6">
+              <i class="el-icon-time"/>
+              已持续 <span class="red">20</span> 小时 <span class="red">20</span> 分 <span class="red">20</span> 秒
+            </el-col>
+            <el-col :md="6" :offset="12">
+              <el-button type="primary" size="mini" plain>催单</el-button>
+              <el-button type="primary" size="mini" plain>转派</el-button>
+              <el-button type="primary" size="mini" plain>完成</el-button>
+            </el-col>
+          </el-col>
+        </el-card>
+      </el-col>
+
+      <el-col :md="12">
+        <el-card shadow="hover">
+          <div slot="header" class="clearfix">
+            <span>工单动态</span>
+          </div>
+          <div class="order_steps">
+            <el-steps :active="0" :space="100" direction="vertical" process-status="success">
+              <el-step title="已完成" description="2018-10-23 10:30:20 这是一段很长很长很长的描述性文字"/>
+              <el-step title="已转派" description="2018-10-23 10:30:20 这是一段很长很长很长的描述性文字"/>
+              <el-step title="已创建" description="2018-10-23 10:30:20 这是一段很长很长很长的描述性文字"/>
+            </el-steps>
+          </div>
+        </el-card>
+      </el-col>
+      <el-col :md="12">
+        <el-card shadow="hover" class="order_record">
+          <el-tabs v-model="activeName" @tab-click="handleClick">
+            <el-tab-pane label="催单记录(2)" name="first">
+              <div class="tab_body">
+                催单记录
+              </div>
+            </el-tab-pane>
+            <el-tab-pane label="录音记录(3)" name="second">
+              <div class="tab_body">
+                录音记录
+              </div>
+            </el-tab-pane>
+          </el-tabs>
+        </el-card>
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script>
+import { getOrder } from '@/api/order/orderSearch'
+import { mapGetters } from 'vuex'
+import { filterContent } from '@/utils'
+
+export default {
+  name: 'Detail',
+  props: {
+    rowid: {
+      type: String,
+      default: ''
+    },
+    layerid: {
+      type: String,
+      default: ''
+    }
+  },
+  data() {
+    return {
+      activeName: 'first',
+      ordercode: '', // 工单编号
+      name: '', // 姓名
+      phone: '', // 电话
+      sex: '', // 性别
+      address: '', // 地址
+      sourcename: '', // 工单来源
+      sourcetype: '', // 工单类型
+      content: '', // 工单内容
+      createtime: '', // 创建时间
+      createuser: '', // 创建人
+      fileList: [] // 附件
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'avatar'
+    ])
+  },
+  created() {
+    if (this.rowid) {
+      this.getDetail(this.rowid)
+    }
+  },
+  methods: {
+    handleClick(tab, event) {
+      console.log(tab, event)
+    },
+    // 详情
+    getDetail(rid) {
+      getOrder(rid).then(response => {
+        if (response.state.toLowerCase() === 'success') {
+          const res = response.data.model
+          this.ordercode = res.ordercode // 工单编号
+          this.name = res.name // 姓名
+          this.phone = res.phone // 电话
+          this.sex = res.sex // 性别
+          res.provincename = res.provincename === null ? '' : res.provincename
+          res.cityname = res.cityname === null ? '' : res.cityname
+          res.address = res.address === null ? '' : res.address
+          this.address = res.provincename + res.cityname + res.address // 地址
+          this.sourcename = res.sourcename // 工单来源
+          this.sourcetype = res.typename // 工单类型
+          this.content = filterContent.content(res.content) // 工单内容
+          this.createtime = res.createtime // 创建时间
+          this.createuser = res.createuser + '-' + res.createusername // 创建人
+          // 附件
+          if (res.files) {
+            this.fileList = res.files
+          }
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss">
+	.order_detail{
+		.el-col{
+			margin-bottom: 20px;
+		}
+		.el-icon-time{
+			color: #d81e06;
+		}
+		.el-card__header{
+			padding-top: 14px;
+			padding-bottom: 14px;
+			background-color: #F5F5F6;
+		}
+		.order_file{
+			.el-card__body{
+				padding: 22px 0 0 0;
+				text-align: center;
+			}
+		}
+		.order_steps{
+			.el-step__icon-inner{
+				display: none;
+			}
+		}
+		.order_record {
+			.el-card__body{
+				padding: 0;
+			}
+			.el-tabs__header{
+				padding: 0px 20px;
+				background-color: #F5F5F6;
+					.el-tabs__item{
+						font-size: 16px;
+						height: 47px;
+						line-height: 47px;
+					}
+			}
+		}
+	}
+</style>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+	.order_detail{
+		.order_detail_body{
+			margin-bottom: 20px;
+			.round_img{
+				width: 90px;
+				height: 90px;
+				border-radius: 50%;
+				overflow: hidden;
+				margin: 14px;
+				img{
+					width: 100%;
+					height: 100%;
+				}
+			}
+			.title{
+				font-size: 20px;
+				.title_icon{
+					color: #d81e06;
+					font-size: 16px;
+					margin-right: 20px;
+				}
+			}
+			.title_sub{
+				font-size: 14px;
+				color: #666666;
+			}
+			.order_detail_content{
+				background-color: #F5F5F6;
+				padding-top: 20px;
+				color: #4c4c4c;
+				font-size: 14px;
+				.order_detail_item{
+					margin-bottom: 10px;
+					.order_content{
+						margin-top: 10px;
+					}
+					.order_file {
+						position: relative;
+						cursor: pointer;
+						.img_mask {
+							display: none;
+							position: absolute;
+							left: 0px;
+							top: 0px;
+							background-color: rgba(0, 0, 0, 0.3);
+							width: 100%;
+							height: 22px;
+							text-align: right;
+							z-index: 1;
+							i {
+								font-size: 20px;
+								line-height: 22px;
+								display: inline-block;
+								margin-right: 15px;
+								color: #fff;
+							}
+						}
+						p {
+							margin-top: 5px;
+							padding-left: 14px;
+							padding-right: 14px;
+							white-space: nowrap;
+							overflow: hidden;
+							text-overflow: ellipsis;
+						}
+						.file_icon{
+							height: 68px;
+							line-height: 68px;
+							font-size: 68px;
+							color: #409EFF;
+						}
+					}
+					.order_file:hover .img_mask {
+						display: block;
+					}
+				}
+			}
+		}
+		.green {
+			color: #00c1de;
+		}
+		.done {
+			color: #198120;
+		}
+		.red {
+			color: #d81e06;
+		}
+		.yellow{
+			color: #e6a23c;
+		}
+		.order_steps{
+			// height: 240px;
+			.el-step__icon-inner{
+				display: none;
+			}
+		}
+
+		.tab_body{
+			padding: 0 20px 20px 20px;
+		}
+	}
+</style>

CallCenterWeb.UI/src/views/memberManagement/memberList/components/editLabel.vue

@@ -1,11 +1,8 @@
 <template>
   <div v-loading="loading">
     <el-form ref="ruleForm" :model="ruleForm" :rules="rules" label-width="150px" class="order_form">
-      <el-form-item label="标签名称" prop="labelName">
-        <el-input v-model="ruleForm.labelName" placeholder="请输入标签名称"/>
-      </el-form-item>
-      <el-form-item label="标签说明" prop="labelDescription">
-        <el-input v-model="ruleForm.labelDescription" placeholder="请输入客户电话"/>
+      <el-form-item label="已选中标签" prop="SelectedLabel">
+        <el-input v-model="ruleForm.SelectedLabel" placeholder="已选中标签"/>
       </el-form-item>
       <el-form-item>
         <el-button type="primary" @click="submitForm">保存</el-button>
@@ -47,14 +44,14 @@ export default {
       ruleForm: {
         unique_id: '', //		否	string	callid
         ordercode: '',
-        labelName: '',
+        SelectedLabel: '',
         labelDescription: '',
       },
       rules: {
-        labelName: [{
+        SelectedLabel: [{
           required: true,
           trigger: 'blur',
-          message: '请输入标签姓名',
+          message: '已选中标签',
         }]
       },
       loading: false

CallCenterWeb.UI/src/views/memberManagement/memberList/components/freeCoupons.vue

@@ -1,11 +1,21 @@
 <template>
   <div v-loading="loading">
     <el-form ref="ruleForm" :model="ruleForm" :rules="rules" label-width="150px" class="order_form">
-      <el-form-item label="标签名称" prop="labelName">
-        <el-input v-model="ruleForm.labelName" placeholder="请输入标签名称"/>
+      <el-form-item label="优惠券">
+        <el-select v-model="ruleForm.labelName" class="form_select" placeholder="优惠券">
+          <el-option label="全部" value="0"></el-option>
+          <el-option label="代金券" value="1"></el-option>
+          <el-option label="折扣券" value="2"></el-option>
+          <el-option label="兑换券" value="3"></el-option>
+        </el-select>
       </el-form-item>
-      <el-form-item label="标签说明" prop="labelDescription">
-        <el-input v-model="ruleForm.labelDescription" placeholder="请输入客户电话"/>
+      <el-form-item label="优惠券">
+        <el-select v-model="ruleForm.labelName" class="form_select" placeholder="优惠券">
+          <el-option label="全部" value="0"></el-option>
+          <el-option label="代金券" value="1"></el-option>
+          <el-option label="折扣券" value="2"></el-option>
+          <el-option label="兑换券" value="3"></el-option>
+        </el-select>
       </el-form-item>
       <el-form-item>
         <el-button type="primary" @click="submitForm">保存</el-button>

CallCenterWeb.UI/src/views/memberManagement/memberList/components/memberExtension.vue

@@ -1,11 +1,20 @@
 <template>
   <div v-loading="loading">
     <el-form ref="ruleForm" :model="ruleForm" :rules="rules" label-width="150px" class="order_form">
-      <el-form-item label="标签名称" prop="labelName">
-        <el-input v-model="ruleForm.labelName" placeholder="请输入标签名称"/>
+      <el-form-item label="付费会员类型">
+        <el-select v-model="ruleForm.paidMemberType" class="form_select" placeholder="付费会员类型">
+          <el-option label="一般付费" value="0"></el-option>
+          <el-option label="超级付费" value="1"></el-option>
+        </el-select>
       </el-form-item>
-      <el-form-item label="标签说明" prop="labelDescription">
-        <el-input v-model="ruleForm.labelDescription" placeholder="请输入客户电话"/>
+      <el-form-item label="延期条件">
+        <el-select v-model="ruleForm.extensionCondition" class="form_select" placeholder="延期条件">
+          <el-option label="指定会员或指定条件" value="0"></el-option>
+          <el-option label="付费会员已失效" value="1"></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="延期天数" prop="deferredDays">
+        <el-input v-model="ruleForm.deferredDays" placeholder="请输入延期天数"/>
       </el-form-item>
       <el-form-item>
         <el-button type="primary" @click="submitForm">保存</el-button>
@@ -47,16 +56,12 @@ export default {
       sourceOptions: [], // 工单来源下拉数据
       ruleForm: {
         unique_id: '', //		否	string	callid
-        ordercode: '',
-        labelName: '',
-        labelDescription: '',
+        ordercode: '', 
+        paidMemberType: '', // 付费会员类型 
+        extensionCondition: '', // 延期条件
+        deferredDays: '', // 延期天数
       },
       rules: {
-        labelName: [{
-          required: true,
-          trigger: 'blur',
-          message: '请输入标签姓名',
-        }]
       },
       loading: false
     }

CallCenterWeb.UI/src/views/memberManagement/memberList/components/memberLevel.vue

@@ -1,11 +1,21 @@
 <template>
   <div v-loading="loading">
     <el-form ref="ruleForm" :model="ruleForm" :rules="rules" label-width="150px" class="order_form">
-      <el-form-item label="标签名称" prop="labelName">
-        <el-input v-model="ruleForm.labelName" placeholder="请输入标签名称"/>
+      <el-form-item label="会员等级">
+        <el-select v-model="ruleForm.memberLevelInput" class="form_select" placeholder="优惠券">
+          <el-option label="普通会员" value="0"></el-option>
+          <el-option label="高级会员" value="1"></el-option>
+          <el-option label="尊贵会员" value="2"></el-option>
+          <el-option label="黄金会员" value="3"></el-option>
+        </el-select>
       </el-form-item>
-      <el-form-item label="标签说明" prop="labelDescription">
-        <el-input v-model="ruleForm.labelDescription" placeholder="请输入客户电话"/>
+      <el-form-item label="备注">
+        <el-input
+          type="textarea"
+          :rows="4"
+          placeholder="备注"
+          v-model="ruleForm.textarea">
+        </el-input>
       </el-form-item>
       <el-form-item>
         <el-button type="primary" @click="submitForm">保存</el-button>
@@ -48,15 +58,9 @@ export default {
       ruleForm: {
         unique_id: '', //		否	string	callid
         ordercode: '',
-        labelName: '',
-        labelDescription: '',
+        memberLevelInput: '', // 会员等级
       },
       rules: {
-        labelName: [{
-          required: true,
-          trigger: 'blur',
-          message: '请输入标签姓名',
-        }]
       },
       loading: false
     }

CallCenterWeb.UI/src/views/memberManagement/memberList/components/searchFilter.vue

@@ -0,0 +1,216 @@
+<template>
+    <div class="filter-container">
+      <el-input v-model="searchDatas.customerName" placeholder="客户姓名" class="filter-item"/>
+      <el-input v-model="searchDatas.phoneNumber" placeholder="手机号码" class="filter-item"/>
+      <el-input v-model="searchDatas.memberType" placeholder="会员类型" class="filter-item"/>
+      <el-input v-model="searchDatas.province" placeholder="省份" class="filter-item"/>
+      <el-input v-model="searchDatas.city" placeholder="市" class="filter-item"/>
+      <el-input v-model="searchDatas.county" placeholder="县区" class="filter-item"/>
+      <el-input v-model="searchDatas.township" placeholder="乡镇" class="filter-item"/>
+      <el-input v-model="searchDatas.address" placeholder="详细地址" class="filter-item"/>
+      <el-input v-model="searchDatas.memberBirthday" placeholder="会员生日" class="filter-item"/>
+      <el-input v-model="searchDatas.referrer" placeholder="推荐人" class="filter-item"/>
+      <el-input v-model="searchDatas.contactFrequency" placeholder="联系频次" class="filter-item"/>
+      <el-button type="primary" class="filter-item" icon="el-icon-search" @click="btn_search">搜索</el-button>
+      <el-button v-permission="'HY_add'" type="primary" class="filter-item" icon="el-icon-plus" @click="btn_add">添加</el-button>
+      <el-button v-permission="'HY_label'" type="primary" class="filter-item" @click="btn_label">打标签</el-button>
+      <el-button v-permission="'HY_coupon'" type="primary" class="filter-item" @click="btn_coupon">赠送优惠券</el-button>
+      <el-button v-permission="'HY_send_message'" type="primary" class="filter-item" @click="btn_send_message">群发短信</el-button>
+      <el-button v-permission="'HY_member_extension'" type="primary" class="filter-item" @click="btn_member_extension">付费会员延期</el-button>
+      <el-button v-permission="'HY_member_level'" type="primary" class="filter-item" @click="btn_member_level">会员等级</el-button>
+      <el-button type="primary" class="filter-item" @click="btn_import"><svg-icon icon-class="daoru" />导入</el-button>
+      <el-button type="primary" class="filter-item" @click="btn_export">导出</el-button>
+    </div>
+</template>
+
+<script>
+import { getProviceCity, getDictionary } from '@/api/commonAPI'
+import { pickerOptions } from '@/utils'
+import addOrEdit from './addOrEdit'
+import editLabel from './editLabel'
+import freeCoupons from './freeCoupons'
+import sendGroupMessage from './sendGroupMessage'
+import memberExtension from './memberExtension'
+import memberLevel from './memberLevel'
+
+
+export default {
+  name: 'SearchFilter',
+  props: {
+    searchDatas: {
+      required: true,
+      type: Object,
+      default() {
+        return {
+            customerName: '', //客户姓名
+            phoneNumber: '', //手机号码
+            memberType: '', //会员类型
+            province: '', //省份
+            city: '', //市
+            county: '', //县区
+            township: '', //乡镇
+            address: '', //详细地址
+            memberBirthday: '', //会员生日
+            referrer: '', //推荐人
+            contactFrequency: '', //联系频次
+        }
+      }
+    },
+    // 是否显示 添加
+    showadd: { 
+      type: Boolean,
+      default: false
+    },
+    // 是否显示 批量删除
+    showdeletes: {
+      type: Boolean,
+      default: true
+    }
+  },
+  data() {
+    return {
+      provinceCityDatas: [], // 省市下拉数据
+      props: {
+        // 自定义省市下拉数据的key值
+        value: 'code',
+        label: 'name',
+        children: 'entityJson'
+      },
+      deptOptions: [], // 咨询/投诉下拉数据
+      typeOptions: [], // 工单类型下拉数据
+      pickerOptions // 日期数据
+    }
+  },
+  created() {
+    this.getProCity()
+    this.getOrderType()
+    this.getDeptData()// 获取咨询/投诉部门
+  },
+  methods: {
+    btn_search() {
+      this.$emit('search', this.searchDatas)
+    },
+    btn_export() {
+      this.$emit('export', this.searchDatas)
+    },
+    btn_deletes() {
+      this.$emit('delorders')
+    },
+    btn_add() {
+      this.$layer.iframe({
+        content: {
+          content: addOrEdit, // 传递的组件对象
+          parent: this, // 当前的vue对象
+          data: { rowid: '' } // props//该方法会自动添加一个key为layerid的值， 该值为创建层的id， 可以直接使用
+        },
+        area: ['80%', '90%'],
+        title: '添加工单'
+      })
+    },
+    btn_label() {
+      this.$layer.iframe({
+        content: {
+          content: editLabel,
+          parent: this,
+          data: { 'rowid': '' }
+        },
+        area: ['80%', '90%'],
+        title: '打标签'
+      })
+    },
+        btn_coupon() {
+      this.$layer.iframe({
+        content: {
+          content: freeCoupons, // 传递的组件对象
+          parent: this, // 当前的vue对象
+          data: { 'rowid': '' }// props//该方法会自动添加一个key为layerid的值， 该值为创建层的id， 可以直接使用
+        },
+        area: ['80%', '90%'],
+        title: '赠送优惠券'
+      })
+    },
+    btn_send_message(editId) {
+      this.$layer.iframe({
+        content: {
+          content: sendGroupMessage, // 传递的组件对象
+          parent: this, // 当前的vue对象
+          data: { 'rowid': editId }// props
+        },
+        area: ['80%', '90%'],
+        title: '群发短信'
+      })
+    },
+    btn_member_extension(editId) {
+      this.$layer.iframe({
+        content: {
+          content: memberExtension, // 传递的组件对象
+          parent: this, // 当前的vue对象
+          data: { 'rowid': editId }// props
+        },
+        area: ['80%', '90%'],
+        title: '付费会员延期'
+      })
+    },
+    btn_member_level(editId) {
+      this.$layer.iframe({
+        content: {
+          content: memberLevel, // 传递的组件对象
+          parent: this, // 当前的vue对象
+          data: { 'rowid': editId }// props
+        },
+        area: ['80%', '90%'],
+        title: '会员等级'
+      })
+    },
+    btn_import() {
+      if (!this.planId) {
+        this.$message.warning('请先选择一行!')
+        return
+      }
+      this.$layer.iframe({
+        content: {
+          content: importTels, // 传递的组件对象
+          parent: this, // 当前的vue对象
+          data: { 'rowid': this.planId }// props//该方法会自动添加一个key为layerid的值， 该值为创建层的id， 可以直接使用
+        },
+        area: ['40%', '380px'],
+        shadeClose: false,
+        title: '导入号码'
+      })
+    },
+    // 获取省市下拉数据
+    getProCity() {
+      return new Promise(resolve => {
+        getProviceCity().then(response => {
+          if (response.state.toLowerCase() === 'success') {
+            this.provinceCityDatas = response.data
+          }
+        })
+        resolve()
+      })
+    },
+    // 获取工单类型
+    getOrderType() {
+      return new Promise(resolve => {
+        getDictionary('HYGDLX').then(response => {
+          if (response.state.toLowerCase() === 'success') {
+            this.typeOptions = response.data
+          }
+        })
+        resolve()
+      })
+    },
+    // 获取咨询/投诉部门
+    getDeptData() {
+      return new Promise(resolve => {
+        getDictionary('HYZXBM').then(response => {
+          if (response.state.toLowerCase() === 'success') {
+            this.deptOptions = response.data
+          }
+        })
+        resolve()
+      })
+    }
+  }
+}
+</script>

CallCenterWeb.UI/src/views/memberManagement/memberList/components/sendGroupMessage.vue

@@ -1,14 +1,16 @@
 <template>
   <div v-loading="loading">
     <el-form ref="ruleForm" :model="ruleForm" :rules="rules" label-width="150px" class="order_form">
-      <el-form-item label="标签名称" prop="labelName">
-        <el-input v-model="ruleForm.labelName" placeholder="请输入标签名称"/>
-      </el-form-item>
-      <el-form-item label="标签说明" prop="labelDescription">
-        <el-input v-model="ruleForm.labelDescription" placeholder="请输入客户电话"/>
+      <el-form-item label="短信内容">
+        <el-input
+          type="textarea"
+          :rows="4"
+          placeholder="请输入内容"
+          v-model="ruleForm.textarea">
+        </el-input>
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" @click="submitForm">保存</el-button>
+        <el-button type="primary" @click="submitForm">发送短信</el-button>
       </el-form-item>
     </el-form>
   </div>
@@ -47,15 +49,9 @@ export default {
       ruleForm: {
         unique_id: '', //		否	string	callid
         ordercode: '',
-        labelName: '',
         labelDescription: '',
       },
       rules: {
-        labelName: [{
-          required: true,
-          trigger: 'blur',
-          message: '请输入标签姓名',
-        }]
       },
       loading: false
     }
@@ -66,7 +62,7 @@ export default {
     }
     Promise.all([])
       .then(() => {
-        if (this.rowid) {
+        if (this.rowid) {8
           this.ruleForm.ordercode = this.rowid
           this.getDetail(this.rowid)
         }

CallCenterWeb.UI/src/views/memberManagement/memberList/index.vue

@@ -1,51 +1,154 @@
 <template>
   <div class="app-container">
-    <div class="filter-container">
-      <el-input v-model="label_name" placeholder="手机号" class="filter-item"/>
-      <el-input v-model="label_name" placeholder="有无购买记录" class="filter-item"/>
-      <el-input v-model="label_name" placeholder="付费会员" class="filter-item"/>
-      <el-input v-model="label_name" placeholder="会员等级" class="filter-item"/>
-      <el-input v-model="label_name" placeholder="请选择标签" class="filter-item"/>
-      <el-input v-model="label_name" placeholder="推荐人手机号" class="filter-item"/>
-      <el-input v-model="label_name" placeholder="日期" class="filter-item"/>
-      <el-input v-model="label_name" placeholder="备注" class="filter-item"/>
-      <el-input v-model="label_name" placeholder="姓名" class="filter-item"/>
-      <el-input v-model="label_name" placeholder="导购员手机号" class="filter-item"/>
-      <el-input v-model="label_name" placeholder="请选择门店" class="filter-item"/>
-      <el-input v-model="label_name" placeholder="请选择地区" class="filter-item"/>
-      <el-input v-model="label_name" placeholder="请选择店铺" class="filter-item"/>
-      <el-button type="primary" class="filter-item" icon="el-icon-search" @click="btn_search">搜索</el-button>
-      <el-button v-permission="'HY_add'" type="primary" class="filter-item" icon="el-icon-plus" @click="btn_add">添加</el-button>
-      <el-button v-permission="'HY_label'" type="primary" class="filter-item" @click="btn_label">打标签</el-button>
-      <el-button v-permission="'HY_coupon'" type="primary" class="filter-item" @click="btn_coupon">赠送优惠券</el-button>
-      <el-button v-permission="'HY_send_message'" type="primary" class="filter-item" @click="btn_send_message">群发短信</el-button>
-      <el-button v-permission="'HY_member_extension'" type="primary" class="filter-item" @click="btn_member_extension">付费会员延期</el-button>
-      <el-button v-permission="'HY_member_level'" type="primary" class="filter-item" @click="btn_member_level">会员等级</el-button>
-      <el-button v-permission="'HY_add'" type="primary" class="filter-item" @click="btn_add">导出</el-button>
-    </div>
-
+    <search-filter
+      :search-datas.sync="searchDatas"
+      showadd
+      @search="btn_search"
+      @delorders="btn_search"
+      @export="btn_search">
+    </search-filter>
     <el-table v-loading="loading" :data="dataLists" border stripe>
-      <el-table-column
+      <el-table-column 
         type="selection"
         width="40">
       </el-table-column>
-      <el-table-column type="index" label="手机号" align="center" fixed width=""/>
-      <el-table-column type="index" label="姓名" align="center" fixed width=""/>
-      <el-table-column type="index" label="性别" align="center" fixed width=""/>
-      <el-table-column type="index" label="推荐人" align="center" fixed width=""/>
-      <el-table-column type="index" label="是否禁用" align="center" fixed width=""/>
-      <el-table-column type="index" label="标签" align="center" fixed width=""/>
-      <el-table-column label="标签描述" align="center">
-        <template slot-scope="scope">
-          {{ scope.row.content | formatterContent }}
-        </template>
+      <el-table-column
+        type="index"
+        label="客户姓名"
+        align="center"
+        fixed
+        width="">
+      </el-table-column>
+      <el-table-column
+        type="index"
+        label="客户性别"
+        align="center"
+        fixed
+        width="">
+      </el-table-column>
+      <el-table-column
+        type="index"
+        label="客户年龄"
+        align="center"
+        fixed
+        width="">
+      </el-table-column>
+      <el-table-column
+        type="index"
+        label="手机号码1"
+        align="center"
+        fixed
+        width="">
+      </el-table-column>
+      <el-table-column
+        type="index"
+        label="手机号码2"
+        align="center"
+        fixed
+        width="">
+      </el-table-column>
+      <el-table-column
+        type="index"
+        label="固定电话"
+        align="center"
+        fixed
+        width="">
+      </el-table-column>
+      <el-table-column
+        type="index"
+        label="会员类型"
+        align="center"
+        fixed
+        width="">
+      </el-table-column>
+      <el-table-column
+        type="index"
+        label="地址"
+        align="center"
+        fixed
+        width="">
       </el-table-column>
-      <el-table-column label="操作" width="" align="center" class-name="oparate_btn" fixed="right">
-        <template slot-scope="scope">
-          <el-button v-permission="'HY_edit'" size="mini" plain type="primary" @click="btn_edit(scope.row.ordercode)">详情</el-button>
-          <el-button v-permission="'HY_edit'" size="mini" plain type="primary" @click="btn_edit(scope.row.ordercode)">编辑</el-button>
-          <!-- <el-button v-permission="'HY_edit'" size="mini" plain type="primary" @click="btn_edit(scope.row.ordercode)">会员等级</el-button> -->
-          <el-button v-permission="'HY_delete'" size="mini" plain type="danger" @click="btn_delete(scope.row.id)">删除</el-button>
+      <el-table-column
+        type="index"
+        label="邮编"
+        align="center"
+        fixed
+        width="">
+      </el-table-column>
+      <el-table-column
+        type="index"
+        label="鞋码"
+        align="center"
+        fixed
+        width="">
+      </el-table-column>
+      <el-table-column
+        type="index"
+        label="会员日期"
+        align="center"
+        fixed
+        width="">
+      </el-table-column>
+      <el-table-column
+        type="index"
+        label="会员积分"
+        align="center"
+        fixed
+        width="">
+      </el-table-column>
+      <el-table-column
+        type="index"
+        label="推荐人"
+        align="center"
+        fixed
+        width="">
+      </el-table-column>
+      <el-table-column
+        type="index"
+        label="累计消费金额"
+        align="center"
+        fixed
+        width="">
+      </el-table-column>
+      <el-table-column
+        type="index"
+        label="累计积分"
+        align="center"
+        fixed
+        width="">
+      </el-table-column>
+      <el-table-column
+        label="操作"
+        width=""
+        align="center"
+        class-name="oparate_btn"
+        fixed="right">
+        <template
+          slot-scope="scope">
+          <el-button
+            v-permission="'HY_detail'"
+            size="mini"
+            plain
+            type="primary"
+            @click="btn_detail(scope.row.ordercode)">
+            详情
+          </el-button>
+          <el-button
+            v-permission="'HY_edit'"
+            size="mini"
+            plain
+            type="primary"
+            @click="btn_edit(scope.row.ordercode)">
+            编辑
+          </el-button>
+          <el-button
+            v-permission="'HY_delete'"
+            size="mini"
+            plain
+            type="danger"
+            @click="btn_delete(scope.row.id)">
+            删除
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -55,14 +158,17 @@
       :pageindex.sync="pageParams.pageindex"
       :pagesize.sync="pageParams.pagesize"
       class="pagination"
-      @pagination="getList" />
+      @pagination="getList">
+    </pagination>
   </div>
 </template>
 
 <script>
 
 import { getOrderLists, deleteOrder } from '@/api/order/orderSearch'
+import searchFilter from './components/searchFilter'
 import addOrEdit from './components/addOrEdit'
+import detail from './components/detail'
 import editLabel from './components/editLabel'
 import freeCoupons from './components/freeCoupons'
 import sendGroupMessage from './components/sendGroupMessage'
@@ -74,12 +180,25 @@ import Pagination from '@/components/Pagination' // 对el-pagination 二次封
 export default {
   name: 'memberLabel',
   components: {
-    Pagination
+    Pagination,
+    searchFilter
   },
   data() {
     return {
+      searchDatas: {
+        customerName: '', //客户姓名
+        phoneNumber: '', //手机号码
+        memberType: '', //会员类型
+        province: '', //省份
+        city: '', //市
+        county: '', //县区
+        township: '', //乡镇
+        address: '', //详细地址
+        memberBirthday: '', //会员生日
+        referrer: '', //推荐人
+        contactFrequency: '', //联系频次
+      },
       loading: false,
-      label_name: '',//标签名
       pageParams: {
         pageindex: 1, // 当前第几页
         pagesize: Number(this.$store.getters.serverConfig.PAGESIZE), // 每页几条数据
@@ -118,70 +237,15 @@ export default {
       this.pageParams.pageindex = 1
       this.getList()
     },
-    btn_add() {
-      this.$layer.iframe({
-        content: {
-          content: addOrEdit, // 传递的组件对象
-          parent: this, // 当前的vue对象
-          data: { 'rowid': '' }// props//该方法会自动添加一个key为layerid的值， 该值为创建层的id， 可以直接使用
-        },
-        area: ['80%', '90%'],
-        title: '添加工单'
-      })
-    },
-    btn_label() {
-      this.$layer.iframe({
-        content: {
-          content: editLabel,
-          parent: this,
-          data: { 'rowid': '' }
-        },
-        area: ['80%', '90%'],
-        title: '打标签'
-      })
-    },
-    btn_coupon() {
-      this.$layer.iframe({
-        content: {
-          content: freeCoupons, // 传递的组件对象
-          parent: this, // 当前的vue对象
-          data: { 'rowid': '' }// props//该方法会自动添加一个key为layerid的值， 该值为创建层的id， 可以直接使用
-        },
-        area: ['80%', '90%'],
-        title: '赠送优惠券'
-      })
-    },
-    btn_send_message(editId) {
-      this.$layer.iframe({
-        content: {
-          content: sendGroupMessage, // 传递的组件对象
-          parent: this, // 当前的vue对象
-          data: { 'rowid': editId }// props
-        },
-        area: ['80%', '90%'],
-        title: '群发短信'
-      })
-    },
-    btn_member_extension(editId) {
-      this.$layer.iframe({
-        content: {
-          content: memberExtension, // 传递的组件对象
-          parent: this, // 当前的vue对象
-          data: { 'rowid': editId }// props
-        },
-        area: ['80%', '90%'],
-        title: '付费会员延期'
-      })
-    },
-    btn_member_level(editId) {
+    btn_detail(editId) {
       this.$layer.iframe({
         content: {
-          content: memberLevel, // 传递的组件对象
+          content: detail, // 传递的组件对象
           parent: this, // 当前的vue对象
           data: { 'rowid': editId }// props
         },
         area: ['80%', '90%'],
-        title: '会员等级'
+        title: '工单详情'
       })
     },
     btn_edit(editId) {