lilei 1 gadu atpakaļ
vecāks
revīzija
02fb4be369

+ 4 - 4
src/views/productManagement/newProduct/list.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <a-card size="small" :bordered="false" class="productInfoList-wrap searchBottomSpace">
+    <a-card size="small" :bordered="false" class="productInfoList-wrap searchBoxNormal">
       <!-- 搜索条件 -->
       <div ref="tableSearch" class="table-page-search-wrapper">
         <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
@@ -55,13 +55,13 @@
         <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"
           :defaultLoadData="false"
-          :scroll="{ x: 1090, y: tableHeight }"
+          :scroll="{ y: tableHeight }"
           bordered>
           <!-- 上/下线时间 表头 -->
           <template slot="auditTimeTit">
@@ -218,7 +218,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 225
+      this.tableHeight = window.innerHeight - tableSearchH - 200
     }
   },
   watch: {

+ 17 - 15
src/views/productManagement/productInfo/list.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <a-card size="small" :bordered="false" class="productInfoList-wrap searchBottomSpace">
+    <a-card size="small" :bordered="false" class="productInfoList-wrap searchBoxNormal">
       <!-- 搜索条件 -->
       <div ref="tableSearch" class="table-page-search-wrapper">
         <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
@@ -91,41 +91,43 @@
       <a-spin :spinning="spinning" tip="Loading...">
         <!-- 操作按钮 -->
         <div class="table-operator">
-          <a-button id="productInfoList-add" type="primary" v-if="$hasPermissions('B_productInfo_add')" class="button-error" @click="handleEdit()">新增</a-button>
+          <a-button type="primary" v-if="$hasPermissions('B_productInfo_add')" @click="handleEdit()">新增</a-button>
+          <a-button type="primary" class="button-info" @click="handleMenuClick({key:'1'})" v-if="$hasPermissions('B_productInfo_batchImport')"> 新增产品导入</a-button>
+          <a-button type="primary" class="button-info" @click="handleMenuClick({key:'2'})" v-if="$hasPermissions('B_offlineProduct_import')"> 下线产品导入</a-button>
+          
           <a-button
             id="productInfoList-batchAudit"
             type="primary"
             v-if="$hasPermissions('B_productInfo_batchAudit')"
-            class="button-warning"
+            ghost
+            class="button-info"
             :loading="loadingAudit"
             @click="handleBatchAudit"
-            style="margin: 0 10px;">批量审核</a-button>
+            style="margin: 0 5px;">批量审核</a-button>
           <a-button
             id="productInfoList-batchLaunch"
             type="primary"
             v-if="$hasPermissions('B_productInfo_batchLaunch')"
-            class="button-primary"
+            ghost
             :loading="loadingLaunch"
             @click="handleBatchLaunch"
-            style="margin: 0 10px;">批量上线</a-button>
+            style="margin: 0 5px;">批量上线</a-button>
           <a-button
             id="productInfoList-batchDownline"
             type="primary"
             v-if="$hasPermissions('B_productInfo_batchDownline')"
-            class="button-grey"
+            ghost
             :loading="loadingDownline"
             @click="handleBatchDownline"
-            style="margin: 0 10px;">批量下线</a-button>
-          <a-button type="primary" class="button-error" @click="handleMenuClick({key:'1'})" v-if="$hasPermissions('B_productInfo_batchImport')" style="margin: 0 10px;"> 新增产品导入</a-button>
-          <a-button type="primary" class="button-info" @click="handleMenuClick({key:'2'})" v-if="$hasPermissions('B_offlineProduct_import')" style="margin: 0 10px;"> 下线产品导入</a-button>
-          <span style="margin-left: 8px" v-if="$hasPermissions('B_productInfo_batchAudit') || $hasPermissions('B_productInfo_batchLaunch') || $hasPermissions('B_productInfo_batchDownline')">
-            <template v-if="rowSelectionInfo && rowSelectionInfo.selectedRowKeys.length>0">{{ `已选 ${rowSelectionInfo.selectedRowKeys.length} 项` }}</template>
-          </span>
+            style="margin: 0 5px;">批量下线</a-button>
+           <span style="margin-left: 8px" v-if="$hasPermissions('B_productInfo_batchAudit') || $hasPermissions('B_productInfo_batchLaunch') || $hasPermissions('B_productInfo_batchDownline')">
+              <template v-if="rowSelectionInfo && rowSelectionInfo.selectedRowKeys.length>0">{{ `已选 ${rowSelectionInfo.selectedRowKeys.length} 项` }}</template>
+            </span>
         </div>
         <s-table
           class="sTable fixPagination"
           ref="table"
-          :style="{ height: tableHeight+84.5+'px' }"
+          :style="{ height: tableHeight+70+'px' }"
           size="small"
           :row-selection=" showSelect?{ columnWidth: 40 }:null"
           :rowKey="(record) => record.id"
@@ -613,7 +615,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 265
+      this.tableHeight = window.innerHeight - tableSearchH - 240
     }
   },
   watch: {

+ 21 - 16
src/views/productManagement/productLaunchAudit/list.vue

@@ -1,16 +1,6 @@
 <template>
   <div class="productLaunchAuditList-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)">
@@ -43,19 +33,29 @@
         </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_productLaunchAudit_batchAudit')&&queryParam.bizState == 'WAIT'" id="productLaunchAudit-export" :loading="loading" @click="handleBatchAudit">批量审核</a-button>
-          <span style="margin-left: 5px" v-if="$hasPermissions('B_productLaunchAudit_batchAudit')">
+        <div v-if="$hasPermissions('B_productLaunchAudit_batchAudit')&&queryParam.bizState == 'WAIT'">
+          <a-button type="primary" ghost id="productLaunchAudit-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>
         <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"
@@ -63,6 +63,7 @@
           @rowSelection="rowSelectionFun"
           :columns="columns"
           :data="loadData"
+          :pageSize="30"
           :scroll="{ y: tableHeight }"
           :defaultLoadData="false"
           bordered>
@@ -138,6 +139,7 @@ export default {
             this.disabled = false
           }
           this.spinning = false
+          this.setTableH()
           return data
         })
       },
