Merge branch 'feature/12月迭代' into master

config/index.js

@@ -18,7 +18,7 @@ module.exports = {
     // Paths
     assetsSubDirectory: 'static',
     assetsPublicPath: '/haoban-3/',
-    // proxyTable: proxyConfig.proxyList,
+    proxyTable: proxyConfig.proxyList,
 
     // Various Dev Server settings
     // host: '0.0.0.0', // can be overwritten by process.env.HOST

config/proxyList.js

@@ -63,6 +63,13 @@ module.exports = {
       pathRewrite: {
         '^/haoban-task-manage-web': ''
       }
+    },
+    '/haoban-app-aggregation-web/':{
+      target: 'https://www.gicdev.com/haoban-app-aggregation-web/',
+      changeOrigin: true,
+      pathRewrite: {
+        '^/haoban-app-aggregation-web/': ''
       }
+    },
   }
 }

src/api/api.js

@@ -21,12 +21,10 @@ import { Message } from 'element-ui';
 // }
 
 Vue.axios.defaults.timeout = 500000;
-// let local = window.location.origin;
-// eslint-disable-next-line
-let local = process.env.NODE_ENV == 'development' ? 'https://www.gicdev.com/' : '';
-/* if (local.indexOf('localhost') != -1) {
-  local = 'https://www.gicdev.com';
-} */
+let local = window.location.origin;
+
+// let local = process.env.NODE_ENV == 'development' ? 'https://www.gicdev.com' : '';
+
 let axiosPromiseArr = []; //储存cancel toke
 let pending = []; //声明一个数组用于存储每个ajax请求的取消函数和ajax标识
 let CancelToken = Vue.axios.CancelToken;

src/components/app/taskView.vue

@@ -64,6 +64,9 @@
         <el-table-column prop="" label="逾期中" show-overflow-tooltip>
           <template slot-scope="scope">{{ scope.row.overTimeNum }}</template>
         </el-table-column>
+        <el-table-column prop="" label="逾期失效" show-overflow-tooltip>
+          <template slot-scope="scope">{{ scope.row.invalidCount }}</template>
+        </el-table-column>
         <el-table-column prop="" label="删除状态" show-overflow-tooltip>
           <template slot-scope="scope">
             <span class="state-point state-point-error" v-if="scope.row.delStatusDesc != '-'">{{ scope.row.delStatusDesc }}</span>

src/filters/index.js

@@ -199,7 +199,15 @@ const formatTime = function(msTime) {
 
   return `${hour}:${minute}:${second}`;
 };
-
+const formatInvalidStatus = function(data) {
+  let str = '--';
+  if (data == 1) {
+    str = '未失效';
+  } else if (data == 2) {
+    str = '已失效';
+  }
+  return str;
+};
 export default {
   dateFormat,
   formatTimeStamp,
@@ -211,5 +219,6 @@ export default {
   timeStampToYmd2,
   formatName,
   timeStampSpace,
-  formatTime
+  formatTime,
+  formatInvalidStatus
 };

src/views/enterprise/enterpriseSet.vue

@@ -100,6 +100,12 @@
           <el-input class="m-l-10 w-399" maxlength="200" v-model="application.secretVal"></el-input>
           <span v-if="haobanObj.updateTime" class="m-l-20 font-12 color-909399">最后一次授权：{{ application.updateTime | formatTimeStamp }}</span>
         </div>
+        <div class="m-b-20 secret-cell" v-show="paymentObj.secretVal">
+          <span class="inline-block w-127">
+            <span class="font-14 color-606266">企微支付secret：</span>
+          </span>
+          <el-input class="m-l-10 w-399" maxlength="200" v-model="paymentObj.secretVal"></el-input>
+        </div>
         <div class="secret-cell m-b-20">
           <el-tooltip class="item" effect="dark" content="企业微信中【应用管理】关联的会员小程序secret，请复制后更新至此处。首次使用好办请输入。" placement="top-start"> <span style="cursor: pointer;padding-bottom: 2px; border-bottom: 1px dashed #2F54EB;" class="font-14 color-606266">会员小程序secret：</span></el-tooltip>
           <span class="p-l-10 font-14 color-303133 font-w-500">会员小程序信息</span>
@@ -294,7 +300,8 @@ export default {
       application: {
         secretVal: '',
         updateTime: null
-      } // 待开发应用secret
+      }, // 待开发应用secret
+      paymentObj: {}
     };
   },
   computed: {},
@@ -635,6 +642,9 @@ export default {
                 if (ele.secretType == 5) {
                   this.application = ele;
                 }
+                if (ele.secretType == 6) {
+                  this.paymentObj = ele;
+                }
               });
             }
             return false;

src/views/salesleads/groupSend/grStoreDetail.vue

@@ -74,6 +74,9 @@
                   <el-table-column label="完成情况" min-width="90">
                     <template slot-scope="scope"><span v-if="scope.row.taskStatus" class="point" :style="'background:' + taskStyle[scope.row.taskStatus] + ';'"></span>{{ scope.row.taskStatus === 1 ? '未完成' : scope.row.taskStatus === 2 ? '已完成' : '' }}</template>
                   </el-table-column>
