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/out/platform/index.vue | 99 +++++++++++++++++++++++++------------------------
1 files changed, 50 insertions(+), 49 deletions(-)
diff --git a/zy-asrs-admin/src/views/base/cacheSite/index.vue b/zy-asrs-admin/src/views/out/platform/index.vue
similarity index 72%
rename from zy-asrs-admin/src/views/base/cacheSite/index.vue
rename to zy-asrs-admin/src/views/out/platform/index.vue
index 1a5fd32..08ed9a8 100644
--- a/zy-asrs-admin/src/views/base/cacheSite/index.vue
+++ b/zy-asrs-admin/src/views/out/platform/index.vue
@@ -11,7 +11,7 @@
const router = useRouter();
-const TABLE_KEY = 'table-cacheSite';
+const TABLE_KEY = 'table-platform';
let currentPage = 1;
let pageSize = 10;
const searchInput = ref("")
@@ -32,77 +32,49 @@
const columns = [
{
- title: formatMessage('db.man_cache_site.channel', '閫氶亾'),
- dataIndex: 'channel',
+ title: formatMessage('db.man_platform.platform_no', '闆嗚揣缂栧彿'),
+ dataIndex: 'platformNo',
width: 140,
ellipsis: true,
- ...getColumnSearchProps('channel'),
+ ...getColumnSearchProps('platformNo'),
},
{
- title: formatMessage('db.man_cache_site.site_no', '绔欑偣缂栧彿'),
- dataIndex: 'siteNo',
+ title: formatMessage('db.man_platform.status', '鐘舵��'),
+ dataIndex: 'status$',
width: 140,
ellipsis: true,
- ...getColumnSearchProps('siteNo'),
+ ...getColumnSearchProps('status$'),
},
{
- title: formatMessage('db.man_cache_site.site_status', '绔欑偣鐘舵��'),
- dataIndex: 'siteStatus$',
+ title: formatMessage('db.man_platform.create_time', '娣诲姞鏃堕棿'),
+ dataIndex: 'createTime$',
width: 140,
ellipsis: true,
- ...getColumnSearchProps('siteStatus$'),
+ ...getColumnSearchProps('createTime$'),
},
{
- title: formatMessage('db.man_cache_site.order_id', '璁㈠崟ID'),
- dataIndex: 'orderId$',
+ title: formatMessage('db.man_platform.create_by', '娣诲姞浜哄憳'),
+ dataIndex: 'createBy$',
width: 140,
ellipsis: true,
- ...getColumnSearchProps('orderId$'),
+ ...getColumnSearchProps('createBy$'),
},
{
- 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', '淇敼鏃堕棿'),
+ title: formatMessage('db.man_platform.update_time', '淇敼鏃堕棿'),
dataIndex: 'updateTime$',
width: 140,
ellipsis: true,
...getColumnSearchProps('updateTime$'),
},
{
- title: formatMessage('db.man_cache_site.update_by', '淇敼浜哄憳'),
+ title: formatMessage('db.man_platform.update_by', '淇敼浜哄憳'),
dataIndex: 'updateBy$',
width: 140,
ellipsis: true,
...getColumnSearchProps('updateBy$'),
},
{
- title: formatMessage('db.man_cache_site.memo', '澶囨敞'),
+ title: formatMessage('db.man_platform.memo', '澶囨敞'),
dataIndex: 'memo',
width: 140,
ellipsis: true,
@@ -114,7 +86,7 @@
name: 'oper',
dataIndex: 'oper',
key: 'oper',
- width: 140,
+ width: 200,
fixed: 'right',
},
];
@@ -135,7 +107,7 @@
function getPage() {
state.loading = true;
- post('/api/cacheSite/page', {
+ post('/api/platform/page', {
current: currentPage,
pageSize: pageSize,
condition: searchInput.value
@@ -169,7 +141,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/platform/remove/' + rows.map((row) => row.id).join(','), {}).then(resp => {
let result = resp.data;
if (result.code === 200) {
message.success(result.msg);
@@ -187,7 +159,7 @@
}
const handleExport = async (intl) => {
- postBlob('/api/cacheSite/export', {}).then(result => {
+ postBlob('/api/platform/export', {}).then(result => {
const blob = new Blob([result.data], { type: 'application/vnd.ms-excel' });
window.location.href = window.URL.createObjectURL(blob);
return true;
@@ -209,11 +181,38 @@
getPage()
}
+const handleShipped = (item) => {
+ Modal.confirm({
+ title: formatMessage('page.shipped', '鍙戣揣'),
+ content: formatMessage('page.shipped.confirm', '纭畾鍙戣揣鍚楋紵'),
+ maskClosable: true,
+ onOk: async () => {
+ const hide = message.loading(formatMessage('common.loading', '璇锋眰涓�'));
+ try {
+ post('/api/platform/shipped', {
+ platformId: item.id,
+ }).then(resp => {
+ let result = resp.data;
+ if (result.code === 200) {
+ message.success(result.msg);
+ } else {
+ message.error(result.msg);
+ }
+ getPage()
+ hide()
+ })
+ } catch (error) {
+ message.error(formatMessage('common.fail', '璇锋眰澶辫触'));
+ }
+ },
+ });
+}
+
</script>
<script>
export default {
- name: '鎾绔欑偣'
+ name: '闆嗚揣绠＄悊'
}
</script>
@@ -236,6 +235,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="handleShipped(record)">{{ formatMessage('page.platform.shipped', '鍙戣揣')
+ }}</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>
--
Gitblit v1.9.1