Browse Source

样式修改

lilei 1 year ago
parent
commit
03bb5e4403

+ 0 - 43
src/components/Table/index.js

@@ -318,46 +318,6 @@ export default {
         this.updateSelect()
       }
     },
-    /**
-     * 处理交给 table 使用者去处理 clear 事件时,内部选中统计同时调用
-     * @param callback
-     * @returns {*}
-     */
-    renderClear (callback) {
-      if (this.selectedRowKeys.length <= 0) return null
-      return (
-        <a style="margin-left: 24px" onClick={() => {
-          callback()
-          this.clearSelected()
-        }}>清空</a>
-      )
-    },
-    renderAlert () {
-      // 绘制统计列数据
-      const needTotalItems = this.needTotalList.map((item) => {
-        return (<span style="margin-right: 12px">
-          {item.title}总计 <a style="font-weight: 600">{!item.customRender ? item.total : item.customRender(item.total)}</a>
-        </span>)
-      })
-
-      // 绘制 清空 按钮
-      const clearItem = (typeof this.alert.clear === 'boolean' && this.alert.clear) ? (
-        this.renderClear(this.clearSelected)
-      ) : (this.alert !== null && typeof this.alert.clear === 'function') ? (
-        this.renderClear(this.alert.clear)
-      ) : null
-
-      // 绘制 alert 组件
-      return (
-        <a-alert showIcon={true} style="margin-bottom: 16px">
-          <template slot="message">
-            <span style="margin-right: 12px">已选择: <a style="font-weight: 600">{this.selectedRows.length}</a></span>
-            {needTotalItems}
-            {clearItem}
-          </template>
-        </a-alert>
-      )
-    },
     // 自定义行
     customRows(record, index) {
       return {
@@ -376,11 +336,9 @@ export default {
       }
     },
   },
