From c64c8f43ec1a3d88feb1f915fd488040b6358e7d Mon Sep 17 00:00:00 2001
From: shj <1790240199@qq.com>
Date: 星期二, 09 八月 2022 19:04:12 +0800
Subject: [PATCH] Merge branch 'master' of https://sinanoaq.cn:8888/r/gtqtOut
---
src/components/equipmentDailog/maintenanceDailog.vue | 148 ++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 120 insertions(+), 28 deletions(-)
diff --git a/src/components/equipmentDailog/maintenanceDailog.vue b/src/components/equipmentDailog/maintenanceDailog.vue
index 3f646d2..a791fc4 100644
--- a/src/components/equipmentDailog/maintenanceDailog.vue
+++ b/src/components/equipmentDailog/maintenanceDailog.vue
@@ -1,16 +1,16 @@
<template>
- <el-dialog :fullscreen="full" v-model="dialogVisible" title="新建仪器仪表" width="50%" draggable>
+ <el-dialog :fullscreen="full" v-model="dialogVisible" @close="resetForms(ruleFormRefs)" :title="titles" width="50%" draggable>
<el-button @click="toggleFullscreen" size="small" class="pot" :icon="FullScreen"></el-button>
- <el-form :model="form" label-width="120px">
+ <el-form :model="form" ref="ruleFormRefs" :rules="rules" :disabled="disabled" label-width="120px">
<el-row>
<el-col :span="11">
- <el-form-item label="保养情况">
- <el-input v-model="form.name" />
+ <el-form-item label="保养情况" size="default" prop="takecareMemo">
+ <el-input v-model="form.takecareMemo" />
</el-form-item>
</el-col>
<el-col :span="11" :offset="2">
- <el-form-item label="保养负责人">
- <el-input v-model="form.name">
+ <el-form-item label="保养负责人" size="default" prop="leadingPersonName">
+ <el-input v-model="form.leadingPersonName">
<template #append> <el-button :icon="Search" @click="openUser" /> </template
></el-input>
</el-form-item>
@@ -18,56 +18,120 @@
</el-row>
<el-row>
<el-col :span="11">
- <el-form-item label="保养日期">
- <el-date-picker v-model="form.date1" type="date" style="width: 100%" />
+ <el-form-item label="保养日期" size="default" prop="takecareDate">
+ <el-date-picker v-model="form.takecareDate" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" type="datetime" style="width: 100%" />
</el-form-item>
</el-col>
<el-col :span="11" :offset="2">
- <el-form-item label="保养负责人单位">
- <el-select v-model="form.region" style="width: 100%">
- <el-option label="Zone one" value="shanghai" />
- <el-option label="Zone two" value="beijing" />
- </el-select>
+ <el-form-item label="保养负责人单位" size="default" prop="leadingPersonDepartmentId">
+ <el-tree-select v-model="form.leadingPersonDepartmentId" :data="data" check-strictly="true" class="w100" :props="propse" placeholder="请选择" />
</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="resetForms(ruleFormRefs)" size="default">关闭</el-button>
+ <el-button type="primary" @click="submitForms(ruleFormRefs)" size="default">确定</el-button>
</span>
</template>
</el-dialog>
- <DailogSearchUser ref="Show"></DailogSearchUser>
+ <DailogSearchUser ref="Show" @SearchUser="User"></DailogSearchUser>
</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 type { FormInstance, FormRules } from 'element-plus';
import DailogSearchUser from '/@/components/DailogSearchUser/index.vue';
+import { goalManagementApi } from '/@/api/goalManagement';
export default defineComponent({
components: { DailogSearchUser },
- setup() {
- const form = reactive({
- name: '',
- region: '',
- date1: '',
- date2: '',
- delivery: false,
- type: [],
- resource: '',
- desc: '',
+ setup(props, { emit }) {
+ const ruleFormRefs = ref<FormInstance>();
+ const form = ref({
+ takecareMemo: '',
+ leadingPersonId: '',
+ leadingPersonName: '',
+ takecareDate: '',
+ leadingPersonDepartmentId: '',
});
// 开启弹窗
+ const titles = ref();
+ const disabled = ref(false);
const dialogVisible = ref(false);
- const openDailog = () => {
+ const openDailog = (title: string, data: any) => {
+ department()
dialogVisible.value = true;
+ titles.value = `${title}仪器仪表`;
+ if (title == '查看') {
+ disabled.value = true;
+ form.value = data;
+ } else if (title == '修改') {
+ disabled.value = false;
+ form.value = data;
+ }
};
+ const rules = reactive<FormRules>({
+ takecareMemo: [
+ {
+ required: true,
+ message: '保养情况不能为空',
+ trigger: 'blur',
+ },
+ ],
+ leadingPersonName: [
+ {
+ required: true,
+ message: '保养负责人不能为空',
+ trigger: 'blur',
+ },
+ ],
+ takecareDate: [
+ {
+ required: true,
+ message: '保养日期不能为空',
+ trigger: 'blur',
+ },
+ ],
+ leadingPersonDepartmentId: [
+ {
+ required: true,
+ message: '保养负责人单位不能为空',
+ trigger: 'blur',
+ },
+ ],
+ });
// 开启用户弹窗
const Show = ref();
const openUser = () => {
Show.value.openDailog();
+ };
+ const User = (val: any) => {
+ form.value.leadingPersonId = val.uid;
+ form.value.leadingPersonName = val.realName;
+ };
+ // 提交
+ const submitForms = async (formEl: FormInstance | undefined) => {
+ if (!formEl) return;
+ await formEl.validate((valid, fields) => {
+ if (valid) {
+ dialogVisible.value = false;
+ emit('onMain',form.value);
+ } else {
+ console.log('error submit!', fields);
+ }
+ });
+ disabled.value = false;
+ };
+ // 取消
+ const resetForms = (formEl: FormInstance | undefined) => {
+ if (!formEl) return;
+ formEl.resetFields();
+ dialogVisible.value = false;
+ disabled.value = false;
+ form.value={}
};
//全屏
const full = ref(false);
@@ -78,10 +142,38 @@
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,
+ disabled,
+ rules,
+ titles,
+ submitForms,
+ resetForms,
form,
+ User,
dialogVisible,
openDailog,
+ ruleFormRefs,
Show,
openUser,
Search,
--
Gitblit v1.9.2