UDI
/
udiwms-vue
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1.修复部分弹窗无法关闭，分页导致查询无效，关键字查询无效等问题，调整菜单页面布局，删除不需要的元素

Browse Source
fengcang
x_z 3 years ago
parent b4cf0c0760
commit ac3485ed8b
6 changed files with 276 additions and 284 deletions
Show Stats Download Patch File Download Diff File

14
src/views/basic/BussinessType.vue
Unescape Escape View File

@ -25,7 +25,7 @@
<el-form-item> <el-form-item>
<el-button-group style="margin-left: 10px;display:flex;"> <el-button-group style="margin-left: 10px;display:flex;">
<el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button> <el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
<el-button type="primary" icon="search" @click="getList">查询</el-button> <el-button type="primary" icon="search" @click="search">查询</el-button>
<el-button type="primary" icon="search" @click="handleAddClick" <el-button type="primary" icon="search" @click="handleAddClick"
:disabled="!configParms.typeScan" :disabled="!configParms.typeScan"
>新增 >新增
@ -164,6 +164,7 @@ import axios from "axios";
import store from "@/store"; import store from "@/store";
import {getLocalJoinBusType} from "@/api/basic/busLocalType"; import {getLocalJoinBusType} from "@/api/basic/busLocalType";
import {findConfig} from "@/api/thrsys/spsSyncStatus"; import {findConfig} from "@/api/thrsys/spsSyncStatus";
import {isBlank} from "@/utils/strUtil";
export default { export default {
data() { data() {
@ -262,9 +263,10 @@ export default {
this.modifyDialogVisible = false; this.modifyDialogVisible = false;
this.addDialogVisible = false; this.addDialogVisible = false;
}, },
// handleChange() { search() {
// this.getList(); this.filterQuery.page = 1;
// }, this.getList();
},
getList() { getList() {
this.loading = true; this.loading = true;
getJoinBussinessType(this.filterQuery) getJoinBussinessType(this.filterQuery)
@ -285,6 +287,10 @@ export default {
}, },
onAddSubmit() { onAddSubmit() {
if (isBlank(this.inputQuery.name)) {
this.$message.error("扫码单据类型名称不能为空！");
return;
}
if (this.inputQuery.enable && this.inputQuery.localAction == "") { if (this.inputQuery.enable && this.inputQuery.localAction == "") {
this.$message.error("本地单据不能为空！"); this.$message.error("本地单据不能为空！");
return; return;

3
src/views/userManage/admin/authAdmin.vue
Unescape Escape View File

@ -353,6 +353,9 @@ export default {
} else if (this.formData.roles.length === 0) { } else if (this.formData.roles.length === 0) {
this.$message.error("未指定角色！") this.$message.error("未指定角色！")
return; return;
} else if (this.formData.passWord !== this.formData.checkPassword) {
this.$message.error("两次输入密码不一致!")
return;
} }
this.$refs["dataForm"].validate(valid => { this.$refs["dataForm"].validate(valid => {

49
src/views/userManage/admin/authPermissionRule.vue
Unescape Escape View File

@ -1,26 +1,11 @@
<template> <template>
<div> <div>
<el-form :inline="true" :model="query" class="query-form" size="mini"> <el-form :inline="true" :model="query" class="query-form" size="mini">
<el-form-item class="query-form-item">
<el-select v-model="query.status" placeholder="状态">
<el-option label="全部" value=""></el-option>
<el-option label="禁用" value="0"></el-option>
<el-option label="正常" value="1"></el-option>
</el-select>
</el-form-item>
<el-form-item> <el-form-item>
<el-button-group> <el-button-group>
<el-button
type="primary"
icon="el-icon-refresh"
@click="onReset"
></el-button>
<el-button type="primary" icon="search" @click="onSubmit"
>查询</el-button
>
<el-button type="primary" @click.native="handleForm(null, null)" <el-button type="primary" @click.native="handleForm(null, null)"
>新增</el-button >新增
</el-button
> >
</el-button-group> </el-button-group>
</el-form-item> </el-form-item>
@ -76,7 +61,7 @@
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="状态" prop="status"> <el-form-item label="状态" prop="status">
<el-radio-group v-model="formData.status"> <el-radio-group v-model="formData.status" :disabled="true">
<el-radio :label="0">禁用</el-radio> <el-radio :label="0">禁用</el-radio>
<el-radio :label="1">正常</el-radio> <el-radio :label="1">正常</el-radio>
</el-radio-group> </el-radio-group>
@ -84,13 +69,6 @@
<!-- <el-form-item label="额外的规则表达式"> <!-- <el-form-item label="额外的规则表达式">
<el-input type="textarea" v-model="formData.condition"></el-input> <el-input type="textarea" v-model="formData.condition"></el-input>
</el-form-item> --> </el-form-item> -->
<el-form-item label="排序" prop="listorder">
<el-input
type=""
v-model="formData.listorder"
auto-complete="off"
></el-input>
</el-form-item>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button @click.native="hideForm">取消</el-button> <el-button @click.native="hideForm">取消</el-button>
@ -98,7 +76,8 @@
type="primary" type="primary"
@click.native="formSubmit()" @click.native="formSubmit()"
:loading="formLoading" :loading="formLoading"
>提交</el-button >提交
</el-button
> >
</div> </div>
</el-dialog> </el-dialog>
@ -111,6 +90,7 @@ import {
authPermissionRuleSave, authPermissionRuleSave,
authPermissionRuleDelete authPermissionRuleDelete
} from "../../../api/auth/authPermissionRule"; } from "../../../api/auth/authPermissionRule";
const formJson = { const formJson = {
id: "", id: "",
pid: "2", pid: "2",
@ -146,13 +126,13 @@ export default {
formData: formJson, formData: formJson,
formRules: { formRules: {
name: [ name: [
{ required: true, message: "请输入规则名", trigger: "blur" } {required: true, message: "请输入规则名", trigger: "blur"}
], ],
title: [ title: [
{ required: true, message: "请输入标题", trigger: "blur" } {required: true, message: "请输入标题", trigger: "blur"}
], ],
status: [ status: [
{ required: true, message: "请选择状态", trigger: "change" } {required: true, message: "请选择状态", trigger: "change"}
] ]
}, },
pidData: {}, pidData: {},
@ -161,9 +141,10 @@ export default {
}, },
methods: { methods: {
/*eslint-disable */ /*eslint-disable */
renderContent(h, { node, data, store }) { renderContent(h, {node, data, store}) {
return ( return (
<span style="flex: 1; display: flex; align-items: center; justify-content: space-between; font-size: 14px; padding-right: 8px;"> <span
style="flex: 1; display: flex; align-items: center; justify-content: space-between; font-size: 14px; padding-right: 8px;">
<span> <span>
<span title={data.name}>{node.label}</span> <span title={data.name}>{node.label}</span>
</span> </span>
@ -238,6 +219,7 @@ export default {
}, },
// 显示表单 // 显示表单
handleForm(node, data, formName) { handleForm(node, data, formName) {
this.resetForm();
this.formVisible = true; this.formVisible = true;
this.pidData = data || null; this.pidData = data || null;
formJson.pid = (data && parseInt(data.id)) || ""; formJson.pid = (data && parseInt(data.id)) || "";
@ -307,7 +289,7 @@ export default {
}) })
.then(() => { .then(() => {
this.deleteLoading = true; this.deleteLoading = true;
let para = { id: data.id }; let para = {id: data.id};
authPermissionRuleDelete(para) authPermissionRuleDelete(para)
.then((response) => { .then((response) => {
this.deleteLoading = false; this.deleteLoading = false;
@ -347,7 +329,8 @@ export default {
return statusMap[status]; return statusMap[status];
}, },
}, },
mounted() {}, mounted() {
},
created() { created() {
// 加载表格数据 // 加载表格数据
this.getList(); this.getList();

1
src/views/userManage/admin/authRole.vue
Unescape Escape View File

@ -235,6 +235,7 @@ export default {
this.getList(); this.getList();
}, },
onSubmit() { onSubmit() {
this.query.page = 1;
this.getList(); this.getList();
}, },
handleCurrentChange(val) { handleCurrentChange(val) {

13
src/views/userManage/param/phoneRegisterManage.vue
Unescape Escape View File

@ -189,7 +189,7 @@
</el-col> </el-col>
</el-row> </el-row>
<span slot="footer" class="dialog-footer" style="margin-top: 40px"> <span slot="footer" class="dialog-footer" style="margin-top: 40px">
<el-button @click="editDialogVisible = false">取消</el-button> <el-button @click="cancelDialog">取消</el-button>
<el-button type="primary" @click="confirmEdit">确定</el-button> <el-button type="primary" @click="confirmEdit">确定</el-button>
</span> </span>
</el-dialog> </el-dialog>
@ -276,13 +276,9 @@ export default {
this.editDialogVisible = true; this.editDialogVisible = true;
}, },
cancelDialog() { cancelDialog() {
this.addDialogVisible = false; this.editDialogVisible = false;
}, this.getList();
handleCheckedChange(val) {
console.log(val);
}, },
handleSizeChange(val) { handleSizeChange(val) {
this.filterQuery.limit = val; this.filterQuery.limit = val;
this.getList(); this.getList();
@ -294,10 +290,10 @@ export default {
checkRegister() { checkRegister() {
this.loading = true; this.loading = true;
check(this.checkQuery) check(this.checkQuery)
.then((response) => { .then((response) => {
if (response.code === 20000) { if (response.code === 20000) {
this.editDialogVisible = false;
this.getList(); this.getList();
this.$message({ this.$message({
type: "success", type: "success",
@ -316,7 +312,6 @@ export default {
this.centerDialogVisible = true; this.centerDialogVisible = true;
}, },
confirmEdit() { confirmEdit() {
this.ch
this.checkRegister(); this.checkRegister();
}, },

8
src/views/userManage/param/systemParamConfig.vue
Unescape Escape View File

@ -5,12 +5,12 @@
<el-form :inline="true" :model="query" class="query-form" size="mini"> <el-form :inline="true" :model="query" class="query-form" size="mini">
<el-row> <el-row>
<el-form-item class="query-form-item"> <el-form-item class="query-form-item">
<el-input v-model="query.key" placeholder="参数关键字搜索"></el-input> <el-input v-model="query.paramName" placeholder="参数关键字搜索" clearable></el-input>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button-group> <el-button-group>
<el-button type="primary" @click.native="getList" <el-button type="primary" @click.native="search"
>搜索 >搜索
</el-button </el-button
> >
@ -182,6 +182,10 @@
this.query.page = val; this.query.page = val;
this.getList(); this.getList();
}, },
search() {
this.query.page = 1;
this.getList();
},
getList() { getList() {
this.loading = true; this.loading = true;
systemParamConfigList(this.query) systemParamConfigList(this.query)

Write Preview
Loading…
Cancel
Save