lilei 1 рік тому
батько
коміт
608054d817

+ 6 - 5
src/views/productManagement/priceChangeRecord/list.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <a-card size="small" :bordered="false" class="productChangeRecordList-wrap searchBottomSpace">
+    <a-card size="small" :bordered="false" class="productChangeRecordList-wrap searchBoxNormal">
       <!-- 搜索条件 -->
       <div ref="tableSearch" class="table-page-search-wrapper">
         <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
@@ -63,12 +63,13 @@
         <s-table
           class="sTable fixPagination"
           ref="table"
-          :style="{ height: tableHeight+122.5+'px' }"
+          :style="{ height: tableHeight+95+'px' }"
           size="small"
           :rowKey="(record) => record.id"
           :columns="columns"
           :data="loadData"
-          :scroll="{ x: 1520, y: tableHeight }"
+          :pageSize="30"
+          :scroll="{ y: tableHeight }"
           :defaultLoadData="false"
           bordered>
           <!-- 产品分类 -->
@@ -174,7 +175,7 @@ export default {
     columns () {
       const _this = this
       const arr = [
-        { title: '序号', dataIndex: 'no', width: 50, align: 'center', fixed: 'left' },
+        { title: '序号', dataIndex: 'no', width: 50, align: 'center' },
         { title: '变更时间', dataIndex: 'updateDate', width: 130, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '产品名称', dataIndex: 'productEntity.name', align: 'left', ellipsis: true, customRender: function (text) { return text || '--' } },
         { title: '产品编码', dataIndex: 'productEntity.code', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
@@ -323,7 +324,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 263
+      this.tableHeight = window.innerHeight - tableSearchH - 225
     },
     // 修改状态
     changeFlagHandle (text, record) {

+ 1 - 1
src/views/productManagement/productBrand/editModal.vue

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

+ 6 - 5
src/views/productManagement/productBrand/list.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <a-card size="small" :bordered="false" class="productBrandList-wrap searchBottomSpace">
+    <a-card size="small" :bordered="false" class="productBrandList-wrap searchBoxNormal">
       <!-- 搜索条件 -->
       <div ref="tableSearch" class="table-page-search-wrapper">
         <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
@@ -33,18 +33,19 @@
     <a-card size="small" :bordered="false">
       <a-spin :spinning="spinning" tip="Loading...">
         <!-- 操作按钮 -->
-        <div class="table-operator">
-          <a-button id="productBrandList-add" type="primary" v-if="$hasPermissions('B_productBrand_add')" class="button-error" @click="handleEdit()">新增</a-button>
+        <div class="table-operator" v-if="$hasPermissions('B_productBrand_add')" >
+          <a-button id="productBrandList-add" type="primary" @click="handleEdit()">新增</a-button>
         </div>
         <!-- 列表 -->
         <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"
           :data="loadData"
+          :pageSize="30"
           :scroll="{ y: tableHeight }"
           :defaultLoadData="false"
           bordered>
@@ -226,7 +227,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 265
+      this.tableHeight = window.innerHeight - tableSearchH - 240
     }
   },
   watch: {

+ 1 - 1
src/views/productManagement/productCategory/editModal.vue

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

+ 2 - 2
src/views/productManagement/productCategory/list.vue

@@ -2,8 +2,8 @@
   <a-card size="small" :bordered="false" class="productCategoryList-wrap">
     <a-spin :spinning="spinning" tip="Loading...">
       <!-- 操作按钮 -->
-      <div class="table-operator-nobor">
-        <a-button id="productCategoryList-add" type="primary" v-if="$hasPermissions('B_productCategory_add')" class="button-error" @click="handleAdd()">新增一级分类</a-button>
+      <div class="table-operator-nobor" v-if="$hasPermissions('B_productCategory_add')" >
+        <a-button id="productCategoryList-add" type="primary"@click="handleAdd()">新增一级分类</a-button>
       </div>
       <!-- 列表 -->
       <s-table

+ 4 - 3
src/views/productManagement/productLevel/list.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <a-card size="small" :bordered="false" class="productLevelList-wrap searchBottomSpace">
+    <a-card size="small" :bordered="false" class="productLevelList-wrap searchBoxNormal">
       <!-- 搜索条件 -->
       <div ref="tableSearch" class="table-page-search-wrapper">
         <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
@@ -54,11 +54,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"
         :data="loadData"
+        :pageSize="30"
         :scroll="{ y: tableHeight }"
         :defaultLoadData="false"
         bordered>
@@ -222,7 +223,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 225
+      this.tableHeight = window.innerHeight - tableSearchH - 200
     }
   },
   watch: {

+ 3 - 3
src/views/productManagement/productNotOnline/list.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <a-card size="small" :bordered="false" class="productPricingList-wrap searchBottomSpace">
+    <a-card size="small" :bordered="false" class="productPricingList-wrap searchBoxNormal">
       <!-- 搜索条件 -->
       <div ref="tableSearch" class="table-page-search-wrapper">
         <a-form layout="inline" @keyup.enter.native="searchForm">
@@ -72,7 +72,7 @@
         <s-table
           class="sTable fixPagination"
           ref="table"
-          :style="{ height: tableHeight+84.5+'px' }"
+          :style="{ height: tableHeight+70+'px' }"
           size="small"
           :rowKey="(record) => record.no"
           rowKeyName="no"
@@ -247,7 +247,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 255
+      this.tableHeight = window.innerHeight - tableSearchH - 226
     }
   },
   watch: {

+ 20 - 22
src/views/productManagement/productOfflineAudit/list.vue

@@ -1,17 +1,6 @@
 <template>
   <div class="productOfflineAuditList-wrap">
-    <!-- 状态 -->
-    <div style="background-color: #fff;margin-bottom: 5px;">
-      <v-select
-        v-model="queryParam.bizState"
-        ref="state"
-        showType="tabs"
-        @change="resetSearchForm()"
-        code="PRODUCT_LOG_BIZ_STATE"
-        allowClear></v-select>
-    </div>
-
-    <a-card size="small" :bordered="false" class="searchBottomSpace">
+    <a-card size="small" :bordered="false" class="searchBoxNormal">
       <!-- 搜索条件 -->
       <div ref="tableSearch" class="table-page-search-wrapper">
         <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
@@ -66,12 +55,22 @@
         </a-form>
       </div>
     </a-card>
+    <!-- 状态 -->
+    <div style="background-color: #fff;">
+      <v-select
+        v-model="queryParam.bizState"
+        ref="state"
+        showType="tabs"
+        @change="resetSearchForm()"
+        code="PRODUCT_LOG_BIZ_STATE"
+        allowClear></v-select>
+    </div>
     <!-- 列表 -->
     <a-card size="small" :bordered="false">
       <a-spin :spinning="spinning" tip="Loading...">
-        <div style="margin-bottom: 10px">
-          <a-button type="primary" v-if="$hasPermissions('B_productOfflineAudit_batchAudit')&&queryParam.bizState == 'WAIT'" id="productOfflineAudit-export" :loading="loading" @click="handleBatchAudit">批量审核</a-button>
-          <span style="margin-left: 5px" v-if="$hasPermissions('B_productOfflineAudit_batchAudit')">
+        <div style="margin-bottom: 10px" v-if="$hasPermissions('B_productOfflineAudit_batchAudit')&&queryParam.bizState == 'WAIT'" >
+          <a-button type="primary" ghost id="productOfflineAudit-export" :loading="loading" @click="handleBatchAudit">批量审核</a-button>
+          <span style="margin-left: 10px">
             <template v-if="rowSelectionInfo && rowSelectionInfo.selectedRowKeys.length>0">{{ `已选 ${rowSelectionInfo.selectedRowKeys.length} 项` }}</template>
           </span>
         </div>
@@ -79,13 +78,14 @@
         <s-table
           class="sTable fixPagination"
           ref="table"
-          :style="{ height: tableHeight+84.5+'px' }"
+          :style="{ height: tableHeight+70+'px' }"
           size="small"
           :rowKey="(record) => record.productLogSn"
           rowKeyName="productLogSn"
           :row-selection="$hasPermissions('B_productOfflineAudit_batchAudit')&&queryParam.bizState == 'WAIT'?{ columnWidth: 40 }:null"
           @rowSelection="rowSelectionFun"
           :columns="columns"
+          :pageSize="30"
           :data="loadData"
           :scroll="{ y: tableHeight }"
           :defaultLoadData="false"
@@ -156,6 +156,7 @@ export default {
             this.disabled = false
           }
           this.spinning = false
+          this.setTableH()
           return data
         })
       },
