会员管理、营销bug修改

CallCenterWeb.UI/src/views/marketingManagement/fullDecrement/components/addOrEdit.vue

@@ -1,10 +1,10 @@
 <template>
   <div v-loading="loading">
     <el-form ref="ruleForm" :model="ruleForm" :rules="rules" label-width="150px" class="order_form">
-      <el-form-item label="活动名称" prop="policyName">
-        <el-input v-model="ruleForm.activityName" placeholder="请输入政策名称"></el-input>
+      <el-form-item label="活动名称" prop="activityName">
+        <el-input v-model="ruleForm.activityName" placeholder="请输入活动名称"></el-input>
       </el-form-item>
-      <el-form-item label="活动时间">
+      <el-form-item label="活动时间" prop="activityTime">
         <el-date-picker
         v-model="ruleForm.activityTime"
         :picker-options="pickerOptions"
@@ -19,16 +19,16 @@
         end-placeholder="结束日期"
       />
       </el-form-item>
-      <el-form-item label="促销方式">
+      <el-form-item label="促销方式" prop="promotionMethod">
         <el-input v-model="ruleForm.promotionMethod" placeholder="请输入促销方式" ></el-input>
       </el-form-item>
-      <el-form-item label="满减金额">
+      <el-form-item label="满减金额" prop="reductionAmount">
         <el-input v-model="ruleForm.reductionAmount" placeholder="请输入满减金额" onkeyup="value=value.replace(/[^\d.]/g,'')"></el-input>
       </el-form-item>
-      <el-form-item label="金额区间">
+      <el-form-item label="金额区间" prop="amountRange">
         <el-input v-model="ruleForm.amountRange" placeholder="请输入金额区间"></el-input>
       </el-form-item>
-      <el-form-item label="活动方式" >
+      <el-form-item label="活动方式" prop="activityMode">
         <el-input v-model="ruleForm.activityMode" placeholder="请输入活动方式"></el-input>
       </el-form-item>
       <el-form-item label="绑定商品" prop="boundGoods">
@@ -93,10 +93,15 @@ export default {
         boundGoods: '', //绑定商品
       },
       rules: {
-        customerName: [{
+        activityName: [{
           required: true,
           trigger: 'blur',
-          message: '请输入商户名称',
+          message: '请输入活动名称',
+        }],
+        activityTime: [{
+          required: true,
+          trigger: 'blur',
+          message: '请输入活动时间',
         }],
       },
       loading: false
@@ -184,7 +189,7 @@ export default {
           this.ruleForm.reductionAmount = res.F_Process;
           this.ruleForm.amountRange = res.F_AmountRange;
           this.ruleForm.activityMode = res.F_ActivityMode;
-          this.ruleForm.boundGoods = res.F_CommodityName;
+          this.ruleForm.boundGoods = res.F_Commodity;
           this.ruleForm.activityTime = [res.F_StartTime,res.F_EndTime];
         }
       })

CallCenterWeb.UI/src/views/marketingManagement/fullDecrement/components/detail.vue

@@ -90,7 +90,7 @@ export default {
           this.reductionAmount = res.F_Process;
           this.amountRange = res.F_AmountRange;
           this.activityMode = res.F_ActivityMode;
-          this.boundGoods = res.F_CommodityName;
+          this.boundGoods = res.F_Commodity;
           this.activityTime = res.F_StartTime+'-'+res.F_EndTime;
         }
       })

CallCenterWeb.UI/src/views/marketingManagement/fullDecrement/index.vue