-
   render () {
     const props = {}
     const localKeys = Object.keys(this.$data)
-    const showAlert = (typeof this.alert === 'object' && this.alert !== null && this.alert.show) && typeof this.rowSelection.selectedRowKeys !== 'undefined' || this.alert
     Object.keys(T.props).forEach(k => {
       const localKey = `local${k.substring(0, 1).toUpperCase()}${k.substring(1)}`
       if (localKeys.includes(localKey)) {
@@ -425,7 +383,6 @@ export default {
 
     return (
       <div class="table-wrapper">
-        { showAlert ? this.renderAlert() : null }
         { table }
       </div>
     )

+ 6 - 3
src/components/index.less

@@ -313,9 +313,12 @@
         height: 100%;
         position: relative;
         .ant-pagination.ant-table-pagination{
-          position: absolute;
-          right: 0;
-          bottom: 0;
+           float: none;
+           text-align: center;
+           position: absolute;
+           width: 100%;
+           left: 0;
+           bottom: 0;
         }
       }
     }

+ 0 - 1
src/layouts/BasicLayout.vue

@@ -137,7 +137,6 @@ export default {
     }
     this.collapsed = !this.sidebarOpened
     this.$store.dispatch('ToggleMultiTab', true)
-	  this.$store.dispatch('ToggleColor', '#1890FF')
   },
   mounted () {
     const userAgent = navigator.userAgent

+ 2 - 2
src/views/salesManagement/pushOrderManagement/detail.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="salesDetail-wrap">
+  <div class="pushOrder-wrap">
     <a-spin :spinning="spinning" tip="Loading...">
       <a-page-header :ghost="false" :backIcon="false" class="salesDetail-cont" :style="{marginBottom:!outBizSubSn&&!bizSn?'6px':'0px'}">
         <template slot="subTitle" v-if="!outBizSubSn&&!bizSn">
@@ -372,7 +372,7 @@ export default {
 </script>
 
 <style lang="less">
-  .salesDetail-wrap{
+  .pushOrder-wrap{
     .salesDetail-cont{
       margin-bottom: 6px;
     }

+ 2 - 2
src/views/salesManagement/pushOrderManagement/detailForOut.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="salesDetail-wrap">
+  <div class="pushOrder-forOut-wrap">
     <a-spin :spinning="spinning" tip="Loading...">
       <a-page-header :ghost="false" :backIcon="false" class="salesDetail-cont" :style="{ padding: !outBizSubSn ? '16px 24px' : '0px 24px' }">
         <template slot="subTitle" v-if="!outBizSubSn&&!bizSn">
@@ -330,7 +330,7 @@ export default {
 </script>
 
 <style lang="less">
-  .salesDetail-wrap{
+  .pushOrder-forOut-wrap{
     .ant-card-body:first-child{
       padding-bottom: 0;
     }

+ 4 - 4
src/views/salesManagement/salesQueryNew/comps/activeQueryPart.vue

@@ -179,9 +179,9 @@ export default {
   computed: {
     columns () {
       const arr = [
-        { title: '产品编码', dataIndex: 'productCode', width: '150px', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '产品编码', dataIndex: 'productCode', width: '150px', align: 'left', customRender: function (text) { return text || '--' } },
         { title: '产品名称', dataIndex: 'productName', scopedSlots: { customRender: 'productName' }, align: 'left' },
-        { title: '原厂编码', dataIndex: 'productOrigCode', width: '150px', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '原厂编码', dataIndex: 'productOrigCode', width: '150px', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '品牌', dataIndex: 'productBrandName', width: '100px', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '出库仓库', dataIndex: 'warehouseName', width: '80px', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '库存数量', dataIndex: 'currentStockQty', width: '80px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
@@ -206,7 +206,7 @@ export default {
   },
   watch:{
     advanced(a,b){
-      this.tableHeight = window.innerHeight - (a ? 395 : 350)
+      this.tableHeight = window.innerHeight - (a ? 375 : 330)
     }
   },
   methods: {
@@ -276,7 +276,7 @@ export default {
       }
       this.tabList = tabList
       this.promoProductClz = tabList[0].val
-      this.tableHeight = window.innerHeight - 350
+      this.tableHeight = window.innerHeight - 330
 
       this.resetSearchForm()
     },

+ 4 - 5
src/views/salesManagement/salesQueryNew/comps/queryPart.vue

@@ -162,9 +162,9 @@ export default {
   computed: {
     columns () {
       const arr = [
-        { title: '产品编码', dataIndex: 'productCode', width: '150px', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '产品编码', dataIndex: 'productCode', width: '150px', align: 'left', customRender: function (text) { return text || '--' } },
         { title: '产品名称', dataIndex: 'productName', scopedSlots: { customRender: 'productName' }, align: 'left' },
-        { title: '原厂编码', dataIndex: 'productOrigCode', width: '100px', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '原厂编码', dataIndex: 'productOrigCode', width: '100px', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '品牌', dataIndex: 'productBrandName', width: '80px', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '出库仓库', dataIndex: 'warehouseName', width: '80px', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '库存数量', dataIndex: 'currentStockQty', width: '80px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
@@ -182,8 +182,7 @@ export default {
   },
   watch:{
     advanced(a,b){
-      console.log(a,b)
-      this.tableHeight = window.innerHeight - (a ? 355 : 310)
+      this.tableHeight = window.innerHeight - (a ? 325 : 280)
     }
   },
   methods: {
@@ -229,7 +228,7 @@ export default {
     },
     pageInit (data, promo) {
       this.buyerSn = data.buyerSn
-      this.tableHeight = window.innerHeight - 310
+      this.tableHeight = window.innerHeight - 280
       this.resetSearchForm()
     },
     // 刷新当前页面

+ 1 - 1
src/views/salesManagement/salesQueryNew/detailAll.vue

@@ -315,7 +315,7 @@
           { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
           { title: '产品编码', dataIndex: 'productCode', width: '10%', scopedSlots: { customRender: 'productCode' }, align: 'left' },
           { title: '产品名称', dataIndex: 'productName', width: '20%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
-          { title: '原厂编码', dataIndex: 'productOrigCode', width: '10%', align: 'left', customRender: function (text) { return text || '--' } },
+          { title: '原厂编码', dataIndex: 'productOrigCode', width: '10%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true  },
           { title: '出库仓库', dataIndex: 'warehouseName', width: '8%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
           // { title: '成本价', dataIndex: 'showCost', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
           // { title: '省级价', dataIndex: 'provincePrice', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },