From cc077cba0e6a0c1d9ec11af6c89ee5c898cee423 Mon Sep 17 00:00:00 2001
From: gaosp <gaosp>
Date: 星期三, 17 一月 2024 00:25:06 +0800
Subject: [PATCH] updatte
---
src/container/maintenance/dailyMAdd.vue | 20 +++++++++++++-------
1 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/src/container/maintenance/dailyMAdd.vue b/src/container/maintenance/dailyMAdd.vue
index 3213798..3dc55ce 100644
--- a/src/container/maintenance/dailyMAdd.vue
+++ b/src/container/maintenance/dailyMAdd.vue
@@ -4,17 +4,18 @@
<el-dialog
:title="title"
width="80%"
+ @close="cancel"
:visible.sync="dialogVisibleAdd" class="role-select">
<!-- 鏌ヨ琛ㄥ崟 -->
<el-form :model="dataForm" ref="dataForm" label-width="150px" style="margin-top:10px;">
<el-row :gutter="24">
<el-col :xs="24":sm="6":md="6":lg="6":xl="6">
<el-form-item label="璁惧鍚嶇О" prop="machineName">
- <el-select v-model="dataForm.machineId" placeholder="---璇烽�夋嫨---">
+ <el-select v-model="dataForm.machineId" placeholder="---璇烽�夋嫨---" clearable>
<el-option
v-for="item in machineList"
:key="item.id"
- :label="item.name"
+ :label="item.machineName"
:value="item.id">
</el-option>
</el-select>
@@ -58,7 +59,7 @@
</el-col>
<el-col :xs="24":sm="6":md="6":lg="6":xl="6">
<el-form-item label="淇濆吇鍐呭涓庡瓨鍦ㄩ棶棰�" prop="detail">
- <el-input size="mini" type="text" v-model="dataForm.detail"></el-input>
+ <el-input size="mini" type="text" v-model="dataForm.detail" clearable></el-input>
</el-form-item>
</el-col>
<el-col :xs="24":sm="6":md="6":lg="6":xl="6">
@@ -70,6 +71,7 @@
value-format="yyyy-MM-dd"
v-model="dataForm.planStartDate"
range-separator="鑷�"
+ clearable
type="daterange"
start-placeholder="寮�濮嬫棩鏈�"
end-placeholder="缁撴潫鏃ユ湡">
@@ -83,6 +85,7 @@
value-format="yyyy-MM-dd"
v-model="dataForm.planFinishDate"
range-separator="鑷�"
+ clearable
type="daterange"
start-placeholder="寮�濮嬫棩鏈�"
end-placeholder="缁撴潫鏃ユ湡">
@@ -104,7 +107,7 @@
import { getMachineList, maintainCreate, maintainUpdate, userList, departmentGet } from '@/api/MdcApi'
import { getRequest } from '@/api/Api'
export default {
- props: ['styles', 'departmentlist','machineList','userList'],
+ props: ['styleName','styles','styleValue', 'departmentlist','machineList','userList'],
data() {
return {
dataForm: {
@@ -113,6 +116,7 @@
maintainPerson: '',
isQualified: '',
detail: '',
+ style: '',
},
dialogVisibleAdd: false,
// 涓嬫媺妗�
@@ -133,11 +137,13 @@
init(n, data) {
this.data = data
this.no = n
+
if (n === 1) {
- this.title = '鏂板' + this.style
+ this.title = '鏂板' + this.styleName
Object.keys(this.dataForm).forEach(key => {
this.dataForm[key] = ''
})
+ this.dataForm['style'] = ''
} else {
this.title = '淇敼' + this.style
Object.keys(this.dataForm).forEach(key => {
@@ -176,7 +182,7 @@
completeDateFrom,
completeDateTo,
isQualified,
- styles: this.style
+ style: this.styleValue
}).then(res => {
if (res.result === 'SUCCESS') {
this.$message({
@@ -201,7 +207,7 @@
completeDateFrom,
completeDateTo,
isQualified,
- styles: this.style
+ style: this.styleValue
}).then(res => {
if (res.result === 'SUCCESS') {
this.$message({
--
Gitblit v1.9.3