liuyifan %!s(int64=5) %!d(string=hace) años
padre
commit
850b956cf3

+ 20 - 2
CallCenterWeb.UI/src/views/CustomerServiceReport/TVShoppingMarketing/index.vue

@@ -5,6 +5,9 @@
5 5
       <el-button type="primary" @click="btn_search">刷新</el-button>
6 6
       <el-button type="primary" @click="btn_export">导出</el-button>
7 7
     </div>
8
+    <div class="nowDate">
9
+      <span>当前时间:{{ getNowDate() }}</span>
10
+    </div>
8 11
     <el-table v-loading="loading" :data="dataLists" :span-method="arraySpanMethod" border stripe>
9 12
       <el-table-column prop="project" label="项目" align="center"> </el-table-column>
10 13
       <el-table-column prop="center" label="中心" align="center"> </el-table-column>
@@ -245,17 +248,32 @@ export default {
245 248
       }
246 249
     },
247 250
     btn_search() {
251
+      this.dataLists = []
248 252
       this.getList()
249 253
     },
250 254
     btn_export() {
251 255
       window.location.href = this.$store.getters.serverConfig.BASE_API + "api/KFReport/TVDelivery?isdc=1"
252 256
     },
257
+    getNowDate() {
258
+      let nowDate = new Date()
259
+      let year = nowDate.getFullYear()
260
+      let month = nowDate.getMonth() + 1
261
+      let day = nowDate.getDate()
262
+      month = month.toString().padStart(2, "0")
263
+      day = day.toString().padStart(2, "0")
264
+      let defaultDate = `${year}-${month}-${day}`
265
+      return defaultDate
266
+    }
253 267
   },
254 268
 }
255 269
 </script>
256 270
 
257 271
 <style rel="stylesheet/scss" lang="scss" scoped>
258
-span {
259
-  font-size: 14px;
272
+.nowDate {
273
+  width: 100%;
274
+  text-align: center;
275
+  span {
276
+    font-size: 16px;
277
+  }
260 278
 }
261 279
 </style>

+ 3 - 0
CallCenterWeb.UI/src/views/memberManagement/memberList/components/detail.vue

@@ -54,6 +54,7 @@
54 54
             <el-col :md="6" class="order_detail_item">修改人:{{ F_LastModifyBy }}</el-col>
55 55
             <el-col :md="6" class="order_detail_item">修改时间:{{ F_LastModifyOn }}</el-col>
56 56
             <el-col :md="6" class="order_detail_item">购买次数:{{ F_Count }}</el-col>
57
+            <el-col :md="6" class="order_detail_item">媒体:{{ F_Media }}</el-col>
57 58
 
58 59
             <!-- <el-col :md="18" :offset="6">
59 60
               <el-button type="primary" size="mini" plain>打标签</el-button>
@@ -425,6 +426,7 @@ export default {
425 426
       lastholetime: "", // 末联通话记录
426 427
       F_LastModifyOn: "", // 修改时间
427 428
       F_Count: "", //购买次数
429
+      F_Media: "", //媒体
428 430
       F_LastModifyBy: "", // 修改人
429 431
       orderLists: [], // 订单列表数据
430 432
       dataLists: [], // 列表数据
@@ -547,6 +549,7 @@ export default {
547 549
         this.lastholetime = res.F_Lastholetime // 末联通话记录
548 550
         this.F_LastModifyOn = res.F_LastModifyOn // 修改时间
549 551
         this.F_Count = res.F_Count // 购买次数
552
+        this.F_Media = res.F_Media // 购买次数
550 553
         this.F_LastModifyBy = res.F_LastModifyBy // 修改人
551 554
       })
552 555
     },

+ 62 - 1
CallCenterWeb.UI/src/views/telCall/hotlineReturnVisit/index.vue

@@ -1,7 +1,7 @@
1 1
 <template>
2 2
   <div class="app-container">
3 3
     <div class="filter-container">
4
-      <!-- <el-date-picker v-model="searchDate" :picker-options="pickerOptions" class="filter-item" type="daterange" format="yyyy年MM月dd日" value-format="yyyy-MM-dd" align="left" unlink-panels range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" /> -->
4
+      <el-date-picker v-model="searchData.date" :picker-options="pickerOptions" class="filter-item" type="daterange" format="yyyy年MM月dd日" value-format="yyyy-MM-dd" align="left" unlink-panels range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" />
5 5
       <el-input v-model="searchData.name" placeholder="请输入会员姓名" class="filter-item" />
6 6
       <el-input v-model="searchData.phone" placeholder="请输入会员电话" class="filter-item" />
7 7
       <el-select v-model="searchData.IsReturnvisit" class="filter-item" filterable clearable placeholder="请选择是否回访">
@@ -31,6 +31,13 @@
31 31
           <i class="el-icon-edit phoneIcon" @click="btn_isReturnvisit(scope.row.F_ID)" />
32 32
         </template>
33 33
       </el-table-column>
