From 346c0aa1f95b37042c8f7aba38631534c236b727 Mon Sep 17 00:00:00 2001 From: xy <271556543@qq.com> Date: Mon, 25 Mar 2024 17:38:06 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 2 +- .env.production | 2 +- .env.staging | 2 +- src/views/contract/contractEdit.vue | 33 +++- src/views/contract/contractList.vue | 292 +++++++--------------------- 5 files changed, 99 insertions(+), 232 deletions(-) diff --git a/.env.development b/.env.development index a68c83c..11e08b6 100644 --- a/.env.development +++ b/.env.development @@ -6,7 +6,7 @@ VUE_APP_DOMIAN = http://hjjc-hdcontract-test.ali251.langye.net VUE_APP_UPLOAD_API = http://hjjc-hdcontract-test.ali251.langye.net/api/admin/upload-file VUE_APP_BASE_API = VUE_APP_OUT_Book = http://hjjc-book-service-test.ali251.langye.net -VUE_APP_OUT_GDZC = http://hjjc-szemcgdzc.ali251.langye.net +VUE_APP_OUT_GDZC = http://hjjc-szemcgdzc.ali251.langye.net/admin VUE_APP_OUT_OLD = http://hjjc-szemcold-test.ali251.langye.net VUE_APP_OUT_URL = http://192.168.60.18:2021 VUE_APP_OUT_GOODS = http://hjjc-szemc_goods-test.ali251.langye.net diff --git a/.env.production b/.env.production index 5c9db49..899627e 100644 --- a/.env.production +++ b/.env.production @@ -6,7 +6,7 @@ VUE_APP_DOMIAN=http://192.168.0.66:9001/ VUE_APP_UPLOAD_API = http://192.168.00.66:9001/api/admin/upload-file VUE_APP_BASE_API = '' VUE_APP_OUT_Book = http://192.168.0.66:9002/ -VUE_APP_OUT_GDZC = http://192.168.0.66:17777 +VUE_APP_OUT_GDZC = http://192.168.0.66:17777/admin/ VUE_APP_OUT_OLD = http://192.168.0.66 VUE_APP_OUT_URL = http://192.168.60.18:2021 VUE_APP_OLD_OA = http://192.168.0.66:16667 diff --git a/.env.staging b/.env.staging index 9015676..7e40f0a 100644 --- a/.env.staging +++ b/.env.staging @@ -8,7 +8,7 @@ VUE_APP_DOMIAN = http://hjjc-hdcontract-test.ali251.langye.net VUE_APP_UPLOAD_API = http://hjjc-hdcontract-test.ali251.langye.net/api/admin/upload-file VUE_APP_BASE_API = VUE_APP_OUT_Book = http://hjjc-book-service-test.ali251.langye.net -VUE_APP_OUT_GDZC = http://hjjc-szemcgdzc.ali251.langye.net +VUE_APP_OUT_GDZC = http://hjjc-szemcgdzc.ali251.langye.net/admin VUE_APP_OUT_OLD = http://hjjc-szemcold-test.ali251.langye.net VUE_APP_OUT_URL = http://192.168.60.18:2021 VUE_APP_OUT_GOODS = http://hjjc-szemc_goods-test.ali251.langye.net diff --git a/src/views/contract/contractEdit.vue b/src/views/contract/contractEdit.vue index 3133ff7..3f7b101 100644 --- a/src/views/contract/contractEdit.vue +++ b/src/views/contract/contractEdit.vue @@ -323,7 +323,7 @@ - + @@ -1323,6 +1323,32 @@ export default { this.form.contract_to_contracts.splice(this.form.contract_to_contracts.findIndex(j => j.to_contract_id === i.id),1) this.$refs['contractToContractsTable']?.toggleRowSelection(this.$refs['contractToContractsTable']?.getSelection().find(j => i.id === j.id),true) }, + + async getDetail () { + const res = await detailContract({ + id: this.contractId + }) + this.form = { + type: res?.type, + is_plan: res?.is_plan, + purchase_type_id: res?.purchase_type_id, + is_contract: res?.is_contract, + purchase_way_id: res?.purchase_way_id, + money_way_id: res?.money_way_id, + plan_price: Number(res?.plan_price), + name: res?.name, + contract_plan_links: [], + is_simple: res?.is_simple, + supply: res?.supply, + money: Number(res?.money), + status: res?.status, + is_framework: res?.is_framework, + use_framework_buy: res?.use_framework_buy, + content: res?.content, + contract_to_contracts: [], + } + console.log(this.form) + } }, computed: { isLedger () { @@ -1618,7 +1644,10 @@ export default { next(vm => { const { contractId } = to.query vm.contractId = contractId; - if (contractId) vm.setType('edit'); + if (contractId) { + vm.setType('edit') + vm.getDetail() + } }) } }; diff --git a/src/views/contract/contractList.vue b/src/views/contract/contractList.vue index a4d1d40..3ef3b03 100644 --- a/src/views/contract/contractList.vue +++ b/src/views/contract/contractList.vue @@ -272,7 +272,6 @@ 查看 + + + + - - - - - - - - - - - -