From d86ccb2b95f03aaa4e3ef3fdab8f3bda5d965473 Mon Sep 17 00:00:00 2001
From: songshankun <songshankun@foxmail.com>
Date: 星期二, 17 十月 2023 20:38:06 +0800
Subject: [PATCH] Merge branch 'dev' into songshankun/adjust-style
---
src/views/overview/AddOverviewDialog.vue | 47 +++++++++++++++++++++++++++++------------------
1 files changed, 29 insertions(+), 18 deletions(-)
diff --git a/src/views/overview/AddOverviewDialog.vue b/src/views/overview/AddOverviewDialog.vue
index 6f9807e..348a411 100644
--- a/src/views/overview/AddOverviewDialog.vue
+++ b/src/views/overview/AddOverviewDialog.vue
@@ -173,7 +173,7 @@
<el-tab-pane label="鍏朵粬淇℃伅" name="second">
<div class="purchase-view">
<div class="left">
- <div class="second-label">鍏朵粬淇℃伅</div>
+ <!-- <div class="second-label">鍏朵粬淇℃伅</div> -->
<!-- <el-form-item v-if="workType !== 1" label="閫佽揣绛栫暐" prop="client_name">
<el-select
v-model="editConfig.infomation.memberId"
@@ -263,9 +263,9 @@
</div>
</el-form>
<!-- 灏� -->
- <div v-if="showFooter" slot="footer" class="dialog-footer">
+ <div slot="footer" class="dialog-footer">
<!-- <el-button type="primary" size="small" @click="editConfig.visible = false">淇濆苟鎻愪氦瀹℃壒</el-button> -->
- <el-button type="primary" size="small" @click="saveClick('form')">淇濆瓨</el-button>
+ <el-button type="primary" size="small" @click="saveClick('form')" :disabled="!showFooter">淇濆瓨</el-button>
<el-button size="small" @click="editConfig.visible = false">鍙栨秷</el-button>
</div>
</el-dialog>
@@ -409,20 +409,22 @@
},
// 璁剧疆鍒犻櫎/鎵撳嵃/缂栬緫鏄惁鏄剧ず
setBottonView() {
+ console.log(this.editConfig.infomation.status)
if (this.editConfig.title === "鏂板缓") {
this.showButton = false
this.showEdit = false
this.showFooter = true
this.isValidateClick = false
- } else if (
- this.editConfig.title === "鏌ョ湅" &&
- (this.editConfig.infomation.status !== 4 || this.editConfig.infomation.status !== "瀹屾垚")
- ) {
+ } else if (this.editConfig.title === "鏌ョ湅" && this.editConfig.infomation.status !== 4) {
this.showButton = true
this.showEdit = false
this.isDelClick = true
this.showFooter = false
- this.isValidateClick = true
+ if (this.editConfig.infomation.status === "瀹屾垚") {
+ this.isValidateClick = false
+ } else {
+ this.isValidateClick = true
+ }
} else if (this.editConfig.infomation.status === 4 || this.editConfig.infomation.status === "瀹屾垚") {
this.showButton = true
this.showEdit = false
@@ -545,7 +547,11 @@
},
// 鎿嶄綔鍒楄〃
setTableForm() {
- if (this.editConfig.title !== "鏂板缓") {
+ if (
+ this.editConfig.title !== "鏂板缓" &&
+ this.editConfig.infomation.details &&
+ this.editConfig.infomation.details.length > 0
+ ) {
const list = this.editConfig.infomation.details.map((item) => {
return {
...item,
@@ -716,13 +722,13 @@
height: calc(100% - 80px);
overflow: auto;
margin: 20px;
- border: 1px solid #dcdfe6;
- box-shadow: inset 0 0 2px #dee2e6;
- -moz-box-shadow: inset 0 0 2px #dee2e6;
- -webkit-box-shadow: inset 0 0 2px #dee2e6;
- .basic-info-view {
- margin-top: 20px;
- }
+ // border: 1px solid #dcdfe6;
+ // box-shadow: inset 0 0 2px #dee2e6;
+ // -moz-box-shadow: inset 0 0 2px #dee2e6;
+ // -webkit-box-shadow: inset 0 0 2px #dee2e6;
+ // .basic-info-view {
+ // margin-top: 20px;
+ // }
}
.purchase-view {
display: flex;
@@ -749,13 +755,18 @@
color: #333;
}
}
- .el-tabs--card > .el-tabs__header .el-tabs__nav {
- margin-left: 20px;
+ .el-tabs--card > .el-tabs__header {
+ border-bottom: none;
+ }
+ .el-tabs__item.is-active {
+ color: #fff;
+ background: #2a78fb;
}
.el-tabs__item {
height: 30px;
line-height: 30px;
font-size: 13px;
+ background: #f3f3f3;
}
}
</style>
--
Gitblit v1.8.0