From e9c423b2bb2ffae3dab2130fab9f11f3c7d8bece Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 17 十一月 2023 10:49:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/equipment/metering/metering-form.vue | 126 +++++++++++++++++++++++++++++++++--------
1 files changed, 101 insertions(+), 25 deletions(-)
diff --git a/src/views/equipment/metering/metering-form.vue b/src/views/equipment/metering/metering-form.vue
index 1d290dd..ca38b67 100644
--- a/src/views/equipment/metering/metering-form.vue
+++ b/src/views/equipment/metering/metering-form.vue
@@ -23,23 +23,33 @@
</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 label="鏍″噯鏃堕棿" prop="createTime">
+ <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="createUser">
+ <el-input
+ v-model="dataForm.createUser"
+ placeholder="璐ｄ换浜�"
+ ></el-input>
</el-form-item>
</el-col>
+
<el-col :span="12">
<el-form-item label="鍘傚" prop="supplier">
<el-input
@@ -48,11 +58,63 @@
></el-input>
</el-form-item>
</el-col>
+
<el-col :span="12">
- <el-form-item label="鐘舵��" prop="state">
- <el-select
+ <el-form-item label="璐ｄ换閮ㄩ棬" prop="responsibleDepartment">
+ <el-input
+ v-model="dataForm.responsibleDepartment"
+ placeholder="璐ｄ换閮ㄩ棬"
+ ></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="鐘舵��" prop="status">
+ <el-input
v-model="dataForm.status"
placeholder="鐘舵��"
+ ></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="瑙勬牸" prop="specifications">
+ <el-input
+ v-model="dataForm.specifications"
+ placeholder="瑙勬牸"
+ ></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="妫�瀹�/鏍″噯" prop="verification">
+ <el-input
+ v-model="dataForm.verification"
+ placeholder="妫�瀹�/鏍″噯"
+ ></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="鍒嗙被" prop="classification">
+ <el-input
+ v-model="dataForm.classification"
+ placeholder="鍒嗙被"
+ ></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="瀹氱偣浣嶇疆" prop="fixedPointPosition">
+ <el-input
+ v-model="dataForm.fixedPointPosition"
+ placeholder="瀹氱偣浣嶇疆"
+ ></el-input>
+ </el-form-item>
+ </el-col>
+
+
+
+ <!-- <el-col :span="12">
+ <el-form-item label="璁惧鐘舵��" prop="status">
+ <el-select
+ v-model="dataForm.status"
+ placeholder="璁惧鐘舵��"
filterable
style="width: 100%"
>
@@ -64,7 +126,7 @@
/>
</el-select>
</el-form-item>
- </el-col>
+ </el-col> -->
</el-row>
</el-form>
<span slot="footer" class="dialog-footer">
@@ -85,6 +147,10 @@
export default {
data() {
return {
+ pickerOptions: {
+ disabledDate(time) {
+ return time.getTime() > Date.now();
+ },},
// options: regionData,
visible: false,
dataForm: {
@@ -100,12 +166,23 @@
typeSpecification: '',
manufactureDate: '',
installDate: '',
- state: '',
+ // state: '',
+ verification:'',
+ inspectionUnit:'',
+ specifications:'',
+ responsibleDepartment:'',
+ classification:'',
+ createUser:'',
+ status:'',
+ updateTime:'',
+ createTime:'',
description: '',
value1: '',
+ certificate:'',
+ fixedPointPosition:'',
code: null,
- type: null,
- status: null,
+ // type: null,
+ status: null,
supplier: null
},
dataRule: {
@@ -173,7 +250,7 @@
}
})
},
-
+
initFactorySelect() {
loadFactoryList().then((res) => {
this.factoryOptions = res.data
@@ -183,11 +260,11 @@
})
}
},
-
+
created() {
this.initFactorySelect()
this.getEquipmentState()
-
+
// remote('work_shop').then((response) => {
// if (response.data.code === 0) {
// this.workshopList = response.data.data
@@ -198,4 +275,3 @@
}
}
</script>
-
\ No newline at end of file
--
Gitblit v1.9.3