Pārlūkot izejas kodu

Merge branch 'deploy_0804' of jianguan-web/qpls-md-html into master

李磊 3 gadi atpakaļ
vecāks
revīzija
3301b2cc62
39 mainītis faili ar 561 papildinājumiem un 512 dzēšanām
  1. 1 1
      .env
  2. 1 1
      .env.development
  3. 1 1
      .env.practice
  4. 1 1
      .env.preview
  5. 38 23
      src/components/MultiTab/MultiTab.vue
  6. 0 182
      src/components/custom.less
  7. 42 241
      src/components/global.less
  8. 367 6
      src/components/index.less
  9. 9 0
      src/components/newThem.less
  10. 1 1
      src/config/router.config.js
  11. 0 43
      src/layouts/BasicLayout.vue
  12. 3 2
      src/libs/JGPrint.js
  13. 2 1
      src/store/modules/app.js
  14. 5 0
      src/views/allocationManagement/chainTransferIn/list.vue
  15. 5 0
      src/views/allocationManagement/chainTransferOut/list.vue
  16. 5 0
      src/views/allocationManagement/storeTransferOut/list.vue
  17. 5 0
      src/views/allocationManagement/warehouseAllocation/list.vue
  18. 5 0
      src/views/bulkManagement/bulkReturnGoods/list.vue
  19. 5 0
      src/views/bulkManagement/bulkWarehousingOrder/list.vue
  20. 1 0
      src/views/common/custSatelliteList.vue
  21. 1 0
      src/views/common/productBrand.js
  22. 5 0
      src/views/customerManagement/customerInfo/list.vue
  23. 5 0
      src/views/financialManagement/companyReceivablePayable/list.vue
  24. 5 0
      src/views/financialManagement/expenseManagement/list.vue
  25. 5 0
      src/views/inventoryManagement/inventoryChecking/list.vue
  26. 5 0
      src/views/inventoryManagement/inventoryQuery/list.vue
  27. 5 0
      src/views/inventoryManagement/warehouse/list.vue
  28. 5 0
      src/views/productManagement/productInfo/list.vue
  29. 1 0
      src/views/productManagement/productInfoJg/list.vue
  30. 2 2
      src/views/purchasingManagement/purchaseOrder/edit.vue
  31. 5 0
      src/views/purchasingManagement/purchaseOrder/list.vue
  32. 2 2
      src/views/purchasingManagement/purchaseReturn/edit.vue
  33. 5 0
      src/views/purchasingManagement/purchaseReturn/list.vue
  34. 1 1
      src/views/salesManagement/salesQuery/edit.vue
  35. 5 1
      src/views/salesManagement/salesQuery/list.vue
  36. 1 1
      src/views/salesManagement/salesQuery/queryPart.vue
  37. 5 0
      src/views/salesManagement/salesReturn/list.vue
  38. 1 1
      src/views/salesManagement/salesReturn/queryPart.vue
  39. 0 1
      vue.config.js

+ 1 - 1
.env

@@ -6,6 +6,6 @@ VUE_APP_ENVTIPS=
 VUE_APP_VERSION=V1.0.1
 VUE_APP_PRO_NAME=iSCM智慧供应链系统
 VUE_APP_LOGO=@/assets/logo.png
-VUE_APP_THEME_COLOR=#ed1c24
+VUE_APP_THEME_COLOR=#f30f30
 VUE_APP_COM_NAME=陕西山海高科信息技术有限公司
 VUE_APP_ICP=陕ICP备20006268号

+ 1 - 1
.env.development

@@ -6,6 +6,6 @@ VUE_APP_VERSION=V1.0.1
 VUE_APP_ENVTIPS=开发环境
 VUE_APP_PRO_NAME=iSCM智慧供应链系统
 VUE_APP_LOGO=@/assets/logo.png
-VUE_APP_THEME_COLOR=#ed1c24
+VUE_APP_THEME_COLOR=#f30f30
 VUE_APP_COM_NAME=陕西山海高科信息技术有限公司
 VUE_APP_ICP=陕ICP备20006268号

+ 1 - 1
.env.practice

@@ -6,6 +6,6 @@ VUE_APP_VERSION=V1.0.1
 VUE_APP_ENVTIPS=练习环境
 VUE_APP_PRO_NAME=iSCM智慧供应链系统
 VUE_APP_LOGO=@/assets/logo.png
-VUE_APP_THEME_COLOR=#ed1c24
+VUE_APP_THEME_COLOR=#f30f30
 VUE_APP_COM_NAME=陕西山海高科信息技术有限公司
 VUE_APP_ICP=陕ICP备20006268号

+ 1 - 1
.env.preview

@@ -6,6 +6,6 @@ VUE_APP_VERSION=V1.0.1
 VUE_APP_ENVTIPS=预发布环境
 VUE_APP_PRO_NAME=iSCM智慧供应链系统
 VUE_APP_LOGO=@/assets/logo.png
