销售目标页面调整

src/HDrpManagement/dataanalysis/index.vue

@@ -13,6 +13,15 @@
             ></el-option>
           </el-select>
         </div>
+        <div class="content">
+          作业数据
+        </div>
+        <div class="content">
+          销售数据
+        </div>
+        <div class="content">
+          业绩数据
+        </div>
       </div>
 
     </template>

src/HDrpManagement/orderManage/details/index.vue

@@ -16,8 +16,8 @@
         @onEditSuccess="queryMainData($route.query.id)">
         <div slot="customOperation"  v-if="Object.keys(mainData).length > 0">
           <!-- <Edit class="inline-16" v-if="tool.checkAuth($route.name,'update') && (mainData.status == '新建')" :data="mainData" @onSuccess="queryMainData();$refs.prod && $refs.prod.listData()" /> -->
-          <Edit style="display: inline-block !important;"   v-if="mainData.status === '新建' || mainData.status === '关闭'" :data="mainData" @onSuccess="queryMainData();$refs.prod && $refs.prod.listData()" />
-          <Edit class="inline-16" v-if="mainData.status !== '新建' && mainData.status !== '关闭'" :data="mainData" @onSuccess="queryMainData();$refs.prod && $refs.prod.listData()" />
+          <Edit style="display: inline-block !important;"   v-if="mainData.status === '新建'" :data="mainData" @onSuccess="queryMainData();$refs.prod && $refs.prod.listData()" />
+<!--          <Edit class="inline-16" v-if="mainData.status !== '新建' && mainData.status !== '关闭'" :data="mainData" @onSuccess="queryMainData();$refs.prod && $refs.prod.listData()" />-->
           <EditRemark style="margin-right: 20px !important;"  :data="mainData" @onSuccess="queryMainData"></EditRemark>
           <changeSaler class="inline-16" style="margin-left: -10px" ref="saler" @selectRow="salerChange">
             <el-button v-if="tool.checkAuth($route.name,'changeSaler')" type="primary" slot="input" size="mini" @click="$refs.saler.visible=true;$refs.saler.listData()">变更业务员</el-button>
@@ -86,7 +86,7 @@
               </div>
             </div>
           </div>
-          
+
         </template>
       <div slot="slot1">
         <default-info :mainData="mainData"></default-info>
@@ -227,7 +227,7 @@ export default {
         this.orderreviewtype()
         re()
       })
-      
+
     },
     changeDataStructure() {
       let that = this
@@ -428,7 +428,7 @@ export default {
         this.$message({
           type: 'info',
           message: '已取消'
-        });          
+        });
       });
     },
     // 反审核订单
