合并冲突

fhKeeper/formulahousekeeper/timesheet/config/index.js

@@ -1,7 +1,8 @@
 var path = require('path')
 
-var ip = '127.0.0.1'
 
+ var ip = '192.168.2.21'
+ 
 // var os = require('os'), ip = '', ifaces = os.networkInterfaces() // 获取本机ip
 // for (var i in ifaces) {
 //     for (var j in ifaces[i]) {

fhKeeper/formulahousekeeper/timesheet/src/routes.js

@@ -35,6 +35,9 @@ import timetype from './views/settings/timetype.vue';
 import finance from './views/project/finance';
 import Market from './views/market/list';
 import PdfView from './views/pdf/pdfview';
+
+// 费用报销
+// import expense from './views/expense/expense'
 Vue.use(Router)
 
 export const fixedRouter = [
@@ -153,6 +156,17 @@ export const manageRouter = [
         ]
     },
     
+    // // 费用报销模块
+    // {
+    //     path: '/',
+    //     component: Home,
+    //     name: '费用报销',
+    //     iconCls: 'iconfont firerock-iconcaiwu',
+    //     leaf: true,
+    //     children: [
+    //         { path: '/expense', component: expense, name: '费用报销' }
+    //     ]
+    // },
 
     //项目管理
     {

fhKeeper/formulahousekeeper/timesheet/src/views/expense/expense.vue

@@ -0,0 +1,23 @@
+<template>
+  <div class="layout-container">
+      费用报销模块
+  </div>
+</template>
+
+<script>
+export default {
+  name: "",
+  components: {},
+  props: {},
+  data() {
+    return {};
+  },
+  computed: {},
+  watch: {},
+  created() {},
+  mounted() {},
+  methods: {},
+};
+</script>
+<style scoped>
+</style>

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

@@ -47,27 +47,27 @@
                         <el-table-column  label="基线成本" >
                             <el-table-column prop="baseMan" label="人员成本">
                                 <template slot-scope="scope">
-                                ￥{{scope.row.baseMan}}
+                                ￥{{scope.row.baseMan | numberToCurrency}}
                                 </template>
                             </el-table-column>
                             <el-table-column prop="baseFee" label="费用">
                                 <template slot-scope="scope">
-                                ￥{{scope.row.baseFee}}
+                                ￥{{scope.row.baseFee | numberToCurrency}}
                                 </template>
                             </el-table-column>
                             <el-table-column prop="baseOutsourcing" label="外包费用">
                                 <template slot-scope="scope">
-                                ￥{{scope.row.baseOutsourcing}}
+                                ￥{{scope.row.baseOutsourcing | numberToCurrency}}
                                 </template>
                             </el-table-column>
                             <el-table-column prop="baseRisk1" label="风险预留金额1" width="150">
                                 <template slot-scope="scope">
-                                ￥{{scope.row.baseRisk1}}
+                                ￥{{scope.row.baseRisk1 | numberToCurrency}}
                                 </template>
                             </el-table-column>
                             <el-table-column prop="baseRisk2" label="风险预留金额2" width="150">
                                 <template slot-scope="scope">
-                                ￥{{scope.row.baseRisk2}}
+                                ￥{{scope.row.baseRisk2 | numberToCurrency}}
                                 </template>
                             </el-table-column>
                         </el-table-column>
@@ -142,6 +142,21 @@
                 
             };
         },
+        filters: {
+            numberToCurrency(value) {
+                if (!value) return '0.00'
+                value = value.toFixed(2)
+                const intPart = Math.trunc(value)
+                const intPartFormat = intPart.toString().replace(/(\d)(?=(?:\d{3})+$)/g, '$1,')
+                let floatPart = '.00'
+                const valueArray = value.toString().split('.')
+                if (valueArray.length === 2) { // 有小数部分
+                floatPart = valueArray[1].toString() // 取得小数部分
+                return intPartFormat + '.' + floatPart
+                }
+                return intPartFormat + floatPart
+            }
+        },
         methods: {
             getProfitSnapshot() {
                 let _this = this;
@@ -419,4 +434,7 @@
             this.getProfitSnapshot();
         }
     };
-</script>
+</script>
+
+<style scoped>
+</style>

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

@@ -16,7 +16,7 @@
                     <el-row :gutter="10">
                         <el-col :span="5" ><span class="gray_label">项目编码: </span></el-col><el-col :span="7" ><span >{{project.projectCode}}</span></el-col>
                         <el-col :span="5" ><span class="gray_label">项目金额：</span></el-col><el-col :span="7" >
