Merge branch 'master' into cygx_11.3

config/dev.env.js

@@ -10,5 +10,6 @@ module.exports = merge(prodEnv, {
   CHART_LINK:'"https://charttest.hzinsights.com/chartshow"',
   HR_MANAGEMENT_SYSTEM:'"http://8.136.199.33:8391/login"',
   FINANCIAL_MANAGEMENT_SYSTEM:'"http://8.136.199.33:8618/login"',
-  ETA_SYSTEM:'"http://8.136.199.33:7778/temppage"'
+  ETA_SYSTEM:'"http://8.136.199.33:7778/temppage"',
+  CYGX_WEB:'"https://clpttest.hzinsights.com"' // 查研观向网页版首页地址
 });

config/prod.env.js

@@ -6,5 +6,6 @@ module.exports = {
 	CHART_LINK:'"https://chartlib.hzinsights.com/chartshow"',
 	HR_MANAGEMENT_SYSTEM:'"https://hr.hzinsights.com/login"',
 	FINANCIAL_MANAGEMENT_SYSTEM:'"https://fms.hzinsights.com/login"',
-	ETA_SYSTEM:'"https://eta.hzinsights.com/temppage"'
+	ETA_SYSTEM:'"https://eta.hzinsights.com/temppage"',
+	CYGX_WEB:'"https://web.hzinsights.com"' // 查研观向网页版首页地址
 }

config/prod.test.env.js

@@ -8,5 +8,6 @@ module.exports = {
 	CHART_LINK:'"https://charttest.hzinsights.com/chartshow"',
 	HR_MANAGEMENT_SYSTEM:'"http://8.136.199.33:8391/login"',
   FINANCIAL_MANAGEMENT_SYSTEM:'"http://8.136.199.33:8618/login"',
-  ETA_SYSTEM:'"http://8.136.199.33:7778/temppage"'
+  ETA_SYSTEM:'"http://8.136.199.33:7778/temppage"',
+	CYGX_WEB:'"https://clpttest.hzinsights.com"' // 查研观向网页版首页地址
 }

src/views/custom_manage/compontents/permissionDetail.vue

@@ -0,0 +1,113 @@
+<template>
+  <div class="container-remindDlg">
+    <el-dialog title="权限详情" v-dialogDrag :visible.sync="isPermissionDetailShow" :close-on-click-modal="false" :modal-append-to-body="false" @close="cancelHandle" center width="800px">
+      <CpessionTableEquity v-if="tableData.length" fromType="detail" :authList="tableData" style="margin-bottom: 20px" />
+      <div style="margin: 20px 0" v-if="Points">
+        <span>研选服务点数</span>
+        <span>{{ Points }}</span>
+        <span class="editsty" @click="lookNumber">明细>></span>
+      </div>
+    </el-dialog>
+    <el-dialog title="研选服务点数明细" :visible.sync="isShowResearchNumber" width="80%" v-dialogDrag :close-on-click-modal="false" :modal-append-to-body="false" center @close="handleClose">
+      <el-table style="margin-bottom: 30px" :data="tableListResearch" border height="500">
+        <el-table-column align="center" prop="Content" label="事项"></el-table-column>
+        <el-table-column align="center" prop="CreateTime" label="时间"></el-table-column>
+        <el-table-column align="center" prop="RealName" label="参会人" width="150"></el-table-column>
+        <el-table-column align="center" prop="minNumber" label="小计" width="100">
+          <template slot-scope="{ row }">
+            <span :style="{ color: row.BillDetailed > 0 ? '#31c640' : '#ec808d' }"> {{ row.BillDetailed > 0 ? "+" + row.BillDetailed : row.BillDetailed }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column align="center" prop="Points" label="合计" width="100"></el-table-column>
+      </el-table>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { customInterence, equityContacts, raiInterface } from "@/api/api.js";
+import CpessionTableEquity from "./CpessionTableEquity.vue";
+export default {
+  name: "",
+  components: { CpessionTableEquity },
+  props: {
+    isPermissionDetailShow: {
+      default: false,
+      type: Boolean,
+    },
+    researchDetailId: {
+      default: 0,
+      type: Number,
+    },
+  },
+  data() {
+    return {
+      tableData: [],
+      isShowResearchNumber: false, // 研选服务点数明细 弹框
+      tableListResearch: [], // 严选数据
+      Points: "",
+    };
+  },
+  computed: {},
+  watch: {
+    isPermissionDetailShow: {
+      handler(newVal) {
+        newVal && this.getDetailList();
+      },
+    },
+  },
+  created() {},
+  mounted() {},
+  methods: {
+    // 弹框关闭的事件
+    cancelHandle() {
+      this.$emit("update:researchDetailId", 0);
+      this.$emit("update:isPermissionDetailShow", false);
+      this.tableData = [];
+    },
+    /* 获取客户详情 */
+    async getDetailList() {
+      this.tableData = [];
+      const res = await customInterence.customDetail({
+        CompanyId: this.researchDetailId,
+      });
+      if (res.Ret !== 200) return;
+      this.Points = res.Data.RaiItem.Points || "";
+      let auth = [];
+      res.Data.RaiItem.PermissionList.forEach((item) => {
+        let obj = {
+          checkAll: item.CheckList && item.CheckList.length === item.Items.length ? true : false,
+          isIndeterminate: item.CheckList && item.CheckList.length > 0 && item.CheckList.length < item.Items.length,
+          ...item,
+        };
+        auth.push(obj);
+      });
+      this.tableData = auth;
+    },
+    // 查看
+    lookNumber() {
+      this.isShowResearchNumber = true;
+      this.getDataList();
+    },
+    // 明细弹框关闭
+    handleClose() {
+      this.isShowResearchNumber = false;
+      this.tableListResearch = [];
+    },
+    // 获取表格数据
+    async getDataList() {
+      const res = await raiInterface.activityPointsBill({
+        CompanyId: this.researchDetailId,
+      });
+      if (res.Ret === 200) {
+        this.tableListResearch = res.Data.List || [];
+      }
+    },
+  },
+};
+</script>
+<style scoped lang="scss">
+.container-remindDlg {
+  display: block;
+}
+</style>

src/views/custom_manage/contacts/compontents/contactsColums.js

@@ -218,6 +218,38 @@ export const tableColums = (type) => {
           widthsty: 300,
         },
       ]
