瀏覽代碼

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

lilei 3 年之前
父節點
當前提交
0155b59756
共有 28 個文件被更改,包括 98 次插入67 次删除
  1. 4 2
      src/libs/JGPrint.js
  2. 1 3
      src/views/bulkManagement/bulkImport/list.vue
  3. 1 3
      src/views/bulkManagement/bulkWarehousingOrder/list.vue
  4. 1 3
      src/views/financialManagement/companyReceivablePayable/detail.vue
  5. 15 0
      src/views/financialManagement/financialCollection/list.vue
  6. 14 0
      src/views/financialManagement/financialPayment/list.vue
  7. 1 3
      src/views/inventoryManagement/inventoryChecking/detailModal.vue
  8. 1 3
      src/views/inventoryManagement/inventoryChecking/makeInventory.vue
  9. 1 3
      src/views/inventoryManagement/inventoryImport/list.vue
  10. 1 3
      src/views/inventoryManagement/inventoryQuery/list.vue
  11. 1 3
      src/views/inventoryManagement/inventoryWarning/list.vue
  12. 1 2
      src/views/productManagement/priceChangeRecord/list.vue
  13. 1 3
      src/views/productManagement/productInfo/list.vue
  14. 1 3
      src/views/productManagement/productInfoJg/list.vue
  15. 1 3
      src/views/productManagement/productOnlineInfo/list.vue
  16. 1 3
      src/views/purchasingManagement/purchaseOrder/detail.vue
  17. 14 0
      src/views/reportData/chainPurchaseReceiptReport/list.vue
  18. 1 3
      src/views/reportData/chainPurchaseReceiptReport/purchaseReceiptDetail.vue
  19. 1 3
      src/views/reportData/chainPurchaseReceiptReport/purchaseReceiptOrder.vue
  20. 1 2
      src/views/reportData/chainReceivedSendStorageReport/list.vue
  21. 15 1
      src/views/reportData/inventoryReport/list.vue
  22. 14 0
      src/views/reportData/purchaseReceiptReport/list.vue
  23. 1 3
      src/views/reportData/purchaseReceiptReport/purchaseReceiptDetail.vue
  24. 1 3
      src/views/reportData/purchaseReceiptReport/purchaseReceiptOrder.vue
  25. 1 3
      src/views/reportData/receivedSendStorageReport/list.vue
  26. 1 3
      src/views/reportData/salesDetailReport/list.vue
  27. 1 3
      src/views/reportData/salesReport/list.vue
  28. 1 3
      src/views/salesManagement/salesQuery/list.vue

+ 4 - 2
src/libs/JGPrint.js

@@ -89,15 +89,17 @@ export const demoDownloadPDF = function (url) {
 // 导出下载excel
 export const downloadExcel = function (data, fileName) {
   if (!data) { return }
+  const a = moment().format('YYYYMMDDHHmmss')
+  const fname = fileName + a
   const blob = new Blob([data], { type: 'application/vnd.ms-excel' })
   if (window.navigator && window.navigator.msSaveOrOpenBlob) {
-    navigator.msSaveBlob(blob, fileName + '.xlsx')
+    navigator.msSaveBlob(blob, fname + '.xlsx')
   } else {
     const link = document.createElement('a')
     link.style.display = 'none'
     var href = URL.createObjectURL(blob)
     link.href = href
-    link.setAttribute('download', fileName + '.xlsx')
+    link.setAttribute('download', fname + '.xlsx')
     document.body.appendChild(link)
     link.click()
     document.body.removeChild(link)

+ 1 - 3
src/views/bulkManagement/bulkImport/list.vue

@@ -71,7 +71,6 @@
 <script>
 import { STable, Upload } from '@/components'
 import { stockImportList, stockImportFinish, stockImportCancel, stockImportExportError } from '@/api/stockImport'
-import moment from 'moment'
 import { downloadExcel } from '@/libs/JGPrint.js'
 export default {
   components: { STable, Upload },
@@ -198,8 +197,7 @@ export default {
           })
           reader.readAsText(res)
         } else {
-          const fileName = '散件导入错误项' + moment().format('YYYYMMDDHHmmss')
-          downloadExcel(res, fileName)
+          downloadExcel(res, '散件导入错误项')
         }
       })
     },