-VUE_APP_THEME_COLOR=#ed1c24
+VUE_APP_THEME_COLOR=#f30f30
 VUE_APP_COM_NAME=陕西山海高科信息技术有限公司
 VUE_APP_ICP=陕ICP备20006268号

+ 38 - 23
src/components/MultiTab/MultiTab.vue

@@ -5,10 +5,10 @@ export default {
   name: 'MultiTab',
   data () {
     return {
-      fullPathList: [],
-      tabsList: [],
-      pages: [],
-      activeKey: '',
+      pagesRecordList: [], // 记录打开过的页面
+      tabsList: [], // 已打开页签
+      pages: [], // 已打开页面
+      activeKey: '', // 当前页面
       newTabIndex: 0
     }
   },
@@ -38,6 +38,7 @@ export default {
 
     this.pages.push(this.$route)
     this.tabsList.push(this.$route.name)
+    this.pagesRecordList.push(this.$route.name)
     this.selectedLastPath()
   },
   methods: {
@@ -66,6 +67,11 @@ export default {
     selectedLastPath () {
       this.activeKey = this.tabsList[this.tabsList.length - 1]
     },
+    replaceTab (newtab, oldtab) {
+      const index = this.pages.findIndex(item => item.name == oldtab.name)
+      this.pages.splice(index, 1, newtab)
+      this.tabsList.splice(index, 1, newtab.name)
+    },
     // content menu
     refashThat (e) {
       this.reloadView()
@@ -143,35 +149,44 @@ export default {
   },
   watch: {
     '$route': function (newVal, oldVal) {
-      const index = this.tabsList.indexOf(newVal.name)
+      console.log(newVal, oldVal)
       if (newVal.name == oldVal.name) { return }
       // 解决页面地址相同参数不同时打开多个页签问题(例 详情页id或sn不同时)
+      const index = this.tabsList.indexOf(newVal.name)
       if (index < 0) { // 不存在
-        this.tabsList.push(newVal.name)
-        this.pages.push(newVal)
-        this.$store.state.app.isNewTab = true
+        console.log(1, '不存在')
+        // 判断是否是新增,编辑,详情页
+        const na = newVal.meta.title.indexOf('详情') >= 0
+        const nb = newVal.meta.title.indexOf('新增') >= 0
+        const nc = newVal.meta.title.indexOf('编辑') >= 0
+        const oa = oldVal.meta.title.indexOf('详情') >= 0
+        const ob = oldVal.meta.title.indexOf('新增') >= 0
+        const oc = oldVal.meta.title.indexOf('编辑') >= 0
+        if (na || nb || nc || oa || ob || oc) {
+          // 替换当前页签
+          this.replaceTab(newVal, oldVal)
+          // 从列表打开新增,编辑
+          this.$store.state.app.isNewTab = na || nb || nc
+          // 从编辑,新增返回列表,刷新列表
+          this.$store.state.app.updateList = ob || oc
+        } else {
+          // 新打开的页签
+          this.tabsList.push(newVal.name)
+          this.pages.push(newVal)
+          this.pagesRecordList.push(newVal.name)
+          this.$store.state.app.isNewTab = true
+          this.$store.state.app.updateList = false
+        }
       } else { // 已存在
         this.pages.splice(index, 1, newVal)
+        this.tabsList.splice(index, 1, newVal.name)
         this.$store.state.app.isNewTab = false
-      }
-      // 父页面(列表)进入子页面(编辑、详情)再返回至父页面时关闭子页面页签   子页面点击“返回列表”
-      if (oldVal && oldVal.name && newVal.query.closeLastOldTab) {
-        if (oldVal.name.indexOf('List') == -1) { // 要关闭的页面不能是列表页
-          this.remove(oldVal.name) // 关闭子页面
-          this.$store.state.app.isNewTab = !(oldVal.meta.title.indexOf('详情') >= 0)
-        }
+        console.log(1, '已存在')
       }
       this.activeKey = newVal.name
     },
     activeKey: function (newPathKey) {
-      console.log(newPathKey, 'newVal')
-      const row = this.pages.find(item => item.name == newPathKey)
-      if (row.fullPath.indexOf('/list') == -1) {
-        this.$router.push({ path: row.fullPath })
-      } else {
-        // this.$router.push({ path: row.fullPath, query: { closeLastOldTab: true } })  //  需求:切换页签需关掉子页面
-        this.$router.push({ path: row.path }) //  需求:切换页签不需关掉子页面
-      }
+      this.$router.push({ name: newPathKey })
     }
   },
   render () {

+ 0 - 182
src/components/custom.less

@@ -1,182 +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: 15px!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;
-    }
-  }
-  .ant-pagination.ant-table-pagination{
-    margin: 10px 0 0;
-  }
-  .ant-table-small > .ant-table-content .ant-table-body{
-    margin: 0;
-    tr:hover{
-      td{
-        background: #ffb60a;
-        color: #fff;
-      }
-    }
-  }
-}
-.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;
-        }
-      }
-    }
-  }
-}

