Merge branch 'orangeUrgent' into allTestUrgent

src/HDrpManagement/customerData/index.vue

@@ -53,7 +53,7 @@
               <div style="margin-bottom:20px">客户数据概况</div>
               <div class="data-all-wrapper">
                 <div class="data-left">
-                  <div class="data-item" @click="onClick('客户总数')">
+                  <div class="data-item div-hover-click"  @click="onClick('客户总数')">
                     <p>{{ tool.formatAmount(dataAll.total)|| 0 }}</p>
                     <p>
                       客户总数
@@ -62,22 +62,22 @@
                       </el-tooltip>
                     </p>
                   </div>
-                  <div class="data-item" @click="onClick('公海客户数')">
+                  <div class="data-item div-hover-click" @click="onClick('公海客户数')">
                     <p>{{ tool.formatAmount(dataAll.customerpoolqty)}}</p>
                     <p>
                       公海客户数
                     </p>
                   </div>
-                  <div class="data-item" @click="onClick('成交客户数')">
+                  <div class="data-item div-hover-click" @click="onClick('成交客户数')">
                     <p>{{ tool.formatAmount(dataAll.tradedCustomers)}}</p>
                     <p>
                       成交客户数
-                      <el-tooltip class="item" effect="dark" content="成交客户：已成交、多次成交状态的客户数量" placement="top">
+                      <el-tooltip class="item div-click" effect="dark" content="成交客户：已成交、多次成交状态的客户数量" placement="top">
                         <img style="vertical-align: middle" src="@/assets/icons/prompt_icon.svg" alt="">
                       </el-tooltip>
                     </p>
                   </div>
-                  <div class="data-item" @click="onClick('参与项目客户数')">
+                  <div class="data-item div-hover-click" @click="onClick('参与项目客户数')">
                     <p>{{ tool.formatAmount(dataAll.participateProject) }}</p>
                     <p>
                       参与项目客户数
@@ -88,7 +88,7 @@
                   </div>
                 </div>
                 <div class="data-right">
-                  <div class="data-item" v-for="item in dataAll.data" :key="item.rowindex" @click="onClick(item.value)">
+                  <div class="data-item div-hover-click" v-for="item in dataAll.data" :key="item.rowindex" @click="onClick(item.value)">
                     <p>{{ tool.formatAmount(item.qty) }}</p>
                     <p>
                       {{ item.value}}