+    : type === 10
+    ? [
+        {
+          label: "标签名称",
+          key: "TagName",
+        },
+        {
+          label: "报告系列",
+          key: "ArticleTypes",
+          // widthsty: 200,
+        },
+        {
+          label: "活动类型",
+          key: "ActivityTypes",
+          // widthsty: 300,
+        },
+        {
+          label: "相关产业",
+          key: "Industries",
+          // widthsty: 300,
+        },
+        {
+          label: "相关标的",
+          key: "SubjectNames",
+          // widthsty: 300,
+        },
+        {
+          label: "点击时间",
+          key: "CreateTime",
+          // widthsty: 300,
+        },
+    ]      
     : [];
 };
 
@@ -618,6 +650,44 @@ export const organizationTableColums = (type) => {
           key: "CreateTime",
         },
       ]
+    : type === 10
+    ? [
+        {
+          label: "姓名",
+          key: "RealName",
+          // widthsty: 130,
+        },
+        {
+          label: "手机号",
+          key: "Mobile",
+        },
+        {
+          label: "标签名称",
+          key: "TagName",
+          // widthsty: 500,
+        },
+        {
+          label: "报告系列",
+          key: "ArticleTypes",
+        },
+        {
+          label: "活动类型",
+          key: "ActivityTypes",
+        },        
+        {
+          label: "相关产业",
+          key: "SubjectNames",
+          // widthsty: 500,
+        },
+        {
+          label: "相关标的",
+          key: "SubjectNames",
+        },
+        {
+          label: "点击时间",
+          key: "CreateTime",
+        },
+      ]
     : [];
 };
 
@@ -986,5 +1056,48 @@ export const wholeOrganizationTableColums = (type) => {
           key: "CreateTime",
         },
       ]
+    : type === 10
+    ? [
+        {
+          label: "公司名",
+          key: "CompanyName",
+          // widthsty: 200,
+        },
+        {
+          label: "姓名",
+          key: "RealName",
+          // widthsty: 100,
+        },
+        {
+          label: "手机号",
+          key: "Mobile",
+          // widthsty: 100,
+        },
+        {
+          label: "标签名称",
+          key: "TagName",
+        },
+        {
+          label: "报告系列",
+          key: "ArticleTypes",
+          // widthsty: 500,
+        },
+        {
+          label: "活动类型",
+          key: "ActivityTypes",
+        },
+        {
+          label: "相关产业",
+          key: "SubjectNames",
+        },
+        {
+          label: "相关标的",
+          key: "SubjectNames",
+        },
+        {
+          label: "点击时间",
+          key: "CreateTime",
+        },
+      ]
     : [];
 };

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