+ 42 - 241
src/components/global.less

@@ -492,6 +492,48 @@ body {
   }
 }
 
+/*
+ * The following styles are auto-applied to elements with
+ * transition="page-transition" when their visibility is toggled
+ * by Vue.js.
+ *
+ * You can easily play with the page transition by editing
+ * these styles.
+ */
+.vidio_cont .ant-modal-body {
+	padding: 0;
+}
+.vidio_cont .ant-modal-close-x {
+	width: 36px;
+	height: 36px;
+	text-align: center;
+	line-height: 36px;
+	color: #fff;
+	background-color: rgba(0, 0, 0, 0.6);
+	border-radius: 50%;
+	position: absolute;
+	top: 10px;
+	right: 10px;
+}
+.page-transition-enter {
+  opacity: 0;
+}
+
+.page-transition-leave-active {
+  opacity: 0;
+}
+
+.page-transition-enter .page-transition-container,
+.page-transition-leave-active .page-transition-container {
+  -webkit-transform: scale(1.1);
+  transform: scale(1.1);
+}
+ .setting-drawer-content{
+    .ant-drawer-content{
+      overflow: visible
+    }
+  }
+
 // 数据列表 样式
 .table-alert {
   margin-bottom: 16px;
@@ -528,245 +570,4 @@ body {
     white-space: nowrap;
   }
 }
-
-.content {
-  .table-operator {
-    padding: 15px 0;
-    // border-top: 1px solid #eee;
-    button {
-      margin-right: 8px;
-    }
-  }
-  .table-operator-nobor{
-    padding: 0 0 15px 0;
-    button {
-      margin-right: 8px;
-    }
-  }
-}
-
-/* 扩展ant design pro按钮组件颜色 */
-.ant-btn-primary.button-primary {
-  background-color: #39f;
-  border-color: #39f;
-  margin: 0 5px;
-  font-size: 12px;
-  &:hover, &:focus {
-    background-color: #52a6fb;
-    border-color: #52a6fb;
-  }
- 
-  &:active, &.active {
-    background-color: #3d80bf;
-    border-color: #3d80bf;
-  }
-}
- 
-.ant-btn-primary.button-info {
-  background-color: #2db7f5;
-  border-color: #2db7f5;
-  margin: 0 5px;
-  font-size: 12px;
-  &:hover, &:focus {
-    background-color: #32c8f5;
-    border-color: #32c8f5;
-  }
- 
-  &:active, &.active {
-    background-color: #27a3d8;
-    border-color: #27a3d8;
-  }
-}
- 
-.ant-btn-primary.button-success {
-  background-color: #0c6;
-  border-color: #0c6;
-  margin: 0 5px;
-  font-size: 12px;
-  &:hover, &:focus {
-    background-color: #01dc8c;
-    border-color: #01dc8c;
-  }
- 
-  &:active, &.active {
-    background-color: #00af57;
-    border-color: #00af57;
-  }
-}
- 
-.ant-btn-primary.button-warning {
-  background-color: #f90;
-  border-color: #f90;
-  margin: 0 5px;
-  font-size: 12px;
-  &:hover, &:focus {
-    background-color: #ffb60a;
-    border-color: #ffb60a;
-  }
- 
-  &:active, &.active {
-    background-color: #dd8500;
-    border-color: #dd8500;
-  }
-}
- 
-.ant-btn-primary.button-error {
-  background-color: #f30;
-  border-color: #f30;
-  margin: 0 5px;
-  font-size: 12px;
-  &:hover, &:focus {
-    background-color: #ff6666;
-    border-color: #ff6666;
-  }
- 
-  &:active, &.active {
-    background-color: #d62a00;
-    border-color: #d62a00;
-  }
-}
- 
-.ant-btn-primary.button-geekblue {
-  background-color: #2F54EB;
-  border-color: #2F54EB;
-  margin: 0 5px;
-  font-size: 12px;
-  &:hover, &:focus {
-    background-color: #1d39c4;
-    border-color: #1d39c4;
-  }
- 
-  &:active, &.active {
-    background-color: #597ef7;
-    border-color: #597ef7;
-  }
-}
- 
-.ant-btn-primary.button-purple {
-  background-color: #722ED1;
-  border-color: #722ED1;
-  margin: 0 5px;
-  font-size: 12px;
-  &:hover, &:focus {
-    background-color: #9254de;
-    border-color: #9254de;
-  }
- 
-  &:active, &.active {
-    background-color: #531dab;
-    border-color: #531dab;
-  }
-}
-.ant-btn-primary.button-grey {
-  background-color: #82848a;
-  border-color: #82848a;
-  margin: 0 5px;
-  font-size: 12px;
-  &:hover, &:focus {
-    background-color: #909399;
-    border-color: #909399;
-  }
- 
-  &:active, &.active {
-    background-color: #c8c9cc;
-    border-color: #c8c9cc;
-  }
-}
-
-// btn-link
-.ant-btn-link.button-default {
-  color: #1b1b1b;
-  &:hover, &:focus {
-    color: #66696d;
-  }
- 
-  &:active, &.active {
-    color: #8e8f91;
-  }
-}
-.ant-btn-link.button-primary {
-  color: #39f;
-  &:hover, &:focus {
-    color: #52a6fb;
-  }
- 
-  &:active, &.active {
-    color: #3d80bf;
-  }
-}
- 
-.ant-btn-link.button-info {
-  color: #2db7f5;
-  &:hover, &:focus {
-    color: #32c8f5;
-  }
- 
-  &:active, &.active {
-    color: #27a3d8;
-  }
-}
- 
-.ant-btn-link.button-success {
-  color: #0c6;
-  &:hover, &:focus {
-    color: #01dc8c;
-  }
- 
-  &:active, &.active {
-    color: #00af57;
-  }
-}
- 
-.ant-btn-link.button-warning {
-  color: #aa6a02;
-  &:hover, &:focus {
-    color: #c68d07;
-  }
- 
-  &:active, &.active {
-    color: #dd8500;
-  }
-}
- 
-.ant-btn-link.button-error {
-  color: #f30;
-  &:hover, &:focus {
-    color: #ff6666;
-  }
- 
-  &:active, &.active {
-    color: #d62a00;
-  }
-}
  
