2022.4.25

fhKeeper/formulahousekeeper/timesheet/src/views/awayOffice/awayOffice.vue

@@ -703,7 +703,7 @@ export default {
             }
             this.DingdingForm = e
             this.getwuduList(2)
-            console.log('editor',this.DingdingForm);
+            // console.log('editor',this.DingdingForm);
         },
         DingdingDetermine(){
             let edddd = {
@@ -758,7 +758,7 @@ export default {
             } else if(keyPath[0] == '4'){
                 if(this.searchDates == null){
                     this.searchDates = this.getautoDate()
-                    console.log('000');
+                    // console.log('000');
                 }
                 this.displayTable = true;
                 this.apk = 1
@@ -1019,7 +1019,7 @@ export default {
         },
         // 操作 - 编辑
         editor(e) {
-            console.log("编辑",e);
+            // console.log("编辑",e);
             this.editDialog = true
             if(e.degreeId != null){
                 e.degreeId = e.degreeId + ''

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

@@ -750,7 +750,7 @@ export default {
           if(this.approverList.length != 0){
             this.mustApprover = 'approver'
           }
-          console.log('list',res.data);
+          // console.log('list',res.data);
         }else {
           this.$message({
             message: res.msg,
@@ -873,7 +873,7 @@ export default {
     handleNodeClick(data) {
                 if(this.depData == null || data.id != this.depData.id) {
                     this.depData = data;
-                    console.log("depdata",this.depData);
+                    // console.log("depdata",this.depData);
                     this.getSettings();
                 }
             },
@@ -884,7 +884,7 @@ export default {
                         this.listLoading = false;
                         if (res.code == "ok") {
                             this.dataArray = res.data;
-                            console.log("请求1",res.data);
+                            // console.log("请求1",res.data);
                         } else {
                             this.$message({
                                 message: res.msg,
@@ -984,7 +984,7 @@ export default {
               this.dialogVisible = false;
               if (this.curDeptId == null) return;
               var node = this.$refs.deptCascader.getCheckedNodes()[0];
-              console.log("node",node);
+              // console.log("node",node);
               
               if (this.isAdd) {
                 if(node.path[0] == 1){
@@ -1109,7 +1109,7 @@ export default {
       this.addForm.leaveType = index
     },
     staffs(key, keyPath) {
-      console.log("keypath",keyPath)
+      // console.log("keypath",keyPath)
       if (keyPath[0] == '1') {
         this.displayTable = false;
         this.apk = false
@@ -1228,7 +1228,7 @@ export default {
       return zong
     },
     submits(){
-      console.log(this.addForm)
+      // console.log(this.addForm)
       // return
         this.$refs.addForm.validate(valid => {
           this.addForm.endDate = this.buling(this.addForm.endDate)
@@ -1284,12 +1284,12 @@ export default {
     },
     txselts(a,b){
       this.selts()
-      console.log('txselts',this.addForm.ownerId);
+      // console.log('txselts',this.addForm.ownerId);
       if(a == 6 && this.addForm.ownerId != ''){
         this.http.post('/leave-sheet/getOTAvaiDays',{ userId:b },
         res => {
           if(res.code == "ok") {
-            console.log('post',res.data);
+            // console.log('post',res.data);
             if(res.data < 0.5){
               this.txselnum = 0
             }else{
@@ -1318,7 +1318,7 @@ export default {
       }
     },
     chanRadio() {
-      console.log(this.addForm.timeType)
+      // console.log(this.addForm.timeType)
         if(this.addForm.timeType == '0') {
             this.flg = true
             this.addForm.startDate = this.getCurrentTime()
@@ -1346,7 +1346,7 @@ export default {
         this.addForm.timeHours = this.addForm.timeDays * 8
     },
     datasss() {
-      console.log(123)
+      // console.log(123)
       this.addForm.endDate = this.addForm.startDate
     },
     DateDiff(sDate1,  sDate2){
@@ -1408,7 +1408,7 @@ export default {
       this.bills()
     },
     handleCurrentChange(val) {
-      console.log(val, 1, '1')
+      // console.log(val, 1, '1')
       this.page =  val;
       this.bills()
     },
@@ -1456,7 +1456,7 @@ export default {
       } else {
         if(this.addForm.timeHours.indexOf('.') != '-1') {
           var str = this.addForm.timeHours
-          console.log(str)
+          // console.log(str)
           if(str.indexOf('.') != '-1') {
             var s = str.split('.')[0]
             var st = str.split('.')[1]
@@ -1465,7 +1465,7 @@ export default {
           }
         }
       }
-      console.log(this.addForm)
+      // console.log(this.addForm)
     },
     deletes(e) {
       this.$confirm("确认要删除吗?", "提示", {

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

@@ -132,7 +132,7 @@
                 });
             },
             getUsers() {
-                console.log(this.port.manage.list)
+                // console.log(this.port.manage.list,'getusers')
                 this.http.post(this.port.manage.list, {
                         departmentId: -1,
                         pageIndex: 1,
@@ -387,7 +387,7 @@
                 });
             },
             yanjiu() {
-                console.log('触发')
+                // console.log('触发')
             },
             getEchart(){
                 var that = this
@@ -419,7 +419,7 @@
                 if (this.dateRange != null) {
                     param = {startDate:this.user.timeType.fixMonthcost==0?this.dateRange[0]:this.dateRange, 
                     endDate: this.user.timeType.fixMonthcost==0?this.dateRange[1]:this.dateRange};
-                    console.log(param);
+                    // console.log(param);
                 }
                 var url = '';
                 if (this.radio=='项目') {
@@ -478,7 +478,7 @@
                             list = res.data
                             var totalMoneyCost = 0;
                             for(var i in list) {
-                                console.log(list[i].name, list[i].costMoney, list[i].cost)
+                                // console.log(list[i].name, list[i].costMoney, list[i].cost)
                                 xList.push(list[i].name);
                                 yList.push({
                                     "value": this.yAxisValue==0?list[i].costMoney:list[i].cost,
@@ -586,41 +586,41 @@
                         }
                         
                         myChart.setOption(option,{notMerge: true});
-                        myChart.getZr().on('click', params => {
-                            const pointInPixel = [params.offsetX, params.offsetY];
-                            if (myChart.containPixel('grid', pointInPixel)) {
-                                console.log(_this.params)
-                                if(_this.radio=='项目') {
-                                    if (_this.dateRange != null) {
-                                        if (this.user.timeType.fixMonthcost == 0) {
-                                            _this.$router.push("/cost/" + _this.params[0].data.id + "/" + _this.params[0].name
-                                            +"?startDate="+_this.dateRange[0]+"&endDate="+_this.dateRange[1]);
-                                        } else {
-                                            _this.$router.push("/cost/" + _this.params[0].data.id + "/" + _this.params[0].name
-                                            +"?startDate="+_this.dateRange+"&endDate="+_this.dateRange);
-                                        }
-                                    } else {
-                                        _this.$router.push("/cost/" + _this.params[0].data.id + "/" + _this.params[0].name);
-                                    }
-                                } else if (_this.radio=='部门') {
-                                    if (_this.params[0].data.hasSubDept) {
-                                        if (_this.parentDeptId != _this.params[0].data.id) {
-                                            _this.parentDeptId = _this.params[0].data.id;
-                                            _this.parentDeptStack.push(_this.parentDeptId);
-                                            _this.jieliu();
-                                        }
-                                        // _this.jieliu();
-                                    } else {
-                                        if (_this.dateRange != null) {
-                                            _this.$router.push("/costDep/" + _this.params[0].data.id + "/" + _this.params[0].name
-                                                +"?startDate="+_this.dateRange[0]+"&endDate="+_this.dateRange[1]);
-                                        } else {
-                                            _this.$router.push("/costDep/" + _this.params[0].data.id + "/" + _this.params[0].name);
-                                        }
-                                    }
-                                }
-                            }
-                        });
+                        // myChart.getZr().on('click', params => {
+                        //     const pointInPixel = [params.offsetX, params.offsetY];
+                        //     if (myChart.containPixel('grid', pointInPixel)) {
+                        //         console.log('sss',_this.params)
+                        //         if(_this.radio=='项目') {
+                        //             if (_this.dateRange != null) {
+                        //                 if (this.user.timeType.fixMonthcost == 0) {
+                        //                     _this.$router.push("/cost/" + _this.params[0].data.id + "/" + _this.params[0].name
+                        //                     +"?startDate="+_this.dateRange[0]+"&endDate="+_this.dateRange[1]);
+                        //                 } else {
+                        //                     _this.$router.push("/cost/" + _this.params[0].data.id + "/" + _this.params[0].name
+                        //                     +"?startDate="+_this.dateRange+"&endDate="+_this.dateRange);
+                        //                 }
+                        //             } else {
+                        //                 _this.$router.push("/cost/" + _this.params[0].data.id + "/" + _this.params[0].name);
+                        //             }
+                        //         } else if (_this.radio=='部门') {
+                        //             if (_this.params[0].data.hasSubDept) {
+                        //                 if (_this.parentDeptId != _this.params[0].data.id) {
+                        //                     _this.parentDeptId = _this.params[0].data.id;
+                        //                     _this.parentDeptStack.push(_this.parentDeptId);
+                        //                     _this.jieliu();
+                        //                 }
+                        //                 // _this.jieliu();
+                        //             } else {
+                        //                 if (_this.dateRange != null) {
+                        //                     _this.$router.push("/costDep/" + _this.params[0].data.id + "/" + _this.params[0].name
+                        //                         +"?startDate="+_this.dateRange[0]+"&endDate="+_this.dateRange[1]);
+                        //                 } else {
+                        //                     _this.$router.push("/costDep/" + _this.params[0].data.id + "/" + _this.params[0].name);
+                        //                 }
+                        //             }
+                        //         }
+                        //     }
+                        // });
                     } else {
                         this.$message({
                             message: res.msg,