修复冲突，增加导出任务功能

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

@@ -225,9 +225,11 @@
             <el-tab-pane label="数据统计" name="summary"><Summary ref="summary"></Summary></el-tab-pane>
             <el-tab-pane label="挣值分析" name="earning"><Earning ref="earning"></Earning></el-tab-pane>
         </el-tabs>
-
+        
         <!--新增任务界面-->
         <el-dialog class="jm" :title="title" v-if="addFormVisible" :visible.sync="addFormVisible" :close-on-click-modal="false" customClass="customWidth" width="800px">
+        <!-- <div style="width: 200%;height:80%;position: absolute;right:-100%;top:0;background:#000;opacity: 0;" @click="sss"></div> -->
+
             <el-form ref="form1" :model="addForm" :rules="taskRules" label-width="100px">
                 <!--子任务需要选择任务列表 -->
                 <el-form-item label="任务列表" prop="stages" v-if="addForm.parentTid != null">
@@ -278,10 +280,11 @@
                     </p>
                     <!-- 任务进展展示 -->
                     <div style="display: none;" ref="proBox" class="progress">
+                        <!-- <el-form :model="> -->
                         <el-radio-group v-model="radio">
-                            <el-radio label="状态正常" value="0"> </el-radio>
-                            <el-radio label="风险提示" value="1"> </el-radio>
-                            <el-radio label="高度危险" value="2"> </el-radio>
+                            <el-radio :label="0" class="rala1">状态正常</el-radio>
+                            <el-radio :label="1" class="rala2">风险提示</el-radio>
+                            <el-radio :label="2" class="rala3">高度危险</el-radio>
                         </el-radio-group>
 
                         <el-input
@@ -295,19 +298,58 @@
 
                         <h4 style="font-weight: normal;">提醒谁查看：0</h4>
 
-                        <i class="el-icon-circle-plus pron_i" style="font-size: 28px;color: #409EFF;"></i>
+                        <i class="el-icon-circle-plus pron_i" style="font-size: 28px;color: #409EFF;" @click="addI(0)"></i>
 
-                        <div class="remind">
-                            <el-checkbox-group v-model="checkedCities">
-                               <el-checkbox v-for="city in cityOptions" :label="city" :key="city"><p>{{city}}</p></el-checkbox>
+                        <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>
                         </div>
-
+                        <!-- </el-form> -->
                         <div class="pro_btn">
                             <el-button size="mini" @click="shutPro">取消</el-button>
-                            <el-button size="mini" type="primary">发布</el-button>
+                            <el-button size="mini" type="primary" @click="subMission">发布</el-button>
                         </div>
+
+                    </div>
+
+                    <!-- 任务进展列表 -->
+                    <div class="elCard">
+                        <i class="el-icon-success" style="color: #5ECE67;"></i>
+                        <span>状态正常</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>
+                                </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>
+
+                    <!-- 任务进展完整状态 -->
+                    <el-dialog title="提示" :visible.sync="innerVisible" width="300px">
+                    <div class="integrity">
+                        <h3 style="font-weight: normal;">任务进展：2</h3>
+                        <span class=""><i class="el-icon-circle-plus"></i>填写进展</span>
+                    </div>
+                    <span slot="footer" class="dialog-footer">
+                        <el-button @click="innerVisible = false">取 消</el-button>
+                        <el-button type="primary" @click="innerVisible = false">确 定</el-button>
+                    </span>
+                    </el-dialog>
+
                     <!-- 子任务 -->
                     <p ><i class="iconfont firerock-icontree" style="color:#20A0ff;margin-left:10px;">子任务</i>
                         <el-link style="float:right;" @click="addSubTask">添加子任务</el-link>
@@ -657,8 +699,10 @@ toolbar: 'bold italic underline strikethrough | fontsizeselect | forecolor backc
                 textContent: true, // 控制提交 
                 times: null,
                 text2: '',
-                cityOptions : ['渣渣灰', '渣渣灰', '渣渣灰', '渣渣灰','渣渣灰', '渣渣灰', '渣渣灰', '渣渣灰'],
-                checkedCities: []
+                // cityOptions : ['渣渣灰', '小小', '嘿嘿', '嘀嘀','版本', '更新', '快速', '欧克'],
+                // checkedCities: []
+                checkList: ['小红'],
+                innerVisible: false // 任务展示弹出层
             };
         },
         methods: {
@@ -677,21 +721,36 @@ toolbar: 'bold italic underline strikethrough | fontsizeselect | forecolor backc
                 }
                 );
             },
+            sss(){
+                this.$refs.addRem.style.display="none" 
+            },
             addprogress(){ // 添加子任务进展事件
                 this.$refs.proBox.style.display="block"
                 this.$refs.addPro.style.display="none"
             },
             shutPro() { // 关闭任务进展
                 this.$refs.addPro.style.display="block"
-                this.$refs.proBox.style.display="none"
+                this.$refs.addRem.style.display="none" 
+                this.$refs.proBox.style.display="none" 
             },
-            load () {
+            addI() { // 打开选择查看
+                this.$refs.addRem.style.display="block" 
+            },
+            load() {
                  if(this.count >= 0) return
                 this.count += 2
             },
             onEditorFocus() {
                 this.onEditorBlur()
             },
+            subMission() { // 添加
+
+            },
+            handleCheckedCitiesChange(value) {
+                let checkedCount = value.length;
+                this.checkAll = checkedCount === this.cities.length;
+                this.isIndeterminate = checkedCount > 0 && checkedCount < this.cities.length;
+            },
             // 获得焦点时触发
             onEditorBlur(){
                 let theEle = this.$refs.text; // 获取元素
@@ -2155,12 +2214,55 @@ toolbar: 'bold italic underline strikethrough | fontsizeselect | forecolor backc
     position: relative;
 }
 .remind {
-    width: 90px;
-    height: 80%;
+    width: 95px;
+    height: 60%;
+    overflow-y:auto;
     position: absolute;
     background: #fff;
     padding: 10px;
     left: 0;
     top: 0;
+    border: 1px solid #ddd;
+    z-index: 999999;
+}
+
+.rala1 .el-radio__input.is-checked + .el-radio__label {
+       color: #43d14f !important;
+   }
+.rala1 .el-radio__input.is-checked .el-radio__inner {
+       background: #43d14f !important;
+       border-color: #43d14f !important;
+   }
+
+.rala2 .el-radio__input.is-checked + .el-radio__label {
+       color: #fd7624 !important;
+   }
+.rala2 .el-radio__input.is-checked .el-radio__inner {
+       background: #fd7624 !important;
+       border-color: #fd7624 !important;
+   }
+
+.rala3 .el-radio__input.is-checked + .el-radio__label {
+       color: #fd4d47 !important;
+   }
+.rala3 .el-radio__input.is-checked .el-radio__inner {
+       background: #fd4d47 !important;
+       border-color: #fd4d47 !important;
+   }
+
+/* 任务进展列表 */
+.elCard {
+    width: 100%;
+    padding: 15px;
+    box-sizing: border-box;
+    border: 1px solid #EBEEF5;
+}
+.elCard_qu {
+    float: right;
+    margin-right: 15px;
+}
+.integrity {
+    padding: 15px;
 }
+.write {}
 </style>