-.ant-btn-link.button-geekblue {
-  color: #2F54EB;
-  &:hover, &:focus {
-    color: #1d39c4;
-  }
- 
-  &:active, &.active {
-    color: #597ef7;
-  }
-}
- 
-.ant-btn-link.button-purple {
-  color: #722ED1;
-  &:hover, &:focus {
-    color: #9254de;
-  }
- 
-  &:active, &.active {
-    color: #531dab;
-  }
-}
-.ant-btn-link.button-grey {
-  color: #82848a;
-  &:hover, &:focus {
-    color: #909399;
-  }
- 
-  &:active, &.active {
-    color: #c8c9cc;
-  }
-}

+ 367 - 6
src/components/index.less

@@ -1,14 +1,11 @@
-@import "~ant-design-vue/lib/style/index";
-
+@import '~ant-design-vue/dist/antd.less'; // 引入官方提供的 less 样式入口文件
+// @import "~ant-design-vue/lib/style/index";
+@import './newThem.less'; // 用于覆盖上面定义的变量
 // The prefix to use on all css classes from ant-pro.
 @ant-pro-prefix             : ant-pro;
 @ant-global-sider-zindex    : 106;
 @ant-global-header-zindex   : 105;
 
-.ant-input-disabled{
-  color: #666;
-  background-color: #f8f8f8;
-}
 .text-overflow{
     overflow: hidden;    
     text-overflow:ellipsis;    
@@ -19,4 +16,368 @@
     -webkit-box-orient: vertical;    
     -webkit-line-clamp: 3;    
     overflow: hidden;
+}
+
+/* 扩展ant design pro按钮组件颜色 */
+.ant-btn-primary.button-primary {
+  background-color: #39f;
+  border-color: #39f;
+  margin: 0 5px;
+  font-size: 12px;
+  &:hover, &:focus {
+    background-color: #52a6fb;
+    border-color: #52a6fb;
+  }
+ 
+  &:active, &.active {
+    background-color: #3d80bf;
+    border-color: #3d80bf;
+  }
+}
+ 
+.ant-btn-primary.button-info {
+  background-color: #2db7f5;
+  border-color: #2db7f5;
+  margin: 0 5px;
+  font-size: 12px;
+  &:hover, &:focus {
+    background-color: #32c8f5;
+    border-color: #32c8f5;
+  }
+ 
+  &:active, &.active {
+    background-color: #27a3d8;
+    border-color: #27a3d8;
+  }
+}
+ 
+.ant-btn-primary.button-success {
+  background-color: #0c6;
+  border-color: #0c6;
+  margin: 0 5px;
+  font-size: 12px;
+  &:hover, &:focus {
+    background-color: #01dc8c;
+    border-color: #01dc8c;
+  }
+ 
+  &:active, &.active {
+    background-color: #00af57;
+    border-color: #00af57;
+  }
+}
+ 
+.ant-btn-primary.button-warning {
+  background-color: #f90;
+  border-color: #f90;
+  margin: 0 5px;
+  font-size: 12px;
+  &:hover, &:focus {
+    background-color: #ffb60a;
+    border-color: #ffb60a;
+  }
+ 
+  &:active, &.active {
+    background-color: #dd8500;
+    border-color: #dd8500;
+  }
+}
+ 
+.ant-btn-primary.button-error {
+  background-color: #f30;
+  border-color: #f30;
+  margin: 0 5px;
+  font-size: 12px;
+  &:hover, &:focus {
+    background-color: #ff6666;
+    border-color: #ff6666;
+  }
+ 
+  &:active, &.active {
+    background-color: #d62a00;
+    border-color: #d62a00;
+  }
+}
+ 
+.ant-btn-primary.button-geekblue {
+  background-color: #2F54EB;
+  border-color: #2F54EB;
+  margin: 0 5px;
+  font-size: 12px;
+  &:hover, &:focus {
+    background-color: #1d39c4;
+    border-color: #1d39c4;
+  }
+ 
+  &:active, &.active {
+    background-color: #597ef7;
+    border-color: #597ef7;
+  }
+}
+ 
+.ant-btn-primary.button-purple {
+  background-color: #722ED1;
+  border-color: #722ED1;
+  margin: 0 5px;
+  font-size: 12px;
+  &:hover, &:focus {
+    background-color: #9254de;
+    border-color: #9254de;
+  }
+ 
+  &:active, &.active {
+    background-color: #531dab;
+    border-color: #531dab;
+  }
+}
+.ant-btn-primary.button-grey {
+  background-color: #82848a;
+  border-color: #82848a;
+  margin: 0 5px;
+  font-size: 12px;
+  &:hover, &:focus {
+    background-color: #909399;
+    border-color: #909399;
+  }
+ 
+  &:active, &.active {
+    background-color: #c8c9cc;
+    border-color: #c8c9cc;
+  }
+}
+
+// btn-link
+.ant-btn-link.button-default {
+  color: #1b1b1b;
+  &:hover, &:focus {
+    color: #66696d;
+  }
+ 
+  &:active, &.active {
+    color: #8e8f91;
+  }
+}
+.ant-btn-link.button-primary {
+  color: #39f;
+  &:hover, &:focus {
+    color: #52a6fb;
+  }
+ 
+  &:active, &.active {
+    color: #3d80bf;
+  }
+}
+ 
+.ant-btn-link.button-info {
+  color: #2db7f5;
+  &:hover, &:focus {
+    color: #32c8f5;
+  }
+ 
+  &:active, &.active {
+    color: #27a3d8;
+  }
+}
+ 
+.ant-btn-link.button-success {
+  color: #0c6;
+  &:hover, &:focus {
+    color: #01dc8c;
+  }
+ 
+  &:active, &.active {
+    color: #00af57;
+  }
+}
+ 
+.ant-btn-link.button-warning {
+  color: #aa6a02;
+  &:hover, &:focus {
+    color: #c68d07;
+  }
+ 
+  &:active, &.active {
+    color: #dd8500;
+  }
+}
+ 
+.ant-btn-link.button-error {
+  color: #f30;
+  &:hover, &:focus {
+    color: #ff6666;
+  }
+ 
+  &:active, &.active {
+    color: #d62a00;
+  }
+}
+ 
+.ant-btn-link.button-geekblue {
+  color: #2F54EB;
+  &:hover, &:focus {
+    color: #1d39c4;
+  }
+ 
+  &:active, &.active {
+    color: #597ef7;
+  }
+}
+ 
+.ant-btn-link.button-purple {
+  color: #722ED1;
+  &:hover, &:focus {
+    color: #9254de;
+  }
+ 
+  &:active, &.active {
+    color: #531dab;
+  }
+}
+.ant-btn-link.button-grey {
+  color: #82848a;
+  &:hover, &:focus {
+    color: #909399;
+  }
+ 
+  &:active, &.active {
+    color: #c8c9cc;
+  }
+}
+// 查询条件样式
+.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;
+      }
+    }
+  }
+  .table-page-search-submitButtons {
+    margin-bottom: 9px;
+  }
+}
+// 菜单样式
+.sider {
+  .logo {
+    h1 {
+      font-size: 15px!important;
+    }
+  }
+  .ant-menu{
+    .ant-menu-submenu{
+      .ant-menu-item{  //  二级菜单左侧缩进
+        padding-left: 30px!important;
+      }
+    }
+  }
+}
+// 内容盒子样式
+.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;
+  }
+}
+// 页签样式
+.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;
+}
+
+// 表格 样式
+.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!important;
+      }
+    }
+  }
+  .ant-pagination.ant-table-pagination{
+    margin: 10px 0 0;
+  }
+  .ant-table-small > .ant-table-content .ant-table-body{
+    margin: 0;
+  }
+}
+.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;
+        }
+      }
+    }
+  }
 }

