Showing
3 changed files
with
11 additions
and
7 deletions
| @@ -115,7 +115,7 @@ | @@ -115,7 +115,7 @@ | ||
| 115 | </template> | 115 | </template> |
| 116 | 116 | ||
| 117 | <script> | 117 | <script> |
| 118 | -import { getContractApi, deleteContractApi, uploadFormalContract, uploadStandardContract, uploadSignedContractFile, statusStyle, statusMap } from '@/api/contract' | 118 | +import { getContractApi, deleteContractApi, uploadFormalContract, uploadStandardContract, uploadSignedContractFile, statusStyle, statusMap,showContract } from '@/api/contract' |
| 119 | import ProductRel from './productRel.vue' | 119 | import ProductRel from './productRel.vue' |
| 120 | import DetailButtons from '@/components/detail-buttons/index.vue' | 120 | import DetailButtons from '@/components/detail-buttons/index.vue' |
| 121 | import FileUpload from '@/components/file-upload/index.vue' | 121 | import FileUpload from '@/components/file-upload/index.vue' |
| @@ -344,8 +344,10 @@ export default { | @@ -344,8 +344,10 @@ export default { | ||
| 344 | }) | 344 | }) |
| 345 | }, | 345 | }, |
| 346 | onLockApply() { | 346 | onLockApply() { |
| 347 | - uni.navigateTo({ | ||
| 348 | - url: '/pages/contract_foreign_unplan/lock_apply?id=' + this.detail.id || '' | 347 | + showContract(this.detail.id).then(res => { |
| 348 | + uni.navigateTo({ | ||
| 349 | + url: '/pages/contract_foreign_unplan/lock_apply?id=' + this.detail.id || '' | ||
| 350 | + }) | ||
| 349 | }) | 351 | }) |
| 350 | }, | 352 | }, |
| 351 | onEdit() { | 353 | onEdit() { |
| @@ -263,7 +263,7 @@ export default { | @@ -263,7 +263,7 @@ export default { | ||
| 263 | { ...this.buttons[5], visible: (s === 'STANDARD' && a !== 'AUDIT' && a !== 'PASS' && this.$auth.hasPermi('contract-manage:distribution-inventory-contract:standard-upload')) }, | 263 | { ...this.buttons[5], visible: (s === 'STANDARD' && a !== 'AUDIT' && a !== 'PASS' && this.$auth.hasPermi('contract-manage:distribution-inventory-contract:standard-upload')) }, |
| 264 | { ...this.buttons[6], visible: (s === 'FORMAL' && e && t === 'AUDIT' && this.$auth.hasPermi('contract-manage:distribution-inventory-contract:approve')) }, | 264 | { ...this.buttons[6], visible: (s === 'FORMAL' && e && t === 'AUDIT' && this.$auth.hasPermi('contract-manage:distribution-inventory-contract:approve')) }, |
| 265 | { ...this.buttons[7], visible: (s === 'STANDARD' && e && t === 'AUDIT' && this.$auth.hasPermi('contract-manage:distribution-inventory-contract:approve')) }, | 265 | { ...this.buttons[7], visible: (s === 'STANDARD' && e && t === 'AUDIT' && this.$auth.hasPermi('contract-manage:distribution-inventory-contract:approve')) }, |
| 266 | - { ...this.buttons[8], visible: (s === 'STANDARD' && f && a === 'AUDIT' && this.$auth.hasPermi('contract-manage:distribution-inventory-contract:restandard-approveview')) }, | 266 | + { ...this.buttons[8], visible: (s === 'STANDARD' && f && a === 'AUDIT' && this.$auth.hasPermi('contract-manage:distribution-inventory-contract:standard-approve')) }, |
| 267 | { ...this.buttons[9], visible: (s === 'FORMAL' && t && this.$auth.hasPermi('contract-manage:distribution-inventory-contract:review')) }, | 267 | { ...this.buttons[9], visible: (s === 'FORMAL' && t && this.$auth.hasPermi('contract-manage:distribution-inventory-contract:review')) }, |
| 268 | { ...this.buttons[10], visible: (s === 'STANDARD' && t && this.$auth.hasPermi('contract-manage:distribution-inventory-contract:review')) }, | 268 | { ...this.buttons[10], visible: (s === 'STANDARD' && t && this.$auth.hasPermi('contract-manage:distribution-inventory-contract:review')) }, |
| 269 | { ...this.buttons[11], visible: (s === 'STANDARD' && a && this.$auth.hasPermi('contract-manage:distribution-inventory-contract:standard-review')) }, | 269 | { ...this.buttons[11], visible: (s === 'STANDARD' && a && this.$auth.hasPermi('contract-manage:distribution-inventory-contract:standard-review')) }, |
| @@ -115,7 +115,7 @@ | @@ -115,7 +115,7 @@ | ||
| 115 | </template> | 115 | </template> |
| 116 | 116 | ||
| 117 | <script> | 117 | <script> |
| 118 | -import { getContractApi, deleteContractApi, uploadFormalContract, statusStyle, uploadStandardContract, statusMap } from '@/api/contract' | 118 | +import { getContractApi, deleteContractApi, uploadFormalContract, statusStyle, uploadStandardContract, statusMap, showContract } from '@/api/contract' |
| 119 | import ProductRel from './productRel.vue' | 119 | import ProductRel from './productRel.vue' |
| 120 | import DetailButtons from '@/components/detail-buttons/index.vue' | 120 | import DetailButtons from '@/components/detail-buttons/index.vue' |
| 121 | import FileUpload from '@/components/file-upload/index.vue' | 121 | import FileUpload from '@/components/file-upload/index.vue' |
| @@ -340,8 +340,10 @@ export default { | @@ -340,8 +340,10 @@ export default { | ||
| 340 | }) | 340 | }) |
| 341 | }, | 341 | }, |
| 342 | onLockApply() { | 342 | onLockApply() { |
| 343 | - uni.navigateTo({ | ||
| 344 | - url: '/pages/contract_unplan/lock_apply?id=' + this.detail.id || '' | 343 | + showContract(this.detail.id).then(res => { |
| 344 | + uni.navigateTo({ | ||
| 345 | + url: '/pages/contract_unplan/lock_apply?id=' + this.detail.id || '' | ||
| 346 | + }) | ||
| 345 | }) | 347 | }) |
| 346 | }, | 348 | }, |
| 347 | uploadContract(id, type = 'formal') { | 349 | uploadContract(id, type = 'formal') { |