Commit f5128ddefcfd3063258558d4491fa3ff6df7343b

Authored by wuxw
1 parent 1cd49b72

优化打印404 问题

src/components/contract/contractDetailReceipt.vue
@@ -66,7 +66,7 @@ export default { @@ -66,7 +66,7 @@ export default {
66 feeReceipts: [], 66 feeReceipts: [],
67 payObjId: '', 67 payObjId: '',
68 selectReceipts: [], 68 selectReceipts: [],
69 - printUrl: '/print.html#/pages/property/printPayFee' 69 + printUrl: '/#/pages/property/printPayFee'
70 }, 70 },
71 currentPage: 1, 71 currentPage: 1,
72 pageSize: 10, 72 pageSize: 10,
@@ -141,7 +141,7 @@ export default { @@ -141,7 +141,7 @@ export default {
141 return 141 return
142 } 142 }
143 const receiptIds = this.contractDetailReceiptInfo.selectReceipts.join(',') 143 const receiptIds = this.contractDetailReceiptInfo.selectReceipts.join(',')
144 - window.open(`/print.html#/pages/property/printPayFee?receiptIds=${receiptIds}&apply=Y`) 144 + window.open(`/#/pages/property/printPayFee?receiptIds=${receiptIds}&apply=Y`)
145 }, 145 },
146 _printFeeSmallReceipt() { 146 _printFeeSmallReceipt() {
147 if (this.contractDetailReceiptInfo.selectReceipts.length < 1) { 147 if (this.contractDetailReceiptInfo.selectReceipts.length < 1) {
@@ -149,7 +149,7 @@ export default { @@ -149,7 +149,7 @@ export default {
149 return 149 return
150 } 150 }
151 const receiptIds = this.contractDetailReceiptInfo.selectReceipts.join(',') 151 const receiptIds = this.contractDetailReceiptInfo.selectReceipts.join(',')
152 - window.open(`/smallPrint.html#/pages/property/printSmallPayFee?receiptIds=${receiptIds}`) 152 + window.open(`/#/pages/property/printSmallPayFee?receiptIds=${receiptIds}`)
153 }, 153 },
154 _listFeePrintPages() { 154 _listFeePrintPages() {
155 const param = { 155 const param = {
src/components/fee/batchPayConfirm.vue
@@ -61,7 +61,7 @@ export default { @@ -61,7 +61,7 @@ export default {
61 authCode: '', 61 authCode: '',
62 feePrices: '', 62 feePrices: '',
63 detailIds: '', 63 detailIds: '',
64 - printUrl: '/print.html#/pages/property/printPayFee', 64 + printUrl: '/#/pages/property/printPayFee',
65 accountAmount: '', 65 accountAmount: '',
66 acctId: '' 66 acctId: ''
67 } 67 }
src/components/fee/feeDetailReceipt.vue
@@ -64,7 +64,7 @@ export default { @@ -64,7 +64,7 @@ export default {
64 records: 0, 64 records: 0,
65 selectReceipts: [], 65 selectReceipts: [],
66 quan: false, 66 quan: false,
67 - printUrl: '/print.html#/pages/property/printPayFee' 67 + printUrl: '/#/pages/property/printPayFee'
68 }, 68 },
69 currentPage: 1, 69 currentPage: 1,
70 pageSize: 10 70 pageSize: 10
@@ -125,7 +125,7 @@ export default { @@ -125,7 +125,7 @@ export default {
125 } 125 }
126 126
127 const receiptIds = this.feeDetailReceiptInfo.selectReceipts.join(',') 127 const receiptIds = this.feeDetailReceiptInfo.selectReceipts.join(',')
128 - window.open(`/print.html#/pages/property/printPayFee?receiptIds=${receiptIds}&apply=Y`) 128 + window.open(`/#/pages/property/printPayFee?receiptIds=${receiptIds}&apply=Y`)
129 }, 129 },
130 _printFeeSmallReceipt() { 130 _printFeeSmallReceipt() {
131 if (this.feeDetailReceiptInfo.selectReceipts.length < 1) { 131 if (this.feeDetailReceiptInfo.selectReceipts.length < 1) {
@@ -134,7 +134,7 @@ export default { @@ -134,7 +134,7 @@ export default {
134 } 134 }
135 135
136 const receiptIds = this.feeDetailReceiptInfo.selectReceipts.join(',') 136 const receiptIds = this.feeDetailReceiptInfo.selectReceipts.join(',')
137 - window.open(`/smallPrint.html#/pages/property/printSmallPayFee?receiptIds=${receiptIds}`) 137 + window.open(`/#/pages/property/printSmallPayFee?receiptIds=${receiptIds}`)
138 }, 138 },
139 checkAllReceipt(e) { 139 checkAllReceipt(e) {
140 if (e) { 140 if (e) {
src/components/fee/payFeeOrderResult.vue
@@ -31,7 +31,7 @@ export default { @@ -31,7 +31,7 @@ export default {
31 return { 31 return {
32 dialogVisible: false, 32 dialogVisible: false,
33 receiptId: '', 33 receiptId: '',
34 - printUrl: '/print.html#/pages/property/printPayFee' 34 + printUrl: '/#/pages/property/printPayFee'
35 } 35 }
36 }, 36 },
37 created() { 37 created() {
@@ -87,7 +87,7 @@ export default { @@ -87,7 +87,7 @@ export default {
87 window.open(`${this.printUrl}?receiptId=${this.receiptId}&merge=${merge}`) 87 window.open(`${this.printUrl}?receiptId=${this.receiptId}&merge=${merge}`)
88 }, 88 },
89 printSmallAndBack() { 89 printSmallAndBack() {
90 - window.open(`/smallPrint.html#/pages/property/printSmallPayFee?receiptId=${this.receiptId}`) 90 + window.open(`/#/pages/property/printSmallPayFee?receiptId=${this.receiptId}`)
91 }, 91 },
92 back() { 92 back() {
93 this.close() 93 this.close()
src/components/fee/printOwnFee.vue
@@ -60,7 +60,7 @@ export default { @@ -60,7 +60,7 @@ export default {
60 this.visible = false 60 this.visible = false
61 }, 61 },
62 _openPrintOweFeePage() { 62 _openPrintOweFeePage() {
63 - window.open(`/print.html#/pages/property/printOweFee?payObjId=${this.printOwnFeeInfo.payObjId 63 + window.open(`/#/pages/property/printOweFee?payObjId=${this.printOwnFeeInfo.payObjId
64 }&payObjType=${this.printOwnFeeInfo.payObjType 64 }&payObjType=${this.printOwnFeeInfo.payObjType
65 }&payObjName=${encodeURIComponent(this.printOwnFeeInfo.payObjName) 65 }&payObjName=${encodeURIComponent(this.printOwnFeeInfo.payObjName)
66 }&targetEndTime=${this.printOwnFeeInfo.targetEndTime}`) 66 }&targetEndTime=${this.printOwnFeeInfo.targetEndTime}`)
src/components/fee/simplifyCallable.vue
@@ -153,7 +153,7 @@ export default { @@ -153,7 +153,7 @@ export default {
153 } 153 }
154 }, 154 },
155 _printOwnOrder() { 155 _printOwnOrder() {
156 - window.open(`/print.html#/pages/property/printOweFee?payObjId=${this.simplifyCallableInfo.roomId}&payObjType=3333&payObjName=${this.simplifyCallableInfo.roomName}`) 156 + window.open(`/#/pages/property/printOweFee?payObjId=${this.simplifyCallableInfo.roomId}&payObjType=3333&payObjName=${this.simplifyCallableInfo.roomName}`)
157 }, 157 },
158 _openWritePrintOweFeeCallableModal() { 158 _openWritePrintOweFeeCallableModal() {
159 if (!this.simplifyCallableInfo.roomId) { 159 if (!this.simplifyCallableInfo.roomId) {
src/components/fee/simplifyFeeReceipt.vue
@@ -127,7 +127,7 @@ export default { @@ -127,7 +127,7 @@ export default {
127 ownerFlag: 'F', 127 ownerFlag: 'F',
128 contractId: '', 128 contractId: '',
129 quan: false, 129 quan: false,
130 - printUrl: '/print.html#/pages/property/printPayFee' 130 + printUrl: '/#/pages/property/printPayFee'
131 }, 131 },
132 currentPage: 1, 132 currentPage: 1,
133 pageSize: 10, 133 pageSize: 10,
@@ -219,7 +219,7 @@ export default { @@ -219,7 +219,7 @@ export default {
219 return 219 return
220 } 220 }
221 const receiptids = this.simplifyFeeReceiptInfo.selectReceipts.join(',') 221 const receiptids = this.simplifyFeeReceiptInfo.selectReceipts.join(',')
222 - window.open(`/print.html#/pages/property/printPayFee?receiptIds=${receiptids}&apply=Y`) 222 + window.open(`/#/pages/property/printPayFee?receiptIds=${receiptids}&apply=Y`)
223 }, 223 },
224 _printFeeSmallReceipt() { 224 _printFeeSmallReceipt() {
225 if (this.simplifyFeeReceiptInfo.selectReceipts.length < 1) { 225 if (this.simplifyFeeReceiptInfo.selectReceipts.length < 1) {
@@ -227,7 +227,7 @@ export default { @@ -227,7 +227,7 @@ export default {
227 return 227 return
228 } 228 }
229 const receiptids = this.simplifyFeeReceiptInfo.selectReceipts.join(',') 229 const receiptids = this.simplifyFeeReceiptInfo.selectReceipts.join(',')
230 - window.open(`/smallPrint.html#/pages/property/printSmallPayFee?receiptIds=${receiptids}`) 230 + window.open(`/#/pages/property/printSmallPayFee?receiptIds=${receiptids}`)
231 }, 231 },
232 clearSimplifyFeeReceiptInfo() { 232 clearSimplifyFeeReceiptInfo() {
233 this.simplifyFeeReceiptInfo = { 233 this.simplifyFeeReceiptInfo = {
@@ -247,7 +247,7 @@ export default { @@ -247,7 +247,7 @@ export default {
247 ownerFlag: 'F', 247 ownerFlag: 'F',
248 contractId: '', 248 contractId: '',
249 quan: false, 249 quan: false,
250 - printUrl: '/print.html#/pages/property/printPayFee' 250 + printUrl: '/#/pages/property/printPayFee'
251 } 251 }
252 }, 252 },
253 async _changeSimplifyFeeReceiptFeeTypeCd(objType) { 253 async _changeSimplifyFeeReceiptFeeTypeCd(objType) {
src/components/machine/printEquipmentAccount.vue
@@ -123,7 +123,7 @@ export default { @@ -123,7 +123,7 @@ export default {
123 this.$refs.form.resetFields() 123 this.$refs.form.resetFields()
124 }, 124 },
125 handlePrint() { 125 handlePrint() {
126 - window.open(`/print.html#/pages/property/printEquipmentAccountLabel?machineId=${this.formData.machineId}&qty=${this.formData.printQty}`) 126 + window.open(`/#/pages/property/printEquipmentAccountLabel?machineId=${this.formData.machineId}&qty=${this.formData.printQty}`)
127 this.dialogVisible = false 127 this.dialogVisible = false
128 } 128 }
129 } 129 }
src/components/owner/ownerDetailAccountReceipt.vue
@@ -96,7 +96,7 @@ export default { @@ -96,7 +96,7 @@ export default {
96 return 96 return
97 } 97 }
98 const arIds = selected.map(item => item.arId).join(',') 98 const arIds = selected.map(item => item.arId).join(',')
99 - window.open(`/print.html#/pages/property/printAccountReceipt?arIds=${arIds}&apply=N`) 99 + window.open(`/#/pages/property/printAccountReceipt?arIds=${arIds}&apply=N`)
100 }, 100 },
101 _printFeeSmallAccountReceipt() { 101 _printFeeSmallAccountReceipt() {
102 const selected = this.ownerDetailAccountReceiptInfo.feeReceipts.filter(item => item.checked) 102 const selected = this.ownerDetailAccountReceiptInfo.feeReceipts.filter(item => item.checked)
@@ -105,7 +105,7 @@ export default { @@ -105,7 +105,7 @@ export default {
105 return 105 return
106 } 106 }
107 const arIds = selected.map(item => item.arId).join(',') 107 const arIds = selected.map(item => item.arId).join(',')
108 - window.open(`/smallPrint.html#/pages/property/printSmallAccountReceipt?arIds=${arIds}`) 108 + window.open(`/#/pages/property/printSmallAccountReceipt?arIds=${arIds}`)
109 }, 109 },
110 handleCheckChange(row) { 110 handleCheckChange(row) {
111 if (row.checked) { 111 if (row.checked) {
src/components/owner/ownerDetailReceipt.vue
@@ -67,7 +67,7 @@ export default { @@ -67,7 +67,7 @@ export default {
67 total: 0, 67 total: 0,
68 records: 0, 68 records: 0,
69 selectReceipts: [], 69 selectReceipts: [],
70 - printUrl: '/print.html#/pages/property/printPayFee' 70 + printUrl: '/#/pages/property/printPayFee'
71 }, 71 },
72 currentPage: 1, 72 currentPage: 1,
73 pageSize: 10, 73 pageSize: 10,
@@ -135,7 +135,7 @@ export default { @@ -135,7 +135,7 @@ export default {
135 return 135 return
136 } 136 }
137 const receiptIds = selected.map(item => item.receiptId).join(',') 137 const receiptIds = selected.map(item => item.receiptId).join(',')
138 - window.open(`/print.html#/pages/property/printPayFee?receiptIds=${receiptIds}&apply=Y`) 138 + window.open(`/#/pages/property/printPayFee?receiptIds=${receiptIds}&apply=Y`)
139 }, 139 },
140 _printFeeSmallReceipt() { 140 _printFeeSmallReceipt() {
141 const selected = this.ownerDetailReceiptInfo.feeReceipts.filter(item => item.checked) 141 const selected = this.ownerDetailReceiptInfo.feeReceipts.filter(item => item.checked)
@@ -144,7 +144,7 @@ export default { @@ -144,7 +144,7 @@ export default {
144 return 144 return
145 } 145 }
146 const receiptIds = selected.map(item => item.receiptId).join(',') 146 const receiptIds = selected.map(item => item.receiptId).join(',')
147 - window.open(`/smallPrint.html#/pages/property/printSmallPayFee?receiptIds=${receiptIds}`) 147 + window.open(`/#/pages/property/printSmallPayFee?receiptIds=${receiptIds}`)
148 }, 148 },
149 handleCheckChange(row) { 149 handleCheckChange(row) {
150 if (row.checked) { 150 if (row.checked) {
src/components/owner/ownerDetailRoomFee.vue
@@ -228,7 +228,7 @@ export default { @@ -228,7 +228,7 @@ export default {
228 this.$message.warning(this.$t('ownerDetailRoomFee.selectRoom')) 228 this.$message.warning(this.$t('ownerDetailRoomFee.selectRoom'))
229 return 229 return
230 } 230 }
231 - window.open(`/print.html#/pages/property/printOweFee?payObjId=${_ids.join(',')}&payObjType=3333&payObjName=`) 231 + window.open(`/#/pages/property/printOweFee?payObjId=${_ids.join(',')}&payObjType=3333&payObjName=`)
232 }, 232 },
233 _openRoomsCreateFeeModal() { 233 _openRoomsCreateFeeModal() {
234 this.$refs.roomsCreateFee.open({ 234 this.$refs.roomsCreateFee.open({
src/components/simplify/simplifyContract.vue
@@ -100,7 +100,7 @@ export default { @@ -100,7 +100,7 @@ export default {
100 this.$router.push('/pages/admin/newContractManage') 100 this.$router.push('/pages/admin/newContractManage')
101 }, 101 },
102 _printContract(contract) { 102 _printContract(contract) {
103 - window.open(`/print.html#/pages/admin/printContract?contractTypeId=${contract.contractType}&contractId=${contract.contractId}`) 103 + window.open(`/#/pages/admin/printContract?contractTypeId=${contract.contractType}&contractId=${contract.contractId}`)
104 }, 104 },
105 _viewContract(contract) { 105 _viewContract(contract) {
106 this.$router.push(`/pages/contract/contractDetail?contractId=${contract.contractId}`) 106 this.$router.push(`/pages/contract/contractDetail?contractId=${contract.contractId}`)
src/views/contract/contractDetail.vue
@@ -241,7 +241,7 @@ export default { @@ -241,7 +241,7 @@ export default {
241 }, 241 },
242 _printContract() { 242 _printContract() {
243 const contract = this.contractDetailInfo 243 const contract = this.contractDetailInfo
244 - window.open(`/print.html#/pages/admin/printContract?contractTypeId=${contract.contractType}&contractId=${contract.contractId}`) 244 + window.open(`/#/pages/admin/printContract?contractTypeId=${contract.contractType}&contractId=${contract.contractId}`)
245 } 245 }
246 } 246 }
247 } 247 }
src/views/fee/feeReceiptList.vue
@@ -104,7 +104,7 @@ export default { @@ -104,7 +104,7 @@ export default {
104 feeReceiptManageInfo: { 104 feeReceiptManageInfo: {
105 feeReceipts: [], 105 feeReceipts: [],
106 moreCondition: false, 106 moreCondition: false,
107 - printUrl: '/print.html#/pages/property/printPayFee', 107 + printUrl: '/#/pages/property/printPayFee',
108 conditions: { 108 conditions: {
109 objType: '', 109 objType: '',
110 storeName: '', 110 storeName: '',
@@ -184,7 +184,7 @@ export default { @@ -184,7 +184,7 @@ export default {
184 window.open(`${this.feeReceiptManageInfo.printUrl}?receiptId=${receipt.receiptId}`) 184 window.open(`${this.feeReceiptManageInfo.printUrl}?receiptId=${receipt.receiptId}`)
185 }, 185 },
186 _printFeeSmallReceipt(receipt) { 186 _printFeeSmallReceipt(receipt) {
187 - window.open(`/smallPrint.html#/pages/property/printSmallPayFee?receiptIds=${receipt.receiptId}`) 187 + window.open(`/#/pages/property/printSmallPayFee?receiptIds=${receipt.receiptId}`)
188 }, 188 },
189 _moreCondition() { 189 _moreCondition() {
190 this.feeReceiptManageInfo.moreCondition = !this.feeReceiptManageInfo.moreCondition 190 this.feeReceiptManageInfo.moreCondition = !this.feeReceiptManageInfo.moreCondition
src/views/machine/equipmentAccountDetailList.vue
@@ -244,7 +244,7 @@ export default { @@ -244,7 +244,7 @@ export default {
244 this.$refs.viewImage.open(photo.url) 244 this.$refs.viewImage.open(photo.url)
245 }, 245 },
246 _printEquipmentDetail() { 246 _printEquipmentDetail() {
247 - window.open(`/print.html#/pages/property/printEquipmentAccountLabel?machineId=${this.equipmentAccountDetail.machineId}`) 247 + window.open(`/#/pages/property/printEquipmentAccountLabel?machineId=${this.equipmentAccountDetail.machineId}`)
248 } 248 }
249 } 249 }
250 } 250 }
src/views/resource/allocationStorehouseDetailList.vue
@@ -233,7 +233,7 @@ export default { @@ -233,7 +233,7 @@ export default {
233 this.$router.go(-1) 233 this.$router.go(-1)
234 }, 234 },
235 printAllocationStorehouse() { 235 printAllocationStorehouse() {
236 - window.open(`/print.html#/pages/property/printAllocationStorehouse?applyId=${this.allocationStorehouseDetailInfo.applyId}`) 236 + window.open(`/#/pages/property/printAllocationStorehouse?applyId=${this.allocationStorehouseDetailInfo.applyId}`)
237 } 237 }
238 } 238 }
239 } 239 }
src/views/resource/assetInventoryInStockList.vue
@@ -225,7 +225,7 @@ export default { @@ -225,7 +225,7 @@ export default {
225 item.invLossMoney = item.invLoss * parseFloat(item.price) 225 item.invLossMoney = item.invLoss * parseFloat(item.price)
226 }, 226 },
227 _printAssetInventoryInStock() { 227 _printAssetInventoryInStock() {
228 - window.open(`/print.html#/pages/property/printAssetInventoryInStock?aiId=${this.assetInventoryInStockInfo.aiId}`) 228 + window.open(`/#/pages/property/printAssetInventoryInStock?aiId=${this.assetInventoryInStockInfo.aiId}`)
229 } 229 }
230 } 230 }
231 } 231 }
src/views/resource/purchaseApplyDetailList.vue
@@ -292,9 +292,9 @@ export default { @@ -292,9 +292,9 @@ export default {
292 }, 292 },
293 _printPurchaseApply() { 293 _printPurchaseApply() {
294 if (this.purchaseApplyDetailInfo.resOrderType == '10000') { 294 if (this.purchaseApplyDetailInfo.resOrderType == '10000') {
295 - window.open(`/print.html#/pages/property/printPurchaseApply?applyOrderId=${this.purchaseApplyDetailInfo.applyOrderId}&resOrderType=${this.purchaseApplyDetailInfo.resOrderType}`) 295 + window.open(`/#/pages/property/printPurchaseApply?applyOrderId=${this.purchaseApplyDetailInfo.applyOrderId}&resOrderType=${this.purchaseApplyDetailInfo.resOrderType}`)
296 } else if (this.purchaseApplyDetailInfo.resOrderType == '20000') { 296 } else if (this.purchaseApplyDetailInfo.resOrderType == '20000') {
297 - window.open(`/print.html#/pages/property/printPurchaseOutApply?applyOrderId=${this.purchaseApplyDetailInfo.applyOrderId}&resOrderType=${this.purchaseApplyDetailInfo.resOrderType}`) 297 + window.open(`/#/pages/property/printPurchaseOutApply?applyOrderId=${this.purchaseApplyDetailInfo.applyOrderId}&resOrderType=${this.purchaseApplyDetailInfo.resOrderType}`)
298 } 298 }
299 } 299 }
300 } 300 }