From 0574b9145e131043eb2f3c8867ef3aea4ab3a86e Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期五, 06 十二月 2024 18:14:08 +0800
Subject: [PATCH] 改bug
---
admin/src/views/contract/components/contractEdit.vue | 2 ++
admin/src/views/finance/components/details.vue | 6 +++---
admin/.env.test | 2 +-
admin/src/views/finance/components/bullEdit.vue | 2 +-
4 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/admin/.env.test b/admin/.env.test
index 8690fa3..b641171 100644
--- a/admin/.env.test
+++ b/admin/.env.test
@@ -7,7 +7,7 @@
# VUE_APP_API_URL = 'http://192.168.0.163:10010/'
# 钀嶅
-VUE_APP_API_URL = 'http://192.168.0.105:10010/'
+VUE_APP_API_URL = 'http://192.168.0.108:10010/'
# 娴嬭瘯鏈嶅姟
# VUE_APP_API_URL = 'https://dmtest.ahapp.net/gateway_interface'
diff --git a/admin/src/views/contract/components/contractEdit.vue b/admin/src/views/contract/components/contractEdit.vue
index cc88366..a2ae60c 100644
--- a/admin/src/views/contract/components/contractEdit.vue
+++ b/admin/src/views/contract/components/contractEdit.vue
@@ -843,6 +843,8 @@
this.$emit('close')
} else {
this.activeTabs = 0
+ this.zlList = []
+ this.wyList = []
}
}
}
diff --git a/admin/src/views/finance/components/bullEdit.vue b/admin/src/views/finance/components/bullEdit.vue
index de28758..acf1da2 100644
--- a/admin/src/views/finance/components/bullEdit.vue
+++ b/admin/src/views/finance/components/bullEdit.vue
@@ -219,7 +219,7 @@
this.$refs.selectHouse.open('閫夋嫨鎴挎簮', { contractId: this.form.contractId, type: 0 })
},
getCompanyList () {
- companyList({})
+ companyList({ type: 2, status: 0 })
.then(res => {
this.comparyList = res
})
diff --git a/admin/src/views/finance/components/details.vue b/admin/src/views/finance/components/details.vue
index f349cc1..e8ff47b 100644
--- a/admin/src/views/finance/components/details.vue
+++ b/admin/src/views/finance/components/details.vue
@@ -7,7 +7,7 @@
<el-tag type="success" v-if="info.status === 0">寮�鍚�</el-tag>
<el-tag type="info" v-if="info.status === 1">鍏抽棴</el-tag>
</div>
- <el-button type="danger" v-if="info.status === 0" @click="closeDW()">鍏抽棴娴佹按</el-button>
+ <el-button type="danger" v-if="info.status !== 1 || !['3','4'].includes(info.contractStatus)" @click="closeDW()">鍏抽棴娴佹按</el-button>
</div>
<div class="line"></div>
<div class="main">
@@ -225,13 +225,13 @@
tabsClick(val) {
this.activeTabs = val
},
- closeDW (id) {
+ closeDW () {
this.$confirm('纭鍏抽棴姝ゆ祦姘村悧?', '鎻愮ず', {
confirmButtonText: '纭畾',
cancelButtonText: '鍙栨秷',
type: 'warning'
}).then(() => {
- close(id)
+ close(this.info.id)
.then(res => {
this.getDetails()
})
--
Gitblit v1.9.3