调整组织架构的专业证书

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;

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

@@ -149,7 +149,7 @@
                     {{scope.row.progress==null?"-":scope.row.progress}}%
                 </template>
             </el-table-column>
-            <el-table-column label="操作" width="320"  align="center">
+            <el-table-column label="操作" width="350" align="left">
                 <template slot-scope="scope">
                     <el-button v-if="permissions.projectManagement || user.id==scope.row.creatorId" size="mini"  @click="subProject(scope.row)">子项目</el-button>
                     <el-button size="mini" v-if="permissions.projectManagement || user.id==scope.row.inchargerId || user.id==scope.row.creatorId" type="primary" @click="handleAdd(scope.$index, scope.row)">编辑</el-button>
@@ -2114,6 +2114,9 @@ a {
 
 </style>
 <style>
+.customdropdown{
+    margin-left: 10px;
+}
 .customdropdown .el-dropdown__caret-button{
     height: 27px;
 }

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

@@ -104,7 +104,7 @@
                         </div> -->
                         <div v-if="!displayTable">
 
-                        <draggable style="overflow-x:auto;white-space:nowrap;" @update="onMoveStage"
+                        <draggable style="white-space:nowrap;" @update="onMoveStage"
                         v-model="stageList" group="stage" @start="stageDrag=true" @end="stageDrag=false;" draggable=".taskStage" >
                             <!--每个阶段的拖拽 -->
                             <!-- <transition-group > -->
@@ -2462,7 +2462,7 @@ overflow: auto;
     display: inline-block;
     background: #e62412;
     color: #fff;
-    border-radius: 5px;
+    border-radius: 3px;
     padding: 3px;
     /* text-align: center; */
     font-size: 12px;

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

@@ -72,7 +72,9 @@
                     <el-table-column label="截止时间" width="260" fixed="right">
                         <template slot-scope="scope">
                             <div style="display: flex;justify-content: space-between;padding-right: 40px">
-                            <span style="display: inline-block;margin-right: 55px">{{scope.row.endDate}}</span>
+                            <span style="display: inline-block;margin-right: 55px">
+                                <span  :class="judgedate(scope.row.endDate) ? 'redwarningspan' : ''" style="padding:1.5px">{{scope.row.endDate}}</span>
+                            </span>
                             <el-button v-if="searchField == 0" size="small" type="primary" @click="completes(scope.row.id, 0)">完成</el-button>
                             <el-button v-if="searchField == 1" size="small" type="warning" @click="completes(scope.row.id, 1)">重启</el-button>
                             </div>
@@ -492,6 +494,11 @@
     text-overflow: ellipsis;
     cursor: pointer;
 }
+.redwarningspan{
+    background: #e62412;
+    color: #fff;
+    border-radius: 3px;
+}
 /* p {
     margin: 0 !important;
 } */
@@ -727,6 +734,12 @@ import { error } from 'dingtalk-jsapi';
             };
         },
         methods: {
+            judgedate(itemD){
+                let nowdate = new Date()
+                let idate = new Date(itemD + " 23:59:59")
+                return nowdate > idate ? true : false
+            },
+
             deleteSubPro(subProject) {
                 this.$confirm("确定要删除子项目" + subProject.name + "吗?","删除子项目", {
                     confirmButtonText: "确定",

fhKeeper/formulahousekeeper/timesheet/src/views/workReport/daily.vue

@@ -1921,12 +1921,9 @@
     },
     tableListener(){
       let that = this;
-      // this.$refs.maTable.bodyWarpper 
       let dom = that.$refs.hasworkTbl.bodyWrapper;
-    //   console.log(dom)
       	  // 添加scroll监听事件
           dom.addEventListener("scroll", function () {
-          // scrollHeight-scrollTop-clientHeight=0 用来判断滚动条到底部
             const scrollDistance = dom.scrollHeight - dom.scrollTop - dom.clientHeight;
             if (scrollDistance < 2) {
               if (that.monthworkDateS.length < that.monthworkDateS1.length) {
@@ -1937,7 +1934,6 @@
                   that.monthTotalPage * that.monthTotalLages,
                   that.monthTotalLages
                 );
-                // console.log(infoList, '将要合并的数据')
                 // 数据添加
                 that.monthworkDateS = that.monthworkDateS.concat(infoList);
               }
@@ -1946,13 +1942,10 @@
     },
     showMonthNotWorkTime() {
       this.monthTotalPage = 0,
-    //   console.log("exportMembNotWorkHours",this.WorktimeDatepickValue);
         this.tbload = true
       this.http.post(
-        // "/report/getUserDailyWorkTime",
         "/report/getNoReportUserList",
         {
-          // month: this.date,
           startDate: this.WorktimeDatepickValue[0],
           endDate: this.WorktimeDatepickValue[1],
         },
@@ -1960,24 +1953,22 @@
           if (res.code == "ok") {
               this.tbload = false
             this.monthNotWorkDate = res.data;
-            // this.monthNotWorkDateS = this.monthNotWorkDate
-            // console.log("data",res.data);
-            // console.log("monthNotWorkDate", this.monthNotWorkDate);
             this.monthnotworkDateS1 = res.data
             this.monthnotTotal = res.data.length
+            // 2222111
+            // var infoList = []
             if (this.monthnotworkDateS1.length > 20) {
                 this.monthNotWorkDateS = this.monthnotworkDateS1.slice(0,20);
             } else {
                 this.monthNotWorkDateS = this.monthnotworkDateS1
             }
-            
+            this.monthNotWorkDateS = infoList;
             // 判断
             if (this.monthnotworkDateS1.length > 0) {
                 setTimeout(() => {
                     this.tableListenernot()
                 }, 1000);
             }
-            // this.$forceUpdate();
             this.$nextTick(function(){
                 this.$refs.hasworkTbl2.doLayout();
             });
@@ -1994,24 +1985,18 @@
     },
     tableListenernot(){
       let that = this;
-      // this.$refs.maTable.bodyWarpper 
       let dom = that.$refs.hasworkTbl2.bodyWrapper;
-    //   console.log(dom2)
-      	  // 添加scroll监听事件
           dom.addEventListener("scroll", function () {
           // scrollHeight-scrollTop-clientHeight=0 用来判断滚动条到底部
             const scrollDistance2 = dom.scrollHeight - dom.scrollTop - dom.clientHeight;
             if (scrollDistance2 < 2) {
               if (that.monthNotWorkDateS.length < that.monthnotworkDateS1.length) {
                 that.monthnotTotalPage++; //当前页数自增
-                // console.log(that.monthnotworkDateS1.length, that.monthNotWorkDateS.length, that.monthnotTotalPage, that.monthnotTotalLages, that.monthnotTotalPage * that.monthnotTotalLages)
                 var arrList = JSON.parse(JSON.stringify(that.monthnotworkDateS1))
                 var infoList = arrList.splice(
                   that.monthnotTotalPage * that.monthnotTotalLages,
                   that.monthnotTotalLages
                 );
-                // console.log(infoList, '将要合并的数据')
-                // 数据添加
                 that.monthNotWorkDateS = that.monthNotWorkDateS.concat(infoList);
               }
             }