From e04c8dab8e435cabf1360bbcd6936e5ac9e77906 Mon Sep 17 00:00:00 2001
From: shj <1790240199@qq.com>
Date: Mon, 08 Aug 2022 16:46:47 +0800
Subject: [PATCH] Merge branch 'master' of https://sinanoaq.cn:8888/r/gtqtOut
---
src/components/equipmentDailog/repairDailog.vue | 58 +++++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 43 insertions(+), 15 deletions(-)
diff --git a/src/components/equipmentDailog/repairDailog.vue b/src/components/equipmentDailog/repairDailog.vue
index edc6513..0c3baff 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>
@@ -25,7 +25,7 @@
</el-col>
<el-col :span="11" :offset="2">
<el-form-item label="维修负责人" size="default">
- <el-input v-model="form.repairPersonId" placeholder="请选择">
+ <el-input v-model="form.repairPersonName" placeholder="请选择">
<template #append> <el-button :icon="Search" @click="openUser" /> </template
></el-input>
</el-form-item>
@@ -34,31 +34,28 @@
<el-row>
<el-col :span="11">
<el-form-item label="维修负责人单位" size="default">
- <el-select v-model="form.repairPersonDepartmentId" placeholder="请选择" style="width: 100%">
- <el-option label="xxxxx单位" value="1" />
- <el-option label="xxx单位" value="2" />
- </el-select>
+ <el-tree-select v-model="form.repairPersonDepartmentId" :data="data" check-strictly="true" class="w100" :props="propse" placeholder="请选择" />
</el-form-item>
</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>
@@ -66,8 +63,10 @@
</template>
<script lang="ts">
import { defineComponent, ref, reactive } from 'vue';
+import { ElMessage, ElMessageBox} from 'element-plus';
import { Search, FullScreen } from '@element-plus/icons-vue';
import DailogSearchUser from '/@/components/DailogSearchUser/index.vue';
+import { goalManagementApi } from '/@/api/goalManagement';
export default defineComponent({
components: { DailogSearchUser },
setup(props, { emit }) {
@@ -76,7 +75,8 @@
repairStatus: '',
repairMemo: '',
repairPersonId: '',
- repairPersonDepartmentId: false,
+ repairPersonName:'',
+ repairPersonDepartmentId: "",
repairStartDate: '',
repairEndDate: '',
});
@@ -85,13 +85,15 @@
const disabled = ref(false);
const dialogVisible = ref(false);
const openDailog = (title: string, data: any) => {
+ department()
dialogVisible.value = true;
titles.value = `${title}设备维修`;
if (title == '查看') {
disabled.value = true;
form.value = data;
- } else {
+ } else if(title == '修改') {
disabled.value = false;
+ form.value = data;
}
};
// 开启用户弹窗
@@ -101,6 +103,7 @@
};
const User = (val: any) => {
form.value.repairPersonId = val.uid;
+ form.value.repairPersonName = val.realName;
};
// 提交
const submitForm = () => {
@@ -111,10 +114,12 @@
repairStatus: '',
repairMemo: '',
repairPersonId: '',
- repairPersonDepartmentId: false,
+ repairPersonName:'',
+ repairPersonDepartmentId: "",
repairStartDate: '',
repairEndDate: '',
};
+ disabled.value = false;
};
// 取消
const resetForm = () => {
@@ -124,10 +129,12 @@
repairStatus: '',
repairMemo: '',
repairPersonId: '',
- repairPersonDepartmentId: false,
+ repairPersonName:"",
+ repairPersonDepartmentId: "",
repairStartDate: '',
repairEndDate: '',
};
+ disabled.value = false;
};
//全屏
const full = ref(false);
@@ -138,7 +145,28 @@
full.value = false;
}
};
+ //部门树
+ const department = () => {
+ goalManagementApi()
+ .getTreedepartment()
+ .then((res) => {
+ if (res.data.code == 200) {
+ data.value = res.data.data;
+ } else {
+ ElMessage.error(res.data.msg);
+ }
+ });
+ };
+ const propse = {
+ label: 'depName',
+ children: 'children',
+ value: 'depId',
+ };
+ const data = ref();
return {
+ department,
+ propse,
+ data,
form,
titles,
disabled,
--
Gitblit v1.9.2