@@ -451,7 +451,7 @@ export default {
         this.$message({
           type: 'info',
           message: '已取消'
-        });          
+        });
       });
     },
     async onRebanck () {
@@ -587,4 +587,4 @@ export default {
 .account__panel small,.reveive__panel small{
   color:#888
 }
-</style>
+</style>

src/HDrpManagement/orderManage/modules/edit.vue

@@ -95,10 +95,10 @@
                   width="120px">
                   <template slot-scope="scope">
                     <el-button class="inline-16" type="text" @click="(defaultData.fin_info = scope.row,visible2 = false)" size="mini">选 择</el-button>
-                    <delete-btn 
+                    <delete-btn
                       message="确定删除当前信息吗?"
-                      nameId="20221013160502" 
-                      nameKey="sys_enterprise_financeids" 
+                      nameId="20221013160502"
+                      nameKey="sys_enterprise_financeids"
                       :id="scope.row.sys_enterprise_financeid"
                       @deleteSuccess="thisDetail().queryMainData().then(() => {setDefaultData()})"
                     ></delete-btn>
@@ -127,10 +127,10 @@
                 trigger="click"
                 v-model="visible4">
                 <div class="flex-align-center" style="justify-content:space-between;margin-bottom:10px">
-                  <el-input 
-                    size="small"  
-                    v-model="enterpriseParam.content.where.condition" 
-                    placeholder="请输入搜索内容" 
+                  <el-input
+                    size="small"
+                    v-model="enterpriseParam.content.where.condition"
+                    placeholder="请输入搜索内容"
                     style="width:150px"
                     @keyup.enter.native="getEnterpriseList(enterpriseParam.content.pageNumber = 1)" @clear="getEnterpriseList(enterpriseParam.content.pageNumber = 1)" clearable></el-input>&nbsp;
                 </div>
@@ -155,10 +155,10 @@
                     width="120">
                     <template slot-scope="scope">
                       <el-button class="inline-16" type="text" @click="(selectEnterpriseInfo = scope.row,receiveAddress(),defaultData.re_info={},visible4=false)" size="mini">选 择</el-button>
-                      <!-- <delete-btn 
+                      <!-- <delete-btn
                         message="确定删除当前地址吗?"
-                        nameId="20221009155903" 
-                        nameKey="contactsid" 
+                        nameId="20221009155903"
+                        nameKey="contactsid"
                         :id="scope.row.contactsid"
                         :isNumber="true"
                         @deleteSuccess="receiveAddress"
@@ -188,10 +188,10 @@
                 trigger="click"
                 v-model="visible">
                 <div class="flex-align-center" style="justify-content:space-between;margin-bottom:10px">
-                  <el-input 
-                    size="small"  
-                    v-model="addressparam.content.where.condition" 
-                    placeholder="请输入搜索内容" 
+                  <el-input
+                    size="small"
+                    v-model="addressparam.content.where.condition"
+                    placeholder="请输入搜索内容"
                     style="width:150px"
                     @keyup.enter.native="receiveAddress(addressparam.content.pageNumber = 1)" @clear="receiveAddress(addressparam.content.pageNumber = 1)" clearable></el-input>&nbsp;
                   <addAddressInfo style="text-align:right" @onAddSuccess="receiveAddress()" :mainData="{sys_enterpriseid:data.sys_enterpriseid}"/>
@@ -222,9 +222,9 @@
                     width="120">
                     <template slot-scope="scope">
                       <el-button class="inline-16" type="text" @click="(defaultData.re_info = scope.row,visible = false)" size="mini">选 择</el-button>
-                      <delete-btn 
+                      <delete-btn
                         message="确定删除当前地址吗?"
-                        nameId="20221009155903" 
+                        nameId="20221009155903"
                         nameKey="contactsids"
                         :id="scope.row.contactsid"
                         :isNumber="false"
@@ -250,7 +250,7 @@
             <small>{{defaultData.re_info.province?defaultData.re_info.province:'--'}}{{defaultData.re_info.city}}{{defaultData.re_info.county}}{{defaultData.re_info.address?defaultData.re_info.address:''}}</small>
           </div>
         </div>
-        
+
       </div>
       <div class="normal-margin flex-align-center">
         <div class="inline-16">
@@ -521,7 +521,7 @@ export default {
       this.billdate = this.data.billdate
       this.selectEnterpriseInfo = this.data.contactsEnterprise
     },
-   
+
     async onSubmit() {
       const res = await this.$api.requested({
         "id": 20221108111402,
@@ -557,7 +557,7 @@ export default {
         /*if (this.data.type === '标准订单' ||  this.data.type === '特殊订单') {
           this.isusedrebate === 1?this.useRebate(this.data.rebateamount):""
         }*/
-        
+
         this.drawer = false
       })
     },
@@ -671,4 +671,4 @@ export default {
   /* border-bottom: 1px solid #f1f2f3; */
   flex:1
 }
-</style>
+</style>

src/HManagement/personalTarget/personalTargetStatistics/index.vue

@@ -642,24 +642,31 @@ export default {
       } else if (document.msExitFullscreen) {
         document.msExitFullscreen();
       }
+    },
+    handleFullscreenChange () {
+      if (document.fullscreenElement || document.mozFullScreenElement || document.webkitFullscreenElement || document.msFullscreenElement) {
+        // 全屏模式激活
+        console.log('全屏模式已激活');
+        this.onBack = true
+        this.height = 'calc(100vh - 100px)'
+        this.style.padding = '10px'
+      } else {
+        // 全屏模式退出
+        this.onBack = false
+        this.height = 'calc(100vh - 330px)'
+        this.style.padding = '0px'
+        console.log('全屏模式已退出');
+      }
     }
   },
   mounted () {
     this.queryData()
     const siteid = JSON.parse(sessionStorage.getItem('active_account')).siteid
     this.yearList(siteid)
-    let that = this
-    window.addEventListener('resize', function () {
-      if (that.onBack){
-        that.onBack = false
-        that.height = 'calc(100vh - 330px)'
-        that.style.padding = '0px'
-      }else {
-        that.onBack = true
-        that.height = 'calc(100vh - 100px)'
-        that.style.padding = '10px'
-      }
-    });
+    document.addEventListener('fullscreenchange', this.handleFullscreenChange);
+    document.addEventListener('mozfullscreenchange', this.handleFullscreenChange);
+    document.addEventListener('webkitfullscreenchange', this.handleFullscreenChange);
+    document.addEventListener('MSFullscreenChange',this.handleFullscreenChange)
   }
 }
 

src/HManagement/personalTarget/target/modules/edit/components/table.vue

@@ -447,6 +447,21 @@ export default {
       } else if (document.msExitFullscreen) {
         document.msExitFullscreen();
       }
