Merge branch 'blueBranch' into allTestUrgent

src/HDrpManagement/orderManage/details/index.vue

@@ -386,7 +386,7 @@ export default {
           value:this.mainData.erpbillno
         },
         {
-          label:this.tool.checkAuth(this.$route.name,'returnSignature')?'回签单':'',
+          label:'回签单',
           value:this.mainData.signbackstatus
         },
         {
@@ -523,7 +523,7 @@ export default {
           value:this.mainData.erpbillno
         },
         {
-          label:this.tool.checkAuth(this.$route.name,'returnSignature')?'回签单':'',
+          label:'回签单',
           value:this.mainData.signbackstatus
         },
         {
@@ -648,7 +648,7 @@ export default {
           value:this.mainData.erpbillno
         },
         {
-          label:this.tool.checkAuth(this.$route.name,'returnSignature')?'回签单':'',
+          label:'回签单',
           value:this.mainData.signbackstatus
         },
         {
@@ -777,7 +777,7 @@ export default {
           value:this.mainData.erpbillno
         },
         {
-          label:this.tool.checkAuth(this.$route.name,'returnSignature')?'回签单':'',
+          label:'回签单',
           value:this.mainData.signbackstatus
         },
         {

src/HDrpManagement/orderManage/modules/edit.vue

@@ -255,9 +255,9 @@
 
       </div>
       <div class="normal-margin flex-align-center">
-        <div class="inline-16" v-if="tool.checkAuth($route.name,'returnSignature')">
+        <div class="inline-16" >
           <small><b>{{$t(`回签单`)}}:</b>&nbsp;</small>
-          <el-radio-group v-model="signbackstatus">
+          <el-radio-group v-model="signbackstatus" :disabled="siteId == 'HY'">
             <el-radio label="不需要" :style="{marginTop:windowWidth>1314?0:'10px'}">{{$t(`不需要`)}}</el-radio>
             <el-radio label="纸质件" :style="{marginTop:windowWidth>1314?0:'10px'}">{{$t(`纸质件`)}}</el-radio>
             <el-radio label="扫描件" :style="{marginTop:windowWidth>1314?0:'10px'}">{{$t(`扫描件`)}}</el-radio>

src/HDrpManagement/projectChange/modules/detail.vue

@@ -13,6 +13,7 @@
     :tags="[]"
     :tabs="tool.checkAuth($route.name,'productSetQuery')?['报价单','合同','详细信息','关联客户','联系人','产品配置单','关联线索','报备进度','竞争对手','项目评估']:['报价单','合同','详细信息','关联客户','联系人','关联线索','报备进度','竞争对手','项目评估']"
     :status="mainData.status"
+    :pageChange="pageDisabled ? pageDisabled : false"
     @pageChange="pageChange"
     @onEditSuccess="queryMainData($route.query.id)"
     @logSuccess="queryMainData"
@@ -154,6 +155,7 @@ import importFile from '@/template/importFile/index'
 import commissionSet from '@/components/commissionSetNew/index.vue'
 import updProject from './modules/updProject/index'
 export default {
+  props:["pageDisabled"],
   components:{
     reportingProgress,
     Quotation,

src/HDrpManagement/projectChange/modules/modules/andEnterprise/index.vue

@@ -15,7 +15,7 @@
       </el-input>
     </div>
     <div style="margin-top: 15px">
-      <tableLayout :layout="tablecols" :data="list" :opwidth="200" :custom="true"  :height="tableHieght" fixedName="operation">
+      <tableLayout :layout="tablecols" :data="list" :opwidth="200" :custom="true"  height="calc(100vh - 490px)" fixedName="operation">
         <template v-slot:customcol="scope">
           <div v-if="scope.column.columnname === 'province'">
             <p>{{ scope.column.data.province + '-' + scope.column.data.city + '-' + scope.column.data.county}}</p>

src/HDrpManagement/projectChange/modules/modules/clue/index.vue

@@ -15,7 +15,7 @@
       </el-input>
     </div>
     <div style="margin-top: 15px">
-      <tableLayout :layout="tablecols" :data="list" :opwidth="200"  :custom="true" :width="false"  :height="tableHieght" fixedName="operation">
+      <tableLayout :layout="tablecols" :data="list" :opwidth="200"  :custom="true" :width="false"  height="calc(100vh - 490px)" fixedName="operation">
         <template v-slot:customcol="scope">
           <div v-if="scope.column.columnname == 'status'">
             <span style="color:#999999" v-if="scope.column.data[[scope.column.columnname]] == '已过期'">{{$t(scope.column.data[[scope.column.columnname]])}}</span>

src/HDrpManagement/projectChange/modules/modules/contacts/index.vue

@@ -15,7 +15,7 @@
       </el-input>
     </div>
     <div style="margin-top: 15px">
-      <tableLayout :layout="tablecols" :data="list" :opwidth="200" :custom="true"  fixedName="operation">
+      <tableLayout :layout="tablecols" :data="list" :opwidth="200" :custom="true"  fixedName="operation" height="calc(100vh - 490px)">
         <template v-slot:customcol="scope">
           <div v-if="scope.column.columnname === 'operation'">
             <span>{{$t(scope.column.data[scope.column.columnname])}}</span>

src/HDrpManagement/projectChange/modules/modules/contract/index.vue

@@ -15,7 +15,7 @@
       </el-input>
     </div>
     <div style="margin-top: 15px">
-      <tableLayout :layout="tablecols" :data="list" :opwidth="200" :custom="true"  fixedName="operation" :height="tableHieght">
+      <tableLayout :layout="tablecols" :data="list" :opwidth="200" :custom="true"  fixedName="operation" height="calc(100vh - 490px)">
         <template v-slot:customcol="scope">
           <div v-if="scope.column.columnname === 'status'">
             <span style="color:#3874f6" v-if="scope.column.data[[scope.column.columnname]] == '新建'">{{$t(scope.column.data[[scope.column.columnname]])}}</span>

src/HDrpManagement/projectChange/modules/modules/quotation/index.vue

@@ -16,7 +16,7 @@
       </el-input>
     </div>
     <div style="margin-top: 15px">
-      <tableLayout :layout="tablecols" :data="list" :opwidth="200" :custom="true"  :height="tableHieght" fixedName="operation">
+      <tableLayout :layout="tablecols" :data="list" :opwidth="200" :custom="true"  height="calc(100vh - 490px)" fixedName="operation">
         <template v-slot:customcol="scope">
           <div v-if="scope.column.columnname === 'invaliddate'">
             {{scope.column.data.begdate?scope.column.data.begdate + $t('至') + scope.column.data.enddate:'--'}}

src/HDrpManagement/projectChange/modules/modules/rival/index.vue

@@ -13,7 +13,7 @@
           @clear="listData(params.content.pageNumber= 1)"
           clearable></el-input>
     </div>
-    <tableLayout :layout="tablecols" :data="list" :opwidth="200" :custom="true"  fixedName="operation">
+    <tableLayout :layout="tablecols" :data="list" :opwidth="200" :custom="true"  fixedName="operation" height="calc(100vh - 490px)">
       <template v-slot:customcol="scope">
         <div v-if="scope.column.columnname === 'important'">
           <span>{{scope.column.data[scope.column.columnname] === 1 ? $t('是') : $t('否')}}</span>

src/SDrpManagement/agentOrder/modules/edit.vue

@@ -472,12 +472,12 @@
           </div>
         </div>
         <div class="normal-margin flex-align-center">
-          <div class="inline-16" v-if="tool.checkAuth($route.name,'returnSignature')">
+          <div class="inline-16" >
             <small
               ><b>{{ $t("回签单") }}</b
               >&nbsp;</small
             >
-            <el-radio-group v-model="signbackstatus">
+            <el-radio-group v-model="signbackstatus" :disabled="siteId == 'HY'">
               <el-radio label="不需要" :style="{marginTop:windowWidth>1132?0:'10px'}">{{ $t("不需要") }}</el-radio>
               <el-radio label="纸质件" :style="{marginTop:windowWidth>1132?0:'10px'}">{{ $t("纸质件") }}</el-radio>
               <el-radio label="扫描件" :style="{marginTop:windowWidth>1132?0:'10px'}">{{ $t("扫描件") }}</el-radio>

src/SDrpManagement/salerOrder/modules/edit.vue

@@ -459,12 +459,12 @@
           </div>
         </div>
         <div class="normal-margin flex-align-center">
-          <div class="inline-16" v-if="tool.checkAuth($route.name,'returnSignature')">
+          <div class="inline-16" >
             <small
               ><b>{{ $t("回签单") }}:</b
               >&nbsp;</small
             >
-            <el-radio-group v-model="signbackstatus">
+            <el-radio-group v-model="signbackstatus" :disabled="siteId == 'HY'">
               <el-radio label="不需要" :style="{marginTop:windowWidth>988?0:'10px'}">{{ $t("不需要") }}</el-radio>
               <el-radio label="纸质件" :style="{marginTop:windowWidth>988?0:'10px'}">{{ $t("纸质件") }}</el-radio>
               <el-radio label="扫描件" :style="{marginTop:windowWidth>988?0:'10px'}">{{ $t("扫描件") }}</el-radio>

src/router/index.js

@@ -111,7 +111,18 @@ let routes = [
           title: '销售漏斗',
           ast_nav:true
         },
-        component: () => import(/* webpackChunkName: "about" */ '@/views/mediaStatistics/modules/salesfunnel.vue')
+        component: () => import(/* webpackChunkName: "about" */ '@/views/mediaStatistics/modules/salesfunnel.vue'),
+        children:[
+          {
+            path: '/funnelProjectDetail',
+            name: 'salesfunnel',
+            meta: {
+              title: '销售漏斗项目详情',
+              ast_nav:false
+            },
+            component: () => import(/* webpackChunkName: "about" */ '@/HDrpManagement/projectChange/modules/detail')
+          },
+        ]
       },{
         path: '/salesData',
         name: 'salesData',

src/views/mediaStatistics/modules/drawerDetail.vue

@@ -0,0 +1,54 @@
+<template>
+  <div>
+    <el-button size="small" type="text" @click="onShow" :disabled="disabled">{{$t(btn_title)}}</el-button>
+    <el-drawer
+        :visible.sync="drawer"
+        size="85%"
+        style="padding-top: 0px !important;"
+        append-to-body
+        >
+      <projectDetail ref="detailRef" :pageDisabled="true"></projectDetail>
+    </el-drawer>
+<!--    <projectDetail ref="detailRef" v-if="drawer"></projectDetail>-->
+  </div>
+</template>
+
+<script>
+import projectDetail from '@/HDrpManagement/projectChange/modules/detail'
+export default {
+  name: "drawerDetail",
+  props:['data','detailPath','idName','disabled','overview','listqueryid','total','btn_title'],
+  components:{
+    projectDetail
+  },
+  computed:{
+  },
+  data () {
+    return {
+      drawer:false
+    }
+  },
+  methods:{
+    onShow () {
+      this.drawer = true
+
+      let  query = {id:this.data[this.idName],rowindex:this.data.rowindex,listqueryid:this.listqueryid}
+
+      console.log(query,'query数据222')
+      this.$router.push({path:this.detailPath.path,query:Object.assign({},query,this.detailPath.param)})
+      // this.$router.push({path:'/funnelProjectDetail',query:{id:this.data[key],rowindex:this.data.rowindex}})
+
+    }
+  },
+}
+</script>
+
+<style scoped>
+.detail__panel{
+  background:#f1f2f3;
+  overflow-y: scroll;
+  font-size: 14px;
+  color:#666;
+  height:100vh;
+}
+</style>

src/views/mediaStatistics/modules/salesfunnel.vue

@@ -156,7 +156,9 @@
             <span>{{scope.column.data.province?scope.column.data.province + scope.column.data.city + scope.column.data.county + scope.column.data[[scope.column.columnname]]:'--'}}</span>
           </div>
           <div v-else-if="scope.column.columnname == 'projectname'">
-            <el-button size="mini" type="text" @click="goDetail(scope.column.data)">{{scope.column.data[[scope.column.columnname]]}}</el-button>
+<!--            <el-button size="mini" type="text" @click="goDetail(scope.column.data)">{{scope.column.data[[scope.column.columnname]]}}</el-button>-->
+            <drawerDetail :btn_title="scope.column.data[[scope.column.columnname]]"  :data="scope.column.data" :detailPath="detailPath" :idName="idName"
+                          :total="total"></drawerDetail>
           </div>
           <div v-else>
             {{scope.column.data[[scope.column.columnname]]?scope.column.data[[scope.column.columnname]]:'--'}}
@@ -188,8 +190,9 @@ import chartTemplate from '@/template/chartG2Template/Column'
 import previousTwelveMonths from './previousTwelveMonths'
 import futureTwelveMonths from './futureTwelveMonths'
 import exportFile from '@/components/export_file/index5'
+import drawerDetail from "@/views/mediaStatistics/modules/drawerDetail";
 export default {
-  components:{tableTemp,tableNewTemp,chartTemplate,previousTwelveMonths,futureTwelveMonths,exportFile},
+  components:{tableTemp,tableNewTemp,chartTemplate,previousTwelveMonths,futureTwelveMonths,exportFile,drawerDetail},
   data () {
     return {
       chartPie:null,
@@ -283,7 +286,11 @@ export default {
           }
         }
       },
-      dataBoxData:[]
+      dataBoxData:[],
+      detailPath:{
+        path:'/funnelProjectDetail'
+      },
+      idName:'sa_projectid',
     }
   },
   methods:{
@@ -1026,13 +1033,13 @@ export default {
     },
     goDetail(data){
       let route = this.$route
-      if (route.path !== '/projectChangeDetail') {
+      if (route.path !== '/funnelProjectDetail') {
         this.oldRoute = {path:route.path,query:route.query}
         this.$store.dispatch('setHistoryRouter',this.oldRoute)
       }
       this.$store.dispatch("changeDetailDrawer", true);
       this.$router.push({
-        path:'/projectChangeDetail',
+        path:'/funnelProjectDetail',
         query:{
           id:data.sa_projectid,
           rowindex:data.rowindex,