任务分组调整

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

@@ -119,20 +119,20 @@
                     
                     <!-- 增加侧边栏的点击效果 -->
                     
-                    <el-main style="background:#f7f7f7;padding:0px;">
-                        <el-row style="color:#999;margin-top:10px;padding: 0px 10px;" :gutter="10">
-                        <el-col :span="12">
-                            <el-link @click="toggleGroup"><i v-if="selectedGroup != null" :class="groupWidth==0?'el-icon-d-arrow-right':'el-icon-d-arrow-left'" style="margin-top:10px;">{{selectedGroup.name}}</i></el-link>
-                        </el-col>
-                        <el-col :span="8" style="float:right;width:380px">
-                            <el-select v-model="order" size="small" style="background:#fff;display:inline-block;" @change="orderChange">
-                                <el-option v-for="item in orderList" :key="item.id" :label="item.name" :value="item.id">
-                                    <span>{{item.name}}</span>
-                                </el-option>
-                            </el-select>
-                            <el-button icon="iconfont firerock-icondaochu" style="margin-left:10px" size="mini" @click="showExportDialog">导出</el-button>
-                            <el-button icon="iconfont firerock-icondaoru" size="mini" @click="importTaskDialog = true;importToStageId = stageList[0].id;">导入</el-button>
-                        </el-col>
+                    <el-main style="background:#f7f7f7;padding:0px;position: relative;">
+                        <el-row style="color:#999;margin-top:10px;padding: 0px 10px;position: absolute;width: 100%;top: 0;left: 0;" :gutter="10">
+                            <el-col :span="12">
+                                <el-link @click="toggleGroup"><i v-if="selectedGroup != null" :class="groupWidth==0?'el-icon-d-arrow-right':'el-icon-d-arrow-left'" style="margin-top:10px;">{{selectedGroup.name}}</i></el-link>
+                            </el-col>
+                            <el-col :span="8" style="float:right;width:380px">
+                                <el-select v-model="order" size="small" style="background:#fff;display:inline-block;" @change="orderChange">
+                                    <el-option v-for="item in orderList" :key="item.id" :label="item.name" :value="item.id">
+                                        <span>{{item.name}}</span>
+                                    </el-option>
+                                </el-select>
+                                <el-button icon="iconfont firerock-icondaochu" style="margin-left:10px" size="mini" @click="showExportDialog">导出</el-button>
+                                <el-button icon="iconfont firerock-icondaoru" size="mini" @click="importTaskDialog = true;importToStageId = stageList[0].id;">导入</el-button>
+                            </el-col>
                         <!-- <el-col :span="4">
                             
                         </el-col> -->
@@ -141,7 +141,7 @@
                             <i v-if="selectedGroup != null" class="el-icon-arrow-left" style="margin-top:10px;">{{selectedGroup.name}}</i>
                         
                         </div> -->
-                        <div v-if="!displayTable">
+                        <div v-if="!displayTable" style="margin-top: 30px">
 
                         <draggable style="white-space:nowrap;" @update="onMoveStage"
                         v-model="stageList" group="stage" @start="stageDrag=true" @end="stageDrag=false;" draggable=".taskStage" >
@@ -809,7 +809,7 @@
                     </el-form-item> -->
                 </el-form>
             <div slot="footer" class="dialog-footer">
-                <el-button type="primary" @click="addGroup" style="width:100%;" >保存</el-button>
+                <el-button type="primary" @click="addGroup('form2')" style="width:100%;" >保存</el-button>
             </div>
         </el-dialog>
         <el-dialog title="添加为模板" v-if="addToTmpDialog" :visible.sync="addToTmpDialog" :close-on-click-modal="false" customClass="customWidth" width="500px">