From 7202d29ba116dcc862cfb6fbd0377afddb03bcee Mon Sep 17 00:00:00 2001 From: zouyu <2723363702@qq.com> Date: 星期四, 09 十一月 2023 17:56:17 +0800 Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before --- src/views/equipment/metering/metering-form.vue | 83 +++++++++++++++++++++++++++++------------ 1 files changed, 59 insertions(+), 24 deletions(-) diff --git a/src/views/equipment/metering/metering-form.vue b/src/views/equipment/metering/metering-form.vue index 2e1ca3e..12aba68 100644 --- a/src/views/equipment/metering/metering-form.vue +++ b/src/views/equipment/metering/metering-form.vue @@ -22,32 +22,33 @@ <el-input v-model="dataForm.name" placeholder="鍚嶇О"></el-input> </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-col :span="12"> + <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="璐d换浜�" prop="createUser"> <el-input v-model="dataForm.createUser" placeholder="璐d换浜�" ></el-input> </el-form-item> - </el-col> --> + </el-col> <el-col :span="12"> <el-form-item label="鍘傚" prop="supplier"> @@ -82,6 +83,31 @@ ></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"> @@ -121,6 +147,10 @@ export default { data() { return { + pickerOptions: { + disabledDate(time) { + return time.getTime() > Date.now(); + },}, // options: regionData, visible: false, dataForm: { @@ -137,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: { -- Gitblit v1.9.3