@@ -0,0 +1,82 @@
+<template>
+  <div class="container-remindDlg">
+    <el-dialog
+      :title="remindList.IsRemind ? '取消提醒' : '互动提醒'"
+      v-dialogDrag
+      :visible.sync="isShowRemindDlg"
+      :close-on-click-modal="false"
+      :modal-append-to-body="false"
+      @close="cancelHandle"
+      center
+      width="500px"
+    >
+      <div>
+        <p v-if="remindList.IsRemind">请选择取消范围</p>
+        <p v-else>设置提醒后，联系人的互动行为都将通过【查研观向小助手】提醒你，请选择设置范围</p>
+        <div style="margin-top: 20px">
+          <el-radio-group v-model="remindRadio">
+            <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>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="cancelHandle">取 消</el-button>
+        <el-button type="primary" @click="remindBtnHandler">确 定</el-button>
+      </span>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { customInterence, equityContacts } from "@/api/api.js";
+export default {
+  name: "",
+  components: {},
+  props: {
+    isShowRemindDlg: {
+      default: false,
+      type: Boolean,
+    },
+    remindList: {
+      default: {},
+      type: Object,
+    },
+  },
+  data() {
+    return {
+      remindRadio: 1,
+    };
+  },
+  computed: {},
+  watch: {},
+  created() {},
+  mounted() {},
+  methods: {
+    // 弹框关闭的事件
+    cancelHandle() {
+      this.remindRadio = 1;
+      this.$parent.isShowRemindDlg = false;
+      this.$emit("update:remindList", {});
+    },
+    // 确认事件
+    async remindBtnHandler() {
+      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("操作成功！");
+      }
+    },
+  },
+};
+</script>
+<style scoped lang="scss">
+.container-remindDlg {
+  display: block;
+}
+</style>

src/views/custom_manage/contacts/contactsList.vue

@@ -1,13 +1,7 @@
 <template>
   <div class="container-contactsList">
     <div class="top-wrap">
-      <el-input
-        style="width: 200px; margin-right: 20px"
-        v-model="contactWay"
-        placeholder="手机号/邮箱/姓名/公司名"
-        prefix-icon="el-icon-search"
-        clearable
-      ></el-input>
+      <el-input style="width: 200px; margin-right: 20px" v-model="contactWay" placeholder="手机号/邮箱/姓名/公司名" prefix-icon="el-icon-search" clearable></el-input>
       <el-select v-model="decisionValue" placeholder="是否决策人" @change="handelGetData" clearable>
         <el-option v-for="item in decisionOptions" :key="item.value" :label="item.label" :value="item.value"> </el-option>
       </el-select>
@@ -111,13 +105,7 @@
               >
                 {{ item }}
               </el-tag>
-              <span
-                @click="showLabelDlg(row)"
-                style="font-weight: 700; padding: 5px 10px"
-                class="editsty"
-                v-if="row.Labels && row.Labels.split(',').length > 10"
-                >...</span
-              >
+              <span @click="showLabelDlg(row)" style="font-weight: 700; padding: 5px 10px" class="editsty" v-if="row.Labels && row.Labels.split(',').length > 10">...</span>
             </div>
           </template>
         </el-table-column>
@@ -142,21 +130,9 @@
         <m-page :total="total" :page_no="page_no" :pageSize="10" @handleCurrentChange="handleCurrentChange" />
       </el-col>
     </el-card>
-    <el-dialog
-      v-dialogDrag
-      :visible.sync="remarkDlgShow"
-      :close-on-click-modal="false"
-      :modal-append-to-body="false"
-      @close="cancelHandle"
-      center
-      :width="addRemarFrom.IsShowSee ? '800px' : '500px'"
-    >
+    <el-dialog v-dialogDrag :visible.sync="remarkDlgShow" :close-on-click-modal="false" :modal-append-to-body="false" @close="cancelHandle" center :width="addRemarFrom.IsShowSee ? '800px' : '500px'">
       <div slot="title">
-        <i
-          class="el-icon-close"
-          style="fontsize: 24px; cursor: pointer; position: absolute; right: 20px; top: 50%; transform: translateY(-50%)"
-          @click="cancelHandle"
-        ></i>
+        <i class="el-icon-close" style="fontsize: 24px; cursor: pointer; position: absolute; right: 20px; top: 50%; transform: translateY(-50%)" @click="cancelHandle"></i>
         <span style="fontsize: 16px">{{ addRemarFrom.IsShowSee ? "历史备注" : "添加备注" }}</span>
       </div>
       <div v-if="addRemarFrom.IsShowSee">
