From 72a153f82321b8da3f64f80196a3ca84821a6895 Mon Sep 17 00:00:00 2001
From: shj <1790240199@qq.com>
Date: 星期三, 03 八月 2022 10:08:29 +0800
Subject: [PATCH] 对接
---
src/components/equipmentDailog/standardDailog.vue | 8
src/views/facilityManagement/ProductionEquipment/index.vue | 2
src/components/equipmentDailog/repairDailog.vue | 18 +-
src/components/equipmentDailog/Dailog.vue | 246 ++++++++++++++++++++++++++++++++++++++++++++++++
4 files changed, 257 insertions(+), 17 deletions(-)
diff --git a/src/components/equipmentDailog/Dailog.vue b/src/components/equipmentDailog/Dailog.vue
index e91c2b4..3031556 100644
--- a/src/components/equipmentDailog/Dailog.vue
+++ b/src/components/equipmentDailog/Dailog.vue
@@ -1,5 +1,5 @@
<template>
- <el-dialog v-model="dialogVisible" :fullscreen="full" draggable :title="titles" width="60%">
+ <el-dialog v-model="dialogVisible" :fullscreen="full" :before-close="resetForm" draggable :title="titles" width="60%">
<el-button @click="toggleFullscreen" size="small" class="pot" :icon="FullScreen"></el-button>
<el-form :model="form" :disabled="disabled" label-width="120px" class="formType">
<el-form-item label="装置设施名称" size="default">
@@ -531,12 +531,252 @@
ElMessage.error(res.data.msg);
}
});
- // form.value = null;
+ form.value = {
+ supplyName: '',
+
+ nextTestDate: '',
+
+ qUsage: '',
+
+ departmentId: '',
+
+ produceTime: '',
+
+ actualStopDate: '',
+
+ takecareDetailList: [],
+
+ infoType: '',
+
+ leadingDepartmentId: '',
+
+ useEndDay: '',
+
+ previousTakecareDate: '',
+
+ previousCheckDate: '',
+
+ model: '',
+
+ stopStatus: '',
+
+ testWarn: '',
+
+ stopSubmitDate: '',
+
+ repairStatus: '',
+
+ takecareStardardeDetailList: [
+ {
+ filePath: '123',
+ },
+ ],
+
+ nextCheckDate: '',
+
+ checkCycle: '',
+
+ checkPoint: '',
+
+ leadingPersonId: '',
+
+ qName: '',
+
+ nextTakecareDate: '',
+
+ setPart: '',
+
+ checkStandardeDetailList: [],
+
+ actualDestoryDate: '',
+
+ isNeedTest: '',
+
+ alertNum: '',
+
+ checkContent: '',
+
+ useMemo: '',
+
+ previousTestDate: '',
+
+ isNeedTakecare: '',
+
+ destoryReason: '',
+
+ checkDetailList: [],
+
+ positionNum: '',
+
+ testCycle: '',
+
+ recoveryReason: '',
+
+ isNeedCheck: '',
+
+ actualRecoveryDate: '',
+
+ leadingPersonDepartmentId: '',
+
+ stopReason: '',
+
+ destorySubmitDate: '',
+
+ testDetailList: [],
+
+ checkWarn: '',
+
+ repaireDetailList: [],
+
+ equipmentTypeId: 1,
+
+ useDate: '',
+
+ recoverySubmitDate: '',
+
+ lockNum: '',
+
+ stopSubmitPersonId: '',
+
+ afterStopStep: '',
+
+ lifeCycle: '',
+
+ delCheckStandardeDetails: '',
+
+ delTakecareStardardeDetails: '',
+
+ delTakecareDetails: '',
+
+ delRepaireDetails: '',
+
+ delTestDetails: '',
+ };
};
// 取消
const resetForm = () => {
dialogVisible.value = false;
- // form.value = null;
+ form.value = {
+ supplyName: '',
+
+ nextTestDate: '',
+
+ qUsage: '',
+
+ departmentId: '',
+
+ produceTime: '',
+
+ actualStopDate: '',
+
+ takecareDetailList: [],
+
+ infoType: '',
+
+ leadingDepartmentId: '',
+
+ useEndDay: '',
+
+ previousTakecareDate: '',
+
+ previousCheckDate: '',
+
+ model: '',
+
+ stopStatus: '',
+
+ testWarn: '',
+
+ stopSubmitDate: '',
+
+ repairStatus: '',
+
+ takecareStardardeDetailList: [
+ {
+ filePath: '123',
+ },
+ ],
+
+ nextCheckDate: '',
+
+ checkCycle: '',
+
+ checkPoint: '',
+
+ leadingPersonId: '',
+
+ qName: '',
+
+ nextTakecareDate: '',
+
+ setPart: '',
+
+ checkStandardeDetailList: [],
+
+ actualDestoryDate: '',
+
+ isNeedTest: '',
+
+ alertNum: '',
+
+ checkContent: '',
+
+ useMemo: '',
+
+ previousTestDate: '',
+
+ isNeedTakecare: '',
+
+ destoryReason: '',
+
+ checkDetailList: [],
+
+ positionNum: '',
+
+ testCycle: '',
+
+ recoveryReason: '',
+
+ isNeedCheck: '',
+
+ actualRecoveryDate: '',
+
+ leadingPersonDepartmentId: '',
+
+ stopReason: '',
+
+ destorySubmitDate: '',
+
+ testDetailList: [],
+
+ checkWarn: '',
+
+ repaireDetailList: [],
+
+ equipmentTypeId: 1,
+
+ useDate: '',
+
+ recoverySubmitDate: '',
+
+ lockNum: '',
+
+ stopSubmitPersonId: '',
+
+ afterStopStep: '',
+
+ lifeCycle: '',
+
+ delCheckStandardeDetails: '',
+
+ delTakecareStardardeDetails: '',
+
+ delTakecareDetails: '',
+
+ delRepaireDetails: '',
+
+ delTestDetails: '',
+ };
};
const activeName = ref('first');
const index = ref<any>();
diff --git a/src/components/equipmentDailog/repairDailog.vue b/src/components/equipmentDailog/repairDailog.vue
index 52fd407..bb40c91 100644
--- a/src/components/equipmentDailog/repairDailog.vue
+++ b/src/components/equipmentDailog/repairDailog.vue
@@ -1,5 +1,5 @@
<template>
- <el-dialog v-model="dialogVisible" :fullscreen="full" :title="titles" width="50%" draggable>
+ <el-dialog v-model="dialogVisible" :fullscreen="full" :before-close="resetForm" :title="titles" width="50%" draggable>
<el-button @click="toggleFullscreen" size="small" class="pot" :icon="FullScreen"></el-button>
<el-form :model="form" :disabled="disabled" label-width="120px">
<el-row>
@@ -42,23 +42,23 @@
</el-col>
<el-col :span="11" :offset="2">
<el-form-item label="维修开始日期" size="default">
- <el-date-picker v-model="form.repairStartDate" type="date" placeholder="选择日期时间" style="width: 100%" />
+ <el-date-picker v-model="form.repairStartDate" format="YYYY-MM-DD HH:mm:ss" type="datetime" placeholder="选择日期时间" style="width: 100%" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="11">
<el-form-item label="维修结束日期" size="default">
- <el-date-picker v-model="form.repairEndDate" type="date" placeholder="选择日期时间" style="width: 100%" />
+ <el-date-picker v-model="form.repairEndDate" format="YYYY-MM-DD HH:mm:ss" type="datetime" placeholder="选择日期时间" style="width: 100%" />
</el-form-item>
</el-col>
</el-row>
</el-form>
<template #footer>
<span class="dialog-footer">
- <el-button type="primary" @click="dialogVisible = false" size="default">继续添加</el-button>
- <el-button @click="dialogVisible = false" size="default">关闭</el-button>
- <el-button type="primary" @click="dialogVisible = false" size="default">确定</el-button>
+ <!-- <el-button type="primary" @click="dialogVisible = false" size="default">继续添加</el-button> -->
+ <el-button @click="resetForm" size="default">关闭</el-button>
+ <el-button type="primary" @click="submitForm" size="default">确定</el-button>
</span>
</template>
</el-dialog>
@@ -76,7 +76,7 @@
repairStatus: '',
repairMemo: '',
repairPersonId: '',
- repairPersonDepartmentId: false,
+ repairPersonDepartmentId: "",
repairStartDate: '',
repairEndDate: '',
});
@@ -112,7 +112,7 @@
repairStatus: '',
repairMemo: '',
repairPersonId: '',
- repairPersonDepartmentId: false,
+ repairPersonDepartmentId: "",
repairStartDate: '',
repairEndDate: '',
};
@@ -125,7 +125,7 @@
repairStatus: '',
repairMemo: '',
repairPersonId: '',
- repairPersonDepartmentId: false,
+ repairPersonDepartmentId: "",
repairStartDate: '',
repairEndDate: '',
};
diff --git a/src/components/equipmentDailog/standardDailog.vue b/src/components/equipmentDailog/standardDailog.vue
index 3228ae5..85febd2 100644
--- a/src/components/equipmentDailog/standardDailog.vue
+++ b/src/components/equipmentDailog/standardDailog.vue
@@ -1,5 +1,5 @@
<template>
- <el-dialog v-model="dialogVisible" :fullscreen="full" :title="titles" width="50%" draggable>
+ <el-dialog v-model="dialogVisible" :fullscreen="full" :before-close="resetForm" :title="titles" width="50%" draggable>
<el-button @click="toggleFullscreen" size="small" class="pot" :icon="FullScreen"></el-button>
<el-form :model="form" label-width="120px" :disabled="disabled">
<el-row>
@@ -61,7 +61,7 @@
checkContent: '',
checkTarget: '',
unit: '',
- checkPart: false,
+ checkPart: "",
rate: '',
});
// 开启弹窗
@@ -93,7 +93,7 @@
checkContent: '',
checkTarget: '',
unit: '',
- checkPart: false,
+ checkPart: "",
rate: '',
};
};
@@ -105,7 +105,7 @@
checkContent: '',
checkTarget: '',
unit: '',
- checkPart: false,
+ checkPart: "",
rate: '',
};
};
diff --git a/src/views/facilityManagement/ProductionEquipment/index.vue b/src/views/facilityManagement/ProductionEquipment/index.vue
index ebe63db..ad83ac6 100644
--- a/src/views/facilityManagement/ProductionEquipment/index.vue
+++ b/src/views/facilityManagement/ProductionEquipment/index.vue
@@ -184,7 +184,7 @@
// 弹窗
const openAdd = ref();
const openD = (title: String, id: number) => {
- openAdd.value.openDailog(title,false,id,1);
+ openAdd.value.openDailog(title,true,id,1);
};
// 删除
const onDelete = (id: number) => {
--
Gitblit v1.9.2