From 05013f375e82f8860b86bf82ea03555c038d6fae Mon Sep 17 00:00:00 2001
From: lzhe <181968431@qq.com>
Date: 星期一, 01 四月 2024 00:04:44 +0800
Subject: [PATCH] 1

---
 src/views/console/system/addMenu.vue |  167 +++++++++++++++++++++--------------------
 src/views/console/system/menu.vue    |   39 +++++----
 2 files changed, 107 insertions(+), 99 deletions(-)

diff --git a/src/views/console/system/addMenu.vue b/src/views/console/system/addMenu.vue
index 95b011e..7450ce8 100644
--- a/src/views/console/system/addMenu.vue
+++ b/src/views/console/system/addMenu.vue
@@ -1,78 +1,83 @@
 <template>
 	<el-dialog :title="titleMap[mode]" v-model="visible" :width="900" destroy-on-close @closed="$emit('closed')">
-		<el-form :model="form" :rules="rules" :disabled="mode=='show'" ref="dialogForm" label-width="120px" label-position="center">
+		<el-form :model="formAddMenu" :rules="addMenuRules" :disabled="mode=='show'" ref="dialogForm" label-width="120px" label-position="center">
 			<el-row>
 				<el-col :span="12">
-					<el-form-item label="鑿滃崟鍚嶇О" prop="userName">
-						<el-input v-model="form.userName" placeholder="瀛楀吀缂栧彿" clearable></el-input>
+					<el-form-item label="鑿滃崟鍚嶇О" prop="name">
+						<el-input v-model="formAddMenu.name" placeholder="鑿滃崟鍚嶇О" clearable></el-input>
 					</el-form-item>
 				</el-col>
 				<el-col :span="12">
-					<el-form-item label="璺敱鍦板潃" prop="name">
-						<el-input v-model="form.name" placeholder="瀛楀吀鍚嶇О" clearable></el-input>
+					<el-form-item label="璺敱鍦板潃">
+						<el-input v-model="formAddMenu.path" placeholder="璺敱鍦板潃" clearable></el-input>
 					</el-form-item>
 				</el-col>
 				<el-col :span="12">
-					<el-form-item label="涓婄骇鑿滃崟" prop="name">
-						<el-input v-model="form.name" placeholder="瀛楀吀鎺掑簭" clearable></el-input>
+					<el-form-item label="涓婄骇鑿滃崟">
+						<el-tree-select
+						    v-model="formAddMenu.parentId"
+						    clearable
+						    placeholder="涓婄骇鑿滃崟"
+						    :data="parentData"
+						    check-strictly
+						    :props="{ label: 'title' }"
+						    style="width:100%;"
+						    :render-after-expand="false" />
 					</el-form-item>
 				</el-col>
 				<el-col :span="12">
-					<el-form-item label="鑿滃崟鍥炬爣" prop="name">
-						<el-input v-model="form.name" placeholder="瀛楀吀鎺掑簭" clearable></el-input>
+					<el-form-item label="鑿滃崟鍥炬爣">
+						<el-input v-model="formAddMenu.source" placeholder="鑿滃崟鍥炬爣" clearable></el-input>
 					</el-form-item>
 				</el-col>
 				<el-col :span="12">
-					<el-form-item label="鑿滃崟缂栧彿" prop="name">
-						<el-input v-model="form.name" placeholder="瀛楀吀鎺掑簭" clearable></el-input>
+					<el-form-item label="鑿滃崟缂栧彿" prop="code">
+						<el-input v-model="formAddMenu.code" placeholder="鑿滃崟缂栧彿" clearable></el-input>
 					</el-form-item>
 				</el-col>
 				<el-col :span="12">