@@ -177,6 +153,7 @@
     </el-dialog>
     <InteractionDlg :interactionDlg.sync="interactionDlg" :interactionFrom="interactionFrom" />
     <label-dlg :isShowLabelDlg.sync="isShowLabelDlg" :dlgLabelList.sync="dlgLabelList" @labelChildren="labelChildren" :userLabel="userLabel" />
+    <remind-dlg :isShowRemindDlg.sync="isShowRemindDlg" :remindList.sync="remindList" />
   </div>
 </template>
 
@@ -186,9 +163,10 @@ import mPage from "@/components/mPage.vue";
 import mDialog from "@/components/mDialog.vue";
 import InteractionDlg from "./compontents/interactionDlg.vue";
 import LabelDlg from "./compontents/labelDlg.vue";
+import RemindDlg from "./compontents/remindDlg.vue";
 export default {
   name: "",
-  components: { mPage, mDialog, InteractionDlg, LabelDlg },
+  components: { mPage, mDialog, InteractionDlg, LabelDlg, RemindDlg },
   props: {},
   data() {
     return {
@@ -242,6 +220,8 @@ export default {
       organizationTableL: [], //互助量机构的
       isShowLabelDlg: false, //
       dlgLabelList: {}, //
+      isShowRemindDlg: false, // 消息提醒的弹框
+      remindList: {}, // 消息提醒的数据
     };
   },
   computed: {},
@@ -260,9 +240,7 @@ export default {
   created() {},
   mounted() {
     if (sessionStorage.getItem("contactsListBack")) {
-      const { keyword, decisionValue, registerValue, sales, clientStatus, userLabel, isFollowValue } = JSON.parse(
-        sessionStorage.getItem("contactsListBack")
-      );
+      const { keyword, decisionValue, registerValue, sales, clientStatus, userLabel, isFollowValue } = JSON.parse(sessionStorage.getItem("contactsListBack"));
       this.contactWay = keyword;
       this.decisionValue = decisionValue;
       this.registerValue = registerValue;
@@ -440,32 +418,8 @@ export default {
     },
     //点击操作的互助提醒
     async remindHandler(item) {
-      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: "已取消",
-            });
-          });
-      }
+      this.remindList = item;
+      this.isShowRemindDlg = true;
     },
     sortChangeHandle(item) {
       console.log(item.order);

src/views/custom_manage/customList/customDetail.vue

@@ -7,7 +7,13 @@
 					<ul class="detail_item" v-if="basicform">
 						<li style="width:40%">
 							<label class="label">客户名称</label>
-							<span class="con">{{basicform.CompanyName}}</span>
+							<span class="con">
+								<span style="margin-right: 10px;">{{basicform.CompanyName}} </span>
+								<el-tooltip content="此客户存在长期且反复申请试用，但从未签约的情况，请谨慎领取" placement="top" :open-delay="500" 
+								v-if="RaiSellerRole && basicform.IsScrounge==1" >
+									<img width="16" style="cursor: pointer;vertical-align: text-top;" src="../../../assets/img/icons/warning_triangle_yellow.png" />
+								</el-tooltip>
+							</span>
 						</li>
 
 						<li style="width:26%">
@@ -64,7 +70,7 @@
 								>客户编码</label>
 								<span class="con" style="word-break: break-word;">{{raiform.OpenCode}}</span>
 							</li>
-							<li  style="width:100%" v-if="!['试用','冻结','流失'].includes(raiform.Status) && raiform.Points">
+							<li  style="width:100%" v-if="raiform.Points">
 								<label class="label-num">研选服务点数</label>
 								<span class="con" style="word-break: break-word;">{{raiform.Points}}</span>
 								<span v-if="raiform.Points" @click="isShowResearchNumber = true" class="con" style="word-break: break-word;color:#409EFF;padding-left:10px;cursor: pointer;">明细>></span>
@@ -665,6 +671,9 @@ export default {
 			let type = localStorage.getItem('RoleType') || '';
 			return type;
 		},
+		RaiSellerRole(){
+			return ['rai_seller','rai_admin','admin'].includes(this.Role)
+		},
 	},	
 	beforeRouteLeave(to, from, next)  {
 		from.matched[0].name='客户管理'

src/views/custom_manage/customList/customList.vue

@@ -156,6 +156,10 @@
 							:class="{'isShared':scope.row.IsShared,'color-red':act_status==='正式'&&scope.row.Status.includes('正式')&&scope.row.WeekViewActive===0}"
 							>{{scope.row.CompanyName}}</span>
 							<img width="15" src="../../../assets/img/icons/remark.png" alt="" v-if="scope.row.RenewalReason||(scope.row.Status==='冻结'&&scope.row.FreezeReason)">
+							<el-tooltip content="此客户存在长期且反复申请试用，但从未签约的情况，请谨慎领取" placement="top" :open-delay="500" 
+							v-if="RaiSellerRole && scope.row.IsScrounge == 1">
+								<img width="16" style="cursor: pointer;" src="../../../assets/img/icons/warning_triangle_yellow.png" />
+							</el-tooltip>
 						</template>
 					</el-table-column>
 					<el-table-column label="To-Do" prop="todo" align="center" min-width="5.14%" sortable="custom">
@@ -766,6 +770,9 @@ ShareListDialog},
 			let type = localStorage.getItem('RoleType') || '';
 			return type;
 		},
