问题修改

CallCenterWeb.UI/src/api/trafficData/trafficData.js

@@ -89,3 +89,11 @@ export function getIVRCalloutRecord (params) {
     params
   })
 }
+
+export function returnVisitCallRecords(params) {
+  return request({
+    url: 'api/CallRecords/Returnvisit',
+    method: 'get',
+    params
+  })
+}

CallCenterWeb.UI/src/components/Dialplate/index.vue

@@ -18,8 +18,8 @@
       </el-row>
       <el-button v-waves class="btn_call" type="success" round @click="callOut">拨打</el-button>
       <!-- 右侧 通话记录和通讯录  -->
-      <svg-icon v-popover:popover class="btn_yonghu" icon-class="yonghu" />
-      <el-popover
+      <!-- <svg-icon v-popover:popover class="btn_yonghu" icon-class="yonghu" /> -->
+      <!-- <el-popover
         ref="popover"
         :value="telIsVisCallout"
         visible-arrow
@@ -29,7 +29,6 @@
         trigger="click"
         transition="fade-in-linear"
       >
-        <!-- @show="getTelHisList" -->
         <el-tabs v-model="tabActiveName" stretch class="phnoe_tabs" @tab-click="handleClick">
           <el-input v-model="s_keywords" size="mini" placeholder="搜索" prefix-icon="el-icon-search" />
           <el-tab-pane label="历史记录" name="first">
@@ -93,7 +92,7 @@
             </el-scrollbar>
           </el-tab-pane>
         </el-tabs>
-      </el-popover>
+      </el-popover> -->
     </div>
   </div>
 </template>

CallCenterWeb.UI/src/components/audioPlayer/index.vue

