From e3b4329138be65f4a30d28b22b74572895b53a5a Mon Sep 17 00:00:00 2001
From: zxx <47968546@163.com>
Date: Thu, 7 Dec 2023 16:14:07 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=89=93=E5=8D=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Middle/Base/BaseAdmin/BaseAdmin/list.vue | 96 ++++++------
.../Mes/MesStock/MesStock/OutIn/LogDetail.vue | 32 +++-
.../Mes/MesStock/MesStock/OutIn/OutEdit.vue | 138 ++++++++++--------
.../Mes/MesStock/MesStock/OutIn/data2.json | 29 ++--
.../Mes/MesStock/MesStock/OutIn/preview.vue | 3 -
5 files changed, 161 insertions(+), 137 deletions(-)
diff --git a/src/pages/Middle/Base/BaseAdmin/BaseAdmin/list.vue b/src/pages/Middle/Base/BaseAdmin/BaseAdmin/list.vue
index 4259563..0a8f3df 100644
--- a/src/pages/Middle/Base/BaseAdmin/BaseAdmin/list.vue
+++ b/src/pages/Middle/Base/BaseAdmin/BaseAdmin/list.vue
@@ -11,7 +11,7 @@
-
+
@@ -23,9 +23,6 @@
-
-
-
批量删除
@@ -36,7 +33,6 @@
-
{{ item.name }}
@@ -44,8 +40,12 @@
@@ -69,7 +69,7 @@
+ :rowConfig="{ isCurrent: true, isHover: true }" :data="roleData">
@@ -84,8 +84,8 @@
+ :tree-config="{ transform: true, expandAll: true }"
+ :checkbox-config="{ reserve: true, highlight: true, trigger: 'row', labelField: 'nodeTitle' }">
@@ -133,32 +133,31 @@ export default {
start_time: 0,
end_time: 0,
+
//搜索区
searchFormData: {
name: '',
nick_name: '',
},
searchRules: [
- { key: "name", mode: "like" },
- { key: "nick_name", mode: "like" }
+ {key: "name", mode: "like"},
+ {key: "nick_name", mode: "like"}
],
-
searchFormItems: [
- { field: 'name', title: '名称', span: 5, itemRender: { name: '$input', props: { placeholder: '请输入名称' } } },
- { field: 'nick_name', title: '昵称', span: 5, itemRender: { name: '$input', props: { placeholder: '请输入昵称' } } },
- { span: 8, slots: { default: 'date' } },
+ {field: 'name', title: '名称', span: 5, itemRender: {name: '$input', props: {placeholder: '请输入名称'}}},
+ {field: 'nick_name', title: '昵称', span: 5, itemRender: {name: '$input', props: {placeholder: '请输入昵称'}}},
+ {span: 8, slots: {default: 'date'}},
{
align: 'right', span: 4, itemRender: {
- name: '$buttons', children: [{ props: { type: 'submit', content: '搜索', status: 'primary' } },
- { props: { type: 'reset', content: '重置' } }]
+ name: '$buttons', children: [{props: {type: 'submit', content: '搜索', status: 'primary'}},
+ {props: {type: 'reset', content: '重置'}}]
}
}
],
-
//数据区
gridOptions: {
height: '100%',
@@ -175,7 +174,7 @@ export default {
ajax: {
// 当点击工具栏查询按钮或者手动提交指令 query或reload 时会被触发
query: (options) => {
- const { page, sorts } = options;
+ const {page, sorts} = options;
var params = {};
params.page = page.currentPage;
params.limit = page.pageSize;
@@ -189,21 +188,21 @@ export default {
})
});
}
- return this.loadData({ params });
+ return this.loadData({params});
}
}
},
columns: [
- { type: 'checkbox', width: '40' },
- { type: 'seq', width: 50 },
- { field: 'realname', sortable: true, title: '名称' },
- { field: 'nickname', sortable: true, title: '昵称', showHeaderOverflow: true },
- { field: 'email', sortable: true, title: 'email', showHeaderOverflow: true },
- { field: 'mobile', sortable: true, title: '电话', showHeaderOverflow: true },
- { title: '角色', slots: { default: 'role' }, width: 150 },
- { title: '角色设置', slots: { default: 'op2' }, width: 120 },
- { title: '自定义权限设置', slots: { default: 'op3' }, width: 120 },
- { title: '操作', slots: { default: 'op' }, width: 120 }
+ {type: 'checkbox', width: '40'},
+ {type: 'seq', width: 50},
+ {field: 'realname', sortable: true, title: '名称'},
+ {field: 'nickname', sortable: true, title: '昵称', showHeaderOverflow: true},
+ {field: 'email', sortable: true, title: 'email', showHeaderOverflow: true},
+ {field: 'mobile', sortable: true, title: '电话', showHeaderOverflow: true},
+ {title: '角色', slots: {default: 'role'}, width: 150},
+ {title: '角色设置', slots: {default: 'op2'}, width: 120},
+ {title: '自定义权限设置', slots: {default: 'op3'}, width: 120},
+ {title: '操作', slots: {default: 'op'}, width: 120}
]
}
};
@@ -271,17 +270,19 @@ export default {
let row = this.$refs.xGrid.getCurrentRecord();
if (!row) {
let rows = this.$refs.xGrid.getCheckboxRecords();
- if (rows && rows.length) { row = rows[0]; }
+ if (rows && rows.length) {
+ row = rows[0];
+ }
}
return row;
},
- loadData({ params }) {
+ loadData({params}) {
params.start_time = this.start_time;
params.end_time = this.end_time;
- return this.$mk.getPagedData({ url: this.actions.getList, data: params });
+ return this.$mk.getPagedData({url: this.actions.getList, data: params});
},
@@ -293,7 +294,7 @@ export default {
title: "新增用户信息",
pageMode: "add",
dataId: 0,
- callback: ({ success }) => {
+ callback: ({success}) => {
success && this.$refs.xGrid.commitProxy('query')
}
})
@@ -311,12 +312,12 @@ export default {
title: "编辑用户信息",
pageMode: "edit",
dataId: row[this.keyName],
- callback: ({ success }) => {
+ callback: ({success}) => {
success && this.$refs.xGrid.commitProxy('query')
}
})
},
- saveRoleSetting({ adds, removes }) {
+ saveRoleSetting({adds, removes}) {
if (!adds.length && !removes.length) {
return;
}
@@ -361,11 +362,11 @@ export default {
adds.push(row.id);
}
})
- this.saveRoleSetting({ adds, removes });
+ this.saveRoleSetting({adds, removes});
});
},
- savePermission({ adds, removes }) {
+ savePermission({adds, removes}) {
if (!adds.length && !removes.length) {
return;
}
@@ -412,14 +413,13 @@ export default {
adds.push(row.permission_code);
}
})
- this.savePermission({ adds, removes }); // 保存权限
+ this.savePermission({adds, removes}); // 保存权限
});
},
roleDataInit() { // 角色数据初始化
this.$mk.post({
url: this.actions.roleList,
- data: {
- }
+ data: {}
}).then(a => {
this.roleData = a.data.Role;
@@ -431,8 +431,7 @@ export default {
this.$mk.post({
url: this.actions.permissionList,
- data: {
- }
+ data: {}
}).then(a => {
let arr = [];
a.data.BasePermission.forEach(item => {
@@ -562,15 +561,10 @@ export default {
}
},
// 监听属性
- watch: {
-
- }
+ watch: {}
};
-
-
-
+