Browse Source

Merge branch 'deploy_0804' of http://git.chelingzhu.com/jianguan-web/qpls-md-html into deploy_0804

lilei 4 years ago
parent
commit
fbdde170bd
100 changed files with 540 additions and 406 deletions
  1. 8 0
      src/api/reportData.js
  2. 8 0
      src/api/reportStock.js
  3. 1 1
      src/components/Menu/SideMenu.vue
  4. 17 7
      src/components/MultiTab/MultiTab.vue
  5. 44 16
      src/components/global.less
  6. 1 1
      src/config/defaultSettings.js
  7. 1 1
      src/layouts/BasicLayout.vue
  8. 2 2
      src/utils/mixin.js
  9. 2 2
      src/views/allocationManagement/chainTransferIn/detail.vue
  10. 2 2
      src/views/allocationManagement/chainTransferIn/edit.vue
  11. 2 6
      src/views/allocationManagement/chainTransferIn/list.vue
  12. 18 9
      src/views/allocationManagement/chainTransferOut/detail.vue
  13. 4 3
      src/views/allocationManagement/chainTransferOut/edit.vue
  14. 10 20
      src/views/allocationManagement/chainTransferOut/list.vue
  15. 21 11
      src/views/allocationManagement/storeTransferOut/detail.vue
  16. 3 3
      src/views/allocationManagement/storeTransferOut/edit.vue
  17. 3 7
      src/views/allocationManagement/storeTransferOut/list.vue
  18. 17 9
      src/views/allocationManagement/warehouseAllocation/detail.vue
  19. 6 4
      src/views/allocationManagement/warehouseAllocation/edit.vue
  20. 2 2
      src/views/allocationManagement/warehouseAllocation/list.vue
  21. 5 5
      src/views/basicData/bulkPartsTypeManagement/list.vue
  22. 5 5
      src/views/basicData/customerTypeManagement/list.vue
  23. 5 5
      src/views/basicData/expenseType/list.vue
  24. 5 5
      src/views/basicData/storeTransferOutTypeManagement/list.vue
  25. 4 4
      src/views/bulkManagement/bulkReturnGoods/edit.vue
  26. 2 2
      src/views/bulkManagement/bulkReturnGoods/list.vue
  27. 2 2
      src/views/bulkManagement/bulkWarehousingOrder/detail.vue
  28. 5 5
      src/views/bulkManagement/bulkWarehousingOrder/edit.vue
  29. 4 8
      src/views/bulkManagement/bulkWarehousingOrder/list.vue
  30. 16 10
      src/views/common/auditModal.vue
  31. 6 1
      src/views/common/custList.vue
  32. 1 0
      src/views/customerManagement/customerInfo/detailModal.vue
  33. 15 10
      src/views/customerManagement/customerInfo/edit.vue
  34. 6 5
      src/views/customerManagement/customerInfo/list.vue
  35. 4 4
      src/views/financialManagement/companyCollectionPayment/detail.vue
  36. 4 4
      src/views/financialManagement/companyCollectionPayment/list.vue
  37. 2 2
      src/views/financialManagement/companyReceivablePayable/collectionPayment.vue
  38. 3 3
      src/views/financialManagement/companyReceivablePayable/detail.vue
  39. 3 3
      src/views/financialManagement/companyReceivablePayable/list.vue
  40. 1 1
      src/views/financialManagement/expenseManagement/detailModal.vue
  41. 24 24
      src/views/financialManagement/expenseManagement/edit.vue
  42. 3 3
      src/views/financialManagement/expenseManagement/list.vue
  43. 1 1
      src/views/financialManagement/financialCollection/detailModal.vue
  44. 5 5
      src/views/financialManagement/financialCollection/list.vue
  45. 3 3
      src/views/financialManagement/financialPayment/list.vue
  46. 3 3
      src/views/financialManagement/inventoryReview/detail.vue
  47. 2 2
      src/views/financialManagement/inventoryReview/list.vue
  48. 3 3
      src/views/financialManagement/ledgerRecord/list.vue
  49. 3 3
      src/views/financialManagement/warehousingAudit/detail.vue
  50. 2 2
      src/views/financialManagement/warehousingAudit/list.vue
  51. 1 1
      src/views/financialManagement/withdrawalManagement/list.vue
  52. 1 1
      src/views/inventoryManagement/inventoryChecking/checkingTipsModal.vue
  53. 3 3
      src/views/inventoryManagement/inventoryChecking/detail.vue
  54. 3 3
      src/views/inventoryManagement/inventoryChecking/financialAuditDetail.vue
  55. 1 1
      src/views/inventoryManagement/inventoryChecking/list.vue
  56. 2 2
      src/views/inventoryManagement/inventoryChecking/makeInventory.vue
  57. 3 3
      src/views/inventoryManagement/inventoryChecking/makeInventoryDetail.vue
  58. 2 2
      src/views/inventoryManagement/inventoryChecking/overall.vue
  59. 4 4
      src/views/inventoryManagement/inventoryChecking/selfDisk.vue
  60. 1 1
      src/views/inventoryManagement/inventoryQuery/detailModal.vue
  61. 3 3
      src/views/inventoryManagement/inventoryQuery/list.vue
  62. 4 4
      src/views/inventoryManagement/inventoryQuery/warehouseDetail.vue
  63. 3 2
      src/views/inventoryManagement/inventoryWarning/list.vue
  64. 1 1
      src/views/inventoryManagement/satelliteWarehouseInventory/list.vue
  65. 2 2
      src/views/inventoryManagement/warehouse/list.vue
  66. 2 2
      src/views/inventoryManagement/warehouse/storingLocation/list.vue
  67. 1 1
      src/views/notice/list.vue
  68. 1 1
      src/views/power/OperateJournal/OperateJournal.vue
  69. 1 1
      src/views/power/dataDictionary/dataDictionary.vue
  70. 1 1
      src/views/power/role/roleList.vue
  71. 4 3
      src/views/power/user/userList.vue
  72. 8 7
      src/views/productManagement/priceChangeRecord/list.vue
  73. 2 2
      src/views/productManagement/productBrand/list.vue
  74. 2 2
      src/views/productManagement/productCategory/list.vue
  75. 2 2
      src/views/productManagement/productInfo/edit.vue
  76. 2 2
      src/views/productManagement/productInfo/list.vue
  77. 5 9
      src/views/productManagement/productInfoJg/list.vue
  78. 3 3
      src/views/purchasingManagement/purchaseOrder/detail.vue
  79. 2 2
      src/views/purchasingManagement/purchaseOrder/edit.vue
  80. 5 13
      src/views/purchasingManagement/purchaseOrder/list.vue
  81. 1 1
      src/views/purchasingManagement/purchaseOrder/receivingAddress/chooseAddressModal.vue
  82. 4 5
      src/views/purchasingManagement/purchaseOrder/receivingAddress/editAddressModal.vue
  83. 2 2
      src/views/purchasingManagement/purchaseOrder/warehousing.vue
  84. 16 7
      src/views/purchasingManagement/purchaseReturn/detail.vue
  85. 1 1
      src/views/purchasingManagement/purchaseReturn/edit.vue
  86. 5 7
      src/views/purchasingManagement/purchaseReturn/list.vue
  87. 6 5
      src/views/reportData/chainReceivedSendStorageReport/list.vue
  88. 8 7
      src/views/reportData/chainSalesDetailReport/list.vue
  89. 7 6
      src/views/reportData/chainSalesReport/list.vue
  90. 9 5
      src/views/reportData/chainStockReport/detailModal.vue
  91. 11 7
      src/views/reportData/chainStockReport/list.vue
  92. 1 1
      src/views/reportData/customerReport/list.vue
  93. 2 2
      src/views/reportData/receivedSendStorageReport/list.vue
  94. 2 2
      src/views/reportData/stockExpenditureReport/list.vue
  95. 4 4
      src/views/reportData/stockIncomeReport/list.vue
  96. 1 1
      src/views/salesManagement/giftRecord/list.vue
  97. 58 12
      src/views/salesManagement/outboundOrder/list.vue
  98. 3 3
      src/views/salesManagement/quotation/detail.vue
  99. 4 4
      src/views/salesManagement/quotation/edit.vue
  100. 1 1
      src/views/salesManagement/quotation/list.vue

+ 8 - 0
src/api/reportData.js

@@ -37,6 +37,14 @@ export const linkageReportTotal = (params) => {
     method: 'post'
   })
 }
+// 收发存报表-列表合计
+export const reportStockPutOutCount = (params) => {
+  return axios({
+    url: 'report/reportStockPutOut/reportCount',
+    data: params,
+    method: 'post'
+  })
+}
 // 大客户报表-分页列表
 export const reportBigCustomerList = (params) => {
   const url = `report/reportBigCustomer/reportPage/${params.pageNo}/${params.pageSize}`

+ 8 - 0
src/api/reportStock.js

@@ -30,6 +30,14 @@ export const reportStockDetailList = (params) => {
     method: 'post'
   })
 }
