From aa802302cfe650e08806c8b87d5a8c5d3a79ffe1 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期二, 12 五月 2026 04:32:11 +0800
Subject: [PATCH] Merge branch 'dev_河南_鹤壁天沐玻璃厂' of http://114.132.189.42:9002/r/product-inventory-management into dev_河南_鹤壁天沐玻璃厂
---
src/views/equipmentManagement/measurementEquipment/components/formDia.vue | 107 +++++++++++++++++++++++++++++------------------------
1 files changed, 58 insertions(+), 49 deletions(-)
diff --git a/src/views/equipmentManagement/measurementEquipment/components/formDia.vue b/src/views/equipmentManagement/measurementEquipment/components/formDia.vue
index 8a1e302..5a8a448 100644
--- a/src/views/equipmentManagement/measurementEquipment/components/formDia.vue
+++ b/src/views/equipmentManagement/measurementEquipment/components/formDia.vue
@@ -15,11 +15,20 @@
ref="formRef"
>
<el-row :gutter="30">
- <el-col :span="24">
+ <el-col :span="12">
<el-form-item label="鍑哄巶缂栧彿锛�" prop="code">
<el-input
v-model="form.code"
placeholder="璇疯緭鍏�"
+ clearable
+ />
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="璁￠噺鍣ㄥ叿鍚嶇О锛�" prop="name">
+ <el-input
+ v-model="form.name"
+ placeholder="璇疯緭鍏ヨ閲忓櫒鍏峰悕绉�"
clearable
/>
</el-form-item>
@@ -70,7 +79,7 @@
</el-col>
</el-row>
<el-row :gutter="30">
- <el-col :span="12">
+ <!-- <el-col :span="12">
<el-form-item label="鏈夋晥鏃ユ湡(澶�)锛�" prop="valid">
<el-input
v-model="form.valid"
@@ -83,7 +92,7 @@
<template #append>鏃�</template>
</el-input>
</el-form-item>
- </el-col>
+ </el-col> -->
<el-col :span="12">
<el-form-item label="妫�瀹氬懆鏈燂細" prop="cycle">
<el-input
@@ -174,6 +183,7 @@
const data = reactive({
form: {
code: "",
+ name: "",
instationLocation: "",
mostDate:"",
model: "",
@@ -187,6 +197,7 @@
},
rules: {
code: [{required: true, message: "璇疯緭鍏�", trigger: "blur"}],
+ name: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
model: [{required: true, message: "璇疯緭鍏�", trigger: "blur"}],
validDate: [{required: true, message: "璇疯緭鍏�", trigger: "blur"}],
nextDate: [{required: true, message: "璇烽�夋嫨", trigger: "change"}],
@@ -195,32 +206,32 @@
instationLocation: [{required: true, message: "璇疯緭鍏�", trigger: "blur"}],
mostDate: [{required: true, message: "璇烽�夋嫨", trigger: "change"}],
cycle: [{required: true, message: "璇烽�夋嫨", trigger: "blur"}],
- valid: [
- {required: true, message: "璇疯緭鍏�", trigger: "blur"},
- {
- validator: (rule, value, callback) => {
- if (value === '' || value === null || value === undefined) {
- callback();
- return;
- }
- const numValue = Number(value);
- if (isNaN(numValue)) {
- callback(new Error('璇疯緭鍏ユ湁鏁堢殑鏁板瓧'));
- return;
- }
- if (numValue <= 0) {
- callback(new Error('鍙兘杈撳叆姝ｆ暟'));
- return;
- }
- if (!Number.isInteger(numValue)) {
- callback(new Error('璇疯緭鍏ユ暣鏁�'));
- return;
- }
- callback();
- },
- trigger: 'blur'
- }
- ],
+ // valid: [
+ // {required: true, message: "璇疯緭鍏�", trigger: "blur"},
+ // {
+ // validator: (rule, value, callback) => {
+ // if (value === '' || value === null || value === undefined) {
+ // callback();
+ // return;
+ // }
+ // const numValue = Number(value);
+ // if (isNaN(numValue)) {
+ // callback(new Error('璇疯緭鍏ユ湁鏁堢殑鏁板瓧'));
+ // return;
+ // }
+ // if (numValue <= 0) {
+ // callback(new Error('鍙兘杈撳叆姝ｆ暟'));
+ // return;
+ // }
+ // if (!Number.isInteger(numValue)) {
+ // callback(new Error('璇疯緭鍏ユ暣鏁�'));
+ // return;
+ // }
+ // callback();
+ // },
+ // trigger: 'blur'
+ // }
+ // ],
unit: [{required: true, message: "璇疯緭鍏�", trigger: "blur"}],
}
})
@@ -282,26 +293,24 @@
}
}
-// 澶勭悊鏈夋晥鏃ユ湡杈撳叆锛屽彧鍏佽姝ｆ暣鏁�
-const handleValidInput = (value) => {
- if (value === '' || value === null || value === undefined) {
- form.value.valid = '';
- return;
- }
- // 杞崲涓哄瓧绗︿覆骞剁Щ闄ゆ墍鏈夐潪鏁板瓧瀛楃锛堝寘鎷礋鍙枫�佸皬鏁扮偣绛夛級
- const numStr = String(value).replace(/[^0-9]/g, '');
- if (numStr === '') {
- form.value.valid = '';
- return;
- }
- const numValue = parseInt(numStr, 10);
- // 纭繚鏄鏁存暟锛堝ぇ浜�0锛�
- if (numValue > 0 && !isNaN(numValue)) {
- form.value.valid = numValue;
- } else {
- form.value.valid = '';
- }
-}
+// 澶勭悊鏈夋晥鏃ユ湡杈撳叆锛屽彧鍏佽姝ｆ暣鏁帮紙宸叉敞閲娿�屾湁鏁堟棩鏈熴�嶈〃鍗曢」锛屼繚鐣欎究浜庢仮澶嶏級
+// const handleValidInput = (value) => {
+// if (value === '' || value === null || value === undefined) {
+// form.value.valid = '';
+// return;
+// }
+// const numStr = String(value).replace(/[^0-9]/g, '');
+// if (numStr === '') {
+// form.value.valid = '';
+// return;
+// }
+// const numValue = parseInt(numStr, 10);
+// if (numValue > 0 && !isNaN(numValue)) {
+// form.value.valid = numValue;
+// } else {
+// form.value.valid = '';
+// }
+// }
const submitForm = () => {
proxy.$refs["formRef"].validate(valid => {
--
Gitblit v1.9.3