@@ -104,6 +104,8 @@ export default {
           pageindex: this.pageParams.pageindex, // int 第几页
           pagesize: this.pageParams.pagesize, // int 每页几条信息
           type: 3, //满减营销政策
+          starttime:this.searchDatas.date && this.searchDatas.date[0],//开始时间
+          endtime:this.searchDatas.date && this.searchDatas.date[1],//结束时间
           process: this.activeName==3?'':this.activeName
         }
         getOrderLists(params).then(response => {
@@ -143,7 +145,7 @@ export default {
       })
     },
     btn_delete(editId) {
-      this.$confirm('您确定要将此工单删除吗?', '提示', {
+      this.$confirm('您确定要将此活动删除吗?', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'

CallCenterWeb.UI/src/views/marketingManagement/fullGiveMarketing/components/addOrEdit.vue

@@ -59,7 +59,7 @@
         <!-- <el-input v-model="ruleForm.boundGoods" placeholder="请输入绑定商品"></el-input> -->
       </el-form-item>
       <el-form-item label="活动金额">
-        <el-input v-model="ruleForm.money" placeholder="请输入活动金额"></el-input>
+        <el-input v-model="ruleForm.money" placeholder="请输入活动金额" onkeyup="value=value.replace(/[^\d.]/g,'')"></el-input>
       </el-form-item>
       <el-form-item>
         <el-button type="primary" @click="submitForm">保存</el-button>
@@ -105,7 +105,7 @@ export default {
         ordercode: '',
         policyName: '', //政策名称
         promotionSpecifications: '', //促销规则
-        bundledGifts: '', //绑定赠品
+        bundledGifts: [], //绑定赠品
         policyDescription: '', //政策描述
         lateValidity: '', //延迟有效期
         applicableMember: '', //适用会员
@@ -117,10 +117,15 @@ export default {
       giftsList:[],//绑定商品数据
       shopList:[],//绑定商品数据
       rules: {
-        customerName: [{
+        policyName: [{
           required: true,
           trigger: 'blur',
-          message: '请输入商户名称',
+          message: '请输入政策名称',
+        }],
+        lateValidity: [{
+          required: true,
+          trigger: 'blur',
+          message: '请输入政策有效期',
         }],
       },
       loading: false
@@ -157,7 +162,7 @@ export default {
               F_Describe:this.ruleForm.policyDescription,//政策描述
               F_StartTime:this.ruleForm.lateValidity && this.ruleForm.lateValidity[0],//政策开始时间
               F_EndTime:this.ruleForm.lateValidity && this.ruleForm.lateValidity[1],//政策结束时间
-              F_Member:this.ruleForm.applicableMemberId,//会员ID
+              F_Member:this.ruleForm.applicableMember,//会员ID
               F_Commodity:this.ruleForm.boundGoods,//商品ID
               F_Money:this.ruleForm.money,//活动金额
             }
@@ -200,6 +205,8 @@ export default {
     },
     resetForm() {
       this.$refs.ruleForm.resetFields()
+      this.ruleForm.applicableMember=''
+      this.ruleForm.money=''
     },
     // 详情
     getDetail(rid) {
@@ -208,10 +215,10 @@ export default {
           const res = response.data
           this.ruleForm.policyName = res.F_Name;
           this.ruleForm.promotionSpecifications = res.F_PromotionRules;
-          this.ruleForm.bundledGifts = res.F_Gift;
+          this.ruleForm.bundledGifts = res.F_Gift?res.F_Gift.split(',').map(Number):'';
           this.ruleForm.policyDescription = res.F_Describe;
-          this.ruleForm.applicableMember = res.F_MemberName;
-          this.ruleForm.applicableMemberId = res.F_Member;
+          this.ruleForm.applicableMember = res.F_Member?(res.F_Member-0):'';
+          // this.ruleForm.applicableMemberId = res.F_Member?res.F_Member:'';
           this.ruleForm.money = res.F_Money;
           this.ruleForm.lateValidity = [res.F_StartTime,res.F_EndTime];
         }

CallCenterWeb.UI/src/views/marketingManagement/fullGiveMarketing/components/detail.vue

@@ -92,10 +92,11 @@ export default {
           const res = response.data
           this.policyName = res.F_Name;
           this.promotionSpecifications = res.F_PromotionRules;
-          this.bundledGifts = res.F_Gift;
+          this.bundledGifts = res.F_GiftName;
           this.policyDescription = res.F_Describe;
           this.applicableMember = res.F_MemberName;
           this.applicableMemberId = res.F_Member;
+          this.boundGoods = res.F_Commodity;
           this.money = res.F_Money;
           this.lateValidity = res.F_StartTime+'-'+res.F_EndTime;
         }

CallCenterWeb.UI/src/views/marketingManagement/fullGiveMarketing/index.vue

@@ -7,7 +7,7 @@
         <el-table v-loading="loading" :data="dataLists" border stripe @selection-change="changeSelects">
           <el-table-column type="selection" width="40"></el-table-column>
           <el-table-column prop="F_Name" label="政策名称" align="center"  width=""></el-table-column>
-          <el-table-column prop="F_PromotionRules" label="促销规则送赠品" align="center"  width=""></el-table-column>
+          <el-table-column prop="F_PromotionRules" label="促销规则" align="center"  width=""></el-table-column>
           <el-table-column prop="F_GiftName" label="绑定赠品" align="center"  width=""></el-table-column>
           <el-table-column prop="F_Describe" label="政策描述" align="center"  width=""></el-table-column>
           <el-table-column prop="F_StartTime" label="开始时间" align="center"  width=""></el-table-column>
@@ -105,6 +105,8 @@ export default {
           pageindex: this.pageParams.pageindex, // int 第几页
           pagesize: this.pageParams.pagesize, // int 每页几条信息
           type: 1, //满赠营销政策
+          starttime:this.searchDatas.date && this.searchDatas.date[0],//开始时间
+          endtime:this.searchDatas.date && this.searchDatas.date[1],//结束时间
           process: this.activeName==3?'':this.activeName
         }
         getOrderLists(params).then(response => {
@@ -144,7 +146,7 @@ export default {
       })
     },
     btn_delete(editId) {
-      this.$confirm('您确定要将此工单删除吗?', '提示', {
+      this.$confirm('您确定要将此活动删除吗?', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'

CallCenterWeb.UI/src/views/marketingManagement/limitedTimeOffer/components/addOrEdit.vue

@@ -33,7 +33,7 @@
         </el-select>
       </el-form-item>
       <el-form-item label="商品活动价格" prop="commodityActivityPrice">
-        <el-input v-model="ruleForm.commodityActivityPrice" placeholder="请输入商品活动价格"></el-input>
+        <el-input v-model="ruleForm.commodityActivityPrice" placeholder="请输入商品活动价格" type="number"></el-input>
       </el-form-item>
       <el-form-item>
         <el-button type="primary" @click="submitForm">保存</el-button>
@@ -85,10 +85,15 @@ export default {
         commodityActivityPrice: '', //商品活动价格
       },
       rules: {
-        customerName: [{
+        activityName: [{
           required: true,
           trigger: 'blur',
-          message: '请输入商户名称',
+          message: '请输入活动名称',
+        }],
+        activityTime: [{
+          required: true,
+          trigger: 'blur',
+          message: '请输入活动时间',
         }],
       },
       loading: false

CallCenterWeb.UI/src/views/marketingManagement/limitedTimeOffer/components/searchFilter.vue

@@ -67,7 +67,7 @@ export default {
           data: { rowid: '' } // props//该方法会自动添加一个key为layerid的值， 该值为创建层的id， 可以直接使用
         },
         area: ['80%', '90%'],
-        title: '添加工单'
+        title: '添加限时特惠'
       })
     },
     btn_import() {

CallCenterWeb.UI/src/views/marketingManagement/limitedTimeOffer/index.vue

@@ -103,6 +103,8 @@ export default {
           pageindex: this.pageParams.pageindex, // int 第几页
           pagesize: this.pageParams.pagesize, // int 每页几条信息
           type: 4, //限时特惠活动
+          starttime:this.searchDatas.date && this.searchDatas.date[0],//开始时间
+          endtime:this.searchDatas.date && this.searchDatas.date[1],//结束时间
           process: this.activeName==3?'':this.activeName
         }
         getOrderLists(params).then(response => {
@@ -138,11 +140,11 @@ export default {
           data: { 'rowid': editId }// props
         },
         area: ['80%', '90%'],
-        title: '编辑工单'
+        title: '编辑限时特惠'
       })
     },
     btn_delete(editId) {
-      this.$confirm('您确定要将此工单删除吗?', '提示', {
+      this.$confirm('您确定要将此活动删除吗?', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'

CallCenterWeb.UI/src/views/marketingManagement/marketingActivity/components/addOrEdit.vue

@@ -91,10 +91,15 @@ export default {
         activityMode: '', //活动方式
       },
       rules: {
-        customerName: [{
+        activityName: [{
           required: true,
           trigger: 'blur',
-          message: '请输入商户名称',
+          message: '请输入活动名称',
+        }],
+        activityTime: [{
+          required: true,
+          trigger: 'blur',
+          message: '请输入活动时间',
         }],
       },
       loading: false

CallCenterWeb.UI/src/views/marketingManagement/marketingActivity/components/searchFilter.vue

@@ -67,7 +67,7 @@ export default {
           data: { rowid: '' } // props//该方法会自动添加一个key为layerid的值， 该值为创建层的id， 可以直接使用
         },
         area: ['80%', '90%'],
-        title: '添加工单'
+        title: '添加营销活动'
       })
     },
     btn_import() {

CallCenterWeb.UI/src/views/marketingManagement/marketingActivity/index.vue

@@ -103,6 +103,8 @@ export default {
           pageindex: this.pageParams.pageindex, // int 第几页
           pagesize: this.pageParams.pagesize, // int 每页几条信息
           type: 2, //生日营销活动
+          starttime:this.searchDatas.date && this.searchDatas.date[0],//开始时间
+          endtime:this.searchDatas.date && this.searchDatas.date[1],//结束时间
           process: this.activeName==3?'':this.activeName
         }
         getOrderLists(params).then(response => {
@@ -138,11 +140,11 @@ export default {
           data: { 'rowid': editId }// props
         },
         area: ['80%', '90%'],
-        title: '编辑工单'
+        title: '编辑营销活动'
       })
     },
     btn_delete(editId) {
-      this.$confirm('您确定要将此工单删除吗?', '提示', {
+      this.$confirm('您确定要将此活动删除吗?', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'

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

@@ -64,6 +64,11 @@ export default {
     },
     created() {
         this.getList()
+        document.onkeyup = (e) => {
+            if (e.keyCode === 13) {
+                this.getList()
+            }
+        }
     },
     methods: {
         getList() {

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

@@ -6,7 +6,7 @@
                     <span>积分配置</span>
                 </el-col>
                 <el-col>
-                    <span>是否开启积分：</span>
+                    <span>是否开启积分:</span>
                     <el-switch
                     @change="handleChange"
                     v-model="openPoints"
@@ -17,14 +17,14 @@
                 <div v-show="flag">
                     <el-col>
                         <span>积分获取比例:</span>
-                        订单金额1元人民币获得<el-input-number size="mini" v-model="integralProportion"  controls-position="right"></el-input-number>积分
+                        订单金额1元人民币获得<el-input-number size="mini" v-model="integralProportion"  controls-position="right" :min="0"></el-input-number>积分
                     </el-col>
                     <el-col>
                         <span>积分获取时间:</span>
                         订单完成<el-input-number size="mini" v-model="integralTime"  controls-position="right" :min="1"></el-input-number>天，获取积分
                     </el-col>
                     <el-col>
-                        <span>是否开启积分抵扣：</span>
+                        <span>是否开启积分抵扣:</span>
                         <el-switch
                         v-model="creditDeduction "
                         active-text="开启"
@@ -33,7 +33,7 @@
                     </el-col>
                     <el-col>
                         <span>积分抵扣比例:</span>
-                        <el-input-number size="mini" v-model="deductionProportion"  controls-position="right"></el-input-number>积分 抵扣1元人民币
+                        <el-input-number size="mini" v-model="deductionProportion"  controls-position="right" :min="0"></el-input-number>积分 抵扣1元人民币
                     </el-col>
                 </div>
                 <el-col>

CallCenterWeb.UI/src/views/memberManagement/memberLabel/addOrEdit.vue

@@ -7,19 +7,19 @@
       <el-form-item label="标签名称" prop="labelName">
         <el-input v-model="ruleForm.labelName" placeholder="请输入标签名称"></el-input>
       </el-form-item>
-      <el-form-item label="标签分类">
+      <el-form-item label="标签分类" prop="labelKind">
         <el-input v-model="ruleForm.labelKind" placeholder="请输入标签分类"></el-input>
       </el-form-item>
-      <el-form-item label="标签类型">
+      <el-form-item label="标签类型" prop="labelType">
         <el-input v-model="ruleForm.labelType" placeholder="请输入标签类型"></el-input>
       </el-form-item>
-      <el-form-item label="标签描述">
+      <el-form-item label="标签描述" prop="labelDescription">
         <el-input v-model="ruleForm.labelDescription" placeholder="请输入标签描述"></el-input>
       </el-form-item>
-      <el-form-item label="标签颜色">
+      <el-form-item label="标签颜色" prop="labelColor">
         <el-color-picker v-model="ruleForm.labelColor" @change='handleColor'></el-color-picker>
       </el-form-item>
-      <el-form-item label="标签字体颜色">
+      <el-form-item label="标签字体颜色" prop="fontSizeColor">
         <el-color-picker v-model="ruleForm.fontSizeColor" @change='handleFontSizeColor'></el-color-picker>
       </el-form-item>
       <el-form-item>
@@ -74,7 +74,7 @@ export default {
         labelName: [{
           required: true,
           trigger: 'blur',
-          message: '请输入标签姓名',
+          message: '请输入标签名称',
         }]
       },
       loading: false

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

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <div class="filter-container">
-      <el-input v-model="label_name" placeholder="请输入标签名" class="filter-item"></el-input>
+      <el-input v-model="label_name" placeholder="请输入标签名称" class="filter-item"></el-input>
       <el-button type="primary" class="filter-item" icon="el-icon-search" @click="btn_search">搜索</el-button>
       <el-button type="primary" class="filter-item" icon="el-icon-plus" @click="btn_add">添加</el-button>
     </div>
@@ -76,7 +76,7 @@ export default {
         const params = {
           pageindex: this.pageParams.pageindex, // int 第几页
           pagesize: this.pageParams.pagesize, // int 每页几条信息
-          keyword: this.label_name,//搜索标签名
+          keyword: this.label_name.trim(),//搜索标签名
         }
         getLabelLists(params).then(response => {
           this.loading = false

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

@@ -7,23 +7,23 @@
       <el-form-item label="客户姓名" prop="F_Name">
         <el-input v-model="ruleForm.F_Name" placeholder="请输入客户姓名"></el-input>
       </el-form-item>
-      <el-form-item label="客户性别">
+      <el-form-item label="客户性别" prop="F_Sex">
         <el-radio v-model="ruleForm.F_Sex" label="男">男</el-radio>
         <el-radio v-model="ruleForm.F_Sex" label="女">女</el-radio>
       </el-form-item>
-      <el-form-item label="客户年龄">
-        <el-input v-model="ruleForm.F_Age" placeholder="请输入客户年龄"></el-input>
+      <el-form-item label="客户年龄" prop="F_Age">
+        <el-input v-model="ruleForm.F_Age" placeholder="请输入客户年龄" onkeyup="value=value.replace(/[^\d.]/g,'')"></el-input>
       </el-form-item>
-      <el-form-item label="手机号码1">
+      <el-form-item label="手机号码1" prop="F_Mobile">
         <el-input v-model="ruleForm.F_Mobile" placeholder="请输入手机号码1"></el-input>
       </el-form-item>
-      <el-form-item label="手机号码2">
+      <el-form-item label="手机号码2" prop="F_Mobile1">
         <el-input v-model="ruleForm.F_Mobile1" placeholder="请输入手机号码2"></el-input>
       </el-form-item>
       <el-form-item label="固定电话" prop="F_Phone">
         <el-input v-model="ruleForm.F_Phone" placeholder="请输入固定电话"></el-input>
       </el-form-item>
-      <el-form-item label="会员类型">
+      <el-form-item label="会员类型" prop="F_Type">
         <el-select v-model="ruleForm.F_Type" placeholder="请选择会员类型" class="form_select">
           <el-option
             v-for="item in memberType"
@@ -33,7 +33,7 @@
           </el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="地区">
+      <el-form-item label="地区" prop="provinceCity">
          <el-cascader
         v-model="provinceCity"
         :options="provinceCityDatas"
@@ -44,19 +44,19 @@
         filterable
         change-on-select/>
       </el-form-item>
-      <el-form-item label="详细地址">
+      <el-form-item label="详细地址" prop="F_Address">
         <el-input v-model="ruleForm.F_Address" placeholder="请输入详细地址"></el-input>
       </el-form-item>
-      <el-form-item label="备用地址">
+      <el-form-item label="备用地址" prop="F_Address1">
         <el-input v-model="ruleForm.F_Address1" placeholder="请输入备用地址"></el-input>
       </el-form-item>
-      <el-form-item label="邮编">
+      <el-form-item label="邮编" prop="F_Postcode">
         <el-input v-model="ruleForm.F_Postcode" placeholder="请输入邮编"></el-input>
       </el-form-item>
-      <el-form-item label="鞋码">
-        <el-input v-model="ruleForm.F_ShoeSize" placeholder="请输入鞋码"></el-input>
+      <el-form-item label="鞋码" prop="F_ShoeSize">
+        <el-input v-model="ruleForm.F_ShoeSize" placeholder="请输入鞋码" onkeyup="value=value.replace(/[^\d.]/g,'')"></el-input>
       </el-form-item>
-      <el-form-item label="会员日期">
+      <el-form-item label="会员日期" prop="F_RegTime">
         <el-date-picker
           v-model="ruleForm.F_RegTime"
           type="datetime"
@@ -64,7 +64,7 @@
           class="form_date"
         ></el-date-picker>
       </el-form-item>
-      <el-form-item label="会员生日">
+      <el-form-item label="会员生日" prop="F_Birthday">
         <el-date-picker
         value-format="yyyy-MM-dd"
           v-model="ruleForm.F_Birthday"
@@ -73,17 +73,17 @@
           class="form_date"
         ></el-date-picker>
       </el-form-item>
-      <el-form-item label="会员积分">
-        <el-input v-model="ruleForm.F_Score" placeholder="请输入会员积分"></el-input>
+      <el-form-item label="会员积分" prop="F_Score">
+        <el-input v-model="ruleForm.F_Score" placeholder="请输入会员积分" onkeyup="value=value.replace(/[^\d.]/g,'')"></el-input>
       </el-form-item>
-      <el-form-item label="推荐人">
+      <el-form-item label="推荐人" prop="F_Recommender">
         <el-input v-model="ruleForm.F_Recommender" placeholder="请输入推荐人"></el-input>
       </el-form-item>
-      <el-form-item label="累计消费金额">
-        <el-input v-model="ruleForm.F_Money" placeholder="请输入累计消费金额"></el-input>
+      <el-form-item label="累计消费金额" prop="F_Money">
+        <el-input v-model="ruleForm.F_Money" placeholder="请输入累计消费金额" onkeyup="value=value.replace(/[^\d.]/g,'')"></el-input>
       </el-form-item>
-      <el-form-item label="累计积分">
-        <el-input v-model="ruleForm.F_TotalScore" placeholder="请输入累计积分"></el-input>
+      <el-form-item label="累计积分" prop="F_TotalScore">
+        <el-input v-model="ruleForm.F_TotalScore" placeholder="请输入累计积分" onkeyup="value=value.replace(/[^\d.]/g,'')"></el-input>
       </el-form-item>
       <el-form-item>
         <el-button type="primary" @click="submitForm">保存</el-button>
@@ -164,7 +164,7 @@ export default {
           {
             required: true,
             trigger: "blur",
-            message: "请输入商户名称"
+            message: "请输入客户名称"
           }
         ],
         F_Phone: [
@@ -270,6 +270,7 @@ export default {
       getMemberInfo(rid).then(response => {
         if (response.state.toLowerCase() === "success") {
           this.ruleForm = response.data;
+          this.ruleForm.F_Type = response.data.F_Label
           if(response.data.F_Province){
             this.provinceCity.push(response.data.F_Province)
           }

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

@@ -185,7 +185,7 @@ export default {
           this.mobile1 = res.F_Mobile // 手机号码1
           this.mobile2 = res.F_Mobile1 // 手机号码2
           this.phone = res.F_Phone // 固定电话
-          this.type = res.F_Type // 会员类型
+          this.type = res.F_Label // 会员类型
           this.address = res.F_Address // 详细地址
           this.postcode = res.F_Postcode // 邮编
           this.shoesize = res.F_ShoeSize // 鞋码
@@ -194,7 +194,7 @@ export default {
           this.recommender = res.F_Recommender // 推荐人
           this.money = res.F_Money // 累计消费金额  
           this.totalscore = res.F_TotalScore // 累计积分
-          this.province = res.F_TotalScore // 省
+          this.province = res.F_Province // 省
           this.city = res.F_City // 市
           this.area = res.F_Area // 县
           this.town = res.F_Town // 乡

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

@@ -1,8 +1,7 @@
 <template>
     <div class="filter-container">
-      <el-input v-model="searchDatas.customerName" placeholder="客户姓名" class="filter-item"></el-input>
-      <el-input v-model="searchDatas.phoneNumber" placeholder="手机号码" class="filter-item"></el-input>
-       <el-select v-model="searchDatas.memberType" placeholder="请选择会员类型" class="form_select">
+      <el-date-picker v-model="searchDatas.memberBirthday" type="date" placeholder="会员生日" value-format="yyyy-MM-dd" class="filter-item"></el-date-picker>
+       <el-select v-model="searchDatas.memberType" placeholder="请选择会员类型" class="form_select" clearable>
           <el-option
             v-for="item in memberType"
             :key="item.F_ValueId"
@@ -19,8 +18,9 @@
         clearable
         filterable
         change-on-select/>
+      <el-input v-model="searchDatas.customerName" placeholder="客户姓名" class="filter-item"></el-input>
+      <el-input v-model="searchDatas.phoneNumber" placeholder="手机号码" class="filter-item"></el-input>
       <el-input v-model="searchDatas.address" placeholder="详细地址" class="filter-item"></el-input>
-      <el-date-picker v-model="searchDatas.memberBirthday" type="date" placeholder="会员生日" value-format="yyyy-MM-dd" class="filter-item"></el-date-picker>
       <el-input v-model="searchDatas.referrer" placeholder="推荐人" class="filter-item"></el-input>
       <el-input v-model="searchDatas.saleperson" placeholder="销售负责人" class="filter-item"></el-input>
       <el-input v-model="searchDatas.contactFrequency" placeholder="联系频次" class="filter-item"></el-input>

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

@@ -12,7 +12,7 @@
       <el-table-column prop="F_Mobile1" label="手机号码2" align="center"  width=""></el-table-column>
       <el-table-column prop="F_Phone" label="固定电话" align="center"  width="100px"></el-table-column>
       <el-table-column prop="F_Label" label="会员类型" align="center"  width=""></el-table-column>
-      <el-table-column label="地址" align="center"  width="100px">
+      <el-table-column label="详细地址" align="center"  width="100px">
         <template slot-scope="scoped">
           <span v-show="scoped.row.F_Province==null?false:true">{{scoped.row.F_Province}}</span>
           <span v-show="scoped.row.F_City==null?false:true">{{scoped.row.F_City}}</span>
@@ -118,18 +118,18 @@ export default {
         const params = {
           pageindex: this.pageParams.pageindex, // int 第几页
           pagesize: this.pageParams.pagesize, // int 每页几条信息
-          name: this.searchDatas.customerName, //客户姓名
-          phone: this.searchDatas.phoneNumber, //手机号码
+          name: this.searchDatas.customerName.trim(), //客户姓名
+          phone: this.searchDatas.phoneNumber.trim(), //手机号码
           type: this.searchDatas.memberType, //会员类型
           province: this.searchDatas.provinceCity&&this.searchDatas.provinceCity[0], //省份
           city: this.searchDatas.provinceCity[1]&&this.searchDatas.provinceCity[1], //市
           area: this.searchDatas.provinceCity[2]&&this.searchDatas.provinceCity[2], //县区
           town: this.searchDatas.provinceCity[3]&&this.searchDatas.provinceCity[3], //乡镇
-          address: this.searchDatas.address, //详细地址
+          address: this.searchDatas.address.trim(), //详细地址
           birthday: this.searchDatas.memberBirthday, //会员生日
-          recommender: this.searchDatas.referrer, //推荐人
-          saleperson: this.searchDatas.saleperson, //销售负责人
-          contact: this.searchDatas.contactFrequency, //联系频次
+          recommender: this.searchDatas.referrer.trim(), //推荐人
+          saleperson: this.searchDatas.saleperson.trim(), //销售负责人
+          contact: this.searchDatas.contactFrequency.trim(), //联系频次
         }
         getOrderLists(params).then(response => {
           this.loading = false
@@ -180,7 +180,7 @@ export default {
           data: { 'rowid': editId.toString() }// props
         },
         area: ['80%', '90%'],
-        title: '编辑工单'
+        title: '编辑会员信息'
       })
     },
     //批量删除