+		RaiSellerRole(){
+			return ['rai_seller','rai_admin','admin'].includes(this.Role)
+		},
 		SellerAdminId() {
 			let type = localStorage.getItem('AdminId') || '';
 			return type;
@@ -1551,9 +1558,25 @@ ShareListDialog},
 			}else if(query.type=='申请解冻'){
 				this.applyPick(query.data,'申请解冻')
 			}else if(query.type=='申请领取'){
-				this.applyPick(query.data,'申请领取')
+				if(this.RaiSellerRole && query.data.IsScrounge == 1){
+					this.$confirm('此客户存在长期且反复申请试用，但从未签约的情况，确定要领取吗？','申请领取',{
+						type:'warning'
+					}).then(() => {
+						this.applyPick(query.data,'申请领取')
+					}).catch(() => {});
+				}else{
+					this.applyPick(query.data,'申请领取')
+				}
 			}else if(query.type=='领取客户'){
-				this.pickHandle(query.data)
+				if(this.RaiSellerRole && query.data.IsScrounge == 1){
+					this.$confirm('此客户存在长期且反复申请试用，但从未签约的情况，确定要领取吗？','领取客户',{
+						type:'warning'
+					}).then(() => {
+						this.pickHandle(query.data)
+					}).catch(() => {})
+				}else{
+					this.pickHandle(query.data)
+				}
 			}else if(query.type=='备注'){
 				this.lookRemarkHandle(query.data)
 			}else if(query.type=='设置共享' || query.type=='取消共享'){
@@ -1635,6 +1658,16 @@ ShareListDialog},
 			let flag=await this.getCustomerDetail(item.CompanyId)
 			if(flag) return
 
