Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web

2024-04-24 15:42:46 +08:00 · 2024-04-24 15:42:46 +08:00 · 241f14c324
parent 6fb1ff7b17 6c0703eac1
commit 241f14c324
2 changed files with 6 additions and 0 deletions
--- 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: '主要原料',
--- 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="是否表示所监测设备的运行状态"