34
+      <el-table-column label="操作" width="180" align="center" class-name="oparate_btn" fixed="right">
35
+        <template slot-scope="scope">
36
+          <el-button v-permission="'HY_add_order'" type="text" v-if="authority_edit(scope.row.F_Saleperson)" @click="btn_add_order(scope.row.F_ID)">添加订单</el-button>
37
+          <el-button v-permission="'HY_detail'" type="text" @click="btn_detail(scope.row.F_ID.toString())">详情</el-button>
38
+          <el-button v-permission="'HY_edit'" type="text" v-if="authority_edit(scope.row.F_Saleperson)" @click="btn_edit(scope.row.F_ID)">编辑</el-button>
39
+        </template>
40
+      </el-table-column>
34 41
     </el-table>
35 42
     <pagination v-show="pageParams.total > 0" :total="pageParams.total" :pageindex.sync="pageParams.pageindex" :pagesize.sync="pageParams.pagesize" class="pagination" @pagination="getList" />
36 43
   </div>
@@ -46,6 +53,9 @@ import store from "@/store"
46 53
 import { mapGetters } from "vuex"
47 54
 import returnvisit from "./returnvisit"
48 55
 import { encryptphone } from "@/api/memberManagement/memberList"
56
+import addOrEdit from "@/views/memberManagement/memberList/components/addOrEdit"
57
+import detail from "@/views/memberManagement/memberList/components/detail"
58
+import addOrder from "@/views/memberManagement/memberList/components/addOrder"
49 59
 
50 60
 export default {
51 61
   name: "CallRecord",
@@ -78,6 +88,7 @@ export default {
78 88
         name: "", //会员姓名
79 89
         phone: "", //会员电话
80 90
         IsReturnvisit: "", //是否回访
91
+        date: [], // 时间
81 92
       },
82 93
       pageParams: {
83 94
         pageindex: 1, // 当前第几页
@@ -114,6 +125,8 @@ export default {
114 125
           name: this.searchData.name,
115 126
           phone: this.searchData.phone,
116 127
           IsReturnvisit: this.searchData.IsReturnvisit,
128
+          laststartholetime: this.searchData.date && this.searchData.date[0],
129
+          lastendholetime: this.searchData.date && this.searchData.date[1],
117 130
         }
118 131
         getHotlineReturnVisitList(params).then((response) => {
119 132
           this.loading = false
@@ -225,6 +238,54 @@ export default {
225 238
       const defaultDate = `${year}-${month}-${day} ${hour}`
226 239
       return defaultDate
227 240
     },
241
+    // 添加订单
242
+    btn_add_order(id) {
243
+      this.$layer.iframe({
244
+        content: {
245
+          content: addOrder, // 传递的组件对象
246
+          parent: this, // 当前的vue对象
247
+          data: { rowid: id.toString() }, // props
248
+        },
249
+        area: ["80%", "90%"],
250
+        title: "添加订单",
251
+      })
252
+    },
253
+    // 详情
254
+    btn_detail(editId) {
255
+      this.$layer.iframe({
256
+        content: {
257
+          content: detail, // 传递的组件对象
258
+          parent: this, // 当前的vue对象
259
+          data: { rowid: editId }, // props
260
+        },
261
+        area: ["80%", "90%"],
262
+        title: "详情",
263
+      })
264
+    },
265
+    // 编辑
266
+    btn_edit(editId) {
267
+      this.$layer.iframe({
268
+        content: {
269
+          content: addOrEdit, // 传递的组件对象
270
+          parent: this, // 当前的vue对象
271
+          data: { rowid: editId.toString() }, // props
272
+        },
273
+        area: ["80%", "90%"],
274
+        title: "编辑会员信息",
275
+      })
276
+    },
277
+    authority_edit(saleperson) {
278
+      const storageGroupCode = window.localStorage.getItem("roleCode")
279
+      if (storageGroupCode === "XS") {
280
+        if (this.username == saleperson) {
281
+          return true
282
+        } else {
283
+          return false
284
+        }
285
+      } else {
286
+        return true
287
+      }
288
+    },
228 289
   },
229 290
 }
230 291
 </script>

+ 1 - 1
CallCenterWeb.UI/src/views/trafficData/callRecord/index.vue

@@ -36,7 +36,7 @@
36 36
       <el-table-column prop="Callee" label="被叫号码" align="center" min-width>
37 37
         <template slot-scope="scope">
38 38
           {{ scope.row.Callee | phoneFilter }}
39
-          <i v-if="scope.row.CallType == '1'" class="el-icon-tickets phoneIcon" @click="clickCut(scope.row.Caller)" />
39
+          <i v-if="scope.row.CallType == '1'" class="el-icon-tickets phoneIcon" @click="clickCut(scope.row.Callee)" />
40 40
           <i v-if="scope.row.CallType == '1'" class="el-icon-phone phoneIcon" @click="clickCallOut(scope.row.Callee, scope.row.Id)" />
41 41
         </template>
42 42
       </el-table-column>