+			if(this.RaiSellerRole && item.IsScrounge == 1){
+				// 已经弹过二次确认弹窗 避免再一次的弹窗
+				this.isPickLoss = true;
+				this.regionType = item.RegionType;
+				this.addCompanyId = item.CompanyId;
+				this.diaform.telCode='86'
+				this.isAddContact = true;
+				return 
+			}
+
 			this.$confirm('是否确认领取该客户?','提示',{
 				type:'warning'
 			}).then(() => {

src/views/custom_manage/customSearch.vue

@@ -29,6 +29,10 @@
 							{{scope.row.CompanyName}}
 						</span>
 						<span v-else :class="scope.row.BtnItem.BtnView?'customName':''" :style="{color:scope.row.BtnItem.BtnView?'#409EFF':'#606266',cursor:scope.row.BtnItem.BtnView?'pointer':'text'}" @click="goDetail(scope.row)">{{scope.row.CompanyName}}</span>
+						<el-tooltip content="此客户存在长期且反复申请试用，但从未签约的情况，请谨慎领取" placement="top" :open-delay="500" 
+						v-if="RaiSellerRole && scope.row.IsScrounge == 1">
+							<img width="16" style="cursor: pointer;" src="../../assets/img/icons/warning_triangle_yellow.png" />
+						</el-tooltip>
 					</template>
 				</el-table-column>
 				<el-table-column
@@ -460,6 +464,8 @@
 			<div style="padding:20px 0;"></div>
 		</el-dialog>
 		<!-- 查看备注弹窗 -->
+		<!-- 权限详情弹框 -->
+		<permission-detail :isPermissionDetailShow.sync="isPermissionDetailShow" :researchDetailId.sync="researchDetailId"/>
 	</div>
 </template>
 
@@ -471,10 +477,18 @@ import Cauthlist from './compontents/CauthList.vue'
 import CompleteInfo from './compontents/CompleteInfo.vue'
 import ContractInfo from './compontents/ContractInfo.vue'
 import mPage from '@/components/mPage.vue'
+import PermissionDetail from './compontents/permissionDetail.vue'
 export default {
 	name:'',
-	components: {Capplydia,Contactdia,Cauthlist,CompleteInfo,ContractInfo,mPage},
+	components: {Capplydia,Contactdia,Cauthlist,CompleteInfo,ContractInfo,mPage, PermissionDetail},
 	computed:{
+		Role() {
+			let role = localStorage.getItem('Role') || '';
+			return role;
+		},
+		RaiSellerRole(){
+			return ['rai_seller','rai_admin','admin'].includes(this.Role)
+		},
 		RoleType() {
 			let type = localStorage.getItem('RoleType') || '';
 			return type;
@@ -628,13 +642,16 @@ export default {
 				BtnTurnPositive: '申请转正',
 				BtnUpdate: '续约申请',
 				BtnView: '查看权限',
-				BtnRemarkView: '备注'
+				BtnRemarkView: '备注',
+				IsResearchShow:'研选详情'
 			},	// 按钮命令列表
 			lookRemarkTitle:'',//查看备注标题
 			lookRemarkList:[],//查看备注列表
 			lookRemarkTextarea:'',//备注的文本框
 			isRemarkLook:false ,////查看备注弹窗
 			lookRemarkItem:{},////查看备注的item项
+			isPermissionDetailShow:false ,// 权限详情 弹框
+			researchDetailId:0,
 		};
 	},
 	/* 页面跳转前记录参数 */
@@ -738,7 +755,7 @@ export default {
 			}).then(res => {
 				if(res.Ret === 200) {
 					this.tableData = res.Data?res.Data.List:[];
-					this.pageinfo.total=res.Data.Paging.Totals
+					this.pageinfo.total=res.Data && res.Data.Paging ? res.Data.Paging.Totals : 0
 					this.tableData.forEach(item => {
 						item.ApproveStatus = item.ApproveStatus=='待审批'?'待审批':''
 					})
@@ -778,8 +795,18 @@ export default {
 		itemclickHandle(query) {
 			if(query.type == '申请转正') {
 				this.applyTurn(query.data)
-			}else if(query.type == '申请延期' || query.type == '申请解冻' || query.type == '申请领取') {
+			}else if(query.type == '申请延期' || query.type == '申请解冻') {
 				this.applyHandle(query.type,query.data)
+			}else if(query.type == '申请领取') {
+				if(this.RaiSellerRole && query.data.IsScrounge == 1){
+					this.$confirm('此客户存在长期且反复申请试用，但从未签约的情况，确定要领取吗？','申请领取',{
+						type:'warning'
+					}).then(() => {
+						this.applyHandle('申请领取',query.data)
+					}).catch(() => {});
+				}else{
+					this.applyHandle('申请领取',query.data)
+				}
 			}else if(query.type == '修改销售') {
 				this.updateSale(query.data);
 			}else if(query.type == '启用' || query.type == '暂停') {
@@ -802,9 +829,19 @@ export default {
 				this.addAgreement(query.data)
 				this.addAgreement(query.data)
 			}else if(query.type=='领取客户'){
-				this.receiveHandle(query.data)
+				if(this.RaiSellerRole && query.data.IsScrounge == 1){
+					this.$confirm('此客户存在长期且反复申请试用，但从未签约的情况，确定要领取吗？','领取客户',{
+						type:'warning'
+					}).then(() => {
+						this.receiveHandle(query.data)
+					}).catch(() => {})
+				}else{
+					this.receiveHandle(query.data)
+				}
 			}else if(query.type=='备注'){
 				this.lookRemarkHandle(query.data)
+			}else if(query.type=='研选详情'){
+				this.researchDetailHandle(query.data)
 			}
 		},
 		/* 查看权限 */
@@ -1068,6 +1105,16 @@ export default {
 			let flag=await this.getCustomerDetail(item.CompanyId,0)
 			if(flag) return
 
+			if(this.RaiSellerRole && item.IsScrounge == 1){
+				// 已经弹过二次确认弹窗 避免再一次的弹窗
+				this.isPickLoss = true;
+				this.regionType = item.RegionType;
+				this.addCompanyId = item.CompanyId;
+				this.diaform.telCode='86'
+				this.isAddContact = true;
+				return 
+			}
+			
 			this.$confirm('是否确认领取该客户?','提示',{
 				type:'warning'
 			}).then(() => {
@@ -1076,8 +1123,8 @@ export default {
 					this.isPickLoss = true;
 					this.addCompanyId = item.CompanyId;
 					this.regionType=item.RegionType
+					this.diaform.telCode='86'
 					this.isAddContact = true;
-
 				// }else {
 				// 	customInterence.Pick({
 				// 		CompanyId:item.CompanyId,
@@ -1564,8 +1611,12 @@ export default {
 				})
 			}
 		},
-		//删除备注
-		async lookRemarkDelete(data){
+	researchDetailHandle(item) {
+		this.isPermissionDetailShow = true
+		this.researchDetailId = item.CompanyId
+	},
+	//删除备注
+	async lookRemarkDelete(data){
 			this.$confirm('备注删除后不可恢复，确认删除吗？','提示',{
 				confirmButtonText: '确定',
 				cancelButtonText: '取消',

src/views/rai_manage/activityManage/components/addActivity.vue

@@ -620,6 +620,7 @@ export default {
         Body: this.content,
         PermissionName: this.optionFormregion,
         CustomerTypeIds: this.checkedCitiesTwo,
+        IsAllCustomerType:this.checkAll?1:0,
         LimitPeopleNum: Number(this.astrict) || 0,
         IndustrialManagementIdS: arr.length ? arr.join(",") : "",
         IndustrialSubjectIdS: this.markValue.length ? this.markValue.join(",") : "",

src/views/rai_manage/activityManage/specialResearch.vue

@@ -91,7 +91,7 @@ export default {
       themeVal: "",
       dataList: [],
       page_no: 1,
-      total: "",
+      total: 0,
       dialogVisibleActivity: false,
       dialogTitle: "",
       activityDetail: {},
@@ -113,7 +113,8 @@ export default {
 
       particularsDialogVisible: false,
       dialogVisibleList: {},
-      specialDetailId: null,
+      specialDetailId: 0,
+      selectList: [],
       messageDialogVisible: false, // 发送模版消息
       selectionArr: {},
     };

src/views/rai_manage/components/addChoiceness.vue

@@ -50,16 +50,28 @@
             </div>
           </el-form-item>
         </el-form>
-        <!-- 产业/标的 模块 -->
-        <div class="content-module">
-          <div class="content-industry" v-for="(item, index) in industryList" :key="item.ChartPermissionId">
-            <div class="content-name" :class="industryIndex == index ? 'active' : ''" @click="industryBtn(item, index)">{{ item.ChartPermissionName }}</div>
-          </div>
+          <!-- 产业/标的 模块 -->
+          <div class="content-module">
+          <draggable
+          v-model="industryList"
+          animation="300"
+          @update="sortChange">
+            <div class="content-industry" v-for="(item, index) in industryList" :key="item.ChartPermissionId">
+              <div class="content-name" :class="industryIndex == index ? 'active' : ''" @click="industryBtn(item, index)">{{ item.ChartPermissionName }}</div>
+            </div>
+          </draggable>
           <div v-for="(item, index) in industryList" :key="item.ChartPermissionId">
             <RichText v-show="industryIndex == index" :ref="'logic' + index" :spareId="'logictest' + index" :isText="contentTextLogic" />
           </div>
-          <div class="classification">
-            <div v-for="(val, num) in industryListItem" :key="val.IndustrialSubjectId" class="industrial" @click="ificationIndustrialBtn(val, num)" :class="num == ificationIndustrial ? 'pitch' : ''">
+          <draggable
+          :list="industryListItem"
+          animation="300"
+          class="classification"
+          filter=".addIndustrial"
+          :move="onMove"
+          @update="ificationSortChange">
+            <div v-for="(val, num) in industryListItem" :key="val.IndustrialSubjectId" class="industrial" 
+            @click="ificationIndustrialBtn(val, num)" :class="num == ificationIndustrial ? 'pitch' : ''">
               <span style="margin-right: 19px">{{ val.IndustrialSubjectName }}</span>
               <span v-if="num == ificationIndustrial">
                 <img src="~@/assets/img/icons/edit1.png" style="width: 12px; height: 12px; marginright: 10px" @click="editText(val, num)" />
@@ -70,7 +82,7 @@
               <i class="el-icon-plus"></i>
               <span>添加标的</span>
             </div>
-          </div>
+          </draggable>
           <template v-for="(val, num) in industryListItem">
             <div class="industrial-is-new" :key="val.IndustrialSubjectId" v-if="num == ificationIndustrial">
               <el-checkbox v-model="val.IsNew" :true-label="1" :false-label="0">显示new标签</el-checkbox>
@@ -125,9 +137,11 @@
 <script>
 import RichText from "./richText.vue";
 import { raiInterface } from "@/api/api.js";
+import draggable from 'vuedraggable';
+
 export default {
   name: "",
-  components: { RichText },
+  components: { RichText , draggable},
   props: {},
   data() {
     return {
@@ -558,6 +572,42 @@ export default {
       this.industryListItem[this.ificationIndustrial].CompanyLabel.splice(index, 1);
     },
   },
+  // 拖拽排序更新
+  sortChange({oldIndex,newIndex}){
+    this.industryIndex=this.sortChangeFun(this.industryIndex,oldIndex,newIndex)
+  },
+  //标的拖拽排序更新
+  ificationSortChange({oldIndex,newIndex}){
+    this.ificationIndustrial=this.sortChangeFun(this.ificationIndustrial,oldIndex,newIndex)
+  },
+  // 排序更新后的逻辑
+  sortChangeFun(currentIndex,oldIndex,newIndex){
+    console.log({currentIndex,oldIndex,newIndex});
+    let bigger,smaller
+    if(oldIndex>newIndex){
+      bigger=oldIndex
+      smaller=newIndex
+    }else{
+      bigger=newIndex
+      smaller=oldIndex
+    }
+    // 当前算中tab的排序 小于较小的 大于较大的 则不用做变动
+    if(currentIndex < smaller || currentIndex > bigger) return currentIndex
+    // 移动的是当前选中的
+    if(currentIndex == oldIndex) return newIndex
+    if(oldIndex>newIndex){
+      // 向左移 加加
+      currentIndex++
+    }else if(oldIndex<newIndex){
+      // 向右移 减减
+      currentIndex--
+    }
+    return currentIndex
+  },
+  onMove(e){
+    // 返回false表示不允许停靠
+    return !!e.relatedContext.element
+  },
 };
 </script>
 <style lang="scss">

src/views/rai_manage/components/apply/templateMessage.vue

@@ -45,7 +45,7 @@ export default {
     selectionArr: {
       type: Array,
       required: true,
-      default: [],
+      default: () => [],
     },
     messageDialog: {
       type: Boolean,

src/views/rai_manage/reportManage/appletsReport.vue

@@ -669,7 +669,9 @@ export default {
     },
     //文章详情
     lookDetail(item) {
-      let href = `https://vmp.hzinsights.com/v2/articles/${item.ArticleId}`;
+      // let href = `https://vmp.hzinsights.com/v2/articles/${item.ArticleId}`;
+      // window.open(href, "_blank");
+      let href = `${process.env.CYGX_WEB}/material/info/${item.ArticleId}`
       window.open(href, "_blank");
     },
     //筛选行业的清除事件

src/views/rai_manage/reportManage/summaryManage.vue

@@ -30,7 +30,7 @@
       <el-table :data="dataList" style="width: 100%" border>
         <el-table-column key="title" align="center" label="报告标题" min-width="300">
           <template slot-scope="scope">
-            <span class="editsty" style="color: #409eff" @click="lookDetail(scope.row.ArticleIdMd5)">{{ scope.row.Title }}</span>
+            <span class="editsty" style="color: #409eff" @click="lookDetail(scope.row.ArticleId)">{{ scope.row.Title }}</span>
           </template>
         </el-table-column>
         <el-table-column key="category" prop="ArticleTypeName" align="center" label="报告类型" min-width="95"></el-table-column>
@@ -252,13 +252,13 @@ export default {
     },
     //文章详情
     lookDetail(id) {
-      let url =
-        process.env.NODE_ENV === "production"
-          ? "https://details.hzinsights.com/cygx/report"
-          : process.env.NODE_ENV === "test"
-          ? "http://xcxh5test.hzinsights.com/xcx_h5/cygx/report"
-          : "http://xcxh5test.hzinsights.com/xcx_h5/cygx/report";
-      let href = `${url}?id=${id}`;
+      // let url =
+      //   process.env.NODE_ENV === "production"
+      //     ? "https://details.hzinsights.com/cygx/report"
+      //     : process.env.NODE_ENV === "test"
+      //     ? "http://xcxh5test.hzinsights.com/xcx_h5/cygx/report"
+      //     : "http://xcxh5test.hzinsights.com/xcx_h5/cygx/report";
+      let href = `${process.env.CYGX_WEB}/material/info/${id}`
       window.open(href, "_blank");
     },
     //列表