+ 1 - 3
src/views/bulkManagement/bulkWarehousingOrder/list.vue

@@ -139,7 +139,6 @@
 </template>
 
 <script>
-import moment from 'moment'
 import { STable, VSelect } from '@/components'
 import rangeDate from '@/views/common/rangeDate.vue'
 import getDate from '@/libs/getDate.js'
@@ -315,8 +314,7 @@ export default {
           })
           reader.readAsText(res)
         } else {
-          const fileName = '散件入库单' + moment().format('YYYYMMDDHHmmss')
-          downloadExcel(res, fileName)
+          downloadExcel(res, '散件入库单')
         }
       })
     },

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

@@ -70,7 +70,6 @@
 </template>
 
 <script>
-import moment from 'moment'
 import { downloadExcel } from '@/libs/JGPrint.js'
 import { STable, VSelect } from '@/components'
 import rangeDate from '@/views/common/rangeDate.vue'
@@ -151,8 +150,7 @@ export default {
       this.exportLoading = true
       // customerBundleExportDelay(params).then(res => {
       //   this.exportLoading = false
-	  // const fileName = '单位应收应付' + moment().format('YYYYMMDDHHmmss')
-	  // downloadExcel(res, fileName)
+	  // downloadExcel(res, '单位应收应付')
       // })
     },
   },

+ 15 - 0
src/views/financialManagement/financialCollection/list.vue

@@ -367,3 +367,18 @@ export default {
   }
 }
 </script>
+
+<style lang="less">
+	.financialCollectionList-wrap{
+		.financialCollectionList-tabs.ant-tabs.ant-tabs-card .ant-tabs-card-bar .ant-tabs-nav-container{
+      height: 30px!important;
+		}
+    .financialCollectionList-tabs.ant-tabs.ant-tabs-card .ant-tabs-card-bar .ant-tabs-tab-active{
+      height: 30px!important;
+    }
+    .financialCollectionList-tabs.ant-tabs.ant-tabs-card .ant-tabs-card-bar .ant-tabs-tab{
+      line-height: 26px!important;
+      height: 30px!important;
+    }
+	}
+</style>

+ 14 - 0
src/views/financialManagement/financialPayment/list.vue

@@ -366,3 +366,17 @@ export default {
   }
 }
 </script>
+<style lang="less">
+	.finacialPay-wrap{
+		.finacialPay-tabs.ant-tabs.ant-tabs-card .ant-tabs-card-bar .ant-tabs-nav-container{
+      height: 30px!important;
+		}
+    .finacialPay-tabs.ant-tabs.ant-tabs-card .ant-tabs-card-bar .ant-tabs-tab-active{
+      height: 30px!important;
+    }
+    .finacialPay-tabs.ant-tabs.ant-tabs-card .ant-tabs-card-bar .ant-tabs-tab{
+      line-height: 26px!important;
+      height: 30px!important;
+    }
+	}
+</style>

+ 1 - 3
src/views/inventoryManagement/inventoryChecking/detailModal.vue

@@ -150,7 +150,6 @@
 </template>
 
 <script>
-import moment from 'moment'
 import { downloadExcel } from '@/libs/JGPrint.js'
 import { STable } from '@/components'
 import printModal from './printModal.vue'
