Procházet zdrojové kódy

排期锁定一需求排期

qinzhipeng_v před 5 roky
rodič
revize
907d42f664

+ 10 - 47
src/views/projectManage/requirement/components/scheduleList.vue

@@ -6,15 +6,10 @@
       :data="scheduleList"
       :header-cell-style="{ backgroundColor: 'rgba(232,232,232,0.4)', color: 'rgb(74, 74, 74)', fontSize: '14px', fontWeight: '500'}"
       :row-style="{'background-color': 'transparent'}"
-      style="max-width: 100%"
       show-overflow-tooltip="true"
       row-key="id"
     >
-      <el-table-column
-        v-if="noMove"
-        width="80"
-        align="center"
-      >
+      <el-table-column v-if="noMove" width="80" align="center">
         <template>
           <el-tooltip class="item" effect="dark" content="代表移动,鼠标选中区域可以向上移动" placement="bottom">
             <div class="sortable-tip">
@@ -23,48 +18,16 @@
           </el-tooltip>
         </template>
       </el-table-column>
-      <el-table-column
-        prop="type"
-        label="类型"
-        width="100"
-        align="center"
-      >
+      <el-table-column prop="type" label="类型" min-width="100" align="center">
         <template slot-scope="scope">
           {{ getType(scope.row.type) }}
         </template>
       </el-table-column>
-      <el-table-column
-        prop="desc"
-        label="描述"
-        min-width="150"
-        align="left"
-        show-overflow-tooltip
-      />
-      <el-table-column
-        prop="seperateDaysNoHoliday"
-        label="排期"
-        min-width="200"
-        align="center"
-        show-overflow-tooltip
-      />
-      <el-table-column
-        prop="dayLength"
-        label="时长"
-        width="50"
-        align="center"
-      />
-      <el-table-column
-        prop="peopleList"
-        label="参与人员"
-        min-width="100"
-        align="center"
-      />
-      <el-table-column
-        label="操作"
-        width="200"
-        align="center"
-        show-overflow-tooltip
-      >
+      <el-table-column prop="desc" label="描述" min-width="150" align="left" show-overflow-tooltip />
+      <el-table-column prop="seperateDaysNoHoliday" label="排期" min-width="200" align="center" show-overflow-tooltip />
+      <el-table-column prop="dayLength" label="时长" min-width="50" align="center" />
+      <el-table-column prop="peopleList" label="参与人员" min-width="100" align="center" />
+      <el-table-column label="操作" width="200" align="center">
         <template slot-scope="scope">
           <el-button type="text" size="small" @click="editSchedule(scope.row)">编辑</el-button>
           <el-button type="text" size="small" @click="deleteSchedule(scope.row)">删除</el-button>
@@ -223,7 +186,7 @@ export default {
   cursor: pointer;
   color: #409EFF;
   font-size: 14px;
-  width: calc(100% - 40px);
+  // width: calc(100% - 40px);
   margin: 0 20px;
   padding: 20px 0;
   i {
@@ -234,7 +197,7 @@ export default {
   }
 }
 .schedule-list {
-  width: calc(100% - 40px);
+  // width: calc(100% - 40px);
   margin: 0 20px;
   padding: 0;
   background:rgba(248,248,248,0.6);
@@ -253,7 +216,7 @@ export default {
 }
 .bottom-detail {
   font-size: 14px;
-  width: calc(100% - 40px);
+  // width: calc(100% - 40px);
   margin: 0 20px;
   padding: 20px 0;
   :first-child {

+ 22 - 19
src/views/projectManage/requirement/requirementDetail.vue

@@ -122,20 +122,28 @@
               </div>
             </div>
           </div>
-          <div class="require-list">
-            <schedule-list
-              :id="requirementId"
-              :type-list="taskScheduleEvent"
-              class-name="white"
-              :all="true"
-              :no-move="false"
-              style="flex:2;border-right: 1px solid red"
-            />
-            <div style=" flex:1; min-width: 200px; text-align: center">
-              <div>排期变更记录</div>
-              <div>额 sad sad</div>
-            </div>
-          </div>
+          <el-container>
+            <el-main style="padding: 0; border-right: 1px solid red; border-radius: 0;">
+              <schedule-list
+                :id="requirementId"
+                :type-list="taskScheduleEvent"
+                class-name="white"
+                :all="true"
+                :no-move="false"
+              />
+            </el-main>
+            <el-aside style="width: 200px;">
+              <div align="center">排期变更记录</div>
+              <div v-for="(item, val) in []" :key="val">记录</div>
+            </el-aside>
+          </el-container>
+          <!-- <schedule-list
+            :id="requirementId"
+            :type-list="taskScheduleEvent"
+            class-name="white"
+            :all="true"
+            :no-move="false"
+          /> -->
         </section>
         <section class="main-section">
           <div class="el-main-title">
@@ -475,11 +483,6 @@ export default {
   height: calc(100vh - 140px);
   overflow: scroll;
 }
-.require-list {
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-}
 .main-section {
   @include main-section;
   .require-plan {