From a7db7823a897726e3692077729880f24a2c1314c Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期日, 01 十二月 2024 22:26:33 +0800
Subject: [PATCH] 开发
---
admin/.env | 4 ++--
admin/src/views/login.vue | 4 ++--
admin/src/views/contract/components/terminateLease.vue | 4 ++++
admin/src/views/finance/payments.vue | 2 +-
admin/src/views/finance/components/flowingWater.vue | 1 +
admin/src/views/contract/components/addCollectionBill.vue | 12 ++++++++++--
admin/src/views/finance/components/bullDetail.vue | 5 ++++-
admin/.env.production | 2 +-
admin/src/views/contract/contractList.vue | 8 ++++----
admin/src/views/finance/bull.vue | 7 ++++++-
10 files changed, 35 insertions(+), 14 deletions(-)
diff --git a/admin/.env b/admin/.env
index 1b78e31..2ec7c8a 100644
--- a/admin/.env
+++ b/admin/.env
@@ -4,10 +4,10 @@
VUE_APP_ROUTER_MODE = 'hash'
# 椤圭洰涓婁笅鏂囪矾寰�
-VUE_APP_CONTEXT_PATH = '/admin'
+VUE_APP_CONTEXT_PATH = '/fn_admin'
# 鎺ュ彛鍓嶇紑
VUE_APP_API_PREFIX = '/gateway_interface'
# 椤圭洰鍚嶇О
-VUE_APP_TITLE = '绉熻祦骞冲彴'
+VUE_APP_TITLE = '鏅烘収鍦洪杩愮淮绠＄悊绯荤粺'
diff --git a/admin/.env.production b/admin/.env.production
index 92c5c4d..3bc09c8 100644
--- a/admin/.env.production
+++ b/admin/.env.production
@@ -1,4 +1,4 @@
# 鐢熶骇鐜閰嶇疆
NODE_ENV = 'production'
-# VUE_APP_API_URL = 'http://192.168.0.173/gateway_interface'
+# VUE_APP_API_URL = 'https://dmtest.ahapp.net/gateway_interface'
diff --git a/admin/src/views/contract/components/addCollectionBill.vue b/admin/src/views/contract/components/addCollectionBill.vue
index a67dc5b..23a35cb 100644
--- a/admin/src/views/contract/components/addCollectionBill.vue
+++ b/admin/src/views/contract/components/addCollectionBill.vue
@@ -37,8 +37,7 @@
type="daterange"
range-separator="鑷�"
v-model="form.date"
- :min-date="new Date(time.startDate)"
- :max-date="new Date(time.endDate)"
+ :picker-options="pickerOptions"
@change="changeDate"
start-placeholder="寮�濮嬫棩鏈�"
end-placeholder="缁撴潫鏃ユ湡"
@@ -111,6 +110,7 @@
billTypeCopy: 0,
date: []
},
+ pickerOptions: {},
time: {
startDate: '',
endDate: ''
@@ -146,6 +146,14 @@
this.title = title
this.time.startDate = time.startDate
this.time.endDate = time.endDate
+ this.pickerOptions = {
+ disabledDate(time) {
+ // 濡傛灉娌℃湁鍚庨潰鐨� -8.64e7 灏辨槸涓嶅彲浠ラ�夋嫨浠婂ぉ鐨�
+ const beginDate = new Date(time.startDate).getTime() - 8.64e7
+ const endDate = new Date(time.endDate).getTime() - 8.64e7
+ return beginDate > time.getTime() || endDate < time.getTime()
+ }
+ }
this.getCompany()
this.visible = true
// 鏂板缓
diff --git a/admin/src/views/contract/components/terminateLease.vue b/admin/src/views/contract/components/terminateLease.vue
index 982e7f0..31fda94 100644
--- a/admin/src/views/contract/components/terminateLease.vue
+++ b/admin/src/views/contract/components/terminateLease.vue
@@ -28,6 +28,7 @@
<el-date-picker
v-model="form.btDate"
type="date"
+ @change="changeBtDate"
value-format="yyyy-MM-dd"
placeholder="璇烽�夋嫨">
</el-date-picker>
@@ -268,6 +269,9 @@
this.title = title
this.info = info
this.form.id = info.id
+ this.$nextTick(() => {
+ this.$refs.form.resetFields()
+ })
this.info.canBackRentBills.forEach(item => {
this.$set(item, 'receivableFeeCopy', item.receivableFee)
this.$set(item, 'receivableFee', item.needReceivableFee)
diff --git a/admin/src/views/contract/contractList.vue b/admin/src/views/contract/contractList.vue
index ca11e0c..d4709f6 100644
--- a/admin/src/views/contract/contractList.vue
+++ b/admin/src/views/contract/contractList.vue
@@ -2,7 +2,7 @@
<div class="main_app">
<QueryForm v-model="filters" :query-form-config="queryFormConfig" @handleQuery="getList(1)" @clear="clear">
<template #btns>
- <el-button>瀵煎嚭</el-button>
+<!-- <el-button @click="exportData">瀵煎嚭</el-button>-->
</template>
</QueryForm>
<div class="mt10">
@@ -135,10 +135,10 @@
},
handleSizeChange (capacity) {
this.pagination.pageSize = capacity
+ },
+ exportData () {
+
}
}
}
</script>
-
-<style>
-</>
diff --git a/admin/src/views/finance/bull.vue b/admin/src/views/finance/bull.vue
index 4f502d9..4c7923a 100644
--- a/admin/src/views/finance/bull.vue
+++ b/admin/src/views/finance/bull.vue
@@ -9,7 +9,7 @@
<div class="btns">
<el-button type="primary" @click="addOpen" icon="el-icon-plus"
v-permissions="['business:ywpatrolline:create']">鏂板缓</el-button>
- <el-button @click="handleDetail" v-permissions="['business:ywpatrolline:create']">瀵煎嚭</el-button>
+<!-- <el-button @click="handleDetail" v-permissions="['business:ywpatrolline:create']">瀵煎嚭</el-button>-->
</div>
</div>
<el-table v-loading="loading" :data="list" stripe>
@@ -124,6 +124,11 @@
label: '瀹㈡埛鍚嶇О'
},
{
+ filed: 'contractCode',
+ type: 'input',
+ label: '鍚堝悓缂栧彿'
+ },
+ {
filed: 'status',
type: 'select',
label: '璐﹀崟鐘舵��',
diff --git a/admin/src/views/finance/components/bullDetail.vue b/admin/src/views/finance/components/bullDetail.vue
index 844888d..bfea17f 100644
--- a/admin/src/views/finance/components/bullDetail.vue
+++ b/admin/src/views/finance/components/bullDetail.vue
@@ -182,7 +182,7 @@
</div>
</div>
<!-- 鍒涘缓娴佹按 -->
- <FlowingWater ref="flowingWater" @success="getDetails" />
+ <FlowingWater ref="flowingWater" @success="getDetails" @refresh="Refresh" />
</GlobalWindow>
</template>
@@ -219,6 +219,9 @@
this.visible = true
})
},
+ Refresh () {
+ this.$emit('success')
+ },
tabsClick(val) {
this.activeTabs = val
},
diff --git a/admin/src/views/finance/components/flowingWater.vue b/admin/src/views/finance/components/flowingWater.vue
index 827e578..d011587 100644
--- a/admin/src/views/finance/components/flowingWater.vue
+++ b/admin/src/views/finance/components/flowingWater.vue
@@ -144,6 +144,7 @@
this.visible = false
this.$tip.apiSuccess('鍒涘缓鎴愬姛')
this.$emit('success')
+ this.$emit('refresh')
})
.finally(() => {
this.isWorking = false
diff --git a/admin/src/views/finance/payments.vue b/admin/src/views/finance/payments.vue
index ce5fd22..63c2576 100644
--- a/admin/src/views/finance/payments.vue
+++ b/admin/src/views/finance/payments.vue
@@ -2,7 +2,7 @@
<div class="main_app">
<QueryForm v-model="filters" :query-form-config="queryFormConfig" @handleQuery="getList(1)" @clear="clear" />
<div class="mt20">
- <el-button v-permissions="['business:ywpatrolline:create']">瀵煎嚭</el-button>
+<!-- <el-button v-permissions="['business:ywpatrolline:create']">瀵煎嚭</el-button>-->
</div>
<el-table v-loading="loading" :data="list" stripe>
<el-table-column prop="customerName" label="瀹㈡埛鍚嶇О" min-width="100" show-overflow-tooltip />
diff --git a/admin/src/views/login.vue b/admin/src/views/login.vue
index 819ab49..ddcbbeb 100644
--- a/admin/src/views/login.vue
+++ b/admin/src/views/login.vue
@@ -3,8 +3,8 @@
<img src="@/assets/images/bg@2x.png" class="main_bg" alt="">
<div class="login_wrap">
<div class="login_img">
- <div class="h3">闃滃畞鏂囦綋涓績</div>
-<!-- <div class="h3">鏅烘収鍦洪杩愮淮绠＄悊绯荤粺</div>-->
+<!-- <div class="h3">闃滃畞鏂囦綋涓績</div>-->
+ <div class="h3">鏅烘収鍦洪杩愮淮绠＄悊绯荤粺</div>
</div>
<div class="form_wrap">
<div class="tabs">
--
Gitblit v1.9.3