-					<el-form-item label="鑿滃崟绫诲瀷" prop="name">
-						<el-radio-group v-model="form.name">
-							<el-radio :value="1">APP</el-radio>
-							<el-radio :value="2">鑿滃崟</el-radio>
-							<el-radio :value="3">鎸夐挳</el-radio>
-							<el-radio :value="4">鍗$墖</el-radio>
+					<el-form-item label="鑿滃崟绫诲瀷" prop="belongApplication">
+						<el-radio-group v-model="formAddMenu.belongApplication">
+						    <el-radio v-for="item in belongApplicationList" :label="item.label" :key="item.id">{{item.value}}</el-radio>
 						</el-radio-group>
 					</el-form-item>
 				</el-col>
 				<el-col :span="12">
-					<el-form-item label="鑿滃崟鍒悕" prop="name">
-						<el-input v-model="form.name" placeholder="瀛楀吀鎺掑簭" clearable></el-input>
+					<el-form-item label="鑿滃崟鍒悕" prop="alias">
+						<el-input v-model="formAddMenu.alias" placeholder="鑿滃崟鍒悕" clearable></el-input>
 					</el-form-item>
 				</el-col>
 				<el-col :span="12">
-					<el-form-item label="鏂扮獥鍙�" prop="name">
-						<el-radio-group v-model="form.name">
-							<el-radio :value="1">鏄�</el-radio>
-							<el-radio :value="2">鍚�</el-radio>
+					<el-form-item label="鏂扮獥鍙�" prop="isOpen">
+						<el-radio-group v-model="formAddMenu.isOpen">
+							<el-radio :label="1">鍚�</el-radio>
+							<el-radio :label="2">鏄�</el-radio>
 						</el-radio-group>
 					</el-form-item>
 				</el-col>
 				<el-col :span="12">
-					<el-form-item label="鍚敤缂撳瓨" prop="name">
-						<el-radio-group v-model="form.name">
-							<el-radio :value="1">鏄�</el-radio>
-							<el-radio :value="2">鍚�</el-radio>
+					<el-form-item label="鍚敤缂撳瓨" prop="keepAlive">
+						<el-radio-group v-model="formAddMenu.keepAlive">
+							<el-radio :label="1">鍚�</el-radio>
+							<el-radio :label="2">鏄�</el-radio>
 						</el-radio-group>
 					</el-form-item>
 				</el-col>
 				<el-col :span="12">
-					<el-form-item label="鎵�灞炲簲鐢�" prop="name">
-						<el-select v-model="form.name" style="width: 100%">
-							<el-option v-for="item in groups" :key="item.id" :label="item.label" :value="item.id"/>
+					<el-form-item label="鎵�灞炲簲鐢�" prop="category">
+						<el-select v-model="formAddMenu.category" style="width: 100%">
+							<el-option v-for="item in applicationList" :key="item.code" :label="item.name" :value="item.code"/>
 						</el-select>
 					</el-form-item>
 				</el-col>
 				<el-col :span="24">
-					<el-form-item label="鑿滃崟鎺掑簭" prop="name">
-						<el-input v-model="form.name" placeholder="鑿滃崟鎺掑簭" clearable></el-input>
+					<el-form-item label="鑿滃崟鎺掑簭" prop="sort">
+						<el-input v-model="formAddMenu.sort" placeholder="鑿滃崟鎺掑簭" clearable></el-input>
 					</el-form-item>
 				</el-col>
 				<el-col :span="24">
-					<el-form-item label="鑿滃崟澶囨敞" prop="name">
-						<el-input v-model="form.name" type="textarea" placeholder="鑿滃崟澶囨敞" clearable></el-input>
+					<el-form-item label="鑿滃崟澶囨敞">
+						<el-input v-model="formAddMenu.remark" type="textarea" placeholder="鑿滃崟澶囨敞" clearable></el-input>
 					</el-form-item>
 				</el-col>
 			</el-row>
