From c48169d93608ee7f9e7bc41f21d8d470bd5fb44d Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期三, 06 十二月 2023 18:04:50 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before
---
src/views/equipment/metering/metering-form.vue | 19 +++++++++----------
1 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/src/views/equipment/metering/metering-form.vue b/src/views/equipment/metering/metering-form.vue
index 12aba68..ca38b67 100644
--- a/src/views/equipment/metering/metering-form.vue
+++ b/src/views/equipment/metering/metering-form.vue
@@ -40,7 +40,7 @@
</el-date-picker>
</el-form-item>
</el-col>
-
+
<el-col :span="12">
<el-form-item label="璐ｄ换浜�" prop="createUser">
<el-input
@@ -58,7 +58,7 @@
></el-input>
</el-form-item>
</el-col>
-
+
<el-col :span="12">
<el-form-item label="璐ｄ换閮ㄩ棬" prop="responsibleDepartment">
<el-input
@@ -90,7 +90,7 @@
placeholder="妫�瀹�/鏍″噯"
></el-input>
</el-form-item>
- </el-col>
+ </el-col>
<el-col :span="12">
<el-form-item label="鍒嗙被" prop="classification">
<el-input
@@ -98,7 +98,7 @@
placeholder="鍒嗙被"
></el-input>
</el-form-item>
- </el-col>
+ </el-col>
<el-col :span="12">
<el-form-item label="瀹氱偣浣嶇疆" prop="fixedPointPosition">
<el-input
@@ -106,8 +106,8 @@
placeholder="瀹氱偣浣嶇疆"
></el-input>
</el-form-item>
- </el-col>
-
+ </el-col>
+
<!-- <el-col :span="12">
@@ -250,7 +250,7 @@
}
})
},
-
+
initFactorySelect() {
loadFactoryList().then((res) => {
this.factoryOptions = res.data
@@ -260,11 +260,11 @@
})
}
},
-
+
created() {
this.initFactorySelect()
this.getEquipmentState()
-
+
// remote('work_shop').then((response) => {
// if (response.data.code === 0) {
// this.workshopList = response.data.data
@@ -275,4 +275,3 @@
}
}
</script>
-
\ No newline at end of file
--
Gitblit v1.9.3