@@ -320,8 +319,7 @@ export default {
           reader.readAsText(res)
         } else {
           if (this.nowType == 'export' || this.nowType == 'typeExport') {
-			const fileName = '库存盘点' + moment().format('YYYYMMDDHHmmss')
-			downloadExcel(res, fileName)
+			downloadExcel(res, '库存盘点')
           } else {
             this.print(res, objs.type)
           }

+ 1 - 3
src/views/inventoryManagement/inventoryChecking/makeInventory.vue

@@ -168,7 +168,6 @@
 </template>
 
 <script>
-import moment from 'moment'
 import { STable, VSelect } from '@/components'
 import ProductType from '@/views/common/productType.js'
 import printModal from './printModal.vue'
@@ -405,8 +404,7 @@ export default {
           reader.readAsText(res)
         } else {
           if (this.nowType == 'export' || this.nowType == 'typeExport') {
-			const fileName = '库存盘点' + moment().format('YYYYMMDDHHmmss')
-			downloadExcel(res, fileName)
+			downloadExcel(res, '库存盘点')
           } else {
             this.print(res, objs.type)
           }

+ 1 - 3
src/views/inventoryManagement/inventoryImport/list.vue

@@ -72,7 +72,6 @@
 <script>
 import { STable, Upload } from '@/components'
 import { stockImportList, stockImportFinish, stockImportCancel, stockImportKCExportError } from '@/api/stockImport'
-import moment from 'moment'
 import { downloadExcel } from '@/libs/JGPrint.js'
 export default {
   components: { STable, Upload },
@@ -192,8 +191,7 @@ export default {
           })
           reader.readAsText(res)
         } else {
-          const fileName = '库存导入错误项' + moment().format('YYYYMMDDHHmmss')
-          downloadExcel(res, fileName)
+          downloadExcel(res, '库存导入错误项')
         }
       })
     },

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

@@ -123,7 +123,6 @@
 </template>
 
 <script>
-import moment from 'moment'
 import { stockList, stockCount, stockExport } from '@/api/stock'
 import { dealerProductTypeList } from '@/api/dealerProductType'
 import { dealerProductBrandQuery } from '@/api/dealerProductBrand'
@@ -277,8 +276,7 @@ export default {
           })
           reader.readAsText(res)
         } else {
-		  const fileName = '库存查询' + moment().format('YYYYMMDDHHmmss')
-		  downloadExcel(res, fileName)
+		  downloadExcel(res, '库存查询')
         }
       })
     },

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

@@ -177,7 +177,6 @@
 </template>
 
 <script>
-import moment from 'moment'
 import { STable, VSelect } from '@/components'
 import { stockWarnList, stockWarnSaveBatch } from '@/api/stockWarn'
 import { dealerProductBrandQuery } from '@/api/dealerProductBrand'
