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

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

@@ -79,10 +79,10 @@
           <p>{{ row.addNumT ? row.addNumT : '--' }}</p>
         </template>
       </el-table-column>
-      <el-table-column label="关联导购" width="120" show-overflow-tooltip>
+      <el-table-column label="关联导购" width="130" show-overflow-tooltip>
         <template slot-scope="{ row }">
           <p>{{ row.clerkName ? row.clerkName : '--' }}</p>
-          <p class="ft-12 phone">{{ row.clerkCode ? row.clerkCode : '--' }}</p>
+          <p class="ft-12 phone overflow-ellipsis">{{ row.clerkCode ? row.clerkCode : '--' }}</p>
           <p v-if="row.clerkList && row.clerkList.length > 0">
             <el-popover width="200" trigger="click">
               <ul class="userMember-ul">
@@ -284,8 +284,8 @@ export default {
             }).then(() => {
               deleteRequest('/haoban-manage3-web/hm/qrcode/del', { hmId: row.hmId }).then(res => {
                 if (res.data.code == 0) {
-                  // this.getTableList();
-                  this.$router.go(0);
+                  this.getTableList();
+                  // this.$router.go(0);
                 }
               });
             });

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

@@ -31,7 +31,7 @@ export default {
   components: { setActCode, SelectClerk },
   data() {
     return {
-      hmMemberNum: 1,
+      hmMemberNum: 0,
       form: {
         hmType: 1,
         // name: '',
@@ -58,7 +58,7 @@ export default {
     getClerkNum() {
       getRequest('/haoban-manage3-web/hm/qrcode/getAddCount', {}).then(res => {
         if (res.data.code == 0) {
-          this.hmMemberNum = res.data.result || 1;
+          this.hmMemberNum = res.data.result || 0;
         }
       });
     },

src/views/salesleads/components/dataDetail.vue

@@ -107,7 +107,7 @@ export default {
             start = new Date(`${start.getFullYear()}-${start.getMonth() + 1}-${start.getDate()}`);
             let start2 = new Date(pickerMinDate);
             let end = new Date();
-            end = new Date(`${end.getFullYear()}-${end.getMonth() + 1}-${end.getDate()} 23:59:59`);
+            end = new Date(`${end.getFullYear()}-${end.getMonth() + 1}-${end.getDate() + 1}`);
             let end2 = new Date(pickerMinDate);
             if (pickerMinDate) {
               start = start.setFullYear(start.getFullYear() - 2);