@@ -291,7 +293,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 312
+      this.tableHeight = window.innerHeight - tableSearchH - (this.queryParam.bizState == 'WAIT' ? 280 : 250)
     }
   },
   watch: {
@@ -321,6 +323,9 @@ export default {
 </script>
 <style lang="less">
   .productLaunchAuditList-wrap{
+    .sTable{
+      margin-top:10px;
+    }
     .ant-tabs-bar{
       margin: 0;
     }

+ 7 - 7
src/views/productManagement/productPricing/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">
@@ -62,27 +62,27 @@
         <!-- 操作按钮 -->
         <div class="table-operator">
           <a-button
-            style="margin: 0 15px 0 0;"
+            style="margin: 0 10px 0 0;"
             v-if="$hasPermissions('B_productPriceImport')"
             id="productPricingList-add"
             @click="openGuideModal=true"
             type="primary"
-            class="button-error">定价导入</a-button>
+            >定价导入</a-button>
           <a-button
             id="productPricingList-batchAudit"
             type="primary"
-            class="button-warning"
+            ghost
             :loading="spinning"
             @click="handleBatchAudit"
             v-if="$hasPermissions('B_productPricing_audit')"
-            style="margin: 0 15px 0 0;">批量审核</a-button>
+            style="margin: 0 10px 0 0;">批量审核</a-button>
           <span v-if="$hasPermissions('B_productPricing_audit')&&selTotal">已选{{ selTotal }}项</span>
         </div>
         <!-- 列表 -->
         <s-table
           class="sTable fixPagination"
           ref="table"
-          :style="{ height: tableHeight+84.5+'px' }"
+          :style="{ height: tableHeight+70+'px' }"
           size="small"
           :row-selection="$hasPermissions('B_productPricing_audit') ? { columnWidth: '4%', getCheckboxProps: record => ({ props: { disabled: record.pricingState!='WAIT_PRICING_AUDIT' } })}: null"
           @rowSelection="rowSelectionFun"
@@ -344,7 +344,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 265
+      this.tableHeight = window.innerHeight - tableSearchH - 240
     }
   },
   watch: {