From ce09e7d8c54d1868fe9a589caec577ddb0aeaf52 Mon Sep 17 00:00:00 2001
From: yz3456 <2753272399@qq.com>
Date: 星期一, 27 五月 2024 17:38:43 +0800
Subject: [PATCH] 修改了bug
---
ruoyi-ui/src/views/meeting/approve.vue | 3 +
ruoyi-ui/src/views/healthy/healthYear.vue | 8 ++--
ruoyi-ui/src/views/meeting/approveInfo.vue | 4 ++
ruoyi-ui/src/views/meeting/meetingInfo.vue | 8 +++-
ruoyi-ui/src/views/meeting/index.vue | 50 +++++++++++++++++++-----
5 files changed, 55 insertions(+), 18 deletions(-)
diff --git a/ruoyi-ui/src/views/healthy/healthYear.vue b/ruoyi-ui/src/views/healthy/healthYear.vue
index a374f05..a2b7370 100644
--- a/ruoyi-ui/src/views/healthy/healthYear.vue
+++ b/ruoyi-ui/src/views/healthy/healthYear.vue
@@ -998,7 +998,7 @@
// 鏁版嵁鑼冨洿閫夐」
fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
'.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng'],
-
+
fileList:[
],
fileListOther:[
@@ -1039,7 +1039,7 @@
},
created() {
this.getList()
-
+ this.$route.meta.title = "鐜扮姸鍋ュ悍鎯呭喌";
},
methods: {
@@ -2080,7 +2080,7 @@
};
console.log(111)
console.log(this.bloodData)
-
+
if(isObjectEmpty(this.bloodData)){
this.HealthyBaseList.bloodClass = this.HealthyBaseList.bloodClass;
}else {
@@ -2274,7 +2274,7 @@
}
})
// 鍒锋柊椤甸潰
-
+
},
//骞村害鍋ュ悍鎶ュ憡
toYearhealthy(){
diff --git a/ruoyi-ui/src/views/meeting/approve.vue b/ruoyi-ui/src/views/meeting/approve.vue
index aaa8f44..44ff390 100644
--- a/ruoyi-ui/src/views/meeting/approve.vue
+++ b/ruoyi-ui/src/views/meeting/approve.vue
@@ -122,7 +122,8 @@
</el-table-column>
<el-table-column label="鐘舵��" prop="statu" sortable align="center">
- <template slot-scope="scope">{{scope.row.statu===1? '鍚屾剰': '鎷掔粷'}}</template>
+ <!-- <template slot-scope="scope">{{scope.row.statu===1? '鍚屾剰': '鎷掔粷'}}</template> -->
+ <template slot-scope="scope">{{scope.row.statu ===3 ? '寰呭鎵�' : (scope.row.statu===1? '鍚屾剰': '鎷掔粷')}}</template>
</el-table-column>
<el-table-column label="鎿嶄綔" align="center" width="200" class-name="small-padding fixed-width">
diff --git a/ruoyi-ui/src/views/meeting/approveInfo.vue b/ruoyi-ui/src/views/meeting/approveInfo.vue
index 26bdd78..9a19109 100644
--- a/ruoyi-ui/src/views/meeting/approveInfo.vue
+++ b/ruoyi-ui/src/views/meeting/approveInfo.vue
@@ -237,6 +237,10 @@
{
value: 0,
label: '鎷掔粷',
+ },
+ {
+ value: 3 ,
+ label: '寰呭鎵�',
}
],
}
diff --git a/ruoyi-ui/src/views/meeting/index.vue b/ruoyi-ui/src/views/meeting/index.vue
index 492f878..4687ece 100644
--- a/ruoyi-ui/src/views/meeting/index.vue
+++ b/ruoyi-ui/src/views/meeting/index.vue
@@ -222,7 +222,9 @@
</el-table-column>
<el-table-column label="鐘舵��" prop="statu" sortable align="center">
- <template slot-scope="scope">{{scope.row.statu===1? '鍚屾剰': '鎷掔粷'}}</template>
+ <!-- <template slot-scope="scope">{{scope.row.statu===1? '鍚屾剰': '鎷掔粷'}}</template> -->
+ <template slot-scope="scope">{{scope.row.statu ===3 ? '寰呭鎵�' : (scope.row.statu===1? '鍚屾剰': '鎷掔粷')}}</template>
+ <!-- scope.row.statu ==='寰呭鎵�' ? '寰呭鎵�' : (scope.row.statu===1? '鍚屾剰': '鎷掔粷') -->
</el-table-column>
<el-table-column label="鎿嶄綔" align="center" width="200" class-name="small-padding fixed-width">
@@ -287,7 +289,7 @@
<el-input v-model="formDat.applyApart" placeholder="璇疯緭鍏ョ敵璇峰搴垨閮ㄩ棬" clearable :style="{width: '100%'}">
</el-input>
</el-form-item>
- <el-form-item label="鏄惁鎷滆姘寸墝" prop="isPlacebrand">
+ <el-form-item label="鏄惁鎽嗘斁姘寸墝" prop="isPlacebrand">
<el-select v-model="formDat.isPlacebrand" placeholder="璇烽�夋嫨" clearable :style="{width: '100%'}">
<el-option v-for="(item, index) in typeOptions" :key="index" :label="item.label" :value="item.value"
></el-option>
@@ -301,10 +303,11 @@
<el-input v-model="formDat.connPhone" placeholder="璇疯緭鍏ヨ仈绯荤數璇�" clearable :style="{width: '100%'}"></el-input>
</el-form-item>
<el-form-item label="鐘舵��" prop="statu">
- <el-select v-model="formDat.statu" placeholder="璇烽�夋嫨" clearable :style="{width: '100%'}">
+ <!-- <el-select v-model="formDat.statu" placeholder="璇烽�夋嫨" clearable :style="{width: '100%'}">
<el-option v-for="(item, index) in typeOptions2" :key="index" :label="item.label" :value="item.value"
></el-option>
- </el-select>
+ </el-select> -->
+ <el-input placeholder="寰呭鏍�" :disabled='true'></el-input>
</el-form-item>
</el-form>
@@ -415,7 +418,7 @@
}],
isPlacebrand: [{
required: true,
- message: '璇烽�夋嫨鏄惁鎷滆姘寸墝',
+ message: '璇烽�夋嫨鏄惁鎽嗘斁姘寸墝',
trigger: 'blur'
}],
connPerson: [{
@@ -428,11 +431,11 @@
message: '璇疯緭鍏ヨ仈绯荤數璇�',
trigger: 'blur'
}],
- statu: [{
- required: true,
- message: '璇烽�夋嫨鐘舵��',
- trigger: 'blur'
- }],
+ // statu: [{
+ // // required: true,
+ // message: '璇烽�夋嫨鐘舵��',
+ // trigger: 'blur'
+ // }],
},
typeOptions: [
@@ -487,6 +490,28 @@
this.queryParams.pageNum = 1;
this.getList();
},
+ reset() {
+ if (this.$refs.menu != undefined) {
+ this.$refs.menu.setCheckedKeys([]);
+ }
+ this.menuExpand = false,
+ this.menuNodeAll = false,
+ this.deptExpand = true,
+ this.deptNodeAll = false,
+ this.form = {
+ roleId: undefined,
+ roleName: undefined,
+ roleKey: undefined,
+ roleSort: 0,
+ status: "0",
+ menuIds: [],
+ deptIds: [],
+ menuCheckStrictly: true,
+ deptCheckStrictly: true,
+ remark: undefined
+ };
+ this.resetForm("elForm");
+ },
/** 閲嶇疆鎸夐挳鎿嶄綔 */
resetQuery() {
this.dateRange = [];
@@ -496,17 +521,20 @@
newRequest(){
+ this.reset();
this.open = true;
this.title = "鏂扮敵璇�"
},
cancel() {
this.open = false;
- // this.reset();
+ this.reset();
},
submitDataScope: function() {
this.$refs["elForm"].validate(valid => {
// alert(valid)
if (valid) {
+ // console.log(this.formDat,'formDat')
+ this.formDat.statu = 3
addMeeting(this.formDat).then(response => {
this.$modal.msgSuccess("鏂板鎴愬姛");
this.open = false;
diff --git a/ruoyi-ui/src/views/meeting/meetingInfo.vue b/ruoyi-ui/src/views/meeting/meetingInfo.vue
index 4938380..407e8b9 100644
--- a/ruoyi-ui/src/views/meeting/meetingInfo.vue
+++ b/ruoyi-ui/src/views/meeting/meetingInfo.vue
@@ -124,7 +124,7 @@
<el-form-item label="鐘舵��" prop="statu" label-width="120px"
style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
<el-select v-model="formData.statu" placeholder="璇烽�夋嫨 " clearable :style="{width: '100%'}"
- :disabled="dsb">
+ :disabled="true">
<el-option v-for="(item, index) in typeOptions2" :key="index" :label="item.label"
:value="item.value"></el-option>
</el-select>
@@ -255,7 +255,7 @@
trigger: 'blur'
}],
statu: [{
- required: true,
+ // required: true,
message: '璇烽�夋嫨鐘舵��',
trigger: 'blur'
}],
@@ -279,6 +279,10 @@
{
value: 0,
label: '鎷掔粷',
+ },
+ {
+ value: 3 ,
+ label: '寰呭鎵�',
}
],
}
--
Gitblit v1.9.1