完善时间截止显示红色背景

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

@@ -119,6 +119,15 @@
                     <span style="margin-left:50px;margin-right:10px;" v-if="user.company.packageProject==1">项目预算</span>
                     <el-input v-model="addForm.budget"    style="width:32%;"
                     placeholder="整数" clearable @keyup.native="number"></el-input><span style="margin-left:10px;">元</span>
+
+                <!-- 增加合同金额字段 -->
+                    <div style="margin-top: 10px; text-align: right;margin-right: 11px;">
+                        <span style="margin-left:50px;margin-right:10px;" v-if="user.company.packageProject==1">合同金额</span>
+                        <el-input v-model="addForm.aggadm"    style="width:33%;"
+                        placeholder="整数" clearable @keyup.native="number"></el-input><span style="margin-left:10px;">元</span>
+                    </div>
+                <!-- 增加合同金额字段 -->   
+
                 </el-form-item>
                 <el-form-item label="开始日期" prop="planStartDate" v-if="user.company.packageProject==1" >
                     <el-date-picker v-model="addForm.planStartDate" 

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

@@ -140,7 +140,7 @@
                                                 <el-button v-if="element.executorName == null" type="primary" @click.stop.native="addAsMyTask(element)" size="mini" style="float:right;width:38px;padding:5px;">认领</el-button>
                                             </div>
                                             <div style="margin: 10px 0px;color:#666;" @click="timess(element.endDate)">
-                                                <span v-if="element.endDate > times || element.taskStatus == 1"><i v-if="element.endDate != null" class="el-icon-date">&nbsp;&nbsp;{{element.endDate}}</i></span>
+                                                <span v-if="element.endDate >= times || element.taskStatus == 1"><i v-if="element.endDate != null" class="el-icon-date">&nbsp;&nbsp;{{element.endDate}}</i></span>
                                                 <span v-else class="element_span"><em v-if="element.endDate != null" style="display: inline-block;padding:3px 5px"><i v-if="element.endDate != null" class="el-icon-date">&nbsp;&nbsp;{{element.endDate}}  截止</i></em></span>
                                                 <i :class="taskTypeIcon[element.taskType]" :style="'float:right;color:'+taskTypeColor[element.taskType]+';margin-right:8px;'" ></i>
                                             </div>
@@ -200,11 +200,17 @@
                                     {{scope.row.executorName == null?"待分配":scope.row.executorName}}
                                 </template>
                             </el-table-column>
+                            <!-- <el-table-column prop="endDate" label="截止时间" width="100" ></el-table-column> -->
+                            <el-table-column prop="endDate" label="截止时间" width="100" >
+                                <template slot-scope="scope">
+                                    <p v-if="scope.row.endDate >= times">{{scope.row.endDate}}</p>
+                                    <p style="border-radius: 3px; text-align: center;background: #e62412; color: #fff;" v-else><span>{{scope.row.endDate}}</span></p>
+                                </template>
+                            </el-table-column>
                             <el-table-column prop="createDate" label="创建时间" width="100" ></el-table-column>
-                            <el-table-column prop="endDate" label="截止时间" width="100" ></el-table-column>
                             <el-table-column prop="taskLevel" label="优先级" width="100" >
                                 <template slot-scope="scope">
-                                    {{importanceList[scope.row.taskLevel].name}}
+                                   {{importanceList[scope.row.taskLevel].name}}
                                 </template>
                             </el-table-column>
                         </el-table>
@@ -290,7 +296,12 @@
                                     {{scope.row.executorName == null?"待分配":scope.row.executorName}}
                                 </template>
                             </el-table-column>
-                            <el-table-column prop="endDate" label="截止时间" width="100" ></el-table-column>
+                            <el-table-column prop="endDate" label="截止时间" width="100" >
+                                <template slot-scope="scope">
+                                    <p v-if="scope.row.endDate >= times">{{scope.row.endDate}}</p>
+                                    <p v-else style="background: #e62412; color: #fff;text-align: center; border-radius: 3px;">{{scope.row.endDate}}</p>
+                                </template>
+                            </el-table-column>
                         </el-table>
                     </div>
             </el-form>
@@ -866,6 +877,7 @@ toolbar: 'bold italic underline strikethrough | fontsizeselect | forecolor backc
                 res => {
                     if (res.code == "ok") {
                         this.taskDataList = res.data;
+                        console.log(this.taskDataList, '视图任务列表');
                         this.taskDataList.forEach(t=>{
                             t.isFinish = t.taskStatus==1?true:false;
                         });
@@ -1101,7 +1113,6 @@ toolbar: 'bold italic underline strikethrough | fontsizeselect | forecolor backc
                 res => {
                     if (res.code == "ok") {
                         this.stageList = res.data;
-                        console.log(this.stageList, '加载项目内的任务列表');
                         this.timess() // 处理时间的方法
                     } else {
                         this.$message({
@@ -1123,7 +1134,6 @@ toolbar: 'bold italic underline strikethrough | fontsizeselect | forecolor backc
                 let M = date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : (date.getMonth() + 1)
                 let D = date.getDate() < 10 ? ('0' + date.getDate()) : date.getDate()
                 this.times = `${Y}-${M}-${D}`
-                console.log(this.times);
             },
             addStagePost() {
                 let param = JSON.parse(JSON.stringify(this.stageForm));
@@ -1983,6 +1993,10 @@ toolbar: 'bold italic underline strikethrough | fontsizeselect | forecolor backc
     position: absolute;
     bottom: 85px;    
 }
+.scop_span {
+    display: inline-block;
+    padding: 2px 5px;
+}
 </style>
 <style>
 .ql-snow .ql-picker.ql-size .ql-picker-label::before,