From ae760880186edef869f91e3ee97dee5788aab464 Mon Sep 17 00:00:00 2001
From: yangfeng <wanwan926_4@163.com>
Date: 星期四, 19 十月 2023 17:53:53 +0800
Subject: [PATCH] bug修复(5316 5317)

---
 src/views/overview/AddOverviewDialog.vue |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/views/overview/AddOverviewDialog.vue b/src/views/overview/AddOverviewDialog.vue
index 4b8465d..ee6d7c4 100644
--- a/src/views/overview/AddOverviewDialog.vue
+++ b/src/views/overview/AddOverviewDialog.vue
@@ -46,7 +46,7 @@
             <el-row>
               <el-col :span="12">
                 <el-form-item prop="companyName">
-                  <span slot="label">{{ workType === 1 ? "瀹㈡埛" : workType === 2 ? "閫佽揣鍦板潃" : "鑱旂郴浜�" }}</span>
+                  <span slot="label">{{ workType === 1 ? "渚涘簲鍟�" : workType === 2 ? "瀹㈡埛" : "鑱旂郴浜�" }}</span>
                   <el-select
                     v-model="editConfig.infomation.companyName"
                     placeholder="璇烽�夋嫨"
@@ -410,9 +410,14 @@
         this.showEdit = false
         this.showFooter = true
         this.isValidateClick = false
-      } else if (this.editConfig.title === "鏌ョ湅" && this.editConfig.infomation.status !== 4) {
+      } else if (this.editConfig.title === "缂栬緫") {
         this.showButton = true
         this.showEdit = false
+        this.isDelClick = true
+        this.showFooter = true
+      } else if (this.editConfig.title === "鏌ョ湅" && this.editConfig.infomation.status !== 4) {
+        this.showButton = true
+        this.showEdit = true
         this.isDelClick = true
         this.showFooter = false
         if (this.editConfig.infomation.status === "瀹屾垚") {
@@ -566,7 +571,7 @@
           // { label: "璇存槑", prop: "number", input: true },
           // { label: "鏃ユ湡", prop: "amount", date: true, isRequird: true },
           // { label: "鎴鏃ユ湡", prop: "price", date: true },
-          { label: "瀹屾垚", prop: "amount", inputFloat: true },
+          { label: "鏁伴噺", prop: "amount", inputFloat: true },
           { label: "璁¢噺鍗曚綅", prop: "unit" }
         ]
       }

--
Gitblit v1.8.0