+ 9 - 0
src/components/newThem.less

@@ -0,0 +1,9 @@
+@font-size-base: 12px;
+@table-row-hover-bg: color(~`colorPalette('@{warning-color}', 3) `);
+@text-color: fade(@black, 100%);
+@disabled-bg: #fafafa;
+@modal-body-padding: 15px;
+@menu-item-height: 30px;
+@collapse-header-padding: 6px 8px;
+@table-padding-vertical: 5px;
+@table-padding-horizontal: 5px;

+ 1 - 1
src/config/router.config.js

@@ -660,7 +660,7 @@ export const asyncRouterMap = [
                 name: 'companyReceivablePayableCollectionPayment',
                 component: () => import(/* webpackChunkName: "financialManagement" */ '@/views/financialManagement/companyReceivablePayable/collectionPayment.vue'),
                 meta: {
-                  title: '单位应收应付',
+                  title: '编辑单位应收应付',
                   icon: 'transaction',
                   hidden: true,
                   permission: 'M_collectionPayment'

+ 0 - 43
src/layouts/BasicLayout.vue

@@ -243,47 +243,4 @@ export default {
 
 <style lang="less">
 @import url('../components/global.less');
-@import url('../components/custom.less');  //  自定义样式文件
-
-/*
- * The following styles are auto-applied to elements with
- * transition="page-transition" when their visibility is toggled
- * by Vue.js.
- *
- * You can easily play with the page transition by editing
- * these styles.
- */
-.vidio_cont .ant-modal-body {
-	padding: 0;
-}
-.vidio_cont .ant-modal-close-x {
-	width: 36px;
-	height: 36px;
-	text-align: center;
-	line-height: 36px;
-	color: #fff;
-	background-color: rgba(0, 0, 0, 0.6);
-	border-radius: 50%;
-	position: absolute;
-	top: 10px;
-	right: 10px;
-}
-.page-transition-enter {
-  opacity: 0;
-}
-
-.page-transition-leave-active {
-  opacity: 0;
-}
-
-.page-transition-enter .page-transition-container,
-.page-transition-leave-active .page-transition-container {
-  -webkit-transform: scale(1.1);
-  transform: scale(1.1);
-}
- .setting-drawer-content{
-    .ant-drawer-content{
-      overflow: visible
-    }
-  }
 </style>

+ 3 - 2
src/libs/JGPrint.js

@@ -24,8 +24,9 @@ export const JGPrint = function (data, type, printerType) {
       return
     }
     LODOP.SET_SHOW_MODE('HIDE_PAPER_BOARD', 1) //  隐藏底图上有模拟走纸板的条纹线
-    LODOP.ADD_PRINT_HTM('0', '0', 'RightMargin:0.1cm', 'BottomMargin:0.1cm', data)
-    LODOP.SET_PRINT_PAGESIZE(3, 2140, '60', '') // 这里3表示纵向打印且纸高“按内容的高度”;2140表示纸宽214.0mm;60表示页底空白6.0mm
+    LODOP.ADD_PRINT_HTM('0', '0', 'RightMargin:0cm', 'BottomMargin:0cm', data)
+    LODOP.SET_PRINT_PAGESIZE(3, 2090, 45, '') // 这里3表示纵向打印且纸高“按内容的高度”;2140表示纸宽214.0mm;60表示页底空白6.0mm
+    // LODOP.SET_PRINT_PAGESIZE(1, 2090, 1000, '')
     if (type == 'preview') {
       LODOP.PREVIEW()
     }

+ 2 - 1
src/store/modules/app.js

@@ -28,7 +28,8 @@ const app = {
     nowRoute: '', // 当前路由
     isShowVideo: false, // 是否显示视频弹窗
     isNewTab: false,
-    isNewSubTab: false
+    isNewSubTab: false,
+    updateList: false
   },
   mutations: {
     SET_SIDEBAR_TYPE: (state, type) => {

+ 5 - 0
src/views/allocationManagement/chainTransferIn/list.vue

@@ -263,6 +263,11 @@ export default {
       this.pageInit()
       this.resetSearchForm()
     }
+    // 仅刷新列表,不重置页面
+    if (this.$store.state.app.updateList) {
+      this.pageInit()
+      this.$refs.table.refresh()
+    }
   },
   beforeRouteEnter (to, from, next) {
     next(vm => {})

+ 5 - 0
src/views/allocationManagement/chainTransferOut/list.vue

@@ -325,6 +325,11 @@ export default {
       this.pageInit()
       this.resetSearchForm()
     }
+    // 仅刷新列表,不重置页面
+    if (this.$store.state.app.updateList) {
+      this.pageInit()
+      this.$refs.table.refresh()
+    }
   },
   beforeRouteEnter (to, from, next) {
     next(vm => {})

+ 5 - 0
src/views/allocationManagement/storeTransferOut/list.vue

@@ -310,6 +310,11 @@ export default {
       this.pageInit()
       this.resetSearchForm()
     }
+    // 仅刷新列表,不重置页面
+    if (this.$store.state.app.updateList) {
+      this.pageInit()
+      this.$refs.table.refresh()
+    }
   },
   beforeRouteEnter (to, from, next) {
     next(vm => {})

+ 5 - 0
src/views/allocationManagement/warehouseAllocation/list.vue

@@ -267,6 +267,11 @@ export default {
       this.pageInit()
       this.resetSearchForm()
     }
+    // 仅刷新列表,不重置页面
+    if (this.$store.state.app.updateList) {
+      this.pageInit()
+      this.$refs.table.refresh()
+    }
   },
   beforeRouteEnter (to, from, next) {
     next(vm => {})

+ 5 - 0
src/views/bulkManagement/bulkReturnGoods/list.vue

@@ -338,6 +338,11 @@ export default {
       this.pageInit()
       this.resetSearchForm()
     }
+    // 仅刷新列表,不重置页面
+    if (this.$store.state.app.updateList) {
+      this.pageInit()
+      this.$refs.table.refresh()
+    }
   },
   beforeRouteEnter (to, from, next) {
     next(vm => {})

+ 5 - 0
src/views/bulkManagement/bulkWarehousingOrder/list.vue

@@ -368,6 +368,11 @@ export default {
       this.pageInit()
       this.resetSearchForm()
     }
+    // 仅刷新列表,不重置页面
+    if (this.$store.state.app.updateList) {
+      this.pageInit()
+      this.$refs.table.refresh()
+    }
   },
   beforeRouteEnter (to, from, next) {
     next(vm => {})

+ 1 - 0
src/views/common/custSatelliteList.vue

@@ -7,6 +7,7 @@
     placeholder="请输入名称搜索"
     style="width: 100%"
     :filter-option="false"
+    :dropdownMatchSelectWidth="false"
     :not-found-content="fetching ? undefined : null"
     @search="fetchUser"
     @change="handleChange"

+ 1 - 0
src/views/common/productBrand.js

@@ -9,6 +9,7 @@ const ProductBrand = {
         :showSearch="true"
         @change="handleChange"
         option-filter-prop="children"
+        :dropdownMatchSelectWidth="false"
         :filter-option="filterOption">
         <a-select-option v-for="item in productBrandList" :key="item.brandSn" :value="item.brandSn">{{ item.brandName }}</a-select-option>
       </a-select>

+ 5 - 0
src/views/customerManagement/customerInfo/list.vue

@@ -357,6 +357,11 @@ export default {
       this.pageInit()
       this.resetSearchForm()
     }
+    // 仅刷新列表,不重置页面
+    if (this.$store.state.app.updateList) {
+      this.pageInit()
+      this.$refs.table.refresh()
+    }
   },
   beforeRouteEnter (to, from, next) {
     next(vm => {})

+ 5 - 0
src/views/financialManagement/companyReceivablePayable/list.vue

@@ -165,6 +165,11 @@ export default {
       this.pageInit()
       this.resetSearchForm()
     }
+    // 仅刷新列表,不重置页面
+    if (this.$store.state.app.updateList) {
+      this.pageInit()
+      this.$refs.table.refresh()
+    }
   },
   beforeRouteEnter (to, from, next) {
     next(vm => {})

+ 5 - 0
src/views/financialManagement/expenseManagement/list.vue

@@ -335,6 +335,11 @@ export default {
       this.pageInit()
       this.resetSearchForm()
     }
+    // 仅刷新列表,不重置页面
+    if (this.$store.state.app.updateList) {
+      this.pageInit()
+      this.$refs.table.refresh()
+    }
   },
   beforeRouteEnter (to, from, next) {
     next(vm => {})

+ 5 - 0
src/views/inventoryManagement/inventoryChecking/list.vue

@@ -297,6 +297,11 @@ export default {
       this.pageInit()
       this.resetSearchForm()
     }
+    // 仅刷新列表,不重置页面
+    if (this.$store.state.app.updateList) {
+      this.pageInit()
+      this.$refs.table.refresh()
+    }
   },
   beforeRouteEnter (to, from, next) {
     next(vm => {})

+ 5 - 0
src/views/inventoryManagement/inventoryQuery/list.vue

@@ -367,6 +367,11 @@ export default {
       this.pageInit()
       this.resetSearchForm()
     }
+    // 仅刷新列表,不重置页面
+    if (this.$store.state.app.updateList) {
+      this.pageInit()
+      this.$refs.table.refresh()
+    }
   },
   beforeRouteEnter (to, from, next) {
     next(vm => {})

+ 5 - 0
src/views/inventoryManagement/warehouse/list.vue

@@ -177,6 +177,11 @@ export default {
       this.pageInit()
       this.resetSearchForm()
     }
+    // 仅刷新列表,不重置页面
+    if (this.$store.state.app.updateList) {
+      this.pageInit()
+      this.$refs.table.refresh()
+    }
   },
   beforeRouteEnter (to, from, next) {
     next(vm => {})

+ 5 - 0
src/views/productManagement/productInfo/list.vue

@@ -354,6 +354,11 @@ export default {
       this.pageInit()
       this.resetSearchForm()
     }
+    // 仅刷新列表,不重置页面
+    if (this.$store.state.app.updateList) {
+      this.pageInit()
+      this.$refs.table.refresh()
+    }
   },
   beforeRouteEnter (to, from, next) {
     next(vm => {})

+ 1 - 0
src/views/productManagement/productInfoJg/list.vue

@@ -29,6 +29,7 @@
                   v-model="queryParam.productBrandSn"
                   :showSearch="true"
                   option-filter-prop="children"
+                  :dropdownMatchSelectWidth="false"
                   :filter-option="filterOption">
                   <a-select-option v-for="item in productBrandList" :key="item.brandSn" :value="item.brandSn">{{ item.brandName }}</a-select-option>
                 </a-select>

+ 2 - 2
src/views/purchasingManagement/purchaseOrder/edit.vue

@@ -81,7 +81,7 @@
                 :columns="columns"
                 :data="loadData"
                 :defaultLoadData="false"
-                :scroll="{ y:170 }"
+                :scroll="{ y:176 }"
                 :pageSize="10"
                 bordered>
                 <!-- 产品图片 -->
@@ -186,7 +186,7 @@
                 :data="chooseLoadData"
                 :defaultLoadData="false"
                 :pageSize="10"
-                :scroll="{ y: 300 }"
+                :scroll="{ y: 176 }"
                 bordered>
                 <!-- 采购数量 -->
                 <template slot="storageQuantity" slot-scope="text, record">

+ 5 - 0
src/views/purchasingManagement/purchaseOrder/list.vue

@@ -325,6 +325,11 @@ export default {
       this.pageInit()
       this.resetSearchForm()
     }
+    // 仅刷新列表,不重置页面
+    if (this.$store.state.app.updateList) {
+      this.pageInit()
+      this.$refs.table.refresh()
+    }
   },
   beforeRouteEnter (to, from, next) {
     next(vm => {})

+ 2 - 2
src/views/purchasingManagement/purchaseReturn/edit.vue

@@ -48,7 +48,7 @@
               :data="loadData"
               :defaultLoadData="false"
               :pageSize="10"
-              :scroll="{ y: 140 }"
+              :scroll="{ y: 149 }"
               bordered>
               <!-- 自定义表头 -->
               <template slot="refundableQtyTitle">
@@ -103,7 +103,7 @@
               :data="chooseLoadData"
               :defaultLoadData="false"
               :pageSize="10"
-              :scroll="{ y: 300 }"
+              :scroll="{ y: 149 }"
               bordered>
               <!-- 退货数量 -->
               <template slot="qty" slot-scope="text, record">

+ 5 - 0
src/views/purchasingManagement/purchaseReturn/list.vue

@@ -290,6 +290,11 @@ export default {
       this.pageInit()
       this.resetSearchForm()
     }
+    // 仅刷新列表,不重置页面
+    if (this.$store.state.app.updateList) {
+      this.pageInit()
+      this.$refs.table.refresh()
+    }
   },
   beforeRouteEnter (to, from, next) {
     next(vm => {})

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

@@ -80,7 +80,7 @@
               </a-form-model>
             </a-col>
             <a-col :span="6">
-              <div style="float:right;overflow: hidden;margin-top: 5px;">
+              <div style="float:right;overflow: hidden;">
                 <a-button
                   type="primary"
                   @click="delSalerOrder"

+ 5 - 1
src/views/salesManagement/salesQuery/list.vue

@@ -441,12 +441,16 @@ export default {
     }
   },
   activated () {
-    console.log(this.$store.state.app.isNewTab)
     // 如果是新页签打开,则重置当前页面
     if (this.$store.state.app.isNewTab) {
       this.pageInit()
       this.resetSearchForm()
     }
+    // 仅刷新列表,不重置页面
+    if (this.$store.state.app.updateList) {
+      this.pageInit()
+      this.$refs.table.refresh()
+    }
   },
   beforeRouteEnter (to, from, next) {
     next(vm => {})

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

@@ -117,7 +117,7 @@
       :customRow="handleClickRow"
       :defaultLoadData="false"
       :pageSize="10"
-      :scroll="{ y: 144 }"
+      :scroll="{ y: 149 }"
       bordered>
       <!-- 售价 -->
       <template slot="salePrice" slot-scope="text, record">

+ 5 - 0
src/views/salesManagement/salesReturn/list.vue

@@ -298,6 +298,11 @@ export default {
       this.pageInit()
       this.resetSearchForm()
     }
+    // 仅刷新列表,不重置页面
+    if (this.$store.state.app.updateList) {
+      this.pageInit()
+      this.$refs.table.refresh()
+    }
   },
   beforeRouteEnter (to, from, next) {
     next(vm => {})

+ 1 - 1
src/views/salesManagement/salesReturn/queryPart.vue

@@ -48,7 +48,7 @@
       :customRow="handleClickRow"
       :defaultLoadData="false"
       :pageSize="10"
-      :scroll="{ y: 144 }"
+      :scroll="{ y: 149 }"
       bordered>
       <!-- 价格 -->
       <template slot="price" slot-scope="text, record">{{ text }}</template>

+ 0 - 1
vue.config.js

@@ -91,7 +91,6 @@ const vueConfig = {
       less: {
         modifyVars: {
           // less vars,customize ant design theme
-
           'primary-color': process.env.VUE_APP_THEME_COLOR,
           'link-color': process.env.VUE_APP_THEME_COLOR
           // 'border-radius-base': '4px'