-                        <span >{{project.contractAmount == null?'-':project.contractAmount}} 元</span></el-col>
+                        <span >{{project.contractAmount == null?'-':project.contractAmount | numberToCurrency}} 元</span></el-col>
                     </el-row>
                     <el-row :gutter="10">
                         <el-col :span="5" ><span class="gray_label">项目级别: </span></el-col><el-col :span="7" ><span >{{levelTxt[project.level]}}</span></el-col>
@@ -38,17 +38,17 @@
                     <div><label>成本基线<el-link v-if="user.id == project.creatorId || user.id == project.inchargerId" @click="showEditBase" style="float:right;"><i class="el-icon-edit"  ></i></el-link></label>
                     <el-row :gutter="10">
                         <el-col :span="5" ><span class="gray_label">人工成本:</span></el-col><el-col :span="7" ><span>
-                            ￥{{project.baseMan==null?'-':project.baseMan}}</span></el-col>
+                            ￥{{project.baseMan==null?'-':project.baseMan | numberToCurrency}}</span></el-col>
                         <el-col :span="5" ><span class="gray_label">费用:</span></el-col><el-col :span="7" ><span>
-                        ￥{{project.baseFee==null?'-':project.baseFee}}</span></el-col></el-row>
+                        ￥{{project.baseFee==null?'-':project.baseFee | numberToCurrency}}</span></el-col></el-row>
                         <el-row :gutter="10"><el-col :span="5" ><span class="gray_label">外包费用:</span></el-col><el-col :span="7" ><span>
-                        ￥{{project.baseOutsourcing==null?'-':project.baseOutsourcing}}</span></el-col>
+                        ￥{{project.baseOutsourcing==null?'-':project.baseOutsourcing | numberToCurrency}}</span></el-col>
                         <el-col :span="5" ><span class="gray_label">风险预留金额1:</span></el-col><el-col :span="7" ><span>
-                        ￥{{project.baseRisk1==null?'-':project.baseRisk1}}</span></el-col></el-row>
+                        ￥{{project.baseRisk1==null?'-':project.baseRisk1 | numberToCurrency}}</span></el-col></el-row>
                         <el-row :gutter="10"><el-col :span="5" ><span class="gray_label">风险预留金额2:</span></el-col><el-col :span="7" ><span>
-                        ￥{{project.baseRisk2==null?'-':project.baseRisk2}}</span></el-col>
+                        ￥{{project.baseRisk2==null?'-':project.baseRisk2 | numberToCurrency}}</span></el-col>
                         <el-col :span="5" ><span class="gray_label">总成本:</span></el-col><el-col :span="7" ><span>
-                        ￥{{project.budget==null?'-':project.budget}}</span></el-col>
+                        ￥{{project.budget==null?'-':project.budget | numberToCurrency}}</span></el-col>
                     </el-row>
                     </div>
                 </div>
@@ -281,6 +281,21 @@
                 }
             };
         },
