From 020ecfe0ae4ce42c51712a38656fe87faa7cffce Mon Sep 17 00:00:00 2001
From: 马宇豪 <978517621@qq.com>
Date: Fri, 03 Jan 2025 16:04:02 +0800
Subject: [PATCH] 修改数据上报
---
src/views/dataUpload/saftyBaseInfo/equipInfo/components/addReport.vue | 108 ++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 77 insertions(+), 31 deletions(-)
diff --git a/src/views/dataUpload/saftyBaseInfo/equipInfo/components/addReport.vue b/src/views/dataUpload/saftyBaseInfo/equipInfo/components/addReport.vue
index da55976..9ce78fc 100644
--- a/src/views/dataUpload/saftyBaseInfo/equipInfo/components/addReport.vue
+++ b/src/views/dataUpload/saftyBaseInfo/equipInfo/components/addReport.vue
@@ -24,7 +24,7 @@
</el-form-item>
</el-col>
<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">
- <el-form-item label="出厂时间">
+ <el-form-item label="出厂时间" prop="productionTime">
<el-date-picker v-model="form.productionTime" value-format="YYYY-MM-DD HH:mm:ss" type="datetime" placeholder="选择出厂时间" style="width: 100%" />
</el-form-item>
</el-col>
@@ -50,12 +50,22 @@
</el-form-item>
</el-col>
<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">
- <el-form-item label="设备状况">
+ <el-form-item label="设备状况" prop="status">
<el-select v-model="form.status" placeholder="请选择设备状况">
- <el-option :key="1" label="1" :value="1"/>
- <el-option :key="2" label="2" :value="2"/>
- <el-option :key="3" label="3" :value="3"/>
+ <el-option :key="1" label="在用" :value="1"/>
+ <el-option :key="2" label="停用" :value="2"/>
+ <el-option :key="3" label="报废" :value="3"/>
</el-select>
+ </el-form-item>
+ </el-col>
+ <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">
+ <el-form-item label="设备使用年限" prop="designUseYears">
+ <el-input v-model.trim="form.designUseYears" type="number" placeholder="设备使用年限/年" clearable></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">
+ <el-form-item label="首次使用日期" prop="firstUseDate">
+ <el-date-picker v-model="form.firstUseDate" value-format="YYYY-MM-DD" type="date" placeholder="选择首次使用日期" style="width: 100%" />
</el-form-item>
</el-col>
<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">
@@ -66,9 +76,9 @@
<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">
<el-form-item label="检验状态">
<el-select v-model="form.checkStatus" placeholder="请选择检验状态">
- <el-option :key="1" label="1" :value="1"/>
- <el-option :key="2" label="2" :value="2"/>
- <el-option :key="3" label="3" :value="3"/>
+ <el-option :key="1" label="待检验" :value="1"/>
+ <el-option :key="2" label="已检验" :value="2"/>
+ <el-option :key="3" label="超期待检验" :value="3"/>
</el-select>
</el-form-item>
</el-col>
@@ -87,9 +97,17 @@
<el-upload accept=".pdf" :action="uploadUrl" :headers="header" method="post" :on-exceed="showTip" :on-success="handleAvatarSuccess" :limit='1' v-model:file-list="fileList" :before-upload="picSize" :on-remove="handleRemove" :before-remove="beforeRemove">
<el-button type="primary">点击上传</el-button>
<template #tip>
- <div class="el-upload__tip">仅支持上传pdf文件，尺寸小于2M,最多可上传1张</div>
+ <div class="el-upload__tip">仅支持上传pdf文件，尺寸小于5M,最多可上传1张</div>
</template>
</el-upload>
+ </el-form-item>
+ </el-col>
+ <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20" v-if="title == '新增上报'? false : true">
+ <el-form-item label="删除状态" prop="deleted">
+ <el-radio-group v-model="form.deleted">
+ <el-radio :label="0">未删除</el-radio>
+ <el-radio :label="1">已删除</el-radio>
+ </el-radio-group>
</el-form-item>
</el-col>
</el-row>
@@ -132,6 +150,9 @@
nextCheckTime: string
lastCheckTime: string
files: string
+ deleted: number | null
+ designUseYears: number | null
+ firstUseDate: string
}
rules:{}
fileList: [],
@@ -161,14 +182,21 @@
checkStatus: null,
nextCheckTime: '',
lastCheckTime: '',
- files: ''
+ files: '',
+ firstUseDate: '',
+ designUseYears: null,
+ deleted: 0
},
rules:{
no: [{ required: true, message: '请填写编号', trigger: 'blur' }],
+ status: [{ required: true, message: '请选择设备状况', trigger: 'blur' }],
name: [{ required: true, message: '请填写设备名称', trigger: 'blur' }],
cateName: [{ required: true, message: '请填写分类名称', trigger: 'blur' }],
model: [{ required: true, message: '请填写型号', trigger: 'blur' }],
- registerNo: [{ required: true, message: '请填写注册登记编号', trigger: 'blur' }]
+ registerNo: [{ required: true, message: '请填写注册登记编号', trigger: 'blur' }],
+ productionTime: [{ required: true, message: '请选择出场时间', trigger: 'blur' }],
+ designUseYears: [{ required: true, message: '请填写设备使用年限', trigger: 'blur' }],
+ firstUseDate: [{ required: true, message: '请选择首次使用日期', trigger: 'blur' }]
},
fileList: [],
uploadUrl: import.meta.env.VITE_API_URL + '/account/file/upload',
@@ -202,29 +230,47 @@
checkStatus: null,
nextCheckTime: '',
lastCheckTime: '',
- files: ''
+ files: '',
+ firstUseDate: '',
+ designUseYears: null,
+ deleted: 1
}
+ state.fileList = []
}else{
state.title = '重新上报';
- state.form = {
- uuid: data.uuid,
- no: '',
- name: '',
- cateName: '',
- model: '',
- productionTime: '',
- isSpecial: null,
- isRegister: null,
- registerNo: '',
- status: null,
- registerTable: '',
- checkStatus: null,
- nextCheckTime: '',
- lastCheckTime: '',
- files: ''
+ Object.keys(state.form).forEach(key => {
+ if (Object.prototype.hasOwnProperty.call(data,key)) {
+ state.form[key] = JSON.parse(JSON.stringify(data))[key];
+ }
+ })
+ if(data.files !== ''){
+ state.fileList = state.form.files.split(',').map((i,index) => {
+ return {
+ url: i,
+ name: '文件' + (index+1)
+ }
+ })
+ }else{
+ state.fileList = []
}
+ // state.form = {
+ // uuid: data.uuid,
+ // no: '',
+ // name: '',
+ // cateName: '',
+ // model: '',
+ // productionTime: '',
+ // isSpecial: null,
+ // isRegister: null,
+ // registerNo: '',
+ // status: null,
+ // registerTable: '',
+ // checkStatus: null,
+ // nextCheckTime: '',
+ // lastCheckTime: '',
+ // files: ''
+ // }
}
- state.fileList = []
};
// 新增修改
@@ -264,10 +310,10 @@
}
const picSize = async(rawFile: any) => {
- if(rawFile.size / 1024 / 1024 > 2){
+ if(rawFile.size / 1024 / 1024 > 5){
ElMessage({
type: 'warning',
- message: '文件大小不能超过2M'
+ message: '文件大小不能超过5M'
});
return false
}
--
Gitblit v1.9.2