浏览代码

再次提交

Lijy 3 年之前
父节点
当前提交
4834590d0a

+ 2 - 2
fhKeeper/formulahousekeeper/timesheet/src/views/project/cost.vue

@@ -97,7 +97,7 @@
                 containerHeight: 0,    
                 myChart: null,
                 params: null,
-                widthHtval: 1800,
+                widthHtval: document.body.clientWidth - 230,
                 users: [],
                 jichu: [],
                 namess: ''
@@ -429,7 +429,7 @@
                                     // this.widthHtval = +this.widthHtval + 2
                                     this.widthHtval = +this.widthHtval + 40
                                 } else {
-                                    this.widthHtval = 1800
+                                    this.widthHtval = document.body.clientWidth - 230
                                 }
                             }
                             

+ 7 - 1
fhKeeper/formulahousekeeper/timesheet/src/views/workReport/daily.vue

@@ -833,7 +833,9 @@
                 this.jsTime = quanbu
             },
             removeTimeItem(item, index) {
+                // console.log(1234)
                 item.worktimeList.splice(index, 1);
+                this.iptChangs()
             },
             //添加工时
             addNewWorktime(index, item) {
@@ -2076,8 +2078,12 @@
                         this.showAddMore = true;
                     }
                 }
-                this.seleChn(0)
                 
+                if(this.user.timeType.multiWorktime == 1) {
+                    this.iptChangs()
+                } else {
+                    this.seleChn(0)
+                }
             },
 
             // 改变月份

+ 1 - 1
fhKeeper/formulahousekeeper/timesheet_h5/vue.config.js

@@ -4,7 +4,7 @@ const path = require('path');
 const themePath = path.resolve(__dirname,'src/assets/style/theme.less');
 
 // var ip = '127.0.0.1'
-var ip = '47.100.37.243'
+var ip = '192.168.2.34'
 // var os = require('os'), ip = '', ifaces = os.networkInterfaces() // 获取本机ip
 // for (var i in ifaces) {
 //     for (var j in ifaces[i]) {