Bladeren bron

Merge branch 'master' of http://47.100.37.243:10080/wutt/manHourHousekeeper into master

seyason 3 jaren geleden
bovenliggende
commit
3984c8b396

+ 1 - 1
fhKeeper/formulahousekeeper/timesheet/src/views/Home.vue

@@ -568,7 +568,7 @@
             .content-container {
                 flex: 1;
                 width: 80%;
-                overflow-y: auto;
+                // overflow-y: auto;
                 .breadcrumb-container {
                     .title {
                         width: 200px;

+ 19 - 19
fhKeeper/formulahousekeeper/timesheet/src/views/awayOffice/awayOffice.vue

@@ -630,7 +630,7 @@ export default {
     },
     created(){
         this.cityList = citys
-        console.log("city",this.cityList);
+        // console.log("city",this.cityList);
         let height = window.innerHeight;
         this.tableHeight = height - 195;
         const that = this;
@@ -642,11 +642,11 @@ export default {
         this.getTableList()
         this.getProjectList()
         this.getDepartment()
-        console.log("session",this.wuduData);
+        // console.log("session",this.wuduData);
     },
     methods: {
         staffs(key, keyPath) {
-            console.log("keypath",keyPath)
+            // console.log("keypath",keyPath)
             if (keyPath[0] == '1') {
                 this.displayTable = false;
                 this.apk = 0
@@ -732,7 +732,7 @@ export default {
             this.bills()
         },
         handleCurrentChange(val) {
-            console.log(val, 1, '1')
+            // console.log(val, 1, '1')
             this.page =  val;
             this.bills()
         },
@@ -742,7 +742,7 @@ export default {
             this.$refs.addformAO.validate(val => {
                 if(val){
                     this.formloading = true
-                    console.log("addform",this.addform);
+                    // console.log("addform",this.addform);
                     this.http.post( '/business-trip/add', this.addform,
                     res => {
                         if (res.code == "ok") {
@@ -801,7 +801,7 @@ export default {
                 }
         },
         datechg2(e){
-            console.log(this.editItemForm.startDate,this.editItemForm.endDate);
+            // console.log(this.editItemForm.startDate,this.editItemForm.endDate);
                 if(this.editItemForm.endDate != null && this.editItemForm.startDate != null){
                     let days = this.autoCountDay(this.editItemForm.startDate,this.editItemForm.endDate)
                     if(days > 0){
@@ -839,7 +839,7 @@ export default {
             res => {
                 if (res.code == "ok") {
                     this.tableList = res.data.records
-                    console.log("getlist",res.data);
+                    // console.log("getlist",res.data);
                 } else {
                     this.$message({
                         message: res.msg,
@@ -917,11 +917,11 @@ export default {
         },
         // 操作 - 编辑
         editor(e) {
-            console.log("编辑",e);
+            // console.log("编辑",e);
             this.editDialog = true
             if(e.degreeId != null){
                 e.degreeId = e.degreeId + ''
-                console.log("e.degreeId",e.degreeId);
+                // console.log("e.degreeId",e.degreeId);
             }
             this.editItemForm = e
             this.getwuduList(0)
@@ -963,7 +963,7 @@ export default {
 
     // 出差统计
         statistical() {
-            console.log("date",this.searchDates);
+            // console.log("date",this.searchDates);
             this.loading = true
             this.http.post('/business-trip/summaryData', {
                 keyword: this.searchWord,
@@ -972,7 +972,7 @@ export default {
             },
             res => {
                 if (res.code == "ok") {
-                    console.log("出差统计",res.data);
+                    // console.log("出差统计",res.data);
                     this.statisticalList = res.data
                     this.loading = false
                 } else {
@@ -1002,7 +1002,7 @@ export default {
         },
         // 出差统计列表查看详情
         viewDetails(s,e){
-            console.log("e",e);
+            // console.log("e",e);
             if(s){
                 this.detailsuserid = e.ownerId
             }
@@ -1025,7 +1025,7 @@ export default {
                     // this.$forceUpdate()
                     this.detailsData = res.data.records
                     this.seeDialog = true
-                    console.log('see',res.data);
+                    // console.log('see',res.data);
                     this.$forceUpdate()
                     this.detailsloading = false
                 } else {
@@ -1049,7 +1049,7 @@ export default {
             this.viewDetails(0)
         },
         detailsCurrentChange(val) {
-            console.log(val, 1, '1')
+            // console.log(val, 1, '1')
             this.detailspage =  val;
             this.viewDetails(0)
         },
@@ -1101,7 +1101,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();
             }
         },
@@ -1111,7 +1111,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,
@@ -1215,7 +1215,7 @@ export default {
             },
             res => {
                 if (res.code == "ok") {
-                    console.log("users",res.data);
+                    // console.log("users",res.data);
                     this.users = res.data.records;
                     for (let i = 0; i < this.users.length; i++) {
                         this.susers.push({value:this.users[i].id,label:this.users[i].name})
@@ -1246,7 +1246,7 @@ export default {
                 res => {
                     if (res.code == "ok") {
                         this.projectList = res.data;
-                        console.log("项目列表",this.projectList);
+                        // console.log("项目列表",this.projectList);
                     } else {
                         this.$message({
                             message: res.msg,
@@ -1284,7 +1284,7 @@ export default {
                 },
                 res => {
                     if (res.code == "ok") {
-                        console.log("维度数据",res.data);
+                        // console.log("维度数据",res.data);
                         this.wuduList = res.data
                         this.$forceUpdate()
                     } 

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

@@ -1,5 +1,5 @@
 <template>
-    <section>
+    <section class="sectionaa">
         <el-tabs v-model="activeName" @tab-click="handleClick">
             <el-tab-pane label="主要内容" name="project" @click="null" disabled=true>
                 <template slot="label">
@@ -25,7 +25,7 @@
             </el-tab-pane>
             <el-tab-pane label="任务看板" name="projectInside">
                 <el-container style="padding: 0px;">
-                    <el-aside :style="'padding-left:10px;padding-right:5px;height:'+tableHeight+'px;width:'+groupWidth+'px;'">
+                    <el-aside :style="'overflow:auto;padding-left:10px;padding-right:5px;height:'+tableHeight+'px;width:'+groupWidth+'px;'">
                         <el-input v-model="groupSearch" size="small" placeholder="搜索分组" @input="startSearchGroup" style="margin-top:10px"/>
                         <p ><span class="heavyTxt">任务分组</span> <i class="el-icon-plus pull-right" style="color:#666;margin-right:10px;" @click="createGroup"></i></p>
                         <el-menu :default-active="defaultGroupId" ref="defaultMenu"  class="el-menu-vertical-demo" @select="groupChange" style="border-right:none;">