2022.5.24

fhKeeper/formulahousekeeper/timesheet/src/views/leave/list.vue

@@ -56,18 +56,18 @@
 
           <!-- 钉钉环境对接 -->
           <template v-if="isDingding">
-          <el-menu-item index="7">
-              <template slot="title">
-                <i class="iconfont firerock-iconbaoxiaodan"></i>
-                <span slot="title">请假单列表</span>
-              </template>
-          </el-menu-item>
-          <el-menu-item index="8">
-              <template slot="title">
-                <i class="iconfont firerock-iconbaoxiaodan"></i>
-                <span slot="title">假期剩余表</span>
-              </template>
-          </el-menu-item>
+            <el-menu-item index="7" v-if="permissions.leaveAll">
+                <template slot="title">
+                  <i class="iconfont firerock-iconbaoxiaodan"></i>
+                  <span slot="title">请假单列表</span>
+                </template>
+            </el-menu-item>
+            <el-menu-item index="8" v-if="permissions.leaveAll">
+                <template slot="title">
+                  <i class="iconfont firerock-iconbaoxiaodan"></i>
+                  <span slot="title">假期剩余表</span>
+                </template>
+            </el-menu-item>
           </template>
 
 
@@ -553,7 +553,7 @@
                 <el-pagination
                   @size-change="vacationSizeChange"
                   @current-change="vacationCurrentChange"
-                  :current-page="currentPage4"
+                  :current-page="page"
                   :page-sizes="[50]"
                   :page-size="50"
                   layout="total, sizes, prev, pager, next"
