Browse Source

bug 修复

lilei 3 years ago
parent
commit
43997ac1e4

+ 1 - 1
src/components/Menu/SideMenu.vue

@@ -12,7 +12,7 @@
       :theme="theme"
       :mode="mode"
       @select="onSelect"
-      style="padding: 16px 0px;"></s-menu>
+      style="padding: 10px 0px;"></s-menu>
   </a-layout-sider>
 
 </template>

+ 1 - 1
src/components/MultiTab/MultiTab.vue

@@ -160,7 +160,7 @@ export default {
             hideAdd
             type={'editable-card'}
             v-model={this.activeKey}
-            tabBarStyle={{ background: '#FFF', margin: 0, paddingLeft: '16px', paddingTop: '1px' }}
+            tabBarStyle={{ background: '#FFF', margin: 0, paddingLeft: '10px', paddingTop: '1px' }}
             {...{ on: { edit: onEdit } }}>
             {panes}
           </a-tabs>

+ 1 - 1
src/components/Table/index.js

@@ -11,7 +11,7 @@ export default {
 
       localLoading: false,
       localDataSource: [],
-      localPagination: Object.assign({}, this.pagination)
+      localPagination: Object.assign({'show-total':total => `共 ${total} 条`}, this.pagination)
     }
   },
   props: Object.assign({}, T.props, {

+ 19 - 16
src/components/global.less

@@ -18,7 +18,7 @@ body {
   &.tablet {
     .ant-layout-content {
       .content {
-        margin: 24px 0 0;
+        margin: 12px 0 0;
       }
     }
 
@@ -61,7 +61,7 @@ body {
   
   .trigger {
     font-size: 20px;
-    line-height: 64px;
+    line-height: 44px;
     padding: 0 24px;
     cursor: pointer;
     transition: color 0.3s;
@@ -94,7 +94,7 @@ body {
       position: fixed;
       z-index: 8;
       width: 100%;
-      top: 64px;
+      top: 44px;
       right:0;
       margin: auto;
     }
@@ -147,7 +147,7 @@ body {
       position: fixed;
       z-index: 8;
       width: 100%;
-      top: 64px;
+      top: 44px;
       right:0;
       margin: auto;
       &.ant-header-side-opened {
@@ -161,13 +161,16 @@ body {
   }
 
   .header {
-    height: 64px;
+    height: 44px;
     padding: 0 12px 0 0;
     background: #fff;
     box-shadow: 0 1px 4px rgba(0, 21, 41, 0.08);
     position: relative;
   }
-
+  .ant-layout-header{
+    height: 44px;
+    line-height: 44px;
+  }
   .header,
   .top-nav-header-index {
     .user-wrapper {
@@ -227,9 +230,9 @@ body {
           }
 
           .logo.top-nav-header {
-            flex: 0 0 56px;
+            flex: 0 0 36px;
             text-align: center;
-            line-height: 58px;
+            line-height: 38px;
             h1 {
               display: none;
             }
@@ -279,14 +282,14 @@ body {
       margin: auto;
       padding-left: 0;
       display: flex;
-      height: 64px;
+      height: 44px;
 
       .ant-menu.ant-menu-horizontal {
         max-width: 835px;
         flex: 0 1 835px;
         border: none;
-        height: 64px;
-        line-height: 64px;
+        height: 44px;
+        line-height: 44px;
       }
 
       .header-index-left {
@@ -296,9 +299,9 @@ body {
         .logo.top-nav-header {
           flex: 0 0 auto;
           width: auto;
-          height: 64px;
+          height: 44px;
           position: relative;
-          line-height: 64px;
+          line-height: 44px;
           transition: all 0.3s;
           overflow: hidden;
 
@@ -324,7 +327,7 @@ body {
       .header-index-right {
         flex: 0 0 238px;
         align-self: flex-end;
-        height: 64px;
+        height: 44px;
         overflow: hidden;
 
         .content-box {
@@ -414,10 +417,10 @@ body {
   
   .logo {
     position: relative;
-    height: 64px;
+    height: 44px;
     padding-left: 10px;
     overflow: hidden;
-    line-height: 64px;
+    line-height: 44px;
     background: #002140;
     transition: all .3s;
 

+ 0 - 1
src/components/index.less

@@ -4,7 +4,6 @@
 @ant-pro-prefix             : ant-pro;
 @ant-global-sider-zindex    : 106;
 @ant-global-header-zindex   : 105;
-
 .ant-input-disabled{
   color: #666;
   background-color: #f8f8f8;

+ 1 - 1
src/layouts/BasicLayout.vue

@@ -39,7 +39,7 @@
         @toggle="toggle"
       />
       <!-- layout content -->
-      <a-layout-content :style="{ height: '100%', margin: '24px 24px 0', paddingTop: multiTab&&fixedHeader ? '105px' : (!multiTab&&fixedHeader?'65px':'0') }">
+      <a-layout-content :style="{ height: '100%', margin: '24px 24px 0', paddingTop: multiTab&&fixedHeader ? '85px' : (!multiTab&&fixedHeader?'45px':'0') }">
         <transition name="page-transition">
           <route-view/>
         </transition>

+ 2 - 2
src/views/reportData/actualSalesReport/list.vue

@@ -194,8 +194,8 @@ export default {
                 },
                 {
                   title: '刹车片',
-                  dataIndex: 'pp4',
-                  align: 'jpScpAmount',
+                  dataIndex: 'jpScpAmount',
+                  align: 'center',
                   width: 100,
                   customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
                 },

+ 2 - 2
src/views/reportData/salesAmountReport/list.vue

@@ -194,8 +194,8 @@ export default {
                 },
                 {
                   title: '刹车片',
-                  dataIndex: 'pp4',
-                  align: 'jpScpAmount',
+                  dataIndex: 'jpScpAmount',
+                  align: 'center',
                   width: 100,
                   customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
                 },

+ 2 - 2
src/views/reportData/salesSlipReport/list.vue

@@ -201,8 +201,8 @@ export default {
                 },
                 {
                   title: '刹车片',
-                  dataIndex: 'pp4',
-                  align: 'jpScpAmount',
+                  dataIndex: 'jpScpAmount',
+                  align: 'center',
                   width: 100,
                   customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
                 },

+ 21 - 21
src/views/salesManagement/salesQuery/list.vue

@@ -102,11 +102,11 @@
       <s-table
         class="sTable"
         ref="table"
-        size="default"
+        size="small"
         :rowKey="(record) => record.id"
         :columns="columns"
         :data="loadData"
-        :scroll="{ x: 2640, y:tableHeight }"
+        :scroll="{ x: 1700, y: tableHeight }"
         bordered>
         <!-- 销售单号 -->
         <template slot="salesBillNo" slot-scope="text, record">
@@ -240,25 +240,25 @@ export default {
       },
       // 表头
       columns: [
-        { title: '序号', dataIndex: 'no', width: 80, align: 'center' },
-        { title: '创建时间', dataIndex: 'createDate', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '单据来源', dataIndex: 'salesBillSourceDictValue', width: 120, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '销售单号', scopedSlots: { customRender: 'salesBillNo' }, width: 210, align: 'center' },
-        { title: '采购单号', dataIndex: 'purchaseBillNo', width: 210, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '序号', dataIndex: 'no', width: 60, align: 'center' },
+        { title: '创建时间', dataIndex: 'createDate', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '单据来源', dataIndex: 'salesBillSourceDictValue', width: 80, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '销售单号', scopedSlots: { customRender: 'salesBillNo' }, width: 120, align: 'center' },
+        { title: '采购单号', dataIndex: 'purchaseBillNo', width: 120, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '客户名称', dataIndex: 'buyerName', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '总数量', dataIndex: 'totalQty', scopedSlots: { customRender: 'totalQty' }, width: 100, align: 'center' },
-        { title: '总售价', dataIndex: 'totalAmount', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? ('¥' + text) : '--') } },
-        { title: '已下推数量', dataIndex: 'totalPushedQty', width: 120, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '已发货数量', dataIndex: 'totalDispatchQty', width: 120, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '已取消数量', dataIndex: 'totalCancelQty', width: 120, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '待下推数量', dataIndex: 'totalUnpushedQty', width: 120, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '收款方式', dataIndex: 'settleStyleSnDictValue', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '审核时间', dataIndex: 'auditDate', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '最近备货时间', dataIndex: 'lastStockUpDate', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '业务状态', dataIndex: 'billStatusDictValue', width: 110, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '财务状态', dataIndex: 'financialStatus', scopedSlots: { customRender: 'financialStatus' }, width: 110, align: 'center' },
-        { title: '打印次数', dataIndex: 'detailPrintTimes', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '操作', scopedSlots: { customRender: 'action' }, width: 220, align: 'center', fixed: 'right' }
+        { title: '总数量', dataIndex: 'totalQty', scopedSlots: { customRender: 'totalQty' }, width: 60, align: 'center' },
+        { title: '总售价', dataIndex: 'totalAmount', width: 80, align: 'center', customRender: function (text) { return ((text || text == 0) ? ('¥' + text) : '--') } },
+        { title: '已下推数量', dataIndex: 'totalPushedQty', width: 60, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '已发货数量', dataIndex: 'totalDispatchQty', width: 60, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '已取消数量', dataIndex: 'totalCancelQty', width: 60, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '待下推数量', dataIndex: 'totalUnpushedQty', width: 60, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '收款方式', dataIndex: 'settleStyleSnDictValue', width: 80, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '审核时间', dataIndex: 'auditDate', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '最近备货时间', dataIndex: 'lastStockUpDate', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '业务状态', dataIndex: 'billStatusDictValue', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '财务状态', dataIndex: 'financialStatus', scopedSlots: { customRender: 'financialStatus' }, width: 100, align: 'center' },
+        { title: '打印次数', dataIndex: 'detailPrintTimes', width: 50, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '操作', scopedSlots: { customRender: 'action' }, width: 150, align: 'center', fixed: 'right' }
       ],
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
@@ -266,7 +266,7 @@ export default {
         delete parameter.tableId
         delete parameter.index
         if (this.tableHeight == 0) {
-          this.tableHeight = window.innerHeight - 440
+          this.tableHeight = window.innerHeight - 450
         }
         // 查询总计
         salesCount(Object.assign(parameter, this.queryParam)).then(res => {