设备管理缺陷修复

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)) {
+            console.log('type===============',type)
-                this.initData();
+            console.log('form===============',this.form)
-            }
+            if(type == 'add'){
-            if (['edit', 'view'].includes(type)) {
+                this.form.checkResult = '1'
-                getMenu(this.form.id).then(res => {
+                done()
-                    this.form = Object.assign(res.data.data, {
+            }else{
-                        hasChildren: this.form.hasChildren,
+                this.form.checkResult = this.form.checkResult == '' ? '1' : this.form.checkResult
-                    });
+                done()
-                    if (this.form.parentId === '0') {
-                        this.form.parentId = '';
-                    }
-                });
             }
-            done();
         },
         // 关闭 弹框  关闭表单前会执行beforeClose方法，
         beforeClose(done) {

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