From 9ffdca6f6812ab4764f002e23351466d7bc02383 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Wed, 24 Apr 2024 15:08:14 +0800
Subject: [PATCH 1/2] =?UTF-8?q?feat:=20mpoint=20form=E6=B7=BB=E5=8A=A0can?=
 =?UTF-8?q?=5Fmanual?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/em/mpoint_form.vue | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/views/em/mpoint_form.vue b/src/views/em/mpoint_form.vue
index 2330862c..5e1912b9 100644
--- a/src/views/em/mpoint_form.vue
+++ b/src/views/em/mpoint_form.vue
@@ -136,6 +136,11 @@
 								></el-input-number>
 							</el-form-item>
 						</el-col>
+						<el-col :md="12" :sm="24">
+							<el-form-item label="是否可手动录入" label-width="110">
+								<el-switch v-model="form.can_manual" />
+							</el-form-item>
+						</el-col>
 						<el-col :md="12" :sm="24">
 							<el-form-item
 								label="是否表示所监测设备的运行状态"

From 6c0703eac1677d6cf7c2dee69f7120d192dd2a49 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Wed, 24 Apr 2024 15:19:54 +0800
Subject: [PATCH 2/2] =?UTF-8?q?feat:=20=E5=AE=8C=E5=96=84productTypeEnum?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/enum.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/utils/enum.js b/src/utils/enum.js
index a3808f28..49ede02c 100644
--- a/src/utils/enum.js
+++ b/src/utils/enum.js
@@ -71,6 +71,7 @@ export const mioTypeEnum = new EnumFactory({
     'other_out': '其他出库'
 })
 export const productTypeEnum = new EnumFactory({
+    0: '电/水/气',
     10: '成品',
     20: '半成品',
     30: '主要原料',