Browse Source

Merge branch 'develop_yh28' of http://git.chelingzhu.com/jianguan-web/jg-ocs-html into develop_yh28

chenrui 1 năm trước cách đây
mục cha
commit
7c73b25cbf
34 tập tin đã thay đổi với 131 bổ sung123 xóa
  1. 1 1
      src/views/basicData/transferTypeManagement/editModal.vue
  2. 3 3
      src/views/basicData/transferTypeManagement/list.vue
  3. 1 1
      src/views/basicData/warehouse/editModal.vue
  4. 1 1
      src/views/basicData/warehouse/list.vue
  5. 1 1
      src/views/basicData/warehouse/storingLocation/editModal.vue
  6. 2 2
      src/views/basicData/warehouse/storingLocation/list.vue
  7. 2 2
      src/views/power/role/menuModal.vue
  8. 3 3
      src/views/power/role/roleList.vue
  9. 2 2
      src/views/power/role/roleModal.vue
  10. 3 3
      src/views/power/user/userList.vue
  11. 2 2
      src/views/power/user/userModal.vue
  12. 6 5
      src/views/productManagement/priceChangeRecord/list.vue
  13. 1 1
      src/views/productManagement/productBrand/editModal.vue
  14. 6 5
      src/views/productManagement/productBrand/list.vue
  15. 1 1
      src/views/productManagement/productCategory/editModal.vue
  16. 2 2
      src/views/productManagement/productCategory/list.vue
  17. 4 3
      src/views/productManagement/productLevel/list.vue
  18. 3 3
      src/views/productManagement/productNotOnline/list.vue
  19. 20 22
      src/views/productManagement/productOfflineAudit/list.vue
  20. 6 5
      src/views/productManagement/productUniversal/list.vue
  21. 1 1
      src/views/productManagement/shelfNoManage/editHwModal.vue
  22. 7 5
      src/views/productManagement/shelfNoManage/list.vue
  23. 3 3
      src/views/promotionRulesManagement/dealerPromotions/detail.vue
  24. 6 6
      src/views/promotionRulesManagement/dealerPromotions/list.vue
  25. 3 3
      src/views/promotionRulesManagement/promotionManagement/list.vue
  26. 2 2
      src/views/setting/erpMessageManagement/list.vue
  27. 1 1
      src/views/setting/noticeManagement/editModal.vue
  28. 1 1
      src/views/setting/noticeManagement/list.vue
  29. 8 7
      src/views/supplierManagement/associatedProductDetails/list.vue
  30. 8 7
      src/views/supplierManagement/costSetRecord/list.vue
  31. 6 6
      src/views/supplierManagement/costSetting/addProductModal.vue
  32. 7 6
      src/views/supplierManagement/costSetting/list.vue
  33. 3 3
      src/views/supplierManagement/costSetting/settingCost.vue
  34. 5 4
      src/views/supplierManagement/supplierInfo/list.vue

+ 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>

+ 2 - 2
src/views/power/role/menuModal.vue

@@ -39,8 +39,8 @@
           </a-tree>
           </div>
           <a-form-model-item :label-col="{span: 0}" :wrapper-col="{span: 24}" style="text-align: center;margin: 18px 0 0;">
-            <a-button type="primary" id="roleMenuEdit-save" @click="handleSubmit()" :style="{ marginRight: '8px' }">保存</a-button>
-            <a-button id="roleMenuEdit-cancel" :style="{ marginLeft: '8px' }" @click="isshow=false">取消</a-button>
+            <a-button id="roleMenuEdit-cancel" :style="{ marginRight: '10px' }" @click="isshow=false">取消</a-button>
+            <a-button type="primary" id="roleMenuEdit-save" @click="handleSubmit()">保存</a-button>
           </a-form-model-item>
         </a-form-model>
       </a-spin>

+ 3 - 3
src/views/power/role/roleList.vue

@@ -31,12 +31,12 @@
     <a-card size="small" :bordered="false">
       <a-spin :spinning="spinning" tip="Loading...">
         <div class="table-operator">
