From 2ab9e3e914b6c29a3ab34d7b73113e751e113f0f Mon Sep 17 00:00:00 2001 From: songshankun <songshankun@foxmail.com> Date: 星期五, 20 十月 2023 10:46:37 +0800 Subject: [PATCH] Merge branch 'dev' into songshankun/adjust-style --- src/views/overview/AddOverviewDialog.vue | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/overview/AddOverviewDialog.vue b/src/views/overview/AddOverviewDialog.vue index 54a2cf0..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="璇烽�夋嫨" @@ -571,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