init 10.12.1

src/views/custom_manage/compontents/permissionDetail.vue

@@ -9,9 +9,9 @@
         </el-table-column>
         <el-table-column label="剩余天数" align="center" prop="ExpireDay"> </el-table-column>
       </el-table>
-      <div style="margin-bottom: 20px">
+      <div style="margin-bottom: 20px" v-if="Points">
         <span>研选服务点数</span>
-        <span>3333</span>
+        <span>{{Points}}</span>
         <span class="editsty" @click="lookNumber">明细>></span>
       </div>
     </el-dialog>
@@ -41,36 +41,43 @@ export default {
       default: false,
       type: Boolean,
     },
-    // remindList: {
-    //   default: {},
-    //   type: Object,
-    // },
+    researchDetailId: {
+      default: 0,
+      type: Number,
+    },
   },
   data() {
     return {
       tableData: [],
-
       isShowResearchNumber: false, // 研选服务点数明细 弹框
       tableListResearch: [], // 严选数据
+      Points: "",
     };
   },
   computed: {},
-  watch: {},
+  watch: {
+    isPermissionDetailShow: {
+      handler(newVal) {
+        newVal && this.getDetailList();
+      },
+    },
+  },
   created() {},
   mounted() {},
   methods: {
     // 弹框关闭的事件
     cancelHandle() {
-      this.$parent.isShowRemindDlg = false;
-      this.$emit("update:remindList", {});
+      this.$emit("update:researchDetailId", 0);
+      this.$emit("update:isPermissionDetailShow", false);
     },
     /* 获取客户详情 */
     async getDetailList() {
       const res = await customInterence.customDetail({
-        // CompanyId: this.companyId,
+        CompanyId: this.researchDetailId,
       });
       if (res.Ret !== 200) return;
       this.tableData = res.Data.RaiItem.PermissionList[0].Items;
+      this.Points = res.Data.RaiItem.Points || "";
     },
     // 查看
     lookNumber() {
@@ -85,10 +92,10 @@ export default {
     // 获取表格数据
     async getDataList() {
       const res = await raiInterface.activityPointsBill({
-        //  CompanyId: this.dataForm.CompanyId
+        CompanyId: this.researchDetailId,
       });
       if (res.Ret === 200) {
-        this.tableList = res.Data.List || [];
+        this.tableListResearch = res.Data.List || [];
       }
     },
   },

src/views/custom_manage/contacts/compontents/remindDlg.vue

@@ -15,8 +15,8 @@
         <p v-else>设置提醒后，联系人的互动行为都将通过【查研观向小助手】提醒你，请选择设置范围</p>
         <div style="margin-top: 20px">
           <el-radio-group v-model="remindRadio">
-            <el-radio :label="3" style="display: block">{{ remindList.IsRemind ? "单独取消此联系人的提醒" : "对此联系人单独设置" }}</el-radio>
-            <el-radio :label="6" style="margin: 20px 0">{{ remindList.IsRemind ? "对该机构下的联系人批量取消" : "对该机构下的联系人批量设置" }}</el-radio>
+            <el-radio :label="1" style="display: block">{{ remindList.IsRemind ? "单独取消此联系人的提醒" : "对此联系人单独设置" }}</el-radio>
+            <el-radio :label="2" style="margin: 20px 0">{{ remindList.IsRemind ? "对该机构下的联系人批量取消" : "对该机构下的联系人批量设置" }}</el-radio>
           </el-radio-group>
         </div>
       </div>
@@ -29,7 +29,7 @@
 </template>
 
 <script>
-import { customInterence, equityContacts } from "@/api/api.js"; 
+import { customInterence, equityContacts } from "@/api/api.js";
 export default {
   name: "",
   components: {},
@@ -45,7 +45,7 @@ export default {
   },
   data() {
     return {
-      remindRadio: 3,
+      remindRadio: 1,
     };
   },
   computed: {},
@@ -55,17 +55,20 @@ export default {
   methods: {
     // 弹框关闭的事件
     cancelHandle() {
+      this.remindRadio = 1;
       this.$parent.isShowRemindDlg = false;
       this.$emit("update:remindList", {});
     },
     // 确认事件
     async remindBtnHandler() {
-      this.cancelHandle();
-      return;
-      const result = await equityContacts.postUserRemind({
-        UserId: remindList.UserId,
+      const res = await equityContacts.postUserRemind({
+        UserId: this.remindList.UserId,
+        SourceType: this.remindRadio,
+        DoType: this.remindList.IsRemind ? 2 : 1,
       });
       if (res.Ret === 200) {
+        this.cancelHandle();
+        this.$parent.getCygxContactsList();
         this.$message.success("操作成功！");
       }
     },

src/views/custom_manage/contacts/contactsList.vue

@@ -420,33 +420,6 @@ export default {
     async remindHandler(item) {
       this.remindList = item;
       this.isShowRemindDlg = true;
-      return;
-      if (item.IsRemind) {
-        const result = await equityContacts.postUserRemind({
-          UserId: item.UserId,
-        });
-        this.$message.success("已取消互动提醒");
-        this.getCygxContactsList();
-      } else {
-        this.$confirm("该联系人的互动行为都将通过【查研观向小助手】提醒你，确定设置吗？", "提示", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning",
-        })
-          .then(async () => {
-            const result = await equityContacts.postUserRemind({
-              UserId: item.UserId,
-            });
-            this.$message.success("互动提醒成功");
-            this.getCygxContactsList();
-          })
-          .catch(() => {
-            this.$message({
-              type: "info",
-              message: "已取消",
-            });
-          });
-      }
     },
     sortChangeHandle(item) {
       console.log(item.order);

src/views/custom_manage/customSearch.vue

@@ -454,7 +454,7 @@
 		</el-dialog>
 		<!-- 查看备注弹窗 -->
 		<!-- 权限详情弹框 -->
-		<permission-detail :isPermissionDetailShow.sync="isPermissionDetailShow"/>
+		<permission-detail :isPermissionDetailShow.sync="isPermissionDetailShow" :researchDetailId.sync="researchDetailId"/>
 	</div>
 </template>
 
@@ -624,14 +624,16 @@ export default {
 				BtnTurnPositive: '申请转正',
 				BtnUpdate: '续约申请',
 				BtnView: '查看权限',
-				BtnRemarkView: '备注'
+				BtnRemarkView: '备注',
+				IsResearchShow:'研选详情'
 			},	// 按钮命令列表
 			lookRemarkTitle:'',//查看备注标题
 			lookRemarkList:[],//查看备注列表
 			lookRemarkTextarea:'',//备注的文本框
 			isRemarkLook:false ,////查看备注弹窗
 			lookRemarkItem:{},////查看备注的item项
-			isPermissionDetailShow:true ,// 权限详情 弹框
+			isPermissionDetailShow:false ,// 权限详情 弹框
+			researchDetailId:0,
 		};
 	},
 	/* 页面跳转前记录参数 */
@@ -802,6 +804,8 @@ export default {
 				this.receiveHandle(query.data)
 			}else if(query.type=='备注'){
 				this.lookRemarkHandle(query.data)
+			}else if(query.type=='研选详情'){
+				this.researchDetailHandle(query.data)
 			}
 		},
 		/* 查看权限 */
@@ -1560,7 +1564,11 @@ export default {
 				}
 				})
 			}
-		}
+		},
+	researchDetailHandle(item) {
+		this.isPermissionDetailShow = true
+		this.researchDetailId = item.CompanyId
+	},
 	},
 	created() {
 		/* 返回保持上次的状态 */