-
diff --git a/src/components/SimpleMenu/src/components/MenuItem.vue b/src/components/SimpleMenu/src/components/MenuItem.vue
index 0b7afc7..703ae74 100644
--- a/src/components/SimpleMenu/src/components/MenuItem.vue
+++ b/src/components/SimpleMenu/src/components/MenuItem.vue
@@ -107,7 +107,6 @@
//update-begin-author:taoyan date:2022-6-1 for: VUEN-1144 online 配置成菜单后，打开菜单，显示名称未展示为菜单名称
function storePathTitle(path) {
- console.log('storePathTitle', path);
let title = '';
if (instance!.attrs) {
let item: any = instance!.attrs.item;
diff --git a/src/components/registerGlobComp.ts b/src/components/registerGlobComp.ts
index 471f1f7..1a0b9bc 100644
--- a/src/components/registerGlobComp.ts
+++ b/src/components/registerGlobComp.ts
@@ -66,7 +66,7 @@ export function registerGlobComp(app: App) {
compList.forEach((comp) => {
app.component(comp.name || comp.displayName, comp);
});
-
+
//仪表盘依赖Tinymce，需要提前加载（没办法按需加载了）
app.component(Editor.name, Editor);
// update-begin--author:liaozhiyang---date:20240308---for：【QQYUN-8241】Tinymce异步加载
@@ -126,5 +126,4 @@ export function registerGlobComp(app: App) {
.use(Cascader)
.use(Rate)
.use(Progress);
- console.log("---初始化---， 全局注册Antd、仪表盘、流程设计器、online、流程等组件--------------")
}
diff --git a/src/main.ts b/src/main.ts
index 64e53d9..6c76e72 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -99,8 +99,6 @@ async function bootstrap(props?: MainAppProps) {
// 挂载应用
app.mount(getMountContainer(props), true);
- console.log(" vue3 app 加载完成！")
-
return app
}
diff --git a/src/store/modules/permission.ts b/src/store/modules/permission.ts
index f26f195..f139c03 100644
--- a/src/store/modules/permission.ts
+++ b/src/store/modules/permission.ts
@@ -128,7 +128,7 @@ export const usePermissionStore = defineStore({
const codeList = systemPermission.codeList;
this.setPermCodeList(codeList);
this.setAuthData(systemPermission);
-
+
//菜单路由
const routeList = systemPermission.menu;
return routeList;
@@ -211,7 +211,6 @@ export const usePermissionStore = defineStore({
// 后台菜单构建
case PermissionModeEnum.BACK:
const { createMessage, createWarningModal } = useMessage();
- console.log(" --- 构建后台路由菜单 --- ")
// 菜单加载提示
// createMessage.loading({
// content: t('sys.app.menuLoading'),
diff --git a/src/views/inventory/InventoryList.vue b/src/views/inventory/InventoryList.vue
index be96ba1..96f028c 100644
--- a/src/views/inventory/InventoryList.vue
+++ b/src/views/inventory/InventoryList.vue
@@ -54,7 +54,8 @@
库存状态
-
+
diff --git a/src/views/monitor/log/log.data.ts b/src/views/monitor/log/log.data.ts
index f6233eb..7dca9f3 100644
--- a/src/views/monitor/log/log.data.ts
+++ b/src/views/monitor/log/log.data.ts
@@ -2,41 +2,37 @@ import { BasicColumn, FormSchema } from '/@/components/Table';
export const columns: BasicColumn[] = [
{
- title: '日志内容',
- dataIndex: 'logContent',
- width: 100,
- align: 'left',
- },
- {
- title: '操作人ID',
- dataIndex: 'userid',
- width: 80,
- },
- {
- title: '操作人',
- dataIndex: 'username',
- width: 80,
+ title: '操作类型',
+ dataIndex: 'operateType_dictText',
+ width: 25,
},
{
title: 'IP',
dataIndex: 'ip',
- width: 80,
+ width: 35,
},
{
title: '耗时(毫秒)',
dataIndex: 'costTime',
- width: 80,
+ width: 30,
+ },
+ {
+ title: '操作人',
+ dataIndex: 'username',
+ width: 25,
+ },
+
+ {
+ title: '日志内容',
+ dataIndex: 'logContent',
+ width: 200,
+ align: 'left',
},
{
title: '创建时间',
dataIndex: 'createTime',
sorter: true,
- width: 80,
- },
- {
- title: '客户端类型',
- dataIndex: 'clientType_dictText',
- width: 60,
+ width: 40,
},
];
@@ -45,20 +41,25 @@ export const columns: BasicColumn[] = [
*/
export const operationLogColumn: BasicColumn[] = [
...columns,
- {
- title: '操作类型',
- dataIndex: 'operateType_dictText',
- width: 40,
- },
+ /* {
+ title: '操作类型',
+ dataIndex: 'operateType_dictText',
+ width: 40,
+ },*/
];
export const exceptionColumns: BasicColumn[] = [
{
- title: '异常标题',
- dataIndex: 'logContent',
- width: 100,
- align: 'left',
+ title: 'IP',
+ dataIndex: 'ip',
+ width: 35,
},
+ {
+ title: '操作人',
+ dataIndex: 'username',
+ width: 25,
+ },
+
{
title: '请求地址',
dataIndex: 'requestUrl',
@@ -70,34 +71,18 @@ export const exceptionColumns: BasicColumn[] = [
width: 60,
},
{
- title: '操作人',
- dataIndex: 'username',
- width: 60,
- customRender: ({ record }) => {
- let pname = record.username;
- let pid = record.userid;
- if(!pname && !pid){
- return "";
- }
- return pname + " (账号: "+ pid + " )";
- },
- },
- {
- title: 'IP',
- dataIndex: 'ip',
- width: 60,
+ title: '日志内容',
+ dataIndex: 'logContent',
+ width: 100,
+ align: 'left',
},
+
{
title: '创建时间',
dataIndex: 'createTime',
sorter: true,
width: 60,
},
- {
- title: '客户端类型',
- dataIndex: 'clientType_dictText',
- width: 60,
- },
];
export const searchFormSchema: FormSchema[] = [
@@ -105,7 +90,7 @@ export const searchFormSchema: FormSchema[] = [
field: 'keyWord',
label: '搜索日志',
component: 'Input',
- colProps: { span: 8 },
+ colProps: { span: 6 },
},
{
field: 'fieldTime',
@@ -126,7 +111,7 @@ export const operationSearchFormSchema: FormSchema[] = [
field: 'operateType',
label: '操作类型',
component: 'JDictSelectTag',
- colProps: { span: 4 },
+ colProps: { span: 6 },
componentProps: {
dictCode: 'operate_type',
},
diff --git a/src/views/receive/asn/Asn.data.ts b/src/views/receive/asn/Asn.data.ts
index fb4c732..c8f8ec9 100644
--- a/src/views/receive/asn/Asn.data.ts
+++ b/src/views/receive/asn/Asn.data.ts
@@ -25,10 +25,10 @@ export const columns: BasicColumn[] = [
customRender: ({ text }) => {
//入库状态:1.已创建;2.部分收货;3.收货完成;4.已取消。
const statusColorMap = {
- '已创建': 'orange',
- '部分收货': 'blue',
- '收货完成': 'green',
- '已取消': 'red',
+ 已创建: 'orange',
+ 部分收货: 'blue',
+ 收货完成: 'green',
+ 已取消: 'red',
};
const color = statusColorMap[text] || 'red';
return render.renderTag(text, color);
@@ -68,6 +68,11 @@ export const columns: BasicColumn[] = [
//子表表格配置
export const asnDetailColumns: JVxeColumn[] = [
+ {
+ title: '入库明细ID',
+ key: 'id',
+ type: JVxeTypes.hidden,
+ },
{
title: '入库单ID',
key: 'asnId',
@@ -121,7 +126,7 @@ export const asnDetailColumns: JVxeColumn[] = [
width: 150,
async: true, // 异步搜索，默认为 true
//查询状态为可用、启用、未删除的库位
- dictCode: 'base_point where iz_active=1 and del_flag=0,point_code,id',
+ dictCode: 'base_point where area_id = 1986328561044119554 and iz_active=1 and del_flag=0,point_code,id',
tipsContent: '请搜索库位',
validateRules: [
{
@@ -166,10 +171,10 @@ export const asnDetailColumns: JVxeColumn[] = [
};
// 状态颜色映射
const statusColorMap = {
- '已创建': 'orange',
- '部分收货': 'blue',
- '收货完成': 'green',
- '已取消': 'red',
+ 已创建: 'orange',
+ 部分收货: 'blue',
+ 收货完成: 'green',
+ 已取消: 'red',
};
const text = statusMap[cellValue] || '未知状态';
const color = statusColorMap[text] || 'red';
diff --git a/src/views/receive/asn/AsnList.vue b/src/views/receive/asn/AsnList.vue
index 8ceee7e..9d08289 100644
--- a/src/views/receive/asn/AsnList.vue
+++ b/src/views/receive/asn/AsnList.vue
@@ -92,9 +92,9 @@