Merge branch 'feature/act-code' into dev

index.html

@@ -13,7 +13,7 @@
   <meta charset="utf-8">
   <link rel="shortcut icon" href="./favicon.ico" />
   <title>好办管理平台</title>
-  <link rel="stylesheet" type="text/css" href="//web-1251519181.file.myqcloud.com/custom-element/custom-element.1.0.74.css" />
+  <link rel="stylesheet" type="text/css" href="//web-1251519181.file.myqcloud.com/custom-element/custom-element.1.0.75.css" />
   <!--好办后台3.0--> 
   <!-- <link rel="stylesheet" type="text/css" href="//at.alicdn.com/t/font_1628375_vcg1gtmx7lb.css" />  -->
   <script src="//at.alicdn.com/t/font_1628375_vcg1gtmx7lb.js"></script>

menu-data/button-code.js

@@ -332,13 +332,15 @@ module.exports = {
     infoActCode: ['详情', 1, 0],
     editActCode: ['编辑', 1, 1],
     downActCode: ['下载活码', 1, 1],
-    delActCode: ['作废', 1, 1]
+    delActCode: ['作废', 1, 1],
+    recordCode: ['查看记录', 1, 0]
   },
   linkCode: {
     addLink: ['新建链接', 1, 0],
     dataLink: ['数据', 1, 0],
     infoLink: ['详情', 1, 0],
     editLink: ['编辑', 1, 0],
-    downLink: ['链接', 1, 1]
+    downLink: ['链接', 1, 1],
+    recordLink: ['查看记录', 1, 0]
 }
 }

menu-data/button-code.json

