2 Commit-ok 8e12cde7bb ... b68ceca05a

Szerző SHA1 Üzenet Dátum
  bding b68ceca05a Merge branch 'crm_16.4' into debug 1 hete
  bding a9e6397e14 crm_16.4 1 hete

+ 9 - 1
src/api/modules/crmApi.js

@@ -1091,7 +1091,15 @@ const customInterence = {
    */
   getCustomListMoveLog:(params)=>{
       return http.get("/custom/user/listMoveLog",params)
-  }
+  },
+  //修改联系人外呼手机号接口
+    /**
+   * 
+   * @returns 
+   */
+  editOutboundMobile:(params)=>{
+      return http.post("/custom/user/edit/outbound_mobile",params)
+   }
 };
 
 /*

BIN
src/assets/img/is_maker_icon.png


+ 39 - 8
src/views/custom_manage/customList/customDetail.vue

@@ -235,6 +235,7 @@
 							<img src="~@/assets/img/icons/like-heart.png" class="name-follow-heart" v-if="scope.row.IsFollow==1">
 							<span :class="{'isShared':scope.row.IsShared}">{{scope.row.RealName}}</span>
 							<img v-if="scope.row.HaveMoveButton" width="16" style="vertical-align: middle;cursor: pointer;" src="../../../assets/img/contact_transfer.jpg" alt="" @click="clickContactTransfer(scope.row)">
+							<img v-if="scope.row.IsMaker == 1" class="name-maker" src="../../../assets/img/is_maker_icon.png" alt="">
 						</template>
 					</el-table-column>
 					<el-table-column prop="Position" label="职位" align="center" min-width="80px"></el-table-column>
@@ -245,6 +246,12 @@
 					min-width="100">
 						<template slot-scope="scope"><span v-if="scope.row.Mobile&&scope.row.CountryCode">{{scope.row.CountryCode}}-</span><span>{{scope.row.Mobile+(scope.row.MobileTwo?'/'+scope.row.MobileTwo:'')}}</span> </template>
 					</el-table-column>
+					<el-table-column v-if="isUserYanXuanButtonShow" min-width="140" align="center" key="outboundMobile" label="外呼号码">
+						<template slot-scope="scope">
+							<span>{{ scope.row.OutboundMobile }}</span>
+							<img @click="modification(scope.row.UserId, scope.row.OutboundMobile)" :src="$icons.amend" style="color: #fff; width: 12px; height: 12px; margin-left: 5px; vertical-align: middle" />
+						</template>
+					</el-table-column>
 					<el-table-column
 					prop="Email"
 					label="邮箱"
@@ -253,6 +260,7 @@
 						<template slot-scope="scope"> <span>{{scope.row.Email}}</span> </template>
 					</el-table-column>
 					<el-table-column
+					v-if="!isUserYanXuanButtonShow"
 					prop="IsMaker"
 					label="是否KP"
 					align="center">
@@ -298,8 +306,8 @@
 					</template>
 					<el-table-column
 					prop="IsSubscribeHzyj"
-					label="是否关注公众号"
-					min-width="90"
+					:label="isUserYanXuanButtonShow ? '可接受公众号推送':'是否关注公众号'"
+					min-width="140"
 					align="center">
 						<template slot-scope="scope">
 							<div style="text-align:left" v-if="RoleType !=='权益'">
@@ -312,6 +320,11 @@
 								<img v-else style="width:16px;height:16px" src="~@/assets/img/icons/icon_2.png" alt="">
 								<span>查研观向小助手</span>
 							</div>
+							<div style="text-align:left">
+								<img v-if="scope.row.IsSubscribeMfyx == 1" style="width:16px;height:16px" src="~@/assets/img/icons/icon_1.png" alt="">
+								<img v-else style="width:16px;height:16px" src="~@/assets/img/icons/icon_2.png" alt="">
+								<span>买方研选</span>
+							</div>
 						</template>
 					</el-table-column>
 					<!-- crm 14.7 -->
@@ -717,7 +730,7 @@
 		/>
 		<HistoricalNotesDlg :historicalNotesDlgVisible.sync="historicalNotesDlgVisible" :CompanyId.sync="historicalNotesId"/>
 		<ContactTransfer :contactTransferDlgVisible.sync="contactTransferDlgVisible" :TransferMobile.sync="TransferMobile"/>
-
+		<edit-mobile :editMobileDialogVisible.sync="editMobileDialogVisible" :editMobileId="editMobileId" :outboundMobile="outboundMobile" isType="客户" />
 	</div>	
 </template>
 
@@ -739,9 +752,11 @@ import HistoryContract from '../compontents/historyContract.vue'
 
 import HistoricalNotesDlg from "@/components/historicalNotesDlg.vue";
 import ContactTransfer from './components/ContactTransferDlg.vue'
+
+import EditMobile from "../../rai_manage/components/editMobile.vue";
 export default {
 	name:'',
-	components: { Ctimeline, Contactdia, Readia, ElImageViewer, CpessionTable, pdf, chartAuthDialog, ExportData, CpessionTableEquity, ProductReadInfo, DeductDetailDlg, HistoryContract, HistoricalNotesDlg, ContactTransfer},
+	components: { Ctimeline, Contactdia, Readia, ElImageViewer, CpessionTable, pdf, chartAuthDialog, ExportData, CpessionTableEquity, ProductReadInfo, DeductDetailDlg, HistoryContract, HistoricalNotesDlg, ContactTransfer, EditMobile},
 	computed:{
 		Role() {
 			let role = localStorage.getItem('Role') || '';
@@ -874,7 +889,11 @@ export default {
 			historicalNotesId: 0,
 
 			contactTransferDlgVisible: false, //联系人转移的弹框
-			TransferMobile:0
+			TransferMobile:0,
+			// 修改外呼号码的
+			editMobileDialogVisible: false,
+			editMobileId :0,
+			outboundMobile :0,
 		};
 	},
 	methods: {
@@ -1694,7 +1713,7 @@ export default {
     },
 	// 设置表格行的样式
 	setRowClass({row}){
-		if(row.NotRead && row.IsFollow==1){
+		if((row.NotRead && row.IsFollow==1) || (this.isUserYanXuanButtonShow && row.IsMaker==1)){
 			return "not-read-seven-days"
 		}
 	},
@@ -1709,7 +1728,12 @@ export default {
 		this.contactTransferDlgVisible = true;
 		this.TransferMobile = item.Mobile;
 	},
-	
+	// 点击了修改预约外呼
+    modification(id, value) {
+      this.editMobileDialogVisible = true;
+      this.editMobileId = id;
+      this.outboundMobile = value;
+    },
 	},
 	mounted() {
 		this.getDetail();
@@ -1854,7 +1878,14 @@ export default {
 		height: 15px;
 		position: absolute;
 		left: 0;
-    top: 0;
+    	top: 0;
+	}
+	.name-maker{
+		width:32px;
+		height: 22px;
+		position: absolute;
+		right: 0;
+    	top: 0;
 	}
 	.not-read-seven-days{
 		background-color: #FFF8F8;

+ 22 - 14
src/views/rai_manage/components/editMobile.vue

@@ -21,7 +21,7 @@
 </template>
 
 <script>
-import { raiInterface,raiSpecial } from "@/api/api.js";
+import { raiInterface, raiSpecial, customInterence } from "@/api/api.js";
 export default {
   name: "",
   components: {},
@@ -60,7 +60,7 @@ export default {
   computed: {},
   watch: {
     editMobileDialogVisible(newval) {
-      if (newval) {
+      if (newval && this.isType != "客户") {
         this.activitySignupSignupDetail();
       }
     },
@@ -82,17 +82,24 @@ export default {
       this.$emit("update:editMobileDialogVisible", false);
     },
     async btnOk() {
-      const res = this.isType
-        ? await raiSpecial.outboundMobileEdit({
-            CountryCode: this.selectValue,
-            OutboundMobile: this.modelKey,
-            Id: this.editMobileId,
-          })
-        : await raiInterface.outboundMobileEdit({
-            CountryCode: this.selectValue,
-            OutboundMobile: this.modelKey,
-            Id: this.editMobileId,
-          });
+      const res =
+        this.isType == "客户"
+          ? await customInterence.editOutboundMobile({
+              OutboundCountryCode: this.selectValue,
+              OutboundMobile: this.modelKey,
+              UserId: this.editMobileId,
+            })
+          : this.isType == "专项"
+          ? await raiSpecial.outboundMobileEdit({
+              CountryCode: this.selectValue,
+              OutboundMobile: this.modelKey,
+              Id: this.editMobileId,
+            })
+          : await raiInterface.outboundMobileEdit({
+              CountryCode: this.selectValue,
+              OutboundMobile: this.modelKey,
+              Id: this.editMobileId,
+            });
 
       if (res.Ret !== 200) return;
       this.$message.success("操作成功");
@@ -100,7 +107,8 @@ export default {
       this.modelKey = "";
       this.$emit("update:editMobileDialogVisible", false);
       this.$parent.outboundMobile = "";
-      this.$parent.getsDataList();
+
+      this.isType == "客户" ? this.$parent.getuserTable() : this.$parent.getsDataList();
     },
   },
 };