From 2191824072549f0da35d73686a075e59b0196321 Mon Sep 17 00:00:00 2001
From: ZY <zc857179121@qq.com>
Date: 星期三, 25 九月 2024 15:02:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wms-dev' into wms-dev
---
zy-asrs-admin/src/views/asrs/waveLog/index.vue | 153 +++++++++++++++++++++++----------------------------
1 files changed, 69 insertions(+), 84 deletions(-)
diff --git a/zy-asrs-admin/src/views/base/cacheSite/index.vue b/zy-asrs-admin/src/views/asrs/waveLog/index.vue
similarity index 65%
copy from zy-asrs-admin/src/views/base/cacheSite/index.vue
copy to zy-asrs-admin/src/views/asrs/waveLog/index.vue
index 1a5fd32..b93d6f8 100644
--- a/zy-asrs-admin/src/views/base/cacheSite/index.vue
+++ b/zy-asrs-admin/src/views/asrs/waveLog/index.vue
@@ -11,7 +11,7 @@
const router = useRouter();
-const TABLE_KEY = 'table-cacheSite';
+const TABLE_KEY = 'table-waveLog';
let currentPage = 1;
let pageSize = 10;
const searchInput = ref("")
@@ -31,83 +31,69 @@
} = useTableSearch();
const columns = [
- {
- title: formatMessage('db.man_cache_site.channel', '閫氶亾'),
- dataIndex: 'channel',
- width: 140,
- ellipsis: true,
- ...getColumnSearchProps('channel'),
- },
- {
- title: formatMessage('db.man_cache_site.site_no', '绔欑偣缂栧彿'),
- dataIndex: 'siteNo',
- width: 140,
- ellipsis: true,
- ...getColumnSearchProps('siteNo'),
- },
- {
- title: formatMessage('db.man_cache_site.site_status', '绔欑偣鐘舵��'),
- dataIndex: 'siteStatus$',
- width: 140,
- ellipsis: true,
- ...getColumnSearchProps('siteStatus$'),
- },
- {
- title: formatMessage('db.man_cache_site.order_id', '璁㈠崟ID'),
- dataIndex: 'orderId$',
- width: 140,
- ellipsis: true,
- ...getColumnSearchProps('orderId$'),
- },
- {
- title: formatMessage('db.man_cache_site.order_no', '璁㈠崟缂栧彿'),
- dataIndex: 'orderNo',
- width: 140,
- ellipsis: true,
- ...getColumnSearchProps('orderNo'),
- },
- // {
- // title: formatMessage('db.man_cache_site.status', '鐘舵��'),
- // dataIndex: 'status$',
- // width: 140,
- // ellipsis: true,
- // ...getColumnSearchProps('status$'),
- // },
- // {
- // title: formatMessage('db.man_cache_site.create_time', '娣诲姞鏃堕棿'),
- // dataIndex: 'createTime$',
- // width: 140,
- // ellipsis: true,
- // ...getColumnSearchProps('createTime$'),
- // },
- // {
- // title: formatMessage('db.man_cache_site.create_by', '娣诲姞浜哄憳'),
- // dataIndex: 'createBy$',
- // width: 140,
- // ellipsis: true,
- // ...getColumnSearchProps('createBy$'),
- // },
- {
- title: formatMessage('db.man_cache_site.update_time', '淇敼鏃堕棿'),
- dataIndex: 'updateTime$',
- width: 140,
- ellipsis: true,
- ...getColumnSearchProps('updateTime$'),
- },
- {
- title: formatMessage('db.man_cache_site.update_by', '淇敼浜哄憳'),
- dataIndex: 'updateBy$',
- width: 140,
- ellipsis: true,
- ...getColumnSearchProps('updateBy$'),
- },
- {
- title: formatMessage('db.man_cache_site.memo', '澶囨敞'),
- dataIndex: 'memo',
- width: 140,
- ellipsis: true,
- ...getColumnSearchProps('memo'),
- },
+ {
+ title: formatMessage('db.man_wave_log.wave_no', '娉㈡鍙�'),
+ dataIndex: 'waveNo',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('waveNo'),
+ },
+ {
+ title: formatMessage('db.man_wave_log.wave_type', '娉㈡绫诲瀷'),
+ dataIndex: 'waveType$',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('waveType$'),
+ },
+ {
+ title: formatMessage('db.man_wave_log.wave_status', '娉㈡鐘舵��'),
+ dataIndex: 'waveStatus$',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('waveStatus$'),
+ },
+ {
+ title: formatMessage('db.man_wave_log.status', '鐘舵��'),
+ dataIndex: 'status$',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('status$'),
+ },
+ {
+ title: formatMessage('db.man_wave_log.create_time', '娣诲姞鏃堕棿'),
+ dataIndex: 'createTime$',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('createTime$'),
+ },
+ {
+ title: formatMessage('db.man_wave_log.create_by', '娣诲姞浜哄憳'),
+ dataIndex: 'createBy$',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('createBy$'),
+ },
+ {
+ title: formatMessage('db.man_wave_log.update_time', '淇敼鏃堕棿'),
+ dataIndex: 'updateTime$',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('updateTime$'),
+ },
+ {
+ title: formatMessage('db.man_wave_log.update_by', '淇敼浜哄憳'),
+ dataIndex: 'updateBy$',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('updateBy$'),
+ },
+ {
+ title: formatMessage('db.man_wave_log.memo', '澶囨敞'),
+ dataIndex: 'memo',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('memo'),
+ },
{
title: formatMessage('common.operation', '鎿嶄綔'),
@@ -135,7 +121,7 @@
function getPage() {
state.loading = true;
- post('/api/cacheSite/page', {
+ post('/api/waveLog/page', {
current: currentPage,
pageSize: pageSize,
condition: searchInput.value
@@ -169,7 +155,7 @@
onOk: async () => {
const hide = message.loading(formatMessage('common.loading', '璇锋眰涓�'));
try {
- post('/api/cacheSite/remove/' + rows.map((row) => row.id).join(','), {}).then(resp => {
+ post('/api/waveLog/remove/' + rows.map((row) => row.id).join(','), {}).then(resp => {
let result = resp.data;
if (result.code === 200) {
message.success(result.msg);
@@ -187,7 +173,7 @@
}
const handleExport = async (intl) => {
- postBlob('/api/cacheSite/export', {}).then(result => {
+ postBlob('/api/waveLog/export', {}).then(result => {
const blob = new Blob([result.data], { type: 'application/vnd.ms-excel' });
window.location.href = window.URL.createObjectURL(blob);
return true;
@@ -213,7 +199,7 @@
<script>
export default {
- name: '鎾绔欑偣'
+ name: '娉㈡鍘嗗彶'
}
</script>
@@ -231,8 +217,7 @@
<a-table :row-selection="{ selectedRowKeys: state.selectedRowKeys, onChange: onSelectChange }"
:data-source="tableData.records" :defaultExpandAllRows="false" :key="TABLE_KEY" rowKey="id"
:pagination="{ total: tableData.total, onChange: onPageChange }"
- :scroll="{ y: 768, scrollToFirstRowOnChange: true }" :columns="columns" @resizeColumn="handleResizeColumn"
- :loading="state.loading">
+ :scroll="{ y: 768, scrollToFirstRowOnChange: true }" :columns="columns" @resizeColumn="handleResizeColumn" :loading="state.loading">
<template #bodyCell="{ column, text, record }">
<template v-if="column.dataIndex === 'oper'">
<div style="display: flex;justify-content: space-evenly;">
--
Gitblit v1.9.1