-{"multipleAssign":"multipleAssign","assign":"assign","willSyncTag":"willSyncTag","breakSyncTag":"breakSyncTag","addShowRules":"addShowRules","editShowRules":"editShowRules","delShowRules":"delShowRules","groupExpire":"groupExpire","syncGroup":"syncGroup","addGroupTemp":"addGroupTemp","editGroupTemp":"editGroupTemp","setStoreArea":"setStoreArea","delGroupTemp":"delGroupTemp","searchSetSave":"searchSetSave","saveTrafficTaskSet":"saveTrafficTaskSet","addCard":"addCard","editCard":"editCard","delCard":"delCard","sendCardLog":"sendCardLog","getCardLog":"getCardLog","saveEvaluateSet":"saveEvaluateSet","addMaterialGroup":"addMaterialGroup","editMaterialGroup":"editMaterialGroup","delMaterialGroup":"delMaterialGroup","multipleDelAssets":"multipleDelAssets","multipleMoveAssets":"multipleMoveAssets","addText":"addText","editText":"editText","delText":"delText","textAssignStore":"textAssignStore","addImage":"addImage","editImage":"editImage","delImage":"delImage","imageAssignStore":"imageAssignStore","addWeb":"addWeb","editWeb":"editWeb","delWeb":"delWeb","webAssignStore":"webAssignStore","addVideo":"addVideo","editVideo":"editVideo","delVideo":"delVideo","videoAssignStore":"videoAssignStore","addFile":"addFile","editFile":"editFile","delFile":"delFile","fileAssignStore":"fileAssignStore","addApps":"addApps","editApps":"editApps","delApps":"delApps","appsAssignStore":"appsAssignStore","saveGoodsSet":"saveGoodsSet","exportActiveUser":"exportActiveUser","exportLoginUser":"exportLoginUser","exportAreaLoginUser":"exportAreaLoginUser","multipleDelReport":"multipleDelReport","exportReport":"exportReport","reportDetail":"reportDetail","multipleDelReportDetail":"multipleDelReportDetail","delReportDetail":"delReportDetail","showReportDetail":"showReportDetail","multipleExportReport":"multipleExportReport","saveTaskSet":"saveTaskSet","settingSystemReport":"settingSystemReport","saveSystemReport":"saveSystemReport","addCustomReport":"addCustomReport","copyCustomReport":"copyCustomReport","editCustomReport":"editCustomReport","delCustomReport":"delCustomReport","monthTarget":"monthTarget","dayTarget":"dayTarget","exportMonthTask":"exportMonthTask","checkMonthTask":"checkMonthTask","multipleDelTask":"multipleDelTask","delTask":"delTask","exportStoreList":"exportStoreList","checkStoreList":"checkStoreList","exportStoreDetail":"exportStoreDetail","checkStoreDetail":"checkStoreDetail","exportStoreDetailPop":"exportStoreDetailPop","previewStoreDetail":"previewStoreDetail","exportGrTaskList":"exportGrTaskList","checkGrTaskList":"checkGrTaskList","exportTaskRecord":"exportTaskRecord","multipleDelTaskRecord":"multipleDelTaskRecord","checkTaskRecord":"checkTaskRecord","exportTaskDetail":"exportTaskDetail","multipleDelTaskDetail":"multipleDelTaskDetail","delTaskDetail":"delTaskDetail","resolveTaskDetail":"resolveTaskDetail","previewTaskDetail":"previewTaskDetail","exportTaskView":"exportTaskView","multipleDelTaskView":"multipleDelTaskView","checkTaskView":"checkTaskView","exportTaskViewDetail":"exportTaskViewDetail","multipleDelTaskViewDetail":"multipleDelTaskViewDetail","checkTaskDetail":"checkTaskDetail","addSalutatory":"addSalutatory","editSalutatory":"editSalutatory","delSalutatory":"delSalutatory","multipleResolve":"multipleResolve","singleResolve":"singleResolve","singleReject":"singleReject","saveApplySetting":"saveApplySetting","refreshStoreMember":"refreshStoreMember","exportContact":"exportContact","checkContactDetail":"checkContactDetail","checkContactMemberDetail":"checkContactMemberDetail","checkLog":"checkLog","saveGuideSetting":"saveGuideSetting","saveAppsVisible":"saveAppsVisible","refreshStoreInfo":"refreshStoreInfo","saveMemberSecret":"saveMemberSecret","addMemberAppsSecret":"addMemberAppsSecret","editMemberAppsSecret":"editMemberAppsSecret","delMemberAppsSecret":"delMemberAppsSecret","addAppsSecret":"addAppsSecret","getAppsSecret":"getAppsSecret","editAppsSecret":"editAppsSecret","delAppsSecret":"delAppsSecret","checkAuth":"checkAuth","bindStoreList":"bindStoreList","refreshStore":"refreshStore","refreshAdminList":"refreshAdminList","addActCode":"addActCode","batchActCode":"batchActCode","batchGroup":"batchGroup","dataActCode":"dataActCode","infoActCode":"infoActCode","editActCode":"editActCode","downActCode":"downActCode","delActCode":"delActCode","addLink":"addLink","dataLink":"dataLink","infoLink":"infoLink","editLink":"editLink","downLink":"downLink"}
\ No newline at end of file
+{"multipleAssign":"multipleAssign","assign":"assign","willSyncTag":"willSyncTag","breakSyncTag":"breakSyncTag","addShowRules":"addShowRules","editShowRules":"editShowRules","delShowRules":"delShowRules","groupExpire":"groupExpire","syncGroup":"syncGroup","addGroupTemp":"addGroupTemp","editGroupTemp":"editGroupTemp","setStoreArea":"setStoreArea","delGroupTemp":"delGroupTemp","searchSetSave":"searchSetSave","saveTrafficTaskSet":"saveTrafficTaskSet","addCard":"addCard","editCard":"editCard","delCard":"delCard","sendCardLog":"sendCardLog","getCardLog":"getCardLog","saveEvaluateSet":"saveEvaluateSet","addMaterialGroup":"addMaterialGroup","editMaterialGroup":"editMaterialGroup","delMaterialGroup":"delMaterialGroup","multipleDelAssets":"multipleDelAssets","multipleMoveAssets":"multipleMoveAssets","addText":"addText","editText":"editText","delText":"delText","textAssignStore":"textAssignStore","addImage":"addImage","editImage":"editImage","delImage":"delImage","imageAssignStore":"imageAssignStore","addWeb":"addWeb","editWeb":"editWeb","delWeb":"delWeb","webAssignStore":"webAssignStore","addVideo":"addVideo","editVideo":"editVideo","delVideo":"delVideo","videoAssignStore":"videoAssignStore","addFile":"addFile","editFile":"editFile","delFile":"delFile","fileAssignStore":"fileAssignStore","addApps":"addApps","editApps":"editApps","delApps":"delApps","appsAssignStore":"appsAssignStore","saveGoodsSet":"saveGoodsSet","exportActiveUser":"exportActiveUser","exportLoginUser":"exportLoginUser","exportAreaLoginUser":"exportAreaLoginUser","multipleDelReport":"multipleDelReport","exportReport":"exportReport","reportDetail":"reportDetail","multipleDelReportDetail":"multipleDelReportDetail","delReportDetail":"delReportDetail","showReportDetail":"showReportDetail","multipleExportReport":"multipleExportReport","saveTaskSet":"saveTaskSet","settingSystemReport":"settingSystemReport","saveSystemReport":"saveSystemReport","addCustomReport":"addCustomReport","copyCustomReport":"copyCustomReport","editCustomReport":"editCustomReport","delCustomReport":"delCustomReport","monthTarget":"monthTarget","dayTarget":"dayTarget","exportMonthTask":"exportMonthTask","checkMonthTask":"checkMonthTask","multipleDelTask":"multipleDelTask","delTask":"delTask","exportStoreList":"exportStoreList","checkStoreList":"checkStoreList","exportStoreDetail":"exportStoreDetail","checkStoreDetail":"checkStoreDetail","exportStoreDetailPop":"exportStoreDetailPop","previewStoreDetail":"previewStoreDetail","exportGrTaskList":"exportGrTaskList","checkGrTaskList":"checkGrTaskList","exportTaskRecord":"exportTaskRecord","multipleDelTaskRecord":"multipleDelTaskRecord","checkTaskRecord":"checkTaskRecord","exportTaskDetail":"exportTaskDetail","multipleDelTaskDetail":"multipleDelTaskDetail","delTaskDetail":"delTaskDetail","resolveTaskDetail":"resolveTaskDetail","previewTaskDetail":"previewTaskDetail","exportTaskView":"exportTaskView","multipleDelTaskView":"multipleDelTaskView","checkTaskView":"checkTaskView","exportTaskViewDetail":"exportTaskViewDetail","multipleDelTaskViewDetail":"multipleDelTaskViewDetail","checkTaskDetail":"checkTaskDetail","addSalutatory":"addSalutatory","editSalutatory":"editSalutatory","delSalutatory":"delSalutatory","multipleResolve":"multipleResolve","singleResolve":"singleResolve","singleReject":"singleReject","saveApplySetting":"saveApplySetting","refreshStoreMember":"refreshStoreMember","exportContact":"exportContact","checkContactDetail":"checkContactDetail","checkContactMemberDetail":"checkContactMemberDetail","checkLog":"checkLog","saveGuideSetting":"saveGuideSetting","saveAppsVisible":"saveAppsVisible","refreshStoreInfo":"refreshStoreInfo","saveMemberSecret":"saveMemberSecret","addMemberAppsSecret":"addMemberAppsSecret","editMemberAppsSecret":"editMemberAppsSecret","delMemberAppsSecret":"delMemberAppsSecret","addAppsSecret":"addAppsSecret","getAppsSecret":"getAppsSecret","editAppsSecret":"editAppsSecret","delAppsSecret":"delAppsSecret","checkAuth":"checkAuth","bindStoreList":"bindStoreList","refreshStore":"refreshStore","refreshAdminList":"refreshAdminList","addActCode":"addActCode","batchActCode":"batchActCode","batchGroup":"batchGroup","dataActCode":"dataActCode","infoActCode":"infoActCode","editActCode":"editActCode","downActCode":"downActCode","delActCode":"delActCode","recordCode":"recordCode","addLink":"addLink","dataLink":"dataLink","infoLink":"infoLink","editLink":"editLink","downLink":"downLink","recordLink":"recordLink"}
\ No newline at end of file