+    },
+    handleFullscreenChange () {
+      if (document.fullscreenElement || document.mozFullScreenElement || document.webkitFullscreenElement || document.msFullscreenElement) {
+        // 全屏模式激活
+        console.log('全屏模式已激活');
+        this.onBack = true
+        this.height = 'calc(100vh - 100px)'
+        this.style.padding = '10px'
+      } else {
+        // 全屏模式退出
+        this.onBack = false
+        this.height = 'calc(100vh - 330px)'
+        this.style.padding = '0px'
+        console.log('全屏模式已退出');
+      }
     }
     /*yearData(data){
       console.log(data)
@@ -467,6 +482,10 @@ export default {
         that.style.padding = '10px'
       }
     });
+    document.addEventListener('fullscreenchange', this.handleFullscreenChange);
+    document.addEventListener('mozfullscreenchange', this.handleFullscreenChange);
+    document.addEventListener('webkitfullscreenchange', this.handleFullscreenChange);
+    document.addEventListener('MSFullscreenChange',this.handleFullscreenChange)
   }
 }
 

src/HManagement/projectTarget/projectTargetStatistics/index.vue

@@ -2,7 +2,7 @@
 <div>
   <normalLayout @onRefresh="inputChange">
     <div slot="titleRight">
-      <el-button size="small" type="primary" plain @click="exportData" v-if="tool.checkAuth($route.name,'export')">导222出</el-button>
+      <el-button size="small" type="primary" plain @click="exportData" v-if="tool.checkAuth($route.name,'export')">导出</el-button>
     </div>
     <div slot="refresh">
       <img style="width: 16px; height: 16px;" @click="enterFullscreen" src="@/assets/icons/amplify.svg" title="全屏">
@@ -651,24 +651,31 @@ export default {
       } else if (document.msExitFullscreen) {
         document.msExitFullscreen();
       }
+    },
+    handleFullscreenChange () {
+      if (document.fullscreenElement || document.mozFullScreenElement || document.webkitFullscreenElement || document.msFullscreenElement) {
+        // 全屏模式激活
+        console.log('全屏模式已激活');
+        this.onBack = true
+        this.height = 'calc(100vh - 100px)'
+        this.style.padding = '10px'
+      } else {
+        // 全屏模式退出
+        this.onBack = false
+        this.height = 'calc(100vh - 330px)'
+        this.style.padding = '0px'
+        console.log('全屏模式已退出');
+      }
     }
   },
   mounted () {
     this.queryData()
     const siteid = JSON.parse(sessionStorage.getItem('active_account')).siteid
     this.yearList(siteid)
-    let that = this
-    window.addEventListener('resize', function () {
-      if (that.onBack){
-        that.onBack = false
-        that.height = 'calc(100vh - 330px)'
-        that.style.padding = '0px'
-      }else {
-        that.onBack = true
-        that.height = 'calc(100vh - 100px)'
-        that.style.padding = '10px'
-      }
-    });
+    document.addEventListener('fullscreenchange', this.handleFullscreenChange);
+    document.addEventListener('mozfullscreenchange', this.handleFullscreenChange);
+    document.addEventListener('webkitfullscreenchange', this.handleFullscreenChange);
+    document.addEventListener('MSFullscreenChange',this.handleFullscreenChange)
   }
 }
 

src/HManagement/projectTarget/target/modules/edit/components/table.vue

@@ -476,11 +476,26 @@ export default {
       } else if (document.msExitFullscreen) {
         document.msExitFullscreen();
       }
+    },
+    handleFullscreenChange () {
+      if (document.fullscreenElement || document.mozFullScreenElement || document.webkitFullscreenElement || document.msFullscreenElement) {
+        // 全屏模式激活
+        console.log('全屏模式已激活');
+        this.onBack = true
+        this.height = 'calc(100vh - 100px)'
+        this.style.padding = '10px'
+      } else {
+        // 全屏模式退出
+        this.onBack = false
+        this.height = 'calc(100vh - 330px)'
+        this.style.padding = '0px'
+        console.log('全屏模式已退出');
+      }
     }
   },
   mounted () {
     let that = this
-    window.addEventListener('resize', function () {
+   /* window.addEventListener('resize', function () {
       if (that.onBack){
         that.onBack = false
         that.height = 'calc(100vh - 330px)'
@@ -490,7 +505,11 @@ export default {
         that.height = 'calc(100vh - 100px)'
         that.style.padding = '10px'
       }
-    });
+    });*/
+    document.addEventListener('fullscreenchange', this.handleFullscreenChange);
+    document.addEventListener('mozfullscreenchange', this.handleFullscreenChange);
+    document.addEventListener('webkitfullscreenchange', this.handleFullscreenChange);
+    document.addEventListener('MSFullscreenChange',this.handleFullscreenChange)
   }
 }
 

src/SManagement/personal_target/index.vue

