标准/译文申请

src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/index.vue

@@ -30,7 +30,8 @@
           />
         </el-form-item>
         <el-form-item class="el-form-item search-item" label="申请人">
-          <el-input v-model="applyForUserName" placeholder="选择请选择申请人" @click.native="choiceWSSMR('wssmr', '请选择申请人', StandardApplyForEOPage.applyForUserIds)" />
+          <el-input v-model="applyForUserName" placeholder="选择请选择申请人"
+                    @click.native="choiceWSSMR('wssmr', '请选择申请人', StandardApplyForEOPage.applyForUserIds)"/>
         </el-form-item>
         <el-form-item class="el-form-item search-item" label="需求时间">
           <el-input v-model="StandardApplyForEOPage.requiredTime" clearable placeholder="请输入需求时间"/>
@@ -57,22 +58,32 @@
         </el-form-item>
       </el-form>
     </div>
-    <div class="table-container">
     <div class="operate-options">
       <div>
-          <el-button v-btn-permission="'34ea84f51eb01a166b7acfe4f7b02c8d'" size="mini" type="danger" @click="batchOverrule(selectedList)">批量驳回</el-button>
+        <el-button v-btn-permission="'34ea84f51eb01a166b7acfe4f7b02c8d'" size="mini" type="danger"
-          <el-button v-btn-permission="'a8218ff15358a5265e5571e49acf1f4e'" size="mini" type="primary" @click="batchPass(selectedList)">批量通过</el-button>
+                   @click="batchOverrule(selectedList)">批量驳回
-          <el-button v-btn-permission="'b899c22e27baa561b8c2ecb0f35d7302'" size="mini" @click="exportList">列表导出</el-button>
+        </el-button>
+        <el-button v-btn-permission="'a8218ff15358a5265e5571e49acf1f4e'" size="mini" type="primary"
+                   @click="batchPass(selectedList)">批量通过
+        </el-button>
+        <el-button v-btn-permission="'b899c22e27baa561b8c2ecb0f35d7302'" size="mini" @click="exportList">列表导出
+        </el-button>
       </div>
       <div>
-          <el-button v-btn-permission="'33809866b2fda3f52058299b5e2584c3'" size="mini" type="primary" @click="standardsAndTranslationRequestShowModal">标准/译文获取申请</el-button>
+        <el-button v-btn-permission="'33809866b2fda3f52058299b5e2584c3'" size="mini" type="primary"
+                   @click="standardsAndTranslationRequestShowModal">标准/译文获取申请
+        </el-button>
       </div>
     </div>
+    <div class="content">
+      <div class="table-wrap">
+        <div style="position: absolute;height: calc(100% - 10px);width: 100%;">
           <el-table
               ref="selections"
               v-loading="tableLoading"
               tooltip-effect="dark"
-        style="width: 100%; flex: auto;"
+              style="width: 100%;"
+              height="100%"
               class="drag-table"
               row-key="id"
               border
@@ -143,8 +154,14 @@
             <el-table-column label="操作" align="center" width="200" fixed="right">
               <template slot-scope="scope">
                 <div class="table-operate-btn" @click="toView(scope.row)">查看</div>
-            <div v-show="scope.row.status ==='pendingApproval'" v-btn-permission="'3bc041e58bcb4b0510bcc1aad0b9ce89'" class="table-operate-btn" @click="batchPass([scope.row.id])">通过</div>
+                <div v-show="scope.row.status ==='pendingApproval'"
-            <div v-show="scope.row.status ==='pendingApproval'" v-btn-permission="'92adace8c9a703b3b2472f684808db98'" class="table-operate-btn" @click="batchOverrule([scope.row.id])">驳回</div>
+                     v-btn-permission="'3bc041e58bcb4b0510bcc1aad0b9ce89'" class="table-operate-btn"
+                     @click="batchPass([scope.row.id])">通过
+                </div>
+                <div v-show="scope.row.status ==='pendingApproval'"
+                     v-btn-permission="'92adace8c9a703b3b2472f684808db98'" class="table-operate-btn"
+                     @click="batchOverrule([scope.row.id])">驳回
+                </div>
                 <div
                     v-if="account === scope.row.createBy"
                     v-show="scope.row.status ==='pendingApproval'"
@@ -183,6 +200,9 @@
               </template>
             </el-table-column>
           </el-table>
+        </div>
+      </div>
+    </div>
     <pagination
         style="position: relative;"
         :page="StandardApplyForEOPage.page"
@@ -190,7 +210,6 @@
         @pageChange="pageChange"
         @pageSizeChange="pageSizeChange"
     />
-    </div>
     <standardsAndTranslationModal ref="standardsAndTranslationModalRef" @updateIndexList="getList"/>
     <detailModal ref="detailModalRef"/>
     <addModal ref="addModalRef" @updateList="getList"/>
@@ -585,23 +604,25 @@ export default {
   height: 100%;
   display: flex;
   flex-direction: column;
-
-  .table-container {
   background-color: white;
-    padding: 0 10px;
-    flex-grow: 1;
-    display: flex;
-    flex-direction: column;
-
-    .drag-table {
-      flex-grow: 1;
-    }
 
   .operate-options {
     display: flex;
     align-items: center;
     justify-content: space-between;
-      padding-bottom: 10px;
+    padding: 10px;
+  }
+
+  .content {
+    flex: auto;
+    overflow: hidden;
+    display: flex;
+    flex-direction: column;
+
+    .table-wrap {
+      flex: auto;
+      overflow: hidden;
+      position: relative;
     }
   }