lilei 1 rok pred
rodič
commit
07b64f9878

+ 0 - 186
src/components/custom.less

@@ -1,186 +0,0 @@
-// 自定义样式文件   覆盖框架样式
-
-body{
-  font-size: 12px!important;
-  span,td,label,.ant-btn-sm{
-    font-size: 12px!important;
-  }
-  .ant-form-item-label > label{
-    color: #000!important;
-  }
-}
-// 查询条件样式
-.table-page-search-wrapper {
-  .ant-form.ant-form-inline{
-    .ant-form-item {
-      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;
-        padding-right: 8px!important;
-      }
-      .ant-form-item-control{
-        line-height: 31px!important;
-      }
-      .ant-form-item-control-wrapper{
-        .ant-select-selection__rendered{
-          margin: 0!important;
-        }
-      }
-    }
-  }
-  .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{
-        font-size: 12px;
-      }
-    }
-  }
-  .table-page-search-submitButtons {
-    margin-bottom: 9px;
-  }
-}
-// 菜单样式
-.sider {
-  .logo {
-    h1 {
-      font-size: 12px!important;
-    }
-  }
-  .ant-menu{
-    .ant-menu-item{
-      // padding-left: 10px!important;  //  只有一级菜单时的左侧缩进(例:首页)
-    }
-    .ant-menu-submenu{
-      .ant-menu-submenu-title{
-        // padding-left: 10px!important;  //  多级菜单的一级菜单左侧缩进
-      }
-      .ant-menu-item{  //  二级菜单左侧缩进
-        padding-left: 30px!important;
-      }
-    }
-  }
-}
-// 内容盒子样式
-.content {
-  .table-operator {
-    // padding: 8px 0;
-    padding: 0 0 8px;
-  }
-  .table-operator-nobor{
-    padding: 0 0 10px 0;
-    button {
-      margin-right: 5px;
-    }
-  }
-  .affix-cont{
-    z-index: 99;
-    position: absolute;
-    bottom: 0;
-    left: 0;
-    width: 100%;
-    text-align: center;
-    background-color: #fff;
-    padding: 7px 0 4px;
-    box-shadow: 0 0 20px #dcdee2;
-  }
-}
-// 页签样式
-.multi-tab-con{
-  .ant-tabs-nav-container{
-    height: 31px!important;
-    .ant-tabs-tab{
-      padding: 0 8px!important;
-      height: 30px!important;
-      line-height: 30px!important;
-    }
-  }
-}
-// a-alert样式
-.ant-alert,.ant-alert-info{
-  .ant-alert-icon{
-    top: 6.5px!important;
-    left: 5px!important;
-  }
-  padding: 3px 10px!important;
-  border-radius: 2px!important;
-}
-.ant-page-header{
-  padding: 5px 10px!important;
-}
-// 折叠面板 样式
-.ant-collapse{
-  .ant-collapse-header{
-    padding-top: 8px!important;
-    padding-bottom: 8px!important;
-  }
-  .ant-collapse-content-box{
-    padding: 10px 12px 5px!important;
-    .ant-descriptions-item{
-      padding-bottom: 10px!important;
-    }
-  }
-}
-// 表格 样式
-.sTable{
-  .ant-table{
-    .ant-table-content{
-      .ant-table-header tr th, .ant-table-thead tr th{
-        background: #fafafa!important;
-        font-weight: bold;
-        color: #000!important;
-        padding: 5px 5px 2px!important;
-      }
-    }
-  }
-  .ant-table-row{
-    .ant-table-row-cell-break-word, td{
-      padding: 2px 4px!important;
-      color: #000!important;
-    }
-    &:hover{
-      td{
-        background: #fff2f0!important;
-      }
-    }
-  }
-  .ant-pagination.ant-table-pagination{
-    margin: 10px 0 0;
-  }
-  .ant-table-small > .ant-table-content .ant-table-body,.ant-table-fixed-right,.ant-table-fixed-left{
-    margin: 0;
-    tr:hover{
-      td{
-        background: #fff2f0!important;
-      }
-    }
-  }
-}
-.sTable.fixPagination{
-  >.ant-table-wrapper{
-    height: 100%;
-    >.ant-spin-nested-loading{
-      height: 100%;
-      >.ant-spin-container{
-        height: 100%;
-        position: relative;
-        .ant-pagination.ant-table-pagination{
-          position: absolute;
-          right: 0;
-          bottom: 0;
-        }
-      }
-    }
-  }
-}

