From 06c4e59fa35c1b9e74da9cf3d081e78c13d17e20 Mon Sep 17 00:00:00 2001
From: yangyang
Date: 星期一, 14 七月 2025 06:36:36 +0800
Subject: [PATCH] no message
---
zy-asrs-admin/src/views/loc/locDetl/index.vue | 52 ++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 46 insertions(+), 6 deletions(-)
diff --git a/zy-asrs-admin/src/views/loc/locDetl/index.vue b/zy-asrs-admin/src/views/loc/locDetl/index.vue
index 3bd47b6..99a27c4 100644
--- a/zy-asrs-admin/src/views/loc/locDetl/index.vue
+++ b/zy-asrs-admin/src/views/loc/locDetl/index.vue
@@ -8,7 +8,6 @@
import { formatMessage } from '@/utils/localeUtils.js';
import useTableSearch from '@/utils/tableUtils.jsx';
const context = getCurrentInstance()?.appContext.config.globalProperties;
-
const router = useRouter();
const TABLE_KEY = 'table-locDetl';
@@ -21,9 +20,9 @@
orderNo: null,
batch: null,
tagId: null,
+ orderType: null,
})
const editChild = ref(null)
-
const state = reactive({
selectedRowKeys: [],
loading: false,
@@ -70,6 +69,13 @@
...getColumnSearchProps('locNo'),
},
{
+ title: formatMessage('db.man_loc_detl.loc_type', '搴撲綅绫诲瀷'),
+ dataIndex: 'type$',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('type$'),
+ },
+ {
title: formatMessage('db.man_loc_detl.matnr', '鍟嗗搧缂栧彿'),
dataIndex: 'matnr',
width: 140,
@@ -96,6 +102,34 @@
width: 140,
ellipsis: true,
...getColumnSearchProps('model'),
+ },
+ {
+ title: formatMessage('db.man_loc_detl.matnr', '鍝佺被'),
+ dataIndex: 'tagId$',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('tagId$'),
+ },
+ {
+ title: formatMessage('db.man_loc_detl.maktx', '棰滆壊'),
+ dataIndex: 'color',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('color'),
+ },
+ {
+ title: formatMessage('db.man_loc_detl.model', '鍝佺墝'),
+ dataIndex: 'brand',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('brand'),
+ },
+ {
+ title: formatMessage('db.man_loc_detl.model', '浜у湴'),
+ dataIndex: 'origin',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('origin'),
},
{
title: formatMessage('db.man_loc_detl.dewell', '鍏ュ簱鏃堕棿'),
@@ -226,8 +260,8 @@
let content = "鏄惁纭鐢熸垚-->鍑哄簱浠诲姟锛侊紒"
let type = 2
if (item?.locNo.indexOf("B") >= 0 || item?.locNo.indexOf("C") >= 0) {
- content = "鏄惁纭鐢熸垚-->鎷ｈ揣鍗曪紒锛�"
- type = 1
+ content = "鏄惁纭鐢熸垚-->鎷ｈ揣鍗曪紒锛�"
+ type = 1
}
Modal.confirm({
title: formatMessage('page.delete', '鍑哄簱'),
@@ -246,7 +280,7 @@
console.log(result);
message.success(result.msg);
} else {
- message.error(result.msg);
+ message.error(result.msg);
}
getPage()
hide()
@@ -300,6 +334,7 @@
const onSearch = () => {
// console.log('search');
+ currentPage = 1;
getPage()
}
@@ -337,6 +372,10 @@
style="width: 140px;margin-right: 10px;" />
<a-input v-model:value="searchParam.batch" :placeholder="formatMessage('page.locDetl.batch.input', '璇疯緭鍏ユ壒鍙�')"
style="width: 140px;margin-right: 10px;" />
+ <a-select v-model:value="searchParam.orderType" :placeholder="formatMessage('page.locDetl.orderNo.input', '浠撳簱绫诲瀷')"
+ :options="[
+ { label: '鍏ㄩ儴', value: null }, { label: '绔嬪簱', value: 1 }, { label: '骞冲簱', value: 2 }]" style="width: 140px;margin-right: 10px;">
+ </a-select>
<a-select v-model:value="searchParam.tagId" :placeholder="formatMessage('page.locDetl.orderNo.input', '璇烽�夋嫨鍝佺被')"
:options="[
{ label: '榛樿鍒嗙被', value: 10 }, { label: '鏈烘补', value: 11 }, { label: '鍙橀�熺娌�', value: 17 }, { label: '鐏姳濉�', value: 18 },
@@ -361,7 +400,8 @@
<template #bodyCell="{ column, text, record }">
<template v-if="column.dataIndex === 'oper'">
<div style="display: flex;justify-content: space-evenly;">
- <a-button type="link" primary @click="handleEdit(record)">{{ formatMessage('page.edit', '鎵嬪姩鍑哄簱') }}</a-button>
+ <a-button type="link" primary @click="handleEdit(record)">{{ formatMessage('page.edit', '鎵嬪姩鍑哄簱')
+ }}</a-button>
<!-- <a-button type="link" danger @click="handleDel([record])">{{ formatMessage('page.delete', '鍒犻櫎')}}</a-button> -->
</div>
</template>
--
Gitblit v1.9.1