Merge branch 'feature/act-code' of http://git.gicdev.com/office/haoban-3 into feature/act-code

src/router/actCodeManageRouter/staffActCodeRouter.js

@@ -23,7 +23,11 @@ const staffActCodeRouter = [
   {
     path: '/actCodeDetails',
     name: '活码详情-详情',
-    component: _import('salesleads/actCodeManage/staffActCode', 'actCodeDetail')
+    component: _import('salesleads/actCodeManage/staffActCode', 'actCodeDetail'),
+    meta: {
+      keepAlive: true,
+      fromPath: ['/actCodeRecord']
+    }
   },
   {
     path: '/actCodeAdd',

src/views/salesleads/actCodeManage/staffActCode/actCodeRecord.vue

@@ -45,13 +45,13 @@
         <el-table-column prop="" label="导购信息" show-overflow-tooltip min-width="128px">
           <template slot-scope="scope">
             <p class="line-20 text-ellipsis">{{ scope.row.clerkName || '--' }}</p>
-            <p class="color-606266 line-18 text-ellipsis font-12">{{ scope.row.clerkCode || '--' }}</p>
+            <p class="color-606266 line-18 text-ellipsis font-12">code：{{ scope.row.clerkCode || '--' }}</p>
           </template>
         </el-table-column>
         <el-table-column prop="" label="导购所属门店" show-overflow-tooltip min-width="185px">
           <template slot-scope="scope">
             <p class="line-20 text-ellipsis">{{ scope.row.storeName || '--' }}</p>
-            <p class="color-606266 line-18 text-ellipsis font-12">{{ scope.row.storeCode || '--' }}</p>
+            <p class="color-606266 line-18 text-ellipsis font-12">code：{{ scope.row.storeCode || '--' }}</p>
           </template>
         </el-table-column>
         <el-table-column prop="" label="企微号" show-overflow-tooltip min-width="107px">

src/views/salesleads/actCodeManage/staffActCode/views/act-code-table.vue

@@ -148,7 +148,7 @@
     <el-dialog title="选择分组" :visible.sync="dialogGroupFormVisible" width="25%">
       <el-form :model="formGroup">
         <el-form-item label="活码分组" :rules="[{ required: true, message: '请选择分组', trigger: 'blur' }]">
-          <el-select v-model="formGroup.groupId" placeholder="选择分组" v-loadmore="onLoadmore" remote filterable :remote-method="remoteMethod" @visible-change="visibleChange" clearable>
+          <el-select class="chooseGroup" v-model="formGroup.groupId" placeholder="选择分组" v-loadmore="onLoadmore" filterable :filter-method="remoteMethod" @visible-change="visibleChange" clearable>
             <el-option v-for="item in groupList" :key="item.groupId" :label="item.groupName" :value="item.groupId"></el-option>
           </el-select>
         </el-form-item>
@@ -614,6 +614,9 @@ export default {
 </style>
 
 <style lang="less" scoped>
+.chooseGroup {
+  width: 100%;
+}
 .el-form--inline .el-form-item {
   margin-right: 5px !important;
 }

src/views/salesleads/actCodeManage/staffActCode/views/group-list.vue

@@ -224,7 +224,7 @@ export default {
             this.addOrEditGroupDialog = false;
           } else {
             this.$message({
-              type: 'error',
+              type: 'warning',
               message: res.data.message
             });
           }

src/views/salesleads/components/dataDetail.vue

@@ -17,19 +17,19 @@
       <el-table-column label="导购信息" show-overflow-tooltip>
         <template slot-scope="{ row }">
           <p class="overflow-ellipsis" :title="row.clerkName">{{ row.clerkName }}</p>
-          <p>code：{{ row.clerkCode }}</p>
+          <p class="textCode overflow-ellipsis">code：{{ row.clerkCode }}</p>
         </template>
       </el-table-column>
       <el-table-column label="导购所属门店" show-overflow-tooltip>
         <template slot-scope="{ row }">
           <p class="overflow-ellipsis" :title="row.storeName">{{ row.storeName ? row.storeName : '--' }}</p>
-          <p>code：{{ row.storeCode ? row.storeCode : '--' }}</p>
+          <p class="textCode overflow-ellipsis">code：{{ row.storeCode ? row.storeCode : '--' }}</p>
         </template>
       </el-table-column>
       <el-table-column label="企微号">
         <template slot-scope="{ row }">
           <p class="overflow-ellipsis" :title="row.staffName">{{ row.staffName }}</p>
-          <!-- <p>code：{{ row.staffCode }}</p> -->
+          <!-- <p class="textCode overflow-ellipsis">code：{{ row.staffCode }}</p> -->
         </template>
       </el-table-column>
       <el-table-column label="新增总人数" prop="addNumT" sortable></el-table-column>
@@ -318,4 +318,8 @@ export default {
 .el-button--text {
   color: #2f54eb;
 }
+.textCode {
+  font-size: 12px;
+  color: #606266;
+}
 </style>

src/views/salesleads/components/welcomesItem.vue

@@ -176,7 +176,7 @@ export default {
     submit() {
       if (this.welcomeType == 2) return true;
       if (this.welcomeType == 1 && !this.welcomeId) {
-        this.$message.error('请选择欢迎语');
+        this.$message.warning('请选择欢迎语');
         return false;
       } else {
         return true;