doctor-admin-components 1.0.14-beta.69 → 1.0.14-beta.70

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "doctor-admin-components",
3
3
  "version1": "1.0.11",
4
- "version": "1.0.14-beta.69",
4
+ "version": "1.0.14-beta.70",
5
5
  "private": false,
6
6
  "main1": "lib/index.umd.min.js",
7
7
  "main": "packages/index.js",
@@ -1679,15 +1679,8 @@ export default {
1679
1679
  },
1680
1680
  identifyPage(url, shipmentId, type) {
1681
1681
  if (type == 'summary') {
1682
- return this.$router.push({
1683
- path: '/jxxg/ocr/index',
1684
- query: {
1685
- // url: url,
1686
- shipmentId,
1687
- shipmentOcrType: type,
1688
- contractId: this.contractId,
1689
- },
1690
- });
1682
+ window.open(`/jxxg/ocr/index?shipmentId=${shipmentId}&shipmentOcrType=${type}&contractId=${this.contractId}`, '_blank');
1683
+ return;
1691
1684
  }
1692
1685
 
1693
1686
  if (!url) {
@@ -1695,51 +1688,23 @@ export default {
1695
1688
  }
1696
1689
 
1697
1690
  if (type == 'draft_bill') {
1698
- return this.$router.push({
1699
- path: '/jxxg/ocr/draft-bill',
1700
- query: {
1701
- url: url,
1702
- shipmentId,
1703
- shipmentOcrType: type,
1704
- contractId: this.contractId,
1705
- },
1706
- });
1691
+ window.open(`/jxxg/ocr/draft-bill?url=${url}&shipmentId=${shipmentId}&shipmentOcrType=${type}&contractId=${this.contractId}`, '_blank');
1692
+ return;
1707
1693
  }
1708
1694
 
1709
1695
  if (type == 'packing') {
1710
- return this.$router.push({
1711
- path: '/jxxg/ocr/packing-list',
1712
- query: {
1713
- url: url,
1714
- shipmentId,
1715
- shipmentOcrType: type,
1716
- contractId: this.contractId,
1717
- },
1718
- });
1696
+ window.open(`/jxxg/ocr/packing-list?url=${url}&shipmentId=${shipmentId}&shipmentOcrType=${type}&contractId=${this.contractId}`, '_blank');
1697
+ return;
1719
1698
  }
1720
1699
 
1721
1700
  if (type == 'temporary_invoice') {
1722
- return this.$router.push({
1723
- path: '/jxxg/ocr/invoice-balance-temp',
1724
- query: {
1725
- url: url,
1726
- shipmentId,
1727
- shipmentOcrType: type,
1728
- contractId: this.contractId,
1729
- },
1730
- });
1701
+ window.open(`/jxxg/ocr/invoice-balance-temp?url=${url}&shipmentId=${shipmentId}&shipmentOcrType=${type}&contractId=${this.contractId}`, '_blank');
1702
+ return;
1731
1703
  }
1732
1704
 
1733
1705
  if (type == 'final_invoice') {
1734
- return this.$router.push({
1735
- path: '/jxxg/ocr/invoice-balance',
1736
- query: {
1737
- url: url,
1738
- shipmentId,
1739
- shipmentOcrType: type,
1740
- contractId: this.contractId,
1741
- },
1742
- });
1706
+ window.open(`/jxxg/ocr/invoice-balance?url=${url}&shipmentId=${shipmentId}&shipmentOcrType=${type}&contractId=${this.contractId}`, '_blank');
1707
+ return;
1743
1708
  }
1744
1709
  },
1745
1710