From 0cb7c4532ca4cfa7f32888d201673a34ac5ba763 Mon Sep 17 00:00:00 2001
From: lzhe <lzhe@example.com>
Date: 星期二, 02 四月 2024 12:03:30 +0800
Subject: [PATCH] 1

---
 src/views/console/system/addDict.vue |    9 ----
 src/views/console/system/dict.vue    |   65 ++++++++++++++++++++++++++------
 src/views/console/system/menu.vue    |   10 ++--
 3 files changed, 58 insertions(+), 26 deletions(-)

diff --git a/src/views/console/system/addDict.vue b/src/views/console/system/addDict.vue
index 9a0a522..156d03d 100644
--- a/src/views/console/system/addDict.vue
+++ b/src/views/console/system/addDict.vue
@@ -120,15 +120,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.addDictForm, data);
 			}
 		}
 	}
diff --git a/src/views/console/system/dict.vue b/src/views/console/system/dict.vue
index 2f05ad4..a75f125 100644
--- a/src/views/console/system/dict.vue
+++ b/src/views/console/system/dict.vue
@@ -2,7 +2,7 @@
  * @Author: lzhe lzhe@example.com
  * @Date: 2024-03-26 10:28:33
  * @LastEditors: lzhe lzhe@example.com
- * @LastEditTime: 2024-03-29 15:31:38
+ * @LastEditTime: 2024-04-02 12:02:57
  * @FilePath: /smart-web/src/views/master/person/main/index.vue
  * @Description: 杩欐槸榛樿璁剧疆,璇疯缃甡customMade`, 鎵撳紑koroFileHeader鏌ョ湅閰嶇疆 杩涜璁剧疆: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 -->
@@ -13,10 +13,7 @@
 				<el-input v-model="searchData.code" placeholder="瀛楀吀缂栧彿" clearable />
 			</el-form-item>
 			<el-form-item label="瀛楀吀鍚嶇О">
-				<el-select v-model="searchData.dictValue" placeholder="瀛楀吀鍚嶇О" clearable>
-					<el-option label="Zone one" value="shanghai" />
-					<el-option label="Zone two" value="beijing" />
-				</el-select>
+				<el-input v-model="searchData.dictValue" placeholder="瀛楀吀鍚嶇О" clearable></el-input>
 			</el-form-item>
 			<el-form-item>
 				<el-button type="primary" @click="searchclick">鎼滅储</el-button>
@@ -26,8 +23,8 @@
 		<div>
 			<div class="dict-Btn">
 				<div class="dict-btn-bottom"> 
-					<el-button type="primary" @click="addPerson">+ 鏂板</el-button>
-					<el-button type="danger" plain @click="delPerson">鍒犻櫎</el-button>
+					<el-button type="primary" @click="addData">+ 鏂板</el-button>
+					<el-button type="danger" plain @click="delData">鍒犻櫎</el-button>
 				</div>
 			</div>
 			<div class="dict-table">
@@ -74,6 +71,7 @@
 		name: "allocation",
 		data(){
 			return {
+				selection: [],
 				total: 0,
 				searchData: {
 					code: "",
@@ -138,9 +136,23 @@
 				})
 			},
 			//鍒犻櫎
-			table_del(row) {},
+			table_del(row) {
+				var that = this;
+				this.$confirm(`纭畾灏嗛�夋嫨鏁版嵁鍒犻櫎?`, '', {
+					type: 'warning'
+				}).then(() => {
+					this.$HTTP.post("/api/blade-system/dict/remove?ids="+row.id).then(res=> {
+						if(res.code == 200) {
+							that.$message.success("鎿嶄綔鎴愬姛");
+							that.searchBtn();
+						}
+					})
+				}).catch(() => {
+
+				})
+			},
 			//娣诲姞
-			addPerson(){
+			addData(){
 				this.dialog.save = true
 				this.$nextTick(() => {
 					this.$refs.saveDialog.open()
@@ -148,8 +160,13 @@
 			},
 			table_edit(row){
 				this.dialog.save = true
-				this.$nextTick(() => {
-					this.$refs.saveDialog.open('edit').setData(row)
+				this.$HTTP.get("/api/blade-system/dict/detail?id="+row.id).then(res=> {
+					if(res.code == 200) {
+						this.dialog.save = true;
+						this.$nextTick(() => {
+							this.$refs.saveDialog.open('edit').setData(res.data);
+						})
+					}
 				})
 			},
 			//鏌ョ湅
@@ -159,8 +176,30 @@
 					this.$refs.saveDialog.open('show').setData(row)
 				})
 			},
-			handleSelectionChange() {},
-			delPerson() {},
+			handleSelectionChange(selection) {
+				this.selection = selection;
+			},
+			delData() {
+				if(this.selection.length == 0) {
+					this.$message({
+			          message: '璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�',
+			          type: 'warning'
+			        });
+			        return;
+				}
+				var selStr = "";
+				this.selection.map(item=> {
+					selStr += item.id + ","
+				})
+				selStr = selStr.replace(/,$/, '');
+				var that = this;
+				this.$HTTP.post("/api/blade-system/dict/remove?ids="+selStr).then(res=> {
+					if(res.code == 200) {
+						that.$message.success("鎿嶄綔鎴愬姛");
+						that.searchclick();
+					}
+				})
+			},
 			changeDepartment() {
 				this.departmentVisible = true;
 			},
diff --git a/src/views/console/system/menu.vue b/src/views/console/system/menu.vue
index ea69a17..5745c15 100644
--- a/src/views/console/system/menu.vue
+++ b/src/views/console/system/menu.vue
@@ -2,7 +2,7 @@
  * @Author: lzhe lzhe@example.com
  * @Date: 2024-03-26 10:28:33
  * @LastEditors: lzhe lzhe@example.com
- * @LastEditTime: 2024-04-01 18:24:25
+ * @LastEditTime: 2024-04-02 11:56:39
  * @FilePath: /smart-web/src/views/master/person/main/index.vue
  * @Description: 杩欐槸榛樿璁剧疆,璇疯缃甡customMade`, 鎵撳紑koroFileHeader鏌ョ湅閰嶇疆 杩涜璁剧疆: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 -->
@@ -43,8 +43,8 @@
 		<div>
 			<div class="dict-Btn">
 				<div class="dict-btn-bottom"> 
-					<el-button type="primary" @click="addPerson">+ 鏂板</el-button>
-					<el-button type="danger" plain @click="delPerson">鍒犻櫎</el-button>
+					<el-button type="primary" @click="addData">+ 鏂板</el-button>
+					<el-button type="danger" plain @click="delData">鍒犻櫎</el-button>
 				</div>
 			</div>
 			<div class="dict-table">
@@ -186,7 +186,7 @@
 				})
 			},
 			//娣诲姞
-			addPerson(){
+			addData(){
 				this.dialog.save = true
 				this.$nextTick(() => {
 					this.$refs.saveDialog.open()
@@ -216,7 +216,7 @@
 			handleSelectionChange(selection) {
 				this.selection = selection;
 			},
-			delPerson() {
+			delData() {
 				if(this.selection.length == 0) {
 					this.$message({
 			          message: '璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�',

--
Gitblit v1.9.3