+//  连锁库存总表  详情  合计
+export const reportStockDetailCount = (params) => {
+  return axios({
+    url: '/report/reportStock/reportDetailCount',
+    data: params,
+    method: 'post'
+  })
+}
 //  库存总入报表
 export const reportStockPutList = (params) => {
   return axios({

+ 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>

+ 17 - 7
src/components/MultiTab/MultiTab.vue

@@ -121,22 +121,32 @@ export default {
     }
   },
   watch: {
-    '$route': function (newVal) {
+    '$route': function (newVal, oldVal) {
+      // 父页面(列表)进入子页面(编辑、详情)再返回至父页面时关闭子页面页签   子页面点击“返回列表”
+      if (oldVal && oldVal.name && newVal.query.closeLastOldTab) {
+        if (oldVal.name.indexOf('List') == -1) { // 要关闭的页面不能是列表页
+          this.remove(oldVal.name) // 关闭子页面
+        }
+      }
       this.activeKey = newVal.name
       const index = this.tabsList.indexOf(newVal.name)
-      // 不存在
-      if (index < 0) {
+      // 解决页面地址相同参数不同时打开多个页签问题(例 详情页id或sn不同时)
+      if (index < 0) { // 不存在
         this.tabsList.push(newVal.name)
         this.pages.push(newVal)
-      } else {
-        // 已存在
+      } else { // 已存在
         this.pages.splice(index, 1, newVal)
       }
     },
     activeKey: function (newPathKey) {
       const row = this.pages.find(item => item.name == newPathKey)
-      // console.log(row.fullPath)
-      this.$router.push({ path: row.fullPath })
+      // console.log(row, '+++', row.fullPath)
+      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 }) //  需求:切换页签不需关掉子页面
+      }
     }
   },
   render () {

+ 44 - 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;
 
@@ -654,6 +657,21 @@ body {
     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-primary {
@@ -731,4 +749,14 @@ body {
   &:active, &.active {
     color: #531dab;
   }
+}
+.ant-btn-link.button-grey {
+  color: #82848a;
+  &:hover, &:focus {
+    color: #909399;
+  }
+ 
+  &:active, &.active {
+    color: #c8c9cc;
+  }
 }

+ 1 - 1
src/config/defaultSettings.js

@@ -28,6 +28,6 @@ export default {
   storageOptions: {
     namespace: 'pro__', // key prefix
     name: 'ls', // name variable Vue.[ls] or this.[$ls],
-    storage: 'local' // storage name session, local, memory
+    storage: 'session' // storage name session, local, memory
   }
 }

+ 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/utils/mixin.js

@@ -57,9 +57,9 @@ const AppDeviceEnquire = {
       switch (deviceType) {
         case DEVICE_TYPE.DESKTOP:
           $store.commit('TOGGLE_DEVICE', 'desktop')
-          // $store.dispatch('setSidebar', true)
+          $store.dispatch('setSidebar', true)
           // 默认收起侧边栏
-          $store.dispatch('setSidebar', false)
+          // $store.dispatch('setSidebar', false)
           break
         case DEVICE_TYPE.TABLET:
           $store.commit('TOGGLE_DEVICE', 'tablet')

+ 2 - 2
src/views/allocationManagement/chainTransferIn/detail.vue

@@ -38,7 +38,7 @@
       </a-card>
       <a-card size="small" :bordered="false" class="chainTransferInDetail-cont">
         <!-- 总计 -->
-        <a-alert type="info" showIcon style="margin-bottom:15px">
+        <a-alert type="info" showIcon style="margin-bottom:10px">
           <div slot="message">
             总款数 <strong>{{ (productTotal&&(productTotal.productTotalCategory || productTotal.productTotalCategory==0)) ? productTotal.productTotalCategory : '--' }}</strong> ,
             总数量 <strong>{{ (productTotal&&(productTotal.productTotalQty || productTotal.productTotalQty==0)) ? productTotal.productTotalQty : '--' }}</strong> ,
@@ -115,7 +115,7 @@ export default {
   methods: {
     //  返回列表
     handleBack () {
-      this.$router.push({ path: '/allocationManagement/chainTransferIn/list' })
+      this.$router.push({ path: '/allocationManagement/chainTransferIn/list', query: { closeLastOldTab: true } })
     },
     // 基本信息
     getDetail () {

+ 2 - 2
src/views/allocationManagement/chainTransferIn/edit.vue

@@ -30,7 +30,7 @@
         </a-collapse>
       </a-card>
       <!-- 总计 -->
-      <a-alert type="info" showIcon style="margin-bottom:15px">
+      <a-alert type="info" showIcon style="margin-bottom:10px">
         <div slot="message">
           总款数 <strong>{{ (basicInfoData&&(basicInfoData.productTotalCategory || basicInfoData.productTotalCategory==0)) ? basicInfoData.productTotalCategory : '--' }}</strong> ,
           总数量 <strong>{{ (basicInfoData&&(basicInfoData.productTotalQty || basicInfoData.productTotalQty==0)) ? basicInfoData.productTotalQty : '--' }}</strong> ,
@@ -250,7 +250,7 @@ export default {
     },
     //  返回列表
     handleBack () {
-      this.$router.push({ path: '/allocationManagement/chainTransferIn/list' })
+      this.$router.push({ path: '/allocationManagement/chainTransferIn/list', query: { closeLastOldTab: true } })
     },
     //  产品分类  change
     changeProductType (val, opt) {

+ 2 - 6
src/views/allocationManagement/chainTransferIn/list.vue

@@ -74,7 +74,7 @@
       <s-table
         class="sTable"
         ref="table"
-        size="default"
+        size="small"
         :rowKey="(record) => record.id"
         :columns="columns"
         :data="loadData"
@@ -85,10 +85,6 @@
           <span style="color: #ed1c24;cursor: pointer;" v-if="$hasPermissions('B_allocLinkagePutDetail')" @click="handleDetail(record)">{{ record.allocationLinkagePutNo }}</span>
           <span v-else>{{ record.allocationLinkagePutNo }}</span>
         </template>
-        <!-- 财务状态 -->
-        <template slot="settleState" slot-scope="text, record">
-          <a-badge :color="text=='FINISH'?'#87d068':'gold'" :text="record.settleStateDictValue" />
-        </template>
         <!-- 操作 -->
         <template slot="action" slot-scope="text, record">
           <a-button
@@ -151,7 +147,7 @@ export default {
         { title: '入库时间', dataIndex: 'putWarehouseTime', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '调拨产品类型', dataIndex: 'allocationTypeDictValue', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '业务状态', dataIndex: 'stateDictValue', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '财务状态', scopedSlots: { customRender: 'settleState' }, width: 100, align: 'center' },
+        { title: '财务状态', dataIndex: 'settleStateDictValue', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: 170, align: 'center', fixed: 'right' }
       ],
       // 加载数据方法 必须为 Promise 对象

+ 18 - 9
src/views/allocationManagement/chainTransferOut/detail.vue

@@ -1,9 +1,9 @@
 <template>
   <div class="chainTransferOutDetail-wrap">
     <a-spin :spinning="spinning" tip="Loading...">
-      <a-page-header :ghost="false" :backIcon="false" class="chainTransferOutDetail-cont" >
+      <a-page-header :ghost="false" :backIcon="false" class="chainTransferOutDetail-cont" :style="{ padding: !outBizSn ? '16px 24px' : '0px 24px' }" >
         <!-- 自定义的二级文字标题 -->
-        <template slot="subTitle">
+        <template slot="subTitle" v-if="!outBizSn">
           <a id="chainTransferOutDetail-back-btn" href="javascript:;" @click="handleBack"><a-icon type="left" /> 返回列表</a>
           <a-button
             v-if="isEdit&&$hasPermissions('B_allocLinkageOutEdit')"
@@ -42,7 +42,7 @@
         <a-collapse :activeKey="['1']">
           <a-collapse-panel key="1" header="产品详情">
             <!-- 总计 -->
-            <a-alert type="info" showIcon style="margin-bottom:15px">
+            <a-alert type="info" showIcon style="margin-bottom:10px">
               <div slot="message">
                 总款数 <strong>{{ (productTotal&&(productTotal.productTotalCategory || productTotal.productTotalCategory==0)) ? productTotal.productTotalCategory : '--' }}</strong> ,
                 总数量 <strong>{{ (productTotal&&(productTotal.productTotalQty || productTotal.productTotalQty==0)) ? productTotal.productTotalQty : '--' }}</strong> ,
@@ -75,12 +75,18 @@ import { getOperationalPrecision } from '@/libs/tools.js'
 import { allocLinkageOutDetailSn, allocLinkageOutDetailList, allocLinkageOutDetailCount, allocLinkageOutDetailPrint } from '@/api/allocLinkageOut'
 export default {
   components: { STable, VSelect },
+  props: {
+    outBizSn: { //  有值则为弹框,无值则为页面
+      type: [Number, String],
+      default: ''
+    }
+  },
   data () {
     return {
       spinning: false,
       // 表头
       columns: [
-        { title: '序号', dataIndex: 'no', width: 80, align: 'center', fixed: 'left' },
+        { title: '序号', dataIndex: 'no', width: 80, align: 'center' },
         { title: '产品编码', dataIndex: 'dealerProductEntity.code', width: 200, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '产品名称', dataIndex: 'dealerProductEntity.name', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '原厂编码', dataIndex: 'dealerProductEntity.origCode', width: 200, align: 'center', customRender: function (text) { return text || '--' } },
@@ -92,7 +98,7 @@ export default {
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
         this.disabled = true
-        const params = Object.assign(parameter, { allocationLinkageOutSn: this.$route.params.sn })
+        const params = Object.assign(parameter, { allocationLinkageOutSn: this.outBizSn || this.$route.params.sn })
         return allocLinkageOutDetailList(params).then(res => {
           const data = res.data
           const no = (data.pageNo - 1) * data.pageSize
@@ -121,11 +127,11 @@ export default {
   methods: {
     //  返回列表
     handleBack () {
-      this.$router.push({ path: '/allocationManagement/chainTransferOut/list' })
+      this.$router.push({ path: '/allocationManagement/chainTransferOut/list', query: { closeLastOldTab: true } })
     },
     // 基本信息
     getDetail () {
-      allocLinkageOutDetailSn({ sn: this.$route.params.sn }).then(res => {
+      allocLinkageOutDetailSn({ sn: this.outBizSn || this.$route.params.sn }).then(res => {
         if (res.status == 200) {
           this.basicInfoData = res.data
         } else {
@@ -151,7 +157,7 @@ export default {
     handlePrint (type) {
       const _this = this
       _this.spinning = true
-      allocLinkageOutDetailPrint({ sn: this.$route.params.sn, type: this.printerType }).then(res => {
+      allocLinkageOutDetailPrint({ sn: this.outBizSn || this.$route.params.sn, type: this.printerType }).then(res => {
         _this.spinning = false
         if (res.type == 'application/json') {
           var reader = new FileReader()
@@ -182,9 +188,12 @@ export default {
       }
     }
   },
+  mounted () {
+    this.getDetail()
+  },
   beforeRouteEnter (to, from, next) {
     next(vm => {
-      vm.getDetail()
+      // vm.getDetail()
     })
   }
 }

+ 4 - 3
src/views/allocationManagement/chainTransferOut/edit.vue

@@ -71,7 +71,7 @@
                     </a-col>
                     <a-col :md="6" :sm="24">
                       <a-form-item label="仓库">
-                        <a-select id="chainTransferOutEdit-warehouseSn" placeholder="请选择仓库" v-model="queryParam.warehouseSn" >
+                        <a-select id="chainTransferOutEdit-warehouseSn" allowClear placeholder="请选择仓库" v-model="queryParam.warehouseSn" >
                           <a-select-option v-for="item in warehouseList" :key="item.warehouseSn" :value="item.warehouseSn">{{ item.name }}</a-select-option>
                         </a-select>
                       </a-form-item>
@@ -124,7 +124,7 @@
         <a-collapse :activeKey="['1']">
           <a-collapse-panel key="1" header="已选产品">
             <!-- 总计 -->
-            <a-alert type="info" showIcon style="margin-bottom:15px">
+            <a-alert type="info" showIcon style="margin-bottom:10px">
               <div slot="message">
                 总款数 <strong>{{ (productTotal&&(productTotal.productTotalCategory || productTotal.productTotalCategory==0)) ? productTotal.productTotalCategory : '--' }}</strong> ,
                 总数量 <strong>{{ (productTotal&&(productTotal.productTotalQty || productTotal.productTotalQty==0)) ? productTotal.productTotalQty : '--' }}</strong> ,
@@ -305,6 +305,7 @@ export default {
       this.queryParam.productTypeSn1 = undefined
       this.queryParam.productTypeSn2 = undefined
       this.queryParam.productTypeSn3 = undefined
+      this.productType = []
       this.getProductList(1)
     },
     // 已选产品  重置
@@ -424,7 +425,7 @@ export default {
     },
     //  返回列表
     handleBack () {
-      this.$router.push({ path: '/allocationManagement/chainTransferOut/list' })
+      this.$router.push({ path: '/allocationManagement/chainTransferOut/list', query: { closeLastOldTab: true } })
     },
     filterOption (input, option) {
       return (

+ 10 - 20
src/views/allocationManagement/chainTransferOut/list.vue

@@ -7,7 +7,7 @@
           <a-row :gutter="15">
             <a-col :md="6" :sm="24">
               <a-form-item label="创建时间">
-                <rangeDate ref="rangeDate" :value="createDate" @change="dateChange" />
+                <rangeDate ref="rangeDate" @change="dateChange" />
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
@@ -53,7 +53,7 @@
                     v-model="queryParam.settleState"
                     ref="settleState"
                     id="chainTransferOutList-settleState"
-                    code="FINANCIAL_RECEIVE_STATUS"
+                    code="FINANCIAL_STATUS"
                     placeholder="请选择财务状态"
                     allowClear></v-select>
                 </a-form-item>
@@ -78,7 +78,7 @@
       <s-table
         class="sTable"
         ref="table"
-        size="default"
+        size="small"
         :rowKey="(record) => record.id"
         :columns="columns"
         :data="loadData"
@@ -89,10 +89,6 @@
           <span style="color: #ed1c24;cursor: pointer;" v-if="$hasPermissions('B_allocLinkageOutDetail')" @click="handleDetail(record)">{{ record.allocationLinkageOutNo }}</span>
           <span v-else>{{ record.allocationLinkageOutNo }}</span>
         </template>
-        <!-- 财务状态 -->
-        <template slot="settleState" slot-scope="text, record">
-          <a-badge :color="text=='FINISH'?'#87d068':'gold'" :text="record.settleStateDictValue" />
-        </template>
         <!-- 操作 -->
         <template slot="action" slot-scope="text, record">
           <a-button
@@ -133,8 +129,6 @@
 </template>
 
 <script>
-import moment from 'moment'
-import getDate from '@/libs/getDate.js'
 import { STable, VSelect } from '@/components'
 import rangeDate from '@/views/common/rangeDate.vue'
 import basicInfoModal from './basicInfoModal.vue'
@@ -146,13 +140,9 @@ export default {
       spinning: false,
       tableHeight: 0,
       advanced: false, // 高级搜索 展开/关闭
-      createDate: [
-        moment(getDate.getCurrMonthDays().starttime, 'YYYY-MM-DD'),
-        moment(getDate.getCurrMonthDays().endtime, 'YYYY-MM-DD')
-      ], //  创建时间
       queryParam: { //  查询条件
-        beginDate: getDate.getCurrMonthDays().starttime,
-        endDate: getDate.getCurrMonthDays().endtime,
+        beginDate: '',
+        endDate: '',
         putTenantSn: undefined, //  调往对象
         allocationType: undefined, //  调出产品类型
         state: undefined, //  业务状态
@@ -170,14 +160,14 @@ export default {
         { title: '审核时间', dataIndex: 'auditTime', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '调拨类型', dataIndex: 'allocationTypeDictValue', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '业务状态', dataIndex: 'stateDictValue', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '财务状态', scopedSlots: { customRender: 'settleState' }, width: 100, align: 'center' },
+        { title: '财务状态', dataIndex: 'settleStateDictValue', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: 210, align: 'center', fixed: 'right' }
       ],
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
         this.disabled = true
         if (this.tableHeight == 0) {
-          this.tableHeight = window.innerHeight - 380
+          this.tableHeight = window.innerHeight - 360
         }
         return allocLinkageOutList(Object.assign(parameter, this.queryParam)).then(res => {
           const data = res.data
@@ -202,9 +192,9 @@ export default {
     },
     //  重置
     resetSearchForm () {
-      this.$refs.rangeDate.resetDate(this.createDate)
-      this.queryParam.beginDate = getDate.getCurrMonthDays().starttime
-      this.queryParam.endDate = getDate.getCurrMonthDays().endtime
+      this.$refs.rangeDate.resetDate()
+      this.queryParam.beginDate = ''
+      this.queryParam.endDate = ''
       this.queryParam.putTenantSn = undefined
       this.queryParam.allocationType = undefined
       this.queryParam.state = undefined

+ 21 - 11
src/views/allocationManagement/storeTransferOut/detail.vue

@@ -1,9 +1,9 @@
 <template>
   <div class="storeTransferOutDetail-wrap">
     <a-spin :spinning="spinning" tip="Loading...">
-      <a-page-header :ghost="false" :backIcon="false" class="storeTransferOutDetail-back" >
+      <a-page-header :ghost="false" :backIcon="false" class="storeTransferOutDetail-back" :style="{ padding: !outBizSn ? '16px 24px' : '0px 24px' }" >
         <!-- 自定义的二级文字标题 -->
-        <template slot="subTitle">
+        <template slot="subTitle" v-if="!outBizSn">
           <a id="storeTransferOutDetail-back-btn" href="javascript:;" @click="handleBack"><a-icon type="left" /> 返回列表</a>
           <a-button
             v-if="isEdit&&$hasPermissions('B_storeCallOutEdit')"
@@ -40,7 +40,7 @@
       </a-card>
       <a-card size="small" :bordered="false" class="storeTransferOutDetail-cont">
         <!-- 总计 -->
-        <a-alert type="info" showIcon style="margin-bottom:15px">
+        <a-alert type="info" showIcon style="margin-bottom:10px">
           <div slot="message">
             总款数 <strong>{{ (productTotal&&(productTotal.productTotalCategory || productTotal.productTotalCategory==0)) ? productTotal.productTotalCategory : '--' }}</strong> ,
             总数量 <strong>{{ (productTotal&&(productTotal.productTotalQty || productTotal.productTotalQty==0)) ? productTotal.productTotalQty : '--' }}</strong> ,
@@ -71,12 +71,18 @@ import { getOperationalPrecision } from '@/libs/tools.js'
 import { storeCallOutDetailList, storeCallOutDetailCount, storeCallOutDetailSn, storeCallOutDetailPrint } from '@/api/storeCallOut'
 export default {
   components: { STable, VSelect },
+  props: {
+    outBizSn: { //  有值则为弹框,无值则为页面
+      type: [Number, String],
+      default: ''
+    }
+  },
   data () {
     return {
       spinning: false,
       // 表头
       columns: [
-        { title: '序号', dataIndex: 'no', width: 80, align: 'center', fixed: 'left' },
+        { title: '序号', dataIndex: 'no', width: 80, align: 'center' },
         { title: '产品编码', dataIndex: 'productCode', width: 200, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '产品名称', dataIndex: 'productName', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '单位', dataIndex: 'productUnit', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
@@ -87,7 +93,7 @@ export default {
       ],
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
-        return storeCallOutDetailList(Object.assign(parameter, { storeCallOutSn: this.$route.params.sn })).then(res => {
+        return storeCallOutDetailList(Object.assign(parameter, { storeCallOutSn: this.outBizSn || this.$route.params.sn })).then(res => {
           const data = res.data
           const no = (data.pageNo - 1) * data.pageSize
           for (var i = 0; i < data.list.length; i++) {
@@ -114,13 +120,13 @@ export default {
   methods: {
     //  返回列表
     handleBack () {
-      this.$router.push({ path: '/allocationManagement/storeTransferOut/list' })
+      this.$router.push({ path: '/allocationManagement/storeTransferOut/list', query: { closeLastOldTab: true } })
     },
     // 打印预览/快捷打印
     handlePrint (type) {
       const _this = this
       _this.spinning = true
-      storeCallOutDetailPrint({ sn: this.$route.params.sn, type: this.printerType, costFlag: this.printCostChecked ? '1' : '0' }).then(res => {
+      storeCallOutDetailPrint({ sn: this.outBizSn || this.$route.params.sn, type: this.printerType, costFlag: this.printCostChecked ? '1' : '0' }).then(res => {
         _this.spinning = false
         if (res.type == 'application/json') {
           var reader = new FileReader()
@@ -152,7 +158,7 @@ export default {
     },
     // 基本信息
     getDetail () {
-      storeCallOutDetailSn({ sn: this.$route.params.sn }).then(res => {
+      storeCallOutDetailSn({ sn: this.outBizSn || this.$route.params.sn }).then(res => {
         if (res.status == 200) {
           this.basicInfoData = res.data
         } else {
@@ -162,7 +168,7 @@ export default {
     },
     // 合计
     getDetailCount () {
-      storeCallOutDetailCount({ storeCallOutSn: this.$route.params.sn }).then(res => {
+      storeCallOutDetailCount({ storeCallOutSn: this.outBizSn || this.$route.params.sn }).then(res => {
         if (res.status == 200) {
           this.productTotal = res.data
         } else {
@@ -175,10 +181,14 @@ export default {
       this.$router.push({ path: `/allocationManagement/storeTransferOut/edit/${this.basicInfoData.id}/${this.basicInfoData.storeCallOutSn}` })
     }
   },
+  mounted () {
+    this.getDetail()
+    this.getDetailCount()
+  },
   beforeRouteEnter (to, from, next) {
     next(vm => {
-      vm.getDetail()
-      vm.getDetailCount()
+      // vm.getDetail()
+      // vm.getDetailCount()
     })
   }
 }

+ 3 - 3
src/views/allocationManagement/storeTransferOut/edit.vue

@@ -37,7 +37,7 @@
                   </a-col>
                   <a-col :md="6" :sm="24">
                     <a-form-item label="仓库">
-                      <a-select id="storeTransferOutEdit-warehouseSn" placeholder="请选择仓库" v-model="queryParam.warehouseSn" >
+                      <a-select id="storeTransferOutEdit-warehouseSn" allowClear placeholder="请选择仓库" v-model="queryParam.warehouseSn" >
                         <a-select-option v-for="item in warehouseList" :key="item.warehouseSn" :value="item.warehouseSn">{{ item.name }}</a-select-option>
                       </a-select>
                     </a-form-item>
@@ -108,7 +108,7 @@
         <a-collapse :activeKey="['1']">
           <a-collapse-panel key="1" header="已选产品">
             <!-- 总计 -->
-            <a-alert type="info" showIcon style="margin-bottom:15px">
+            <a-alert type="info" showIcon style="margin-bottom:10px">
               <div slot="message">
                 总款数 <strong>{{ (productTotal&&(productTotal.productTotalCategory || productTotal.productTotalCategory==0)) ? productTotal.productTotalCategory : '--' }}</strong> ,
                 总数量 <strong>{{ (productTotal&&(productTotal.productTotalQty || productTotal.productTotalQty==0)) ? productTotal.productTotalQty : '--' }}</strong> ,
@@ -446,7 +446,7 @@ export default {
     },
     //  返回列表
     handleBack () {
-      this.$router.push({ path: '/allocationManagement/storeTransferOut/list' })
+      this.$router.push({ path: '/allocationManagement/storeTransferOut/list', query: { closeLastOldTab: true } })
     },
     //  已选产品 分页  一页多少条change
     changeChoosePageSize (current, pageSize) {

+ 3 - 7
src/views/allocationManagement/storeTransferOut/list.vue

@@ -67,7 +67,7 @@
       <s-table
         class="sTable"
         ref="table"
-        size="default"
+        size="small"
         :rowKey="(record) => record.id"
         :columns="columns"
         :data="loadData"
@@ -78,10 +78,6 @@
           <span style="color: #ed1c24;cursor: pointer;" v-if="$hasPermissions('B_storeCallOutDetail')" @click="handleDetail(record)">{{ record.storeCallOutNo }}</span>
           <span v-else>{{ record.storeCallOutNo }}</span>
         </template>
-        <!-- 财务状态 -->
-        <template slot="settleState" slot-scope="text, record">
-          <a-badge :color="text=='FINISH'?'#87d068':'gold'" :text="record.settleStateDictValue" />
-        </template>
         <!-- 操作 -->
         <template slot="action" slot-scope="text, record">
           <a-button
@@ -154,14 +150,14 @@ export default {
         { title: '总成本', dataIndex: 'productTotalCost', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '审核时间', dataIndex: 'auditTime', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '业务状态', dataIndex: 'stateDictValue', width: 110, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '财务状态', dataIndex: 'settleState', scopedSlots: { customRender: 'settleState' }, width: 110, align: 'center' },
+        { title: '财务状态', dataIndex: 'settleStateDictValue', width: 110, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: 250, align: 'center', fixed: 'right' }
       ],
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
         this.disabled = true
         if (this.tableHeight == 0) {
-          this.tableHeight = window.innerHeight - 380
+          this.tableHeight = window.innerHeight - 360
         }
         return storeCallOutList(Object.assign(parameter, this.queryParam)).then(res => {
           const data = res.data

+ 17 - 9
src/views/allocationManagement/warehouseAllocation/detail.vue

@@ -1,8 +1,8 @@
 <template>
   <div class="warehouseAllocationDetail-wrap">
-    <a-page-header :ghost="false" :backIcon="false" class="warehouseAllocationDetail-back" >
+    <a-page-header :ghost="false" :backIcon="false" class="warehouseAllocationDetail-back" :style="{ padding: !outBizSn ? '16px 24px' : '0px 24px' }" >
       <!-- 自定义的二级文字标题 -->
-      <template slot="subTitle">
+      <template slot="subTitle" v-if="!outBizSn">
         <a id="warehouseAllocationDetail-back-btn" href="javascript:;" @click="handleBack"><a-icon type="left" /> 返回列表</a>
         <a-button
           v-if="warehouse&&warehouse.stateDictValue!='已完结'&&$hasPermissions('B_warehouseAllocationEdit')"
@@ -38,7 +38,7 @@
     </a-card>
     <a-card size="small" :bordered="false" class="warehouseAllocationDetail-cont">
       <!-- 总计 -->
-      <a-alert type="info" showIcon style="margin-bottom:15px">
+      <a-alert type="info" showIcon style="margin-bottom:10px">
         <div slot="message">
           总款数: <strong>{{ productTotal&&(productTotal.productTotalCategory || productTotal.productTotalCategory==0) ? productTotal.productTotalCategory : '--' }}</strong> ,
           总数量: <strong>{{ productTotal&&(productTotal.productTotalQty || productTotal.productTotalQty==0) ? productTotal.productTotalQty : '--' }}</strong> ,
@@ -79,18 +79,23 @@ import { STable, VSelect } from '@/components'
 import { allocWarehouseDetailSn, allocWarehouseDetailCount, allocWarehouseDetailList } from '@/api/allocWarehouse.js'
 export default {
   components: { STable, VSelect },
+  props: {
+    outBizSn: { //  有值则为弹框,无值则为页面
+      type: [Number, String],
+      default: ''
+    }
+  },
   data () {
     return {
       exportLoading: false, // 导出loading
       queryParam: {
-        allocationWarehouseSn: this.$route.params.sn
+        allocationWarehouseSn: this.outBizSn || this.$route.params.sn
       },
-      id: this.$route.params.id, // 单据id
       warehouse: null, // 基础信息
       productTotal: null,
       // 表头
       columns: [
-        { title: '序号', dataIndex: 'no', width: 80, align: 'center', fixed: 'left' },
+        { title: '序号', dataIndex: 'no', width: 80, align: 'center' },
         { title: '产品编码', dataIndex: 'productCode', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '产品名称', dataIndex: 'productName', width: 200, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '原厂编码', dataIndex: 'productOrigCode', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
@@ -120,7 +125,7 @@ export default {
   methods: {
     //  返回列表
     handleBack () {
-      this.$router.push({ path: '/allocationManagement/warehouseAllocation/list' })
+      this.$router.push({ path: '/allocationManagement/warehouseAllocation/list', query: { closeLastOldTab: true } })
     },
     //  新增/编辑
     handleEdit () {
@@ -128,7 +133,7 @@ export default {
     },
     // 查询基础信息
     getHouse () {
-      allocWarehouseDetailSn({ sn: this.$route.params.sn }).then(res => {
+      allocWarehouseDetailSn({ sn: this.outBizSn || this.$route.params.sn }).then(res => {
         if (res.status == 200) {
           this.warehouse = res.data
           this.queryParam.outWarehouseSn = res.data.outWarehouseSn
@@ -169,9 +174,12 @@ export default {
       link.click()
     }
   },
+  mounted () {
+    this.getHouse()
+  },
   beforeRouteEnter (to, from, next) {
     next(vm => {
-      vm.getHouse()
+      // vm.getHouse()
     })
   }
 }

+ 6 - 4
src/views/allocationManagement/warehouseAllocation/edit.vue

@@ -134,7 +134,7 @@
         <a-collapse :activeKey="['1']">
           <a-collapse-panel key="1" header="已选产品">
             <!-- 总计 -->
-            <a-alert type="info" showIcon style="margin-bottom:15px">
+            <a-alert type="info" showIcon style="margin-bottom:10px">
               <div slot="message">
                 总款数 <strong>{{ (productTotal&&(productTotal.productTotalCategory || productTotal.productTotalCategory==0)) ? productTotal.productTotalCategory : '--' }}</strong> ,
                 总数量 <strong>{{ (productTotal&&(productTotal.productTotalQty || productTotal.productTotalQty==0)) ? productTotal.productTotalQty : '--' }}</strong> ,
@@ -166,8 +166,10 @@
                 </div>
               </a-col>
               <a-col :span="7">
-                <!-- <a-button size="small" style="margin-left: 8px" id="chainTransferOutEdit-import-btn">导入明细</a-button> -->
-                <a-button size="small" type="danger" style="margin-left: 8px" @click.stop="handleDel('', 'all')" id="warehouseAllocationEdit-del-all-btn">整单删除</a-button>
+                <div style="margin-top: 4px;">
+                  <!-- <a-button size="small" style="margin-left: 8px" id="chainTransferOutEdit-import-btn">导入明细</a-button> -->
+                  <a-button size="small" type="danger" style="margin-left: 8px" @click.stop="handleDel('', 'all')" id="warehouseAllocationEdit-del-all-btn">整单删除</a-button>
+                </div>
               </a-col>
             </a-row>
             <!-- 列表 -->
@@ -479,7 +481,7 @@ export default {
     },
     //  返回列表
     handleBack () {
-      this.$router.push({ path: '/allocationManagement/warehouseAllocation/list' })
+      this.$router.push({ path: '/allocationManagement/warehouseAllocation/list', query: { closeLastOldTab: true } })
     },
     // 产品列表数据
     getProductList (pageNo) {

+ 2 - 2
src/views/allocationManagement/warehouseAllocation/list.vue

@@ -56,7 +56,7 @@
       <s-table
         class="sTable"
         ref="table"
-        size="default"
+        size="small"
         :rowKey="record => record.id"
         :columns="columns"
         :data="loadData"
@@ -144,7 +144,7 @@ export default {
       loadData: parameter => {
         this.disabled = true
         if (this.tableHeight == 0) {
-          this.tableHeight = window.innerHeight - 380
+          this.tableHeight = window.innerHeight - 360
         }
         return allocWarehouseList(Object.assign(parameter, this.queryParam)).then(res => {
           const data = res.data

+ 5 - 5
src/views/basicData/bulkPartsTypeManagement/list.vue

@@ -9,30 +9,30 @@
       <s-table
         class="sTable"
         ref="table"
-        size="default"
+        size="small"
         :rowKey="(record) => record.id"
         :columns="columns"
         :data="loadData"
-        :scroll="{ y: 300 }"
         bordered>
         <!-- 操作 -->
         <template slot="action" slot-scope="text, record">
+          <!-- 系统内置类型不可编辑和删除  tenantId为0是内置 -->
           <a-button
-            v-if="$hasPermissions('B_basicData_bulkPartsType_edit')"
+            v-if="$hasPermissions('B_basicData_bulkPartsType_edit') && record.tenantId!=0"
             size="small"
             type="link"
             class="button-info"
             @click="handleEdit(record)"
             id="bulkPartsTypeList-edit-btn">编辑</a-button>
           <a-button
-            v-if="$hasPermissions('B_basicData_bulkPartsType_del')"
+            v-if="$hasPermissions('B_basicData_bulkPartsType_del') && record.tenantId!=0"
             size="small"
             type="link"
             class="button-error"
             @click="handleDel(record)"
             id="bulkPartsTypeList-del-btn"
             style="margin: 0 0 0 8px;">删除</a-button>
-          <span v-if="!$hasPermissions('B_basicData_bulkPartsType_edit') && !$hasPermissions('B_basicData_bulkPartsType_del')">--</span>
+          <span v-if="!($hasPermissions('B_basicData_bulkPartsType_edit') && record.tenantId!=0) && !($hasPermissions('B_basicData_bulkPartsType_del') && record.tenantId!=0)">--</span>
         </template>
       </s-table>
     </a-spin>

+ 5 - 5
src/views/basicData/customerTypeManagement/list.vue

@@ -25,29 +25,29 @@
       <s-table
         class="sTable"
         ref="table"
-        size="default"
+        size="small"
         :rowKey="(record) => record.id"
         :columns="columns"
         :data="loadData"
-        :scroll="{ y: 300 }"
         bordered>
         <!-- 操作 -->
         <template slot="action" slot-scope="text, record">
+          <!-- 系统内置类型不可编辑和删除  tenantId为0是内置 -->
           <a-button
             size="small"
-            v-if="$hasPermissions('B_basicData_customerType_edit')"
+            v-if="$hasPermissions('B_basicData_customerType_edit') && record.tenantId!=0"
             type="link"
             class="button-info"
             @click="handleEdit(record)"
             id="customerTypeList-edit-btn">编辑</a-button>
           <a-button
             size="small"
-            v-if="$hasPermissions('B_basicData_customerType_del')"
+            v-if="$hasPermissions('B_basicData_customerType_del') && record.tenantId!=0"
             type="link"
             class="button-error"
             @click="handleDel(record)"
             id="customerTypeList-del-btn">删除</a-button>
-          <span v-if="!$hasPermissions('B_basicData_customerType_edit') && !$hasPermissions('B_basicData_customerType_del')">--</span>
+          <span v-if="!($hasPermissions('B_basicData_customerType_edit') && record.tenantId!=0) && !($hasPermissions('B_basicData_customerType_del') && record.tenantId!=0)">--</span>
         </template>
       </s-table>
     </a-spin>

+ 5 - 5
src/views/basicData/expenseType/list.vue

@@ -9,16 +9,16 @@
       <s-table
         class="sTable"
         ref="table"
-        size="default"
+        size="small"
         :rowKey="(record) => record.id"
         :columns="columns"
         :data="loadData"
         :showPagination="false"
         :defaultExpandedRowKeys="defaultExpandedRowKeys"
-        :scroll="{ y: 300 }"
         bordered>
         <!-- 操作 -->
         <template slot="action" slot-scope="text, record">
+          <!-- 系统内置类型不可编辑和删除  tenantId为0是内置 -->
           <a-button
             v-if="record.typeLevel<3 && $hasPermissions('B_basicData_expenseType_add')"
             type="link"
@@ -28,7 +28,7 @@
             id="expenseType-addSubItem"
             @click="handleAdd(record)">新增子级</a-button>
           <a-button
-            v-if="record.pid != 0 && $hasPermissions('B_basicData_expenseType_edit')"
+            v-if="record.pid != 0 && $hasPermissions('B_basicData_expenseType_edit') && record.tenantId!=0"
             type="link"
             class="button-info"
             size="small"
@@ -36,14 +36,14 @@
             id="expenseType-edit"
             @click="handleEdit(record)">编辑</a-button>
           <a-button
-            v-if="record.pid != 0 && $hasPermissions('B_basicData_expenseType_del')"
+            v-if="record.pid != 0 && $hasPermissions('B_basicData_expenseType_del') && record.tenantId!=0"
             type="link"
             class="button-error"
             size="small"
             icon="delete"
             id="expenseType-del"
             @click="handleDel(record)">删除</a-button>
-          <span v-if="!$hasPermissions('B_basicData_expenseType_add') && !$hasPermissions('B_basicData_expenseType_edit') && !$hasPermissions('B_basicData_expenseType_del')">--</span>
+          <span v-if="!(record.typeLevel<3 && $hasPermissions('B_basicData_expenseType_add')) && !(record.pid != 0 && $hasPermissions('B_basicData_expenseType_edit') && record.tenantId!=0) && !(record.pid != 0 && $hasPermissions('B_basicData_expenseType_del') && record.tenantId!=0)">--</span>
         </template>
       </s-table>
     </a-spin>

+ 5 - 5
src/views/basicData/storeTransferOutTypeManagement/list.vue

@@ -14,29 +14,29 @@
       <s-table
         class="sTable"
         ref="table"
-        size="default"
+        size="small"
         :rowKey="(record) => record.id"
         :columns="columns"
         :data="loadData"
-        :scroll="{ y: 300 }"
         bordered>
         <!-- 操作 -->
         <template slot="action" slot-scope="text, record">
+          <!-- 系统内置类型不可编辑和删除  tenantId为0是内置 -->
           <a-button
-            v-if="$hasPermissions('B_basicData_storeTransferOutType_edit')"
+            v-if="$hasPermissions('B_basicData_storeTransferOutType_edit') && record.tenantId!=0"
             size="small"
             type="link"
             class="button-info"
             @click="handleEdit(record)"
             id="storeTransferOutTypeList-edit-btn">编辑</a-button>
           <a-button
-            v-if="$hasPermissions('B_basicData_storeTransferOutType_del')"
+            v-if="$hasPermissions('B_basicData_storeTransferOutType_del') && record.tenantId!=0"
             size="small"
             type="link"
             class="button-error"
             @click="handleDel(record)"
             id="storeTransferOutTypeList-del-btn">删除</a-button>
-          <span v-if="!$hasPermissions('B_basicData_storeTransferOutType_edit') && !$hasPermissions('B_basicData_storeTransferOutType_del')">--</span>
+          <span v-if="!($hasPermissions('B_basicData_storeTransferOutType_edit') && record.tenantId!=0) && !($hasPermissions('B_basicData_storeTransferOutType_del') && record.tenantId!=0)">--</span>
         </template>
       </s-table>
     </a-spin>

+ 4 - 4
src/views/bulkManagement/bulkReturnGoods/edit.vue

@@ -81,7 +81,7 @@
             <s-table
               class="sTable"
               ref="table"
-              size="default"
+              size="small"
               :rowKey="(record) => record.id"
               :columns="columns"
               :data="loadData"
@@ -116,14 +116,14 @@
           <!-- 已选产品 -->
           <div>
             <!-- 总计 -->
-            <a-alert type="info" showIcon style="margin-bottom:15px">
+            <a-alert type="info" showIcon style="margin-bottom:10px">
               <div slot="message">产品款数 <strong>6</strong> ,退货数量合计 <strong>6</strong> ,退货金额合计¥<strong>6.33</strong></div>
             </a-alert>
             <!-- 列表 -->
             <s-table
               class="sTable"
               ref="table"
-              size="default"
+              size="small"
               :rowKey="(record) => record.id"
               :columns="chooseColumns"
               :data="chooseLoadData"
@@ -291,7 +291,7 @@ export default {
     },
     //  返回列表
     handleBack () {
-      this.$router.push({ path: '/bulkManagement/bulkReturnGoods/list' })
+      this.$router.push({ path: '/bulkManagement/bulkReturnGoods/list', query: { closeLastOldTab: true } })
     },
     //  导入明细
     handleImport () {

+ 2 - 2
src/views/bulkManagement/bulkReturnGoods/list.vue

@@ -49,14 +49,14 @@
       <a-button id="bulkReturnGoodsList-add" type="primary" class="button-error" @click="handleAdd()">新增</a-button>
     </div>
     <!-- 合计 -->
-    <a-alert type="info" showIcon style="margin-bottom:15px">
+    <a-alert type="info" showIcon style="margin-bottom:10px">
       <div slot="message">共 <strong>6</strong> 条记录,总数量合计 <strong>14</strong> ,总金额合计 <strong>¥14</strong> </div>
     </a-alert>
     <!-- 列表 -->
     <s-table
       class="sTable"
       ref="table"
-      size="default"
+      size="small"
       :rowKey="(record) => record.id"
       :columns="columns"
       :data="loadData"

+ 2 - 2
src/views/bulkManagement/bulkWarehousingOrder/detail.vue

@@ -58,7 +58,7 @@
         <a-collapse :activeKey="['1']">
           <a-collapse-panel key="1" header="产品详情">
             <!-- 总计 -->
-            <a-alert type="info" showIcon style="margin-bottom:15px">
+            <a-alert type="info" showIcon style="margin-bottom:10px">
               <div slot="message">
                 总款数 <strong>{{ (productTotal&&(productTotal.productTotalCategory || productTotal.productTotalCategory==0)) ? productTotal.productTotalCategory : '--' }}</strong> ,
                 总数量 <strong>{{ (productTotal&&(productTotal.productTotalQty || productTotal.productTotalQty==0)) ? productTotal.productTotalQty : '--' }}</strong> ,
@@ -153,7 +153,7 @@ export default {
   methods: {
     //  返回列表
     handleBack () {
-      this.$router.push({ path: '/bulkManagement/bulkWarehousingOrder/list' })
+      this.$router.push({ path: '/bulkManagement/bulkWarehousingOrder/list', query: { closeLastOldTab: true } })
     },
     // 打印预览/快捷打印
     handlePrint (type) {

+ 5 - 5
src/views/bulkManagement/bulkWarehousingOrder/edit.vue

@@ -156,7 +156,7 @@
             <!-- 已选产品 -->
             <div>
               <!-- 总计 -->
-              <a-alert type="info" showIcon style="margin-bottom:15px">
+              <a-alert type="info" showIcon style="margin-bottom:10px">
                 <div slot="message">
                   总款数 <strong>{{ (productTotal&&(productTotal.productTotalCategory || productTotal.productTotalCategory==0)) ? productTotal.productTotalCategory : '--' }}</strong> ,
                   总数量 <strong>{{ (productTotal&&(productTotal.productTotalQty || productTotal.productTotalQty==0)) ? productTotal.productTotalQty : '--' }}</strong> ,
@@ -522,7 +522,7 @@ export default {
     },
     //  返回列表
     handleBack () {
-      this.$router.push({ path: '/bulkManagement/bulkWarehousingOrder/list' })
+      this.$router.push({ path: '/bulkManagement/bulkWarehousingOrder/list', query: { closeLastOldTab: true } })
     },
     // 合计
     getDetailCount (params) {
@@ -587,7 +587,7 @@ export default {
       this.pageNo = pageNo || this.pageNo
       const params = Object.assign({ pageNo: this.pageNo, pageSize: this.pageSize }, this.queryParam)
       params.enabledFlag = 1
-      params.sysFlag = 0
+      // params.sysFlag = 0
       if (sorter) {
         params.sortField = sorter.field
         params.sortOrder = sorter.order
@@ -701,7 +701,7 @@ export default {
     //  产品品牌  列表
     getProductBrand () {
       // sysFlag传0,表示只查自建产品
-      dealerProductBrandQuery({ 'sysFlag': '0' }).then(res => {
+      dealerProductBrandQuery({}).then(res => {
         if (res.status == 200) {
           this.productBrandList = res.data
         } else {
@@ -711,7 +711,7 @@ export default {
     },
     //  产品分类  列表
     getProductType () {
-      dealerProductTypeList({ 'sysFlag': '0' }).then(res => {
+      dealerProductTypeList({}).then(res => {
         if (res.status == 200) {
           this.productTypeList = res.data
         } else {

+ 4 - 8
src/views/bulkManagement/bulkWarehousingOrder/list.vue

@@ -82,7 +82,7 @@
         <a-button v-if="$hasPermissions('B_bulkWarehousingOrder_add')" id="bulkWarehousingOrderList-add" type="primary" class="button-error" @click="handleAdd">新增</a-button>
       </div>
       <!-- alert -->
-      <a-alert type="info" showIcon style="margin-bottom:15px">
+      <a-alert type="info" showIcon style="margin-bottom:10px">
         <div slot="message">
           共 <strong>{{ dataTotalCount }}</strong> 条记录,
           总数量合计 <strong>{{ productTotal&&(productTotal.productTotalQty || productTotal.productTotalQty==0) ? productTotal.productTotalQty : '--' }}</strong> ,
@@ -93,7 +93,7 @@
       <s-table
         class="sTable"
         ref="table"
-        size="default"
+        size="small"
         :rowKey="(record) => record.id"
         :columns="columns"
         :data="loadData"
@@ -104,10 +104,6 @@
           <span v-if="$hasPermissions('B_bulkWarehousingOrder_detail')" style="color: #ed1c24;cursor: pointer;" @click="handleDetail(record)">{{ record.sparePartsPurchaseNo }}</span>
           <span v-else>{{ record.sparePartsPurchaseNo }}</span>
         </template>
-        <!-- 财务状态 -->
-        <template slot="settleState" slot-scope="text, record">
-          <a-badge :color="text=='FINISH'?'#87d068':'gold'" :text="record.settleStateDictValue" />
-        </template>
         <!-- 操作 -->
         <template slot="action" slot-scope="text, record">
           <a-button
@@ -178,14 +174,14 @@ export default {
         { title: '总数量', dataIndex: 'productTotalQty', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '总金额', dataIndex: 'productTotalCost', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '业务状态', dataIndex: 'stateDictValue', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '财务状态', dataIndex: 'settleState', scopedSlots: { customRender: 'settleState' }, width: 100, align: 'center' },
+        { title: '财务状态', dataIndex: 'settleStateDictValue', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: 200, align: 'center', fixed: 'right' }
       ],
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
         this.disabled = true
         if (this.tableHeight == 0) {
-          this.tableHeight = window.innerHeight - 440
+          this.tableHeight = window.innerHeight - 420
         }
         return sparePartsPurList(Object.assign(parameter, this.queryParam)).then(res => {
           const data = res.data

+ 16 - 10
src/views/common/auditModal.vue

@@ -7,17 +7,19 @@
     v-model="isShow"
     @cancle="isShow=false"
     :width="416">
-    <div class="audit-main">
-      <a-icon type="question-circle" style="color: #faad14;font-size: 22px;margin-right: 16px;" />
-      <div class="audit-cont">
-        <p class="audit-tit">提示</p>
-        <p class="audit-txt">请点击下方按钮确认操作?</p>
+    <a-spin :spinning="spinning" tip="Loading...">
+      <div class="audit-main">
+        <a-icon type="question-circle" style="color: #faad14;font-size: 22px;margin-right: 16px;" />
+        <div class="audit-cont">
+          <p class="audit-tit">提示</p>
+          <p class="audit-txt">请点击下方按钮确认操作?</p>
+        </div>
       </div>
-    </div>
-    <div class="btn-box">
-      <a-button type="primary" class="button-error" @click="handleAuditFail">审核不通过</a-button>
-      <a-button type="primary" class="button-info" @click="handleAuditOk">审核通过</a-button>
-    </div>
+      <div class="btn-box">
+        <a-button type="primary" class="button-error" @click="handleAuditFail">审核不通过</a-button>
+        <a-button type="primary" class="button-info" @click="handleAuditOk">审核通过</a-button>
+      </div>
+    </a-spin>
   </a-modal>
 </template>
 
@@ -28,6 +30,10 @@ export default {
     openModal: { //  弹框显示状态
       type: Boolean,
       default: false
+    },
+    spinning: {
+      type: Boolean,
+      default: false
     }
   },
   data () {

+ 6 - 1
src/views/common/custList.vue

@@ -12,8 +12,9 @@
     allowClear
   >
     <a-spin v-if="fetching" slot="notFoundContent" size="small" />
-    <a-select-option v-for="item in data" :key="item.customerSn" :value="item.customerSn">
+    <a-select-option v-for="item in data" :key="item.customerSn" :value="item.customerSn" :disabled="isValidateEnabled ? item.enabledFlag=='0' : false">
       {{ item.customerName }}
+      <span v-if="isValidateEnabled && item.enabledFlag=='0'">(已禁用)</span>
     </a-select-option>
   </a-select>
 </template>
@@ -22,6 +23,10 @@ import debounce from 'lodash/debounce'
 import { custList } from '@/api/customer'
 export default {
   props: {
+    isValidateEnabled: {
+      type: Boolean,
+      default: false
+    }
   },
   data () {
     this.lastFetchId = 0

+ 1 - 0
src/views/customerManagement/customerInfo/detailModal.vue

@@ -15,6 +15,7 @@
           <a-descriptions-item label="客户名称:">{{ detailData&&detailData.customerName || '--' }}</a-descriptions-item>
           <a-descriptions-item label="联系人:">{{ detailData&&detailData.contactName || '--' }}</a-descriptions-item>
           <a-descriptions-item label="联系电话:">{{ detailData&&detailData.contactTel || '--' }}</a-descriptions-item>
+          <a-descriptions-item label="联系手机:">{{ detailData&&detailData.contactMobile || '--' }}</a-descriptions-item>
           <a-descriptions-item label="客户地址:" :span="3">{{ addressStr }}</a-descriptions-item>
           <a-descriptions-item label="客户传真:">{{ detailData&&detailData.fax || '--' }}</a-descriptions-item>
           <a-descriptions-item label="配送方式:">{{ detailData&&detailData.dispatchTypeDictValue || '--' }}</a-descriptions-item>

+ 15 - 10
src/views/customerManagement/customerInfo/edit.vue

@@ -30,7 +30,12 @@
             </a-col>
             <a-col :span="8">
               <a-form-model-item label="联系电话" prop="contactTel">
-                <a-input id="customerManagementEdit-contactTel" :maxLength="11" v-model.trim="form.contactTel" placeholder="请输入联系电话(最多11个字符)" allowClear />
+                <a-input id="customerManagementEdit-contactTel" :maxLength="15" v-model.trim="form.contactTel" placeholder="请输入联系电话(最多15个字符)" allowClear />
+              </a-form-model-item>
+            </a-col>
+            <a-col :span="8">
+              <a-form-model-item label="联系手机" prop="contactMobile">
+                <a-input id="customerManagementEdit-contactMobile" :maxLength="11" v-model.trim="form.contactMobile" placeholder="请输入联系手机(最多11个字符)" allowClear />
               </a-form-model-item>
             </a-col>
             <a-col :span="8">
@@ -40,8 +45,8 @@
             </a-col>
           </a-row>
           <a-row :gutter="15">
-            <a-col :span="16">
-              <a-form-model-item label="客户地址" required style="margin: 0;" :labelCol="{ span: 4 }" :wrapperCol="{ span: 20 }">
+            <a-col :span="24">
+              <a-form-model-item label="客户地址" required style="margin: 0;" :labelCol="{ span: 3 }" :wrapperCol="{ span: 20 }">
                 <a-row :gutter="15">
                   <!-- 客户地址 -->
                   <a-col span="8">
@@ -68,8 +73,8 @@
                 </a-row>
               </a-form-model-item>
             </a-col>
-            <a-col :span="8">
-              <a-form-model-item label="" prop="customerAddr">
+            <a-col :span="24">
+              <a-form-model-item label="详细地址" prop="customerAddr" :labelCol="{ span: 3 }" :wrapperCol="{ span: 20 }">
                 <a-input id="customerManagementEdit-customerAddr" :maxLength="60" v-model.trim="form.customerAddr" placeholder="请输入详细地址(最多60个字符)" allowClear />
               </a-form-model-item>
             </a-col>
@@ -146,12 +151,13 @@ export default {
       spinning: false,
       formItemLayout: {
         labelCol: { span: 9 },
-        wrapperCol: { span: 15 }
+        wrapperCol: { span: 14 }
       },
       form: {
         id: null,
         customerName: '', // 客户名称
         contactTel: '', //  联系电话
+        contactMobile: '', //  联系手机
         contactName: '', //  联系人
         provinceSn: undefined, //  省
         provinceName: '',
@@ -169,11 +175,10 @@ export default {
       },
       rules: {
         customerName: [{ required: true, message: '请输入客户名称', trigger: 'blur' }],
-        contactTel: [{ required: true, message: '请输入联系电话', trigger: 'blur' }, { pattern: /^\d{11}$/, message: '请输入正确的手机号' }],
+        contactMobile: [{ required: false, pattern: /^\d{11}$/, message: '请输入正确的手机号', trigger: 'blur' }],
         provinceSn: [{ required: true, message: '请选择省', trigger: 'change' }],
         citySn: [{ required: true, message: '请选择市', trigger: 'change' }],
         countySn: [{ required: true, message: '请选择区/县', trigger: 'change' }],
-        customerAddr: [{ required: true, message: '请输入详细地址', trigger: 'blur' }],
         priceType: [{ required: true, message: '请选择价格类型', trigger: 'change' }],
         settleStyleSn: [{ required: true, message: '请选择收款方式', trigger: 'change' }]
       },
@@ -238,7 +243,7 @@ export default {
               _this.$message.success(res.message)
               if (_this.model == 'page') {
                 setTimeout(() => {
-                  _this.$router.push({ path: '/customerManagement/customerInfo/list' })
+                  _this.handleBack()
                 }, 600)
               } else {
                 _this.$emit('ok', res.data)
@@ -256,7 +261,7 @@ export default {
     },
     //  返回列表
     handleBack () {
-      this.$router.push({ path: '/customerManagement/customerInfo/list' })
+      this.$router.push({ path: '/customerManagement/customerInfo/list', query: { closeLastOldTab: true } })
     },
     // 获取城市列表
     getCityList (val) {

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

@@ -87,11 +87,11 @@
       <s-table
         class="sTable"
         ref="table"
-        size="default"
+        size="small"
         :rowKey="(record) => record.id"
         :columns="columns"
         :data="loadData"
-        :scroll="{ x: 1240, y: tableHeight }"
+        :scroll="{ x: 1400, y: tableHeight }"
         bordered>
         <!-- 操作 -->
         <template slot="action" slot-scope="text, record">
@@ -154,8 +154,9 @@ export default {
         { title: '序号', dataIndex: 'no', width: 80, align: 'center' },
         { title: '创建时间', dataIndex: 'createDate', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '客户名称', dataIndex: 'customerName', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '联系人', dataIndex: 'contactName', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '联系电话', dataIndex: 'contactTel', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '联系人', dataIndex: 'contactName', width: 140, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '联系电话', dataIndex: 'contactTel', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '联系手机', dataIndex: 'contactMobile', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '最后销售时间', dataIndex: 'lastSaleTime', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '是否卫星仓', dataIndex: 'satelliteFlagDictValue', width: 110, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '启用禁用', scopedSlots: { customRender: 'enableAction' }, width: 100, align: 'center', fixed: 'right' },
@@ -165,7 +166,7 @@ export default {
       loadData: parameter => {
         this.disabled = true
         if (this.tableHeight == 0) {
-          this.tableHeight = window.innerHeight - 380
+          this.tableHeight = window.innerHeight - 360
         }
         return custList(Object.assign(parameter, this.queryParam)).then(res => {
           const data = res.data

+ 4 - 4
src/views/financialManagement/companyCollectionPayment/detail.vue

@@ -21,7 +21,7 @@
             <a-descriptions-item label="单位类型">{{ (basicInfoData&&basicInfoData.settleClientTypeDictValue) || '--' }}</a-descriptions-item>
             <a-descriptions-item label="结算类型">{{ (basicInfoData&&basicInfoData.settleTypeDictValue) || '--' }}</a-descriptions-item>
             <a-descriptions-item label="应结算金额">{{ (basicInfoData&&(basicInfoData.settleAmount || basicInfoData.settleAmount==0)) ? basicInfoData.settleAmount : '--' }}</a-descriptions-item>
-            <a-descriptions-item label="折让金额">{{ discountAmount || '--' }}</a-descriptions-item>
+            <a-descriptions-item label="折让金额">{{ (discountAmount || discountAmount==0) ? discountAmount : '--' }}</a-descriptions-item>
             <a-descriptions-item label="实结算金额">{{ (basicInfoData&&(basicInfoData.realSettleAmount || basicInfoData.realSettleAmount==0)) ? basicInfoData.realSettleAmount : '--' }}</a-descriptions-item>
             <a-descriptions-item label="结算时间">{{ (basicInfoData&&basicInfoData.createDate) || '--' }}</a-descriptions-item>
             <a-descriptions-item label="操作人">{{ (basicInfoData&&basicInfoData.operateName) || '--' }}</a-descriptions-item>
@@ -35,7 +35,7 @@
       <a-collapse :activeKey="['1']">
         <a-collapse-panel key="1" header="收款明细">
           <!-- alert -->
-          <a-alert type="info" showIcon style="margin-bottom:15px">
+          <a-alert type="info" showIcon style="margin-bottom:10px">
             <div slot="message">
               共 <strong>{{ total }}</strong> 条明细,
               金额合计 <strong>{{ (basicInfoData&&(basicInfoData.totalSettleAmount || basicInfoData.totalSettleAmount==0)) ? '¥'+basicInfoData.totalSettleAmount : '--' }}</strong> ,
@@ -84,7 +84,7 @@ export default {
             data.list[i].no = no + i + 1
           }
           this.disabled = false
-          this.total = data.list.length || 0
+          this.total = data.count || 0
           return data
         })
       },
@@ -104,7 +104,7 @@ export default {
   methods: {
     //  返回列表
     handleBack () {
-      this.$router.push({ path: '/financialManagement/companyCollectionPayment/list' })
+      this.$router.push({ path: '/financialManagement/companyCollectionPayment/list', query: { closeLastOldTab: true } })
     },
     // 详情
     getDetail () {

+ 4 - 4
src/views/financialManagement/companyCollectionPayment/list.vue

@@ -64,7 +64,7 @@
       </a-form>
     </div>
     <!-- alert -->
-    <a-alert type="info" showIcon style="margin-bottom:15px">
+    <a-alert type="info" showIcon style="margin-bottom:10px">
       <div slot="message">
         共 <strong>{{ total }}</strong> 条记录,
         其中收款单 <strong>{{ (productTotal&&(productTotal.receiptCount || productTotal.receiptCount==0)) ? productTotal.receiptCount : '--' }}</strong> 条,
@@ -77,7 +77,7 @@
     <s-table
       class="sTable"
       ref="table"
-      size="default"
+      size="small"
       :rowKey="(record) => record.id"
       :columns="columns"
       :data="loadData"
@@ -129,7 +129,7 @@ export default {
       loadData: parameter => {
         this.disabled = true
         if (this.tableHeight == 0) {
-          this.tableHeight = window.innerHeight - 440
+          this.tableHeight = window.innerHeight - 420
         }
         return settleUnitList(Object.assign(parameter, this.queryParam)).then(res => {
           const data = res.data
@@ -138,7 +138,7 @@ export default {
             data.list[i].no = no + i + 1
           }
           this.disabled = false
-          this.total = data.list.length
+          this.total = data.count
           this.getTotal(Object.assign(parameter, this.queryParam))
           return data
         })

+ 2 - 2
src/views/financialManagement/companyReceivablePayable/collectionPayment.vue

@@ -17,7 +17,7 @@
               <a-button type="primary" size="small" class="button-error" id="collectionPayment-circle-btn" @click.stop="handleChoose">选择单据</a-button>
             </template>
             <!-- 总计 -->
-            <a-alert type="info" showIcon style="margin-bottom:15px">
+            <a-alert type="info" showIcon style="margin-bottom:10px">
               <div slot="message">
                 共 <strong>{{ chooseLoadData.length }}</strong>条明细 ,
                 金额合计¥<strong>{{ totalAmount }}</strong> ,
@@ -301,7 +301,7 @@ export default {
     },
     // 返回列表
     handleBack () {
-      this.$router.push({ path: `/financialManagement/companyReceivablePayable/list` })
+      this.$router.push({ path: `/financialManagement/companyReceivablePayable/list`, query: { closeLastOldTab: true } })
     },
     // 关闭
     handleClose () {

+ 3 - 3
src/views/financialManagement/companyReceivablePayable/detail.vue

@@ -44,7 +44,7 @@
         </a-form>
       </div>
       <!-- alert -->
-      <a-alert type="info" showIcon style="margin-bottom:15px">
+      <a-alert type="info" showIcon style="margin-bottom:10px">
         <div slot="message">
           共 <strong>{{ total }}</strong> 条明细,
           金额合计 <strong>{{ (productTotal&&(productTotal.totalAmount || productTotal.totalAmount==0)) ? '¥'+productTotal.totalAmount : '--' }}</strong> ,
@@ -111,7 +111,7 @@ export default {
             data.list[i].no = no + i + 1
           }
           this.disabled = false
-          this.total = data.list.length || 0
+          this.total = data.count || 0
           this.getTotal(params)
           return data
         })
@@ -129,7 +129,7 @@ export default {
     },
     //  返回列表
     handleBack () {
-      this.$router.push({ path: '/financialManagement/companyReceivablePayable/list' })
+      this.$router.push({ path: '/financialManagement/companyReceivablePayable/list', query: { closeLastOldTab: true } })
     },
     // 合计
     getTotal (param) {

+ 3 - 3
src/views/financialManagement/companyReceivablePayable/list.vue

@@ -30,7 +30,7 @@
       </a-form>
     </div>
     <!-- alert -->
-    <a-alert type="info" showIcon style="margin-bottom:15px">
+    <a-alert type="info" showIcon style="margin-bottom:10px">
       <div slot="message">
         共 <strong>{{ total }}</strong> 条记录,
         应收金额合计 <strong>{{ (productTotal&&(productTotal.receipt || productTotal.receipt==0)) ? '¥'+productTotal.receipt : '--' }}</strong> ,
@@ -41,7 +41,7 @@
     <s-table
       class="sTable"
       ref="table"
-      size="default"
+      size="small"
       :rowKey="(record) => record.id"
       :columns="columns"
       :data="loadData"
@@ -107,7 +107,7 @@ export default {
             data.list[i].unSettleAmountPay = Math.abs(data.list[i].unSettleAmountPay) || 0
           }
           this.disabled = false
-          this.total = data.list.length
+          this.total = data.count
           this.getTotal(Object.assign(parameter, this.queryParam))
           return data
         })

+ 1 - 1
src/views/financialManagement/expenseManagement/detailModal.vue

@@ -11,7 +11,7 @@
     <!-- 详情 -->
     <div>
       <a-descriptions :column="1" size="default">
-        <a-descriptions-item label="费用单号">{{ detailsData&&detailsData.accountExpensesSn || '--' }}</a-descriptions-item>
+        <a-descriptions-item label="费用单号">{{ detailsData&&detailsData.accountExpensesNo || '--' }}</a-descriptions-item>
         <a-descriptions-item label="费用类型">
           <div v-if="detailsData&&(detailsData.expensesTypeName1 || detailsData.expensesTypeName2 || detailsData.expensesTypeName3)">
             {{ detailsData&&detailsData.expensesTypeName1 ? detailsData.expensesTypeName1 : '' }}

+ 24 - 24
src/views/financialManagement/expenseManagement/edit.vue

@@ -20,34 +20,34 @@
           :wrapper-col="formItemLayout.wrapperCol">
           <a-form-model-item label="费用类型" prop="costType">
             <a-cascader
-            @change="changeCostType"
-            v-model="form.costType"
-            expand-trigger="hover"
-            :options="costTypeList"
-            :fieldNames="{ label: 'name', value: 'costTypeSn', children: 'children' }"
-            id="productInfoList-costType"
-            placeholder="请选择费用类型"
-            allowClear
+              @change="changeCostType"
+              v-model="form.costType"
+              expand-trigger="hover"
+              :options="costTypeList"
+              :fieldNames="{ label: 'name', value: 'costTypeSn', children: 'children' }"
+              id="productInfoList-costType"
+              placeholder="请选择费用类型"
+              allowClear
             />
           </a-form-model-item>
           <a-form-model-item label="费用金额" prop="settleAmount">
             <a-input-number
-            id="expenseManagementEdit-name"
-            v-model="form.settleAmount"
-            :precision="2"
-            :min="0"
-            :max="999999"
-            placeholder="请输入费用金额(0~999999)"
-            allowClear
-            style="width: 90%;"
+              id="expenseManagementEdit-name"
+              v-model="form.settleAmount"
+              :precision="2"
+              :min="0"
+              :max="999999"
+              placeholder="请输入费用金额(0~999999)"
+              allowClear
+              style="width: 90%;"
             />
           </a-form-model-item>
           <a-form-model-item label="结算方式" prop="settleStyleSn">
-            <a-select placeholder="请选择结算方式" v-model="form.settleStyleSn" @change="settleStyleChange">
-            <a-select-option v-for="item in settleStyleList" :key="item.settleStyleSn" :value="item.settleStyleSn">
-              {{ item.name }}
-            </a-select-option>
+            <a-select placeholder="请选择结算方式" allowClear v-model="form.settleStyleSn" @change="settleStyleChange">
+              <a-select-option v-for="item in settleStyleList" :key="item.settleStyleSn" :value="item.settleStyleSn">
+                {{ item.name }}
+              </a-select-option>
             </a-select>
           </a-form-model-item>
           <a-form-model-item label="关联单号" prop="bizNo">
@@ -57,11 +57,11 @@
             <a-textarea id="expenseManagementEdit-remarks" :maxLength="500" v-model="form.remark" placeholder="请输入备注(最多500个字符)" allowClear />
           </a-form-model-item>
           <a-form-model-item :wrapper-col="{ span: 12, offset: 6 }" style="text-align: center;">
-            <a-button type="primary" size="large" @click="handleSubmit" id="expenseManagementEdit-btn-save" style="margin: 0 30px;">保存</a-button>
+            <a-button type="primary" @click="handleSubmit" id="expenseManagementEdit-btn-save" style="margin: 0 30px;">保存</a-button>
           </a-form-model-item>
         </a-form-model>
       </a-card>
-		</a-spin>
+    </a-spin>
   </div>
 </template>
 
@@ -176,7 +176,7 @@ export default {
                 _this.handleBack()
                 _this.spinning = false
               }, 1000)
-            }else{
+            } else {
               _this.spinning = false
             }
           })
@@ -187,7 +187,7 @@ export default {
     },
     //  返回列表
     handleBack () {
-      this.$router.push({ name: 'expenseManagementList' })
+      this.$router.push({ path: '/financialManagement/expenseManagement/list', query: { closeLastOldTab: true } })
     }
   },
   beforeRouteEnter (to, from, next) {

+ 3 - 3
src/views/financialManagement/expenseManagement/list.vue

@@ -60,7 +60,7 @@
         <a-button v-if="$hasPermissions('B_expenseNew')" id="expenseManagementList-add" type="primary" class="button-error" @click="handleEdit()">新增</a-button>
       </div>
       <!-- alert -->
-      <a-alert type="info" showIcon style="margin-bottom:15px">
+      <a-alert type="info" showIcon style="margin-bottom:10px">
         <div slot="message">
           共 <strong>{{ totalData&&(totalData.count || totalData.count==0) ? totalData.count : '--' }}</strong> 条记录,
           金额共计 <strong>¥{{ totalData&&(totalData.totalAmount || totalData.totalAmount==0) ? '¥'+totalData.totalAmount : '--' }}</strong>
@@ -70,7 +70,7 @@
       <s-table
         class="sTable"
         ref="table"
-        size="default"
+        size="small"
         :rowKey="(record) => record.id"
         :columns="columns"
         :data="loadData"
@@ -90,7 +90,7 @@
             size="small"
             type="link"
             v-if="record.state == 'WAIT_AUDIT' && $hasPermissions('B_expenseAudit')"
-            class="button-warring"
+            class="button-warning"
             @click="handleAudit(record)"
             id="expenseManagement-audit-btn">审核</a-button>
           <a-button

+ 1 - 1
src/views/financialManagement/financialCollection/detailModal.vue

@@ -14,7 +14,7 @@
         <a-descriptions-item label="收款单号">{{ detailsData&&detailsData.settleNo || '--' }}</a-descriptions-item>
         <a-descriptions-item label="关联单号">{{ detailsData&&detailsData.bizNo || '--' }}</a-descriptions-item>
         <a-descriptions-item label="商户名称">{{ detailsData&&detailsData.settleClientName || '--' }}</a-descriptions-item>
-        <a-descriptions-item label="收款金额">{{ '¥'+ (detailsData&&(detailsData.settledAmount || detailsData.settledAmount==0) ? detailsData.settledAmount : '--') }}</a-descriptions-item>
+        <a-descriptions-item label="收款金额">{{ detailsData&&(detailsData.settledAmount || detailsData.settledAmount==0) ? '¥'+ detailsData.settledAmount : '--' }}</a-descriptions-item>
         <a-descriptions-item label="收款类型">{{ detailsData&&detailsData.bizTypeDictValue || '--' }}</a-descriptions-item>
         <a-descriptions-item label="收款方式">{{ detailsData&&detailsData.settleStyleName || '--' }}</a-descriptions-item>
         <a-descriptions-item label="收款时间">{{ detailsData&&detailsData.settleTime || '--' }}</a-descriptions-item>

+ 5 - 5
src/views/financialManagement/financialCollection/list.vue

@@ -29,7 +29,7 @@
                     v-model="queryParam.billState"
                     ref="settleState"
                     id="financialCollectionList-settleState"
-                    code="BILL_STATUS"
+                    code="SETTLE_RECEIVE_STATUS"
                     placeholder="请选择单据状态"
                     allowClear
                   ></v-select>
@@ -55,7 +55,7 @@
         </a-form>
       </div>
       <!-- alert -->
-      <a-alert type="info" showIcon style="margin-bottom:15px">
+      <a-alert type="info" showIcon style="margin-bottom:10px">
         <div slot="message">
           <strong>{{ totalData&&(totalData.count || totalData.count==0) ? totalData.count : '--' }}</strong>
@@ -79,7 +79,7 @@
       <s-table
         class="sTable"
         ref="table"
-        size="default"
+        size="small"
         :row-selection="$hasPermissions('B_financialCollectionPl') ? rowSelection : null"
         :rowKey="record => record.id"
         :columns="columns"
@@ -101,10 +101,10 @@
             type="link"
             :loading="loading"
             class="button-warning"
-            v-if="record.settleState == 'UNSETTLE'&&record.satelliteFlag!=1 && $hasPermissions('B_financialCollectionSing')"
+            v-if="(record.settleState == 'UNSETTLE' || record.settleState == 'PART_SETTLED')&&record.satelliteFlag!=1 && $hasPermissions('B_financialCollectionSing')"
             @click="handleCollectionSing(record)"
             id="financialCollectionList-pay-btn">收款</a-button>
-          <span v-if="(!(record.settleState == 'SETTLED') && !(record.settleState == 'UNSETTLE'&&record.satelliteFlag!=1))||(!$hasPermissions('B_financialCollectionSing') && !$hasPermissions('B_financialCollectionDetail'))||(record.settleState == 'SETTLED' && !$hasPermissions('B_financialCollectionDetail'))||(record.settleState == 'UNSETTLE'&&record.satelliteFlag!=1 && !$hasPermissions('B_financialCollectionSing'))">--</span>
+          <span v-if="!(record.settleState == 'SETTLED' && $hasPermissions('B_financialCollectionDetail')) && !((record.settleState == 'UNSETTLE' || record.settleState == 'PART_SETTLED')&&record.satelliteFlag!=1 && $hasPermissions('B_financialCollectionSing'))">--</span>
           <!-- satelliteFlag为1,是卫星仓 -->
         </template>
       </s-table>

+ 3 - 3
src/views/financialManagement/financialPayment/list.vue

@@ -29,7 +29,7 @@
                     v-model="queryParam.billState"
                     ref="settleState"
                     id="finacialPay-settleState"
-                    code="BILL_STATUS"
+                    code="SETTLE_PAY_STATUS"
                     placeholder="请选择单据状态"
                     allowClear></v-select>
                 </a-form-item>
@@ -54,7 +54,7 @@
         </a-form>
       </div>
       <!-- alert -->
-      <a-alert type="info" showIcon style="margin-bottom:15px">
+      <a-alert type="info" showIcon style="margin-bottom:10px">
         <div slot="message">
           <strong>{{ totalData&&(totalData.count || totalData.count==0) ? totalData.count : '--' }}</strong>
@@ -78,7 +78,7 @@
       <s-table
         class="sTable"
         ref="table"
-        size="default"
+        size="small"
         :row-selection="$hasPermissions('B_financialPaymentPl') ? rowSelection : null"
         :rowKey="record => record.id"
         :columns="columns"

+ 3 - 3
src/views/financialManagement/inventoryReview/detail.vue

@@ -14,7 +14,7 @@
     <!-- 内容 -->
     <a-page-header title="盘点单号:CG2021010100001" ></a-page-header>
     <!-- alert -->
-    <a-alert type="info" showIcon style="margin-bottom:15px">
+    <a-alert type="info" showIcon style="margin-bottom:10px">
       <div slot="message"><strong class="red">红色代表盘盈</strong>,<strong class="green">绿色代表盈亏</strong></div>
     </a-alert>
     <!-- 盈亏统计 -->
@@ -64,7 +64,7 @@
           <s-table
             class="sTable"
             ref="table"
-            size="default"
+            size="small"
             :rowKey="(record) => record.id"
             :columns="columns"
             :data="loadData"
@@ -140,7 +140,7 @@ export default {
   methods: {
     //  返回列表
     handleBack () {
-      this.$router.push({ path: '/financialManagement/inventoryReview/list' })
+      this.$router.push({ path: '/financialManagement/inventoryReview/list', query: { closeLastOldTab: true } })
     }
   }
 }

+ 2 - 2
src/views/financialManagement/inventoryReview/list.vue

@@ -35,14 +35,14 @@
       </a-form>
     </div>
     <!-- alert -->
-    <a-alert type="info" showIcon style="margin-bottom:15px">
+    <a-alert type="info" showIcon style="margin-bottom:10px">
       <div slot="message">共 <strong>6</strong> 条记录,其中待审核 <strong>14</strong> 条 </div>
     </a-alert>
     <!-- 列表 -->
     <s-table
       class="sTable"
       ref="table"
-      size="default"
+      size="small"
       :rowKey="(record) => record.id"
       :columns="columns"
       :data="loadData"

+ 3 - 3
src/views/financialManagement/ledgerRecord/list.vue

@@ -40,7 +40,7 @@
       </a-form>
     </div>
     <!-- alert -->
-    <a-alert type="info" showIcon style="margin-bottom:15px">
+    <a-alert type="info" showIcon style="margin-bottom:10px">
       <div slot="message">
         总计:<strong>{{ total }}</strong>条 ,
         分账金额:<strong>{{ (totalAmount || totalAmount == 0) ? totalAmount+'元' : '--' }}</strong>
@@ -50,7 +50,7 @@
     <s-table
       class="sTable"
       ref="table"
-      size="default"
+      size="small"
       :rowKey="(record) => record.id"
       :columns="columns"
       :data="loadData"
@@ -111,7 +111,7 @@ export default {
             data.list[i].no = no + i + 1
           }
           this.disabled = false
-          this.total = data.list.length || 0
+          this.total = data.count || 0
           this.getTotal(Object.assign(parameter, this.queryParam))
           return data
         })

+ 3 - 3
src/views/financialManagement/warehousingAudit/detail.vue

@@ -77,9 +77,9 @@ export default {
         { title: '原厂编码', dataIndex: 'dealerProductEntity.origCode', width: 220, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '采购数量', dataIndex: 'qty', width: 110, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '入库数量', dataIndex: 'putQty', width: 110, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '成本价', dataIndex: 'price', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '成本价', dataIndex: 'discountedPrice', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '单位', dataIndex: 'dealerProductEntity.unit', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '入库小计', dataIndex: 'totalAmount', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '入库小计', dataIndex: 'discountedAmount', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '仓库', dataIndex: 'warehouseEntity.name', width: 140, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '仓位', dataIndex: 'warehouseLocationEntity.name', width: 140, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true }
       ],
@@ -103,7 +103,7 @@ export default {
   methods: {
     //  返回列表
     handleBack () {
-      this.$router.push({ path: '/financialManagement/warehousingAudit/list' })
+      this.$router.push({ path: '/financialManagement/warehousingAudit/list', query: { closeLastOldTab: true } })
     },
     // 打印预览/快捷打印
     handlePrint (type) {

+ 2 - 2
src/views/financialManagement/warehousingAudit/list.vue

@@ -47,7 +47,7 @@
         </a-form>
       </div>
       <!-- alert -->
-      <a-alert type="info" showIcon style="margin-bottom:15px">
+      <a-alert type="info" showIcon style="margin-bottom:10px">
         <div slot="message">
           共 <strong>{{ (productTotal&&(productTotal.totalRecord || productTotal.totalRecord==0)) ? productTotal.totalRecord : '--' }}</strong> 条记录,
           其中待审核 <strong>{{ (productTotal&&(productTotal.waitAuditRecord || productTotal.waitAuditRecord==0)) ? productTotal.waitAuditRecord : '--' }}</strong> 条
@@ -57,7 +57,7 @@
       <s-table
         class="sTable"
         ref="table"
-        size="default"
+        size="small"
         :rowKey="(record) => record.id"
         :columns="columns"
         :data="loadData"

+ 1 - 1
src/views/financialManagement/withdrawalManagement/list.vue

@@ -27,7 +27,7 @@
     <s-table
       class="sTable"
       ref="table"
-      size="default"
+      size="small"
       :rowKey="(record) => record.id"
       :columns="columns"
       :data="loadData"

+ 1 - 1
src/views/inventoryManagement/inventoryChecking/checkingTipsModal.vue

@@ -16,7 +16,7 @@
     <s-table
       class="sTable"
       ref="table"
-      size="default"
+      size="small"
       :rowKey="(record) => record.id"
       :columns="columns"
       :data="loadData"

+ 3 - 3
src/views/inventoryManagement/inventoryChecking/detail.vue

@@ -24,7 +24,7 @@
     </a-card>
     <a-card size="small" :bordered="false" class="inventoryCheckingDetail-cont">
       <!-- 总计 -->
-      <a-alert type="info" showIcon style="margin-bottom:15px">
+      <a-alert type="info" showIcon style="margin-bottom:10px">
         <div slot="message">
           库存总数量:
           <strong>6</strong>
@@ -54,7 +54,7 @@
       <s-table
         class="sTable"
         ref="table"
-        size="default"
+        size="small"
         :rowKey="record => record.id"
         :columns="columns"
         :data="loadData"
@@ -132,7 +132,7 @@ export default {
     resetSearchForm () {},
     //  返回列表
     handleBack () {
-      this.$router.push({ path: '/inventoryManagement/inventoryChecking/list' })
+      this.$router.push({ path: '/inventoryManagement/inventoryChecking/list', query: { closeLastOldTab: true } })
     },
     //  导出
     handleExport () {

+ 3 - 3
src/views/inventoryManagement/inventoryChecking/financialAuditDetail.vue

@@ -29,7 +29,7 @@
       <a-collapse :activeKey="['1']">
         <a-collapse-panel key="1" header="详情">
           <!-- 总计 -->
-          <a-alert type="info" showIcon style="margin-bottom:15px">
+          <a-alert type="info" showIcon style="margin-bottom:10px">
             <div slot="message">盘盈总数量: <strong>6</strong> ,库存总成本(¥): <strong>6</strong> ,盘亏总数量: <strong>6</strong> ,盘亏总成本(¥): <strong>6</strong>,盈亏总数量: <strong>6</strong> ,盈亏总成本(¥): <strong>6</strong> </div>
           </a-alert>
           <!-- 筛选条件 -->
@@ -54,7 +54,7 @@
           <s-table
             class="sTable"
             ref="table"
-            size="default"
+            size="small"
             :rowKey="(record) => record.id"
             :columns="columns"
             :data="loadData"
@@ -132,7 +132,7 @@
       resetSearchForm(){},
       //  返回列表
       handleBack(){
-        this.$router.push({ path: '/inventoryManagement/inventoryChecking/list'})
+        this.$router.push({ path: '/inventoryManagement/inventoryChecking/list', query: { closeLastOldTab: true }})
       },
     }
   }

+ 1 - 1
src/views/inventoryManagement/inventoryChecking/list.vue

@@ -35,7 +35,7 @@
     <s-table
       class="sTable"
       ref="table"
-      size="default"
+      size="small"
       :rowKey="(record) => record.id"
       :columns="columns"
       :data="loadData"

+ 2 - 2
src/views/inventoryManagement/inventoryChecking/makeInventory.vue

@@ -46,7 +46,7 @@
       <s-table
         class="sTable"
         ref="table"
-        size="default"
+        size="small"
         :rowKey="(record) => record.id"
         :columns="columns"
         :data="loadData"
@@ -131,7 +131,7 @@ export default {
   methods: {
     //  返回列表
     handleBack () {
-      this.$router.push({ path: '/inventoryManagement/inventoryChecking/list' })
+      this.$router.push({ path: '/inventoryManagement/inventoryChecking/list', query: { closeLastOldTab: true } })
     },
     //  导入
     handleImport () {},

+ 3 - 3
src/views/inventoryManagement/inventoryChecking/makeInventoryDetail.vue

@@ -27,7 +27,7 @@
       <a-collapse :activeKey="['1']">
         <a-collapse-panel key="1" header="详情">
           <!-- 总计 -->
-          <a-alert type="info" showIcon style="margin-bottom:15px">
+          <a-alert type="info" showIcon style="margin-bottom:10px">
             <div slot="message">库存总数量: <strong>6</strong> ,盈亏总数量: <strong>6</strong></div>
           </a-alert>
           <!-- 筛选条件 -->
@@ -52,7 +52,7 @@
           <s-table
             class="sTable"
             ref="table"
-            size="default"
+            size="small"
             :rowKey="(record) => record.id"
             :columns="columns"
             :data="loadData"
@@ -130,7 +130,7 @@
       resetSearchForm(){},
       //  返回列表
       handleBack(){
-        this.$router.push({ path: '/inventoryManagement/inventoryChecking/list'})
+        this.$router.push({ path: '/inventoryManagement/inventoryChecking/list', query: { closeLastOldTab: true }})
       },
     }
   }

+ 2 - 2
src/views/inventoryManagement/inventoryChecking/overall.vue

@@ -18,7 +18,7 @@
       <s-table
         class="sTable"
         ref="table"
-        size="default"
+        size="small"
         :rowKey="(record) => record.id"
         :columns="columns"
         :data="loadData"
@@ -87,7 +87,7 @@ export default {
     },
     //  返回
     handleBack () {
-      this.$router.push({ path: '/inventoryManagement/inventoryChecking/list' })
+      this.$router.push({ path: '/inventoryManagement/inventoryChecking/list', query: { closeLastOldTab: true } })
     },
     //
     onChange () {}

+ 4 - 4
src/views/inventoryManagement/inventoryChecking/selfDisk.vue

@@ -100,7 +100,7 @@
             <s-table
               class="sTable"
               ref="table"
-              size="default"
+              size="small"
               :rowKey="(record) => record.id"
               :columns="columns"
               :data="loadData"
@@ -126,14 +126,14 @@
           <!-- 已选产品 -->
           <div>
             <!-- 总计 -->
-            <a-alert type="info" showIcon style="margin-bottom:15px">
+            <a-alert type="info" showIcon style="margin-bottom:10px">
               <div slot="message">产品款数 <strong>6</strong> ,采购数量合计 <strong>6</strong> ,采购金额合计¥<strong>6.33</strong></div>
             </a-alert>
             <!-- 列表 -->
             <s-table
               class="sTable"
               ref="table"
-              size="default"
+              size="small"
               :rowKey="(record) => record.id"
               :columns="chooseColumns"
               :data="chooseLoadData"
@@ -295,7 +295,7 @@ export default {
     },
     //  返回列表
     handleBack () {
-      this.$router.push({ path: '/inventoryManagement/inventoryChecking/list' })
+      this.$router.push({ path: '/inventoryManagement/inventoryChecking/list', query: { closeLastOldTab: true } })
     },
     filterOption (input, option) {
       	return (

+ 1 - 1
src/views/inventoryManagement/inventoryQuery/detailModal.vue

@@ -9,7 +9,7 @@
     @cancle="isShow=false"
     :width="960">
     <!-- 合计 -->
-    <a-alert type="info" showIcon style="margin-bottom:15px">
+    <a-alert type="info" showIcon style="margin-bottom:10px">
       <div class="ftext" slot="message">
         现有库存总数量(个):<strong>{{ currentStock&&(currentStock.currentQty || currentStock.currentQty==0) ? currentStock.currentQty : '--' }}</strong>;
         现有库存总成本(¥):<strong>{{ currentStock&&(currentStock.putCost || currentStock.putCost==0) ? currentStock.putCost : '--' }}</strong>。

+ 3 - 3
src/views/inventoryManagement/inventoryQuery/list.vue

@@ -75,7 +75,7 @@
         </a-form>
       </div>
       <!-- 合计 -->
-      <a-alert type="info" showIcon style="margin-bottom:15px">
+      <a-alert type="info" showIcon style="margin-bottom:10px">
         <div class="ftext" slot="message">
           现有库存总数量(个):<strong>{{ currentStock&&(currentStock.totalCurrentStockQty || currentStock.totalCurrentStockQty==0) ? currentStock.totalCurrentStockQty : '--' }}</strong>;
           现有库存总成本(¥):<strong>{{ currentStock&&(currentStock.totalCurrentStockCost || currentStock.totalCurrentStockCost==0) ? currentStock.totalCurrentStockCost : '--' }}</strong>。
@@ -85,7 +85,7 @@
       <s-table
         class="sTable"
         ref="table"
-        size="default"
+        size="small"
         :rowKey="(record) => record.id"
         :columns="columns"
         :data="loadData"
@@ -177,7 +177,7 @@ export default {
       loadData: parameter => {
         this.disabled = true
         if (this.tableHeight == 0) {
-          this.tableHeight = window.innerHeight - 370
+          this.tableHeight = window.innerHeight - 350
         }
         // 排序
         if (parameter.sortField == 'currentStockQty') {

+ 4 - 4
src/views/inventoryManagement/inventoryQuery/warehouseDetail.vue

@@ -35,7 +35,7 @@
             </a-col>
             <a-col :md="6" :sm="24">
               <a-form-item label="仓库">
-                <a-select id="inventoryQueryWarehouseDetail-warehouseSn" placeholder="请选择仓库" v-model="queryParam.warehouseSn" >
+                <a-select id="inventoryQueryWarehouseDetail-warehouseSn" placeholder="请选择仓库" allowClear v-model="queryParam.warehouseSn" >
                   <a-select-option v-for="item in warehouseList" :key="item.warehouseSn" :value="item.warehouseSn">{{ item.name }}</a-select-option>
                 </a-select>
               </a-form-item>
@@ -64,7 +64,7 @@
         </a-form>
       </div>
       <!-- 合计 -->
-      <a-alert type="info" showIcon style="margin-bottom:15px">
+      <a-alert type="info" showIcon style="margin-bottom:10px">
         <div class="ftext" slot="message">
           当前库存总数量(个):<strong>{{ (productTotal&&(productTotal.totalQty || productTotal.totalQty==0)) ? productTotal.totalQty : '--' }}</strong>;
           当前库存总成本(¥):<strong>{{ (productTotal&&(productTotal.totalCost || productTotal.totalCost==0)) ? productTotal.totalCost : '--' }}</strong>。
@@ -116,7 +116,7 @@ export default {
         { title: '产品编码', dataIndex: 'product.code', width: 140, align: 'center', fixed: 'left', customRender: function (text) { return text || '--' } },
         { title: '产品名称', dataIndex: 'product.name', align: 'center', ellipsis: true, customRender: function (text) { return text || '--' } },
         { title: '原厂编码', dataIndex: 'product.origCode', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '入库批次时间', dataIndex: 'stockBatchNo', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '批次号', dataIndex: 'stockBatchNo', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '单据类型', dataIndex: 'bizTypeDictValue', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '单据审核时间', dataIndex: 'auditTime', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '单位名称', dataIndex: 'unitName', width: 200, align: 'center', ellipsis: true, customRender: function (text) { return text || '--' } },
@@ -181,7 +181,7 @@ export default {
     },
     //  返回列表
     handleBack () {
-      this.$router.push({ path: '/inventoryManagement/inventoryQuery/list' })
+      this.$router.push({ path: '/inventoryManagement/inventoryQuery/list', query: { closeLastOldTab: true } })
     },
     // 仓库下拉数据
     getWarehouseList (type) {

+ 3 - 2
src/views/inventoryManagement/inventoryWarning/list.vue

@@ -92,7 +92,7 @@
       <a-table
         class="sTable"
         ref="table"
-        size="default"
+        size="small"
         :row-selection="$hasPermissions('B_inventoryWarningBatchSave') ? { selectedRowKeys: selectedRowKeys, onChange: onSelectChange } : null"
         :rowKey="(record) => record.id"
         :columns="columns"
@@ -247,7 +247,7 @@ export default {
     //  列表数据
     pageInit (pageNo) {
       if (this.tableHeight == 0) {
-        this.tableHeight = window.innerHeight - 380
+        this.tableHeight = window.innerHeight - 360
       }
       this.disabled = true
       this.loading = true
@@ -344,6 +344,7 @@ export default {
       this.queryParam.productTypeSn2 = undefined
       this.queryParam.productTypeSn3 = undefined
       this.queryParam.stockState = undefined
+      this.productType = []
       this.pageNo = 1
       this.pageSize = 10
       this.paginationProps.total = 0

+ 1 - 1
src/views/inventoryManagement/satelliteWarehouseInventory/list.vue

@@ -42,7 +42,7 @@
       <a-table
         class="sTable"
         ref="table"
-        size="default"
+        size="small"
         :rowKey="(record) => record.id"
         :columns="columns"
         :data-source="loadData"

+ 2 - 2
src/views/inventoryManagement/warehouse/list.vue

@@ -25,7 +25,7 @@
       <s-table
         class="sTable"
         ref="table"
-        size="default"
+        size="small"
         :rowKey="(record) => record.id"
         :columns="columns"
         :data="loadData"
@@ -88,7 +88,7 @@ export default {
       loadData: parameter => {
         this.disabled = true
         if (this.tableHeight == 0) {
-          this.tableHeight = window.innerHeight - 380
+          this.tableHeight = window.innerHeight - 360
         }
         return warehouseList(Object.assign(parameter, this.queryParam)).then(res => {
           const data = res.data

+ 2 - 2
src/views/inventoryManagement/warehouse/storingLocation/list.vue

@@ -33,7 +33,7 @@
         <s-table
           class="sTable"
           ref="table"
-          size="default"
+          size="small"
           :rowKey="(record) => record.id"
           :columns="columns"
           :data="loadData"
@@ -162,7 +162,7 @@ export default {
     },
     //  返回列表
     handleBack () {
-      this.$router.push({ path: '/inventoryManagement/warehouse/list' })
+      this.$router.push({ path: '/inventoryManagement/warehouse/list', query: { closeLastOldTab: true } })
     }
   }
 }

+ 1 - 1
src/views/notice/list.vue

@@ -25,7 +25,7 @@
     <a-table
       class="sTable"
       ref="table"
-      size="default"
+      size="small"
       :rowKey="(record) => record.id"
       :columns="columns"
       :dataSource="loadData"

+ 1 - 1
src/views/power/OperateJournal/OperateJournal.vue

@@ -23,7 +23,7 @@
       <!-- 列表 -->
       <s-table
         ref="table"
-        size="default"
+        size="small"
         rowKey="id"
         :columns="columns"
         :data="loadData"

+ 1 - 1
src/views/power/dataDictionary/dataDictionary.vue

@@ -76,7 +76,7 @@
             </div> -->
             <s-table
               ref="table"
-              size="default"
+              size="small"
               rowKey="id"
               :columns="columns"
               :data="loadData"

+ 1 - 1
src/views/power/role/roleList.vue

@@ -32,7 +32,7 @@
       </div>
       <s-table
         ref="table"
-        size="default"
+        size="small"
         rowKey="id"
         :columns="columns"
         :data="loadData"

+ 4 - 3
src/views/power/user/userList.vue

@@ -31,7 +31,7 @@
       </div>
       <s-table
         ref="table"
-        size="default"
+        size="small"
         rowKey="id"
         :columns="columns"
         :data="loadData"
@@ -40,7 +40,7 @@
         bordered
       >
         <span slot="status" slot-scope="text, record">
-          <a-switch v-if="$hasPermissions('B_powerMD_user_enable')" checkedChildren="启用" unCheckedChildren="禁用" v-model="record.loginFlag" @change="changeFlagHandle(text, record)"/>
+          <a-switch v-if="$hasPermissions('B_powerMD_user_enable') && record.superAdmin!=1" checkedChildren="启用" unCheckedChildren="禁用" v-model="record.loginFlag" @change="changeFlagHandle(text, record)"/>
           <span v-else>{{ record.loginFlag==1?'已启用':'已禁用' }}</span>
         </span>
         <span slot="action" slot-scope="text, record">
@@ -48,7 +48,7 @@
             type="edit"
             title="编辑"
             :style="{fontSize: '20px',color:' #1890FF',padding:' 0 10px'}"
-            v-if="$hasPermissions('B_powerMD_user_edit')"
+            v-if="$hasPermissions('B_powerMD_user_edit') && record.superAdmin!=1"
             @click="handleEdit(record)"
           />
           <a-icon
@@ -63,6 +63,7 @@
             :style="{fontSize: '20px',color: '#f00',padding: '0 10px'}"
             v-if="record.loginFlag==0 && record.ownerOrgFlag==1 && $hasPermissions('B_powerMD_user_del')"
             @click="delect(record)"/>
+          <span v-if="!($hasPermissions('B_powerMD_user_edit') && record.superAdmin!=1) && !(record.loginFlag==1 && record.ownerOrgFlag==1 && $hasPermissions('B_powerMD_user_restPwd')) && !(record.loginFlag==0 && record.ownerOrgFlag==1 && $hasPermissions('B_powerMD_user_del'))">--</span>
         </span>
       </s-table>
     </a-spin>

+ 8 - 7
src/views/productManagement/priceChangeRecord/list.vue

@@ -24,9 +24,9 @@
               <a-form-item label="品牌">
                 <a-select
                   placeholder="请选择"
-                  id="productChangeRecordList-brandSn"
+                  id="productChangeRecordList-productBrandSn"
                   allowClear
-                  v-model="queryParam.brandSn"
+                  v-model="queryParam.productBrandSn"
                   :showSearch="true"
                   option-filter-prop="children"
                   :filter-option="filterOption">
@@ -68,14 +68,14 @@
       </a-form>
     </div>
     <!-- 总计 -->
-    <a-alert type="info" showIcon style="margin-bottom:15px">
+    <a-alert type="info" showIcon style="margin-bottom:10px">
       <div slot="message">合计:<strong>{{ total }}</strong>条</div>
     </a-alert>
     <!-- 列表 -->
     <s-table
       class="sTable"
       ref="table"
-      size="default"
+      size="small"
       :rowKey="(record) => record.id"
       :columns="columns"
       :data="loadData"
@@ -134,7 +134,7 @@ export default {
         endDate: getDate.getCurrMonthDays().endtime,
         productName: '', //  产品名称
         productCode: '', //  产品编码
-        brandSn: undefined, //  品牌
+        productBrandSn: undefined, //  品牌
         productTypeSn1: '', //  产品一级分类
         productTypeSn2: '', //  产品二级分类
         productTypeSn3: '' //  产品三级分类
@@ -150,7 +150,7 @@ export default {
       loadData: parameter => {
         this.disabled = true
         if (this.tableHeight == 0) {
-          this.tableHeight = window.innerHeight - 430
+          this.tableHeight = window.innerHeight - 400
         }
         return productPriceChangeList(Object.assign(parameter, this.queryParam)).then(res => {
           const data = res.data
@@ -267,10 +267,11 @@ export default {
       this.queryParam.endDate = getDate.getCurrMonthDays().endtime
       this.queryParam.productCode = ''
       this.queryParam.productName = ''
-      this.queryParam.brandSn = undefined
+      this.queryParam.productBrandSn = undefined
       this.queryParam.productTypeSn1 = ''
       this.queryParam.productTypeSn2 = ''
       this.queryParam.productTypeSn3 = ''
+      this.productType = []
       this.$refs.table.refresh(true)
     },
     filterOption (input, option) {

+ 2 - 2
src/views/productManagement/productBrand/list.vue

@@ -31,7 +31,7 @@
       <s-table
         class="sTable"
         ref="table"
-        size="default"
+        size="small"
         :rowKey="(record) => record.id"
         :columns="columns"
         :data="loadData"
@@ -93,7 +93,7 @@ export default {
       loadData: parameter => {
         this.disabled = true
         if (this.tableHeight == 0) {
-          this.tableHeight = window.innerHeight - 380
+          this.tableHeight = window.innerHeight - 360
         }
         return dealerProductBrandList(Object.assign(parameter, this.queryParam)).then(res => {
           const data = res.data

+ 2 - 2
src/views/productManagement/productCategory/list.vue

@@ -9,7 +9,7 @@
       <s-table
         class="sTable"
         ref="table"
-        size="default"
+        size="small"
         :rowKey="(record) => record.id"
         :columns="columns"
         :data="loadData"
@@ -75,7 +75,7 @@ export default {
       loadData: parameter => {
         this.disabled = true
         if (this.tableHeight == 0) {
-          this.tableHeight = window.innerHeight - 250
+          this.tableHeight = window.innerHeight - 230
         }
         return dealerProductTypeList({}).then(res => {
           //  递归去除空children

+ 2 - 2
src/views/productManagement/productInfo/edit.vue

@@ -244,7 +244,7 @@ export default {
             if (res.status == 200) {
               _this.$message.success(res.message)
               setTimeout(() => {
-                _this.$router.push({ path: '/productManagement/productInfo/list' })
+                _this.$router.push({ path: '/productManagement/productInfo/list', query: { closeLastOldTab: true } })
                 _this.spinning = false
               }, 1000)
             } else {
@@ -273,7 +273,7 @@ export default {
     },
     //  返回
     handleBack () {
-      this.$router.push({ path: '/productManagement/productInfo/list' })
+      this.$router.push({ path: '/productManagement/productInfo/list', query: { closeLastOldTab: true } })
     },
     //  产品品牌  列表
     getProductBrand (val) {

+ 2 - 2
src/views/productManagement/productInfo/list.vue

@@ -82,7 +82,7 @@
       <s-table
         class="sTable"
         ref="table"
-        size="default"
+        size="small"
         :rowKey="(record) => record.id"
         :columns="columns"
         :data="loadData"
@@ -175,7 +175,7 @@ export default {
       loadData: parameter => {
         this.disabled = true
         if (this.tableHeight == 0) {
-          this.tableHeight = window.innerHeight - 380
+          this.tableHeight = window.innerHeight - 360
         }
         return dealerProductList(Object.assign(parameter, this.queryParam)).then(res => {
           const data = res.data

+ 5 - 9
src/views/productManagement/productInfoJg/list.vue

@@ -76,7 +76,7 @@
     <s-table
       class="sTable"
       ref="table"
-      size="default"
+      size="small"
       :rowKey="(record) => record.id"
       :columns="columns"
       :data="loadData"
@@ -87,10 +87,6 @@
         <span v-if="record.productTypeName2 || record.productTypeName3">{{ record.productTypeName2 }} {{ record.productTypeName3 ? '>' : '' }} {{ record.productTypeName3 }}</span>
         <span v-else>--</span>
       </template>
-      <!-- 状态 -->
-      <template slot="onlineFalgDictValue" slot-scope="text, record">
-        <a-badge :color="record.onlineFalgDictValue == '下架'?'#ccc':'green'" :text="record.onlineFalgDictValue" />
-      </template>
     </s-table>
   </a-card>
 </template>
@@ -127,7 +123,7 @@ export default {
       loadData: parameter => {
         this.disabled = true
         if (this.tableHeight == 0) {
-          this.tableHeight = window.innerHeight - 210
+          this.tableHeight = window.innerHeight - 190
         }
         return productList(Object.assign(parameter, this.queryParam)).then(res => {
           const data = res.data
@@ -163,7 +159,7 @@ export default {
     getColumns () {
       this.columns = [
         { title: '序号', dataIndex: 'no', width: 80, align: 'center', fixed: 'left' },
-        { title: '产品编码', dataIndex: 'code', align: 'center' },
+        { title: '产品编码', dataIndex: 'code', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '产品名称', dataIndex: 'name', align: 'center', ellipsis: true, customRender: function (text) { return text || '--' } },
         { title: '原厂编码', dataIndex: 'origCode', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '产品品牌', dataIndex: 'productBrandName', width: 200, align: 'center', customRender: function (text) { return text || '--' } },
@@ -172,8 +168,8 @@ export default {
       const cArr = [
         { title: '终端价', dataIndex: 'terminalPrice', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '车主价', dataIndex: 'carOwnersPrice', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '创建时间', dataIndex: 'createDate', width: 160, align: 'center' },
-        { title: '状态', scopedSlots: { customRender: 'onlineFalgDictValue' }, width: 140, align: 'center' }
+        { title: '创建时间', dataIndex: 'createDate', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '状态', dataIndex: 'onlineFalgDictValue', width: 140, align: 'center', customRender: function (text) { return text || '--' } }
       ]
       getCurrentDealer().then(res => {
         if (res.status == 200) {

+ 3 - 3
src/views/purchasingManagement/purchaseOrder/detail.vue

@@ -46,7 +46,7 @@
         <a-collapse :activeKey="['1']">
           <a-collapse-panel key="1" header="产品详情">
             <!-- 总计 -->
-            <a-alert type="info" showIcon style="margin-bottom:15px">
+            <a-alert type="info" showIcon style="margin-bottom:10px">
               <div slot="message">
                 产品款数:<strong>{{ detail && (detail.totalCategory || detail.totalCategory==0) ? detail.totalCategory : '--' }}</strong>,
                 采购数量合计:<strong>{{ detail && (detail.totalQty || detail.totalQty==0) ? detail.totalQty : '--' }}</strong>,
@@ -87,7 +87,7 @@
         <a-collapse :activeKey="['1']">
           <a-collapse-panel key="1" header="促销品详情">
             <!-- 总计 -->
-            <a-alert type="info" showIcon style="margin-bottom:15px">
+            <a-alert type="info" showIcon style="margin-bottom:10px">
               <div slot="message">产品款数 <strong>{{ detail&&(detail.totalCategory || detail.totalCategory==0) ? detail.totalCategory : '--' }}</strong> ,
                 采购数量合计 <strong>{{ detail&&(detail.totalQty || detail.totalQty==0) ? detail.totalQty : '--' }}</strong> ,
                 采购金额合计 <strong>{{ detail&&(detail.totalAmount || detail.totalAmount==0) ? '¥'+detail.totalAmount : '--' }}</strong></div>
@@ -183,7 +183,7 @@ export default {
   methods: {
     //  返回列表
     handleBack () {
-      this.$router.push({ path: '/purchasingManagement/purchaseOrder/list' })
+      this.$router.push({ path: '/purchasingManagement/purchaseOrder/list', query: { closeLastOldTab: true } })
     },
     //  详情
     getDetail () {

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

@@ -149,7 +149,7 @@
             <!-- 已选产品 -->
             <div>
               <!-- 总计 -->
-              <a-alert type="info" showIcon style="margin-bottom:15px">
+              <a-alert type="info" showIcon style="margin-bottom:10px">
                 <div slot="message">产品款数 <strong>{{ detail && (detail.totalCategory || detail.totalCategory==0) ? detail.totalCategory : '--' }}</strong> ,
                   采购数量合计 <strong>{{ detail && (detail.totalQty || detail.totalQty==0) ? detail.totalQty : '--' }}</strong> ,
                   采购金额合计 <strong>{{ detail && (detail.discountedAmount || detail.discountedAmount==0) ? '¥'+detail.discountedAmount : '--' }}</strong></div>
@@ -481,7 +481,7 @@ export default {
     },
     //  返回列表
     handleBack () {
-      this.$router.push({ name: 'purchaseOrderList' })
+      this.$router.push({ path: '/purchasingManagement/purchaseOrder/list', query: { closeLastOldTab: true } })
     }
   },
   beforeRouteEnter (to, from, next) {

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

@@ -70,7 +70,7 @@
         <a-button id="purchaseOrderList-add" type="primary" v-if="$hasPermissions('B_purchaseNew')" class="button-error" @click="handleAdd">新增</a-button>
       </div>
       <!-- alert -->
-      <a-alert type="info" showIcon style="margin-bottom:15px">
+      <a-alert type="info" showIcon style="margin-bottom:10px">
         <div slot="message">
           共 <strong>{{ totalData&&(totalData.totalRecord || totalData.totalRecord==0) ? totalData.totalRecord : '--' }}</strong> 条记录,
           采购数量合计 <strong>{{ totalData&&(totalData.totalQty || totalData.totalQty==0) ? totalData.totalQty : '--' }}</strong> ,
@@ -81,7 +81,7 @@
       <s-table
         class="sTable"
         ref="table"
-        size="default"
+        size="small"
         :rowKey="(record) => record.id"
         :columns="columns"
         :data="loadData"
@@ -92,14 +92,6 @@
           <span style="color: #ed1c24;cursor: pointer;" v-if="$hasPermissions('B_purchaseDetail')" @click="handleDetail(record)">{{ record.purchaseBillNo }}</span>
           <span v-else>{{ record.purchaseBillNo }}</span>
         </template>
-        <!-- 财务状态 -->
-        <template slot="financialStatus" slot-scope="text, record">
-          <a-badge :color="text=='FINISH'?'#87d068':'gold'" :text="$refs.financialStatus.getNameByCode(text)" />
-        </template>
-        <!-- 业务状态 -->
-        <template slot="billStatus" slot-scope="text, record">
-          {{ $refs.billStatus.getNameByCode(text) }}
-        </template>
         <!-- 操作 -->
         <template slot="action" slot-scope="text, record">
           <a-button
@@ -172,15 +164,15 @@ export default {
         { title: '产品款数', dataIndex: 'totalCategory', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '采购数量', dataIndex: 'totalQty', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '采购金额(¥)', dataIndex: 'discountedAmount', width: 115, align: 'center', customRender: function (text) { return ((text || text == 0) ? ('¥' + text) : '--') } },
-        { title: '业务状态', dataIndex: 'billStatus', scopedSlots: { customRender: 'billStatus' }, width: 110, align: 'center' },
-        { title: '财务状态', dataIndex: 'financialStatus', scopedSlots: { customRender: 'financialStatus' }, width: 100, align: 'center' },
+        { title: '业务状态', dataIndex: 'billStatusDictValue', width: 110, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '财务状态', dataIndex: 'financialStatusDictValue', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: 200, align: 'center', fixed: 'right' }
       ],
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
         this.disabled = true
         if (this.tableHeight == 0) {
-          this.tableHeight = window.innerHeight - 440
+          this.tableHeight = window.innerHeight - 420
         }
         // 获取统计数据
         this.getTotalData(Object.assign(parameter, this.queryParam))

+ 1 - 1
src/views/purchasingManagement/purchaseOrder/receivingAddress/chooseAddressModal.vue

@@ -17,7 +17,7 @@
       <s-table
         class="sTable"
         ref="table"
-        size="default"
+        size="small"
         :rowKey="(record) => record.id"
         :columns="columns"
         :data="loadData"

+ 4 - 5
src/views/purchasingManagement/purchaseOrder/receivingAddress/editAddressModal.vue

@@ -25,12 +25,12 @@
             placeholder="请输入收货人(最多30个字符)"
             allowClear />
         </a-form-model-item>
-        <a-form-model-item label="手机号码" prop="consigneeTel">
+        <a-form-model-item label="收货人电话" prop="consigneeTel">
           <a-input
             id="editAddress-phone"
-            :maxLength="11"
+            :maxLength="30"
             v-model="form.consigneeTel"
-            placeholder="请输入手机号码(最多11个字符)"
+            placeholder="请输入收货人电话(最多30个字符)"
             allowClear />
         </a-form-model-item>
         <a-form-model-item label="所在地区" required style="margin: 0;">
@@ -112,8 +112,7 @@ export default {
           { required: true, message: '请输入收货人', trigger: 'change' }
         ],
         consigneeTel: [
-          { required: true, message: '请输入手机号', trigger: 'change' },
-          { pattern: /^\d{11}$/, message: '请输入正确的手机号' }
+          { required: true, message: '请输入收货人电话', trigger: 'change' }
         ],
         provinceSn: [
           { required: true, message: '请选择省', trigger: 'change' }

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

@@ -11,7 +11,7 @@
       <!-- 内容 -->
       <a-card size="small" v-for="(item,bindex) in detail" :key="item.id" :bordered="false" class="purchaseOrderWarehousing-cont">
         <!-- 总计 -->
-        <a-alert type="info" showIcon style="margin-bottom:15px">
+        <a-alert type="info" showIcon style="margin-bottom:10px">
           <div slot="message" >
             <div>产品款数 <strong>{{ item.totalPutCategory }}</strong> ,本次发货数量合计 <strong>{{ item.totalPutQty }}</strong> ,本次发货金额合计¥<strong>{{ item.totalPutAmount }}</strong></div>
           </div>
@@ -172,7 +172,7 @@ export default {
     },
     //  返回列表
     handleBack () {
-      this.$router.push({ path: '/purchasingManagement/purchaseOrder/list' })
+      this.$router.push({ path: '/purchasingManagement/purchaseOrder/list', query: { closeLastOldTab: true } })
     },
     filterOption (input, option) {
       return (

+ 16 - 7
src/views/purchasingManagement/purchaseReturn/detail.vue

@@ -1,8 +1,8 @@
 <template>
   <div class="purchaseReturnDetail-wrap">
-    <a-page-header :ghost="false" :backIcon="false" class="purchaseReturnDetail-cont" >
+    <a-page-header :ghost="false" :backIcon="false" class="purchaseReturnDetail-cont" :style="{ padding: !outBizSn ? '16px 24px' : '0px 24px' }" >
       <!-- 自定义的二级文字标题 -->
-      <template slot="subTitle">
+      <template slot="subTitle" v-if="!outBizSn">
         <a id="purchaseReturnDetail-back-btn" href="javascript:;" @click="handleBack"><a-icon type="left" /> 返回列表</a>
         <a-button
           v-if="isEdit"
@@ -61,11 +61,17 @@ import { getOperationalPrecision } from '@/libs/tools.js'
 import { purchaseReturnDetailSn, purchaseReturnDetailList } from '@/api/purchaseReturn'
 export default {
   components: { STable, VSelect },
+  props: {
+    outBizSn: { //  有值则为弹框,无值则为页面
+      type: [Number, String],
+      default: ''
+    }
+  },
   data () {
     return {
       // 表头
       columns: [
-        { title: '序号', dataIndex: 'no', width: 80, align: 'center', fixed: 'left' },
+        { title: '序号', dataIndex: 'no', width: 80, align: 'center' },
         { title: '采购单号', dataIndex: 'purchaseBillNo', width: 200, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '产品编码', dataIndex: 'dealerProductEntity.code', width: 200, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '产品名称', dataIndex: 'dealerProductEntity.name', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
@@ -80,7 +86,7 @@ export default {
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
         this.disabled = true
-        return purchaseReturnDetailList(Object.assign(parameter, { purchaseReturnSn: this.$route.params.sn })).then(res => {
+        return purchaseReturnDetailList(Object.assign(parameter, { purchaseReturnSn: this.outBizSn || this.$route.params.sn })).then(res => {
           const data = res.data
           const no = (data.pageNo - 1) * data.pageSize
           for (var i = 0; i < data.list.length; i++) {
@@ -103,11 +109,11 @@ export default {
   methods: {
     //  返回列表
     handleBack () {
-      this.$router.push({ path: '/purchasingManagement/purchaseReturn/list' })
+      this.$router.push({ path: '/purchasingManagement/purchaseReturn/list', query: { closeLastOldTab: true } })
     },
     // 基本信息
     getDetail () {
-      purchaseReturnDetailSn({ sn: this.$route.params.sn }).then(res => {
+      purchaseReturnDetailSn({ sn: this.outBizSn || this.$route.params.sn }).then(res => {
         if (res.status == 200) {
           this.basicInfoData = res.data
         } else {
@@ -120,9 +126,12 @@ export default {
       this.$router.push({ path: `/purchasingManagement/purchaseReturn/edit/${this.basicInfoData.id}/${this.basicInfoData.purchaseReturnSn}/${this.basicInfoData.returnTargetName}` })
     }
   },
+  mounted () {
+    this.getDetail()
+  },
   beforeRouteEnter (to, from, next) {
     next(vm => {
-      vm.getDetail()
+      // vm.getDetail()
     })
   }
 }

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

@@ -324,7 +324,7 @@ export default {
     },
     //  返回列表
     handleBack () {
-      this.$router.push({ path: '/purchasingManagement/purchaseReturn/list' })
+      this.$router.push({ path: '/purchasingManagement/purchaseReturn/list', query: { closeLastOldTab: true } })
     },
     //  已选产品 分页  一页多少条change
     changePageSize (current, pageSize) {

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

@@ -59,7 +59,7 @@
       <s-table
         class="sTable"
         ref="table"
-        size="default"
+        size="small"
         :rowKey="(record) => record.id"
         :columns="columns"
         :data="loadData"
@@ -70,10 +70,6 @@
           <span style="color: #ed1c24;cursor: pointer;" v-if="$hasPermissions('B_purchaseReturnDetail')" @click="handleDetail(record)">{{ record.purchaseReturnNo }}</span>
           <span v-else>{{ record.purchaseReturnNo }}</span>
         </template>
-        <!-- 财务状态 -->
-        <template slot="settleState" slot-scope="text, record">
-          <a-badge :color="text=='FINISH'?'#87d068':'gold'" :text="record.settleStateDictValue" />
-        </template>
         <!-- 操作 -->
         <template slot="action" slot-scope="text, record">
           <a-button
@@ -112,7 +108,8 @@ export default {
         beginDate: '',
         endDate: '',
         purchaseReturnNo: '', //  退货单号
-        state: undefined //  业务状态
+        state: undefined, //  业务状态
+        settleState: undefined
       },
       disabled: false, //  查询、重置按钮是否可操作
       tableHeight: 0,
@@ -124,7 +121,7 @@ export default {
         { title: '退款金额', dataIndex: 'totalAmount', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '审核时间', dataIndex: 'auditTime', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '业务状态', dataIndex: 'stateDictValue', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '财务状态', scopedSlots: { customRender: 'settleState' }, width: 140, align: 'center' },
+        { title: '财务状态', dataIndex: 'settleStateDictValue', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: 150, align: 'center', fixed: 'right' }
       ],
       // 加载数据方法 必须为 Promise 对象
@@ -159,6 +156,7 @@ export default {
       this.queryParam.endDate = ''
       this.queryParam.purchaseReturnNo = ''
       this.queryParam.state = undefined
+      this.queryParam.settleState = undefined
       this.$refs.table.refresh(true)
     },
     //  删除

+ 6 - 5
src/views/reportData/chainReceivedSendStorageReport/list.vue

@@ -172,9 +172,6 @@ export default {
         const params = Object.assign(parameter, this.queryParam)
         this.spinning = true
         if (this.queryParam.beginDate && this.queryParam.dealerSn) {
-          if (params.dealerSn == 'all') {
-            params.dealerSn = ''
-          }
           return linkageReportPageList(params).then(res => {
             // 总计
             this.getCount(params)
@@ -293,9 +290,13 @@ export default {
         const all = [{ dealerName: '全部', dealerSn: 'all' }]
         if (res.status == 200) {
           const data = res.data || []
-          this.linkageGroupData = [...all, ...data]
+          if (data.length > 0) {
+            this.linkageGroupData = [...all, ...data]
+          } else {
+            this.linkageGroupData = []
+          }
         } else {
-          this.linkageGroupData = all
+          this.linkageGroupData = []
         }
       })
     }

+ 8 - 7
src/views/reportData/chainSalesDetailReport/list.vue

@@ -154,7 +154,7 @@
         </a-form-model>
       </div>
       <!-- 合计 -->
-      <a-alert type="info" showIcon style="margin-bottom:15px">
+      <a-alert type="info" showIcon style="margin-bottom:10px">
         <div class="ftext" slot="message">
           产品总数量:<strong>{{ (totalData && (totalData.totalQty || totalData.totalQty==0)) ? totalData.totalQty : '--' }}</strong>;
           总成本:<strong>{{ (totalData && (totalData.totalCost || totalData.totalCost==0)) ? '¥'+totalData.totalCost : '--' }}</strong>;
@@ -234,7 +234,7 @@ export default {
         { title: '客户名称', dataIndex: 'salesTargetName', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '收款方式', dataIndex: 'settleStyleName', width: 150, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '产品编码', dataIndex: 'productEntity.code', width: 220, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '产品名称', dataIndex: 'productEntity.name', width: 220, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '产品名称', dataIndex: 'productEntity.name', width: 220, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '单位', dataIndex: 'productEntity.unit', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '数量', dataIndex: 'productQty', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '成本', dataIndex: 'productCost', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? ('¥' + text) : '--') } },
@@ -249,9 +249,6 @@ export default {
         this.spinning = true
         delete params.time
         delete params.warehouseCascade
-        if (params.dealerSn == 'all') {
-          params.dealerSn = ''
-        }
         return reportSalesBillDetailList(params).then(res => {
           // 总计
           this.getCount(params)
@@ -394,9 +391,13 @@ export default {
         const all = [{ dealerName: '全部', dealerSn: 'all' }]
         if (res.status == 200) {
           const data = res.data || []
-          this.linkageGroupData = [...all, ...data]
+          if (data.length > 0) {
+            this.linkageGroupData = [...all, ...data]
+          } else {
+            this.linkageGroupData = []
+          }
         } else {
-          this.linkageGroupData = all
+          this.linkageGroupData = []
         }
       })
     },

+ 7 - 6
src/views/reportData/chainSalesReport/list.vue

@@ -102,7 +102,7 @@
         </a-form-model>
       </div>
       <!-- 合计 -->
-      <a-alert type="info" showIcon style="margin-bottom:15px">
+      <a-alert type="info" showIcon style="margin-bottom:10px">
         <div class="ftext" slot="message">
           总单数:<strong>{{ (totalData && (totalData.totalRowSize || totalData.totalRowSize==0)) ? totalData.totalRowSize : '--' }}</strong>;
           产品总数量:<strong>{{ (totalData && (totalData.totalQty || totalData.totalQty==0)) ? totalData.totalQty : '--' }}</strong>;
@@ -182,9 +182,6 @@ export default {
         const params = Object.assign(parameter, this.queryParam)
         this.spinning = true
         delete params.time
-        if (params.dealerSn == 'all') {
-          params.dealerSn = ''
-        }
         return reportSalesBillList(params).then(res => {
           // 总计
           this.getCount(params)
@@ -287,9 +284,13 @@ export default {
         const all = [{ dealerName: '全部', dealerSn: 'all' }]
         if (res.status == 200) {
           const data = res.data || []
-          this.linkageGroupData = [...all, ...data]
+          if (data.length > 0) {
+            this.linkageGroupData = [...all, ...data]
+          } else {
+            this.linkageGroupData = []
+          }
         } else {
-          this.linkageGroupData = all
+          this.linkageGroupData = []
         }
       })
     },

+ 9 - 5
src/views/reportData/chainStockReport/detailModal.vue

@@ -9,7 +9,7 @@
     @cancle="isShow=false"
     :width="960">
     <!-- 合计 -->
-    <a-alert type="info" showIcon style="margin-bottom:15px">
+    <a-alert type="info" showIcon style="margin-bottom:10px">
       <div class="ftext" slot="message">
         现有库存总数量(个):<strong> {{ (currentStock && currentStock.totalQty) || 0 }} </strong>;
         现有库存总成本(¥):<strong> {{ (currentStock && currentStock.totalCost) || 0 }} </strong>。
@@ -40,7 +40,7 @@
 
 <script>
 import { STable } from '@/components'
-import { reportStockDetailList, reportStockCount } from '@/api/reportStock'
+import { reportStockDetailList, reportStockDetailCount } from '@/api/reportStock'
 export default {
   name: 'InventoryQueryDetailModal',
   components: { STable },
@@ -52,6 +52,10 @@ export default {
     productSn: {
       type: [Number, String],
       default: ''
+    },
+    stockSn: {
+      type: [Number, String],
+      default: ''
     }
   },
   computed: {
@@ -77,7 +81,7 @@ export default {
       ],
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
-        const params = Object.assign(parameter, { productSn: this.productSn })
+        const params = Object.assign(parameter, { productSn: this.productSn, stockSn: this.stockSn })
         return reportStockDetailList(params).then(res => {
           const data = res.data
           const no = (data.pageNo - 1) * data.pageSize
@@ -95,7 +99,7 @@ export default {
   methods: {
     // 合计
     getCount (param) {
-      reportStockCount(param).then(res => {
+      reportStockDetailCount(param).then(res => {
         if (res.status == 200 && res.data) {
           this.currentStock = res.data
         } else {
@@ -123,7 +127,7 @@ export default {
   .chainStockReportDetail-modal{
     .btn-cont {
       text-align: center;
-      margin: 5px 0 10px;
+      margin: 10px 0 10px;
     }
   }
 </style>

+ 11 - 7
src/views/reportData/chainStockReport/list.vue

@@ -83,7 +83,7 @@
         </a-form-model>
       </div>
       <!-- 合计 -->
-      <a-alert type="info" showIcon style="margin-bottom:15px">
+      <a-alert type="info" showIcon style="margin-bottom:10px">
         <div class="ftext" slot="message">
           现有库存总数量(个):<strong> {{ (totalData && (totalData.totalQty || totalData.totalQty==0)) ? totalData.totalQty : '--' }} </strong>;
           现有库存总成本(¥):<strong> {{ (totalData && (totalData.totalCost || totalData.totalCost==0)) ? totalData.totalCost : '--' }} </strong>。
@@ -115,7 +115,7 @@
       </s-table>
     </a-spin>
     <!-- 详情 -->
-    <chain-stock-report-detail-modal :openModal="openModal" :productSn="productSn" @close="closeModal" />
+    <chain-stock-report-detail-modal :openModal="openModal" :productSn="productSn" :stockSn="stockSn" @close="closeModal" />
   </a-card>
 </template>
 
@@ -165,9 +165,6 @@ export default {
         const params = Object.assign(parameter, this.queryParam)
         this.spinning = true
         if (params.dealerSn) {
-          if (params.dealerSn == 'all') {
-            params.dealerSn = ''
-          }
           return reportStockList(params).then(res => {
             // 总计
             this.getCount(params)
@@ -203,6 +200,7 @@ export default {
       allocateTypeList: [], //  调拨类型
       totalData: null, //  合计
       productSn: '',
+      stockSn: '',
       openModal: false //  弹框
     }
   },
@@ -247,11 +245,13 @@ export default {
     //  详情
     goDetail (row) {
       this.productSn = row.productSn
+      this.stockSn = row.stockSn
       this.openModal = true
     },
     //  关闭弹框
     closeModal () {
       this.productSn = ''
+      this.stockSn = ''
       this.openModal = false
     },
     //  产品分类  change
@@ -291,9 +291,13 @@ export default {
         const all = [{ dealerName: '全部', dealerSn: 'all' }]
         if (res.status == 200) {
           const data = res.data || []
-          this.linkageGroupData = [...all, ...data]
+          if (data.length > 0) {
+            this.linkageGroupData = [...all, ...data]
+          } else {
+            this.linkageGroupData = []
+          }
         } else {
-          this.linkageGroupData = all
+          this.linkageGroupData = []
         }
       })
     }

+ 1 - 1
src/views/reportData/customerReport/list.vue

@@ -72,7 +72,7 @@
         </a-form-model>
       </div>
       <!-- 合计 -->
-      <a-alert type="info" showIcon style="margin-bottom:15px">
+      <a-alert type="info" showIcon style="margin-bottom:10px">
         <div class="ftext" slot="message">
           总交易金额:<strong>{{ (totalData && (totalData.totalAmount || totalData.totalAmount==0)) ? totalData.totalAmount : '--' }}</strong>;
           总毛利率:<strong>{{ (totalData && totalData.percentage) ? totalData.percentage : '--' }}</strong>

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

@@ -101,7 +101,7 @@ import { STable, VSelect } from '@/components'
 import { dealerProductBrandQuery } from '@/api/dealerProductBrand'
 import { dealerProductTypeList } from '@/api/dealerProductType'
 import rangeDate from '@/views/common/rangeDate.vue'
-import { reportPageList, linkageReportTotal } from '@/api/reportData'
+import { reportPageList, reportStockPutOutCount } from '@/api/reportData'
 export default {
   components: { STable, VSelect, rangeDate },
   data () {
@@ -210,7 +210,7 @@ export default {
     },
     // 查询总计
     getCount (params) {
-      linkageReportTotal(params).then(res => {
+      reportStockPutOutCount(params).then(res => {
         if (res.status == 200 && res.data) {
           this.totalData = res.data
         } else {

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

@@ -39,7 +39,7 @@
           <a-table
             class="sTable"
             ref="table"
-            size="default"
+            size="small"
             :rowKey="(record) => record.dataBizTypeDictValue"
             :columns="columns"
             :dataSource="tableData"
@@ -203,7 +203,7 @@ export default {
       this.spinning = true
       reportStockOutList(params).then(res => {
         this.listLoading = false
-        if (res.status == 200) {
+        if (res.status == 200 && res.data) {
           const reportStockOutVOList = (res.data && res.data.reportStockOutVOList) ? res.data.reportStockOutVOList : []
           const totalQty = (res.data && (res.data.totalQty || res.data.totalQty == 0)) ? res.data.totalQty : '--'
           const totalPrice = (res.data && (res.data.totalPrice || res.data.totalPrice == 0)) ? res.data.totalPrice : '--'

+ 4 - 4
src/views/reportData/stockIncomeReport/list.vue

@@ -39,7 +39,7 @@
           <a-table
             class="sTable"
             ref="table"
-            size="default"
+            size="small"
             :rowKey="(record) => record.dataBizTypeDictValue"
             :columns="columns"
             :dataSource="tableData"
@@ -76,8 +76,8 @@ export default {
       columns: [
         { title: '明细项', dataIndex: 'dataBizTypeDictValue', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '数量(件)', dataIndex: 'productQty', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '成本(元)', dataIndex: 'productCost', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '售价(元)', dataIndex: 'productPrice', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } }
+        { title: '成本(元)', dataIndex: 'productCost', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } }
+        // { title: '售价(元)', dataIndex: 'productPrice', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } }
       ],
       // 统计图
       pieData: [],
@@ -203,7 +203,7 @@ export default {
       this.spinning = true
       reportStockPutList(params).then(res => {
         this.listLoading = false
-        if (res.status == 200) {
+        if (res.status == 200 && res.data) {
           const reportStockPutVOList = (res.data && res.data.reportStockPutVOList) ? res.data.reportStockPutVOList : []
           const totalQty = (res.data && (res.data.totalQty || res.data.totalQty == 0)) ? res.data.totalQty : '--'
           const totalPrice = (res.data && (res.data.totalPrice || res.data.totalPrice == 0)) ? res.data.totalPrice : '--'

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

@@ -46,7 +46,7 @@
     <s-table
       class="sTable"
       ref="table"
-      size="default"
+      size="small"
       :rowKey="(record) => record.id"
       :columns="columns"
       :data="loadData"

+ 58 - 12
src/views/salesManagement/outboundOrder/list.vue

@@ -61,7 +61,7 @@
       <!-- <s-table
         class="sTable"
         ref="table"
-        size="default"
+        size="small"
         :row-selection="rowSelection"
         :rowKey="(record) => record.id"
         :columns="columns"
@@ -72,7 +72,7 @@
       <s-table
         class="sTable"
         ref="table"
-        size="default"
+        size="small"
         :rowKey="(record) => record.id"
         :columns="columns"
         :data="loadData"
@@ -98,15 +98,41 @@
         </template>
       </s-table>
     </a-spin>
+    <!-- 详情 -->
+    <a-modal
+      centered
+      class="outboundOrderDetail-modal"
+      :footer="null"
+      :maskClosable="false"
+      title="详情"
+      v-model="openModal"
+      v-if="openModal"
+      @cancle="cancleModal"
+      width="80%">
+      <div style="max-height: 700px;overflow-y: scroll;">
+        <pushOrderDetailModal v-if="outBizType=='PURCHASE_RETURN'" :outBizSn="orderSn" />
+        <salesDetailModal v-if="outBizType=='SALES'" :outBizSn="orderSn" />
+        <urgentDetailModal v-if="outBizType=='DISPATCH_DEDUCT'" :outBizSn="orderSn" />
+        <storeTransferOutDetailModal v-if="outBizType=='SHOP_CALL_OUT'" :outBizSn="orderSn" />
+        <chainTransferOutDetailModal v-if="outBizType=='LINKAGE_CALL_OUT'" :outBizSn="orderSn" />
+        <warehouseAllocationDetailModal v-if="outBizType=='WAREHOUSE_CALL_OUT'" :outBizSn="orderSn" />
+      </div>
+    </a-modal>
   </a-card>
 </template>
 
 <script>
 import { STable, VSelect } from '@/components'
 import rangeDate from '@/views/common/rangeDate.vue'
+import pushOrderDetailModal from '@/views/purchasingManagement/purchaseReturn/detail.vue'
+import salesDetailModal from '@/views/salesManagement/salesQuery/detail.vue'
+import urgentDetailModal from '@/views/salesManagement/urgentItemsOffset/detail.vue'
+import storeTransferOutDetailModal from '@/views/allocationManagement/storeTransferOut/detail.vue'
+import chainTransferOutDetailModal from '@/views/allocationManagement/chainTransferOut/detail.vue'
+import warehouseAllocationDetailModal from '@/views/allocationManagement/warehouseAllocation/detail.vue'
 import { stockOutList, stockOutOut } from '@/api/stockOut'
 export default {
-  components: { STable, VSelect, rangeDate },
+  components: { STable, VSelect, rangeDate, pushOrderDetailModal, salesDetailModal, urgentDetailModal, storeTransferOutDetailModal, chainTransferOutDetailModal, warehouseAllocationDetailModal },
   data () {
     return {
       spinning: false,
@@ -151,7 +177,10 @@ export default {
           this.disabled = false
           return data
         })
-      }
+      },
+      openModal: false,
+      orderSn: undefined,
+      outBizType: null //  当前单子类型   SALES销售出库        ALLOCATE调拨出库
     }
   },
   computed: {
@@ -213,29 +242,46 @@ export default {
     },
     //  详情
     handleDetail (row) {
+      this.outBizType = row.outBizType
       //  根据出库类型跳转对应页面
       if (row.outBizType == 'PURCHASE_RETURN') { // 采购退货
-        this.$router.push({ path: `/purchasingManagement/purchaseReturn/detail/${row.outBizSn}` })
+        // this.$router.push({ path: `/purchasingManagement/purchaseReturn/detail/${row.outBizSn}` })
+        this.orderSn = row.outBizSn
+        this.openModal = true
       } else if (row.outBizType == 'SPARE_PARTS_RETURN') { // 散件退货
         this.$message.warning('该出库类型对应页面未开发')
-        // this.$router.push({ path: `/purchasingManagement/purchaseReturn/detail/${row.outBizSn}` })
       } else if (row.outBizType == 'SALES') { // 销售
-        this.$router.push({ path: `/salesManagement/salesQuery/detail/${row.outBizSn}` })
+        // this.$router.push({ path: `/salesManagement/salesQuery/detail/${row.outBizSn}` })
+        this.orderSn = row.outBizSn
+        this.openModal = true
       } else if (row.outBizType == 'DISPATCH_DEDUCT') { // 急件冲减
-        this.$router.push({ path: `/salesManagement/urgentItemsOffset/detail/${row.outBizSn}` })
+        // this.$router.push({ path: `/salesManagement/urgentItemsOffset/detail/${row.outBizSn}` })
+        this.orderSn = row.outBizSn
+        this.openModal = true
       } else if (row.outBizType == 'SHOP_CALL_OUT') { // 店内调出
-        this.$router.push({ path: `/allocationManagement/storeTransferOut/detail/${row.outBizSn}` })
+        // this.$router.push({ path: `/allocationManagement/storeTransferOut/detail/${row.outBizSn}` })
+        this.orderSn = row.outBizSn
+        this.openModal = true
       } else if (row.outBizType == 'CHECK_ORDER_OUT') { // 库存盘点盘亏
         this.$message.warning('该出库类型对应页面未开发')
-        // this.$router.push({ path: `/purchasingManagement/purchaseReturn/detail/${row.outBizSn}` })
       } else if (row.outBizType == 'LINKAGE_CALL_OUT') { // 连锁调出
-        this.$router.push({ path: `/allocationManagement/chainTransferOut/detail/${row.outBizSn}` })
+        // this.$router.push({ path: `/allocationManagement/chainTransferOut/detail/${row.outBizSn}` })
+        this.orderSn = row.outBizSn
+        this.openModal = true
       } else if (row.outBizType == 'WAREHOUSE_CALL_OUT') { // 仓库调出
-        this.$router.push({ path: `/allocationManagement/warehouseAllocation/detail/${row.outBizSn}` })
+        // this.$router.push({ path: `/allocationManagement/warehouseAllocation/detail/${row.outBizSn}` })
+        this.orderSn = row.outBizSn
+        this.openModal = true
       } else {
         this.$message.warning('出库类型未知')
       }
     },
+    // 关闭弹框
+    cancleModal () {
+      this.outBizType = null
+      this.orderSn = undefined
+      this.openModal = false
+    },
     // 单个出库
     handleOutbound (row) {
       const _this = this

+ 3 - 3
src/views/salesManagement/quotation/detail.vue

@@ -29,14 +29,14 @@
     </a-card>
     <a-card size="small" :bordered="false" class="quotationDetail-cont">
       <!-- 总计 -->
-      <a-alert type="info" showIcon style="margin-bottom:15px">
+      <a-alert type="info" showIcon style="margin-bottom:10px">
         <div slot="message">总款数:<strong>1</strong>,总数量:<strong>1</strong>,总赠品数量:<strong>0</strong>,总售价:<strong>14</strong>,总成本:<strong>6.33</strong>,总毛利: <strong>6</strong></div>
       </a-alert>
       <!-- 列表 -->
       <s-table
         class="sTable"
         ref="table"
-        size="default"
+        size="small"
         :rowKey="(record) => record.id"
         :columns="columns"
         :data="loadData"
@@ -118,7 +118,7 @@ export default {
     handleSubmit () {},
     //  返回列表
     handleBack () {
-      this.$router.push({ path: '/salesManagement/quotation/list' })
+      this.$router.push({ path: '/salesManagement/quotation/list', query: { closeLastOldTab: true } })
     }
   }
 }

+ 4 - 4
src/views/salesManagement/quotation/edit.vue

@@ -90,7 +90,7 @@
             <s-table
               class="sTable"
               ref="table"
-              size="default"
+              size="small"
               :rowKey="(record) => record.id"
               :columns="columns"
               :data="loadData"
@@ -122,7 +122,7 @@
           <!-- 已选产品 -->
           <div>
             <!-- 总计 -->
-            <a-alert type="info" showIcon style="margin-bottom:15px">
+            <a-alert type="info" showIcon style="margin-bottom:10px">
               <div slot="message">总售价:<strong>6</strong> ,总款数:<strong>6</strong> ,总数量:<strong>6.33</strong></div>
             </a-alert>
             <!-- 搜索条件 -->
@@ -150,7 +150,7 @@
             <s-table
               class="sTable"
               ref="table"
-              size="default"
+              size="small"
               :rowKey="(record) => record.id"
               :columns="chooseColumns"
               :data="chooseLoadData"
@@ -325,7 +325,7 @@
       },
       //  返回列表
       handleBack(){
-        this.$router.push({ path: '/salesManagement/quotation/list'})
+        this.$router.push({ path: '/salesManagement/quotation/list', query: { closeLastOldTab: true }})
       },
       //  编辑客户名称
       handleEditCustom(){},

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

@@ -54,7 +54,7 @@
     <s-table
       class="sTable"
       ref="table"
-      size="default"
+      size="small"
       :rowKey="(record) => record.id"
       :columns="columns"
       :data="loadData"

Some files were not shown because too many files changed in this diff