+                  <el-table-column label="逾期失效" min-width="90">
+                    <template slot-scope="scope">{{ scope.row.invalidStatus | formatInvalidStatus }}</template>
+                  </el-table-column>
                   <el-table-column label="完成详情" min-width="280">
                     <template slot-scope="scope"> 待发送：{{ scope.row.waitSendCount }}，已发送：{{ scope.row.successCount }}，发送失败：{{ scope.row.failCount }} </template>
                   </el-table-column>

src/views/salesleads/groupSend/grStoreList.vue

@@ -69,6 +69,9 @@
                   <el-table-column prop="" label="逾期中">
                     <template slot-scope="scope">{{ scope.row.ovincplTaskCnt || '--' }}</template>
                   </el-table-column>
+                  <el-table-column prop="" label="逾期失效" show-overflow-tooltip>
+                    <template slot-scope="scope">{{ scope.row.invalidCount }}</template>
+                  </el-table-column>
                   <el-table-column prop="" label="操作" width="150">
                     <template slot-scope="scope">
                       <el-button type="text" @click="showDetail(scope.row)">查看详情</el-button>

src/views/salesleads/groupSend/grTaskList.vue

@@ -71,6 +71,9 @@
                   <el-table-column prop="" label="逾期中">
                     <template slot-scope="scope">{{ scope.row.ovincplTaskCnt || '--' }}</template>
                   </el-table-column>
+                  <el-table-column prop="" label="逾期失效" show-overflow-tooltip>
+                    <template slot-scope="scope">{{ scope.row.invalidCount }}</template>
+                  </el-table-column>
                   <el-table-column prop="" label="操作">
                     <template slot-scope="scope">
                       <el-button type="text" @click="showDetail(scope.row)">查看详情</el-button>

src/views/salesleads/trafficTask/taskDetail.vue

@@ -142,6 +142,9 @@
         <el-table-column label="逾期情况">
           <template slot-scope="scope"> <span class="point" :style="'background:' + overdueStyle[scope.row.isOverTime] + ';'"></span>{{ scope.row.isOverTime }}</template>
         </el-table-column>
+        <el-table-column label="逾期失效">
+          <template slot-scope="scope">{{ scope.row.invalidStatus | formatInvalidStatus }}</template>
+        </el-table-column>
         <el-table-column label="完成情况">
           <template #header>
             <el-tooltip class="item" effect="light" placement="right">
@@ -295,6 +298,14 @@ export default {
           value: ''
         },
         {
+          label: '逾期未失效',
+          value: '2'
+        },
+        {
+          label: '逾期已失效',
+          value: '3'
+        },
+        {
           label: '已逾期',
           value: '1'
         },

src/views/salesleads/trafficTask/taskRecord.vue

@@ -68,6 +68,9 @@
         <el-table-column prop="" label="逾期中" show-overflow-tooltip>
           <template slot-scope="scope">{{ scope.row.overdueCount }}</template>
         </el-table-column>
+        <el-table-column prop="" label="逾期失效" show-overflow-tooltip>
+          <template slot-scope="scope">{{ scope.row.invalidCount }}</template>
+        </el-table-column>
         <el-table-column prop="" label="删除状态" show-overflow-tooltip>
           <template slot-scope="scope">
             <span class="state-point state-point-error" v-if="scope.row.delStatusDesc != '-'">{{ scope.row.delStatusDesc }}</span>

src/views/salesleads/trafficTask/taskViewDetail.vue

@@ -65,6 +65,9 @@ import taskViewDetail from '@/components/app/taskViewDetail.vue';
         <el-table-column prop="" label="逾期中" show-overflow-tooltip>
           <template slot-scope="scope">{{ scope.row.overdueCount }}</template>
         </el-table-column>
+        <el-table-column label="逾期失效">
+          <template slot-scope="scope">{{ scope.row.invalidCount }}</template>
+        </el-table-column>
         <el-table-column label="操作">
           <template slot-scope="scope">
             <el-button type="text" @click="toDetail(scope.$index, scope.row)">查看详情</el-button>

src/views/salesleads/trafficTask/trafficTaskSet.vue

@@ -115,7 +115,7 @@ export default {
         {
           label: '企业电话',
           value: '1',
-          tooltips: ['1.对接第三方呼叫中心，外呼显示第三方号码，可监控通话状态。费用结算及通话记录存储于GIC计费中心；', '2.若任务创建时无双向呼叫权限，此项设置勾选也不生效']
+          tooltips: ['1.对接第三方呼叫中心，外呼显示第三方号码，可监控通话状态，免费保留3天的通话录音，费用结算存储于GIC计费中心；2.如果这个配置打开了，则商户好办端所有的话务任务都可以用企业电话，前提是企业电话对应账户不欠费；']
         },
         {
           label: '私人电话',