@@ -308,7 +309,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 310
+      this.tableHeight = window.innerHeight - tableSearchH - (this.queryParam.bizState == 'WAIT' ? 283 : 250)
     }
   },
   watch: {
@@ -348,11 +349,8 @@ export default {
 
 <style lang="less">
   .productOfflineAuditList-wrap{
-    .red{
-      color: #ed1c24;
-    }
-    .green{
-      color: #19be6b;
+    .sTable{
+      margin-top:10px;
     }
     .ant-tabs-bar{
       margin: 0;

+ 6 - 5
src/views/productManagement/productUniversal/list.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <a-card size="small" :bordered="false" class="productUniversalList-wrap searchBottomSpace">
+    <a-card size="small" :bordered="false" class="productUniversalList-wrap searchBoxNormal">
       <!-- 搜索条件 -->
       <div ref="tableSearch" class="table-page-search-wrapper">
         <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
@@ -56,17 +56,18 @@
     <a-card size="small" :bordered="false">
       <a-spin :spinning="spinning" tip="Loading...">
         <!-- 操作按钮 -->
-        <div class="table-operator">
-          <a-button id="productUniversalList-add" type="primary" v-if="$hasPermissions('B_productUniversal_add')" class="button-error" @click="handleEdit()">新增</a-button>
+        <div class="table-operator" v-if="$hasPermissions('B_productUniversal_add')">
+          <a-button id="productUniversalList-add" type="primary" @click="handleEdit()">新增</a-button>
         </div>
         <!-- 列表 -->
         <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"
+          :pageSize="30"
           :data="loadData"
           :scroll="{ y: tableHeight }"
           :defaultLoadData="false"
@@ -236,7 +237,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 265
+      this.tableHeight = window.innerHeight - tableSearchH - 240
     }
   },
   watch: {

+ 1 - 1
src/views/productManagement/shelfNoManage/editHwModal.vue

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

+ 7 - 5
src/views/productManagement/shelfNoManage/list.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <a-card size="small" :bordered="false" class="shelfNoMan-wrap searchBottomSpace">
+    <a-card size="small" :bordered="false" class="shelfNoMan-wrap searchBoxNormal">
       <!-- 搜索条件 -->
       <div ref="tableSearch" class="table-page-search-wrapper">
         <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
@@ -89,22 +89,24 @@
       <a-spin :spinning="spinning" tip="Loading...">
         <!-- 操作按钮 -->
         <div class="table-operator">
+          <a-button type="primary" @click="openNewModal" id="shelfNoMan-add">新增</a-button>
           <a-button
             id="shelfNoMan-batchAudit"
             v-if="$hasPermissions('B_shelfNoManage_import')"
             type="primary"
+            ghost
             @click="openGuideModal = true"
           >批量导入</a-button>
-          <a-button type="primary" @click="openNewModal" class="button-warning" id="shelfNoMan-add">新增</a-button>
         </div>
         <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"
           :data="loadData"
+          :pageSize="30"
           :scroll="{ y: tableHeight }"
           :defaultLoadData="false"
           bordered>
@@ -127,7 +129,7 @@
                 size="small"
                 type="link"
                 v-if="$hasPermissions('B_shelfNoManage_detail')"
-                class="button-success"
+                class="button-info"
                 @click="handleDetail(record)"
                 id="shelfNoMan-detail-btn">变更记录</a-button>
             </div>
@@ -305,7 +307,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 265
+      this.tableHeight = window.innerHeight - tableSearchH - 240
     }
   },
   watch: {