RRSWithSmartHome
/
wms_vue
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: RRSWithSmartHome:65b8f5d36806e9a3f22dc1edec1c718ba26196f8
Branches Tags
RRSWithSmartHome:hwork-master
RRSWithSmartHome:master
...
compare: RRSWithSmartHome:126586f6636d11a3c5068480b29593f9257f66eb
Branches Tags
RRSWithSmartHome:hwork-master
RRSWithSmartHome:master

6 Commits
65b8f5d368 ... 126586f663

Author SHA1 Message Date
A0066811 126586f663 hgwms-2098 fix 租户管理弹窗修改 2025-11-07 14:55:26 +08:00
A0066811 f907724c24 hgwms-2098 fix 角色管理弹窗修改 2025-11-07 14:48:53 +08:00
A0066811 84633099a9 hgwms-2098 fix 用户管理弹窗修改 2025-11-07 14:40:27 +08:00
A0066811 dda045dde0 hgwms-2098 fix 部门管理弹窗修改 2025-11-07 14:32:00 +08:00
A0066811 82a5263854 hgwms-2098 fix 岗位管理弹窗修改 2025-11-07 14:26:24 +08:00
A0066811 d7c8e2758b hgwms-2098 fix 策略参数弹窗修改 2025-11-07 14:21:38 +08:00
22 changed files with 1683 additions and 1367 deletions
Show Stats Expand all files Collapse all files

1134
src/view/config/modal/addConfig.vue
View File

File diff suppressed because it is too large Load Diff

111
src/view/config/modal/edit.vue
View File