+ 61 - 0
src/components/global.less

@@ -538,6 +538,67 @@ body {
 .table-alert {
   margin-bottom: 16px;
 }
+// 内容样式
+.content {
+  .table-operator {
+    padding: 0 0 8px;
+    button {
+      margin-right: 8px;
+      margin-left: 0;
+    }
+  }
+  .table-operator-nobor{
+    padding: 0 0 10px 0;
+    button {
+      margin-right: 5px;
+    }
+  }
+  // 统计样式白底黑子
+  .tongji-bar{}
+  // 底部按钮浮动栏
+  .affix-cont{
+    z-index: 99;
+    position: absolute;
+    bottom: 0;
+    left: 0;
+    width: 100%;
+    text-align: center;
+    background-color: #fff;
+    padding: 7px 0 4px;
+    box-shadow: 0 0 20px #dcdee2;
+  }
+}
+// 查询条件样式
+.table-page-search-wrapper {
+  .ant-form.ant-form-inline .ant-form-item .ant-input, .ant-form.ant-form-inline .ant-form-item .ant-select-selection{
+    border:0;
+    box-shadow: none !important;
+  }
+  .ant-form.ant-form-inline .ant-form-item{
+    border:1px solid #dadada;
+    border-radius: 3px;
+    overflow: hidden;
+    margin-bottom: 10px!important;
+    .ant-form-item-label{
+      padding-left: 11px;
+      padding-right: 0!important;
+    }
+  }
+  .ant-input-group-addon{
+    border: 0;
+  }
+  .form-model-con.ant-form.ant-form-inline{  // a-form-model  有必选条件(因校验提示信息原因,因此边距需高于无必选条件边距)
+    .ant-form-item {
+      margin-bottom: 16px!important;
+      .ant-form-explain{
+        font-size: 12px;
+      }
+    }
+  }
+  .table-page-search-submitButtons {
+    margin-bottom: 9px;
+  }
+}
 
 .table-page-search-wrapper {
   .ant-form-inline {

+ 2 - 59
src/components/index.less

@@ -194,38 +194,7 @@
     color: #3d80bf;
   }
 }
-// 查询条件样式
-.table-page-search-wrapper {
-  margin-bottom: 6px;
-  .ant-form.ant-form-inline .ant-form-item .ant-input, .ant-form.ant-form-inline .ant-form-item .ant-select-selection{
-    border:0;
-    box-shadow: none !important;
-  }
-  .ant-form.ant-form-inline .ant-form-item{
-    border:1px solid #dadada;
-    border-radius: 3px;
-    overflow: hidden;
-    margin-bottom: 10px!important;
-    .ant-form-item-label{
-      padding-left: 11px;
-      padding-right: 0!important;
-    }
-  }
-  .ant-input-group-addon{
-    border: 0;
-  }
-  .form-model-con.ant-form.ant-form-inline{  // a-form-model  有必选条件(因校验提示信息原因,因此边距需高于无必选条件边距)
-    .ant-form-item {
-      margin-bottom: 16px!important;
-      .ant-form-explain{
-        font-size: 12px;
-      }
-    }
-  }
-  .table-page-search-submitButtons {
-    margin-bottom: 9px;
-  }
-}
+
 // 菜单样式
 .sider {
   .logo {
@@ -257,33 +226,7 @@
     }
   }
 }