@@ -409,8 +408,7 @@ export default {
       this.exportLoading = true
       // customerBundleExportDelay(params).then(res => {
       //   this.exportLoading = false
-	  // const fileName = '库存预警' + moment().format('YYYYMMDDHHmmss')
-	  // downloadExcel(res, fileName)
+	  // downloadExcel(res, '库存预警')
       // })
     },
     pageInit () {

+ 1 - 2
src/views/productManagement/priceChangeRecord/list.vue

@@ -283,8 +283,7 @@ export default {
       this.exportLoading = true
       // customerBundleExportDelay(params).then(res => {
       //   this.exportLoading = false
-      // const fileName = '价格变更记录' + moment().format('YYYYMMDDHHmmss')
-      // downloadExcel(res, fileName)
+      // downloadExcel(res, '价格变更记录')
       // })
     },
     //  产品品牌  列表

+ 1 - 3
src/views/productManagement/productInfo/list.vue

@@ -132,7 +132,6 @@
 </template>
 
 <script>
-import moment from 'moment'
 import { dealerProductBrandQuery } from '@/api/dealerProductBrand'
 import { dealerProductTypeList } from '@/api/dealerProductType'
 import { dealerProductList, dealerProductUpdate, dealerProductExport } from '@/api/dealerProduct'
@@ -287,8 +286,7 @@ export default {
       dealerProductExport(this.queryParam).then(res => {
         this.exportLoading = false
         this.spinning = false
-		const fileName = '自建产品列表' + moment().format('YYYYMMDDHHmmss')
-		downloadExcel(res, fileName)
+		downloadExcel(res, '自建产品列表')
       })
     },
     //  产品品牌  列表

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

@@ -110,7 +110,6 @@
 </template>
 
 <script>
-import moment from 'moment'
 import { dealerProductBrandQuery } from '@/api/dealerProductBrand'
 import { productTypeQuery } from '@/api/productType'
 import { productList, getCurrentDealer } from '@/api/product'
@@ -242,8 +241,7 @@ export default {
       this.exportLoading = true
       // dealerProductExport(this.queryParam).then(res => {
       //   this.exportLoading = false
-	  // const fileName = '箭冠产品列表' + moment().format('YYYYMMDDHHmmss')
-	  // downloadExcel(res, fileName)
+	  // downloadExcel(res, '箭冠产品列表')
       // })
     },
     //  产品品牌  列表

+ 1 - 3
src/views/productManagement/productOnlineInfo/list.vue

@@ -106,7 +106,6 @@
 </template>
 
 <script>
-import moment from 'moment'
 import { STable, VSelect } from '@/components'
 import rangeDate from '@/views/common/rangeDate.vue'
 import { dealerProductBrandQuery } from '@/api/dealerProductBrand'
@@ -210,8 +209,7 @@ export default {
       _this.exportLoading = true
       _this.spinning = true
       productExport(params).then(res => {
-        const fileName = '产品上线信息' + moment().format('YYYYMMDDHHmmss')
-        downloadExcel(res, fileName)
+        downloadExcel(res, '产品上线信息')
         _this.exportLoading = false
         _this.spinning = false
       })

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

@@ -138,7 +138,6 @@
 </template>
 
 <script>
-import moment from 'moment'
 import { STable, VSelect } from '@/components'
 import { purchaseDetailBySn, purchaseDetailPrint, purchaseDetailExport, purchaseExportDetail } from '@/api/purchase'
 import { purchaseDetailList } from '@/api/purchaseDetail'
@@ -229,8 +228,7 @@ export default {
           })
           reader.readAsText(res)
         } else {
-			const fileName = '采购产品' + moment().format('YYYYMMDDHHmmss')
-			downloadExcel(res, fileName)
+			downloadExcel(res, '采购产品')
         }
       })
     },

+ 14 - 0
src/views/reportData/chainPurchaseReceiptReport/list.vue

@@ -53,3 +53,17 @@ export default {
   }
 }
 </script>
+<style lang="less">
+	.chainPurchaseReceiptReportList-wrap{
+		.chainPurchaseReceiptReportList-tabs.ant-tabs.ant-tabs-card .ant-tabs-card-bar .ant-tabs-nav-container{
+      height: 30px!important;
+		}
+    .chainPurchaseReceiptReportList-tabs.ant-tabs.ant-tabs-card .ant-tabs-card-bar .ant-tabs-tab-active{
+      height: 30px!important;
+    }
+    .chainPurchaseReceiptReportList-tabs.ant-tabs.ant-tabs-card .ant-tabs-card-bar .ant-tabs-tab{
+      line-height: 26px!important;
+      height: 30px!important;
+    }
+	}
+</style>

+ 1 - 3
src/views/reportData/chainPurchaseReceiptReport/purchaseReceiptDetail.vue

@@ -98,7 +98,6 @@
 </template>
 
 <script>
-import moment from 'moment'
 import { STable, VSelect } from '@/components'
 import rangeDate from '@/views/common/rangeDate.vue'
 import ProductType from '../../common/productType.js'
