2022.4.15样式调整

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: "确定",