init 10.9.1

src/api/modules/rai/pointsApi.js

@@ -13,6 +13,10 @@ const raiPoints = {
   activityPointsBill: (params) => {
     return http.get("/custom/company/activity/points/bill", params);
   },
+  // 专项调研次数明细
+  specialPointsBill: (params) => {
+    return http.get("/custom/company/activity/special/points/bill", params);
+  },
 };
 
 export default raiPoints;

src/views/Home.vue

@@ -49,7 +49,7 @@
                   <a :href="`/${item.level_path}`" class="el-level-path" :style="`display: block;color:${item.level_path===activePath ? '#FDB863 ' : '#fff'}`" @click="(e) => e.preventDefault() ">
                     <img :src="item.icon_path" alt="" style="width:24px;height:24px;" />
                     <span class="titleLetter" v-show="isCollapse">{{isCollapse?MenuLetterMap[item.name]||'':''}}</span>
-                    <span style="display:inline-block; width:96px; text-align:left;font-size:15px;margin-left:15px;">{{item.name}}</span>
+                    <span style="display:inline-block; width:96px; text-align:left;font-size:15px;margin-left:20px;">{{item.name}}</span>
                   </a>
                 </el-menu-item>
                 
@@ -57,7 +57,7 @@
                   <template slot="title">
                     <img :src="item.icon_path" alt="" style="width:24px;height:24px;" />
                     <span class="titleLetter" v-show="isCollapse">{{isCollapse?MenuLetterMap[item.name]||'':''}}</span>
-                    <span style="display:inline-block; width:96px; text-align:left;font-size:15px; margin-left:15px;"
+                    <span style="display:inline-block; width:96px; text-align:left;font-size:15px; margin-left:20px;"
                         >{{item.name}}</span>
                   </template>
                   <el-menu-item

src/views/custom_manage/customList/components/deductDetailDlg.vue

@@ -1,17 +1,27 @@
 <template>
   <div class="">
     <!-- banner 详情的弹框 -->
-    <el-dialog title="研选服务点数明细" :visible.sync="isShowResearchNumber" width="80%" v-dialogDrag :close-on-click-modal="false" :modal-append-to-body="false" center @close="handleClose">
+    <el-dialog
+      :title="isShowDlgType == '专项调研' ? '专项调研次数明细' : '研选服务点数明细'"
+      :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="tableList" 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="ChartPermissionName" label="行业" v-if="isShowDlgType == '专项调研'"></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-column align="center" :prop="isShowDlgType == '专项调研' ? 'Total' : 'Points'" label="合计" width="100"></el-table-column>
       </el-table>
     </el-dialog>
   </div>
@@ -30,6 +40,10 @@ export default {
       type: Object,
       default: {},
     },
+    isShowDlgType: {
+      type: String,
+      default: "",
+    },
   },
   watch: {
     isShowResearchNumber: {
@@ -48,10 +62,12 @@ export default {
     // 关闭弹框
     handleClose() {
       this.$emit("update:isShowResearchNumber", false);
+      this.$emit("update:isShowDlgType", "");
     },
     // 获取表格数据
     async getDataList() {
-      const res = await raiInterface.activityPointsBill({ CompanyId: this.dataForm.CompanyId });
+      const res =
+        this.isShowDlgType == "专项调研" ? await raiInterface.specialPointsBill({ CompanyId: this.dataForm.CompanyId }) : await raiInterface.activityPointsBill({ CompanyId: this.dataForm.CompanyId });
       if (res.Ret === 200) {
         this.tableList = res.Data.List || [];
       }

src/views/custom_manage/customList/customDetail.vue

@@ -57,7 +57,7 @@
 							</li>
 							<li v-if="raiform.SpecialSurplus">
 								<label class="label-num" >专项调研剩余次数</label>
-								<span class="con">{{raiform.SpecialSurplus}}</span>
+								<span class="con">{{raiform.SpecialSurplus}} <span class="editsty" @click="clickDlgNumberHandler('专项调研')">明细>></span></span>
 							</li>
 							<li v-if="RoleType==='admin'" style="width:100%">
 								<label class="label"
@@ -67,7 +67,7 @@
 							<li  style="width:100%" v-if="!['试用','冻结','流失'].includes(raiform.Status) && 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>
+								<span v-if="raiform.Points" @click="clickDlgNumberHandler('研选服务')" class="con" style="word-break: break-word;color:#409EFF;padding-left:10px;cursor: pointer;">明细>></span>
 							</li>
 						</ul>
 						<el-collapse v-model="raiCollapseOpen" accordion>
@@ -631,7 +631,7 @@
 		@close="productReadInfoShow=false"
 		></product-read-info>
 		<!-- 研选服务点数明细 弹框 -->
-		<DeductDetailDlg :isShowResearchNumber.sync="isShowResearchNumber" :dataForm="raiform"/>
+		<DeductDetailDlg :isShowResearchNumber.sync="isShowResearchNumber" :isShowDlgType.sync="isShowDlgType" :dataForm="raiform"/>
 	</div>	
 </template>
 
@@ -774,6 +774,7 @@ export default {
 			IsSubscribe:[],//是否关注公众号
 
 			isShowResearchNumber:false,// 研选服务点数明细 弹框
+			isShowDlgType:'',
 		};
 	},
 	methods: {
@@ -1516,7 +1517,12 @@ export default {
 		changeSubscribe(){
 			this.search_txt = '';
 			this.getuserTable();
-		}
+		},
+	// 研选服务、专项调研明细
+	clickDlgNumberHandler(type){
+		this.isShowDlgType = type
+		this.isShowResearchNumber =true
+	},
 	},
 	mounted() {
 		this.getDetail();