@@ -2741,7 +2741,7 @@ export default {
   font-size: 26px;
   font-weight: 5px;
   font-family: 'ArialMT', 'Arial', sans-serif;
-  color: rgba(0, 0, 0, 0.85);
+  /*color: rgba(0, 0, 0, 0.85);*/
 }
 .data-all .data-item p:nth-child(2) {
   font-size: 14px;
@@ -2797,4 +2797,7 @@ export default {
 .panel-table {
   height: 100%;
 }
+.div-hover-click:hover {
+  color: #3874f6;
+}
 </style>

src/HDrpManagement/dataanalysis/components/quickDate.vue

@@ -1,15 +1,16 @@
 <template>
   <div>
     <el-button-group size="small" class="inline-24">
-      <el-button :type="select === '日'?'primary':''" size="small" @click="selectQuick(1)">日</el-button>
-      <el-button :type="select === '周'?'primary':''" size="small" @click="selectQuick(2)">周</el-button>
-      <el-button :type="select === '月'?'primary':''" size="small" @click="selectQuick(3)">月</el-button>
-      <el-button :type="select === '年'?'primary':''" size="small" @click="selectQuick(4)">年</el-button>
+      <el-button :type="select === '日'?'primary':''" size="small" @click="selectQuick(1)" :disabled="disabled">日</el-button>
+      <el-button :type="select === '周'?'primary':''" size="small" @click="selectQuick(2)" :disabled="disabled">周</el-button>
+      <el-button :type="select === '月'?'primary':''" size="small" @click="selectQuick(3)" :disabled="disabled">月</el-button>
+      <el-button :type="select === '年'?'primary':''" size="small" @click="selectQuick(4)" :disabled="disabled">年</el-button>
     </el-button-group>
     <span style="font-size: 13px">时间：</span>
     <el-date-picker
         value-format="yyyy-MM-dd"
         @change="selectDate"
+        :append-to-body="disabled"
         size="small"
         v-model="value"
         type="daterange"
@@ -23,6 +24,7 @@
 <script>
 export default {
   name: "quickDate",
+  props:['disabled'],
   data(){
     return {
       select:'周',

src/HDrpManagement/dataanalysis/index.vue

@@ -278,8 +278,45 @@ export default {
         this.$refs.documents.queryContract()
       }
     },
-    clickFull(){
-      this.$refs.clue.$refs.addFullRef.enterFullscreen()
+    clickFull(type,time){
+      if (type == '新增线索'){
+        this.tabName = '线索'
+        this.$refs.clue.disabled = true
+        this.$refs.clue.selectAdd = time
+        this.$refs.clue.$refs.quickAdd.select = time
+        this.$refs.clue.$refs.addFullRef.enterFullscreen()
+      }else if (type == '跟进线索'){
+        this.tabName = '线索'
+        this.$refs.clue.disabled = true
+        this.$refs.clue.selectFow = time
+        this.$refs.clue.$refs.quickFow.select = time
+        this.$refs.clue.$refs.fowFullRef.enterFullscreen()
+      }else if (type == '新增客户'){
+        this.tabName = '客户'
+        this.$refs.customer.disabled = true
+        this.$refs.customer.selectAdd = time
+        this.$refs.customer.$refs.quickAdd.select = time
+        this.$refs.customer.$refs.addFullRef.enterFullscreen()
+      }else if (type == '客户跟进'){
+        this.tabName = '客户'
+        this.$refs.customer.disabled = true
+        this.$refs.customer.selectFow = time
+        this.$refs.customer.$refs.quickFow.select = time
+        this.$refs.customer.$refs.fowFullRef.enterFullscreen()
+      }else if (type == '新增项目'){
+        this.tabName = '项目商机'
+        this.$refs.project.disabled = true
+        this.$refs.project.selectAdd = time
+        this.$refs.project.$refs.quickAdd.select = time
+        this.$refs.project.$refs.addFullRef.enterFullscreen()
+      }else if (type == '项目跟进'){
+        this.tabName = '项目商机'
+        this.$refs.project.disabled = true
+        this.$refs.project.selectFow = time
+        this.$refs.project.$refs.quickFow.select = time
+        this.$refs.project.$refs.fowFullRef.enterFullscreen()
+      }
+
     }
 
   },

src/HDrpManagement/dataanalysis/modules/assignmentData.vue

@@ -12,43 +12,41 @@
               </el-col>
             </el-row>
             <el-row :gutter="20" class="content-title">
-              <el-col :span="4">
-                <span class="titleHover" @click="onClick('新增线索')">新增线索</span>
-              </el-col>
-              <el-col :span="4">
-                <span>跟进线索</span>
-              </el-col>
-              <el-col :span="4">
-                <span >新增客户</span>
-              </el-col>
-              <el-col :span="4">
-                <span>客户跟进</span>
-              </el-col>
-              <el-col :span="4">
-                <span>新增项目</span>
-              </el-col>
-              <el-col :span="4">
-                <span>项目跟进</span>
-              </el-col>
-            </el-row>
-            <el-row :gutter="20" class="content-title">
-              <el-col :span="4">
-                <span class="title-font" style="color: #3874F6">{{list.bzxsxz}}</span>
-              </el-col>
-              <el-col :span="4">
-                <span class="title-font" style="color: #16BDFF">{{list.bzxsgj}}</span>
-              </el-col>
-              <el-col :span="4">
-                <span class="title-font" style="color: #3874F6">{{list.bzkhxz}}</span>
-              </el-col>
-              <el-col :span="4">
-                <span class="title-font" style="color: #16BDFF">{{list.bzkhgj}}</span>
-              </el-col>
-              <el-col :span="4">
-                <span class="title-font" style="color: #F09E00">{{list.bzxmxz}}</span>
-              </el-col>
-              <el-col :span="4">
-                <span class="title-font" style="color: #FF7602">{{list.bzxmgj}}</span>
+              <el-col :span="4" class="titleHover" >
+                <div @click="onClick('新增线索','周')">
+                  <div>新增线索</div>
+                  <div class="title-font" style="color: #3874F6">{{list.bzxsxz}}</div>
+                </div>
+              </el-col>
+              <el-col :span="4" class="titleHover">
+                <div  @click="onClick('跟进线索','周')">
+                  <div>跟进线索</div>
+                  <div class="title-font" style="color: #16BDFF">{{list.bzxsgj}}</div>
+                </div>
+              </el-col>
+              <el-col :span="4" class="titleHover">
+                <div @click="onClick('新增客户','周')">
+                  <div>新增客户</div>
+                  <div class="title-font" style="color: #3874F6">{{list.bzkhxz}}</div>
+                </div>
+              </el-col>
+              <el-col :span="4" class="titleHover">
+                <div @click="onClick('客户跟进','周')">
+                  <div>客户跟进</div>
+                  <div class="title-font" style="color: #16BDFF">{{list.bzkhgj}}</div>
+                </div>
+              </el-col>
+              <el-col :span="4" class="titleHover">
+                <div @click="onClick('新增项目','周')">
+                  <div>新增项目</div>
+                  <div class="title-font" style="color: #F09E00">{{list.bzxmxz}}</div>
+                </div>
+              </el-col>
+              <el-col :span="4" class="titleHover">
+                <div @click="onClick('项目跟进','周')">
+                  <div>项目跟进</div>
+                  <div class="title-font" style="color: #FF7602">{{list.bzxmgj}}</div>
+                </div>
               </el-col>
             </el-row>
           </template>
@@ -65,43 +63,41 @@
               </el-col>
             </el-row>
             <el-row :gutter="20" class="content-title">
-              <el-col :span="4">
-                <span >新增线索</span>
-              </el-col>
-              <el-col :span="4">
-                <span>跟进线索</span>
-              </el-col>
-              <el-col :span="4">
-                <span >新增客户</span>
-              </el-col>
-              <el-col :span="4">
-                <span>客户跟进</span>
-              </el-col>
-              <el-col :span="4">
-                <span>新增项目</span>
-              </el-col>
-              <el-col :span="4">
-                <span>项目跟进</span>
-              </el-col>
-            </el-row>
-            <el-row :gutter="20" class="content-title">
-              <el-col :span="4">
-                <span class="title-font" style="color: #3874F6">{{list.byxsxz}}</span>
-              </el-col>
-              <el-col :span="4">
-                <span class="title-font" style="color: #16BDFF">{{list.byxsgj}}</span>
-              </el-col>
-              <el-col :span="4">
-                <span class="title-font" style="color: #3874F6">{{list.bykhxz}}</span>
-              </el-col>
-              <el-col :span="4">
-                <span class="title-font" style="color: #16BDFF">{{list.bykhgj}}</span>
-              </el-col>
-              <el-col :span="4">
-                <span class="title-font" style="color: #F09E00">{{list.byxmxz}}</span>
-              </el-col>
-              <el-col :span="4">
-                <span class="title-font" style="color: #FF7602">{{list.byxmgj}}</span>
+              <el-col :span="4" class="titleHover">
+                <div @click="onClick('新增线索','月')">
+                  <div>新增线索</div>
+                  <div class="title-font" style="color: #3874F6">{{list.byxsxz}}</div>
+                </div>
+              </el-col>
+              <el-col :span="4" class="titleHover">
+                <div  @click="onClick('跟进线索','月')">
+                  <div>跟进线索</div>
+                  <div class="title-font" style="color: #16BDFF">{{list.byxsgj}}</div>
+                </div>
+              </el-col>
+              <el-col :span="4" class="titleHover">
+                <div @click="onClick('新增客户','月')">
+                  <div>新增客户</div>
+                  <div class="title-font" style="color: #3874F6">{{list.bykhxz}}</div>
+                </div>
+              </el-col>
+              <el-col :span="4" class="titleHover">
+                <div @click="onClick('客户跟进','月')">
+                  <div>客户跟进</div>
+                  <div class="title-font" style="color: #16BDFF">{{list.bykhgj}}</div>
+                </div>
+              </el-col>
+              <el-col :span="4" class="titleHover">
+                <div  @click="onClick('新增项目','月')">
+                  <div>新增项目</div>
+                  <div class="title-font" style="color: #F09E00">{{list.byxmxz}}</div>
+                </div>
+              </el-col>
+              <el-col :span="4" class="titleHover">
+                <div @click="onClick('项目跟进','月')">
+                  <div>项目跟进</div>
+                  <div class="title-font" style="color: #FF7602">{{list.byxmgj}}</div>
+                </div>
               </el-col>
             </el-row>
           </template>
@@ -118,43 +114,41 @@
               </el-col>
             </el-row>
             <el-row :gutter="20" class="content-title">
-              <el-col :span="4">
-                <span >新增线索</span>
-              </el-col>
-              <el-col :span="4">
-                <span>跟进线索</span>
-              </el-col>
-              <el-col :span="4">
-                <span >新增客户</span>
-              </el-col>
-              <el-col :span="4">
-                <span>客户跟进</span>
-              </el-col>
-              <el-col :span="4">
-                <span>新增项目</span>
-              </el-col>
-              <el-col :span="4">
-                <span>项目跟进</span>
-              </el-col>
-            </el-row>
-            <el-row :gutter="20" class="content-title">
-              <el-col :span="4">
-                <span class="title-font" style="color: #3874F6">{{list.bnxsxz}}</span>
-              </el-col>
-              <el-col :span="4">
-                <span class="title-font" style="color: #16BDFF">{{list.bnxsgj}}</span>
-              </el-col>
-              <el-col :span="4">
-                <span class="title-font" style="color: #3874F6">{{list.bnkhxz}}</span>
-              </el-col>
-              <el-col :span="4">
-                <span class="title-font" style="color: #16BDFF">{{list.bnkhgj}}</span>
-              </el-col>
-              <el-col :span="4">
-                <span class="title-font" style="color: #F09E00">{{list.bnxmxz}}</span>
-              </el-col>
-              <el-col :span="4">
-                <span class="title-font" style="color: #FF7602">{{list.bnxmgj}}</span>
+              <el-col :span="4" class="titleHover">
+                <div @click="onClick('新增线索','年')">
+                  <div>新增线索</div>
+                  <div class="title-font" style="color: #3874F6">{{list.bnxsxz}}</div>
+                </div>
+              </el-col>
+              <el-col :span="4" class="titleHover">
+                <div @click="onClick('跟进线索','年')">
+                  <div>跟进线索</div>
+                  <div class="title-font" style="color: #16BDFF">{{list.bnxsgj}}</div>
+                </div>
+              </el-col>
+              <el-col :span="4" class="titleHover">
+                <div @click="onClick('新增客户','年')">
+                  <div >新增客户</div>
+                  <div class="title-font" style="color: #3874F6">{{list.bnkhxz}}</div>
+                </div>
+              </el-col>
+              <el-col :span="4" class="titleHover">
+                <div @click="onClick('客户跟进','年')">
+                  <div>客户跟进</div>
+                  <div class="title-font" style="color: #16BDFF">{{list.bnkhgj}}</div>
+                </div>
+              </el-col>
+              <el-col :span="4" class="titleHover">
+                <div @click="onClick('新增项目','年')">
+                  <div>新增项目</div>
+                  <div class="title-font" style="color: #F09E00">{{list.bnxmxz}}</div>
+                </div>
+              </el-col>
+              <el-col :span="4" class="titleHover">
+                <div @click="onClick('项目跟进','年')">
+                  <div>项目跟进</div>
+                  <div class="title-font" style="color: #FF7602">{{list.bnxmgj}}</div>
+                </div>
               </el-col>
             </el-row>
           </template>
@@ -185,8 +179,8 @@ export default {
       const res = await this.$api.requested(this.param)
       this.list = res.data
     },
-    onClick(type){
-      this.$emit('clickFull',type)
+    onClick(type,time){
+      this.$emit('clickFull',type,time)
     }
   },
    mounted() {
@@ -195,7 +189,7 @@ export default {
 </script>
 
 <style scoped>
-  .titleHover:hover{
-    color: #3874F6;
+  .content-title .titleHover:hover{
+    color: #3874f6;
   }
 </style>

src/HDrpManagement/dataanalysis/modules/clue.vue

@@ -8,7 +8,7 @@
               <span style="font-size: 16px;color: #333">新增线索</span>
             </div>
             <div>
-              <quickDate class="inline-16" ref="quickAdd" @selectQuick="selectQuickAdd" ></quickDate>
+              <quickDate class="inline-16" ref="quickAdd" @selectQuick="selectQuickAdd" :disabled="disabled"></quickDate>
               <fullScreen ref="addFullRef" class="inline-16" domId="clueAddFull" @onFull="onAddFull" @backFull="backAddFull"></fullScreen>
             </div>
           </div>
@@ -64,8 +64,8 @@
               <span style="font-size: 16px;color: #333">跟进线索</span>
             </div>
             <div>
-              <quickDate class="inline-16" ref="quickFow" @selectQuick="selectQuickFow" ></quickDate>
-              <fullScreen class="inline-16" domId="clueAddFull" @onFull="onFowFull" @backFull="backFowFull"></fullScreen>
+              <quickDate class="inline-16" ref="quickFow" @selectQuick="selectQuickFow" :disabled="disabled"></quickDate>
+              <fullScreen ref="fowFullRef" class="inline-16" domId="clueFollowFull" @onFull="onFowFull" @backFull="backFowFull"></fullScreen>
             </div>
           </div>
           <tableLayout style="margin-top: 10px" :layout="tablecolsFollow" :data="listFollow" :opwidth="200" :custom="true" :height="isFull ?'calc(100vh - 150px)':tableHeight">
@@ -102,6 +102,7 @@ export default {
   components:{quickDate,tableLayout,fullScreen},
   data() {
     return {
+      disabled:false,
       listAdd:[],
       tablecolsAdd:[],
       listUpdate:[],
@@ -296,6 +297,7 @@ export default {
       this.clueAddParam.content.dataType = 1
       this.clueAddParam.content.pageNumber = 1
       this.clueAddParam.content.pageSize = 10
+      this.disabled = false
       this.queryAdd()
       this.isFull = false
     },

src/HDrpManagement/dataanalysis/modules/customer.vue

@@ -1,68 +1,76 @@
 <template>
   <div>
-    <el-scrollbar >
-      <div style="margin: auto;max-height: 200px">
-        <el-row>
-          <el-col :span="8">
-            <span style="font-size: 16px;color: #333">新增客户</span>
-          </el-col>
-          <el-col :span="16">
-            <quickDate @selectQuick="selectQuickAdd"></quickDate>
-          </el-col>
-        </el-row>
-        <tableLayout style="margin-top: 10px" :layout="tablecolsAdd" :data="listAdd" :opwidth="200" :width="true" :custom="true" :height="tableHeight">
-          <template v-slot:customcol="scope">
-            <p>{{scope.column.data[scope.column.columnname]?scope.column.data[scope.column.columnname]:'--'}}</p>
-          </template>
-        </tableLayout>
-        <div class="container normal-panel" style="text-align:right">
-          <el-pagination
-              background
-              @size-change="handleSizeChangeAdd"
-              @current-change="handleCurrentChangeAdd"
-              :current-page="currentPageAdd"
-              :page-sizes="[10,20, 50, 100, 200]"
-              :page-size="10"
-              layout="total,sizes, prev, pager, next, jumper"
-              :total="totalAdd">
-          </el-pagination>
+    <el-scrollbar>
+      <div style="margin: auto;">
+        <div id="customerAddFull" style="background: #FFFFFF" :style="{padding:isFull ?'16px':0}">
+          <div style="display: flex;justify-content: space-between">
+            <div>
+              <span style="font-size: 16px;color: #333">新增客户</span>
+            </div>
+            <div>
+              <quickDate class="inline-16" ref="quickAdd" @selectQuick="selectQuickAdd" :disabled="disabled"></quickDate>
+              <fullScreen ref="addFullRef" class="inline-16" domId="customerAddFull" @onFull="onFull('新增')" @backFull="backFull('新增')"></fullScreen>
+            </div>
+          </div>
+          <tableLayout style="margin-top: 10px" :layout="tablecolsAdd" :data="listAdd" :opwidth="200" :width="true" :custom="true" :height="isFull ?'calc(100vh - 150px)':tableHeight">
+            <template v-slot:customcol="scope">
+              <p>{{scope.column.data[scope.column.columnname]?scope.column.data[scope.column.columnname]:'--'}}</p>
+            </template>
+          </tableLayout>
+          <div class="container normal-panel" style="text-align:right">
+            <el-pagination
+                background
+                @size-change="handleSizeChangeAdd"
+                @current-change="handleCurrentChangeAdd"
+                :current-page="currentPageAdd"
+                :page-sizes="isFull ?[100,150, 200, 250]:[10,20, 50, 100, 200]"
+                :page-size="isFull ?100:10"
+                layout="total,sizes, prev, pager, next, jumper"
+                :total="totalAdd">
+            </el-pagination>
+          </div>
         </div>
-        <el-row>
-          <el-col :span="8">
-            <span style="font-size: 16px;color: #333">更新客户</span>
-          </el-col>
-          <el-col :span="16">
-            <quickDate @selectQuick="selectQuickUpd"></quickDate>
-          </el-col>
-        </el-row>
-        <tableLayout style="margin-top: 10px" :layout="tablecolsUpdate" :data="listUpdate" :opwidth="200" :custom="true" :height="tableHeight">
-          <template v-slot:customcol="scope">
-            <p>{{scope.column.data[scope.column.columnname]?scope.column.data[scope.column.columnname]:'--'}}</p>
-          </template>
-        </tableLayout>
-        <div class="container normal-panel" style="text-align:right">
-          <el-pagination
-              background
-              @size-change="handleSizeChangeUpdate"
-              @current-change="handleCurrentChangeUpdate"
-              :current-page="currentPageUpdate"
-              :page-sizes="[10,20, 50, 100, 200]"
-              :page-size="10"
-              layout="total,sizes, prev, pager, next, jumper"
-              :total="totalUpdate">
-          </el-pagination>
+        <div id="customerUpdFull" style="background: #FFFFFF" :style="{padding:isFull ?'16px':0}">
+          <div style="display: flex;justify-content: space-between">
+            <div>
+              <span style="font-size: 16px;color: #333">更新客户</span>
+            </div>
+            <div>
+              <quickDate class="inline-16"  ref="quickUpd" @selectQuick="selectQuickUpd"></quickDate>
+              <fullScreen ref="updFullRef" class="inline-16" domId="customerUpdFull" @onFull="onFull('更新')" @backFull="backFull('更新')"></fullScreen>
+            </div>
+          </div>
+          <tableLayout style="margin-top: 10px" :layout="tablecolsUpdate" :data="listUpdate" :opwidth="200" :custom="true" :height="isFull ?'calc(100vh - 150px)':tableHeight">
+            <template v-slot:customcol="scope">
+              <p>{{scope.column.data[scope.column.columnname]?scope.column.data[scope.column.columnname]:'--'}}</p>
+            </template>
+          </tableLayout>
+          <div class="container normal-panel" style="text-align:right">
+            <el-pagination
+                background
+                @size-change="handleSizeChangeUpdate"
+                @current-change="handleCurrentChangeUpdate"
+                :current-page="currentPageUpdate"
+                :page-sizes="isFull ?[100,150, 200, 250]:[10,20, 50, 100, 200]"
+                :page-size="isFull ?100:10"
+                layout="total,sizes, prev, pager, next, jumper"
+                :total="totalUpdate">
+            </el-pagination>
+          </div>
         </div>
-        <el-row>
-          <el-col :span="8">
-            <span style="font-size: 16px;color: #333">跟进客户</span>
-          </el-col>
-          <el-col :span="16">
-            <quickDate @selectQuick="selectQuickFow"></quickDate>
-          </el-col>
-        </el-row>
-        <tableLayout style="margin-top: 10px" :layout="tablecolsFollow" :data="listFollow" :opwidth="200" :custom="true" :height="tableHeight">
-          <template v-slot:customcol="scope">
-            <p v-if="scope.column.columnname === 'followname'">
+        <div id="customerFowFull" style="background: #FFFFFF" :style="{padding:isFull ?'16px':0}">
+          <div style="display: flex;justify-content: space-between">
+            <div>
+              <span style="font-size: 16px;color: #333">跟进客户</span>
+            </div>
+            <div>
+              <quickDate class="inline-16" ref="quickFow" @selectQuick="selectQuickFow" :disabled="disabled"></quickDate>
+              <fullScreen ref="fowFullRef" class="inline-16" domId="customerFowFull" @onFull="onFull('跟进')" @backFull="backFull('跟进')"></fullScreen>
+            </div>
+          </div>
+          <tableLayout style="margin-top: 10px" :layout="tablecolsFollow" :data="listFollow" :opwidth="200" :custom="true" :height="isFull ?'calc(100vh - 150px)':tableHeight">
+            <template v-slot:customcol="scope">
+              <p v-if="scope.column.columnname === 'followname'">
               <span v-if="scope.column.data.followname.length > 0">
                 <span v-for="(item,index) in scope.column.data.followname">
                 <span v-if="index === scope.column.data.followname.length -1">
@@ -73,25 +81,25 @@
                 </span>
               </span>
               </span>
-              <span v-else>--</span>
-            </p>
-            <p v-else>{{scope.column.data[scope.column.columnname]?scope.column.data[scope.column.columnname]:'--'}}</p>
-          </template>
-        </tableLayout>
-        <div class="container normal-panel" style="text-align:right">
-          <el-pagination
-              background
-              @size-change="handleSizeChangeFollow"
-              @current-change="handleCurrentChangeFollow"
-              :current-page="currentPageFollow"
-              :page-sizes="[10,20, 50, 100, 200]"
-              :page-size="10"
-              layout="total,sizes, prev, pager, next, jumper"
-              :total="totalFollow">
-          </el-pagination>
+                <span v-else>--</span>
+              </p>
+              <p v-else>{{scope.column.data[scope.column.columnname]?scope.column.data[scope.column.columnname]:'--'}}</p>
+            </template>
+          </tableLayout>
+          <div class="container normal-panel" style="text-align:right">
+            <el-pagination
+                background
+                @size-change="handleSizeChangeFollow"
+                @current-change="handleCurrentChangeFollow"
+                :current-page="currentPageFollow"
+                :page-sizes="isFull ?[100,150, 200, 250]:[10,20, 50, 100, 200]"
+                :page-size="isFull ?100:10"
+                layout="total,sizes, prev, pager, next, jumper"
+                :total="totalFollow">
+            </el-pagination>
+          </div>
         </div>
       </div>
-
     </el-scrollbar>
   </div>
 </template>
@@ -99,10 +107,11 @@
 <script>
 import quickDate from "@/HDrpManagement/dataanalysis/components/quickDate";
 import tableLayout from '@/components/table/index9'
+import fullScreen from "@/views/salesData/components/fullScreen";
 export default {
   name: "customer",
   props:['param','isDep','dataid','isPerson'],
-  components:{quickDate,tableLayout},
+  components:{quickDate,tableLayout,fullScreen},
   data() {
     return {
       listAdd:[],
@@ -120,7 +129,9 @@ export default {
       totalFollow:0,
       begindate:'',
       enddate:'',
-      select:'周',
+      selectAdd:'周',
+      selectUpd:'周',
+      selectFow:'周',
       sort:[
         {
           reversed : 0,
@@ -134,15 +145,17 @@ export default {
           sortid: 208,
           sortname: "跟进排序"
         }
-      ]
+      ],
+      isFull:false,
+      disabled:false
     }
   },
   methods:{
     async queryAdd(){
       this.param.content.dataType = 4
-      this.param.content.where.begindate = this.select ? '' :this.begindate
-      this.param.content.where.enddate = this.select ? '' : this.enddate
-      this.param.content.dateType = this.select
+      this.param.content.where.begindate = this.selectAdd ? '' :this.begindate
+      this.param.content.where.enddate = this.selectAdd ? '' : this.enddate
+      this.param.content.dateType = this.selectAdd
       this.param.content.sort = [this.sort[0]]
       const res = await this.$api.requested(this.param)
       this.listAdd = res.data
@@ -161,9 +174,9 @@ export default {
     },
     async queryUpdate(){
       this.param.content.dataType = 5
-      this.param.content.where.begindate = this.select ? '' :this.begindate
-      this.param.content.where.enddate = this.select ? '' : this.enddate
-      this.param.content.dateType = this.select
+      this.param.content.where.begindate = this.selectUpd ? '' :this.begindate
+      this.param.content.where.enddate = this.selectUpd ? '' : this.enddate
+      this.param.content.dateType = this.selectUpd
       this.param.content.sort = [this.sort[0]]
       const res = await this.$api.requested(this.param)
       this.listUpdate = res.data
@@ -182,9 +195,9 @@ export default {
     },
     async queryFollow(){
       this.param.content.dataType = 6
-      this.param.content.where.begindate = this.select ? '' :this.begindate
-      this.param.content.where.enddate = this.select ? '' : this.enddate
-      this.param.content.dateType = this.select
+      this.param.content.where.begindate = this.selectFow ? '' :this.begindate
+      this.param.content.where.enddate = this.selectFow ? '' : this.enddate
+      this.param.content.dateType = this.selectFow
       this.param.content.sort = [this.sort[1]]
       const res = await this.$api.requested(this.param)
       this.listFollow = res.data
@@ -205,20 +218,64 @@ export default {
     selectQuickAdd(begindate,enddate,select){
       this.begindate = begindate
       this.enddate = enddate
-      this.select = select
+      this.selectAdd = select
       this.queryAdd(this.param.content.pageNumber = 1)
     },
     selectQuickUpd(begindate,enddate,select){
       this.begindate = begindate
       this.enddate = enddate
-      this.select = select
+      this.selectUpd = select
       this.queryUpdate(this.param.content.pageNumber = 1)
     },
     selectQuickFow(begindate,enddate,select){
       this.begindate = begindate
       this.enddate = enddate
-      this.select = select
+      this.selectFow = select
       this.queryFollow(this.param.content.pageNumber = 1)
+    },
+    onFull(type){
+      if (type == '新增'){
+        this.param.content.dataType = 4
+        this.param.content.pageNumber = 1
+        this.param.content.pageSize = 100
+        this.queryAdd()
+        this.isFull = true
+      }else if (type == '更新'){
+        this.param.content.dataType = 5
+        this.param.content.pageNumber = 1
+        this.param.content.pageSize = 100
+        this.queryUpdate()
+        this.isFull = true
+      }else if (type == '跟进'){
+        this.param.content.dataType = 6
+        this.param.content.pageNumber = 1
+        this.param.content.pageSize = 100
+        this.queryFollow()
+        this.isFull = true
+      }
+    },
+    backFull(type){
+      if (type == '新增'){
+        this.param.content.dataType = 4
+        this.param.content.pageNumber = 1
+        this.param.content.pageSize = 10
+        this.queryAdd()
+        this.disabled = false
+        this.isFull = false
+      }else if (type == '更新'){
+        this.param.content.dataType = 5
+        this.param.content.pageNumber = 1
+        this.param.content.pageSize = 10
+        this.queryUpdate()
+        this.isFull = false
+      }else if (type == '跟进'){
+        this.param.content.dataType = 6
+        this.param.content.pageNumber = 1
+        this.param.content.pageSize = 10
+        this.queryFollow()
+        this.disabled = false
+        this.isFull = false
+      }
     }
   },
   created() {

src/HDrpManagement/dataanalysis/modules/documents.vue

@@ -1,71 +1,76 @@
 <template>
   <div>
     <el-scrollbar >
-      <div style="margin: auto;max-height: 200px">
-        <el-row>
-          <el-col :span="8">
-            <span style="font-size: 16px;color: #333">报价单</span>
-          </el-col>
-          <el-col :span="16">
-            <quickDate @selectQuick="selectQuickQuotation"></quickDate>
-          </el-col>
-        </el-row>
-        <tableLayout style="margin-top: 10px" :layout="quotationTablecols" :data="quotationList" :opwidth="200" :custom="true" :height="tableHeight">
-          <template v-slot:customcol="scope">
-            <div v-if="scope.column.columnname === 'status'">
-              <span style="color:#3874f6" v-if="scope.column.data[[scope.column.columnname]] == '新建'">{{scope.column.data[[scope.column.columnname]]}}</span>
-              <span style="color:#52c41a" v-else-if="scope.column.data[[scope.column.columnname]] == '提交'">{{scope.column.data[[scope.column.columnname]]}}</span>
-              <span style="color:#333333" v-else-if="scope.column.data[[scope.column.columnname]] == '审核'">{{scope.column.data[[scope.column.columnname]]}}</span>
-              <span style="color:#fa8c16" v-else-if="scope.column.data[[scope.column.columnname]] == '复核'">{{scope.column.data[[scope.column.columnname]]}}</span>
+      <div style="margin: auto;">
+        <div id="quotationFull" style="background: #FFFFFF" :style="{padding:isFull ?'16px':0}">
+          <div style="display: flex;justify-content: space-between">
+            <div>
+              <span style="font-size: 16px;color: #333">报价单</span>
             </div>
-            <p v-else>{{scope.column.data[scope.column.columnname]?scope.column.data[scope.column.columnname]:'--'}}</p>
-          </template>
-        </tableLayout>
-        <div class="container normal-panel" style="text-align:right">
-          <el-pagination
-              background
-              @size-change="quotationHandleSizeChange"
-              @current-change="quotationHandleCurrentChange"
-              :current-page="quotationCurrentPage"
-              :page-sizes="[10,20, 50, 100, 200]"
-              :page-size="10"
-              layout="total,sizes, prev, pager, next, jumper"
-              :total="quotationTotal">
-          </el-pagination>
-        </div>
-        <el-row>
-          <el-col :span="8">
-            <span style="font-size: 16px;color: #333">合同</span>
-          </el-col>
-          <el-col :span="16">
-            <quickDate @selectQuick="selectQuickContract"></quickDate>
-          </el-col>
-        </el-row>
-        <tableLayout style="margin-top: 10px" :layout="contractTablecols" :data="contractList" :opwidth="200" :custom="true" :height="tableHeight">
-          <template v-slot:customcol="scope">
-            <div v-if="scope.column.columnname == 'status'">
-              <span style="color:#3874f6" v-if="scope.column.data[[scope.column.columnname]] == '新建'">{{scope.column.data[[scope.column.columnname]]}}</span>
-              <span style="color:#52c41a" v-else-if="scope.column.data[[scope.column.columnname]] == '已提交'">{{scope.column.data[[scope.column.columnname]]}}</span>
-              <span style="color:#333333" v-else-if="scope.column.data[[scope.column.columnname]] == '审核'">{{scope.column.data[[scope.column.columnname]]}}</span>
-              <span style="color:#000000" v-else>{{scope.column.data[[scope.column.columnname]]}}</span>
+            <div>
+              <quickDate class="inline-16" @selectQuick="selectQuickQuotation"></quickDate>
+              <fullScreen ref="quotationFullRef" class="inline-16" domId="quotationFull" @onFull="onFull('报价')" @backFull="backFull('报价')"></fullScreen>
             </div>
-            <p v-else>{{scope.column.data[scope.column.columnname]?scope.column.data[scope.column.columnname]:'--'}}</p>
-          </template>
-        </tableLayout>
-        <div class="container normal-panel" style="text-align:right">
-          <el-pagination
-              background
-              @size-change="contractHandleSizeChange"
-              @current-change="contractHandleCurrentChange"
-              :current-page="contractCurrentPage"
-              :page-sizes="[10,20, 50, 100, 200]"
-              :page-size="10"
-              layout="total,sizes, prev, pager, next, jumper"
-              :total="contractTotal">
-          </el-pagination>
+          </div>
+          <tableLayout style="margin-top: 10px" :layout="quotationTablecols" :data="quotationList" :opwidth="200" :custom="true" :height="isFull ?'calc(100vh - 150px)':tableHeight">
+            <template v-slot:customcol="scope">
+              <div v-if="scope.column.columnname === 'status'">
+                <span style="color:#3874f6" v-if="scope.column.data[[scope.column.columnname]] == '新建'">{{scope.column.data[[scope.column.columnname]]}}</span>
+                <span style="color:#52c41a" v-else-if="scope.column.data[[scope.column.columnname]] == '提交'">{{scope.column.data[[scope.column.columnname]]}}</span>
+                <span style="color:#333333" v-else-if="scope.column.data[[scope.column.columnname]] == '审核'">{{scope.column.data[[scope.column.columnname]]}}</span>
+                <span style="color:#fa8c16" v-else-if="scope.column.data[[scope.column.columnname]] == '复核'">{{scope.column.data[[scope.column.columnname]]}}</span>
+              </div>
+              <p v-else>{{scope.column.data[scope.column.columnname]?scope.column.data[scope.column.columnname]:'--'}}</p>
+            </template>
+          </tableLayout>
+          <div class="container normal-panel" style="text-align:right">
+            <el-pagination
+                background
+                @size-change="quotationHandleSizeChange"
+                @current-change="quotationHandleCurrentChange"
+                :current-page="quotationCurrentPage"
+                :page-sizes="isFull ?[100,150, 200, 250]:[10,20, 50, 100, 200]"
+                :page-size="isFull ?100:10"
+                layout="total,sizes, prev, pager, next, jumper"
+                :total="quotationTotal">
+            </el-pagination>
+          </div>
         </div>
+       <div id="contractFull" style="background: #FFFFFF" :style="{padding:isFull ?'16px':0}">
+         <div style="display: flex;justify-content: space-between">
+           <div>
+             <span style="font-size: 16px;color: #333">合同</span>
+           </div>
+           <div>
+             <quickDate class="inline-16" @selectQuick="selectQuickContract"></quickDate>
+             <fullScreen ref="contractFullRef" class="inline-16" domId="contractFull" @onFull="onFull('合同')" @backFull="backFull('合同')"></fullScreen>
+           </div>
+         </div>
+         <tableLayout style="margin-top: 10px" :layout="contractTablecols" :data="contractList" :opwidth="200" :custom="true" :height="isFull ?'calc(100vh - 150px)':tableHeight">
+           <template v-slot:customcol="scope">
+             <div v-if="scope.column.columnname == 'status'">
+               <span style="color:#3874f6" v-if="scope.column.data[[scope.column.columnname]] == '新建'">{{scope.column.data[[scope.column.columnname]]}}</span>
+               <span style="color:#52c41a" v-else-if="scope.column.data[[scope.column.columnname]] == '已提交'">{{scope.column.data[[scope.column.columnname]]}}</span>
+               <span style="color:#333333" v-else-if="scope.column.data[[scope.column.columnname]] == '审核'">{{scope.column.data[[scope.column.columnname]]}}</span>
+               <span style="color:#000000" v-else>{{scope.column.data[[scope.column.columnname]]}}</span>
+             </div>
+             <p v-else>{{scope.column.data[scope.column.columnname]?scope.column.data[scope.column.columnname]:'--'}}</p>
+           </template>
+         </tableLayout>
+         <div class="container normal-panel" style="text-align:right">
+           <el-pagination
+               background
+               @size-change="contractHandleSizeChange"
+               @current-change="contractHandleCurrentChange"
+               :current-page="contractCurrentPage"
+               :page-sizes="isFull ?[100,150, 200, 250]:[10,20, 50, 100, 200]"
+               :page-size="isFull ?100:10"
+               layout="total,sizes, prev, pager, next, jumper"
+               :total="contractTotal">
+           </el-pagination>
+         </div>
+       </div>
       </div>
-
     </el-scrollbar>
   </div>
 </template>
@@ -73,10 +78,11 @@
 <script>
 import quickDate from "@/HDrpManagement/dataanalysis/components/quickDate";
 import tableLayout from '@/components/table/index9'
+import fullScreen from "@/views/salesData/components/fullScreen";
 export default {
   name: "documents",
   props:['param','isDep','dataid','isPerson'],
-  components:{quickDate,tableLayout},
+  components:{quickDate,tableLayout,fullScreen},
   data() {
     return {
       quotationList:[],
@@ -90,7 +96,8 @@ export default {
       contractTotal:0,
       begindate:'',
       enddate:'',
-      select:'',
+      contractSelect:'周',
+      quotationSelect:'周',
       sort:[
         {
           reversed : 0,
@@ -104,7 +111,9 @@ export default {
           sortid: 208,
           sortname: "跟进排序"
         }
-      ]
+      ],
+      isFull:false,
+      disabled:false
     }
   },
   methods: {
@@ -112,9 +121,9 @@ export default {
      /* this.isDep ? this.param.content.type = 1 : this.isPerson ? this.param.content.type = 0 : this.param.content.type = ''*/
       this.param.content.dataType = 10
     /*  this.param.content.dataid = this.dataid*/
-      this.param.content.where.begindate = this.select ? '' :this.begindate
-      this.param.content.where.enddate = this.select ? '' : this.enddate
-      this.param.content.dateType = this.select
+      this.param.content.where.begindate = this.quotationSelect ? '' :this.begindate
+      this.param.content.where.enddate = this.quotationSelect ? '' : this.enddate
+      this.param.content.dateType = this.quotationSelect
       this.param.content.sort = [this.sort[1]]
       const res = await this.$api.requested(this.param)
       this.quotationList = res.data
@@ -135,9 +144,9 @@ export default {
      /* this.isDep ? this.param.content.type = 1 : this.isPerson ? this.param.content.type = 0 : this.param.content.type = ''*/
       this.param.content.dataType = 11
      /* this.param.content.dataid = this.dataid*/
-      this.param.content.where.begindate = this.select ? '' :this.begindate
-      this.param.content.where.enddate = this.select ? '' : this.enddate
-      this.param.content.dateType = this.select
+      this.param.content.where.begindate = this.contractSelect ? '' :this.begindate
+      this.param.content.where.enddate = this.contractSelect ? '' : this.enddate
+      this.param.content.dateType = this.contractSelect
       this.param.content.sort = [this.sort[1]]
       const res = await this.$api.requested(this.param)
       this.contractList = res.data
@@ -158,15 +167,45 @@ export default {
     selectQuickQuotation(begindate,enddate,select){
       this.begindate = begindate
       this.enddate = enddate
-      this.select = select
+      this.quotationSelect = select
       this.queryQuotation(this.param.content.pageNumber = 1)
     },
     selectQuickContract(begindate,enddate,select){
       this.begindate = begindate
       this.enddate = enddate
-      this.select = select
+      this.contractSelect = select
       this.queryContract(this.param.content.pageNumber = 1)
     },
+    onFull(type){
+      if (type == '报价'){
+        this.param.content.dataType = 10
+        this.param.content.pageNumber = 1
+        this.param.content.pageSize = 100
+        this.queryQuotation()
+        this.isFull = true
+      }else if (type == '合同'){
+        this.param.content.dataType = 11
+        this.param.content.pageNumber = 1
+        this.param.content.pageSize = 100
+        this.queryContract()
+        this.isFull = true
+      }
+    },
+    backFull(type){
+      if (type == '报价'){
+        this.param.content.dataType = 10
+        this.param.content.pageNumber = 1
+        this.param.content.pageSize = 10
+        this.queryQuotation()
+        this.isFull = false
+      }else if (type == '合同'){
+        this.param.content.dataType = 11
+        this.param.content.pageNumber = 1
+        this.param.content.pageSize = 10
+        this.queryContract()
+        this.isFull = false
+      }
+    }
   },
   created() {
     this.quotationTablecols = this.tool.tabelCol(this.$route.name).quotationTable.tablecols

src/HDrpManagement/dataanalysis/modules/project.vue

@@ -1,68 +1,76 @@
 <template>
   <div>
     <el-scrollbar >
-      <div style="margin: auto;max-height: 200px">
-        <el-row>
-          <el-col :span="8">
-            <span style="font-size: 16px;color: #333">新增项目</span>
-          </el-col>
-          <el-col :span="16">
-            <quickDate @selectQuick="selectQuickAdd"></quickDate>
-          </el-col>
-        </el-row>
-        <tableLayout style="margin-top: 10px" :layout="tablecolsAdd" :data="listAdd" :opwidth="200" :custom="true" :height="tableHeight">
-          <template v-slot:customcol="scope">
-            <p>{{scope.column.data[scope.column.columnname]?scope.column.data[scope.column.columnname]:'--'}}</p>
-          </template>
-        </tableLayout>
-        <div class="container normal-panel" style="text-align:right">
-          <el-pagination
-              background
-              @size-change="handleSizeChangeAdd"
-              @current-change="handleCurrentChangeAdd"
-              :current-page="currentPageAdd"
-              :page-sizes="[10,20, 50, 100, 200]"
-              :page-size="10"
-              layout="total,sizes, prev, pager, next, jumper"
-              :total="totalAdd">
-          </el-pagination>
+      <div style="margin: auto;">
+        <div id="projectAddFull" style="background: #FFFFFF" :style="{padding:isFull ?'16px':0}">
+          <div style="display: flex;justify-content: space-between">
+            <div>
+              <span style="font-size: 16px;color: #333">新增项目</span>
+            </div>
+            <div>
+              <quickDate class="inline-16" ref="quickAdd" @selectQuick="selectQuickAdd" :disabled="disabled"></quickDate>
+              <fullScreen ref="addFullRef" class="inline-16" domId="projectAddFull" @onFull="onFull('新增')" @backFull="backFull('新增')"></fullScreen>
+            </div>
+          </div>
+          <tableLayout style="margin-top: 10px" :layout="tablecolsAdd" :data="listAdd" :opwidth="200" :custom="true" :height="isFull ?'calc(100vh - 150px)':tableHeight">
+            <template v-slot:customcol="scope">
+              <p>{{scope.column.data[scope.column.columnname]?scope.column.data[scope.column.columnname]:'--'}}</p>
+            </template>
+          </tableLayout>
+          <div class="container normal-panel" style="text-align:right">
+            <el-pagination
+                background
+                @size-change="handleSizeChangeAdd"
+                @current-change="handleCurrentChangeAdd"
+                :current-page="currentPageAdd"
+                :page-sizes="isFull ?[100,150, 200, 250]:[10,20, 50, 100, 200]"
+                :page-size="isFull ?100:10"
+                layout="total,sizes, prev, pager, next, jumper"
+                :total="totalAdd">
+            </el-pagination>
+          </div>
         </div>
-        <el-row>
-          <el-col :span="8">
-            <span style="font-size: 16px;color: #333">更新项目</span>
-          </el-col>
-          <el-col :span="16">
-            <quickDate @selectQuick="selectQuickUpd"></quickDate>
-          </el-col>
-        </el-row>
-        <tableLayout style="margin-top: 10px" :layout="tablecolsUpdate" :data="listUpdate" :opwidth="200" :custom="true" :height="tableHeight">
-          <template v-slot:customcol="scope">
-            <p>{{scope.column.data[scope.column.columnname]?scope.column.data[scope.column.columnname]:'--'}}</p>
-          </template>
-        </tableLayout>
-        <div class="container normal-panel" style="text-align:right">
-          <el-pagination
-              background
-              @size-change="handleSizeChangeUpdate"
-              @current-change="handleCurrentChangeUpdate"
-              :current-page="currentPageUpdate"
-              :page-sizes="[10,20, 50, 100, 200]"
-              :page-size="10"
-              layout="total,sizes, prev, pager, next, jumper"
-              :total="totalUpdate">
-          </el-pagination>
-        </div>
-        <el-row>
-          <el-col :span="8">
-            <span style="font-size: 16px;color: #333">跟进项目</span>
-          </el-col>
-          <el-col :span="16">
-            <quickDate @selectQuick="selectQuickFow"></quickDate>
-          </el-col>
-        </el-row>
-        <tableLayout style="margin-top: 10px" :layout="tablecolsFollow" :data="listFollow" :opwidth="200" :custom="true" :height="tableHeight">
-          <template v-slot:customcol="scope">
-            <p v-if="scope.column.columnname === 'followname'">
+       <div id="projectUpdFull" style="background: #FFFFFF" :style="{padding:isFull ?'16px':0}">
+         <div style="display: flex;justify-content: space-between">
+           <div>
+             <span style="font-size: 16px;color: #333">更新项目</span>
+           </div>
+           <div>
+             <quickDate class="inline-16"  ref="quickUpd" @selectQuick="selectQuickUpd"></quickDate>
+             <fullScreen ref="updFullRef" class="inline-16" domId="projectUpdFull" @onFull="onFull('更新')" @backFull="backFull('更新')"></fullScreen>
+           </div>
+         </div>
+         <tableLayout style="margin-top: 10px" :layout="tablecolsUpdate" :data="listUpdate" :opwidth="200" :custom="true" :height="isFull ?'calc(100vh - 150px)':tableHeight">
+           <template v-slot:customcol="scope">
+             <p>{{scope.column.data[scope.column.columnname]?scope.column.data[scope.column.columnname]:'--'}}</p>
+           </template>
+         </tableLayout>
+         <div class="container normal-panel" style="text-align:right">
+           <el-pagination
+               background
+               @size-change="handleSizeChangeUpdate"
+               @current-change="handleCurrentChangeUpdate"
+               :current-page="currentPageUpdate"
+               :page-sizes="isFull ?[100,150, 200, 250]:[10,20, 50, 100, 200]"
+               :page-size="isFull ?100:10"
+               layout="total,sizes, prev, pager, next, jumper"
+               :total="totalUpdate">
+           </el-pagination>
+         </div>
+       </div>
+       <div id="projectFowFull" style="background: #FFFFFF" :style="{padding:isFull ?'16px':0}">
+         <div style="display: flex;justify-content: space-between">
+           <div>
+             <span style="font-size: 16px;color: #333">跟进项目</span>
+           </div>
+           <div>
+             <quickDate class="inline-16" ref="quickFow" @selectQuick="selectQuickFow" :disabled="disabled"></quickDate>
+             <fullScreen ref="fowFullRef" class="inline-16" domId="projectFowFull" @onFull="onFull('跟进')" @backFull="backFull('跟进')"></fullScreen>
+           </div>
+         </div>
+         <tableLayout style="margin-top: 10px" :layout="tablecolsFollow" :data="listFollow" :opwidth="200" :custom="true" :height="isFull ?'calc(100vh - 150px)':tableHeight">
+           <template v-slot:customcol="scope">
+             <p v-if="scope.column.columnname === 'followname'">
               <span v-if="scope.column.data.followname.length > 0">
                 <span v-for="(item,index) in scope.column.data.followname">
                 <span v-if="index === scope.column.data.followname.length -1">
@@ -73,23 +81,24 @@
                 </span>
               </span>
               </span>
-              <span v-else>--</span>
-            </p>
-            <p v-else>{{scope.column.data[scope.column.columnname]?scope.column.data[scope.column.columnname]:'--'}}</p>
-          </template>
-        </tableLayout>
-        <div class="container normal-panel" style="text-align:right">
-          <el-pagination
-              background
-              @size-change="handleSizeChangeFollow"
-              @current-change="handleCurrentChangeFollow"
-              :current-page="currentPageFollow"
-              :page-sizes="[10,20, 50, 100, 200]"
-              :page-size="10"
-              layout="total,sizes, prev, pager, next, jumper"
-              :total="totalFollow">
-          </el-pagination>
-        </div>
+               <span v-else>--</span>
+             </p>
+             <p v-else>{{scope.column.data[scope.column.columnname]?scope.column.data[scope.column.columnname]:'--'}}</p>
+           </template>
+         </tableLayout>
+         <div class="container normal-panel" style="text-align:right">
+           <el-pagination
+               background
+               @size-change="handleSizeChangeFollow"
+               @current-change="handleCurrentChangeFollow"
+               :current-page="currentPageFollow"
+               :page-sizes="isFull ?[100,150, 200, 250]:[10,20, 50, 100, 200]"
+               :page-size="isFull ?100:10"
+               layout="total,sizes, prev, pager, next, jumper"
+               :total="totalFollow">
+           </el-pagination>
+         </div>
+       </div>
       </div>
 
     </el-scrollbar>
@@ -99,10 +108,11 @@
 <script>
 import quickDate from "@/HDrpManagement/dataanalysis/components/quickDate";
 import tableLayout from '@/components/table/index9'
+import fullScreen from "@/views/salesData/components/fullScreen";
 export default {
   name: "project",
   props:['param','isDep','dataid','isPerson'],
-  components:{quickDate,tableLayout},
+  components:{quickDate,tableLayout,fullScreen},
   data() {
     return {
       listAdd:[],
@@ -120,7 +130,9 @@ export default {
       totalFollow:0,
       begindate:'',
       enddate:'',
-      select:'周',
+      selectAdd:'周',
+      selectUpd:'周',
+      selectFow:'周',
       sort:[
         {
           reversed : 0,
@@ -134,15 +146,17 @@ export default {
           sortid: 208,
           sortname: "跟进排序"
         }
-      ]
+      ],
+      isFull:false,
+      disabled:false
     }
   },
   methods:{
     async queryAdd(){
       this.param.content.dataType = 7
-      this.param.content.where.begindate = this.select ? '' :this.begindate
-      this.param.content.where.enddate = this.select ? '' : this.enddate
-      this.param.content.dateType = this.select
+      this.param.content.where.begindate = this.selectAdd ? '' :this.begindate
+      this.param.content.where.enddate = this.selectAdd ? '' : this.enddate
+      this.param.content.dateType = this.selectAdd
       this.param.content.sort = [this.sort[0]]
       const res = await this.$api.requested(this.param)
       this.listAdd = res.data
@@ -161,9 +175,9 @@ export default {
     },
     async queryUpdate(){
       this.param.content.dataType = 8
-      this.param.content.where.begindate = this.select ? '' :this.begindate
-      this.param.content.where.enddate = this.select ? '' : this.enddate
-      this.param.content.dateType = this.select
+      this.param.content.where.begindate = this.selectUpd ? '' :this.begindate
+      this.param.content.where.enddate = this.selectUpd ? '' : this.enddate
+      this.param.content.dateType = this.selectUpd
       this.param.content.sort = [this.sort[0]]
       const res = await this.$api.requested(this.param)
       this.listUpdate = res.data
@@ -182,9 +196,9 @@ export default {
     },
     async queryFollow(){
       this.param.content.dataType = 9
-      this.param.content.where.begindate = this.select ? '' :this.begindate
-      this.param.content.where.enddate = this.select ? '' : this.enddate
-      this.param.content.dateType = this.select
+      this.param.content.where.begindate = this.selectFow ? '' :this.begindate
+      this.param.content.where.enddate = this.selectFow ? '' : this.enddate
+      this.param.content.dateType = this.selectFow
       this.param.content.sort = [this.sort[1]]
       const res = await this.$api.requested(this.param)
       this.listFollow = res.data
@@ -205,20 +219,64 @@ export default {
     selectQuickAdd(begindate,enddate,select){
       this.begindate = begindate
       this.enddate = enddate
-      this.select = select
+      this.selectAdd = select
       this.queryAdd(this.param.content.pageNumber = 1)
     },
     selectQuickUpd(begindate,enddate,select){
       this.begindate = begindate
       this.enddate = enddate
-      this.select = select
+      this.selectUpd = select
       this.queryUpdate(this.param.content.pageNumber = 1)
     },
     selectQuickFow(begindate,enddate,select){
       this.begindate = begindate
       this.enddate = enddate
-      this.select = select
+      this.selectFow = select
       this.queryFollow(this.param.content.pageNumber = 1)
+    },
+    onFull(type){
+      if (type == '新增'){
+        this.param.content.dataType = 7
+        this.param.content.pageNumber = 1
+        this.param.content.pageSize = 100
+        this.queryAdd()
+        this.isFull = true
+      }else if (type == '更新'){
+        this.param.content.dataType = 8
+        this.param.content.pageNumber = 1
+        this.param.content.pageSize = 100
+        this.queryUpdate()
+        this.isFull = true
+      }else if (type == '跟进'){
+        this.param.content.dataType = 9
+        this.param.content.pageNumber = 1
+        this.param.content.pageSize = 100
+        this.queryFollow()
+        this.isFull = true
+      }
+    },
+    backFull(type){
+      if (type == '新增'){
+        this.param.content.dataType = 7
+        this.param.content.pageNumber = 1
+        this.param.content.pageSize = 10
+        this.queryAdd()
+        this.disabled = false
+        this.isFull = false
+      }else if (type == '更新'){
+        this.param.content.dataType = 8
+        this.param.content.pageNumber = 1
+        this.param.content.pageSize = 10
+        this.queryUpdate()
+        this.isFull = false
+      }else if (type == '跟进'){
+        this.param.content.dataType = 9
+        this.param.content.pageNumber = 1
+        this.param.content.pageSize = 10
+        this.queryFollow()
+        this.disabled = false
+        this.isFull = false
+      }
     }
   },
   created() {

src/HDrpManagement/projectData/index.vue

@@ -55,11 +55,11 @@
               <div style="margin-bottom:20px">项目数据概况</div>
               <div class="data-all-wrapper">
                 <div class="data-left">
-                  <div class="data-item" @click="onClick('项目总数')">
+                  <div class="data-item div-hover-click" @click="onClick('项目总数')">
                     <p>{{ tool.formatAmount(dataAll.totalqty) }}</p>
                     <p>项目总数</p>
                   </div>
-                  <div class="data-item" @click="onClick('报备项目数')">
+                  <div class="data-item div-hover-click" @click="onClick('报备项目数')">
                     <p>{{ tool.formatAmount(dataAll.reportProject)}}</p>
                     <p >
                       报备项目数
@@ -68,7 +68,7 @@
                       </el-tooltip>
                     </p>
                   </div>
-                  <div class="data-item" @click="onClick('进行中项目数')">
+                  <div class="data-item div-hover-click" @click="onClick('进行中项目数')">
                     <p>{{ dataAll.startproject?tool.formatAmount(dataAll.startproject):0 }}</p>
                     <p>
                       进行中项目数
@@ -77,7 +77,7 @@
                       </el-tooltip>
                     </p>
                   </div>
-                  <div class="data-item" @click="onClick('项目成交数')">
+                  <div class="data-item div-hover-click" @click="onClick('项目成交数')">
                     <p>{{ tool.formatAmount(dataAll.dealProject) }}</p>
                     <p>
                       项目成交数
@@ -95,7 +95,7 @@
                       </el-tooltip>
                     </p>
                   </div>
-                  <div class="data-item" @click="onClick('项目失败数')">
+                  <div class="data-item div-hover-click" @click="onClick('项目失败数')">
                     <p>{{ dataAll.failedproject?tool.formatAmount(dataAll.failedproject):0 }}</p>
                     <p>
                       项目失败数
@@ -113,7 +113,7 @@
                       </el-tooltip>
                     </p>
                   </div>
-                  <div class="data-item" @click="onClick('参与项目数')">
+                  <div class="data-item div-hover-click" @click="onClick('参与项目数')">
                     <p>{{ dataAll.joinProject }}</p>
                     <p>
                       参与项目数
@@ -122,7 +122,7 @@
                       </el-tooltip>
                     </p>
                   </div>
-                  <div class="data-item" @click="onClick('参与项目成交数')">
+                  <div class="data-item div-hover-click" @click="onClick('参与项目成交数')">
                     <p>{{ dataAll.joinDealProject }}</p>
                     <p>
                       参与项目成交数
@@ -142,7 +142,7 @@
                   </div>
                 </div>
                 <div class="data-right">
-                  <div class="data-item" v-for="item in dataAll.projecttype" :key="item.rowindex" @click="onClick(item.value)">
+                  <div class="data-item div-hover-click" v-for="item in dataAll.projecttype" :key="item.rowindex" @click="onClick(item.value)">
                     <p>{{ tool.formatAmount(item.qty) }}</p>
                     <p>
                       {{ item.value }}
@@ -3851,7 +3851,7 @@ export default {
   font-size: 26px;
   font-weight: 5px;
   font-family: 'ArialMT', 'Arial', sans-serif;
-  color: rgba(0, 0, 0, 0.85);
+  /*color: rgba(0, 0, 0, 0.85);*/
 }
 .data-all .data-item p:nth-child(2) {
   font-size: 14px;
@@ -3965,4 +3965,7 @@ export default {
 .panel-table {
   height: 100%;
 }
+.div-hover-click:hover {
+  color: #3874f6;
+}
 </style>

src/views/clueData/modules/digitalSigns.vue

@@ -3,7 +3,7 @@
     <div class="div-box-new">
       <div style="font-size: 16px;color: #333333;margin-bottom: 20px">线索数据概况</div>
       <div class="div-border-new">
-        <div class="item" @click="onClick('线索总数')">
+        <div class="item div-click" @click="onClick('线索总数')">
           <p class="title">{{list.total}}</p>
           <span class="content-font-new">线索总数</span>
           <el-tooltip placement="top">
@@ -11,7 +11,7 @@
             <img style="vertical-align: middle" width="14px" height="14px" src="../../../assets/icons/prompt_icon.svg" >
           </el-tooltip>
         </div>
-        <div class="item" @click="onClick('待分配未过期线索数')">
+        <div class="item div-click" @click="onClick('待分配未过期线索数')">
           <p class="title">{{ list.dfp }}</p>
           <span class="content-font-new">待分配未过期线索数</span>
           <el-tooltip placement="top">
@@ -19,7 +19,7 @@
             <img style="vertical-align: middle" width="14px" height="14px" src="../../../assets/icons/prompt_icon.svg" >
           </el-tooltip>
         </div>
-        <div class="item" @click="onClick('待跟进线索数')">
+        <div class="item div-click" @click="onClick('待跟进线索数')">
           <p class="title">{{ list.dgj }}</p>
           <span class="content-font-new">待跟进线索数</span>
           <el-tooltip placement="top">
@@ -27,7 +27,7 @@
             <img style="vertical-align: middle" width="14px" height="14px" src="../../../assets/icons/prompt_icon.svg" >
           </el-tooltip>
         </div>
-        <div class="item" @click="onClick('跟进中线索数')">
+        <div class="item div-click" @click="onClick('跟进中线索数')">
           <p class="title">{{ list.gjz }}</p>
           <span class="content-font-new">跟进中线索数</span>
           <el-tooltip placement="top">
@@ -35,7 +35,7 @@
             <img style="vertical-align: middle" width="14px" height="14px" src="../../../assets/icons/prompt_icon.svg" >
           </el-tooltip>
         </div>
-        <div class="item" @click="onClick('已转化线索数')">
+        <div class="item div-click" @click="onClick('已转化线索数')">
           <p class="title">{{ list.yzh }}</p>
           <span class="content-font-new">已转化线索数</span>
           <el-tooltip placement="top">
@@ -44,7 +44,7 @@
             <img style="vertical-align: middle" width="14px" height="14px" src="../../../assets/icons/prompt_icon.svg" >
           </el-tooltip>
         </div>
-        <div class="item" @click="onClick('已无效线索数')">
+        <div class="item div-click" @click="onClick('已无效线索数')">
           <p class="title">{{ list.ywx }}</p>
           <span class="content-font-new">已无效线索数</span>
           <el-tooltip placement="top">
@@ -52,7 +52,7 @@
             <img style="vertical-align: middle" width="14px" height="14px" src="../../../assets/icons/prompt_icon.svg" >
           </el-tooltip>
         </div>
-        <div class="item" @click="onClick('待分配已过期线索数')">
+        <div class="item div-click" @click="onClick('待分配已过期线索数')">
           <p class="title">{{ list.ygq }}</p>
           <span class="content-font-new">待分配已过期线索数</span>
           <el-tooltip placement="top">
@@ -68,7 +68,7 @@
             <img style="vertical-align: middle" width="14px" height="14px" src="../../../assets/icons/prompt_icon.svg" >
           </el-tooltip>
         </div>
-        <div class="item" @click="onClick('转化客户线索数')">
+        <div class="item div-click" @click="onClick('转化客户线索数')">
           <p class="title">{{ list.covercusomers }}</p>
           <span class="content-font-new">转化客户线索数</span>
           <el-tooltip placement="top">
@@ -76,7 +76,7 @@
             <img style="vertical-align: middle" width="14px" height="14px" src="../../../assets/icons/prompt_icon.svg" >
           </el-tooltip>
         </div>
-        <div class="item" @click="onClick('转化项目线索数')">
+        <div class="item div-click" @click="onClick('转化项目线索数')">
           <p class="title">{{ list.coverproject }}</p>
           <span class="content-font-new">转化项目线索数</span>
           <el-tooltip placement="top">
@@ -92,7 +92,7 @@
             <img style="vertical-align: middle" width="14px" height="14px" src="../../../assets/icons/prompt_icon.svg" >
           </el-tooltip>
         </div>
-        <div class="item" @click="onClick('线索成交数')">
+        <div class="item div-click" @click="onClick('线索成交数')">
           <p class="title">{{ list.dealqty }}</p>
           <span class="content-font-new">线索成交数</span>
           <el-tooltip placement="top">
@@ -108,7 +108,7 @@
             <img style="vertical-align: middle" width="14px" height="14px" src="../../../assets/icons/prompt_icon.svg" >
           </el-tooltip>
         </div>
-        <div class="item" @click="onClick('参与线索数')">
+        <div class="item div-click" @click="onClick('参与线索数')">
           <p class="title">{{ list.joinordercluesize }}</p>
           <span class="content-font-new">参与线索数</span>
           <el-tooltip placement="top">
@@ -116,7 +116,7 @@
             <img style="vertical-align: middle" width="14px" height="14px" src="../../../assets/icons/prompt_icon.svg" >
           </el-tooltip>
         </div>
-        <div class="item" @click="onClick('参与线索转化数')">
+        <div class="item div-click" @click="onClick('参与线索转化数')">
           <p class="title">{{ list.joincoverorderclue }}</p>
           <span class="content-font-new">参与线索转化数</span>
           <el-tooltip placement="top">
@@ -132,7 +132,7 @@
             <img style="vertical-align: middle" width="14px" height="14px" src="../../../assets/icons/prompt_icon.svg" >
           </el-tooltip>
         </div>
-        <div class="item" @click="onClick('参与线索成交数')">
+        <div class="item div-click" @click="onClick('参与线索成交数')">
           <p class="title">{{ list.joindealorderclue }}</p>
           <span class="content-font-new">参与线索成交数</span>
           <el-tooltip placement="top">
@@ -305,4 +305,7 @@ export default {
     margin-right: 10px;
     color: #000000A6;
   }
+  .div-click:hover{
+    color: #3874f6 !important;
+  }
 </style>

src/views/salesData/components/fullScreen.vue

@@ -18,7 +18,6 @@ export default {
   methods:{
     /*全屏*/
     enterFullscreen(){
-
       this.scrollSave = this.scrollHeight
       /* 获取(<html>)元素以全屏显示页面 */
       const full = document.getElementById(this.domId)
@@ -52,6 +51,7 @@ export default {
     handleFullscreenChange () {
       if (document.fullscreenElement || document.mozFullScreenElement || document.webkitFullscreenElement || document.msFullscreenElement) {
         // 全屏模式激活
+        console.log('全屏')
         this.isFull = false
         this.$emit('onFull')
       } else {