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

src/views/salesleads/actCodeManage/components/mixin.js

@@ -80,21 +80,23 @@ export default {
         // 近三个月
         setDate = endDate => {
           endDate.setMonth(endDate.getMonth() - 3);
-          endDate.setDate(endDate.getDate() + 1);
+          endDate.setDate(1);
           return new Date(endDate);
         };
       } else if (index == 3) {
         // 近半年
         setDate = endDate => {
           endDate.setMonth(endDate.getMonth() - 6);
-          endDate.setDate(endDate.getDate() + 1);
+          endDate.setDate(1); // 以1号为开端
+          // endDate.setDate(endDate.getDate() + 1);
           return new Date(endDate);
         };
       } else {
         // 近一年
         setDate = endDate => {
           endDate.setFullYear(endDate.getFullYear() - 1);
-          endDate.setDate(endDate.getDate() + 1);
+          endDate.setDate(1);
+          // endDate.setDate(endDate.getDate() + 1);
           return new Date(endDate);
         };
       }

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

@@ -28,8 +28,8 @@
       </el-form-item>
       <el-form-item>
         <el-select v-model="inFields.hmTypeInt" placeholder="全部类型" clearable class="w160" @change="searchList">
-          <el-option :key="0" label="单人活码" :value="0"> </el-option>
-          <el-option :key="1" label="多人活码" :value="1"> </el-option>
+          <el-option :key="1" label="单人活码" :value="1"> </el-option>
+          <el-option :key="2" label="多人活码" :value="2"> </el-option>
         </el-select>
       </el-form-item>
       <el-form-item>
@@ -112,7 +112,7 @@
       </el-table-column>
       <el-table-column label="所属分组" width="100" show-overflow-tooltip>
         <template slot-scope="{ row }">
-          <p>{{ row.hmGroupId == null ? row.hmGroupId : '--' }}</p>
+          <p>{{ row.hmGroupId ? row.hmGroupId : '--' }}</p>
         </template>
       </el-table-column>
       <el-table-column label="创建人" width="100">