lilei vor 1 Jahr
Ursprung
Commit
b004d9936a

+ 1 - 1
src/views/basicData/transferTypeManagement/editModal.vue

@@ -33,8 +33,8 @@
           </a-form-model-item>
         </a-form-model>
         <div class="btn-cont">
+          <a-button id="storeTransferOut-type-edit-modal-back" @click="isShow = false" style="margin-right: 15px;">取消</a-button>
           <a-button type="primary" id="storeTransferOut-type-edit-modal-save" @click="handleSave">保存</a-button>
-          <a-button id="storeTransferOut-type-edit-modal-back" @click="isShow = false" style="margin-left: 15px;">返回列表</a-button>
         </div>
       </a-spin>
     </div>

+ 3 - 3
src/views/basicData/transferTypeManagement/list.vue

@@ -6,7 +6,6 @@
         <a-button
           id="transferTypeManagementList-add"
           type="primary"
-          class="button-error"
           v-if="$hasPermissions('B_transferTypeManagement_add')"
           @click="handleEdit()">新增</a-button>
       </div>
@@ -14,11 +13,12 @@
       <s-table
         class="sTable fixPagination"
         ref="table"
-        :style="{ height: tableHeight+84.5+'px' }"
+        :style="{ height: tableHeight+70+'px' }"
         size="small"
         :rowKey="(record) => record.id"
         :columns="columns"
         :scroll="{ y: tableHeight }"
+        :pageSize="30"
         :data="loadData"
         :defaultLoadData="false"
         bordered>
@@ -131,7 +131,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 195
+      this.tableHeight = window.innerHeight - tableSearchH - 185
     }
   },
   watch: {

+ 1 - 1
src/views/basicData/warehouse/editModal.vue

@@ -63,8 +63,8 @@
           </a-form-model-item>
         </a-form-model>
         <div class="btn-cont">
+          <a-button id="warehouse-edit-modal-back" @click="isShow = false" style="margin-right: 15px;">取消</a-button>
           <a-button type="primary" id="warehouse-edit-modal-save" @click="handleSave">保存</a-button>
-          <a-button id="warehouse-edit-modal-back" @click="isShow = false" style="margin-left: 15px;">返回列表</a-button>
         </div>
       </a-spin>
     </div>

+ 1 - 1
src/views/basicData/warehouse/list.vue

@@ -22,7 +22,7 @@
       <a-spin :spinning="spinning" tip="Loading...">
         <!-- 操作按钮 -->
         <div class="table-operator">
-          <a-button v-if="$hasPermissions('B_warehouse_add')" id="warehouseList-add" type="primary" class="button-error" @click="handleEdit()">新增</a-button>
+          <a-button v-if="$hasPermissions('B_warehouse_add')" id="warehouseList-add" type="primary" @click="handleEdit()">新增</a-button>
         </div>
         <!-- 列表 -->
         <s-table

+ 1 - 1
src/views/basicData/warehouse/storingLocation/editModal.vue

@@ -34,8 +34,8 @@
           </a-form-model-item>
         </a-form-model>
         <div class="btn-cont">
+          <a-button id="storingLocation-edit-modal-back" @click="isShow = false" style="margin-right: 15px;">取消</a-button>
           <a-button type="primary" id="storingLocation-edit-modal-save" @click="handleSave">保存</a-button>
-          <a-button id="storingLocation-edit-modal-back" @click="isShow = false" style="margin-left: 15px;">返回列表</a-button>
         </div>
       </a-spin>
     </div>

+ 2 - 2
src/views/basicData/warehouse/storingLocation/list.vue

@@ -27,7 +27,7 @@
         </div>
         <!-- 操作按钮 -->
         <div class="table-operator" style="border: 0;padding: 0 0 10px;">
-          <a-button id="storingLocationList-add" type="primary" class="button-error" @click="handleEdit()">新增</a-button>
+          <a-button id="storingLocationList-add" type="primary" @click="handleEdit()">新增</a-button>
         </div>
         <!-- 列表 -->
         <s-table
@@ -211,7 +211,7 @@ export default {
 <style lang="less">
   .storingLocationList-wrap{
     .storingLocationList-back{
-      margin-bottom: 10px;
+      margin-bottom: 6px;
     }
   }
 </style>