From 75b45b5c0d555b1217b55c5351ae54834b3f81f7 Mon Sep 17 00:00:00 2001
From: jinna <jn517618@163.com>
Date: Thu, 16 Apr 2026 15:19:56 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E7=AE=A1=E7=90=86=E7=BC=BA?=
 =?UTF-8?q?=E9=99=B7=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../measurementRecords/index.vue              | 38 ++++++++++++-------
 .../workwearManagement/index.vue              |  2 +-
 2 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/src/views/equiptManagement/measurementRecords/index.vue b/src/views/equiptManagement/measurementRecords/index.vue
index 69dd58f..0c4d1e5 100644
--- a/src/views/equiptManagement/measurementRecords/index.vue
+++ b/src/views/equiptManagement/measurementRecords/index.vue
@@ -3,7 +3,7 @@
         <avue-crud :option="option" :table-loading="loading" :data="data" v-model="form" v-model:page="page" ref="crud"
             @row-del="rowDel" @row-save="rowSave" @row-update="rowUpdate" @search-change="searchChange" @search-reset="searchReset"
             @selection-change="selectionChange" @current-change="currentChange" @size-change="sizeChange"
-            @refresh-change="refreshChange" @on-load="onLoad">
+            @refresh-change="refreshChange" @on-load="onLoad" :beforeOpen="beforeOpen">
             <template #menu-left>
                 <el-button type="primary" @click="handleConfig">提醒配置</el-button>
             </template>
@@ -132,6 +132,9 @@ export default {
                         sortable: true,
                         overHidden: true,
                         width: 120,
+                        rules:[
+                            { required: true, message: '请输入名称', trigger: 'blur' },
+                        ]
                     },
                     // {
                     //     label: '计量类型',
@@ -163,6 +166,9 @@ export default {
                         type: 'date',
                         format:"YYYY-MM-DD",
                         valueFormat:"YYYY-MM-DD",
+                        rules:[
+                            { required: true, message: '请选择到期日期', trigger: 'blur' },
+                        ]
                     },
                     {
                         label: '检定周期',
@@ -184,6 +190,9 @@ export default {
                         sortable: true,
                         overHidden: true,
                         width: 120,
+                        rules:[
+                            { required: true, message: '请输入规格', trigger: 'blur' },
+                        ]
                     },
                     {
                         label: '精度',
@@ -208,6 +217,9 @@ export default {
                         type: 'date',
                         format:"YYYY-MM-DD",
                         valueFormat:"YYYY-MM-DD",
+                        rules:[
+                            { required: true, message: '请选择启用日期', trigger: 'blur' },
+                        ]
                     },
                     {
                         label: '出厂编号',
@@ -238,6 +250,9 @@ export default {
                         dicData:[
                             {label:"合格",value:'1'},
                             {label:"不合格",value:'0'}
+                        ],
+                        rules:[
+                            { required: true, message: '请选择检验结果', trigger: 'blur' },
                         ]
                     },
                     {
@@ -373,20 +388,15 @@ export default {
         },
         // 打开弹框 前操作  打开表单前会执行beforeOpen方法
         beforeOpen(done, type) {
-            if (['add', 'edit'].includes(type)) {
-                this.initData();
-            }
-            if (['edit', 'view'].includes(type)) {
-                getMenu(this.form.id).then(res => {
-                    this.form = Object.assign(res.data.data, {
-                        hasChildren: this.form.hasChildren,
-                    });
-                    if (this.form.parentId === '0') {
-                        this.form.parentId = '';
-                    }
-                });
+            console.log('type===============',type)
+            console.log('form===============',this.form)
+            if(type == 'add'){
+                this.form.checkResult = '1'
+                done()
+            }else{
+                this.form.checkResult = this.form.checkResult == '' ? '1' : this.form.checkResult
+                done()
             }
-            done();
         },
         // 关闭 弹框  关闭表单前会执行beforeClose方法，
         beforeClose(done) {
diff --git a/src/views/equiptManagement/workwearManagement/index.vue b/src/views/equiptManagement/workwearManagement/index.vue
index 9af448b..749925c 100644
--- a/src/views/equiptManagement/workwearManagement/index.vue
+++ b/src/views/equiptManagement/workwearManagement/index.vue
@@ -1,8 +1,8 @@
 <template>
   <basic-container>
     <el-tabs v-model="tabPosition" class="demo-tabs" @tab-change="tabPositionChange">
-      <el-tab-pane label="飞靶设置" name="feiBaSet"></el-tab-pane>
       <el-tab-pane label="挂具设置" name="rackSet"></el-tab-pane>
+      <el-tab-pane label="飞靶设置" name="feiBaSet"></el-tab-pane>
     </el-tabs>
 
     <avue-crud