b2894lxlx/tms-erp-web
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

1、完善发货模板

Browse Source 
2、完善运输计划
3、完善运单管理
This commit is contained in:
b2894lxlx
2026-08-05 15:52:24 +08:00
parent e683c2cc00
commit 433c611195
72 changed files with 7556 additions and 772 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/views/system/authlock.vue
+4 -7
View File
@@ -46,19 +46,16 @@
{{ row.lockEndTime || '永久' }}
</template>
<template #menu="{ row }">
<el-button
text
<el-link
type="primary"
@click.stop="$refs.authLockCrud.rowView(row)"
>查看</el-button
>查看</el-link
>
<el-button
<el-link
v-if="(row.lockStatus === 'LOCKED' || row.lockStatus === 'PRE_LOCKED') && !row.expired"
text
type="primary"
@click.stop="handleAuthLockUnlock(row)"
>解锁</el-button
>
>解锁</el-link>
</template>
</avue-crud>
</el-drawer>
src/views/system/authlog.vue
+2 -4
View File
@@ -18,12 +18,10 @@
@on-load="authLogOnLoad"
>
<template #menu="{ row }">
<el-button
text
<el-link
type="primary"
@click.stop="$refs.authLogCrud.rowView(row)"
>查看</el-button
>
>查看</el-link>
</template>
<template #account="{ row }">
<el-tag size="small" effect="light">{{ row.account }}</el-tag>
src/views/system/dept.vue
+2 -3
View File
@@ -32,13 +32,12 @@
</el-button>
</template>
<template #menu="scope">
<el-button
<el-link
type="primary"
text
@click.stop="handleAdd(scope.row, scope.index)"
v-if="userInfo.authority.includes('admin')"
>新增子项
</el-button>
</el-link>
</template>
<template #deptCategory="{ row }">
<el-tag>{{ row.deptCategoryName }}</el-tag>
src/views/system/dict.vue
+4 -6
View File
@@ -32,13 +32,12 @@
</el-button>
</template>
<template #menu="scope">
<el-button
<el-link
type="primary"
text
@click.stop="handleRowClick(scope.row)"
v-if="userInfo.authority.includes('admin')"
>字典配置
</el-button>
</el-link>
</template>
<template #code="{ row }">
<el-tag @click="handleRowClick(row)" style="cursor: pointer">{{ row.code }}</el-tag>
@@ -79,13 +78,12 @@
</el-button>
</template>
<template #menu="scope">
<el-button
<el-link
type="primary"
text
@click.stop="handleAdd(scope.row, scope.index)"
v-if="userInfo.authority.includes('admin')"
>新增子项
</el-button>
</el-link>
</template>
<template #isSealed="{ row }">
<el-tag>{{ row.isSealed === 0 ? '否' : '是' }}</el-tag>
src/views/system/dictbiz.vue
+4 -6
View File
@@ -32,13 +32,12 @@
</el-button>
</template>
<template #menu="scope">
<el-button
<el-link
type="primary"
text
@click.stop="handleRowClick(scope.row)"
v-if="userInfo.authority.includes('admin')"
>字典配置
</el-button>
</el-link>
</template>
<template #code="{ row }">
<el-tag @click="handleRowClick(row)" style="cursor: pointer">{{ row.code }}</el-tag>
@@ -79,13 +78,12 @@
</el-button>
</template>
<template #menu="scope">
<el-button
<el-link
type="primary"
text
@click.stop="handleAdd(scope.row, scope.index)"
v-if="userInfo.authority.includes('admin')"
>新增子项
</el-button>
</el-link>
</template>
<template #isSealed="{ row }">
<el-tag>{{ row.isSealed === 0 ? '否' : '是' }}</el-tag>
src/views/system/menu.vue
+42 -8
View File
@@ -32,13 +32,12 @@
</el-button>
</template>
<template #menu="scope">
<el-button
<el-link
type="primary"
text
@click.stop="handleAdd(scope.row, scope.index)"
v-if="userInfo.authority.includes('admin') && scope.row.category === 1"
>新增子项
</el-button>
</el-link>
</template>
<template #name="{ row }">
<i :class="row.source" style="margin-right: 5px" />
@@ -89,7 +88,7 @@ export default {
index: true,
selection: true,
viewBtn: true,
menuWidth: 160,
menuWidth: 320,
dialogClickModal: false,
column: [
{
@@ -312,8 +311,42 @@ export default {
column.addDisabled = true;
this.$refs.crud.rowAdd();
},
normalizeSubmitRow(row = {}, isUpdate = false) {
const submitProps = [
'id',
'parentId',
'code',
'name',
'alias',
'path',
'source',
'component',
'sort',
'category',
'action',
'isOpen',
'isDisplay',
'remark',
];
const submitRow = submitProps.reduce((result, prop) => {
if (row[prop] !== undefined) {
result[prop] = row[prop];
}
return result;
}, {});
if (isUpdate) {
submitRow.id = row.id || this.currentEditMenuId;
} else {
delete submitRow.id;
}
if (submitRow.parentId === '') {
submitRow.parentId = 0;
}
return submitRow;
},
rowSave(row, done, loading) {
add(row).then(
const submitRow = this.normalizeSubmitRow(row);
add(submitRow).then(
res => {
// 获取新增数据的相关字段
const data = res.data.data;
@@ -332,15 +365,15 @@ export default {
);
},
rowUpdate(row, index, done, loading) {
row.id = row.id || this.currentEditMenuId;
update(row).then(
const submitRow = this.normalizeSubmitRow(row, true);
update(submitRow).then(
() => {
this.$message({
type: 'success',
message: '操作成功!',
});
// 数据回调进行刷新
done(row);
done({ ...row, ...submitRow });
},
error => {
window.console.log(error);
@@ -417,6 +450,7 @@ export default {
this.initData();
}
if (type === 'add') {
this.form.id = undefined;
this.form.sort = 1;
this.form.isDisplay = 1;
}
src/views/system/param.vue
+6 -9
View File
@@ -83,27 +83,24 @@
<!-- 操作栏模块 -->
<el-table-column prop="menu" label="操作" :width="220" align="center">
<template #="{ row }">
<el-button
<el-link
v-if="this.permissionList.viewBtn"
type="primary"
text
@click="handleView(row)"
>查看
</el-button>
<el-button
</el-link>
<el-link
v-if="this.permissionList.editBtn"
type="primary"
text
@click="handleEdit(row)"
>编辑
</el-button>
<el-button
</el-link>
<el-link
v-if="this.permissionList.delBtn"
type="primary"
text
@click="rowDel(row)"
>删除
</el-button>
</el-link>
</template>
</el-table-column>
</el-table>
src/views/system/tenant.vue
+4 -6
View File
@@ -115,20 +115,18 @@
</el-tooltip>
</template>
<template #menu="scope">
<el-button
<el-link
v-if="userInfo.authority.includes('administrator') && !recycleMode"
type="primary"
text
@click.stop="handleRowDatasource(scope.row)"
>数据源
</el-button>
<el-button
</el-link>
<el-link
v-if="userInfo.authority.includes('administrator') && !recycleMode"
type="primary"
text
@click.stop="handleRowPackage(scope.row)"
>产品包
</el-button>
</el-link>
</template>
<template #accountNumber="{ row }">
<el-tag>{{ row.accountNumber > 0 ? row.accountNumber : '不限制' }}</el-tag>
src/views/system/topmenu.vue
+2 -3
View File
@@ -38,13 +38,12 @@
</el-button>
</template>
<template #menu="scope">
<el-button
<el-link
v-if="permission.topmenu_setting"
type="primary"
text
@click.stop="handleRowMenuSetting(scope.row)"
>配置
</el-button>
</el-link>
</template>
<template #name="{ row }">
<i :class="row.source" style="margin-right: 5px" />
src/views/system/user.vue
+5 -7
View File
@@ -125,22 +125,20 @@
</el-button>
</template>
<template #menu="{ row, index, size }">
<el-button
text
<el-link
type="primary"
v-if="this.permission.user_view"
@click.stop="$refs.crud.rowView(row, index)"
>查看
</el-button>
<el-button
text
</el-link>
<el-link
type="primary"
v-if="this.permission.user_edit"
@click.stop="$refs.crud.rowEdit(row, index)"
>编辑
</el-button>
</el-link>
<el-dropdown @command="command => handleDropdownCommand(command, row, index)">
<el-button text type="primary">更 多 </el-button>
<el-link type="primary">更 多 </el-link>
<template #dropdown>
<el-dropdown-menu>
<el-dropdown-item command="setLeader" v-if="userInfo.authority.includes('admin')">