-// 内容盒子样式
-.content {
-  .table-operator {
-    padding: 0 0 8px;
-    button {
-      margin-right: 8px;
-      margin-left: 0;
-    }
-  }
-  .table-operator-nobor{
-    padding: 0 0 10px 0;
-    button {
-      margin-right: 5px;
-    }
-  }
-  .affix-cont{
-    z-index: 99;
-    position: absolute;
-    bottom: 0;
-    left: 0;
-    width: 100%;
-    text-align: center;
-    background-color: #fff;
-    padding: 7px 0 4px;
-    box-shadow: 0 0 20px #dcdee2;
-  }
-}
+
 .ant-descriptions-item > span{
     word-break: break-all!important;
   }

+ 3 - 3
src/views/salesManagement/salesQueryNew/comps/detailProductList.vue

@@ -176,9 +176,9 @@
 
           let arr= [
                 { title: '序号', field: 'no',key: "a", width: 50, align: 'center',operationColumn: false, renderBodyCell: ({ row, column, rowIndex }, h) => { return noFormat(row,row[column.field],h)} },
-                { title: '产品编码', field: 'productCode',key: "b", width: 150, align: 'center',operationColumn: false,renderBodyCell: ({ row, column, rowIndex }, h) => { return codeFormat(row,row[column.field],h)} },
-                { title: '产品名称', field: 'productName',key: "c", width: 250, align: 'center',operationColumn: false , ellipsis: { showTitle: true },renderBodyCell: ({ row, column, rowIndex }, h) => { return row[column.field] || '--'}},
-                { title: '原厂编码', field: 'productOrigCode',key: "d", width: 150, align: 'center',operationColumn: false,ellipsis: { showTitle: true },renderBodyCell: ({ row, column, rowIndex }, h) => { return row[column.field] || '--'} },
+                { title: '产品编码', field: 'productCode',key: "b", width: 150, align: 'left',operationColumn: false,renderBodyCell: ({ row, column, rowIndex }, h) => { return codeFormat(row,row[column.field],h)} },
+                { title: '产品名称', field: 'productName',key: "c", width: 250, align: 'left',operationColumn: false , ellipsis: { showTitle: true },renderBodyCell: ({ row, column, rowIndex }, h) => { return row[column.field] || '--'}},
+                { title: '原厂编码', field: 'productOrigCode',key: "d", width: 150, align: 'left',operationColumn: false,ellipsis: { showTitle: true },renderBodyCell: ({ row, column, rowIndex }, h) => { return row[column.field] || '--'} },
                 { title: '出库仓库', field: 'warehouseName',key: "e", width: 100, align: 'center',operationColumn: false,renderBodyCell: ({ row, column, rowIndex }, h) => { return row[column.field] || '--'}}
             ]
             this.colspanNums = 5

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

@@ -21,7 +21,7 @@
             @click="handlePrint('SALES_BILL','B_salesPrint')">销售打印</a-button>
           <a-button
             key="2"
-            type="default"
+            type="primary"
             class="button-info"
             id="salesDetail-xsfl-print-btn"
             v-if="$hasPermissions('B_salesTypePrint')"
@@ -30,7 +30,7 @@
           <a-divider type="vertical" />
           <a-button
             key="3"
-            type="primary"
+            type="default"
             class="button-info"
             id="salesDetail-export-btn"
             v-if="$hasPermissions('B_salesDetailExport')"

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

@@ -123,7 +123,7 @@
         <div class="table-operator" style="display: flex;justify-content: space-between;align-items: center;">
           <div style="padding-right: 15px;"><a-button type="primary" v-if="$hasPermissions('B_salesAdd')" @click="handleAdd">新增</a-button></div>
           <div style="flex-grow: 1;display: flex;justify-content: space-between;align-items: center;">
-            <div>
+            <div class="tongji-bar">
               <div>
                 总单数:<strong>{{ totalData&&(totalData.totalRecord || totalData.totalRecord==0) ? totalData.totalRecord : '--' }}</strong>;
                 总款数:<strong>{{ totalData&&totalData.totalCategory || totalData.totalCategory == 0 ? totalData.totalCategory : '--' }}</strong>;