@ -11,28 +11,40 @@
ref="formRef"
:model="formState"
:rules="formRules"
:label-col="labelCol"
:wrapper-col="wrapperCol">
<a-form-item ref="name" label="描述" name="name">
<a-textarea v-model:value="formState.name" />
</a-form-item>
<a-form-item ref="code" label="编号" name="code">
<a-input v-model:value="formState.code" />
</a-form-item>
<a-form-item ref="value" label="值" name="value">
<a-textarea v-model:value="formState.value" />
</a-form-item>
<a-form-item label="状态" name="enable">
<a-switch v-model:checked="formState.enable" />
</a-form-item>
<a-form-item label="备注" name="remark">
<a-textarea v-model:value="formState.remark" />
</a-form-item>
layout="vertical"
>
<a-row :gutter="[16, 0]">
<a-col :span="24">
<a-form-item ref="name" label="描述" name="name">
<a-textarea v-model:value="formState.name" />
</a-form-item>
</a-col>
<a-col :span="24">
<a-form-item ref="code" label="编号" name="code">
<a-input v-model:value="formState.code" />
</a-form-item>
</a-col>
<a-col :span="24">
<a-form-item ref="value" label="值" name="value">
<a-textarea v-model:value="formState.value" />
</a-form-item>
</a-col>
<a-col :span="24">
<a-form-item label="状态" name="enable">
<a-switch v-model:checked="formState.enable" />
</a-form-item>
</a-col>
<a-col :span="24">
<a-form-item label="备注" name="remark">
<a-textarea v-model:value="formState.remark" />
</a-form-item>
</a-col>
</a-row>
</a-form>
</a-modal>
</template>
<script>
import { message } from '@hwork/ant-design-vue';
import { message } from "@hwork/ant-design-vue";
import { edit } from "@/api/module/config";
import { defineComponent, reactive, ref, toRaw, watch } from "vue";
@ -44,29 +56,28 @@ export default defineComponent({
},
record: {
type: Object,
}
},
},
emit: ["close"],
setup(props, context) {
const formRef = ref();
let formState = reactive({});
const formRules = {
name: [{ required: true, message: '请输入配置描述', trigger: 'blur'}],
code: [{ required: true, message: '请输入配置编号', trigger: 'blur'}],
value: [{ required: true, message: '请输入配置值', trigger: 'blur'}]
name: [{ required: true, message: "请输入配置描述", trigger: "blur" }],
code: [{ required: true, message: "请输入配置编号", trigger: "blur" }],
value: [{ required: true, message: "请输入配置值", trigger: "blur" }],
};
watch(props,(props) => {
formState.id = props.record.id
formState.name = props.record.name
formState.code = props.record.code
formState.value = props.record.value
formState.remark = props.record.remark
formState.enable = props.record.enable
})
watch(props, (props) => {
formState.id = props.record.id;
formState.name = props.record.name;
formState.code = props.record.code;
formState.value = props.record.value;
formState.remark = props.record.remark;
formState.enable = props.record.enable;
});
const submit = (e) => {
message.loading({
@ -78,21 +89,25 @@ export default defineComponent({
.then(() => {
edit(toRaw(formState)).then((response) => {
if (response.success) {
message.success({
content: "保存成功",
key,
duration: 1,
}).then(()=>{
cancel();
});
message
.success({
content: "保存成功",
key,
duration: 1,
})
.then(() => {
cancel();
});
} else {
message.error({
content: "保存失败",
key,
duration: 1,
}).then(()=>{
cancel();
});
message
.error({
content: "保存失败",
key,
duration: 1,
})
.then(() => {
cancel();
});
}
});
})
@ -112,10 +127,10 @@ export default defineComponent({
formRef,
formState,
formRules,
labelCol: { span: 6 },
wrapperCol: { span: 18 },
};
},
});
</script>
</script>

77
src/view/config/modal/info.vue
View File

@ -11,23 +11,35 @@
ref="formRef"
:model="formState"
:rules="formRules"
:label-col="labelCol"
:wrapper-col="wrapperCol">
<a-form-item ref="name" label="描述" name="name">
<a-textarea v-model:value="formState.name" />
</a-form-item>
<a-form-item ref="code" label="编号" name="code">
<a-input v-model:value="formState.code" />
</a-form-item>
<a-form-item ref="value" label="值" name="value">
<a-textarea v-model:value="formState.value" />
</a-form-item>
<a-form-item label="状态" name="enable">
<a-switch v-model:checked="formState.enable" />
</a-form-item>
<a-form-item label="备注" name="remark">
<a-textarea v-model:value="formState.remark" />
</a-form-item>
layout="vertical"
>
<a-row :gutter="[16, 0]">
<a-col :span="24">
<a-form-item ref="name" label="描述" name="name">
<a-textarea v-model:value="formState.name" />
</a-form-item>
</a-col>
<a-col :span="24">
<a-form-item ref="code" label="编号" name="code">
<a-input v-model:value="formState.code" />
</a-form-item>
</a-col>
<a-col :span="24">
<a-form-item ref="value" label="值" name="value">
<a-textarea v-model:value="formState.value" />
</a-form-item>
</a-col>
<a-col :span="24">
<a-form-item label="状态" name="enable">
<a-switch v-model:checked="formState.enable" />
</a-form-item>
</a-col>
<a-col :span="24">
<a-form-item label="备注" name="remark">
<a-textarea v-model:value="formState.remark" />
</a-form-item>
</a-col>
</a-row>
</a-form>
</a-modal>
</template>
@ -42,29 +54,28 @@ export default defineComponent({
},
record: {
type: Object,
}
},
},
emit: ["close"],
setup(props, context) {
const formRef = ref();
let formState = reactive({});
const formRules = {
name: [{ required: true, message: '请输入配置描述', trigger: 'blur'}],
code: [{ required: true, message: '请输入配置编号', trigger: 'blur'}],
value: [{ required: true, message: '请输入配置值', trigger: 'blur'}]
name: [{ required: true, message: "请输入配置描述", trigger: "blur" }],
code: [{ required: true, message: "请输入配置编号", trigger: "blur" }],
value: [{ required: true, message: "请输入配置值", trigger: "blur" }],
};
watch(props,(props) => {
formState.id = props.record.id
formState.name = props.record.name
formState.code = props.record.code
formState.value = props.record.value
formState.remark = props.record.remark
formState.enable = props.record.enable
})
watch(props, (props) => {
formState.id = props.record.id;
formState.name = props.record.name;
formState.code = props.record.code;
formState.value = props.record.value;
formState.remark = props.record.remark;
formState.enable = props.record.enable;
});
const submit = (e) => {
formRef.value.resetFields();
@ -82,10 +93,10 @@ export default defineComponent({
formRef,
formState,
formRules,
labelCol: { span: 6 },
wrapperCol: { span: 18 },
};
},
});
</script>
</script>

85
src/view/config/modal/save.vue
View File

@ -11,24 +11,35 @@
ref="formRef"
:model="formState"
:rules="formRules"
:label-col="labelCol"
:wrapper-col="wrapperCol"
layout="vertical"
>
<a-form-item ref="name" label="名称" name="name">
<a-input v-model:value="formState.name" />
</a-form-item>
<a-form-item ref="code" label="编号" name="code">
<a-input v-model:value="formState.code" />
</a-form-item>
<a-form-item ref="value" label="值" name="value">
<a-input v-model:value="formState.value" />
</a-form-item>
<a-form-item label="状态" name="enable">
<a-switch v-model:checked="formState.enable" />
</a-form-item>
<a-form-item label="备注" name="remark">
<a-textarea v-model:value="formState.remark" />
</a-form-item>
<a-row :gutter="[16, 0]">
<a-col :span="12">
<a-form-item ref="name" label="名称" name="name">
<a-input v-model:value="formState.name" />
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item ref="code" label="编号" name="code">
<a-input v-model:value="formState.code" />
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item ref="value" label="值" name="value">
<a-input v-model:value="formState.value" />
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="状态" name="enable">
<a-switch v-model:checked="formState.enable" />
</a-form-item>
</a-col>
<a-col :span="24">
<a-form-item label="备注" name="remark">
<a-textarea v-model:value="formState.remark" />
</a-form-item>
</a-col>
</a-row>
</a-form>
</a-modal>
</template>
@ -53,9 +64,9 @@ export default defineComponent({
});
const formRules = {
name: [{ required: true, message: '请输入配置描述', trigger: 'blur'}],
code: [{ required: true, message: '请输入配置编号', trigger: 'blur'}],
value: [{ required: true, message: '请输入配置值', trigger: 'blur'}]
name: [{ required: true, message: "请输入配置描述", trigger: "blur" }],
code: [{ required: true, message: "请输入配置编号", trigger: "blur" }],
value: [{ required: true, message: "请输入配置值", trigger: "blur" }],
};
const submit = (e) => {
@ -68,21 +79,25 @@ export default defineComponent({
.then(() => {
save(toRaw(formState)).then((response) => {
if (response.success) {
message.success({
content: "保存成功",
key,
duration: 1,
}).then(()=>{
cancel();
});
message
.success({
content: "保存成功",
key,
duration: 1,
})
.then(() => {
cancel();
});
} else {
message.error({
content: response.msg,
key,
duration: 1,
}).then(()=>{
cancel();
});
message
.error({
content: response.msg,
key,
duration: 1,
})
.then(() => {
cancel();
});
}
});
})
@ -108,4 +123,4 @@ export default defineComponent({
};
},
});
</script>
</script>

133
src/view/dept/modal/edit.vue
View File

@ -8,14 +8,14 @@
@cancel="cancel"
>
<a-form
ref="formRef"
ref="formRef"
:model="formState"
:rules="formRules"
:label-col="labelCol"
:wrapper-col="wrapperCol"
layout="vertical"
>
<!-- 当前部门为根部门, 则不提供上级部门选择 -->
<a-form-item label="上级" name="parent" v-if="formState.parent != 0 ">
<a-col :span="12" v-if="formState.parent != 0">
<!-- 当前部门为根部门, 则不提供上级部门选择 -->
<a-form-item label="上级" name="parent">
<a-tree-select
v-model:value="formState.parent"
style="width: 100%"
@ -26,27 +26,38 @@
:replaceFields="replaceFields"
>
</a-tree-select>
</a-form-item>
<a-form-item ref="name" label="名称" name="name">
<a-input v-model:value="formState.name" />
</a-form-item>
<a-form-item ref="sort" label="排序" name="sort">
<a-input-number v-model:value="formState.sort" />
</a-form-item>
<a-form-item label="状态" name="state">
<a-switch v-model:checked="formState.enable" />
</a-form-item>
<a-form-item ref="address" label="地址" name="address">
<a-input v-model:value="formState.address" />
</a-form-item>
<a-form-item label="备注" name="remark">
<a-textarea v-model:value="formState.remark" />
</a-form-item>
</a-form-item>
</a-col>
<a-col :span="24">
<a-form-item ref="name" label="名称" name="name">
<a-input v-model:value="formState.name" />
</a-form-item>
</a-col>
<a-col :span="24">
<a-form-item ref="sort" label="排序" name="sort">
<a-input-number style="width: 100%" v-model:value="formState.sort" />
</a-form-item>
</a-col>
<a-col :span="24">
<a-form-item ref="address" label="地址" name="address">
<a-input v-model:value="formState.address" />
</a-form-item>
</a-col>
<a-col :span="24">
<a-form-item label="状态" name="state">
<a-switch v-model:checked="formState.enable" />
</a-form-item>
</a-col>
<a-col :span="24">
<a-form-item label="备注" name="remark">
<a-textarea v-model:value="formState.remark" />
</a-form-item>
</a-col>
</a-form>
</a-modal>
</template>
<script>
import { message } from '@hwork/ant-design-vue';
import { message } from "@hwork/ant-design-vue";
import { edit, tree } from "@/api/module/dept";
import { defineComponent, reactive, ref, toRaw, watch } from "vue";
export default defineComponent({
@ -56,56 +67,57 @@ export default defineComponent({
},
record: {
type: Object,
}
},
},
emit: ["close"],
setup(props, context) {
const state = reactive({
depts: [],
});
const state = reactive({
depts: [],
})
const formRef = ref();
const formState = reactive({
sort: 0,
enable: true,
});
watch(props,(props) => {
formState.id = props.record.id
formState.name = props.record.name
formState.sort = props.record.sort
formState.parent = props.record.parent
formState.remark = props.record.remark
formState.enable = props.record.enable
formState.address = props.record.address
})
watch(props, (props) => {
formState.id = props.record.id;
formState.name = props.record.name;
formState.sort = props.record.sort;
formState.parent = props.record.parent;
formState.remark = props.record.remark;
formState.enable = props.record.enable;
formState.address = props.record.address;
});
const formRules = {
name: [ { required: true, message: '请输入部门名称', trigger: 'blur'} ],
address: [ { required: true, message: '请输入详细地址', trigger: 'blur'} ],
parent: [ { required: true, message: '请选择上级部门', trigger: 'change'} ]
name: [{ required: true, message: "请输入部门名称", trigger: "blur" }],
address: [{ required: true, message: "请输入详细地址", trigger: "blur" }],
parent: [
{ required: true, message: "请选择上级部门", trigger: "change" },
],
};
const submit = (e) => {
formRef.value
.validate()
.then(() => {
edit(toRaw(formState)).then((response)=>{
if(response.success){
message.success({ content: '保存成功', duration: 1 }).then(()=>{
cancel();
});
}else{
message.success({ content: '保存失败', duration: 1 }).then(()=>{
cancel();
});
}
edit(toRaw(formState)).then((response) => {
if (response.success) {
message.success({ content: "保存成功", duration: 1 }).then(() => {
cancel();
});
} else {
message.success({ content: "保存失败", duration: 1 }).then(() => {
cancel();
});
}
});
})
.catch(error => {
console.log('error', error);
.catch((error) => {
console.log("error", error);
});
};
@ -115,10 +127,10 @@ export default defineComponent({
};
const loadTree = () => {
tree({}).then((response)=>{
tree({}).then((response) => {
state.depts = response.data;
})
}
});
};
/// 加载部门
loadTree();
@ -130,12 +142,17 @@ export default defineComponent({
formRef,
formState,
formRules,
labelCol: { span: 6 },
wrapperCol: { span: 18 },
replaceFields: {children:'children', title:'name', key:'id', value: 'id' }
replaceFields: {
children: "children",
title: "name",
key: "id",
value: "id",
},
};
},
});
</script>
</script>

15
src/view/dept/modal/info.vue
View File

@ -11,11 +11,11 @@
ref="formRef"
:model="formState"
:rules="formRules"
:label-col="labelCol"
:wrapper-col="wrapperCol"
layout="vertical"
>
<a-col :span="12" v-if="formState.parent != 0 ">
<!-- 当前部门为根部门, 则不提供上级部门选择 -->
<a-form-item label="上级" name="parent" v-if="formState.parent != 0 ">
<a-form-item label="上级" name="parent" >
<a-tree-select
v-model:value="formState.parent"
style="width: 100%"
@ -27,18 +27,19 @@
>
</a-tree-select>
</a-form-item>
</a-col>
<a-form-item ref="name" label="名称" name="name">
<a-input v-model:value="formState.name" />
</a-form-item>
<a-form-item ref="sort" label="排序" name="sort">
<a-input-number v-model:value="formState.sort" />
</a-form-item>
<a-form-item label="状态" name="state">
<a-switch v-model:checked="formState.enable" />
<a-input-number style="width: 100%" v-model:value="formState.sort" />
</a-form-item>
<a-form-item ref="address" label="地址" name="address">
<a-input v-model:value="formState.address" />
</a-form-item>
<a-form-item label="状态" name="state">
<a-switch v-model:checked="formState.enable" />
</a-form-item>
<a-form-item label="备注" name="remark">
<a-textarea v-model:value="formState.remark" />
</a-form-item>

136
src/view/dept/modal/save.vue
View File

@ -8,44 +8,60 @@
@cancel="cancel"
>
<a-form
ref="formRef"
ref="formRef"
:model="formState"
:rules="formRules"
:label-col="labelCol"
:wrapper-col="wrapperCol"
layout="vertical"
>
<a-form-item label="上级" name="parent">
<a-tree-select
v-model:value="formState.parent"
style="width: 100%"
:tree-data="state.depts"
placeholder="所属部门"
replace
tree-default-expand-all
:replaceFields="replaceFields"
>
</a-tree-select>
</a-form-item>
<a-form-item ref="name" label="名称" name="name">
<a-input v-model:value="formState.name" />
</a-form-item>
<a-form-item ref="sort" label="排序" name="sort">
<a-input-number v-model:value="formState.sort" />
</a-form-item>
<a-form-item label="状态" name="state">
<a-switch v-model:checked="formState.enable" />
</a-form-item>
<a-form-item ref="address" label="地址" name="address">
<a-input v-model:value="formState.address" />
</a-form-item>
<a-form-item label="备注" name="remark">
<a-textarea v-model:value="formState.remark" />
</a-form-item>
<a-row :gutter="[16, 0]">
<a-col :span="12">
<a-form-item label="上级" name="parent">
<a-tree-select
v-model:value="formState.parent"
style="width: 100%"
:tree-data="state.depts"
placeholder="所属部门"
replace
tree-default-expand-all
:replaceFields="replaceFields"
>
</a-tree-select>
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item ref="name" label="名称" name="name">
<a-input v-model:value="formState.name" />
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item ref="sort" label="排序" name="sort">
<a-input-number
style="width: 100%"
v-model:value="formState.sort"
/>
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item ref="address" label="地址" name="address">
<a-input v-model:value="formState.address" />
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="状态" name="state">
<a-switch v-model:checked="formState.enable" />
</a-form-item>
</a-col>
<a-col :span="24">
<a-form-item label="备注" name="remark">
<a-textarea v-model:value="formState.remark" />
</a-form-item>
</a-col>
</a-row>
</a-form>
</a-modal>
</template>
<script>
import { message } from '@hwork/ant-design-vue';
import { message } from "@hwork/ant-design-vue";
import { save, tree } from "@/api/module/dept";
import { defineComponent, reactive, ref, toRaw } from "vue";
export default defineComponent({
@ -56,42 +72,43 @@ export default defineComponent({
},
emit: ["close"],
setup(props, context) {
const state = reactive({
depts: [],
});
const state = reactive({
depts: [],
})
const formRef = ref();
const formState = reactive({
sort: 0,
enable: true,
});
const formRules = {
name: [ { required: true, message: '请输入部门名称', trigger: 'blur'} ],
address: [ { required: true, message: '请输入详细地址', trigger: 'blur'} ],
parent: [ { required: true, message: '请选择上级部门', trigger: 'change'} ]
name: [{ required: true, message: "请输入部门名称", trigger: "blur" }],
address: [{ required: true, message: "请输入详细地址", trigger: "blur" }],
parent: [
{ required: true, message: "请选择上级部门", trigger: "change" },
],
};
const submit = (e) => {
formRef.value
.validate()
.then(() => {
save(toRaw(formState)).then((response)=>{
if(response.success){
message.success({ content: '保存成功', duration: 1 }).then(()=>{
cancel();
});
}else{
message.success({ content: '保存失败', duration: 1 }).then(()=>{
cancel();
});
}
save(toRaw(formState)).then((response) => {
if (response.success) {
message.success({ content: "保存成功", duration: 1 }).then(() => {
cancel();
});
} else {
message.success({ content: "保存失败", duration: 1 }).then(() => {
cancel();
});
}
});
})
.catch(error => {
console.log('error', error);
.catch((error) => {
console.log("error", error);
});
};
@ -101,10 +118,10 @@ export default defineComponent({
};
const loadTree = () => {
tree({}).then((response)=>{
tree({}).then((response) => {
state.depts = response.data;
})
}
});
};
/// 加载部门
loadTree();
@ -116,12 +133,17 @@ export default defineComponent({
formRef,
formState,
formRules,
labelCol: { span: 6 },
wrapperCol: { span: 18 },
replaceFields: {children:'children', title:'name', key:'id', value: 'id' }
replaceFields: {
children: "children",
title: "name",
key: "id",
value: "id",
},
};
},
});
</script>
</script>

99
src/view/post/modal/edit.vue
View File

@ -8,32 +8,43 @@
@cancel="cancel"
>
<a-form
ref="formRef"
ref="formRef"
:model="formState"
:rules="formRules"
:label-col="labelCol"
:wrapper-col="wrapperCol"
layout="vertical"
>
<a-form-item ref="name" label="名称" name="name">
<a-input v-model:value="formState.name" />
</a-form-item>
<a-form-item ref="code" label="标识" name="code">
<a-input v-model:value="formState.code" />
</a-form-item>
<a-form-item ref="sort" label="标识" name="sort">
<a-input-number v-model:value="formState.sort" />
</a-form-item>
<a-form-item label="状态" name="enable">
<a-switch v-model:checked="formState.enable" />
</a-form-item>
<a-form-item label="备注" name="remark">
<a-textarea v-model:value="formState.remark" />
</a-form-item>
<a-row :gutter="[16, 0]">
<a-col :span="12">
<a-form-item ref="name" label="名称" name="name">
<a-input v-model:value="formState.name" />
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item ref="code" label="标识" name="code">
<a-input v-model:value="formState.code" />
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item ref="sort" label="标识" name="sort">
<a-input-number style="width: 100%" v-model:value="formState.sort" />
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="状态" name="enable">
<a-switch v-model:checked="formState.enable" />
</a-form-item>
</a-col>
<a-col :span="24">
<a-form-item label="备注" name="remark">
<a-textarea v-model:value="formState.remark" />
</a-form-item>
</a-col>
</a-row>
</a-form>
</a-modal>
</template>
<script>
import { message } from '@hwork/ant-design-vue';
import { message } from "@hwork/ant-design-vue";
import { edit } from "@/api/module/post";
import { defineComponent, reactive, ref, toRaw, watch } from "vue";
export default defineComponent({
@ -43,50 +54,53 @@ export default defineComponent({
},
record: {
type: Object,
}
},
},
emit: ["close"],
setup(props, context) {
const formRef = ref();
const formState = reactive({});
watch(props, (props) => {
formState.id = props.record.id
formState.name = props.record.name
formState.code = props.record.code
formState.sort = props.record.sort
formState.remark = props.record.remark
formState.enable = props.record.enable
})
formState.id = props.record.id;
formState.name = props.record.name;
formState.code = props.record.code;
formState.sort = props.record.sort;
formState.remark = props.record.remark;
formState.enable = props.record.enable;
});
const formRules = {
name: [ { required: true, message: '请输入岗位名称', trigger: 'blur'} ],
code: [ { required: true, message: '请输入岗位编号', trigger: 'blur'} ]
name: [{ required: true, message: "请输入岗位名称", trigger: "blur" }],
code: [{ required: true, message: "请输入岗位编号", trigger: "blur" }],
};
const editKey = "add";
const submit = (e) => {
message.loading({ content: '提交中...', key: editKey });
message.loading({ content: "提交中...", key: editKey });
formRef.value
.validate()
.then(() => {
edit(toRaw(formState)).then((response)=>{
if(response.success){
message.success({ content: '保存成功', key: editKey, duration: 1 }).then(()=>{
edit(toRaw(formState)).then((response) => {
if (response.success) {
message
.success({ content: "保存成功", key: editKey, duration: 1 })
.then(() => {
cancel();
});
}else{
message.success({ content: '保存失败', key: editKey, duration: 1 }).then(()=>{
} else {
message
.success({ content: "保存失败", key: editKey, duration: 1 })
.then(() => {
cancel();
});
}
}
});
})
.catch(error => {
console.log('error', error);
.catch((error) => {
console.log("error", error);
});
};
@ -96,16 +110,15 @@ export default defineComponent({
};
return {
submit,
cancel,
formRef,
formState,
formRules,
labelCol: { span: 6 },
wrapperCol: { span: 18 },
};
},
});
</script>
</script>

71
src/view/post/modal/info.vue
View File

@ -8,27 +8,38 @@
@cancel="cancel"
>
<a-form
ref="formRef"
ref="formRef"
:model="formState"
:rules="formRules"
:label-col="labelCol"
:wrapper-col="wrapperCol"
layout="vertical"
>
<a-form-item ref="name" label="名称" name="name">
<a-input v-model:value="formState.name" />
</a-form-item>
<a-form-item ref="code" label="标识" name="code">
<a-input v-model:value="formState.code" />
</a-form-item>
<a-form-item ref="sort" label="标识" name="sort">
<a-input-number v-model:value="formState.sort" />
</a-form-item>
<a-form-item label="状态" name="enable">
<a-switch v-model:checked="formState.enable" />
</a-form-item>
<a-form-item label="备注" name="remark">
<a-textarea v-model:value="formState.remark" />
</a-form-item>
<a-row :gutter="[16, 0]">
<a-col :span="12">
<a-form-item ref="name" label="名称" name="name">
<a-input v-model:value="formState.name" />
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item ref="code" label="标识" name="code">
<a-input v-model:value="formState.code" />
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item ref="sort" label="标识" name="sort">
<a-input-number style="width: 100%" v-model:value="formState.sort" />
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="状态" name="enable">
<a-switch v-model:checked="formState.enable" />
</a-form-item>
</a-col>
<a-col :span="24">
<a-form-item label="备注" name="remark">
<a-textarea v-model:value="formState.remark" />
</a-form-item>
</a-col>
</a-row>
</a-form>
</a-modal>
</template>
@ -41,23 +52,22 @@ export default defineComponent({
},
record: {
type: Object,
}
},
},
emit: ["close"],
setup(props, context) {
const formRef = ref();
const formState = reactive({});
watch(props, (props) => {
formState.id = props.record.id
formState.name = props.record.name
formState.code = props.record.code
formState.sort = props.record.sort
formState.remark = props.record.remark
formState.enable = props.record.enable
})
formState.id = props.record.id;
formState.name = props.record.name;
formState.code = props.record.code;
formState.sort = props.record.sort;
formState.remark = props.record.remark;
formState.enable = props.record.enable;
});
const formRules = {};
@ -72,16 +82,15 @@ export default defineComponent({
};
return {
submit,
cancel,
formRef,
formState,
formRules,
labelCol: { span: 6 },
wrapperCol: { span: 18 },
};
},
});
</script>
</script>

82
src/view/post/modal/save.vue
View File

@ -8,32 +8,43 @@
@cancel="cancel"
>
<a-form
ref="formRef"
ref="formRef"
:model="formState"
:rules="formRules"
:label-col="labelCol"
:wrapper-col="wrapperCol"
layout="vertical"
>
<a-form-item ref="name" label="名称" name="name">
<a-input v-model:value="formState.name" />
</a-form-item>
<a-form-item ref="code" label="标识" name="code">
<a-input v-model:value="formState.code" />
</a-form-item>
<a-form-item ref="sort" label="标识" name="sort">
<a-input-number v-model:value="formState.sort" />
</a-form-item>
<a-form-item label="状态" name="enable">
<a-switch v-model:checked="formState.enable" />
</a-form-item>
<a-form-item label="备注" name="remark">
<a-textarea v-model:value="formState.remark" />
</a-form-item>
<a-row :gutter="[16, 0]">
<a-col :span="12">
<a-form-item ref="name" label="名称" name="name">
<a-input v-model:value="formState.name" />
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item ref="code" label="标识" name="code">
<a-input v-model:value="formState.code" />
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item ref="sort" label="标识" name="sort">
<a-input-number style="width: 100%" v-model:value="formState.sort" />
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="状态" name="enable">
<a-switch v-model:checked="formState.enable" />
</a-form-item>
</a-col>
<a-col :span="24">
<a-form-item label="备注" name="remark">
<a-textarea v-model:value="formState.remark" />
</a-form-item>
</a-col>
</a-row>
</a-form>
</a-modal>
</template>
<script>
import { message } from '@hwork/ant-design-vue';
import { message } from "@hwork/ant-design-vue";
import { save } from "@/api/module/post";
import { defineComponent, reactive, ref, toRaw } from "vue";
export default defineComponent({
@ -44,40 +55,43 @@ export default defineComponent({
},
emit: ["close"],
setup(props, context) {
const formRef = ref();
const formState = reactive({
sort: 0,
enable: "true",
});
const formRules = {
name: [ { required: true, message: '请输入岗位名称', trigger: 'blur'} ],
code: [ { required: true, message: '请输入岗位编号', trigger: 'blur'} ]
name: [{ required: true, message: "请输入岗位名称", trigger: "blur" }],
code: [{ required: true, message: "请输入岗位编号", trigger: "blur" }],
};
const saveKey = "save";
const submit = (e) => {
message.loading({ content: '提交中...', key: saveKey });
message.loading({ content: "提交中...", key: saveKey });
formRef.value
.validate()
.then(() => {
save(toRaw(formState)).then((response)=>{
if(response.success){
message.success({ content: '保存成功', key: saveKey, duration: 1 }).then(()=>{
save(toRaw(formState)).then((response) => {
if (response.success) {
message
.success({ content: "保存成功", key: saveKey, duration: 1 })
.then(() => {
cancel();
});
}else{
message.success({ content: '保存失败', key: saveKey, duration: 1 }).then(()=>{
} else {
message
.success({ content: "保存失败", key: saveKey, duration: 1 })
.then(() => {
cancel();
});
}
}
});
})
.catch(error => {
console.log('error', error);
.catch((error) => {
console.log("error", error);
});
};
@ -92,10 +106,10 @@ export default defineComponent({
formRef,
formState,
formRules,
labelCol: { span: 6 },
wrapperCol: { span: 18 },
};
},
});
</script>
</script>

27
src/view/power/modal/edit.vue
View File

@ -34,33 +34,18 @@
<a-input v-model:value="formState.title" />
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item
v-if="state.showComponent"
ref="component"
label="组件"
name="component"
>
<a-col :span="12" v-if="state.showComponent">
<a-form-item ref="component" label="组件" name="component">
<a-input v-model:value="formState.component" />
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item
v-if="state.showPath"
ref="path"
label="路径"
name="path"
>
<a-col :span="12" v-if="state.showPath">
<a-form-item ref="path" label="路径" name="path">
<a-input v-model:value="formState.path" />
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item
v-if="state.showCode"
ref="code"
label="标识"
name="code"
>
<a-col :span="12" v-if="state.showCode">
<a-form-item ref="code" label="标识" name="code">
<a-input v-model:value="formState.code" />
</a-form-item>
</a-col>

94
src/view/role/modal/edit.vue
View File

@ -8,32 +8,43 @@
@cancel="cancel"
>
<a-form
ref="formRef"
ref="formRef"
:model="formState"
:rules="formRules"
:label-col="labelCol"
:wrapper-col="wrapperCol"
layout="vertical"
>
<a-form-item ref="name" label="名称" name="name">
<a-input v-model:value="formState.name" />
</a-form-item>
<a-form-item ref="code" label="标识" name="code">
<a-input v-model:value="formState.code" />
</a-form-item>
<a-form-item ref="sort" label="排序" name="sort">
<a-input-number v-model:value="formState.sort" />
</a-form-item>
<a-form-item label="状态" name="enable">
<a-switch v-model:checked="formState.enable" />
</a-form-item>
<a-form-item label="备注" name="remark">
<a-textarea v-model:value="formState.remark" />
</a-form-item>
<a-row :gutter="[16, 0]">
<a-col :span="12">
<a-form-item ref="name" label="名称" name="name">
<a-input v-model:value="formState.name" />
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item ref="code" label="标识" name="code">
<a-input v-model:value="formState.code" />
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item ref="sort" label="排序" name="sort">
<a-input-number style="width: 100%" v-model:value="formState.sort" />
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="状态" name="enable">
<a-switch v-model:checked="formState.enable" />
</a-form-item>
</a-col>
<a-col :span="24">
<a-form-item label="备注" name="remark">
<a-textarea v-model:value="formState.remark" />
</a-form-item>
</a-col>
</a-row>
</a-form>
</a-modal>
</template>
<script>
import { message } from '@hwork/ant-design-vue';
import { message } from "@hwork/ant-design-vue";
import { edit } from "@/api/module/role";
import { defineComponent, reactive, ref, toRaw, watch } from "vue";
export default defineComponent({
@ -43,51 +54,46 @@ export default defineComponent({
},
record: {
type: Object,
}
},
},
emit: ["close"],
setup(props, context) {
const formRef = ref();
const formState = reactive({});
const formRules = {
name: [
{ required: true, message: '请输入名称', trigger: 'blur'},
],
code: [
{ required: true, message: '请输入标识', trigger: 'blur'},
]
name: [{ required: true, message: "请输入名称", trigger: "blur" }],
code: [{ required: true, message: "请输入标识", trigger: "blur" }],
};
watch(props,(props)=>{
watch(props, (props) => {
formState.id = props.record.id;
formState.name = props.record.name;
formState.code = props.record.code;
formState.sort = props.record.sort;
formState.enable = props.record.enable;
formState.remark = props.record.remark;
})
});
const submit = (e) => {
formRef.value
.validate()
.then(() => {
edit(toRaw(formState)).then((response)=>{
if(response.success){
message.success({ content: '保存成功', duration: 1 }).then(()=>{
cancel();
});
}else{
message.success({ content: '保存失败', duration: 1 }).then(()=>{
cancel();
});
}
edit(toRaw(formState)).then((response) => {
if (response.success) {
message.success({ content: "保存成功", duration: 1 }).then(() => {
cancel();
});
} else {
message.success({ content: "保存失败", duration: 1 }).then(() => {
cancel();
});
}
});
})
.catch(error => {
console.log('error', error);
.catch((error) => {
console.log("error", error);
});
};
@ -102,10 +108,10 @@ export default defineComponent({
formRef,
formState,
formRules,
labelCol: { span: 6 },
wrapperCol: { span: 18 },
};
},
});
</script>
</script>

73
src/view/role/modal/give.vue
View File

@ -1,12 +1,5 @@
<template>
<a-modal
:open="visible"
title="权限配置"
cancelText="取消"
okText="保存"
@ok="submit"
@cancel="cancel"
>
<a-drawer :open="visible" title="权限配置" style="padding: 0 8px">
<a-tabs v-model:activeKey="state.active">
<a-tab-pane key="1" tab="菜单权限">
<a-tree
@ -23,11 +16,13 @@
<a-select-option value="ALL">全部</a-select-option>
<a-select-option value="SELF">仅自己</a-select-option>
<a-select-option value="DEPT">所在部门</a-select-option>
<a-select-option value="DEPT_CHILD">所在部门及下级部门</a-select-option>
<a-select-option value="DEPT_CHILD"
>所在部门及下级部门</a-select-option
>
<a-select-option value="CUSTOM">自定义数据</a-select-option>
</a-select>
<br/>
<br/>
<br />
<br />
<a-tree
checkable
show-line="true"
@ -38,7 +33,11 @@
/>
</a-tab-pane>
</a-tabs>
</a-modal>
<template #footer>
<a-button @click="cancel">取消</a-button>
<a-button type="primary" @click="submit">保存</a-button>
</template>
</a-drawer>
</template>
<script>
import { message } from "@hwork/ant-design-vue";
@ -58,7 +57,6 @@ export default defineComponent({
},
emit: ["close"],
setup(props, context) {
const scope = ref("ALL");
const state = reactive({
@ -66,8 +64,8 @@ export default defineComponent({
powers: [],
active: "1",
showDept: false,
checkedPowerIds: {checked:[]},
checkedDeptIds: {checked:[]},
checkedPowerIds: { checked: [] },
checkedDeptIds: { checked: [] },
powerReplaceFields: { key: "id" },
deptReplaceFields: { key: "id", title: "name" },
});
@ -86,13 +84,13 @@ export default defineComponent({
/// 监听数据
watch(scope, (scope) => {
if(scope === "CUSTOM") {
if (scope === "CUSTOM") {
state.showDept = true;
} else {
state.checkedDeptIds = [];
state.showDept = false;
}
})
});
/// 监听数据
watch(props, (props) => {
@ -104,12 +102,12 @@ export default defineComponent({
state.checkedPowerIds = powerIds;
});
let deptIds = [];
dept({ roleId: props.record.id}).then((response) => {
dept({ roleId: props.record.id }).then((response) => {
response.data.forEach((element) => {
deptIds.push(element.id);
})
});
state.checkedDeptIds = deptIds;
})
});
scope.value = props.record.scope;
});
@ -117,23 +115,26 @@ export default defineComponent({
loadDept();
const submit = (e) => {
give({
give({
scope: scope.value,
roleId: props.record.id,
powerIds: state.checkedPowerIds.checked?state.checkedPowerIds.checked:state.checkedPowerIds,
deptIds: state.checkedDeptIds.checked?state.checkedDeptIds.checked:state.checkedDeptIds }).then(
(response) => {
if (response.success) {
message.success({ content: "保存成功", duration: 1 }).then(() => {
cancel();
});
} else {
message.error({ content: "保存失败", duration: 1 }).then(() => {
cancel();
});
}
powerIds: state.checkedPowerIds.checked
? state.checkedPowerIds.checked
: state.checkedPowerIds,
deptIds: state.checkedDeptIds.checked
? state.checkedDeptIds.checked
: state.checkedDeptIds,
}).then((response) => {
if (response.success) {
message.success({ content: "保存成功", duration: 1 }).then(() => {
cancel();
});
} else {
message.error({ content: "保存失败", duration: 1 }).then(() => {
cancel();
});
}
);
});
};
const cancel = (e) => {
@ -145,8 +146,8 @@ export default defineComponent({
state,
submit,
cancel,
SHOW_PARENT
SHOW_PARENT,
};
},
});
</script>
</script>

60
src/view/role/modal/info.vue
View File

@ -8,27 +8,38 @@
@cancel="cancel"
>
<a-form
ref="formRef"
ref="formRef"
:model="formState"
:rules="formRules"
:label-col="labelCol"
:wrapper-col="wrapperCol"
layout="vertical"
>
<a-form-item ref="name" label="名称" name="name">
<a-input v-model:value="formState.name" />
</a-form-item>
<a-form-item ref="code" label="标识" name="code">
<a-input v-model:value="formState.code" />
</a-form-item>
<a-form-item ref="sort" label="排序" name="sort">
<a-input-number v-model:value="formState.sort" />
</a-form-item>
<a-form-item label="状态" name="enable">
<a-switch v-model:checked="formState.enable" />
</a-form-item>
<a-form-item label="备注" name="remark">
<a-textarea v-model:value="formState.remark" />
</a-form-item>
<a-row :gutter="[16, 0]">
<a-col :span="12">
<a-form-item ref="name" label="名称" name="name">
<a-input v-model:value="formState.name" />
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item ref="code" label="标识" name="code">
<a-input v-model:value="formState.code" />
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item ref="sort" label="排序" name="sort">
<a-input-number style="width: 100%" v-model:value="formState.sort" />
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="状态" name="enable">
<a-switch v-model:checked="formState.enable" />
</a-form-item>
</a-col>
<a-col :span="24">
<a-form-item label="备注" name="remark">
<a-textarea v-model:value="formState.remark" />
</a-form-item>
</a-col>
</a-row>
</a-form>
</a-modal>
</template>
@ -41,25 +52,24 @@ export default defineComponent({
},
record: {
type: Object,
}
},
},
emit: ["close"],
setup(props, context) {
const formRef = ref();
const formState = reactive({});
const formRules = {};
watch(props,(props)=>{
watch(props, (props) => {
formState.id = props.record.id;
formState.name = props.record.name;
formState.code = props.record.code;
formState.sort = props.record.sort;
formState.enable = props.record.enable;
formState.remark = props.record.remark;
})
});
const cancel = (e) => {
formRef.value.resetFields();
@ -77,10 +87,10 @@ export default defineComponent({
formRef,
formState,
formRules,
labelCol: { span: 6 },
wrapperCol: { span: 18 },
};
},
});
</script>
</script>

88
src/view/role/modal/save.vue
View File

@ -8,32 +8,43 @@
@cancel="cancel"
>
<a-form
ref="formRef"
ref="formRef"
:model="formState"
:rules="formRules"
:label-col="labelCol"
:wrapper-col="wrapperCol"
layout="vertical"
>
<a-form-item ref="name" label="名称" name="name">
<a-input v-model:value="formState.name" />
</a-form-item>
<a-form-item ref="code" label="标识" name="code">
<a-input v-model:value="formState.code" />
</a-form-item>
<a-form-item ref="sort" label="排序" name="sort">
<a-input-number v-model:value="formState.sort" />
</a-form-item>
<a-form-item label="状态" name="enable">
<a-switch v-model:checked="formState.enable" />
</a-form-item>
<a-form-item label="备注" name="remark">
<a-textarea v-model:value="formState.remark" />
</a-form-item>
<a-row :gutter="[16, 0]">
<a-col :span="12">
<a-form-item ref="name" label="名称" name="name">
<a-input v-model:value="formState.name" />
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item ref="code" label="标识" name="code">
<a-input v-model:value="formState.code" />
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item ref="sort" label="排序" name="sort">
<a-input-number style="width: 100%" v-model:value="formState.sort" />
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="状态" name="enable">
<a-switch v-model:checked="formState.enable" />
</a-form-item>
</a-col>
<a-col :span="24">
<a-form-item label="备注" name="remark">
<a-textarea v-model:value="formState.remark" />
</a-form-item>
</a-col>
</a-row>
</a-form>
</a-modal>
</template>
<script>
import { message } from '@hwork/ant-design-vue';
import { message } from "@hwork/ant-design-vue";
import { save } from "@/api/module/role";
import { defineComponent, reactive, ref, toRaw } from "vue";
export default defineComponent({
@ -44,41 +55,36 @@ export default defineComponent({
},
emit: ["close"],
setup(props, context) {
const formRef = ref();
const formState = reactive({
sort: 0,
enable: "true",
});
const formRules = {
name: [
{ required: true, message: '请输入名称', trigger: 'blur'},
],
code: [
{ required: true, message: '请输入标识', trigger: 'blur'},
]
name: [{ required: true, message: "请输入名称", trigger: "blur" }],
code: [{ required: true, message: "请输入标识", trigger: "blur" }],
};
const submit = (e) => {
formRef.value
.validate()
.then(() => {
save(toRaw(formState)).then((response)=>{
if(response.success){
message.success({ content: '保存成功', duration: 1 }).then(()=>{
cancel();
});
}else{
message.success({ content: '保存失败', duration: 1 }).then(()=>{
cancel();
});
}
save(toRaw(formState)).then((response) => {
if (response.success) {
message.success({ content: "保存成功", duration: 1 }).then(() => {
cancel();
});
} else {
message.success({ content: "保存失败", duration: 1 }).then(() => {
cancel();
});
}
});
})
.catch(error => {
console.log('error', error);
.catch((error) => {
console.log("error", error);
});
};
@ -93,10 +99,10 @@ export default defineComponent({
formRef,
formState,
formRules,
labelCol: { span: 6 },
wrapperCol: { span: 18 },
};
},
});
</script>
</script>

79
src/view/tenant/modal/edit.vue
View File

@ -11,19 +11,25 @@
ref="formRef"
:model="formState"
:rules="formRules"
:label-col="labelCol"
:wrapper-col="wrapperCol">
<a-form-item ref="name" label="名称" name="name">
<a-input v-model:value="formState.name" />
</a-form-item>
<a-form-item label="备注" name="describe">
<a-textarea v-model:value="formState.describe" />
</a-form-item>
layout="vertical"
>
<a-row :gutter="[16, 0]">
<a-col :span="24">
<a-form-item ref="name" label="名称" name="name">
<a-input v-model:value="formState.name" />
</a-form-item>
</a-col>
<a-col :span="24">
<a-form-item label="备注" name="describe">
<a-textarea v-model:value="formState.describe" />
</a-form-item>
</a-col>
</a-row>
</a-form>
</a-modal>
</template>
<script>
import { message } from '@hwork/ant-design-vue';
import { message } from "@hwork/ant-design-vue";
import { edit } from "@/api/module/tenant";
import { defineComponent, reactive, ref, toRaw, watch } from "vue";
@ -35,25 +41,26 @@ export default defineComponent({
},
record: {
type: Object,
}
},
},
emit: ["close"],
setup(props, context) {
const formRef = ref();
let formState = reactive({});
const formRules = {
name: [{ required: true, message: "请输入租户名称", trigger: "blur" }],
describe: [{ required: true, message: "请输入租户描述", trigger: "blur" }],
describe: [
{ required: true, message: "请输入租户描述", trigger: "blur" },
],
};
watch(props,(props) => {
formState.id = props.record.id
formState.name = props.record.name
formState.describe = props.record.describe
})
watch(props, (props) => {
formState.id = props.record.id;
formState.name = props.record.name;
formState.describe = props.record.describe;
});
const submit = (e) => {
message.loading({
@ -65,21 +72,25 @@ export default defineComponent({
.then(() => {
edit(toRaw(formState)).then((response) => {
if (response.success) {
message.success({
content: "保存成功",
key,
duration: 1,
}).then(()=>{
cancel();
});
message
.success({
content: "保存成功",
key,
duration: 1,
})
.then(() => {
cancel();
});
} else {
message.error({
content: "保存失败",
key,
duration: 1,
}).then(()=>{
cancel();
});
message
.error({
content: "保存失败",
key,
duration: 1,
})
.then(() => {
cancel();
});
}
});
})
@ -99,10 +110,10 @@ export default defineComponent({
formRef,
formState,
formRules,
labelCol: { span: 6 },
wrapperCol: { span: 18 },
};
},
});
</script>
</script>

64
src/view/tenant/modal/give.vue
View File

@ -1,21 +1,19 @@
<template>
<a-modal
:open="visible"
title="权限配置"
cancelText="取消"
okText="保存"
@ok="submit"
@cancel="cancel"
>
<a-tree
checkable
checkStrictly
show-line="true"
:tree-data="state.powers"
:replace-fields="state.powerReplaceFields"
v-model:checkedKeys="state.checkedPowerIds"
/>
</a-modal>
<a-drawer :open="visible" title="权限配置">
<a-tree
style="padding: 0 6px"
checkable
checkStrictly
show-line="true"
:tree-data="state.powers"
:replace-fields="state.powerReplaceFields"
v-model:checkedKeys="state.checkedPowerIds"
/>
<template #footer>
<a-button @click="cancel">取消</a-button>
<a-button type="primary" @click="submit">保存</a-button>
</template>
</a-drawer>
</template>
<script>
import { message } from "@hwork/ant-design-vue";
@ -33,10 +31,9 @@ export default defineComponent({
},
emit: ["close"],
setup(props, context) {
const state = reactive({
powers: [],
checkedPowerIds: {checked:[]},
checkedPowerIds: { checked: [] },
powerReplaceFields: { key: "id" },
});
@ -59,21 +56,22 @@ export default defineComponent({
loadPower();
const submit = (e) => {
give({
give({
tenantId: props.record.id,
powerIds: state.checkedPowerIds.checked?state.checkedPowerIds.checked:state.checkedPowerIds}).then(
(response) => {
if (response.success) {
message.success({ content: "保存成功", duration: 1 }).then(() => {
cancel();
});
} else {
message.error({ content: "保存失败", duration: 1 }).then(() => {
cancel();
});
}
powerIds: state.checkedPowerIds.checked
? state.checkedPowerIds.checked
: state.checkedPowerIds,
}).then((response) => {
if (response.success) {
message.success({ content: "保存成功", duration: 1 }).then(() => {
cancel();
});
} else {
message.error({ content: "保存失败", duration: 1 }).then(() => {
cancel();
});
}
);
});
};
const cancel = (e) => {
@ -87,4 +85,4 @@ export default defineComponent({
};
},
});
</script>
</script>

45
src/view/tenant/modal/info.vue
View File

@ -11,14 +11,20 @@
ref="formRef"
:model="formState"
:rules="formRules"
:label-col="labelCol"
:wrapper-col="wrapperCol">
<a-form-item ref="name" label="名称" name="name">
<a-input v-model:value="formState.name" />
</a-form-item>
<a-form-item label="备注" name="describe">
<a-textarea v-model:value="formState.describe" />
</a-form-item>
layout="vertical"
>
<a-row :gutter="[16, 0]">
<a-col :span="24">
<a-form-item ref="name" label="名称" name="name">
<a-input v-model:value="formState.name" />
</a-form-item>
</a-col>
<a-col :span="24">
<a-form-item label="备注" name="describe">
<a-textarea v-model:value="formState.describe" />
</a-form-item>
</a-col>
</a-row>
</a-form>
</a-modal>
</template>
@ -33,25 +39,26 @@ export default defineComponent({
},
record: {
type: Object,
}
},
},
emit: ["close"],
setup(props, context) {
const formRef = ref();
let formState = reactive({});
const formRules = {
name: [{ required: true, message: "请输入租户名称", trigger: "blur" }],
describe: [{ required: true, message: "请输入租户描述", trigger: "blur" }],
describe: [
{ required: true, message: "请输入租户描述", trigger: "blur" },
],
};
watch(props,(props) => {
formState.id = props.record.id
formState.name = props.record.name
formState.describe = props.record.describe
})
watch(props, (props) => {
formState.id = props.record.id;
formState.name = props.record.name;
formState.describe = props.record.describe;
});
const submit = (e) => {
formRef.value.resetFields();
@ -69,10 +76,10 @@ export default defineComponent({
formRef,
formState,
formRules,
labelCol: { span: 6 },
wrapperCol: { span: 18 },
};
},
});
</script>
</script>

16
src/view/tenant/modal/save.vue
View File

@ -1,18 +1,14 @@
<template>
<a-modal
<a-drawer
:open="visible"
title="新增租户"
cancelText="取消"
okText="提交"
@ok="submit"
@cancel="cancel"
>
<a-form
ref="formRef"
:model="formState"
:rules="formRules"
:label-col="labelCol"
:wrapper-col="wrapperCol"
layout="vertical"
style="padding: 0 6px"
>
<a-tabs v-model:activeKey="state.active">
<a-tab-pane key="0" tab="租户信息">
@ -43,7 +39,11 @@
</a-tab-pane>
</a-tabs>
</a-form>
</a-modal>
<template #footer>
<a-button @click="cancel">取消</a-button>
<a-button type="primary" @click="submit">提交</a-button>
</template>
</a-drawer>
</template>
<script>
import { message } from "@hwork/ant-design-vue";

200
src/view/user/modal/edit.vue
View File

@ -1,64 +1,89 @@
<template>
<a-modal
:open="visible"
title="新增用户"
title="修改用户"
cancelText="取消"
okText="提交"
@ok="submit"
@cancel="cancel"
>
<a-form
ref="formRef"
ref="formRef"
:model="formState"
:rules="formRules"
:label-col="labelCol"
:wrapper-col="wrapperCol">
<a-form-item ref="nickname" label="昵称" name="nickname">
<a-input v-model:value="formState.nickname" />
</a-form-item>
<a-form-item ref="username" label="账户" name="username">
<a-input v-model:value="formState.username" />
</a-form-item>
<a-form-item ref="email" label="邮箱" name="email">
<a-input v-model:value="formState.email" />
</a-form-item>
<a-form-item ref="phone" label="电话" name="phone">
<a-input v-model:value="formState.phone" />
</a-form-item>
<a-form-item label="性别" name="gender">
<a-radio-group v-model:value="formState.gender">
<a-radio value="0">男</a-radio>
<a-radio value="1">女</a-radio>
</a-radio-group>
</a-form-item>
<a-form-item label="状态" name="enable">
<a-switch v-model:checked="formState.enable" />
</a-form-item>
<a-form-item label="岗位" name="postId">
<a-select v-model:value="formState.postId">
<a-select-option :value="post.id" v-bind:key="index" v-for="(post,index) in state.posts">{{post.name}}</a-select-option>
</a-select>
</a-form-item>
<a-form-item label="部门" name="deptId">
<a-tree-select
v-model:value="formState.deptId"
style="width: 100%"
:tree-data="state.depts"
placeholder="所属部门"
replace
tree-default-expand-all
:replaceFields="replaceFields"
>
</a-tree-select>
</a-form-item>
<a-form-item label="备注" name="remark">
<a-textarea v-model:value="formState.remark" />
</a-form-item>
layout="vertical"
>
<a-row :gutter="[16, 0]">
<a-col :span="12">
<a-form-item ref="nickname" label="昵称" name="nickname">
<a-input v-model:value="formState.nickname" />
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item ref="username" label="账户" name="username">
<a-input v-model:value="formState.username" />
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item ref="email" label="邮箱" name="email">
<a-input v-model:value="formState.email" />
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item ref="phone" label="电话" name="phone">
<a-input v-model:value="formState.phone" />
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="性别" name="gender">
<a-radio-group v-model:value="formState.gender">
<a-radio value="0">男</a-radio>
<a-radio value="1">女</a-radio>
</a-radio-group>
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="状态" name="enable">
<a-switch v-model:checked="formState.enable" />
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="岗位" name="postId">
<a-select v-model:value="formState.postId">
<a-select-option
:value="post.id"
v-bind:key="index"
v-for="(post, index) in state.posts"
>{{ post.name }}</a-select-option
>
</a-select>
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="部门" name="deptId">
<a-tree-select
v-model:value="formState.deptId"
style="width: 100%"
:tree-data="state.depts"
placeholder="所属部门"
replace
tree-default-expand-all
:replaceFields="replaceFields"
>
</a-tree-select>
</a-form-item>
</a-col>
<a-col :span="24">
<a-form-item label="备注" name="remark">
<a-textarea v-model:value="formState.remark" />
</a-form-item>
</a-col>
</a-row>
</a-form>
</a-modal>
</template>
<script>
import { message } from '@hwork/ant-design-vue';
import { message } from "@hwork/ant-design-vue";
import { list } from "@/api/module/post";
import { edit } from "@/api/module/user";
import { tree } from "@/api/module/dept";
@ -70,61 +95,63 @@ export default defineComponent({
},
record: {
type: Object,
}
},
},
emit: ["close"],
setup(props, context) {
const formRef = ref();
const state = reactive({
const state = reactive({
posts: [],
depts: [],
})
depts: [],
});
const formState = reactive({
enable: true,
gender: "0",
gender: "0",
});
const formRules = {
username: [ { required: true, message: '请输入账户', trigger: 'blur'} ],
nickname: [ { required: true, message: '请输入昵称', trigger: 'blur'} ],
password: [ { required: true, message: '请输入密码', trigger: 'blur'} ],
email: [ { required: true, message: '请输入邮箱', trigger: 'blur'} ],
phone: [ { required: true, message: '请输入电话', trigger: 'blur'} ],
postId: [ { required: true, message: '请选择岗位', trigger: 'blur'} ],
deptId: [ { required: true, message: '请选择部门', trigger: 'blur'} ],
username: [{ required: true, message: "请输入账户", trigger: "blur" }],
nickname: [{ required: true, message: "请输入昵称", trigger: "blur" }],
password: [{ required: true, message: "请输入密码", trigger: "blur" }],
email: [{ required: true, message: "请输入邮箱", trigger: "blur" }],
phone: [{ required: true, message: "请输入电话", trigger: "blur" }],
postId: [{ required: true, message: "请选择岗位", trigger: "blur" }],
deptId: [{ required: true, message: "请选择部门", trigger: "blur" }],
};
const loadPost = () => {
list({}).then((response)=>{
list({}).then((response) => {
state.posts = response.data;
})
}
});
};
const loadTree = () => {
tree({}).then((response)=>{
tree({}).then((response) => {
state.depts = response.data;
})
}
});
};
const submit = (e) => {
formRef.value.validate().then(() => {
edit(toRaw(formState)).then((response)=>{
if(response.success){
message.success({ content: '保存成功', duration: 1 }).then(()=>{
cancel();
});
}else{
message.error({ content: '保存失败', duration: 1 }).then(()=>{
cancel();
});
formRef.value
.validate()
.then(() => {
edit(toRaw(formState)).then((response) => {
if (response.success) {
message.success({ content: "保存成功", duration: 1 }).then(() => {
cancel();
});
} else {
message.error({ content: "保存失败", duration: 1 }).then(() => {
cancel();
});
}
})
}).catch(error => {
console.log('error', error);
});
});
})
.catch((error) => {
console.log("error", error);
});
};
const cancel = (e) => {
@ -137,7 +164,7 @@ export default defineComponent({
/// 加载部门
loadTree();
watch(props,(props) => {
watch(props, (props) => {
formState.id = props.record.id;
formState.username = props.record.username;
formState.nickname = props.record.nickname;
@ -148,7 +175,7 @@ export default defineComponent({
formState.deptId = props.record.deptId;
formState.enable = props.record.enable;
formState.remark = props.record.remark;
})
});
return {
state,
@ -161,8 +188,13 @@ export default defineComponent({
labelCol: { span: 6 },
wrapperCol: { span: 18 },
replaceFields: {children:'children', title:'name', key:'id', value: 'id' }
replaceFields: {
children: "children",
title: "name",
key: "id",
value: "id",
},
};
},
});
</script>
</script>

151
src/view/user/modal/info.vue
View File

@ -8,52 +8,77 @@
@cancel="cancel"
>
<a-form
ref="formRef"
ref="formRef"
:model="formState"
:rules="formRules"
:label-col="labelCol"
:wrapper-col="wrapperCol">
<a-form-item ref="nickname" label="昵称" name="nickname">
<a-input v-model:value="formState.nickname" />
</a-form-item>
<a-form-item ref="username" label="账户" name="username">
<a-input v-model:value="formState.username" />
</a-form-item>
<a-form-item ref="email" label="邮箱" name="email">
<a-input v-model:value="formState.email" />
</a-form-item>
<a-form-item ref="phone" label="电话" name="phone">
<a-input v-model:value="formState.phone" />
</a-form-item>
<a-form-item label="性别" name="gender">
<a-radio-group v-model:value="formState.gender">
<a-radio value="0">男</a-radio>
<a-radio value="1">女</a-radio>
</a-radio-group>
</a-form-item>
<a-form-item label="状态" name="enable">
<a-switch v-model:checked="formState.enable" />
</a-form-item>
<a-form-item label="岗位" name="postId">
<a-select v-model:value="formState.postId">
<a-select-option :value="post.id" v-bind:key="index" v-for="(post,index) in state.posts">{{post.name}}</a-select-option>
</a-select>
</a-form-item>
<a-form-item label="部门" name="deptId">
<a-tree-select
v-model:value="formState.deptId"
style="width: 100%"
:tree-data="state.depts"
placeholder="所属部门"
replace
tree-default-expand-all
:replaceFields="replaceFields"
>
</a-tree-select>
</a-form-item>
<a-form-item label="备注" name="remark">
<a-textarea v-model:value="formState.remark" />
</a-form-item>
layout="vertical"
>
<a-row :gutter="[16, 0]">
<a-col :span="12">
<a-form-item ref="nickname" label="昵称" name="nickname">
<a-input v-model:value="formState.nickname" />
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item ref="username" label="账户" name="username">
<a-input v-model:value="formState.username" />
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item ref="email" label="邮箱" name="email">
<a-input v-model:value="formState.email" />
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item ref="phone" label="电话" name="phone">
<a-input v-model:value="formState.phone" />
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="性别" name="gender">
<a-radio-group v-model:value="formState.gender">
<a-radio value="0">男</a-radio>
<a-radio value="1">女</a-radio>
</a-radio-group>
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="状态" name="enable">
<a-switch v-model:checked="formState.enable" />
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="岗位" name="postId">
<a-select v-model:value="formState.postId">
<a-select-option
:value="post.id"
v-bind:key="index"
v-for="(post, index) in state.posts"
>{{ post.name }}</a-select-option
>
</a-select>
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="部门" name="deptId">
<a-tree-select
v-model:value="formState.deptId"
style="width: 100%"
:tree-data="state.depts"
placeholder="所属部门"
replace
tree-default-expand-all
:replaceFields="replaceFields"
>
</a-tree-select>
</a-form-item>
</a-col>
<a-col :span="24">
<a-form-item label="备注" name="remark">
<a-textarea v-model:value="formState.remark" />
</a-form-item>
</a-col>
</a-row>
</a-form>
</a-modal>
</template>
@ -68,36 +93,35 @@ export default defineComponent({
},
record: {
type: Object,
}
},
},
emit: ["close"],
setup(props, context) {
const formRef = ref();
const state = reactive({
const state = reactive({
posts: [],
depts: [],
})
depts: [],
});
const formState = reactive({
enable: true,
gender: "0",
gender: "0",
});
const formRules = {};
const loadPost = () => {
list({}).then((response)=>{
list({}).then((response) => {
state.posts = response.data;
})
}
});
};
const loadTree = () => {
tree({}).then((response)=>{
tree({}).then((response) => {
state.depts = response.data;
})
}
});
};
const submit = (e) => {
formRef.value.resetFields();
@ -114,7 +138,7 @@ export default defineComponent({
/// 加载部门
loadTree();
watch(props,(props) => {
watch(props, (props) => {
formState.id = props.record.id;
formState.username = props.record.username;
formState.nickname = props.record.nickname;
@ -125,7 +149,7 @@ export default defineComponent({
formState.deptId = props.record.deptId;
formState.enable = props.record.enable;
formState.remark = props.record.remark;
})
});
return {
state,
@ -138,8 +162,13 @@ export default defineComponent({
labelCol: { span: 6 },
wrapperCol: { span: 18 },
replaceFields: {children:'children', title:'name', key:'id', value: 'id' }
replaceFields: {
children: "children",
title: "name",
key: "id",
value: "id",
},
};
},
});
</script>
</script>

210
src/view/user/modal/save.vue
View File

@ -8,60 +8,91 @@
@cancel="cancel"
>
<a-form
ref="formRef"
ref="formRef"
:model="formState"
:rules="formRules"
:label-col="labelCol"
:wrapper-col="wrapperCol">
<a-form-item ref="nickname" label="昵称" name="nickname">
<a-input v-model:value="formState.nickname" />
</a-form-item>
<a-form-item ref="username" label="账户" name="username">
<a-input v-model:value="formState.username" />
</a-form-item>
<a-form-item ref="password" label="密码" name="password">
<a-input v-model:value="formState.password" />
</a-form-item>
<a-form-item ref="email" label="邮箱" name="email">
<a-input v-model:value="formState.email" />
</a-form-item>
<a-form-item ref="phone" label="电话" name="phone">
<a-input v-model:value="formState.phone" />
</a-form-item>
<a-form-item label="性别" name="gender">
<a-radio-group v-model:value="formState.gender">
<a-radio value="0">男</a-radio>
<a-radio value="1">女</a-radio>
</a-radio-group>
</a-form-item>
<a-form-item label="状态" name="enable">
<a-switch v-model:checked="formState.enable" />
</a-form-item>
<a-form-item label="岗位" name="postId">
<a-select v-model:value="formState.postId">
<a-select-option :value="post.id" v-bind:key="index" v-for="(post,index) in state.posts">{{post.name}}</a-select-option>
</a-select>
</a-form-item>
<a-form-item label="部门" name="deptId">
<a-tree-select
v-model:value="formState.deptId"
style="width: 100%"
:tree-data="state.depts"
placeholder="所属部门"
replace
tree-default-expand-all
:replaceFields="replaceFields"
>
</a-tree-select>
</a-form-item>
<a-form-item label="备注" name="remark">
<a-textarea v-model:value="formState.remark" />
</a-form-item>
layout="vertical"
>
<a-row :gutter="[16, 0]">
<a-col :span="12">
<a-form-item ref="nickname" label="昵称" name="nickname">
<a-input v-model:value="formState.nickname" />
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item ref="username" label="账户" name="username">
<a-input v-model:value="formState.username" />
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item ref="password" label="密码" name="password">
<a-input v-model:value="formState.password" />
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item ref="email" label="邮箱" name="email">
<a-input v-model:value="formState.email" />
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item ref="phone" label="电话" name="phone">
<a-input v-model:value="formState.phone" />
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="岗位" name="postId">
<a-select v-model:value="formState.postId">
<a-select-option
:value="post.id"
v-bind:key="index"
v-for="(post, index) in state.posts"
>{{ post.name }}</a-select-option
>
</a-select>
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="部门" name="deptId">
<a-tree-select
v-model:value="formState.deptId"
style="width: 100%"
:tree-data="state.depts"
placeholder="所属部门"
replace
tree-default-expand-all
:replaceFields="replaceFields"
>
</a-tree-select>
</a-form-item>
</a-col>
</a-row>
<a-row :gutter="[16, 0]">
<a-col :span="12">
<a-form-item label="状态" name="enable">
<a-switch v-model:checked="formState.enable" />
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="性别" name="gender">
<a-radio-group v-model:value="formState.gender">
<a-radio value="0">男</a-radio>
<a-radio value="1">女</a-radio>
</a-radio-group>
</a-form-item>
</a-col>
<a-col :span="24">
<a-form-item label="备注" name="remark">
<a-textarea v-model:value="formState.remark" />
</a-form-item>
</a-col>
</a-row>
</a-form>
</a-modal>
</template>
<script>
import { message } from '@hwork/ant-design-vue';
import { message } from "@hwork/ant-design-vue";
import { list } from "@/api/module/post";
import { save } from "@/api/module/user";
import { tree } from "@/api/module/dept";
@ -74,60 +105,62 @@ export default defineComponent({
},
emit: ["close"],
setup(props, context) {
const formRef = ref();
const state = reactive({
const state = reactive({
posts: [],
depts: [],
})
depts: [],
});
const formState = reactive({
enable: true,
gender: "0",
gender: "0",
});
const formRules = {
username: [ { required: true, message: '请输入账户', trigger: 'blur'} ],
nickname: [ { required: true, message: '请输入昵称', trigger: 'blur'} ],
password: [ { required: true, message: '请输入密码', trigger: 'blur'} ],
email: [ { required: true, message: '请输入邮箱', trigger: 'blur'} ],
phone: [ { required: true, message: '请输入电话', trigger: 'blur'} ],
postId: [ { required: true, message: '请选择岗位', trigger: 'blur'} ],
deptId: [ { required: true, message: '请选择部门', trigger: 'blur'} ],
tenantId: [ { required: true, message: '请选择租户', trigger: 'blur'} ]
username: [{ required: true, message: "请输入账户", trigger: "blur" }],
nickname: [{ required: true, message: "请输入昵称", trigger: "blur" }],
password: [{ required: true, message: "请输入密码", trigger: "blur" }],
email: [{ required: true, message: "请输入邮箱", trigger: "blur" }],
phone: [{ required: true, message: "请输入电话", trigger: "blur" }],
postId: [{ required: true, message: "请选择岗位", trigger: "blur" }],
deptId: [{ required: true, message: "请选择部门", trigger: "blur" }],
tenantId: [{ required: true, message: "请选择租户", trigger: "blur" }],
};
const loadPost = () => {
list({}).then((response)=>{
list({}).then((response) => {
state.posts = response.data;
})
}
});
};
const loadTree = () => {
tree({}).then((response)=>{
tree({}).then((response) => {
state.depts = response.data;
})
}
const submit = (e) => {
formRef.value.validate().then(() => {
save(toRaw(formState)).then((response)=>{
if(response.success){
message.success({ content: '保存成功', duration: 1 }).then(()=>{
cancel();
});
}else{
message.error({ content: '保存失败', duration: 1 }).then(()=>{
cancel();
});
}
})
}).catch(error => {
console.log('error', error);
});
};
const submit = (e) => {
formRef.value
.validate()
.then(() => {
save(toRaw(formState)).then((response) => {
if (response.success) {
message.success({ content: "保存成功", duration: 1 }).then(() => {
cancel();
});
} else {
message.error({ content: "保存失败", duration: 1 }).then(() => {
cancel();
});
}
});
})
.catch((error) => {
console.log("error", error);
});
};
const cancel = (e) => {
formRef.value.resetFields();
context.emit("close", false);
@ -149,8 +182,13 @@ export default defineComponent({
labelCol: { span: 6 },
wrapperCol: { span: 18 },
replaceFields: {children:'children', title:'name', key:'id', value: 'id' }
replaceFields: {
children: "children",
title: "name",
key: "id",
value: "id",
},
};
},
});
</script>
</script>