From a2441175073f8b09a7eff29effd7e3e617de2f7d Mon Sep 17 00:00:00 2001
From: lzhe <lzhe@example.com>
Date: 星期四, 06 六月 2024 18:23:01 +0800
Subject: [PATCH] Merge branch 'master' of http://www.beijingsoft.cn:9090/r/smart-web
---
src/views/console/system/addDict.vue | 122 ++++++++++++++++------------------------
1 files changed, 50 insertions(+), 72 deletions(-)
diff --git a/src/views/console/system/addDict.vue b/src/views/console/system/addDict.vue
index e37b9dc..b684540 100644
--- a/src/views/console/system/addDict.vue
+++ b/src/views/console/system/addDict.vue
@@ -1,37 +1,37 @@
<template>
<el-dialog :title="titleMap[mode]" v-model="visible" :width="800" 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="addDictForm" :rules="addDictRules" :disabled="mode=='show'" ref="dialogForm" label-width="120px" label-position="center">
<el-row>
<el-col :span="24">
- <el-form-item label="瀛楀吀缂栧彿" prop="userName">
- <el-input v-model="form.userName" placeholder="瀛楀吀缂栧彿" clearable></el-input>
+ <el-form-item label="瀛楀吀缂栧彿" prop="code">
+ <el-input v-model="addDictForm.code" 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="dictValue">
+ <el-input v-model="addDictForm.dictValue" 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="sort">
+ <el-input v-model="addDictForm.sort" placeholder="瀛楀吀鎺掑簭" clearable></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="灏佸瓨" prop="name">
- <el-switch v-model="value1" />
+ <el-form-item label="灏佸瓨">
+ <el-switch v-model="addDictForm.isSealed" />
</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="addDictForm.remark" placeholder="瀛楀吀澶囨敞" clearable></el-input>
</el-form-item>
</el-col>
</el-row>
</el-form>
<template #footer>
<el-button @click="visible=false" >鍙� 娑�</el-button>
- <el-button v-if="mode!='show'" type="primary" :loading="isSaveing" @click="submit()">淇� 瀛�</el-button>
+ <el-button v-if="mode!='show'" type="primary" :loading="isSaveing" @click="dictSubmit()">淇� 瀛�</el-button>
</template>
</el-dialog>
</template>
@@ -51,50 +51,20 @@
visible: false,
isSaveing: false,
//琛ㄥ崟鏁版嵁
- form: {
- id:"",
- userName: "",
- avatar: "",
- name: "",
- dept: "",
- group: []
+ addDictForm: {
+ code: "",
+ dictValue: "",
+ sort: "",
+ isSealed: false,
+ remark: "",
+ dictKey: "-1",
+ $isSealed: "鍚�"
},
//楠岃瘉瑙勫垯
- 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'}
- ]
+ addDictRules: {
+ code:[{required: true, message: '璇疯緭鍏ュ瓧鍏哥紪鍙�'}],
+ dictValue:[{required: true, message: '璇疯緭鍏ュ瓧鍏稿悕绉�'}],
+ sort:[{required: true, message: '璇疯緭鍏ュ瓧鍏告帓搴�'}]
},
//鎵�闇�鏁版嵁閫夐」
groups: [],
@@ -131,19 +101,28 @@
this.depts = res.data;
},
//琛ㄥ崟鎻愪氦鏂规硶
- submit(){
+ dictSubmit(){
+ var obj = Object.assign({},this.addDictForm);
+ if(obj.isSealed === true) {
+ obj.$isSealed = "鏄�";
+ obj.isSealed = "1";
+ }else {
+ obj.$isSealed = "鍚�";
+ obj.isSealed = "0";
+ }
this.$refs.dialogForm.validate(async (valid) => {
if (valid) {
this.isSaveing = true;
- var res = await this.$API.demo.post.post(this.form);
- this.isSaveing = false;
- if(res.code == 200){
- this.$emit('success', this.form, this.mode)
- this.visible = false;
- this.$message.success("鎿嶄綔鎴愬姛")
- }else{
- this.$alert(res.message, "鎻愮ず", {type: 'error'})
- }
+ this.$HTTP.post("/api/blade-system/dict/submit",obj).then(res=> {
+ this.isSaveing = false;
+ if(res.code == 200) {
+ this.$emit('success', this.addDictForm, this.mode);
+ this.visible = false;
+ this.$message.success("鎿嶄綔鎴愬姛");
+ }else {
+ this.$alert(res.message, "鎻愮ず", {type: 'error'});
+ }
+ })
}else{
return false;
}
@@ -151,15 +130,14 @@
},
//琛ㄥ崟娉ㄥ叆鏁版嵁
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
-
+ console.log(data)
//鍙互鍜屼笂闈竴鏍峰崟涓敞鍏ワ紝涔熷彲浠ュ儚涓嬮潰涓�鏍风洿鎺ュ悎骞惰繘鍘�
- //Object.assign(this.form, data)
+ if(data.isSealed == "1") {
+ data.isSealed = true;
+ }else {
+ data.isSealed = false;
+ }
+ Object.assign(this.addDictForm, data);
}
}
}
--
Gitblit v1.9.3