Merge branch 'moss_dev'

* moss_dev:
  feat：优惠券时指定会员可指定师傅身份

src/components/selectComponent/selectMember.vue

@@ -1,5 +1,5 @@
 <template>
-  <el-dialog title="选择会员" :visible.sync="show" :show-close="false" width="1000px" :close-on-click-modal="false">
+  <el-dialog title="选择会员" :visible.sync="show" :show-close="false" width="1200px" :close-on-click-modal="false">
     <div class="dialog-container2 clearfix">
       <el-form ref="screenForm" :model="member_screenForm" size="small" label-position="left">
         <el-row :gutter="20">
@@ -8,17 +8,18 @@
               <el-input v-model="member_screenForm.keyword" placeholder="请输入会员名称/电话"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :xs="8" :sm="8" :lg="8">
+          <el-col :xs="7" :sm="7" :lg="7">
             <el-form-item label="注册日期" prop="registerDate" label-width="70px">
               <el-date-picker style="width: 100%" v-model="member_screenForm.registerDate" type="daterange"
                 value-format="yyyy-MM-dd" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期">
               </el-date-picker>
             </el-form-item>
           </el-col>
-          <el-col  :xs="6" :sm="6" :lg="6">
+          <el-col  :xs="7" :sm="7" :lg="7">
             <el-form-item label="" prop="type" label-width="20px">
               <el-radio-group v-model="member_screenForm.type" :disabled="memberList.length > 0 ? true : false">
                 <el-radio :label="'SERVICE'">业务员</el-radio>
+                <el-radio :label="'WORKER'">工程师</el-radio>
                 <el-radio :label="'GENERAL'">普通用户</el-radio>
               </el-radio-group>
             </el-form-item>
@@ -35,12 +36,12 @@
           <el-table-column align="center" prop="nickName" label="会员名称" min-width="150"></el-table-column>
           <el-table-column align="center" prop="sex" label="性别" min-width="100"></el-table-column>
           <el-table-column align="center" prop="mobile" label="注册手机" min-width="100"></el-table-column>
-          <el-table-column align="center" prop="memberName" label="角色" min-width="100">
+          <el-table-column align="center" prop="type" label="角色" min-width="100">
             <template slot-scope="scope">
               {{ scope.row.type | MEMBER_CURRENT_TYPE_FILTER }}
             </template>
           </el-table-column>
-          <el-table-column align="center" prop="memberName" label="状态" min-width="100">
+          <el-table-column align="center" prop="status" label="状态" min-width="100">
             <template slot-scope="scope">
               <el-tag :type="scope.row.status ? 'success' : 'danger'">{{ scope.row.status | MEMBER_CURRENT_STATUS_FILTER
               }}</el-tag>
@@ -90,6 +91,10 @@ export default {
     }
   },
   created() {
+    if(this.memberList.length > 0) {
+      console.log(this.memberList[0].type);
+      this.member_screenForm.type = this.memberList[0].type;
+    }
     this.getMemberList()
   },
   methods: {
@@ -162,6 +167,7 @@ export default {
       this.$emit("selectMemberPass", [...this.memberList, ...this.memberTable_choose])
       this.$nextTick(() => {
         this.$emit("cancelSelectMember")
+        this.memberTable_choose = [];
       })
     },
   }

src/utils/select_data.js

@@ -12,7 +12,8 @@ export const MEMBER_CURRENT_STATUS = [
 // 会员的当前类型
 export const MEMBER_CURRENT_TYPE = [
   { label: '普通用户', value: 'GENERAL' },
-  { label: '业务员', value: 'SERVICE' }
+  { label: '业务员', value: 'SERVICE' },
+  { label: '工程师', value: 'WORKER' },
 ]
 
 // 结算的当前状态

src/views/mallManagement/activity/coupon_index/index.vue

@@ -220,7 +220,7 @@ export default {
                     },
                     render: (h, { row, column, index }) => {
                       return <div style="box-sizing: border-box; padding: 6px;">
-                        {MEMBER_CURRENT_TYPE_FILTER(row.memberName)}
+                        {MEMBER_CURRENT_TYPE_FILTER(row.type)}
                       </div>
                     }
                   },