From 62dd7a29fb929865cfcd72e8412beb3b5d41a7fc Mon Sep 17 00:00:00 2001
From: zzq <a13193816592@163.com>
Date: 星期四, 28 九月 2023 15:25:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zzq'
---
src/views/overview/AddOverviewDialog.vue | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/src/views/overview/AddOverviewDialog.vue b/src/views/overview/AddOverviewDialog.vue
index cc0d9d5..8b6c479 100644
--- a/src/views/overview/AddOverviewDialog.vue
+++ b/src/views/overview/AddOverviewDialog.vue
@@ -108,7 +108,7 @@
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="鍏ュ簱绫诲瀷">
+ <el-form-item label="鍏ュ簱绫诲瀷" prop="operationTypeId">
<el-select
v-if="showOperationType"
v-model="editConfig.infomation.operationTypeId"
@@ -317,7 +317,8 @@
sourceNumber: [{ required: true, message: "璇疯緭鍏ユ潵婧愬崟鎹�", trigger: "blur" }],
operationDate: [{ required: true, message: "璇烽�夋嫨鏃ユ湡", trigger: "change" }],
toLocationId: [{ required: true, message: "璇烽�夋嫨浠撳簱浣嶇疆", trigger: "change" }],
- fromLocationId: [{ required: true, message: "璇烽�夋嫨婧愪綅缃�", trigger: "change" }]
+ fromLocationId: [{ required: true, message: "璇烽�夋嫨婧愪綅缃�", trigger: "change" }],
+ operationTypeId: [{ required: true, message: "璇烽�夋嫨鍏ュ簱绫诲瀷", trigger: "change" }]
},
companyOptions: [], // 鍏徃
memberOptions: [{ id: 1, name: "绠＄悊鍛�" }],
@@ -410,7 +411,7 @@
this.showEdit = false
this.showFooter = true
this.isValidateClick = false
- } else if (this.editConfig.infomation.status === 4) {
+ } else if (this.editConfig.infomation.status === 4||this.editConfig.infomation.status === "瀹屾垚") {
this.showButton = true
this.showEdit = false
this.isDelClick = true
@@ -422,6 +423,7 @@
this.showFooter = false
this.isValidateClick = false
} else {
+ // 灏辩华---
this.showButton = true
this.showEdit = true
this.showFooter = false
@@ -431,7 +433,8 @@
this.list[0].status = "active"
} else {
this.list.map((item) => {
- if (item.value === this.editConfig.infomation.status) {
+ console.log(item,this.editConfig.infomation.status,"鎵撳嵃淇℃伅")
+ if (item.value === this.editConfig.infomation.status||item.label===this.editConfig.infomation.status) {
item.status = "active"
} else {
item.status = "todo"
--
Gitblit v1.8.0