@@ -149,8 +149,8 @@ export default {
     /*全屏*/
     enterFullscreen(){
       /* 获取(<html>)元素以全屏显示页面 */
-     /* this.height = 'calc(100vh - 100px)'*/
-     /* this.onBack = true*/
+      this.height = 'calc(100vh - 100px)'
+      /*this.onBack = true*/
       const full = document.getElementById('fulltable')
       if (full.RequestFullScreen) {
         full.RequestFullScreen()
@@ -176,24 +176,34 @@ export default {
       } else if (document.msExitFullscreen) {
         document.msExitFullscreen();
       }
+    },
+    handleFullscreenChange () {
+      if (document.fullscreenElement || document.mozFullScreenElement || document.webkitFullscreenElement || document.msFullscreenElement) {
+        // 全屏模式激活
+        console.log('全屏模式已激活');
+        this.onBack = true
+        this.height = 'calc(100vh - 100px)'
+        this.style.padding = '10px'
+      } else {
+        // 全屏模式退出
+        this.onBack = false
+        this.height = 'calc(100vh - 330px)'
+        this.style.padding = '0px'
+        console.log('全屏模式已退出');
+      }
     }
   },
   mounted() {
     const siteid = JSON.parse(sessionStorage.getItem('active_account')).siteid
     this.yearList(siteid)
-    let that = this
-    window.addEventListener('resize', function () {
-      if (that.onBack){
-        that.onBack = false
-        that.height = 'calc(100vh - 330px)'
-        that.style.padding = '0px'
-      }else {
-        that.onBack = true
-        that.height = 'calc(100vh - 100px)'
-        that.style.padding = '10px'
-      }
-    });
+    document.addEventListener('fullscreenchange', this.handleFullscreenChange);
+    document.addEventListener('mozfullscreenchange', this.handleFullscreenChange);
+    document.addEventListener('webkitfullscreenchange', this.handleFullscreenChange);
+    document.addEventListener('MSFullscreenChange',this.handleFullscreenChange)
   },
+  created() {
+
+  }
 
 };
 </script>

src/SManagement/project_target/index.vue

@@ -136,21 +136,30 @@ export default {
       } else if (document.msExitFullscreen) {
         document.msExitFullscreen();
       }
+    },
+    handleFullscreenChange () {
+      if (document.fullscreenElement || document.mozFullScreenElement || document.webkitFullscreenElement || document.msFullscreenElement) {
+        // 全屏模式激活
+        console.log('全屏模式已激活');
+        this.onBack = true
+        this.$refs.table.onSelect = false
+        this.height = 'calc(100vh - 100px)'
+        this.style.padding = '10px'
+      } else {
+        // 全屏模式退出
+        this.onBack = false
+        this.$refs.table.onSelect = true
+        this.height = 'calc(100vh - 330px)'
+        this.style.padding = '0px'
+        console.log('全屏模式已退出');
+      }
     }
   },
   mounted() {
-    let that = this
-    window.addEventListener('resize', function () {
-      if (that.onBack){
-        that.onBack = false
-        that.height = 'calc(100vh - 350px)'
-        that.$refs.table.onSelect = true
-      }else {
-        that.onBack = true
-        that.height = 'calc(100vh - 100px)'
-        that.$refs.table.onSelect = false
-      }
-    });
+    document.addEventListener('fullscreenchange', this.handleFullscreenChange);
+    document.addEventListener('mozfullscreenchange', this.handleFullscreenChange);
+    document.addEventListener('webkitfullscreenchange', this.handleFullscreenChange);
+    document.addEventListener('MSFullscreenChange',this.handleFullscreenChange)
   }
 };
 </script>

src/components/newLayout/index.vue

@@ -56,7 +56,7 @@ export default {
         clearTimeout(this.timer)
       }
       this.timer = setTimeout(() => {
-        if (this.$refs.menu.$el.clientWidth < 1210 && Array.from(this.$refs.menu.$el.getElementsByTagName('li')).filter(item => item.className.indexOf('el-submenu') != -1).length > 8) {
+        if (this.$refs.menu.$el.clientWidth < 1322 && Array.from(this.$refs.menu.$el.getElementsByTagName('li')).filter(item => item.className.indexOf('el-submenu') != -1).length > 8) {
           this.marginTrue = true
         } else {
           this.marginTrue = false
@@ -68,7 +68,7 @@ export default {
     window.addEventListener('resize',this.debouned)
 
     this.$nextTick(() => {
-      if (this.$refs.menu.$el.clientWidth < 1210) {
+      if (this.$refs.menu.$el.clientWidth < 1322) {
         this.marginTrue = true
       } else {
         this.marginTrue = false
@@ -111,4 +111,4 @@ export default {
   background: #fff;
 }
 
-</style>
+</style>