@@ -250,8 +249,7 @@ export default {
           _this.exportLoading = true
           _this.spinning = true
           reportReceivingBillDetailExport(params).then(res => {
-            const fileName = '连锁采购入库明细报表' + moment().format('YYYYMMDDHHmmss')
-            downloadExcel(res, fileName)
+            downloadExcel(res, '连锁采购入库明细报表')
             _this.exportLoading = false
             _this.spinning = false
           })

+ 1 - 3
src/views/reportData/chainPurchaseReceiptReport/purchaseReceiptOrder.vue

@@ -73,7 +73,6 @@
 </template>
 
 <script>
-import moment from 'moment'
 import { STable, VSelect } from '@/components'
 import rangeDate from '@/views/common/rangeDate.vue'
 import { downloadExcel } from '@/libs/JGPrint.js'
@@ -199,8 +198,7 @@ export default {
           _this.exportLoading = true
           _this.spinning = true
           reportReceivingBillExport(params).then(res => {
-            const fileName = '连锁采购入库单报表' + moment().format('YYYYMMDDHHmmss')
-            downloadExcel(res, fileName)
+            downloadExcel(res, '连锁采购入库单报表')
             _this.exportLoading = false
             _this.spinning = false
           })

+ 1 - 2
src/views/reportData/chainReceivedSendStorageReport/list.vue

@@ -269,8 +269,7 @@ export default {
           _this.exportLoading = true
           _this.spinning = true
           reportChainStockPutOutExport(params).then(res => {
-            const fileName = '连锁收发存报表' + moment().format('YYYYMMDDHHmmss')
-            downloadExcel(res, fileName)
+            downloadExcel(res, '连锁收发存报表')
             _this.exportLoading = false
             _this.spinning = false
           })

+ 15 - 1
src/views/reportData/inventoryReport/list.vue

@@ -2,7 +2,7 @@
   <a-card size="small" :bordered="false" class="inventoryReportList-wrap">
     <a-spin :spinning="spinning" tip="Loading...">
       <!-- 标签页 -->
-      <a-tabs type="card" :default-active-key="nowKey" @change="handleTabChange" class="purchaseReceiptReportList-tabs ">
+      <a-tabs type="card" :default-active-key="nowKey" @change="handleTabChange" class="inventoryReportList-tabs ">
         <a-tab-pane v-for="item in tabPaneData" :key="item.val">
           <span slot="tab">{{ item.name }}</span>
         </a-tab-pane>
@@ -53,3 +53,17 @@ export default {
   }
 }
 </script>
+<style lang="less">
+	.inventoryReportList-wrap{
+		.inventoryReportList-tabs.ant-tabs.ant-tabs-card .ant-tabs-card-bar .ant-tabs-nav-container{
+      height: 30px!important;
+		}
+    .inventoryReportList-tabs.ant-tabs.ant-tabs-card .ant-tabs-card-bar .ant-tabs-tab-active{
+      height: 30px!important;
+    }
+    .inventoryReportList-tabs.ant-tabs.ant-tabs-card .ant-tabs-card-bar .ant-tabs-tab{
+      line-height: 26px!important;
+      height: 30px!important;
+    }
+	}
+</style>

+ 14 - 0
src/views/reportData/purchaseReceiptReport/list.vue

@@ -53,3 +53,17 @@ export default {
   }
 }
 </script>
+<style lang="less">
+	.purchaseReceiptReportList-wrap{
+		.purchaseReceiptReportList-tabs.ant-tabs.ant-tabs-card .ant-tabs-card-bar .ant-tabs-nav-container{
+      height: 30px!important;
+		}
+    .purchaseReceiptReportList-tabs.ant-tabs.ant-tabs-card .ant-tabs-card-bar .ant-tabs-tab-active{
+      height: 30px!important;
+    }
+    .purchaseReceiptReportList-tabs.ant-tabs.ant-tabs-card .ant-tabs-card-bar .ant-tabs-tab{
+      line-height: 26px!important;
+      height: 30px!important;
+    }
+	}
+</style>

+ 1 - 3
src/views/reportData/purchaseReceiptReport/purchaseReceiptDetail.vue

@@ -84,7 +84,6 @@
 </template>
 
 <script>
-import moment from 'moment'
 import { STable, VSelect } from '@/components'
 import rangeDate from '@/views/common/rangeDate.vue'
 import ProductType from '../../common/productType.js'
@@ -227,8 +226,7 @@ export default {
           _this.exportLoading = true
           _this.spinning = true
           reportReceivingBillDetailExport(params).then(res => {
-            const fileName = '采购入库明细报表' + moment().format('YYYYMMDDHHmmss')
-            downloadExcel(res, fileName)
+            downloadExcel(res, '采购入库明细报表')
             _this.exportLoading = false
             _this.spinning = false
           })

+ 1 - 3
src/views/reportData/purchaseReceiptReport/purchaseReceiptOrder.vue

@@ -59,7 +59,6 @@
 </template>
 
 <script>
-import moment from 'moment'
 import { STable, VSelect } from '@/components'
 import rangeDate from '@/views/common/rangeDate.vue'
 import { downloadExcel } from '@/libs/JGPrint.js'
@@ -176,8 +175,7 @@ export default {
           _this.exportLoading = true
           _this.spinning = true
           reportReceivingBillExport(params).then(res => {
-            const fileName = '采购入库单报表' + moment().format('YYYYMMDDHHmmss')
-            downloadExcel(res, fileName)
+            downloadExcel(res, '采购入库单报表')
             _this.exportLoading = false
             _this.spinning = false
           })

+ 1 - 3
src/views/reportData/receivedSendStorageReport/list.vue

@@ -108,7 +108,6 @@
 </template>
 
 <script>
-import moment from 'moment'
 import { STable, VSelect } from '@/components'
 import { dealerProductBrandQuery } from '@/api/dealerProductBrand'
 import { dealerProductTypeList } from '@/api/dealerProductType'
@@ -256,8 +255,7 @@ export default {
           _this.exportLoading = true
           _this.spinning = true
           reportStockPutOutExport(params).then(res => {
-            const fileName = '收发存报表' + moment().format('YYYYMMDDHHmmss')
-            downloadExcel(res, fileName)
+            downloadExcel(res, '收发存报表')
             _this.exportLoading = false
             _this.spinning = false
           })

+ 1 - 3
src/views/reportData/salesDetailReport/list.vue

@@ -175,7 +175,6 @@
 </template>
 
 <script>
-import moment from 'moment'
 import { STable, VSelect } from '@/components'
 import rangeDate from '@/views/common/rangeDate.vue'
 import { downloadExcel } from '@/libs/JGPrint.js'
@@ -337,8 +336,7 @@ export default {
           _this.exportLoading = true
           _this.spinning = true
           reportSalesBillDetailExport(params).then(res => {
-            const fileName = '销售明细报表' + moment().format('YYYYMMDDHHmmss')
-            downloadExcel(res, fileName)
+            downloadExcel(res, '销售明细报表')
             _this.exportLoading = false
             _this.spinning = false
           })

+ 1 - 3
src/views/reportData/salesReport/list.vue

@@ -124,7 +124,6 @@
 </template>
 
 <script>
-import moment from 'moment'
 import { STable, VSelect } from '@/components'
 import rangeDate from '@/views/common/rangeDate.vue'
 import { downloadExcel } from '@/libs/JGPrint.js'
@@ -256,8 +255,7 @@ export default {
           _this.exportLoading = true
           _this.spinning = true
           reportSalesBillExport(params).then(res => {
-            const fileName = '销售报表' + moment().format('YYYYMMDDHHmmss')
-            downloadExcel(res, fileName)
+            downloadExcel(res, '销售报表')
             _this.exportLoading = false
             _this.spinning = false
           })

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

@@ -178,7 +178,6 @@
 </template>
 
 <script>
-import moment from 'moment'
 import getDate from '@/libs/getDate.js'
 import { STable, VSelect } from '@/components'
 import chooseCustomModal from './chooseCustomModal.vue'
@@ -396,8 +395,7 @@ export default {
           })
           reader.readAsText(res)
         } else {
-          const fileName = '销售列表' + moment().format('YYYYMMDDHHmmss')
-          downloadExcel(res, fileName)
+          downloadExcel(res, '销售列表')
         }
       })
     },