diff --git a/src/api/simplify/simplifyContractApi.js b/src/api/simplify/simplifyContractApi.js index 7ea2f3c77..5acb99c8a 100644 --- a/src/api/simplify/simplifyContractApi.js +++ b/src/api/simplify/simplifyContractApi.js @@ -1,9 +1,17 @@ import request from '@/utils/request' export function queryContract(params) { - return request({ - url: '/contract/queryContract', - method: 'get', - params + return new Promise((resolve, reject) => { + request({ + url: '/contract/queryContract', + method: 'get', + params + }) + .then(response => { + resolve(response.data) + }) + .catch(error => { + reject(error) + }) }) } \ No newline at end of file diff --git a/src/components/simplify/simplifyContract.vue b/src/components/simplify/simplifyContract.vue index a197a405a..44607e07b 100644 --- a/src/components/simplify/simplifyContract.vue +++ b/src/components/simplify/simplifyContract.vue @@ -101,10 +101,10 @@ export default { this.$router.push('/pages/admin/newContractManage') }, _printContract(contract) { - window.open(`/#/pages/admin/printContract?contractTypeId=${contract.contractType}&contractId=${contract.contractId}`) + window.open(`/#/views/contract/printContract?contractTypeId=${contract.contractType}&contractId=${contract.contractId}`) }, _viewContract(contract) { - this.$router.push(`/pages/contract/contractDetail?contractId=${contract.contractId}`) + this.$router.push(`/views/contract/contractDetail?contractId=${contract.contractId}`) }, clearContractInfoInfo() { this.contractInfo = { @@ -124,10 +124,11 @@ export default { }, _openContractFee(contract) { this.$router.push({ - path: '/pages/property/listContractFee', + path: '/views/contract/contractDetail', query: { contractId: contract.contractId, - contractCode: contract.contractCode + contractCode: contract.contractCode, + currentTab:'contractDetailFee' } }) },