Selaa lähdekoodia

Merge branch 'deploy_0804' of jianguan-web/jg-ocs-html into master

李磊 3 vuotta sitten
vanhempi
commit
155ae95369

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

@@ -1,7 +1,7 @@
 <template>
   <a-layout-sider
     :class="['sider', isDesktop() ? null : 'shadow', theme, fixSiderbar ? 'ant-fixed-sidemenu' : null ]"
-    width="230px"
+    width="160px"
     :collapsible="collapsible"
     v-model="collapsed"
     :trigger="null">

+ 29 - 11
src/components/custom.less

@@ -6,17 +6,18 @@ body{
     font-size: 12px!important;
   }
   .ant-form-item-label > label{
-    color: #333!important;
+    color: #000!important;
   }
 }
 // 查询条件样式
 .table-page-search-wrapper {
   .ant-form.ant-form-inline{
     .ant-form-item {
-      margin-bottom: 10px;
+      margin-bottom: 10px!important;
       .ant-input,.ant-select-selection{
         border-radius: 2px;
         padding: 0px 11px;
+        font-size: 12px;
       }
       .ant-form-item-label{
         line-height: 32px!important;
@@ -32,7 +33,13 @@ body{
       }
     }
   }
-  .form-model-con{  // a-form-model  有必选条件(因校验提示信息原因,因此边距需高于无必选条件边距)
+  .form-model-con.ant-form.ant-form-inline{  // a-form-model  有必选条件(因校验提示信息原因,因此边距需高于无必选条件边距)
+    // .ant-form-item {
+    //   margin-bottom: 16px!important;
+    //   .ant-form-explain{
+    //     font-size: 12px;
+    //   }
+    // }
     .ant-form-item {
       margin-bottom: 16px!important;
       .ant-form-explain{
@@ -41,14 +48,14 @@ body{
     }
   }
   .table-page-search-submitButtons {
-    margin-bottom: 10px;
+    margin-bottom: 9px;
   }
 }
 // 菜单样式
 .sider {
   .logo {
     h1 {
-      font-size: 15px!important;
+      font-size: 12px!important;
     }
   }
   .ant-menu{
@@ -92,7 +99,7 @@ body{
 // 页签样式
 .multi-tab-con{
   .ant-tabs-nav-container{
-    height: 30px!important;
+    height: 31px!important;
     .ant-tabs-tab{
       padding: 0 8px!important;
       height: 30px!important;
@@ -132,21 +139,32 @@ body{
       .ant-table-header tr th, .ant-table-thead tr th{
         background: #fafafa!important;
         font-weight: bold;
-        color: #333!important;
+        color: #000!important;
+        padding: 5px 5px 2px!important;
       }
     }
   }
   .ant-table-row{
     .ant-table-row-cell-break-word, td{
-      padding: 3px 4px!important;
-      color: #333!important;
+      padding: 2px 4px!important;
+      color: #000!important;
+    }
+    &:hover{
+      td{
+        background: #ffb60a!important;
+      }
     }
   }
   .ant-pagination.ant-table-pagination{
-    margin: 10px 0;
+    margin: 10px 0 0;
   }
-  .ant-table-small > .ant-table-content > .ant-table-body{
+  .ant-table-small > .ant-table-content .ant-table-body,.ant-table-fixed-right{
     margin: 0;
+    tr:hover{
+      td{
+        background: #ffb60a;
+      }
+    }
   }
 }
 .sTable.fixPagination{

+ 2 - 2
src/components/global.less

@@ -133,7 +133,7 @@ body {
       transition: width 0.2s;
 
       &.ant-header-side-opened {
-        width: calc(100% - 230px);
+        width: calc(100% - 160px);
       }
 
       &.ant-header-side-closed {
@@ -151,7 +151,7 @@ body {
       right:0;
       margin: auto;
       &.ant-header-side-opened {
-        width: calc(100% - 230px);
+        width: calc(100% - 160px);
       }
       
       &.ant-header-side-closed {

+ 2 - 2
src/layouts/BasicLayout.vue

@@ -105,7 +105,7 @@ export default {
         return '0'
       }
       if (this.sidebarOpened) {
-        return '230px'
+        return '160px'
       }
       return '80px'
     }
@@ -148,7 +148,7 @@ export default {
     paddingCalc () {
       let left = ''
       if (this.sidebarOpened) {
-        left = this.isDesktop() ? '230px' : '80px'
+        left = this.isDesktop() ? '160px' : '80px'
       } else {
         left = (this.isMobile() && '0') || ((this.fixSidebar && '80px') || '0')
       }

+ 1 - 1
src/views/allocationManagement/transferOut/printModal.vue

@@ -66,7 +66,7 @@ export default {
     return {
       isShow: this.openModal, //  是否打开弹框
       form: {
-        id: undefined,
+        id: 'all',
         priceType: undefined
       },
       rules: {

+ 10 - 10
src/views/purchasingManagement/bulkWarehousingOrder/list.vue

@@ -49,7 +49,7 @@
         :rowKey="(record) => record.sparePartsSn"
         :columns="columns"
         :data="loadData"
-        :scroll="{ x: 1550, y: tableHeight }"
+        :scroll="{ x: 1350, y: tableHeight }"
         :defaultLoadData="false"
         bordered>
         <!-- 入库单号 -->
@@ -102,16 +102,16 @@ export default {
       },
       // 表头
       columns: [
-        { title: '创建时间', dataIndex: 'createDate', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '入库单号', scopedSlots: { customRender: 'sparePartsNo' }, width: 180, align: 'center' },
+        { title: '创建时间', dataIndex: 'createDate', width: 120, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '入库单号', scopedSlots: { customRender: 'sparePartsNo' }, width: 150, align: 'center' },
         { title: '商户名称', dataIndex: 'supplierName', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '入库数量', dataIndex: 'productTotalQty', width: 80, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '入库成本', dataIndex: 'productTotalCost', width: 80, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '入库类型', dataIndex: 'sparePartsTypeDictValue', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '关联单号', dataIndex: 'relationNo', width: 180, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '金蝶单号', dataIndex: 'kingdeeNo', width: 180, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '状态', dataIndex: 'stateDictValue', width: 80, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '备注', dataIndex: 'remark', width: 180, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '入库数量', dataIndex: 'productTotalQty', width: 70, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '入库成本', dataIndex: 'productTotalCost', width: 70, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '入库类型', dataIndex: 'sparePartsTypeDictValue', width: 70, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '关联单号', dataIndex: 'relationNo', width: 70, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '金蝶单号', dataIndex: 'kingdeeNo', width: 150, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '状态', dataIndex: 'stateDictValue', width: 60, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '备注', dataIndex: 'remark', width: 150, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: 100, align: 'center', fixed: 'right' }
       ],
       selectedRowKeys: [], // Check here to configure the default column

+ 3 - 3
src/views/reportData/salesReturnDetailReport/list.vue

@@ -14,7 +14,7 @@
           <a-row :gutter="15">
             <a-col :md="6" :sm="24">
               <a-form-model-item label="退货完成日期" prop="time">
-                <rangeDate ref="rangeDate" :value="queryParam.time" @change="dateChange" />
+                <rangeDateTime ref="rangeDate" :value="queryParam.time" @change="dateChange" />
               </a-form-model-item>
             </a-col>
             <a-col :md="5" :sm="24">
@@ -192,7 +192,7 @@
 import moment from 'moment'
 import getDate from '@/libs/getDate.js'
 import { STable, VSelect } from '@/components'
-import rangeDate from '@/views/common/rangeDate.vue'
+import rangeDateTime from '@/views/common/rangeDateTime.vue'
 import subarea from '@/views/common/subarea.js'
 import custList from '@/views/common/custList.vue'
 import { getArea } from '@/api/data'
@@ -200,7 +200,7 @@ import { productBrandQuery } from '@/api/productBrand'
 import { productTypeQuery } from '@/api/productType'
 import { reportSalesReturnDetailList, reportSalesReturnDetailCount, reportSalesReturnDetailExport } from '@/api/reportData'
 export default {
-  components: { STable, VSelect, rangeDate, custList, subarea },
+  components: { STable, VSelect, rangeDateTime, custList, subarea },
   data () {
     return {
       spinning: false,

+ 1 - 1
src/views/salesManagement/salesQuery/printModal.vue

@@ -65,7 +65,7 @@ export default {
     return {
       isShow: this.openModal, //  是否打开弹框
       form: {
-        id: undefined,
+        id: 'all',
         priceType: undefined
       },
       rules: {