@@ -61,10 +61,11 @@ export default {
     vaplayer.disableVersionBadge = true
   },
   created() {
-    this.musicList.artist = this.artists
+    this.musicList.artist = this.artists == "" ? "未知坐席" : this.artists
     this.musicList.src = this.recFiles
     this.musicList.pic = this.avatar
     console.log(this.musicList.src)
+    console.log("musicList", this.musicList)
   },
   methods: {
     btn_downlaod() {

CallCenterWeb.UI/src/views/afterSaleManagement/afterSaleList/afterSaleDetail.vue

@@ -7,30 +7,16 @@
             <h1 class="title"><svg-icon class="title_icon" icon-class="hongqi" />订单号：{{ orderDetailData.F_OrderId }}</h1>
           </el-col>
           <el-col :md="24" class="order_detail_content">
-            <el-col :md="6" class="order_detail_item">
-              售后类型：{{ orderDetailData.F_Type }}
-            </el-col>
-            <el-col :md="6" class="order_detail_item">
-              变动金额：{{ orderDetailData.F_Money }}
-            </el-col>
-            <el-col :md="6" class="order_detail_item">
-              售后原因：{{ orderDetailData.F_ReturnType }}
-            </el-col>
+            <el-col :md="6" class="order_detail_item"> 售后类型：{{ orderDetailData.F_Type }} </el-col>
+            <el-col :md="6" class="order_detail_item"> 变动金额：{{ orderDetailData.F_Money }} </el-col>
+            <el-col :md="6" class="order_detail_item"> 售后原因：{{ orderDetailData.F_ReturnType }} </el-col>
             <!-- <el-col :md="6" class="order_detail_item">
               售后原因：{{ orderDetailData.F_ReturnDes }}
             </el-col> -->
-            <el-col :md="6" class="order_detail_item">
-              退回商品状态：{{ orderDetailData.F_ProductStatus }}
-            </el-col>
-            <el-col :md="6" class="order_detail_item">
-              处理原因：{{ orderDetailData.F_Reason }}
-            </el-col>
-            <el-col :md="6" class="order_detail_item">
-              客户意愿：{{ orderDetailData.F_Aspiration }}
-            </el-col>
-            <el-col :md="6" class="order_detail_item">
-              售后备注：{{ orderDetailData.F_Remark }}
-            </el-col>
+            <el-col :md="6" class="order_detail_item"> 退回商品状态：{{ orderDetailData.F_ProductStatus }} </el-col>
+            <el-col :md="6" class="order_detail_item"> 处理原因：{{ orderDetailData.F_Reason }} </el-col>
+            <el-col :md="6" class="order_detail_item"> 客户意愿：{{ orderDetailData.F_Aspiration }} </el-col>
+            <el-col :md="6" class="order_detail_item"> 售后备注：{{ orderDetailData.F_Remark }} </el-col>
             <el-col :md="24">
               补发商品：
               <el-table :data="commodityTableData" stripe border style="width: 100%">
@@ -53,21 +39,21 @@
 </template>
 
 <script>
-import { getDictionaryValueList } from '@/api/commonAPI'
-import { getOrder } from '@/api/orderManagement/orderList'
-import { addAfterSaleList, editAfterSaleList, afterSaleListDetail, getAfterSaleOrderCommodityList, } from "@/api/afterSaleManagement/afterSaleList";
+import { getDictionaryValueList } from "@/api/commonAPI"
+import { getOrder } from "@/api/orderManagement/orderList"
+import { addAfterSaleList, editAfterSaleList, afterSaleListDetail, getAfterSaleOrderCommodityList } from "@/api/afterSaleManagement/afterSaleList"
 
 export default {
   name: "AfterSale",
   props: {
     rowid: {
       type: String,
-      default: ""
+      default: "",
     },
     layerid: {
       type: String,
-      default: ""
-    }
+      default: "",
+    },
   },
   data() {
     return {
@@ -75,30 +61,29 @@ export default {
       oldCommodityTableData: [], //退回商品列表
       loading: false,
       orderDetailData: {
-        F_Id: '', //售后id
-        F_OrderId: '', //订单编号
-        F_DetailList: '', //补发产品列表
-        F_OldDetailList: '', //退回产品列表
-        F_Type: '', //售后类型
-        F_Money: '', //变动金额
-        F_Remark: '', //售后备注
-        F_ReturnType: '', //售后原因类型
-        F_ReturnDes: '', //售后原因
-        F_ProductStatus: '', //退回商品状态
-        F_CheckStateSH: '', //0保存 1提交按钮 2不通过
-        F_Reason: '', //处理原因
-        F_Aspiration: '', //客户意愿
+        F_Id: "", //售后id
+        F_OrderId: "", //订单编号
+        F_DetailList: "", //补发产品列表
+        F_OldDetailList: "", //退回产品列表
+        F_Type: "", //售后类型
+        F_Money: "", //变动金额
+        F_Remark: "", //售后备注
+        F_ReturnType: "", //售后原因类型
+        F_ReturnDes: "", //售后原因
+        F_ProductStatus: "", //退回商品状态
+        F_CheckStateSH: "", //0保存 1提交按钮 2不通过
+        F_Reason: "", //处理原因
+        F_Aspiration: "", //客户意愿
       },
-    };
+    }
   },
   created() {
-    Promise.all([
-    ]).then(() => {
+    Promise.all([]).then(() => {
       if (this.rowid) {
         this.orderDetailData.F_Id = this.rowid
         this.getDetail(this.rowid)
       }
-    });
+    })
   },
   methods: {
     //获取售后订单详情
@@ -106,30 +91,39 @@ export default {
       const params = {
         F_Id: rid,
       }
-      afterSaleListDetail(params).then(response => {
-        if (response.state.toLowerCase() === 'success') {
+      afterSaleListDetail(params).then((response) => {
+        if (response.state.toLowerCase() === "success") {
           const res = response.data
           this.orderDetailData.F_OrderId = res.F_OrderId //订单编号
           this.orderDetailData.F_OldDetailList = res.F_OldDetailList //退回产品列表
-          switch(res.F_Type){
+          switch (res.F_Type) {
             case 1:
-              this.orderDetailData.F_Type='调换货';
-              break;
+              this.orderDetailData.F_Type = "调换货"
+              break
             case 2:
-              this.orderDetailData.F_Type='退货';
-              break;
+              this.orderDetailData.F_Type = "退货"
+              break
             case 3:
-              this.orderDetailData.F_Type='部分退货';
-              break;
+              this.orderDetailData.F_Type = "部分退货"
+              break
             case 4:
-              this.orderDetailData.F_Type='对发货';
-              break;
+              this.orderDetailData.F_Type = "对发货"
+              break
             case 5:
-              this.orderDetailData.F_Type='补发货';
-              break;
+              this.orderDetailData.F_Type = "补发货"
+              break
             case 6:
-              this.orderDetailData.F_Type='补差额';
-              break;
+              this.orderDetailData.F_Type = "补差额"
+              break
+            case 7:
+              this.orderDetailData.F_Type = "错发"
+              break
+            case 8:
+              this.orderDetailData.F_Type = "漏发"
+              break
+            case 9:
+              this.orderDetailData.F_Type = "改代收"
+              break
           }
           // this.orderDetailData.F_Type = res.F_Type //售后类型
           this.orderDetailData.F_Money = res.F_Money //变动金额
@@ -145,9 +139,9 @@ export default {
       })
     },
     getReissueGoods(goodsData) {
-      let reissueGoods = goodsData.split('|')
+      let reissueGoods = goodsData.split("|")
       for (let i = 1; i < reissueGoods.length; i++) {
-        let reissueGoodsDetail = reissueGoods[i].split(',')
+        let reissueGoodsDetail = reissueGoods[i].split(",")
         let data = {
           F_ProductId: reissueGoodsDetail[0],
           F_ProductName: reissueGoodsDetail[2],
@@ -159,162 +153,162 @@ export default {
     // 售后订单商品列表
     getAfterSaleOrderCommodity(rid) {
       const params = {
-        orderid: rid
+        orderid: rid,
       }
-      getAfterSaleOrderCommodityList(params).then(response => {
-        if (response.state.toLowerCase() === 'success') {
+      getAfterSaleOrderCommodityList(params).then((response) => {
+        if (response.state.toLowerCase() === "success") {
           const res = response.data
           this.oldCommodityTableData = res
         }
       })
     },
-  }
-};
+  },
+}
 </script>
 
 <style rel="stylesheet/scss" lang="scss">
 .order_form .form_select {
   width: 100%;
 }
-.order_detail{
-  .el-col{
+.order_detail {
+  .el-col {
     margin-bottom: 20px;
   }
-  .el-icon-time{
+  .el-icon-time {
     color: #d81e06;
   }
-  .el-card__header{
+  .el-card__header {
     padding-top: 14px;
     padding-bottom: 14px;
-    background-color: #F5F5F6;
+    background-color: #f5f5f6;
   }
-  .order_file{
-    .el-card__body{
+  .order_file {
+    .el-card__body {
       padding: 22px 0 0 0;
       text-align: center;
     }
   }
-  .order_steps{
-    .el-step__icon-inner{
+  .order_steps {
+    .el-step__icon-inner {
       display: none;
     }
   }
   .order_record {
-    .el-card__body{
+    .el-card__body {
       padding: 0;
     }
-    .el-tabs__header{
+    .el-tabs__header {
       padding: 0px 20px;
-      background-color: #F5F5F6;
-        .el-tabs__item{
-          font-size: 16px;
-          height: 47px;
-          line-height: 47px;
-        }
+      background-color: #f5f5f6;
+      .el-tabs__item {
+        font-size: 16px;
+        height: 47px;
+        line-height: 47px;
+      }
     }
   }
 }
 </style>
 <style rel="stylesheet/scss" lang="scss" scoped>
-	.order_detail{
-		.order_detail_body{
-			margin-bottom: 20px;
-			.round_img{
-				width: 90px;
-				height: 90px;
-				border-radius: 50%;
-				overflow: hidden;
-				margin: 14px;
-				img{
-					width: 100%;
-					height: 100%;
-				}
-			}
-			.title{
-				font-size: 20px;
-				.title_icon{
-					color: #d81e06;
-					font-size: 16px;
-					margin-right: 20px;
-				}
-			}
-			.title_sub{
-				font-size: 14px;
-				color: #666666;
-			}
-			.order_detail_content{
-				background-color: #F5F5F6;
-				padding-top: 20px;
-				color: #4c4c4c;
-				font-size: 14px;
-				.order_detail_item{
-					margin-bottom: 10px;
-					.order_content{
-						margin-top: 10px;
-					}
-					.order_file {
-						position: relative;
-						cursor: pointer;
-						.img_mask {
-							display: none;
-							position: absolute;
-							left: 0px;
-							top: 0px;
-							background-color: rgba(0, 0, 0, 0.3);
-							width: 100%;
-							height: 22px;
-							text-align: right;
-							z-index: 1;
-							i {
-								font-size: 20px;
-								line-height: 22px;
-								display: inline-block;
-								margin-right: 15px;
-								color: #fff;
-							}
-						}
-						p {
-							margin-top: 5px;
-							padding-left: 14px;
-							padding-right: 14px;
-							white-space: nowrap;
-							overflow: hidden;
-							text-overflow: ellipsis;
-						}
-						.file_icon{
-							height: 68px;
-							line-height: 68px;
-							font-size: 68px;
-							color: #409EFF;
-						}
-					}
-					.order_file:hover .img_mask {
-						display: block;
-					}
-				}
-			}
-		}
-		.green {
-			color: #00c1de;
-		}
-		.done {
-			color: #198120;
-		}
-		.red {
-			color: #d81e06;
-		}
-		.yellow{
-			color: #e6a23c;
-		}
-		.order_steps{
-			// height: 240px;
-			.el-step__icon-inner{
-				display: none;
-			}
-		}
-		.tab_body{
-			padding: 0 20px 20px 20px;
-		}
-	}
+.order_detail {
+  .order_detail_body {
+    margin-bottom: 20px;
+    .round_img {
+      width: 90px;
+      height: 90px;
+      border-radius: 50%;
+      overflow: hidden;
+      margin: 14px;
+      img {
+        width: 100%;
+        height: 100%;
+      }
+    }
+    .title {
+      font-size: 20px;
+      .title_icon {
+        color: #d81e06;
+        font-size: 16px;
+        margin-right: 20px;
+      }
+    }
+    .title_sub {
+      font-size: 14px;
+      color: #666666;
+    }
+    .order_detail_content {
+      background-color: #f5f5f6;
+      padding-top: 20px;
+      color: #4c4c4c;
+      font-size: 14px;
+      .order_detail_item {
+        margin-bottom: 10px;
+        .order_content {
+          margin-top: 10px;
+        }
+        .order_file {
+          position: relative;
+          cursor: pointer;
+          .img_mask {
+            display: none;
+            position: absolute;
+            left: 0px;
+            top: 0px;
+            background-color: rgba(0, 0, 0, 0.3);
+            width: 100%;
+            height: 22px;
+            text-align: right;
+            z-index: 1;
+            i {
+              font-size: 20px;
+              line-height: 22px;
+              display: inline-block;
+              margin-right: 15px;
+              color: #fff;
+            }
+          }
+          p {
+            margin-top: 5px;
+            padding-left: 14px;
+            padding-right: 14px;
+            white-space: nowrap;
+            overflow: hidden;
+            text-overflow: ellipsis;
+          }
+          .file_icon {
+            height: 68px;
+            line-height: 68px;
+            font-size: 68px;
+            color: #409eff;
+          }
+        }
+        .order_file:hover .img_mask {
+          display: block;
+        }
+      }
+    }
+  }
+  .green {
+    color: #00c1de;
+  }
+  .done {
+    color: #198120;
+  }
+  .red {
+    color: #d81e06;
+  }
+  .yellow {
+    color: #e6a23c;
+  }
+  .order_steps {
+    // height: 240px;
+    .el-step__icon-inner {
+      display: none;
+    }
+  }
+  .tab_body {
+    padding: 0 20px 20px 20px;
+  }
+}
 </style>
 

CallCenterWeb.UI/src/views/afterSaleManagement/afterSaleList/index.vue

@@ -107,6 +107,7 @@ export default {
         6: "补差额",
         7: "错发",
         8: "漏发",
+        9: "改代收",
       }
       return statusMap[status]
     },

CallCenterWeb.UI/src/views/afterSaleManagement/afterSaleOrderList/edit.vue

@@ -944,9 +944,11 @@ export default {
       if (val === "货到付款") {
         this.judgmentIsPayment = false
         this.disabledIsPayment = false
+        this.isSubmitForm = false
       } else if (val === "全额付款") {
         this.judgmentIsPayment = true
         this.disabledIsPayment = true
+        this.isSubmitForm = false
         this.ruleForm.OrderMoney.F_Money = this.totalAmount
         this.rules.OrderMoney.F_Money[0].required = false
       } else if (val === "部分付款") {
@@ -1107,6 +1109,8 @@ export default {
             type: "warning",
           })
           this.isSubmitForm = true
+        } else {
+          this.isSubmitForm = false
         }
       } else {
         this.isSubmitForm = false

CallCenterWeb.UI/src/views/callScreen/components/createOrder.vue

@@ -958,9 +958,11 @@ export default {
       if (val === "货到付款") {
         this.judgmentIsPayment = false
         this.disabledIsPayment = false
+        this.isSubmitForm = false
       } else if (val === "全额付款") {
         this.judgmentIsPayment = true
         this.disabledIsPayment = true
+        this.isSubmitForm = false
         this.ruleForm.OrderMoney.F_Money = this.totalAmount
         this.rules.OrderMoney.F_Money[0].required = false
       } else if (val === "部分付款") {
@@ -1091,6 +1093,8 @@ export default {
             type: "warning",
           })
           this.isSubmitForm = true
+        } else {
+          this.isSubmitForm = false
         }
       } else {
         this.isSubmitForm = false

CallCenterWeb.UI/src/views/custodianManagement/headlessListCustodian/index.vue

@@ -35,7 +35,7 @@
       </el-table-column>
       <el-table-column label="操作" width="170" align="center" class-name="oparate_btn" fixed="right">
         <template slot-scope="scope">
-          <!-- <el-button v-permission="'HY_edit'" type="text" @click="btn_edit(scope.row.F_ID)">编辑</el-button> -->
+          <el-button v-permission="'HY_edit'" v-if="authority_edit(scope.row.F_State)" type="text" @click="btn_edit(scope.row.F_ID)">编辑</el-button>
           <el-button v-permission="'HY_delete'" type="text" @click="btn_delete(scope.row.F_ID)">删除</el-button>
         </template>
       </el-table-column>
@@ -198,6 +198,14 @@ export default {
       }
       this.selectOrderId = ids
     },
+    //编辑权限
+    authority_edit(state) {
+      if (state == "0") {
+        return true
+      } else {
+        return false
+      }
+    }
   },
 }
 </script>

CallCenterWeb.UI/src/views/customerServiceManagement/customerServiceChangeCollection/index.vue

@@ -105,6 +105,7 @@ export default {
         6: "补差额",
         7: "错发",
         8: "漏发",
+        9: "改代收",
       }
       return statusMap[status]
     },

CallCenterWeb.UI/src/views/customerServiceManagement/orderListLogistics/goback.vue

@@ -2,20 +2,13 @@
   <div>
     <el-form ref="ruleForm" :model="ruleForm" :rules="rules" label-width="80px">
       <el-form-item label="退回" prop="state">
-        <el-select
-          v-model="ruleForm.state"
-          class="form_select"
-          filterable
-          clearable
-          placeholder="请选择退回"
-          @change="selectback"
-        >
+        <el-select v-model="ruleForm.state" class="form_select" filterable clearable placeholder="请选择退回" @change="selectback">
           <el-option label="退回上一级" value="0" />
           <el-option label="退回销售" value="1" />
         </el-select>
       </el-form-item>
       <el-form-item v-show="ishow" label="退回原因">
-        <el-input v-model="ruleForm.remark" type="textarea" placeholder="退回原因"/>
+        <el-input v-model="ruleForm.remark" type="textarea" placeholder="退回原因" />
       </el-form-item>
       <el-form-item>
         <el-button type="primary" @click="submitForm()">提交</el-button>
@@ -24,35 +17,35 @@
   </div>
 </template>
 <script>
-import { gobackOrderCustomerService } from '@/api/customerServiceManagement/orderListCustomerService'
+import { gobackOrderCustomerService } from "@/api/customerServiceManagement/orderListCustomerService"
 export default {
   props: {
     rowid: {
       type: String,
-      default: ''
+      default: "",
     },
     layerid: {
       type: String,
-      default: ''
-    }
+      default: "",
+    },
   },
   data() {
     return {
       ishow: true, // 原因显隐
       ruleForm: {
-        orderids: '', // 订单编号
-        remark: '', // 备注
-        state: ''
+        orderids: "", // 订单编号
+        remark: "", // 备注
+        state: "",
       },
       rules: {
         state: [
           {
             required: true,
-            trigger: 'change',
-            message: '请选择退回'
-          }
-        ]
-      }
+            trigger: "change",
+            message: "请选择退回",
+          },
+        ],
+      },
     }
   },
   created() {
@@ -62,14 +55,14 @@ export default {
   },
   methods: {
     submitForm() {
-      this.$refs.ruleForm.validate(valid => {
+      this.$refs.ruleForm.validate((valid) => {
         if (valid) {
           gobackOrderCustomerService(this.ruleForm)
             .then((response) => {
-              if (response.state.toLowerCase() === 'success') {
+              if (response.state.toLowerCase() === "success") {
                 this.$parent.$layer.close(this.layerid)
                 this.$parent.getList() // 重新加载父级数据
-                this.$message.success('恭喜你，订单信息退回成功!')
+                this.$message.success("恭喜你，订单信息退回成功!")
               }
             })
             .catch(() => {
@@ -79,17 +72,17 @@ export default {
       })
     },
     selectback(e) {
-      if (e === '0') {
+      if (e === "0") {
         this.ishow = false
       } else {
         this.ishow = true
       }
-    }
-  }
+    },
+  },
 }
 </script>
 <style lang="scss" scoped>
 .form_select {
-  width: 100%
+  width: 100%;
 }
 </style>

CallCenterWeb.UI/src/views/layout/components/Navbar.vue

@@ -2,11 +2,17 @@
   <el-menu class="navbar" mode="horizontal">
     <teloperation v-if="seatflag" />
     <!-- <outboundTask v-if="seatflag && telIsLogin" class="navar_item"/> -->
+    <div v-if="seatflag" class="navar_item personalInfoWrapper">
+      <div class="personalInfoLine">
+        <span class="personalInfoText">登陆账号:{{ usercode }}</span>
+        <span class="personalInfoText">姓名:{{ username }}</span>
+      </div>
+      <div class="personalInfoLine">
+        <span class="personalInfoText">用户角色:{{ roleName }}</span>
+        <span class="personalInfoText">分机号:{{ extension }}</span>
+      </div>
+    </div>
     <div v-if="seatflag" class="navar_item telState">
-      <span class="personalInfoText">登陆账号:{{ usercode }}</span>
-      <span class="personalInfoText">用户角色:{{ roleName }}</span>
-      <span class="personalInfoText">姓名:{{ username }}</span>
-      <span class="personalInfoText">分机号:{{ extension }}</span>
       <svg-icon :class="{ state_normal: telTopRightLamp, state_abnormal: !telTopRightLamp }" icon-class="zhuangtai" />
       {{ telTopRightState }}
     </div>
@@ -191,10 +197,23 @@ export default {
       font-size: 16px;
       vertical-align: -0.17em;
     }
-    .personalInfoText {
-      margin-right: 12px;
-      font-size: 14px;
-      z-index: -1;
+  }
+  .personalInfoWrapper {
+    font-size: 14px;
+    width: 280px;
+    height: 52px;
+    padding-right: 15px;
+    right: 270px;
+    line-height: 25px;
+    color: #ffffff;
+    .personalInfoLine {
+      width: 280px;
+      height: 25px;
+      .personalInfoText {
+        margin-right: 12px;
+        font-size: 14px;
+        z-index: -1;
+      }
     }
   }
   .seatState {

CallCenterWeb.UI/src/views/mediaCenter/launchManagment/mediaInformation/manage.vue

@@ -231,7 +231,7 @@
       </el-form>
     </el-row>
     <el-row>
-      <el-form ref="renderForm" :model="renderForm" label-width="100px">
+      <el-form ref="renderForm" :model="renderForm" :rules="rules4" label-width="100px">
         <el-col :span="24">
           <el-form-item label="提醒部门设置" label-width="100px"></el-form-item>
         </el-col>
@@ -242,8 +242,8 @@
           </el-form-item>
         </el-col>
         <el-col :span="6">
-          <el-form-item label="提醒部门">
-            <el-cascader ref="myCascader" v-model="deptParentids" :options="departmentDatas" :props="props" placeholder="请选择部门" class="form_select" change-on-select clearable filterable @change="handledepartment" />
+          <el-form-item label="部门" prop="deptParentids">
+            <el-cascader ref="myCascader" v-model="renderForm.deptParentids" :options="departmentDatas" :props="props" placeholder="请选择部门" class="form_select" change-on-select clearable filterable @change="handledepartment" />
           </el-form-item>
         </el-col>
         <el-col :span="6">
@@ -254,7 +254,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="6">
-          <el-form-item label="小组" prop="group ">
+          <el-form-item label="小组" prop="group">
             <el-select v-model="renderForm.group" class="form_select" filterable clearable placeholder="请选择小组" @change="handlegrop">
               <el-option v-for="item in gropData" :key="item.F_Id" :label="item.F_Name" :value="item.F_Id" />
             </el-select>
@@ -321,6 +321,7 @@ export default {
       },
       renderForm: {
         ReminderTime: "", //提醒时间
+        deptParentids: [],
         deptid: "", //提醒部门
         dept: "", //部门名称
         deptteamid: "", // 中心id
@@ -329,7 +330,6 @@ export default {
         group: "", // 小组名称
         reminder: "0", //是否提醒
       },
-      deptParentids: [],
       departmentDatas: [], //部门数据
       teamData: [], // 中心下拉数据
       gropData: [], // 小组下拉数据
@@ -422,14 +422,6 @@ export default {
         this.$message.error("请选择媒体名称")
         return
       }
-      if (!this.playPlanForm.advertisementName) {
-        this.$message.error("请选择广告名称")
-        return
-      }
-      if (!this.changeInfoForm.F_ChangeType) {
-        this.$message.error("请选择变更类型")
-        return
-      }
       return new Promise((resolve) => {
         const params = {
           F_Id: this.rowid,
@@ -442,11 +434,11 @@ export default {
           F_DailyExpenses: this.form.dailyExpenses - 0, //日费用
           F_IsRemind: this.renderForm.reminder - 0, //是否提醒
           F_ReminderTime: this.renderForm.ReminderTime, //提醒时间F_DeptId
-          F_DeptId: this.renderForm.deptid, //提醒部门
+          F_DeptId: this.renderForm.deptid == "" ? 0 : this.renderForm.deptid, //提醒部门
           F_DeptName: this.renderForm.dept,
-          F_Team: this.renderForm.deptteamid,
+          F_Team: this.renderForm.deptteamid == "" ? 0 : this.renderForm.deptteamid,
           F_TeamName: this.renderForm.deptteam,
-          F_Group: this.renderForm.groupid,
+          F_Group: this.renderForm.groupid == "" ? 0 : this.renderForm.groupid,
           F_GroupName: this.renderForm.group,
           F_PlayPlanList: this.addPlayPlanForm, //计划数据
           F_MediaChangeList: this.addChangeForm, //变更数据
@@ -472,6 +464,10 @@ export default {
     },
     //添加计划方法
     addPlan() {
+      if (!this.playPlanForm.advertisementName) {
+        this.$message.error("请选择广告名称")
+        return
+      }
       this.addPlayPlanForm.push({
         F_Type: 0,
         F_StartTime: this.playPlanForm.startDate && this.playPlanForm.startDate[0],
@@ -509,6 +505,10 @@ export default {
     },
     //添加变更方法
     addChange() {
+      if (!this.changeInfoForm.F_ChangeType) {
+        this.$message.error("请选择变更类型")
+        return
+      }
       if (this.addChangeForm.length !== 1) {
         this.addChangeForm.push({
           F_ChangeTime: this.changeInfoForm.changeDate, //变更时间
@@ -626,7 +626,7 @@ export default {
           this.addChangeForm = response.data.F_MediaChangeList //变更
           this.renderForm.ReminderTime = response.data.F_ReminderTime //提醒时间
           this.renderForm.reminder = response.data.F_IsRemind.toString() //是否提醒、
-          this.deptParentids.push(response.data.F_DeptId)
+          this.renderForm.deptParentids.push(response.data.F_DeptId)
           this.renderForm.deptid = response.data.F_DeptId
           this.renderForm.dept = response.data.F_DeptName
           this.renderForm.deptteamid = response.data.F_Team // 中心

CallCenterWeb.UI/src/views/memberManagement/memberList/components/addOrEdit.vue

@@ -179,7 +179,7 @@
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col :span="12">
+        <!-- <el-col :span="12">
           <el-form-item label="累计消费金额" prop="F_Money">
             <el-input v-model="ruleForm.F_Money" placeholder="请输入累计消费金额" onkeyup="value=value.replace(/[^\d.]/g,'')" :disabled="settingDisabled.disabledMoney" />
           </el-form-item>
@@ -188,7 +188,7 @@
           <el-form-item label="累计积分" prop="F_TotalScore">
             <el-input v-model="ruleForm.F_TotalScore" placeholder="请输入累计积分" onkeyup="value=value.replace(/[^\d.]/g,'')" :disabled="settingDisabled.disabledTotalScore" />
           </el-form-item>
-        </el-col>
+        </el-col> -->
       </el-row>
       <el-form-item>
         <el-button type="primary" @click="submitForm">保存</el-button>

CallCenterWeb.UI/src/views/memberManagement/memberList/components/addOrder.vue

@@ -949,11 +949,13 @@ export default {
       if (val === "货到付款") {
         this.judgmentIsPayment = false
         this.disabledIsPayment = false
+        this.isSubmitForm = false
         this.ruleForm.OrderMoney.F_Money = 0
         this.rules.OrderMoney.F_Money[0].required = false
       } else if (val === "全额付款") {
         this.judgmentIsPayment = true
         this.disabledIsPayment = true
+        this.isSubmitForm = false
         this.ruleForm.OrderMoney.F_Money = this.totalAmount
         this.rules.OrderMoney.F_Money[0].required = false
       } else if (val === "部分付款") {
@@ -1109,6 +1111,8 @@ export default {
             type: "warning",
           })
           this.isSubmitForm = true
+        } else {
+          this.isSubmitForm = false
         }
       } else {
         this.isSubmitForm = false

CallCenterWeb.UI/src/views/orderManagement/changeCollectionOrderList/index.vue

@@ -317,6 +317,7 @@ export default {
         6: "补差额",
         7: "错发",
         8: "漏发",
+        9: "改代收",
       }
       return statusMap[status]
     },

CallCenterWeb.UI/src/views/orderManagement/orderList/edit.vue

@@ -945,9 +945,11 @@ export default {
       if (val === "货到付款") {
         this.judgmentIsPayment = false
         this.disabledIsPayment = false
+        this.isSubmitForm = false
       } else if (val === "全额付款") {
         this.judgmentIsPayment = true
         this.disabledIsPayment = true
+        this.isSubmitForm = false
         this.ruleForm.OrderMoney.F_Money = this.totalAmount
         this.rules.OrderMoney.F_Money[0].required = false
       } else if (val === "部分付款") {
@@ -1108,6 +1110,8 @@ export default {
             type: "warning",
           })
           this.isSubmitForm = true
+        } else {
+          this.isSubmitForm = false
         }
       } else {
         this.isSubmitForm = false

CallCenterWeb.UI/src/views/orderManagement/salesAfterSaleList/index.vue

@@ -14,8 +14,9 @@
         <el-option label="对发货" value="4" />
         <el-option label="补发货" value="5" />
         <!-- <el-option label="补差额" value="6"/> -->
-        <el-option label="错发" value="7" />
+        <!-- <el-option label="错发" value="7" /> -->
         <!-- <el-option label="漏发" value="8"/> -->
+        <!-- <el-option label="改代收" value="9" /> -->
       </el-select>
       <el-button
         type="primary"

CallCenterWeb.UI/src/views/trafficData/callRecord/index.vue

@@ -14,6 +14,10 @@
         <el-option label="未接通电话" :value="0" />
         <el-option label="已接通电话" :value="1" />
       </el-select>
+      <el-select v-model="IsReturnvisit" class="filter-item" filterable clearable placeholder="请选择是否回访">
+        <el-option label="未回访" :value="0" />
+        <el-option label="已回访" :value="1" />
+      </el-select>
       <el-button type="primary" class="filter-item" icon="el-icon-search" @click="btn_search">搜索</el-button>
       <el-button type="primary" class="filter-item" @click="btn_add_outbound">添加外呼</el-button>
     </div>
@@ -21,9 +25,19 @@
     <el-table v-loading="loading" :data="dataLists" border stripe @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="45" />
       <el-table-column type="index" label="编号" align="center" fixed width="80"></el-table-column>
-      <el-table-column prop="Caller" label="主叫号码" align="center" min-width></el-table-column>
+      <el-table-column prop="Caller" label="主叫号码" align="center" min-width>
+        <template slot-scope="scope">
+          {{ scope.row.Caller }}
+          <i v-if="scope.row.CallType == '0'" class="el-icon-phone phoneIcon" @click="clickCallOut(scope.row.Caller, scope.row.Id)" />
+        </template>
+      </el-table-column>
       <!-- <el-table-column prop="UserCode" label="坐席工号" align="center" min-width ></el-table-column> -->
-      <el-table-column prop="Callee" label="被叫号码" align="center" min-width></el-table-column>
+      <el-table-column prop="Callee" label="被叫号码" align="center" min-width>
+        <template slot-scope="scope">
+          {{ scope.row.Callee }}
+          <i v-if="scope.row.CallType == '1'" class="el-icon-phone phoneIcon" @click="clickCallOut(scope.row.Callee, scope.row.Id)" />
+        </template>
+      </el-table-column>
       <el-table-column label="呼叫类型" align="center" min-width>
         <template slot-scope="scope">{{ scope.row.CallType | calltypeFilter }}</template>
       </el-table-column>
@@ -68,6 +82,14 @@
       <el-table-column prop="RelayNumber" label="中继号码" align="center" min-width />
       <el-table-column prop="DeptName" label="部门" align="center" min-width />
       <el-table-column prop="UserName" label="姓名" align="center" min-width />
+      <el-table-column prop="CusCode" label="客户姓名" align="center" min-width />
+      <el-table-column prop="Media" label="媒体名称" align="center" min-width />
+      <el-table-column prop="IsReturnvisit" label="是否回访" align="center" min-width>
+        <template slot-scope="scope">
+          <span>{{ scope.row.IsReturnvisit | isReturnvisitFilter }}</span>
+          <i class="el-icon-edit phoneIcon" @click="btn_isReturnvisit(scope.row.Id)" />
+        </template>
+      </el-table-column>
       <!-- <el-table-column label="外呼类型" align="center" min-width>
         <template slot-scope="scope">{{ scope.row.callopttype | callopttypeFilter }}</template>
       </el-table-column>-->
@@ -78,11 +100,17 @@
 
 <script>
 import { getUserAccountLists } from "@/api/systemSetup/roleSetting/userManage"
-import { getCallRecords } from "@/api/trafficData/trafficData"
+import { getCallRecords, returnVisitCallRecords } from "@/api/trafficData/trafficData"
 import audioPlayer from "@/components/audioPlayer"
 import { pickerOptions } from "@/utils"
 import add from "./add"
 import Pagination from "@/components/Pagination" // 对el-pagination 二次封装
+import { getCallOutprefix } from "@/api/teloperation"
+import { Send } from "@/utils/telWebsocket"
+import store from "@/store"
+import { mapGetters } from "vuex"
+import returnvisit from "./returnvisit"
+
 export default {
   name: "CallRecord",
   components: {
@@ -144,6 +172,14 @@ export default {
         return tm
       }
     },
+    // 是否回访
+    isReturnvisitFilter(status) {
+      const statusMap = {
+        0: "未回访",
+        1: "已回访",
+      }
+      return statusMap[status]
+    },
   },
   data() {
     return {
@@ -152,6 +188,7 @@ export default {
       roleId: "",
       CallType: "", //呼叫类型
       CallState: "", //呼叫状态
+      IsReturnvisit: "", //是否回访
       roleOptions: [],
       searchDate: "",
       pickerOptions,
@@ -165,6 +202,14 @@ export default {
       multipleSelection: [], //选中数据
     }
   },
+  computed: {
+    ...mapGetters([
+      "token",
+      "usercode", // 工号
+      "extension", // 分机号
+      "telIsVisCallout", // 外呼面板是否显示
+    ]),
+  },
   created() {
     this.getRoleSelects()
     this.getList()
@@ -185,6 +230,7 @@ export default {
           UserCode: this.roleId, //	否	string	模糊查询（呼叫号码） CallNumber
           CallType: this.CallType == null ? "" : this.CallType, //呼叫类型
           CallState: this.CallState, //呼叫状态
+          IsReturnvisit: this.IsReturnvisit, //是否回访
           SearchStartTime: this.searchDate && this.searchDate[0],
           SearchEndTime: this.searchDate && this.searchDate[1],
         }
@@ -216,6 +262,7 @@ export default {
     },
     // 播放录音
     playSound(rec_file, artist) {
+      console.log("artist", artist)
       this.$layer.iframe({
         content: {
           content: audioPlayer, // 传递的组件对象
@@ -242,9 +289,74 @@ export default {
         title: "添加外呼",
       })
     },
+    // 外呼
+    clickCallOut(phoneNumber, id) {
+      this.callOut(phoneNumber)
+    },
+    // 外呼
+    callOut(phoneNumber, id) {
+      if (phoneNumber) {
+        getCallOutprefix(phoneNumber).then((response) => {
+          if (response.state.toLowerCase() === "success") {
+            const res = response.data
+            this.scoketDatas = {
+              Type: "MakeCall",
+              AgentID: this.usercode,
+              AgentExten: this.extension,
+              Header: res.fix, // 号码前缀 用于截断前缀得到真实号码
+              DestinationNumber: res.phone, //
+            }
+            store.dispatch("ChangeCallNum", phoneNumber)
+            Send(this.scoketDatas)
+            store.dispatch("UpdateCalloutScreen", false) // 关闭外呼面板
+            store.dispatch("UpdateOutboundScreen", false) // 关闭外呼弹屏
+            this.isReturnvisit(id)
+          }
+        })
+      } else {
+        this.$message({
+          message: "请先输入电话号码！",
+          type: "warning",
+        })
+      }
+    },
+    btn_isReturnvisit(id) {
+      this.$layer.iframe({
+        content: {
+          content: returnvisit, // 传递的组件对象
+          parent: this, // 当前的vue对象
+          data: { rowid: id }, // props
+        },
+        area: ["30%", "30%"],
+        title: "回访",
+      })
+    },
+    isReturnvisit(id) {
+      this.loading = true
+      const params = {
+        id: id,
+        isvisit: 1, // 已回访
+      }
+      returnVisitCallRecords(params)
+        .then((response) => {
+          this.loading = false
+          if (response.state.toLowerCase() === "success") {
+            this.$parent.$layer.close(this.layerid)
+            this.$parent.getList() // 重新加载父级数据
+            this.$message.success("修改成功!")
+          }
+        })
+        .catch(() => {
+          this.loading = false
+        })
+      return
+    },
   },
 }
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
+.phoneIcon {
+  cursor: pointer;
+}
 </style>

CallCenterWeb.UI/src/views/trafficData/callRecord/returnvisit.vue

@@ -0,0 +1,88 @@
+<template>
+  <div v-loading="loading">
+    <el-form ref="ruleForm" :model="ruleForm" :rules="rules" label-width="100px" class="order_form">
+      <el-form-item label="是否回访" prop="isvisit">
+        <el-select v-model="ruleForm.isvisit" clearable placeholder="请选择是否回访" class="form_select">
+          <el-option label="未回访" value="0" />
+          <el-option label="已回访" value="1" />
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" @click="submitForm">保存</el-button>
+      </el-form-item>
+    </el-form>
+  </div>
+</template>
+
+<script>
+import { returnVisitCallRecords } from "@/api/trafficData/trafficData"
+
+export default {
+  name: 'Returnvisit',
+  props: {
+    rowid: {
+      type: Number,
+      default: 0
+    },
+    layerid: {
+      type: String,
+      default: ''
+    }
+  },
+  data() {
+    return {
+      memberClass: [], // 分类数据
+      ruleForm: {
+        id: "",
+        isvisit: "", //会员分类
+      },
+      rules: {
+        isvisit: [{
+          required: true,
+          trigger: 'change',
+          message: '请选择是否回访',
+        }]
+      },
+      loading: false
+    }
+  },
+  created() {
+    if (this.rowid) {
+      this.ruleForm.id = this.rowid
+    }
+  },
+  methods: {
+    submitForm() {
+      this.$refs.ruleForm.validate((valid) => {
+        if (valid) {
+          this.loading = true
+          const params = {
+            id: this.ruleForm.id,
+            isvisit: this.ruleForm.isvisit,
+          }
+          returnVisitCallRecords(params).then(response => {
+            this.loading = false
+            if (response.state.toLowerCase() === 'success') {
+              this.$parent.$layer.close(this.layerid)
+              this.$parent.getList() // 重新加载父级数据
+              this.$message.success('修改成功!')
+            }
+          }).catch(() => {
+            this.loading = false
+          })
+          return
+        } else {
+          this.$message.error('请输入有效的必填项信息!')
+          return false
+        }
+      })
+    },
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss">
+.order_form .form_select{
+	width: 100%;
+}
+</style>