+        filters: {
+            numberToCurrency(value) {
+                if (!value) return '0.00'
+                value = value.toFixed(2)
+                const intPart = Math.trunc(value)
+                const intPartFormat = intPart.toString().replace(/(\d)(?=(?:\d{3})+$)/g, '$1,')
+                let floatPart = '.00'
+                const valueArray = value.toString().split('.')
+                if (valueArray.length === 2) { // 有小数部分
+                floatPart = valueArray[1].toString() // 取得小数部分
+                return intPartFormat + '.' + floatPart
+                }
+                return intPartFormat + floatPart
+            }
+        },
         methods: {
             adjustBase() {
                 //如果没有做修改，不提交数据

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

@@ -93,7 +93,7 @@
         </el-col>
 
         <!--新增界面-->
-        <el-dialog :title="title" v-if="addFormVisible" :visible.sync="addFormVisible" :close-on-click-modal="false" customClass="customWidth" width="600px">
+        <el-dialog :title="title" v-if="addFormVisible" :visible.sync="addFormVisible" :close-on-click-modal="false" customClass="customWidth" width="800px">
             <el-form ref="form1" :model="addForm" :rules="rules" label-width="120px">
                 <el-form-item label="项目编号" >
                     <el-input v-model="addForm.code" :disabled="user.role==0" placeholder="请输入项目编号" clearable></el-input>
@@ -121,13 +121,13 @@
                     placeholder="整数" clearable @keyup.native="number"></el-input><span style="margin-left:10px;">元</span> -->
 
                 <!-- 增加合同金额字段 -->
-                        <span style="margin-left:50px;margin-right:10px;" v-if="user.company.packageProject==1">合同金额</span>
+                        <span style="margin-left:63px;margin-right:10px;" v-if="user.company.packageProject==1">合同金额</span>
                         <el-input v-model="addForm.contractAmount" style="width:33%;"
                         placeholder="整数" clearable @keyup.native="number"></el-input><span style="margin-left:10px;">元</span>
                 <!-- 增加合同金额字段 -->   
 
                 </el-form-item>
-                <el-form-item label="开始日期" prop="planStartDate" v-if="user.company.packageProject==1" >
+                <el-form-item label="开始日期" prop="planStartDate" v-if="user.company.packageProject==1" style="float: left" >
                     <el-date-picker v-model="addForm.planStartDate" 
                      :editable="false" 
                      format="yyyy-MM-dd" 
@@ -135,7 +135,7 @@
                      :clearable="false" type="date" 
                      placeholder="选择日期"></el-date-picker>
                 </el-form-item>
-                <el-form-item label="截止日期" prop="planEndDate" v-if="user.company.packageProject==1" >
+                <el-form-item label="截止日期" prop="planEndDate" v-if="user.company.packageProject==1" style="float: left" >
                     <el-date-picker v-model="addForm.planEndDate" 
                      :editable="false" 
                      format="yyyy-MM-dd" 
@@ -145,45 +145,46 @@
                 </el-form-item>
             <!-- 项目基线 -->
                 <!-- <div style="width: 100%;border: 1px solid #ddd"></div> -->
-                <el-divider ></el-divider>
-                <div style="margin: 20px 0 30px 0">
+                
+                <div style="margin: 90px 0 30px 0">
+                    <el-divider></el-divider>
                     <span class="el-dialog__title">成本基线</span>
                 </div>
             <!-- 人工成本 -->
             <span class="rg_span">
-                <span style="margin-left:50px;margin-right:10px;" v-if="user.company.packageProject==1">人工成本</span>
-                <el-input @input="addUpfun(addForm.baseMan)" v-model="addForm.baseMan" style="width:22%; margin-bottom: 20px"
+                <span style="width:120px;display: inline-block;" v-if="user.company.packageProject==1">人工成本</span>
+                <el-input @input="addUpfun(addForm.baseMan)" v-model="addForm.baseMan" style="width:200px; margin-bottom: 20px"
                 placeholder="整数" clearable @keyup.native="number"></el-input><span style="margin-left:10px;">元</span>
             </span>
             <!-- 费用 -->
             <span class="rg_span">
-                <span style="margin-left:50px;margin-right:10px;" v-if="user.company.packageProject==1">费用</span>
-                <el-input @input="addUpfun(addForm.baseFee)" v-model="addForm.baseFee" style="width:22%;"
+                <span style="width:120px;display: inline-block;" v-if="user.company.packageProject==1">费用</span>
+                <el-input @input="addUpfun(addForm.baseFee)" v-model="addForm.baseFee" style="width:200px;"
                 placeholder="整数" clearable @keyup.native="number"></el-input><span style="margin-left:10px;">元</span>
             </span>
             <!-- 外包费用 -->
-            <div class="rg_span">
-                <span style="margin-left:50px;margin-right:10px;" v-if="user.company.packageProject==1">外包费用</span>
-                <el-input @input="addUpfun(addForm.baseOutsourcing)" v-model="addForm.baseOutsourcing" style="width:22%;"
+            <div class="rg_span" style="margin-bottom: 20px;">
+                <span style=" width:120px;display: inline-block;" v-if="user.company.packageProject==1">外包费用</span>
+                <el-input @input="addUpfun(addForm.baseOutsourcing)" v-model="addForm.baseOutsourcing" style="width:200px;"
                 placeholder="整数" clearable @keyup.native="number"></el-input><span style="margin-left:10px;">元</span>
             </div>
             <!-- 预留风险金额1 -->
-            <div style="margin-bottom: 20px">
-                <span style="margin-left:50px;margin-right:10px;" v-if="user.company.packageProject==1">预留风险金额1</span>
-                <el-input @input="addUpfun(addForm.baseRisk1)" v-model="addForm.baseRisk1" style="width:22%;"
+            <div style="display: inline-block;" class="rg_span">
+                <span style="width:120px;display: inline-block;text-align: right;" v-if="user.company.packageProject==1">预留风险金额1</span>
+                <el-input @input="addUpfun(addForm.baseRisk1)" v-model="addForm.baseRisk1" style="width:200px;"
                 placeholder="整数" clearable @keyup.native="number"></el-input><span style="margin-left:10px;">元</span>
             </div>
             <!-- 预留风险金额2 -->
-            <div style="margin-bottom: 20px">
-                <span style="margin-left:50px;margin-right:10px;" v-if="user.company.packageProject==1">预留风险金额2</span>
-                <el-input @input="addUpfun(addForm.baseRisk2)" v-model="addForm.baseRisk2" style="width:22%;"
+            <div class="rg_span">
+                <span style="width:120px;display: inline-block;text-align: right;" v-if="user.company.packageProject==1">预留风险金额2</span>
+                <el-input @input="addUpfun(addForm.baseRisk2)" v-model="addForm.baseRisk2" style="width:200px;"
                 placeholder="整数" clearable @keyup.native="number"></el-input><span style="margin-left:10px;">元</span>
             </div>
             <!-- 合计 -->
-            <div style="margin-bottom: 20px">
+            <div style="margin-top: 20px">
                 <span style="margin-left:50px;margin-right:10px;" v-if="user.company.packageProject==1">合计</span>
                  <span v-if="addForm.budget <= 0 || addForm.budget == undefined">0</span>
-                 <span>{{addForm.budget}}</span>
+                 <span v-else>{{addForm.budget | numberToCurrency}}</span>
                 <span style="margin-left:10px;">元</span>
             </div>
 
@@ -259,7 +260,6 @@
 </style>
 <script>
     import util from "../../common/js/util";
-
     export default {
         data() {
             return {
@@ -298,6 +298,27 @@
                 }
             };
         },
+        // 过滤器
+        filters: {
+            numberToCurrency(value) {
+                if (!value) return '0.00'
+                // 将数值截取，保留两位小数
+                value = value.toFixed(2)
+                // 获取整数部分
+                const intPart = Math.trunc(value)
+                // 整数部分处理，增加,
+                const intPartFormat = intPart.toString().replace(/(\d)(?=(?:\d{3})+$)/g, '$1,')
+                // 预定义小数部分
+                let floatPart = '.00'
+                // 将数值截取为小数部分和整数部分
+                const valueArray = value.toString().split('.')
+                if (valueArray.length === 2) { // 有小数部分
+                floatPart = valueArray[1].toString() // 取得小数部分
+                return intPartFormat + '.' + floatPart
+                }
+                return intPartFormat + floatPart
+            }
+        },
         methods: {
             number(){　　
         // 　　　  this.addForm.budget = this.addForm.budget.replace(/[^\.\d]/g,'');
@@ -408,10 +429,9 @@
                 var find = false;
                 this.participator = [];
                 this.addForm.userId.forEach(u=>{
-                    var findUser = this.users.filter(au=>au.id == u)[0];
+                    var findUser = this.users.filter(au=>au.id == u)[0];    
                     this.participator.push(findUser);
                 })
-                
             },
             getUsers() {
                 this.http.post(this.port.manage.list, {
@@ -564,16 +584,22 @@
             },
             // 项目基线合计
             addUpfun(je) {
+                var a = '0'
                 var q = '0'
                 var w = '0'
                 var e = '0'
                 var r = '0'
-                this.addForm.baseMan === undefined || this.addForm.baseMan === NaN ? this.addForm.baseMa = '0' : this.addForm.baseMan
+                //  this.addForm.baseMan === undefined || this.addForm.baseMan === NaN ? this.addForm.baseMa = '0' : this.addForm.baseMan
+                if (this.addForm.baseMan == undefined || this.addForm.baseMan == NaN) {
+                    a = 0
+                } else {
+                    a = this.addForm.baseMan
+                }
                 if (this.addForm.baseFee !== undefined) q = this.addForm.baseFee
                 if (this.addForm.baseOutsourcing !== undefined) w = this.addForm.baseOutsourcing
                 if (this.addForm.baseRisk1 !== undefined) e = this.addForm.baseRisk1
                 if (this.addForm.baseRisk2 !== undefined) r = this.addForm.baseRisk2
-                this.addForm.budget = +this.addForm.baseMan + +q + +w + +e + +r
+                this.addForm.budget = +a + +q + +w + +e + +r
             },
             submitInsert() {
                 this.$refs.form1.validate(valid => {
@@ -719,6 +745,15 @@
 
 <style lang="scss" scoped>
 .rg_span{
-    margin-bottom: 20px;
+    display: inline-block;
+}
+.rg_span span {
+    text-align: right;
+    box-sizing: border-box;
+    padding-right: 10px;
+}
+.el-dialog__title {
+    display: inline-table;
+    margin-top: 20px;
 }
 </style>

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

@@ -144,7 +144,7 @@
                                             </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-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>
+                                                <span v-else><em v-if="element.endDate != null" style="display: inline-block;padding:3px 5px"><i v-if="element.endDate != null" class="el-icon-date"><span  class="element_span"> &nbsp;&nbsp;{{element.endDate}} 截止</span></i></em></span>
                                                 <i :class="taskTypeIcon[element.taskType]" :style="'float:right;color:'+taskTypeColor[element.taskType]+';margin-right:8px;'" ></i>
                                             </div>
                                             <!--子任务 -->
@@ -292,61 +292,88 @@
                         border="0"
                         :autosize="{ minRows: 2, maxRows: 6}"
                         placeholder="请输入详细进展描述"
-                        v-model="text2"
+                        v-model.trim="text2"
                         style="margin:10px 0 0 0">
                         </el-input>
 
-                        <h4 style="font-weight: normal;">提醒谁查看：0</h4>
+                        <h4 style="font-weight: normal;">提醒谁查看：{{checkLists.length}}</h4>
 
                         <i class="el-icon-circle-plus pron_i" style="font-size: 28px;color: #409EFF;" @click="addI(0)"></i>
 
                         <div class="remind" ref="addRem" style="display: none">
-                            <el-checkbox-group v-model="checkList">
-                                <p><el-checkbox label="小名"></el-checkbox></p>
-                                <p><el-checkbox label="小红"></el-checkbox></p>
-                                <p><el-checkbox label="小紫"></el-checkbox></p>
-                                <p><el-checkbox label="小蓝"></el-checkbox></p>
-                                <p><el-checkbox label="小绿"></el-checkbox></p>
-                                <p><el-checkbox label="小黄"></el-checkbox></p>
+                            <el-checkbox-group v-model="checkboxGrounp" v-for="item in users" :key="item.id">
+                                <p><el-checkbox :label="item.name" @change="kkk(item)"></el-checkbox></p>
                             </el-checkbox-group>
                         </div>
+                        <div class="ssp" @click="sss"></div>
                         <!-- </el-form> -->
                         <div class="pro_btn">
                             <el-button size="mini" @click="shutPro">取消</el-button>
-                            <el-button size="mini" type="primary" @click="subMission">发布</el-button>
+                            <el-button size="mini" type="primary" @click="addTaskProgress">发布</el-button>
                         </div>
 
                     </div>
 
                     <!-- 任务进展列表 -->
-                    <div class="elCard">
-                        <i class="el-icon-success" style="color: #5ECE67;"></i>
-                        <span>状态正常</span>
+                    <div class="elCard" v-for="item in ProgressList" :key="item.id" style="margin-bottom: 10px;">
+                        <i class="el-icon-success" style="color: #43d14f;" v-if="item.status == 0"></i>
+                        <i class="el-icon-success" style="color: #fd7624;" v-else-if="item.status == 1"></i>
+                        <i class="el-icon-success" style="color: #fd4d47;" v-else></i>
+                        <span v-if="item.status == 0">状态正常</span>
+                        <span v-else-if="item.status == 1">状态正常</span>
+                        <span v-else>状态正常</span>
                         <!-- <div class="elCard_qu">屈经理更新于7小时前</div> -->
                         <el-dropdown trigger="click" style="float:right;cursor:pointer; float: right;">
                                 <i class="el-icon-more" ></i>
                                 <el-dropdown-menu slot="dropdown">
                                     <!-- <el-dropdown-item divided @click.native="deleteStage(stage)"> -->
                                     <el-dropdown-item divided>
-                                        <i class="el-icon-delete"></i>删除列表</el-dropdown-item>
+                                        <span @click="deleteTaskProgress(item.id)"><i class="el-icon-delete"></i>删除列表</span></el-dropdown-item>
                                 </el-dropdown-menu>
                         </el-dropdown>
-                        <div class="elCard_qu">屈经理更新于7小时前</div>
-                        <p style="padding-left: 20px;">文本框输入的内容</p>
-                        <!-- <el-button type="text" @click="open" style="text-align: center;color:#dddddd;">查看完整状态</el-button> -->
-                        <!-- <p style="text-align: center;">查看完整状态</p> -->
-                        <el-button type="text" @click="innerVisible = true">查看完整状态</el-button>
+                        <div class="elCard_qu">屈经理更新于{{item.indate | relativeTime}}</div>
+                        <p style="padding-left: 20px;">{{item.content}}</p>
+                        <div class="examine"><el-button type="text" @click="innerVisibless = true" style="color: #8F87A3;">查看历史记录</el-button></div>
+                    </div>
+
+                    <!-- 任务列表没有数据的时候展示 -->
+                    <div class="nones" v-if="ProgressList.length <= 0">
+                        暂无数据    
                     </div>
 
                     <!-- 任务进展完整状态 -->
-                    <el-dialog title="提示" :visible.sync="innerVisible" width="300px">
+                    <el-dialog title="提示" :visible.sync="innerVisibless" append-to-body width="500px">
                     <div class="integrity">
-                        <h3 style="font-weight: normal;">任务进展：2</h3>
-                        <span class=""><i class="el-icon-circle-plus"></i>填写进展</span>
+                        <h3 style="font-weight: normal;display: inline-block;margin: 0 0 20px 0;">任务进展：2</h3>
+                        <span class="write"><i class="el-icon-circle-plus"></i>填写进展</span>
+                         <el-divider></el-divider>
+
+                         <!--  -->
+                            <div class="block" style="height: 200px;">
+                                <el-timeline style="padding:20px 0 0 0;">
+                                    <el-timeline-item
+                                    v-for="(activity, index) in activities"
+                                    :key="index"
+                                    :icon="activity.icon"
+                                    :type="activity.type"
+                                    :color="activity.color"
+                                    :size="activity.size"
+                                    :timestamp="activity.timestamp">
+                                    {{activity.content}}
+                                    </el-timeline-item>
+                                </el-timeline>
+
+                                <!-- <el-steps direction="vertical" finish-status="success" :active="1" style="margin-bottom: 10px"  >
+                                    <el-step title="步骤 1"></el-step>
+                                    <el-step title="步骤 2"></el-step>
+                                    <el-step title="步骤 3" description="这是一段很长很长很长的描述性文字"></el-step>
+                                </el-steps> -->
+                            </div>
+                         <!--  -->
                     </div>
                     <span slot="footer" class="dialog-footer">
-                        <el-button @click="innerVisible = false">取 消</el-button>
-                        <el-button type="primary" @click="innerVisible = false">确 定</el-button>
+                        <el-button @click="innerVisibless = false">取 消</el-button>
+                        <el-button type="primary" @click="innerVisibless = false">确 定</el-button>
                     </span>
                     </el-dialog>
 
@@ -707,19 +734,38 @@
                 textContent: true, // 控制提交 
                 times: null,
                 text2: '',
-                // cityOptions : ['渣渣灰', '小小', '嘿嘿', '嘀嘀','版本', '更新', '快速', '欧克'],
-                // checkedCities: []
-                checkList: ['小红'],
-                innerVisible: false // 任务展示弹出层
+                innerVisibless: false, // 任务展示弹出层
+                activities: [{
+                    content: '状态正常',
+                    timestamp: '7小时前',
+                    size: 'large',
+                    type: 'primary',
+                    icon: 'el-icon-circle-check',
+                    color: '#409EFF'
+                    }, {
+                    content: '进展逾期',
+                    timestamp: '八小时前',
+                    color: '#F87872'
+                    }],
+                ProgressList: [],
+                checkboxGrounp: [], // 选中人的数据
+                checkLists: [], // 选中人数据的ID
+                taskIid: null
             };
+            
         },
         methods: {
             //删除任务进展
-            deleteTaskProgress() {
-                this.http.post('/task-progress/deleteProgress', {id:1},
+            deleteTaskProgress(id) {
+                console.log(id, '删除传过来的数据');
+                this.http.post('/task-progress/deleteProgress', {id: id},
                     res => {
                         if (res.code == "ok") {
-                            
+                            this.getTaskProgressList(this.taskIid)
+                            this.$message({
+                                message: '删除成功',
+                                type: "success"
+                            });
                         } else {
                             this.$message({
                                 message: res.msg,
@@ -731,11 +777,35 @@
             },
             //创建任务进展
             addTaskProgress() {
-                var param = {taskId:0,status:0,content:'输入进展内容',participatorIds:'1,2,3,4,5'};
+                if (this.text2.length <= 0) {
+                    return this.$message({
+                                message: '请输入内容',
+                                type: "error"
+                            });
+                }
+                console.log(this.taskIid, 'idididi');
+                // var param = {taskId:0,status:0,content:'输入进展内容',participatorIds:'1,2,3,4,5'};
+                // console.log(this.checkLists.toString(), '看看打印的是什么');
+                var param = {
+                    taskId: this.taskIid,
+                    status: this.radio,
+                    content: this.text2,
+                    participatorIds: this.checkLists.toString()
+                };
+                console.log(param, '发布过去的数据');
                 this.http.post('/task-progress/addProgress', param,
                     res => {
                         if (res.code == "ok") {
-                            
+                            this.shutPro()
+                            this.getTaskProgressList(this.taskIid)
+                            this.$message({
+                                message: '发布成功',
+                                type: "success"
+                            });
+                            this.checkboxGrounp = [],
+                            this.checkLists = [],
+                            this.text2 = '',
+                            this.radio = 0
                         } else {
                             this.$message({
                                 message: res.msg,
@@ -747,10 +817,13 @@
             },
             //获取任务进展列表
             getTaskProgressList(taskId) {
+                console.log(taskId);
+                this.taskIid = taskId
                 this.http.post('/task-progress/list', {taskId: taskId},
                     res => {
                         if (res.code == "ok") {
-                            var list = res.data;
+                            this.ProgressList = res.data;
+                            console.log(this.ProgressList, '获取过来的任务进展列表数据');
                         } else {
                             this.$message({
                                 message: res.msg,
@@ -760,6 +833,16 @@
                     }
                 );
             },
+            kkk(el){
+                var k = this.checkLists.indexOf(el.id)
+                if (k == -1) {
+                    this.checkLists.push(el.id)
+                } else {
+                    this.checkLists.splice(k, 1)
+                }
+                // this.checkLists.push(el.id)
+                // console.log(this.checkLists);
+            },
             showExportDialog() {
                 this.exportDialog = true;
             },
@@ -1170,6 +1253,8 @@
                 this.addLoading = false;
                 this.title = "编辑任务";
                 this.getTaskDetail(task.id);
+                this.getTaskProgressList(task.id); // 获取任务进展列表 
+                this.users(); // 获取名单数据
                 this.gain(task); // 获取评论列表
             },  
             // 获取评论列表
@@ -1240,6 +1325,7 @@
                 res => {
                     if (res.code == "ok") {
                         this.addForm = res.data;
+                        console.log(this.addForm, 'getTaskDetail');
                         this.addForm.createDate = null;
                         this.addForm.indate = null;
                         this.addLoading = false;
@@ -1656,6 +1742,7 @@
                 res => {
                     if (res.code == "ok") {
                         this.users = res.data.records;
+                        console.log(this.users, '得到的数据');
                     } else {
                         this.$message({
                         message: res.msg,
@@ -2097,6 +2184,10 @@
     background: #e62412;
     color: #fff;
     border-radius: 5px;
+    padding: 3px;
+    /* text-align: center; */
+    font-size: 12px;
+    margin-left: 5px;
 }
 
 .pro_btn{
@@ -2269,6 +2360,7 @@
     box-sizing: border-box;
     padding: 15px;
     position: relative;
+    margin-bottom: 20px;
 }
 .remind {
     width: 95px;
@@ -2321,5 +2413,29 @@
 .integrity {
     padding: 15px;
 }
-.write {}
+.write {
+    float: right;
+    color: #1B9AEE;
+}
+.ssp {
+    position: absolute;
+    right: 140px;
+    top: 95px;
+    width: 66%;
+    height: 80%;
+}
+.examine {
+    width: 100%;
+    text-align: center;
+}
+.nones {
+    width: 100%;
+    height: 50px;
+    text-align: center;
+    color: #909399;
+    line-height: 50px;
+    border-top: 1px solid #EBEEF5;
+    border-bottom: 1px solid #EBEEF5;
+    font-size: 16px;
+}
 </style>