@@ -850,7 +850,7 @@ export default {
       this.http.post(this.port.manage.depList,{
       },res =>{
         if(res.code == 'ok'){
-          console.log('getDepartment',res.data);
+          // console.log('getDepartment',res.data);
           this.departmentOptions = this.changeArr(res.data)
         }else {
           this.$message({
@@ -866,11 +866,13 @@ export default {
       })
     },
     departmentOptionsChg(){
-      console.log(this.departmentSel);
+      // console.log(this.departmentSel);
+      this.page = 1
       this.getVacationList(1)
     },
     userChg(){
-      console.log(this.userSelId);
+      // console.log(this.userSelId);
+      this.page = 1
       this.getVacationList(1)
     },
 
@@ -929,7 +931,8 @@ export default {
       })
     },
     leaveTypeChange(){
-      console.log(this.leaveTypeItem);
+      // console.log(this.leaveTypeItem);
+      this.page = 1
       this.getVacationList(1)
     },
 
@@ -1333,10 +1336,11 @@ export default {
         this.apk2 = 8
         this.displayTable = true
         this.apk = true
-        this.getVacationList()
-        this.getDepartmentOptions()
         this.userSelId = ''
+        this.page = 1
         this.departmentSel = []
+        this.getVacationList()
+        this.getDepartmentOptions()
       }
     },
     bills(audit, tr){
@@ -1618,13 +1622,13 @@ export default {
       this.page =  val;
       this.bills()
     },
-    vacationSizeChange(){
+    vacationSizeChange(val){
       this.size = val
-      this.getVacationList()
+      this.getVacationList(1)
     },
-    vacationCurrentChange(){
+    vacationCurrentChange(val){
       this.page = val
-      this.getVacationList()
+      this.getVacationList(1)
     },
     statistical() {
       this.loading = true

fhKeeper/formulahousekeeper/timesheet/src/views/project/CostBaseline.vue

@@ -120,7 +120,7 @@
         },
         filters: {
             numberToCurrency(value) {
-                console.log('info numberToCurrency='+value);
+                // console.log('info numberToCurrency='+value);
                 if (!value || value=='-') return '0.00'
                 value = value.toFixed(2)
                 const intPart = Math.trunc(value)
@@ -153,7 +153,7 @@
                 // ]
                 // let lid = 5
                 // let item = this.itemListFilter(list,lid)
-                console.log('test',this.addListColumns);
+                // console.log('test',this.addListColumns);
             },
             baseCostFilter(eId){
                 let emItem = this.nowBaseList.filter((em)=>{
@@ -343,7 +343,7 @@
                         this.nowBaseList = res.data
                         // if(res.data.length == 0){
                             let allboxh = this.$refs.allBox.scrollHeight - 20
-                            console.log('getnowbase',allboxh);
+                            // console.log('getnowbase',allboxh);
                             this.nowBaseHeight = 'height:' + allboxh + 'px;'
                         // }
                     }else {
@@ -369,7 +369,7 @@
                         this.ListLoading = false
                         this.addList = res.data.recordList
                         this.addListColumns = res.data.columns
-                        console.log('getaddlist',res.data);
+                        // console.log('getaddlist',res.data);
                     }else {
                         this.ListLoading = false
                         this.$message({
@@ -392,7 +392,7 @@
                 res => {
                     if (res.code == "ok") {
                         this.projectContractAmount = res.data.contractAmount;
-                        console.log('res.data',res.data);
+                        // console.log('res.data',res.data);
                     } else {
                         this.$message({
                         message: res.msg,
@@ -428,7 +428,7 @@
             this.curProjectId = parseInt(this.$route.params.id);
             // var _this = this;
             // var that = this
-            console.log("mounted")
+            // console.log("mounted")
             // window.addEventListener("resize", function() {
             //     // _this.profitChart.resize();
             //     // that.profitChart.resize(); 

fhKeeper/formulahousekeeper/timesheet/src/views/project/gantt.vue

@@ -26,7 +26,7 @@ export default {
   },
   created:function(){
     // gantt.clearAll()
-    console.log("tasks",this.$props.tasks);
+    // console.log("tasks",this.$props.tasks);
   },
  
   methods: {

fhKeeper/formulahousekeeper/timesheet/src/views/project/project_gantt.vue

@@ -92,7 +92,7 @@ export default {
       // 人员/项目切换
       selChange(){
         this.valuex = null
-        console.log("切换按钮");
+        // console.log("切换按钮");
         if (this.radio1 == "按人员查看") {
           this.reqpar1 = 0
           this.getList()
@@ -166,7 +166,7 @@ export default {
             res => {
               if (res.code == "ok") {
                 this.screenList = res.data
-                console.log("screen",this.screenList);
+                // console.log("screen",this.screenList);
               }else{
                 this.$message({
                   message: res.msg,
@@ -256,7 +256,7 @@ export default {
                                 //   {text: '2-2-1 in',id: 'in3',parent: '20021',render: null,start_date:date1,end_date:date2},
                                 // ]
                                 // this.tasks.data = ttt
-                                console.log('tasks---',this.tasks.data);
+                                // console.log('tasks---',this.tasks.data);
                                 // this.tasks.data.push(item)
                                 // let item2 = {
                                 //   id:'parent2',
@@ -323,7 +323,7 @@ export default {
     let enddate = udate.getFullYear() + "-" + (endmonth < 10 ? "0" + endmonth : endmonth) + "-" + (udate.getDate() < 10 ? "0" + udate.getDate() : udate.getDate())
     this.valueDate = [startdate,enddate]
     this.reqpar2 = this.valueDate
-    console.log("date",this.valueDate);
+    // console.log("date",this.valueDate);
     this.getList();
     this.getScreen()
     // this.tasks1 = this.tasks

fhKeeper/formulahousekeeper/timesheet/src/views/team/index.vue

@@ -688,7 +688,7 @@
                     }
                 }
                 this.handljues = true
-                console.log('触发了')
+                // console.log('触发了')
             },
             handTrue() {
                 var arr = []
@@ -973,7 +973,7 @@
             },
             //选中部门
             choseDept(value) {
-                console.log(value);
+                // console.log(value);
             },
             //月成本输入变化
             oninput(e) {
@@ -1061,7 +1061,7 @@
 
             //获取所有员工的列表
             getUser() {
-                console.log(12345)
+                // console.log(12345)
                 this.listLoading = true;
                 this.http.post( this.port.manage.list, {
                     departmentId: this.depData.id,
@@ -1263,9 +1263,9 @@
                         }
                     }
                 });
-                console.log(form, '提交的数据')
+                // console.log(form, '提交的数据')
                 // return
-                console.log(ssR, trs)
+                // console.log(ssR, trs)
                 if(!ssR && trs) {
                     this.http.post( this.port.manage.insert, form,
                     res => {
@@ -1377,7 +1377,7 @@
                 for(var i in arr1) {
                     array1.push(parseInt(arr1[i]))
                 }
-                console.log(list1)
+                // console.log(list1)
                 this.insertForm = {
                     id: list1.id,
                     name: list1.name,
@@ -1462,7 +1462,7 @@
                             label: '未分配',
                         })
                         this.data = list;
-                        console.log(list, "部门数据")
+                        // console.log(list, "部门数据")
                         this.option = this.changeArr(list1);
                     } else {
                         this.$message({
@@ -1500,7 +1500,7 @@
 
             // 部门列表点击
             handleNodeClick(data) {
-                console.log(data, 999)
+                // console.log(data, 999)
                 if(this.depData == null || data.id != this.depData.id) {
                     this.depData = data;
                     this.page = 1;
@@ -1608,7 +1608,7 @@
                         if (this.depForm.managerId) {
                             form.managerId = this.depForm.managerId
                         } 
-                        console.log(this.depForm)
+                        // console.log(this.depForm)
                         if (this.depForm.reportAuditUserid) {
                             form.reportAuditUserid = this.depForm.reportAuditUserid
                         } 
@@ -1727,7 +1727,7 @@
 
             // 关键搜索
             searchList() {
-                console.log(this.keyword)
+                // console.log(this.keyword)
                 this.listLoading = true;
                 this.http.post( this.port.manage.list, {
                     departmentId: this.depData.id,
@@ -1763,7 +1763,7 @@
                 },
                 res => {
                     if (res.code == "ok") {
-                        console.log(res.data, '获取角色')
+                        // console.log(res.data, '获取角色')
                         this.acquireRoleList = res.data
                         var arr = []
                         for(var i in res.data) {