|
|
@@ -1,20 +1,35 @@
|
|
|
<template>
|
|
|
<el-dialog v-model="visible" :title="!dataForm.id ? '新增' : '修改'" :close-on-click-modal="false" :close-on-press-escape="false">
|
|
|
<el-form :model="dataForm" :rules="rules" ref="dataFormRef" @keyup.enter="dataFormSubmitHandle()" label-width="120px">
|
|
|
- <el-form-item label="0-日巡检 1-周巡检" prop="inspectionType">
|
|
|
- <el-input v-model="dataForm.inspectionType" placeholder="0-日巡检 1-周巡检"></el-input>
|
|
|
+ <el-form-item label="巡检类型" prop="inspectionType">
|
|
|
+ <el-option :label="item.dictLabel" :value="item.dictValue" v-for="item in state.getDictByKey('attendanceStatus')"></el-option>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="开始日期" prop="startDate">
|
|
|
- <el-input v-model="dataForm.startDate" placeholder="开始日期"></el-input>
|
|
|
+ <el-date-picker
|
|
|
+ v-model="dataForm.startDate"
|
|
|
+ type="date"
|
|
|
+ placeholder="选择开始日期"
|
|
|
+ value-format="YYYY-MM-DD"
|
|
|
+ style="width: 100%;"
|
|
|
+ ></el-date-picker>
|
|
|
+ <!-- <el-input v-model="dataForm.startDate" placeholder="开始日期"></el-input> -->
|
|
|
</el-form-item>
|
|
|
<el-form-item label="结束日期" prop="endDate">
|
|
|
- <el-input v-model="dataForm.endDate" placeholder="结束日期"></el-input>
|
|
|
+ <el-date-picker
|
|
|
+ v-model="dataForm.endDate"
|
|
|
+ type="date"
|
|
|
+ placeholder="选择结束日期"
|
|
|
+ value-format="YYYY-MM-DD"
|
|
|
+ style="width: 100%;"
|
|
|
+ ></el-date-picker>
|
|
|
+ <!-- <el-input v-model="dataForm.endDate" placeholder="结束日期"></el-input> -->
|
|
|
</el-form-item>
|
|
|
<el-form-item label="用户上传的文件路径" prop="filePath">
|
|
|
<el-input v-model="dataForm.filePath" placeholder="用户上传的文件路径"></el-input>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="0-待确认 1-已确认" prop="status">
|
|
|
- <el-input v-model="dataForm.status" placeholder="0-待确认 1-已确认"></el-input>
|
|
|
+ <el-form-item label="审阅状态" prop="status">
|
|
|
+ <el-option :label="item.dictLabel" :value="item.dictValue" v-for="item in state.getDictByKey('inspectionReviewStatus')"></el-option>
|
|
|
+ <!-- <el-input v-model="dataForm.status" placeholder="0-待确认 1-已确认"></el-input> -->
|
|
|
</el-form-item>
|
|
|
<el-form-item label="备注" prop="remark">
|
|
|
<el-input v-model="dataForm.remark" placeholder="备注"></el-input>
|
|
|
@@ -31,8 +46,10 @@
|
|
|
import { reactive, ref } from "vue";
|
|
|
import baseService from "@/service/baseService";
|
|
|
import { ElMessage } from "element-plus";
|
|
|
+import { parseTime } from '@/utils/ruoyi'
|
|
|
const emit = defineEmits(["refreshDataList"]);
|
|
|
-
|
|
|
+import useView from "@/hooks/useView";
|
|
|
+const state = reactive({ ...useView({}) });
|
|
|
const visible = ref(false);
|
|
|
const dataFormRef = ref();
|
|
|
|
|
|
@@ -55,8 +72,7 @@ const rules = ref({
|
|
|
status: [
|
|
|
{ required: true, message: '必填项不能为空', trigger: 'blur' }
|
|
|
],
|
|
|
- remark: [
|
|
|
- { required: true, message: '必填项不能为空', trigger: 'blur' }
|
|
|
+ remark: [
|
|
|
]
|
|
|
});
|
|
|
|
|
|
@@ -87,6 +103,9 @@ const dataFormSubmitHandle = () => {
|
|
|
if (!valid) {
|
|
|
return false;
|
|
|
}
|
|
|
+ dataForm.startDate = dataForm.startDate ? parseTime(new Date(dataForm.startDate), '{yy}-{mm}-{dd} {hh}:{ii}:{ss}') : null;
|
|
|
+ dataForm.endDate = dataForm.endDate ? parseTime(new Date(dataForm.endDate), '{yy}-{mm}-{dd} {hh}:{ii}:{ss}') : null;
|
|
|
+ dataForm.status = dataForm.status ? Number(dataForm.status) : null;
|
|
|
(!dataForm.id ? baseService.post : baseService.put)("/emergency/inspection", dataForm).then((res) => {
|
|
|
ElMessage.success({
|
|
|
message: '成功',
|