@@ -89,6 +94,13 @@
 		emits: ['success', 'closed'],
 		data() {
 			return {
+				parentData: {},
+				belongApplicationList: [
+					{label: 1,id: "1",value: "APP"},
+					{label: 2,id: "2",value: "鑿滃崟"},
+					{label: 3,id: "3",value: "鎸夐挳"},
+					{label: 4,id: "4",value: "鍗$墖"}
+				],
 				value1: true,
 				mode: "add",
 				titleMap: {
@@ -99,50 +111,34 @@
 				visible: false,
 				isSaveing: false,
 				//琛ㄥ崟鏁版嵁
-				form: {
-					id:"",
-					userName: "",
-					avatar: "",
+				formAddMenu: {
 					name: "",
-					dept: "",
-					group: []
+					path: "",
+					parentId: "",
+					code: "",
+					$belongApplication: '鑿滃崟',
+					belongApplication: 2,
+					alias: "",
+					isOpen: 1,
+					$isOpen: "鍚�",
+					keepAlive: 2,
+					$keepAlive: "鏄�",
+					$category: "",
+					category: "",
+					$category: "",
+					sort: "",
+					remark: ""
 				},
 				//楠岃瘉瑙勫垯
-				rules: {
-					avatar:[
-						{required: true, message: '璇蜂笂浼犲ご鍍�'}
-					],
-					userName: [
-						{required: true, message: '璇疯緭鍏ョ櫥褰曡处鍙�'}
-					],
-					name: [
-						{required: true, message: '璇疯緭鍏ョ湡瀹炲鍚�'}
-					],
-					password: [
-						{required: true, message: '璇疯緭鍏ョ櫥褰曞瘑鐮�'},
-						{validator: (rule, value, callback) => {
-							if (this.form.password2 !== '') {
-								this.$refs.dialogForm.validateField('password2');
-							}
-							callback();
-						}}
-					],
-					password2: [
-						{required: true, message: '璇峰啀娆¤緭鍏ュ瘑鐮�'},
-						{validator: (rule, value, callback) => {
-							if (value !== this.form.password) {
-								callback(new Error('涓ゆ杈撳叆瀵嗙爜涓嶄竴鑷�!'));
-							}else{
-								callback();
-							}
-						}}
-					],
-					dept: [
-						{required: true, message: '璇烽�夋嫨鎵�灞為儴闂�'}
-					],
-					group: [
-						{required: true, message: '璇烽�夋嫨鎵�灞炶鑹�', trigger: 'change'}
-					]
+				addMenuRules: {
+					name:[{required: true, message: '璇疯緭鍏ヨ彍鍗曞悕绉�'}],
+					code:[{required: true, message: '璇疯緭鍏ヨ彍鍗曠紪鍙�'}],
+					belongApplication: [{required: true, message: '璇烽�夋嫨鑿滃崟绫诲瀷', trigger: 'change'}],
+					alias:[{required: true, message: '璇疯緭鍏ヨ彍鍗曞埆鍚�'}],
+					isOpen:[{required: true, message: '璇烽�夋嫨鏂扮獥鍙�'}],
+					keepAlive:[{required: true, message: '璇烽�夋嫨鍚敤缂撳瓨'}],
+					category: [{required: true, message: '璇烽�夋嫨鎵�灞炲簲鐢�', trigger: 'change'}],
+					sort:[{required: true, message: '璇疯緭鍏ヨ彍鍗曟帓搴�'}]
 				},
 				//鎵�闇�鏁版嵁閫夐」
 				groups: [],
@@ -158,11 +154,23 @@
 				}
 			}
 		},
+		props: ['applicationList'],
 		mounted() {
 			// this.getGroup()
 			// this.getDept()
+			this.parentIdload();
 		},
 		methods: {
+			parentIdload(node, resolve) {
+				this.$HTTP.get("/api/blade-system/menu/tree").then(res=> {
+					if(res.code == 200) {
+						res.data.forEach(item=> {
+							item.label = item.title;
+						})
+						this.parentData = res.data;
+					}
+				})
+			},
 			//鏄剧ず
 			open(mode='add'){
 				this.mode = mode;
@@ -199,15 +207,8 @@
 			},
 			//琛ㄥ崟娉ㄥ叆鏁版嵁
 			setData(data){
-				this.form.id = data.id
-				this.form.userName = data.userName
-				this.form.avatar = data.avatar
-				this.form.name = data.name
-				this.form.group = data.group
-				this.form.dept = data.dept
-
 				//鍙互鍜屼笂闈竴鏍峰崟涓敞鍏ワ紝涔熷彲浠ュ儚涓嬮潰涓�鏍风洿鎺ュ悎骞惰繘鍘�
-				//Object.assign(this.form, data)
+				Object.assign(this.formAddMenu, data)
 			}
 		}
 	}
diff --git a/src/views/console/system/menu.vue b/src/views/console/system/menu.vue
index f561906..ed138c9 100644
--- a/src/views/console/system/menu.vue
+++ b/src/views/console/system/menu.vue
@@ -48,7 +48,7 @@
 				</div>
 			</div>
 			<div class="dict-table">
-				<el-table ref="multipleTableRef" :data="tableData" border style="width: 100%" class="multipleTableRef" @selection-change="handleSelectionChange">
+				<el-table ref="multipleTableRef" :data="tableData" border style="width: 100%" class="multipleTableRef" @selection-change="handleSelectionChange" row-key="id" lazy :load="tableLoad" :tree-props="{ children: 'children', hasChildren: 'hasChildren' }">
 					<el-table-column type="selection" width="55" />
 					<el-table-column prop="name" label="鑿滃崟鍚嶇О"></el-table-column>
 					<el-table-column prop="path" label="璺敱鍦板潃"></el-table-column>
@@ -76,20 +76,11 @@
 						</template>
 					</el-table-column>
 				</el-table>
-				<el-pagination
-					@size-change="handleSizeChange"
-					@current-change="handleCurrentChange"
-					:current-page="currentPage4"
-					:page-sizes="[100, 200, 300, 400]"
-					:page-size="100"
-					layout="total, sizes, prev, pager, next, jumper"
-					:total="400">
-				</el-pagination>
 			</div>
 		</div>
 	</div>
 	
-	<save-dialog v-if="dialog.save" ref="saveDialog" @success="handleSuccess" @closed="dialog.save=false"></save-dialog>
+	<save-dialog v-if="dialog.save" ref="saveDialog" :applicationList="applicationList" @success="handleSuccess" @closed="dialog.save=false"></save-dialog>
 </template>
 <script>
 	import saveDialog from './addMenu'
@@ -129,6 +120,18 @@
 			saveDialog
 		},
 		methods: {
+			handleSuccess() {
+
+			},
+			tableLoad(row,treeNode,resolve) {
+				this.searchData.parentId= row.id;
+				this.$HTTP.get("/api/blade-system/menu/lazy-list",this.searchData).then(res=> {
+					if(res.code == 200) {
+						resolve(res.data);
+					}
+				})
+
+			},
 			clearSearch() {
 				this.searchData= {
 					name: "",
@@ -145,11 +148,10 @@
 					}
 				})
 			},
-			searchBtn() {
-				this.searchData.parentId="";
+			searchBtn(parentId="0") {
+				this.searchData.parentId= parentId;
 				this.$HTTP.get("/api/blade-system/menu/lazy-list",this.searchData).then(res=> {
 					if(res.code == 200) {
-						console.log(res.data,111)
 						this.tableData = res.data;
 					}
 				})
@@ -172,8 +174,13 @@
 			},
 			table_edit(row){
 				this.dialog.save = true
-				this.$nextTick(() => {
-					this.$refs.saveDialog.open('edit').setData(row)
+				this.$HTTP.get("/api/blade-system/menu/detail?id="+row.id).then(res=> {
+					if(res.code == 200) {
+						this.dialog.save = true;
+						this.$nextTick(() => {
+							this.$refs.saveDialog.open('edit').setData(res.data);
+						})
+					}
 				})
 			},
 			//鏌ョ湅

--
Gitblit v1.9.3