From c5fdece0402a774c68a2c7aca41adda83904de42 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期六, 09 五月 2026 14:26:02 +0800
Subject: [PATCH] fix: 计量器具台账去除有效日期字段
---
src/views/equipmentManagement/measurementEquipment/components/rowClickData.vue | 10 +-
src/views/equipmentManagement/measurementEquipment/index.vue | 12 +-
src/views/equipmentManagement/measurementEquipment/components/formDia.vue | 94 +++++++++++------------
src/views/equipmentManagement/measurementEquipment/components/calibrationDia.vue | 96 +++++++++++------------
4 files changed, 104 insertions(+), 108 deletions(-)
diff --git a/src/views/equipmentManagement/measurementEquipment/components/calibrationDia.vue b/src/views/equipmentManagement/measurementEquipment/components/calibrationDia.vue
index b7fa07e..b6a6ffa 100644
--- a/src/views/equipmentManagement/measurementEquipment/components/calibrationDia.vue
+++ b/src/views/equipmentManagement/measurementEquipment/components/calibrationDia.vue
@@ -37,7 +37,7 @@
</el-col>
</el-row>
<el-row :gutter="30">
- <el-col :span="12">
+ <el-col :span="24">
<el-form-item label="妫�瀹氭棩鏈燂細" prop="recordDate">
<el-date-picker
style="width: 100%"
@@ -50,7 +50,7 @@
/>
</el-form-item>
</el-col>
- <el-col :span="12">
+ <!-- <el-col :span="12">
<el-form-item label="鏈夋晥鏃ユ湡(澶�)锛�" prop="valid">
<el-input
v-model="form.valid"
@@ -63,7 +63,7 @@
<template #append>鏃�</template>
</el-input>
</el-form-item>
- </el-col>
+ </el-col> -->
</el-row>
<el-row :gutter="30">
<el-col :span="12">
@@ -155,32 +155,32 @@
rules: {
code: [{required: true, message: "璇疯緭鍏�", trigger: "blur"}],
name: [{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'
+ // }
+ // ],
recordDate: [{required: true, message: "璇烽�夋嫨", trigger: "change"}],
userId: [{required: true, message: "璇烽�夋嫨", trigger: "change"}],
entryDate: [{required: true, message: "璇烽�夋嫨", trigger: "change"}],
@@ -261,26 +261,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 => {
diff --git a/src/views/equipmentManagement/measurementEquipment/components/formDia.vue b/src/views/equipmentManagement/measurementEquipment/components/formDia.vue
index 6b7feec..5a8a448 100644
--- a/src/views/equipmentManagement/measurementEquipment/components/formDia.vue
+++ b/src/views/equipmentManagement/measurementEquipment/components/formDia.vue
@@ -79,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"
@@ -92,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
@@ -206,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"}],
}
})
@@ -293,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 => {
diff --git a/src/views/equipmentManagement/measurementEquipment/components/rowClickData.vue b/src/views/equipmentManagement/measurementEquipment/components/rowClickData.vue
index 6604587..d9a56fe 100644
--- a/src/views/equipmentManagement/measurementEquipment/components/rowClickData.vue
+++ b/src/views/equipmentManagement/measurementEquipment/components/rowClickData.vue
@@ -66,11 +66,11 @@
prop: "model",
width:200
},
- {
- label: "鏈夋晥鏈�",
- prop: "valid",
- width: 100,
- },
+ // {
+ // label: "鏈夋晥鏈�",
+ // prop: "valid",
+ // width: 100,
+ // },
{
label: "褰曞叆浜�",
prop: "userName",
diff --git a/src/views/equipmentManagement/measurementEquipment/index.vue b/src/views/equipmentManagement/measurementEquipment/index.vue
index 46ca100..50ca366 100644
--- a/src/views/equipmentManagement/measurementEquipment/index.vue
+++ b/src/views/equipmentManagement/measurementEquipment/index.vue
@@ -124,12 +124,12 @@
align:"center",
minWidth: 130
},
- {
- label: "鏈夋晥鏃ユ湡",
- prop: "valid",
- width: 130,
- align:"center"
- },
+ // {
+ // label: "鏈夋晥鏃ユ湡",
+ // prop: "valid",
+ // width: 130,
+ // align:"center"
+ // },
{
label: "妫�瀹氬懆鏈�(澶�)",
prop: "cycle",
--
Gitblit v1.9.3