-          <a-button type="primary" v-if="$hasPermissions('B_power_role_add')" class="button-error" @click="openModal" id="roleList-openModal">新增</a-button>
+          <a-button type="primary" v-if="$hasPermissions('B_power_role_add')" @click="openModal" id="roleList-openModal">新增</a-button>
         </div>
         <s-table
           class="sTable fixPagination"
           ref="table"
-          :style="{ height: tableHeight+84.5+'px' }"
+          :style="{ height: tableHeight+70+'px' }"
           size="small"
           rowKey="id"
           :columns="columns"
@@ -269,7 +269,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 250
+      this.tableHeight = window.innerHeight - tableSearchH - 236
     }
   },
   watch: {

+ 2 - 2
src/views/power/role/roleModal.vue

@@ -44,8 +44,8 @@
               placeholder="请输入描述(最多500个字符)"/>
           </a-form-model-item>
           <a-form-model-item :label-col="{span: 0}" :wrapper-col="{span: 24}" style="text-align: center;">
-            <a-button type="primary" @click="handleSubmit()" :style="{ marginRight: '8px' }">保存</a-button>
-            <a-button :style="{ marginLeft: '8px' }" @click="isshow=false">取消</a-button>
+            <a-button :style="{ marginRight: '10px' }" @click="isshow=false">取消</a-button>
+            <a-button type="primary" @click="handleSubmit()">保存</a-button>
           </a-form-model-item>
         </a-form-model>
       </a-spin>

+ 3 - 3
src/views/power/user/userList.vue

@@ -30,13 +30,13 @@
     <a-card size="small" :bordered="false">
       <a-spin :spinning="spinning" tip="Loading...">
         <div class="table-operator">
-          <a-button type="primary" v-if="$hasPermissions('B_power_user_add')" class="button-error" @click="openModal">新增</a-button>
+          <a-button type="primary" v-if="$hasPermissions('B_power_user_add')" @click="openModal">新增</a-button>
         </div>
         <s-table
           class="sTable fixPagination"
           ref="table"
           size="small"
-          :style="{ height: tableHeight+84.5+'px' }"
+          :style="{ height: tableHeight+70+'px' }"
           rowKey="id"
           :columns="columns"
           :data="loadData"
@@ -238,7 +238,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 255
+      this.tableHeight = window.innerHeight - tableSearchH - 240
     }
   },
   watch: {

+ 2 - 2
src/views/power/user/userModal.vue

@@ -101,8 +101,8 @@
             </a-col>
           </a-row>
           <a-form-model-item :label-col="{span: 0}" :wrapper-col="{span: 24}" style="text-align: center;">
-            <a-button type="primary" @click="handleSubmit()" :style="{ marginRight: '8px' }">保存</a-button>
-            <a-button :style="{ marginLeft: '8px' }" @click="isshow=false">取消</a-button>
+            <a-button :style="{ marginRight: '10px' }" @click="isshow=false">取消</a-button>
+            <a-button type="primary" @click="handleSubmit()">保存</a-button>
           </a-form-model-item>
         </a-form-model>
       </a-spin>

+ 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: {

+ 3 - 3
src/views/promotionRulesManagement/dealerPromotions/detail.vue

@@ -40,9 +40,9 @@
       </a-card>
       <a-card size="small" title="规则设置" :bordered="false" class="pages-wrap">
         <div class="btnGroup" v-if="$hasPermissions('B_rulesAddEdit')&&$route.query.type=='rule'">
-          <a-button type="primary" class="button-warning" @click="openBtnModal('SendProducts')" :disabled="disabled">买产品送产品</a-button>
-          <a-button style="margin:0 10px" type="primary" class="button-warn" @click="openBtnModal('SendAmount')" :disabled="disabled">买产品送采购额</a-button>
-          <a-button type="primary" @click="openBtnModal('SpecialOffer')" :disabled="disabled">特价产品</a-button>
+          <a-button type="primary" class="button-info" @click="openBtnModal('SendProducts')" :disabled="disabled">买产品送产品</a-button>
+          <a-button type="primary" class="button-info" @click="openBtnModal('SendAmount')" :disabled="disabled">买产品送采购额</a-button>
+          <a-button type="primary" style="margin-left:5px;" @click="openBtnModal('SpecialOffer')" :disabled="disabled">特价产品</a-button>
         </div>
         <!-- 列表 -->
         <s-table

+ 6 - 6
src/views/promotionRulesManagement/dealerPromotions/list.vue

@@ -61,13 +61,13 @@
       <a-spin :spinning="spinning" tip="Loading...">
         <!-- 操作按钮 -->
         <div class="table-operator" v-if="$hasPermissions('B_dealerPromotionAdd')">
-          <a-button id="promotionList-add" type="primary" class="button-error" @click="handleAdd">新增</a-button>
+          <a-button id="promotionList-add" type="primary" @click="handleAdd">新增</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.sparePartsReturnNo"
           :columns="columns"
@@ -221,11 +221,11 @@ export default {
       columns: [
         { title: '序号', dataIndex: 'no', width: '5%', align: 'center' },
         { title: '创建时间', dataIndex: 'createDate', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '促销名称', scopedSlots: { customRender: 'promotionName' }, width: '18%', align: 'center' },
-        { title: '促销简称', dataIndex: 'description', width: '14%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '促销名称', scopedSlots: { customRender: 'promotionName' }, width: '18%', align: 'left' },
+        { title: '促销简称', dataIndex: 'description', width: '14%', align: 'left', customRender: function (text) { return text || '--' } },
         { title: '促销时间', scopedSlots: { customRender: 'promotionTime' }, width: '13%', align: 'center' },
         { title: '参与客户', scopedSlots: { customRender: 'joinCustomers' }, width: '7%', align: 'center', ellipsis: true },
-        { title: '促销描述', dataIndex: 'content', width: '15%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '促销描述', dataIndex: 'content', width: '15%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '活动状态', dataIndex: 'stateDictValue', width: '7%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '发布状态', scopedSlots: { customRender: 'releaseStatus' }, width: '7%', align: 'center', ellipsis: true },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '10%', align: 'center' }
@@ -414,7 +414,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 250
+      this.tableHeight = window.innerHeight - tableSearchH - 240
     }
   },
   watch: {

+ 3 - 3
src/views/promotionRulesManagement/promotionManagement/list.vue

@@ -53,12 +53,12 @@
       <a-spin :spinning="spinning" tip="Loading...">
         <!-- 操作按钮 -->
         <div class="table-operator" v-if="$hasPermissions('B_promotionManagementAdd')">
-          <a-button type="primary" class="button-error" @click="openAddModal = true">新增</a-button>
+          <a-button type="primary" @click="openAddModal = true">新增</a-button>
         </div>
         <s-table
           class="sTable fixPagination"
           ref="table"
-          :style="{ height: tableHeight+94.5+'px' }"
+          :style="{ height: tableHeight+70+'px' }"
           size="small"
           :rowKey="(record) => record.id"
           :columns="columns"
@@ -352,7 +352,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 265
+      this.tableHeight = window.innerHeight - tableSearchH - 240
     }
   },
   watch: {

+ 2 - 2
src/views/setting/erpMessageManagement/list.vue

@@ -41,7 +41,7 @@
         <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"
@@ -184,7 +184,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 215
+      this.tableHeight = window.innerHeight - tableSearchH - 200
     }
   },
   watch: {

+ 1 - 1
src/views/setting/noticeManagement/editModal.vue

@@ -75,8 +75,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>

+ 1 - 1
src/views/setting/noticeManagement/list.vue

@@ -32,7 +32,7 @@
       <a-spin :spinning="spinning" tip="Loading...">
         <!-- 操作按钮 -->
         <div class="table-operator">
-          <a-button id="noticeManagementList-add" type="primary" class="button-error" @click="handleAdd">新增</a-button>
+          <a-button id="noticeManagementList-add" type="primary" @click="handleAdd">新增</a-button>
         </div>
         <!-- 总计 -->
         <!-- <a-alert type="info" style="margin-bottom:10px">

+ 8 - 7
src/views/supplierManagement/associatedProductDetails/list.vue

@@ -50,10 +50,11 @@
         <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"
@@ -122,13 +123,13 @@ export default {
       const _this = this
       const arr = [
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
-        { title: '供应商名称', dataIndex: 'supplierName', width: '20%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '供应商名称', dataIndex: 'supplierName', width: '20%', align: 'left', customRender: function (text) { return text || '--' } },
         { title: '品牌', dataIndex: 'product.productBrandName', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '产品分类', scopedSlots: { customRender: 'productType' }, width: '18%', align: 'center' },
-        { title: '产品名称', dataIndex: 'product.name', width: '20%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '产品编码', dataIndex: 'product.code', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '产品分类', scopedSlots: { customRender: 'productType' }, width: '18%', align: 'left' },
+        { title: '产品名称', dataIndex: 'product.name', width: '20%', align: 'left', customRender: function (text) { return text || '--' } },
+        { title: '产品编码', dataIndex: 'product.code', width: '8%', align: 'left', customRender: function (text) { return text || '--' } },
+        { title: '原厂编码', dataIndex: 'product.origCode', width: '8%', align: 'left', customRender: function (text) { return text || '--' } },
         { title: '成本价', dataIndex: 'cost', width: '6%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
-        { title: '原厂编码', dataIndex: 'product.origCode', width: '8%', align: 'center', customRender: function (text) { return text || '--' } }
       ]
       return arr
     }
@@ -160,7 +161,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 215
+      this.tableHeight = window.innerHeight - tableSearchH - 200
     }
   },
   watch: {

+ 8 - 7
src/views/supplierManagement/costSetRecord/list.vue

@@ -53,11 +53,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>
@@ -103,12 +104,12 @@ export default {
       columns: [
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
         { title: '变更时间', dataIndex: 'auditTime', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '产品名称', dataIndex: 'product.name', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '产品编码', dataIndex: 'product.code', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '原厂编码', dataIndex: 'product.origCode', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '产品名称', dataIndex: 'product.name', width: '15%', align: 'left', customRender: function (text) { return text || '--' } },
+        { title: '产品编码', dataIndex: 'product.code', width: '10%', align: 'left', customRender: function (text) { return text || '--' } },
+        { title: '原厂编码', dataIndex: 'product.origCode', width: '10%', align: 'left', customRender: function (text) { return text || '--' } },
         { title: '产品品牌', dataIndex: 'product.productBrandName', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '产品分类', scopedSlots: { customRender: 'productType' }, width: '12%', align: 'center' },
-        { title: '供应商名称', dataIndex: 'supplierName', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '产品分类', scopedSlots: { customRender: 'productType' }, width: '12%', align: 'left' },
+        { title: '供应商名称', dataIndex: 'supplierName', width: '15%', align: 'left', customRender: function (text) { return text || '--' } },
         { title: '变更前', dataIndex: 'oldCost', width: '7%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
         { title: '变更后', dataIndex: 'newCost', width: '7%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } }
 
@@ -173,7 +174,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 215
+      this.tableHeight = window.innerHeight - tableSearchH - 200
     }
   },
   watch: {

+ 6 - 6
src/views/supplierManagement/costSetting/addProductModal.vue

@@ -75,6 +75,12 @@
         </div>
         <!-- 按钮 -->
         <div class="btn-con">
+          <a-button
+            id="chooseProducts-cancel"
+            size="large"
+            class="button-cancel"
+            @click="isShow=false"
+            style="padding: 0 60px;margin-right: 15px;">取消</a-button>
           <a-button
             type="primary"
             id="chooseProducts-save"
@@ -82,12 +88,6 @@
             class="button-primary"
             @click="handleSave"
             style="padding: 0 60px;">保存</a-button>
-          <a-button
-            id="chooseProducts-cancel"
-            size="large"
-            class="button-cancel"
-            @click="isShow=false"
-            style="padding: 0 60px;margin-left: 15px;">取消</a-button>
         </div>
       </div>
     </a-spin>

+ 7 - 6
src/views/supplierManagement/costSetting/list.vue

@@ -64,13 +64,13 @@
         <div class="table-operator">
           <a-button type="primary" v-if="$hasPermissions('B_costSetAddProduct')" class="button-error" @click="newProduct=true">新增</a-button>
           <a-button type="primary" v-if="$hasPermissions('B_costSetBatchImport')" class="button-warning" @click="handleBatchImport">批量导入</a-button>
-          <a-button type="primary" v-if="$hasPermissions('B_costSetAudit')" class="button-warning" @click="handleBatchAudit">批量审核</a-button>
+          <a-button type="primary" ghost v-if="$hasPermissions('B_costSetAudit')" @click="handleBatchAudit">批量审核</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.supplierProductSn"
           rowKeyName="supplierProductSn"
@@ -78,6 +78,7 @@
           @rowSelection="rowSelectionFun"
           :columns="columns"
           :data="loadData"
+          :pageSize="30"
           :scroll="{ y: tableHeight }"
           :defaultLoadData="false"
           bordered>
@@ -190,10 +191,10 @@ export default {
       const arr = [
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
         { title: '产品名称', dataIndex: 'product.name', width: '12%', align: 'left', customRender: function (text) { return text || '--' } },
-        { title: '产品编码', dataIndex: 'product.code', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '原厂编码', dataIndex: 'product.origCode', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '产品编码', dataIndex: 'product.code', width: '8%', align: 'left', customRender: function (text) { return text || '--' } },
+        { title: '原厂编码', dataIndex: 'product.origCode', width: '8%', align: 'left', customRender: function (text) { return text || '--' } },
         { title: '产品品牌', dataIndex: 'product.productBrandName', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '产品分类', scopedSlots: { customRender: 'productType' }, width: '12%', align: 'center' },
+        { title: '产品分类', scopedSlots: { customRender: 'productType' }, width: '12%', align: 'left' },
         { title: '供应商名称', dataIndex: 'supplierName', width: '12%', align: 'left', customRender: function (text) { return text || '--' } },
         { title: '审核时间', dataIndex: 'auditTime', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '审核状态', dataIndex: 'auditStateDictValue', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
@@ -315,7 +316,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 250
+      this.tableHeight = window.innerHeight - tableSearchH - 240
     }
   },
   watch: {

+ 3 - 3
src/views/supplierManagement/costSetting/settingCost.vue

@@ -42,12 +42,12 @@
               style="width: 100%;" />
           </a-form-model-item>
           <div style="display: flex;justify-content: center;padding: 30px 0;">
+            <a-button style="margin-right: 15px;" @click="cansel">
+              取消
+            </a-button>
             <a-button type="primary" @click="onSubmit">
               确定
             </a-button>
-            <a-button style="margin-left: 15px;" @click="cansel">
-              取消
-            </a-button>
           </div>
         </a-form-model></a-spin>
       </a-form-model>

+ 5 - 4
src/views/supplierManagement/supplierInfo/list.vue

@@ -22,16 +22,17 @@
       <a-spin :spinning="spinning" tip="Loading...">
         <!-- 操作按钮 -->
         <div class="table-operator">
-          <a-button id="supplierInfoList-add" type="primary" v-if="$hasPermissions('B_supplierInfo_add')" class="button-error" @click="handleEdit()">新增</a-button>
+          <a-button id="supplierInfoList-add" type="primary" v-if="$hasPermissions('B_supplierInfo_add')" @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"
@@ -84,7 +85,7 @@ export default {
       columns: [
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
         { title: '创建时间', dataIndex: 'createDate', width: '13%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '供应商名称', dataIndex: 'supplierName', width: '30%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '供应商名称', dataIndex: 'supplierName', width: '30%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '联系人', dataIndex: 'contact', align: 'center', width: '18%', ellipsis: true, customRender: function (text) { return text || '--' } },
         { title: '产品款数', dataIndex: 'totalProductCategory', width: '10%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '状态', scopedSlots: { customRender: 'enabledFlag' }, width: '10%', align: 'center' },
@@ -157,7 +158,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 255
+      this.tableHeight = window.innerHeight - tableSearchH - 238
     }
   },
   watch: {