From 0d7d6fc9a5c40ccc90190b0f24039ec1362f120f Mon Sep 17 00:00:00 2001
From: “dzb” <2632970487@qq.com>
Date: 星期一, 17 十月 2022 11:33:10 +0800
Subject: [PATCH] 新增设备管理、完善消息新增,修改bug
---
src/views/systemSetting/baseSetting/department/updateUser/index.vue | 54 ++++++++++++++++--------------------------------------
1 files changed, 16 insertions(+), 38 deletions(-)
diff --git a/src/views/systemSetting/baseSetting/department/updateUser/index.vue b/src/views/systemSetting/baseSetting/department/updateUser/index.vue
index 6f1c887..fecebad 100644
--- a/src/views/systemSetting/baseSetting/department/updateUser/index.vue
+++ b/src/views/systemSetting/baseSetting/department/updateUser/index.vue
@@ -7,18 +7,18 @@
<div class="mainContent">
<el-form ref="user" label-width="140px" autoComplete="on" :model="user" :rules="createUserRules"
label-position="right">
- <!-- 閮ㄩ棬id -->
+ <!-- 閮ㄩ棬id
<el-form-item class="optionItem" label="閮ㄩ棬id:" prop="id">
<el-input v-model="user.id" placeholder="璇疯緭鍏ラ儴闂ㄥ悕绉�" :disabled="!updateFlag"></el-input>
- </el-form-item>
+ </el-form-item> -->
<!-- 閮ㄩ棬鍚嶇О -->
<el-form-item class="optionItem" label="閮ㄩ棬鍚嶇О:" prop="departName">
<el-input v-model="user.departName" placeholder="璇疯緭鍏ラ儴闂ㄥ悕绉�" :disabled="!updateFlag"></el-input>
</el-form-item>
<!-- 涓婄骇閮ㄩ棬 -->
<el-form-item class="optionItems" label="涓婄骇閮ㄩ棬:" prop="parentId">
- <el-select v-model="user.parentId" placeholder="璇烽�夋嫨涓婄骇閮ㄩ棬" :disabled="!updateFlag">
- <el-option v-for="item in typeList" :key="item.departName" :label="item.departName"
+ <el-select v-model="user.parentId" placeholder="璇烽�夋嫨涓婄骇閮ㄩ棬" disabled>
+ <el-option v-for="item in departList" :key="item.departName" :label="item.departName"
:value="item.id">
</el-option>
</el-select>
@@ -26,7 +26,7 @@
<!-- 閮ㄩ棬绫诲瀷 -->
<el-form-item class="optionItem" label="閮ㄩ棬绫诲瀷:" prop="departType">
<el-select v-model="user.departType" placeholder="璇烽�夋嫨閮ㄩ棬绫诲瀷" :disabled="!updateFlag">
- <el-option v-for="item in typeList" :key="item.name" :label="item.name" :value="item.value">
+ <el-option v-for="item in typeList" :key="item.id" :label="item.name" :value="item.id">
</el-option>
</el-select>
</el-form-item>
@@ -47,6 +47,7 @@
</div>
</template>
<script>
+import {getTypeList} from '@/utils/helper'
export default {
data() {
const validateNickname = (rule, value, callback) => {
@@ -110,8 +111,8 @@
{ required: false, trigger: "blur" },
],
},
- roleList: [
- { name: '瑙掕壊1', value: 1 }, { name: '瑙掕壊2', value: 2 }
+ departList: [
+
],
typeList: []
}
@@ -119,16 +120,11 @@
created() {
const that = this;
this.user = JSON.parse(JSON.stringify(that.userInfo));
- // 鑾峰彇瑙掕壊鍒楄〃
- // this.$axios.get('')
- // 鑾峰彇鐢ㄦ埛绫诲瀷鍒楄〃
- // this.$axios.get('sccg/admin/list',{userType:0}).then(res=>{
- // console.log(res);
- // })
- // 鑾峰彇鍏ㄩ儴閮ㄩ棬鍒楄〃
this.$axios.get('sccg/depart/page').then(res => {
- that.typeList = res.data.records;
- })
+ that.departList = res.data.records;
+ });
+ // 鑾峰彇閮ㄩ棬绫诲瀷
+ this.getDepartType();
},
methods: {
handleUser() {
@@ -154,6 +150,10 @@
return false;
}
})
+ },
+ // 鑾峰彇閮ㄩ棬绫诲瀷
+ async getDepartType(){
+ this.typeList = await getTypeList(1,'08')
}
},
props: ['userInfo', 'updateFlag', 'getUserList', 'changeDialog']
@@ -163,28 +163,6 @@
.updateUser {
border-radius: 1px;
background-color: #09152f;
-
- // header {
- // display: flex;
- // justify-content: center;
- // height: 60px;
- // line-height: 60px;
- // padding: 0 20px;
- // border: 1px solid #fff;
-
- // .headerTitle {
- // color: #4b9bb7;
- // font-weight: 600;
- // }
-
- // .headerTip span {
- // color: #ff3b6c;
- // }
-
- // .headerTip label {
- // color: #4b9bb7;
- // }
- // }
main {
// border: 1px solid #fff;
--
Gitblit v1.8.0