From 26b93e84d4153039ef3600355308d2a743dc3be7 Mon Sep 17 00:00:00 2001
From: renkang <8417338+k94314517@user.noreply.gitee.com>
Date: 星期一, 23 十二月 2024 09:25:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/.env | 2
admin/src/views/contract/components/contractEdit.vue | 16 +++++++
admin/src/views/finance/components/details.vue | 75 ++++++++++++++++++++-----------------
admin/.env.development | 8 ++--
admin/src/views/finance/components/bullEditFu.vue | 4 +-
5 files changed, 63 insertions(+), 42 deletions(-)
diff --git a/admin/.env b/admin/.env
index 6aaad6a..2ec7c8a 100644
--- a/admin/.env
+++ b/admin/.env
@@ -3,7 +3,7 @@
# 璺敱鏂瑰紡
VUE_APP_ROUTER_MODE = 'hash'
-# 椤圭洰涓婁笅鏂囪矾寰�
+# 椤圭洰涓婁笅鏂囪矾寰�
VUE_APP_CONTEXT_PATH = '/fn_admin'
# 鎺ュ彛鍓嶇紑
diff --git a/admin/.env.development b/admin/.env.development
index a124a35..e812482 100644
--- a/admin/.env.development
+++ b/admin/.env.development
@@ -3,8 +3,8 @@
# 椤圭洰涓婁笅鏂囪矾寰�
VUE_APP_CONTEXT_PATH = './'
-#VUE_APP_API_URL = 'http://localhost:10010'
-VUE_APP_API_URL = 'http://192.168.0.163:10010'
-# VUE_APP_API_URL = 'https://dmtest.ahapp.net/fn_admin'
-# VUE_APP_API_URL = 'http://10.50.250.253:8088/gateway_interface'
+# VUE_APP_API_URL = 'http://localhost:10010'
+# VUE_APP_API_URL = 'http://192.168.0.163:10010'
+VUE_APP_API_URL = 'https://dmtest.ahapp.net/fn_admin'
+# VUE_APP_API_URL = 'http://10.50.250.253:8088/gateway_interface'
diff --git a/admin/src/views/contract/components/contractEdit.vue b/admin/src/views/contract/components/contractEdit.vue
index a2ae60c..a441200 100644
--- a/admin/src/views/contract/components/contractEdit.vue
+++ b/admin/src/views/contract/components/contractEdit.vue
@@ -295,7 +295,7 @@
</div>
</div>
</div>
- <div class="window__footer" style="position: sticky; bottom: 0; left: 0; z-index: 9; background: #ffffff;">
+ <div class="window__footer">
<slot name="footer">
<el-button @click="confirm" :loading="confirmWorking" type="primary">{{activeTabs === 0 ? '涓嬩竴姝�' : '鎻愪氦'}}</el-button>
<slot name="btns" />
@@ -841,6 +841,7 @@
close () {
if (this.activeTabs === 0) {
this.$emit('close')
+ this.visible = false
} else {
this.activeTabs = 0
this.zlList = []
@@ -860,6 +861,19 @@
left: 0;
z-index: 999;
}
+.window__footer {
+ position: absolute;
+ width: 100%;
+ bottom: 0;
+ left: 0;
+ z-index: 9;
+ background: #ffffff;
+ user-select: none;
+ border-top: 1px solid #eee;
+ height: 60px;
+ line-height: 60px;
+ text-align: center;
+}
.tabs {
border-bottom: 1px solid #DFE2E8;
display: flex;
diff --git a/admin/src/views/finance/components/bullEditFu.vue b/admin/src/views/finance/components/bullEditFu.vue
index 723cd41..3c1007e 100644
--- a/admin/src/views/finance/components/bullEditFu.vue
+++ b/admin/src/views/finance/components/bullEditFu.vue
@@ -30,7 +30,7 @@
<el-option :value="0" label="绉熻祦璐�"></el-option>
<el-option :value="1" label="鐗╀笟璐�"></el-option>
<el-option :value="2" label="绉熻祦鎶奸噾"></el-option>
- <el-option :value="3" label="鐗╀笟璇侀噾"></el-option>
+ <el-option :value="3" label="鐗╀笟鎶奸噾"></el-option>
<el-option :value="4" label="姘寸數璐�"></el-option>
<el-option :value="5" label="鏉傞」璐�"></el-option>
<el-option :value="6" label="鍏朵粬"></el-option>
@@ -210,7 +210,7 @@
this.$refs.selectHouse.open('閫夋嫨鎴挎簮', { contractId: this.form.contractId, type: 0 })
},
getCompanyList () {
- companyList({})
+ companyList({ type: 2 })
.then(res => {
this.comparyList = res
})
diff --git a/admin/src/views/finance/components/details.vue b/admin/src/views/finance/components/details.vue
index e8ff47b..42ad3b1 100644
--- a/admin/src/views/finance/components/details.vue
+++ b/admin/src/views/finance/components/details.vue
@@ -1,41 +1,43 @@
<template>
<GlobalWindow :title="title" :withFooter="false" :visible.sync="visible" :confirm-working="isWorking" @close="close"
@confirm="confirm">
- <div class="home_title">
- <div class="left">
- <span class="mr10">瀵规柟鍗曚綅鍚嶇О锛歿{info.customerName}}</span>
- <el-tag type="success" v-if="info.status === 0">寮�鍚�</el-tag>
- <el-tag type="info" v-if="info.status === 1">鍏抽棴</el-tag>
+ <div style="position: sticky; top: 0; left: 0; width: 100%; background: #ffffff;">
+ <div class="home_title">
+ <div class="left">
+ <span class="mr10">瀵规柟鍗曚綅鍚嶇О锛歿{info.customerName}}</span>
+ <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="isShow(info.status, info.contractStatus)" @click="closeDW()">鍏抽棴娴佹按</el-button>
</div>
- <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">
- <div class="list" style="background: rgba(0,0,0,0); padding: 0; margin-bottom: 0;">
- <div class="item" style="flex: 1;">
- <div class="la">缁撴竻鐘舵��</div>
- <div class="val" style="margin-top: 10px;" v-if="info1.payStatus === 0">寰呮敹娆�</div>
- <div class="val" style="margin-top: 10px;" v-if="info1.payStatus === 1">宸茬粨娓�</div>
- <div class="val" style="margin-top: 10px;" v-if="info1.payStatus === 2">閮ㄥ垎缁撴竻</div>
- <div class="val" style="margin-top: 10px;" v-if="info1.payStatus === 3">寰呬粯娆�</div>
- <div class="val" style="margin-top: 10px;" v-if="info1.payStatus === 4">寰呴��娆�</div>
- <div class="val" style="margin-top: 10px;" v-if="info1.payStatus === 5">宸插叧闂�</div>
- </div>
- <div class="item" style="flex: 1;">
- <div class="la">搴攞{info.revenueType === 0 ? '鏀�' : '浠�'}}閲戦锛堝厓锛�</div>
- <div class="val" style="margin-top: 10px;">{{info1.receivableFee}}</div>
- </div>
- <div class="item" style="flex: 1;">
- <div class="la">瀹瀧{info.revenueType === 0 ? '鏀�' : '浠�'}}閲戦锛堝厓锛�</div>
- <div class="val" style="margin-top: 10px;">{{info1.actReceivableFee}}</div>
- </div>
- <div class="item" style="flex: 1;">
- <div class="la">闇�{{info.revenueType === 0 ? '鏀�' : '浠�'}}閲戦锛堝厓锛�</div>
- <div class="val" style="margin-top: 10px;">{{info1.needReceivableFee}}</div>
- </div>
- <div class="item" style="flex: 1;">
- <div class="la">搴攞{info.revenueType === 0 ? '鏀�' : '浠�'}}鏃ユ湡</div>
- <div class="val" style="margin-top: 10px;">{{info1.planPayDate}}</div>
+ <div class="line"></div>
+ <div class="main">
+ <div class="list" style="background: rgba(0,0,0,0); padding: 0; margin-bottom: 0;">
+ <div class="item" style="flex: 1;">
+ <div class="la">缁撴竻鐘舵��</div>
+ <div class="val" style="margin-top: 10px;" v-if="info1.payStatus === 0">寰呮敹娆�</div>
+ <div class="val" style="margin-top: 10px;" v-if="info1.payStatus === 1">宸茬粨娓�</div>
+ <div class="val" style="margin-top: 10px;" v-if="info1.payStatus === 2">閮ㄥ垎缁撴竻</div>
+ <div class="val" style="margin-top: 10px;" v-if="info1.payStatus === 3">寰呬粯娆�</div>
+ <div class="val" style="margin-top: 10px;" v-if="info1.payStatus === 4">寰呴��娆�</div>
+ <div class="val" style="margin-top: 10px;" v-if="info1.payStatus === 5">宸插叧闂�</div>
+ </div>
+ <div class="item" style="flex: 1;">
+ <div class="la">搴攞{info.revenueType === 0 ? '鏀�' : '浠�'}}閲戦锛堝厓锛�</div>
+ <div class="val" style="margin-top: 10px;">{{info1.receivableFee}}</div>
+ </div>
+ <div class="item" style="flex: 1;">
+ <div class="la">瀹瀧{info.revenueType === 0 ? '鏀�' : '浠�'}}閲戦锛堝厓锛�</div>
+ <div class="val" style="margin-top: 10px;">{{info1.actReceivableFee}}</div>
+ </div>
+ <div class="item" style="flex: 1;">
+ <div class="la">闇�{{info.revenueType === 0 ? '鏀�' : '浠�'}}閲戦锛堝厓锛�</div>
+ <div class="val" style="margin-top: 10px;">{{info1.needReceivableFee}}</div>
+ </div>
+ <div class="item" style="flex: 1;">
+ <div class="la">搴攞{info.revenueType === 0 ? '鏀�' : '浠�'}}鏃ユ湡</div>
+ <div class="val" style="margin-top: 10px;">{{info1.planPayDate}}</div>
+ </div>
</div>
</div>
</div>
@@ -225,6 +227,11 @@
tabsClick(val) {
this.activeTabs = val
},
+ isShow (status, contractStatus) {
+ if (status === 1) return false
+ if (contractStatus === '3' || contractStatus === '4') return false
+ return true
+ },
closeDW () {
this.$confirm('纭鍏抽棴姝ゆ祦姘村悧?', '鎻愮ず', {
confirmButtonText: '纭畾',
--
Gitblit v1.9.3