From 4e2bb29096ac63837f8d2c5e25766ee094f45d6c Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期三, 27 十二月 2023 14:35:49 +0800
Subject: [PATCH] modified: src/page/index/top/index.vue modified: src/views/common/part.vue modified: src/views/equipment/equipment/index.vue modified: src/views/equipment/metering/index.vue modified: src/views/plan/manufacturingorder/auto-operationtask.vue modified: src/views/plan/operationtask/operationtask-form.vue modified: src/views/quality/Packaging_ledger/index.vue modified: src/views/quality/packageinspect/index.vue modified: src/views/quality/processconfiguration/index.vue modified: src/views/quality/teststandard/index.vue modified: vue.config.js
---
src/views/equipment/metering/metering-form.vue | 86 ++++++++++++++++--------------------------
1 files changed, 33 insertions(+), 53 deletions(-)
diff --git a/src/views/equipment/metering/metering-form.vue b/src/views/equipment/metering/metering-form.vue
index 2fc95b7..ca38b67 100644
--- a/src/views/equipment/metering/metering-form.vue
+++ b/src/views/equipment/metering/metering-form.vue
@@ -24,44 +24,23 @@
</el-col>
<el-col :span="12">
<el-form-item label="鏍″噯鏃堕棿" prop="createTime">
- <el-date-picker
- v-model="dataForm.createTime"
- align="right"
- type="date"
- placeholder="鏍″噯鏃堕棿"
- :picker-options="pickerOptions">
- </el-date-picker>
+ <el-date-picker
+ v-model="dataForm.createTime"
+ type="datetime"
+ placeholder="鏍″噯鏃堕棿">
+ </el-date-picker>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="鍒版湡鏃堕棿" prop="updateTime">
+ <el-date-picker
+ v-model="dataForm.updateTime"
+ type="datetime"
+ placeholder="鏍″噯鍒版湡鏃堕棿">
+ </el-date-picker>
</el-form-item>
</el-col>
- <el-col :span="12">
- <el-form-item label="鏍″噯鍒版湡鏃堕棿" prop="updateTime">
- <el-date-picker
- v-model="dataForm.updateTime"
- align="right"
- type="date"
- placeholder="鏍″噯鍒版湡鏃堕棿"
- :picker-options="pickerOptions">
- </el-date-picker>
- </el-form-item>
- </el-col>
- <!-- <el-col :span="12">
- <el-form-item label="绫诲瀷" prop="type">
- <el-select
- v-model="dataForm.type"
- filterable
- placeholder="璇烽�夋嫨"
- style="width:100%"
- >
- <el-option
- v-for="item in workshopList"
- :key="item.id"
- :label="item.label"
- :value="item.value"
- >
- </el-option>
- </el-select>
- </el-form-item>
- </el-col> -->
+
<el-col :span="12">
<el-form-item label="璐ｄ换浜�" prop="createUser">
<el-input
@@ -79,7 +58,7 @@
></el-input>
</el-form-item>
</el-col>
-
+
<el-col :span="12">
<el-form-item label="璐ｄ换閮ㄩ棬" prop="responsibleDepartment">
<el-input
@@ -111,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
@@ -119,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
@@ -127,8 +106,8 @@
placeholder="瀹氱偣浣嶇疆"
></el-input>
</el-form-item>
- </el-col>
-
+ </el-col>
+
<!-- <el-col :span="12">
@@ -168,13 +147,10 @@
export default {
data() {
return {
-
pickerOptions: {
disabledDate(time) {
return time.getTime() > Date.now();
- }
- },
-
+ },},
// options: regionData,
visible: false,
dataForm: {
@@ -191,17 +167,22 @@
manufactureDate: '',
installDate: '',
// state: '',
+ verification:'',
+ inspectionUnit:'',
specifications:'',
responsibleDepartment:'',
- // createUser:'',
+ classification:'',
+ createUser:'',
status:'',
-
-
+ updateTime:'',
+ createTime:'',
description: '',
value1: '',
+ certificate:'',
+ fixedPointPosition:'',
code: null,
// type: null,
- // status: null,
+ status: null,
supplier: null
},
dataRule: {
@@ -269,7 +250,7 @@
}
})
},
-
+
initFactorySelect() {
loadFactoryList().then((res) => {
this.factoryOptions = res.data
@@ -279,11 +260,11 @@
})
}
},
-
+
created() {
this.initFactorySelect()
this.getEquipmentState()
-
+
// remote('work_shop').then((response) => {
// if (response.data.code === 0) {
// this.workshopList = response.data.data
@@ -294,4 +275,3 @@
}
}
</script>
-
\ No newline at end of file
--
Gitblit v1.9.3