Merge branch 'xiaoqin' into mergeBranch

src/HManagement/clueManage/clue_import/detailPage/modules/billBody.vue

@@ -15,13 +15,13 @@
       </template>
       <template v-slot:opreation="scope">
         <body-edit 
-          v-if="tool.checkAuth($route.name,'clue_update')"
+          v-if="tool.checkAuth($route.name,'handleClueTab')"
           :disabled="mainData.status !== '待审核'" 
           :data="scope.data" 
           @onSuccess="getList()"
         ></body-edit>
         <body-del 
-          v-if="tool.checkAuth($route.name,'clue_delete')" 
+          v-if="tool.checkAuth($route.name,'handleClueTab')" 
           :data="scope.data" 
           :disabled="mainData.status !== '待审核'"
           @onSuccess="getList()"

src/HManagement/clueManage/m_activity/modules/details.vue

@@ -22,9 +22,9 @@
       </div>
       <div slot="slot0" class="container normal-panel">
         <DetailTable ref="DetailTable">
-          <addClue slot="addClue" :data="mainData" class="inline-16" v-if="tool.checkAuth($route.name,'insert')" @onSuccess="$refs.DetailTable.getList()"/>
+          <addClue slot="addClue" :data="mainData" class="inline-16" v-if="tool.checkAuth($route.name,'handleClue')" @onSuccess="$refs.DetailTable.getList()"/>
           <template v-slot:editClue="scope">
-            <editClue  v-if="tool.checkAuth($route.name,'update')" :data="scope.data" @onSuccess="$refs.DetailTable.getList()"/>
+            <editClue  v-if="tool.checkAuth($route.name,'handleClue')" :data="scope.data" @onSuccess="$refs.DetailTable.getList()"/>
           </template>
         </DetailTable>
       </div>

src/SManagement/orderclue_detail/index.vue

@@ -189,10 +189,18 @@ export default {
             label:'省市县',
             value:`${this.mainData.province}-${this.mainData.city}-${this.mainData.county}`
           },
+          {
+            label:'联系人',
+            value:this.mainData.name
+          },  
           {
             label:'地址',
             value:this.mainData.address
           },
+          {
+            label:'市场活动',
+            value:this.mainData.campaign_name
+          },
           {
             label:'来源',
             value:this.mainData.cluesource
@@ -257,6 +265,10 @@ export default {
             label:'备注',
             value:this.mainData.notes
           },
+          {
+            label:'跟进次数',
+            value:this.mainData.followcount
+          },
         ],
         systemInfo: [
           {label:'创建人',value:this.mainData.createBy},