src/main.js

@@ -103,8 +103,6 @@ router.beforeEach((to, from, next) => {
       to.meta.refresh=refresh;
     }
   }
-  console.log(from)
-  console.log(to)
   next();
 });
  

src/views/salesleads/actCodeManage/attractFlowLink/info.vue

@@ -190,12 +190,12 @@ export default {
     getChartList() {
       let para = {
         linkId: this.linkId,
-        startTime: this.dateDefault[0],
-        endTime: this.dateDefault[1]
+        startTime: this.dateDefault[0] + ' 00:00:00',
+        endTime: this.dateDefault[1] + ' 23:59:59'
       };
       statisticsChart(para).then(res => {
         const { result } = res.data;
-        this.charData = result;
+        this.charData = result || [];
         // this.charData = [
         //   { addNum: 1, bizDate: '2021-07', clickNum: 3, clickTimes: 0 },
         //   { addNum: 2, bizDate: '2021-08', clickNum: 30, clickTimes: 10 },

src/views/salesleads/actCodeManage/attractFlowLink/newAddChart.vue

 <template>
-  <div :id="id"></div>
+  <div>
+    <div :id="id"></div>
+    <div v-if="!charData.length" class="chart--nodata">
+      <div>
+        <img class="image-120" src="@/assets/no-data.svg" />
+        <p class="font-14 color-606266 no-data-text">暂无数据</p>
+      </div>
+    </div>
+  </div>
+
   <!-- <div v-if="charData.length" :id="id"></div> -->
   <!-- <div v-else class="chart--nodata"></div> -->
 </template>
@@ -42,6 +51,7 @@ export default {
   methods: {
     async drawChart() {
       this.chart && this.chart.destroy();
+      if (!this.charData.length) return;
       this.chart = new G2.Chart({
         container: this.id,
         height: 359,
@@ -127,3 +137,20 @@ export default {
   }
 };
 </script>
+<style lang="scss" scoped>
+.chart--nodata {
+  height: 256px;
+  width: 100%;
+  display: flex;
+  justify-content: center;
+  .image-120 {
+    width: 120px;
+    height: 120px;
+    padding-top: 60px;
+  }
+  .no-data-text {
+    text-align: center;
+    padding-top: 18px;
+  }
+}
+</style>

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

@@ -116,8 +116,8 @@ export default {
       let para = {
         inFields: {
           hmId: that.hmId,
-          startTime: that.dateDefault[0],
-          endTime: that.dateDefault[1],
+          startTime: that.dateDefault[0] + ' 00:00:00',
+          endTime: that.dateDefault[1] + ' 23:59:59',
           type: that.dateKey >= 2 ? 2 : 1
         }
       };

src/views/salesleads/components/dataDetail.vue

@@ -44,7 +44,9 @@
       </el-table-column>
       <el-table-column label="操作">
         <template slot-scope="{ row }">
-          <el-button type="text" @click="lookRecords(row)">查看记录</el-button>
+          {{ row }}
+          <el-button type="text" @click="lookRecords(row)" v-if="row.hmId && $getButtonLimit($buttonCode.recordCode)" :limit-code="$buttonCode.recordCode">查看记录</el-button>
+          <el-button type="text" @click="lookRecords(row)" v-else-if="row.hmId && $getButtonLimit($buttonCode.recordLink)" :limit-code="$buttonCode.recordLink">查看记录</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -215,8 +217,8 @@ export default {
     // 列表数据
     async getTableList() {
       const paras = JSON.parse(JSON.stringify(this.pageParam));
-      paras.inFields.startTime = this.dateDefault ? this.dateDefault[0].toString() : '';
-      paras.inFields.endTime = this.dateDefault ? this.dateDefault[1].toString() : '';
+      paras.inFields.startTime = this.dateDefault ? this.dateDefault[0] + ' 00:00:00' : '';
+      paras.inFields.endTime = this.dateDefault ? this.dateDefault[1] + ' 23:59:59' : '';
       if (this.id && this.typeT == 'code') {
         paras.inFields.hmId = this.id;
       } else if (this.id && this.typeT == 'link') {
@@ -238,8 +240,8 @@ export default {
     },
     lookRecords(row) {
       const { clerkId, linkId, hmId } = row;
-      const startTime = this.dateDefault && this.dateDefault.length ? this.dateDefault[0] : undefined;
-      const endTime = this.dateDefault && this.dateDefault.length ? this.dateDefault[1] : undefined;
+      const startTime = this.dateDefault && this.dateDefault.length ? this.dateDefault[0] + ' 00:00:00' : undefined;
+      const endTime = this.dateDefault && this.dateDefault.length ? this.dateDefault[1] + '23:59:59' : undefined;
       let query = { linkId, clerkId, hmId };
       startTime ? (query.startTime = startTime) : '';
       endTime ? (query.endTime = endTime) : '';