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/platformDetl/index.vue | 141 +++++++++++++++++++++++++++++-----------------
1 files changed, 88 insertions(+), 53 deletions(-)
diff --git a/zy-asrs-admin/src/views/base/cacheSite/index.vue b/zy-asrs-admin/src/views/out/platformDetl/index.vue
similarity index 63%
copy from zy-asrs-admin/src/views/base/cacheSite/index.vue
copy to zy-asrs-admin/src/views/out/platformDetl/index.vue
index 1a5fd32..a0cbf70 100644
--- a/zy-asrs-admin/src/views/base/cacheSite/index.vue
+++ b/zy-asrs-admin/src/views/out/platformDetl/index.vue
@@ -11,7 +11,7 @@
const router = useRouter();
-const TABLE_KEY = 'table-cacheSite';
+const TABLE_KEY = 'table-platformDetl';
let currentPage = 1;
let pageSize = 10;
const searchInput = ref("")
@@ -32,91 +32,126 @@
const columns = [
{
- title: formatMessage('db.man_cache_site.channel', '閫氶亾'),
- dataIndex: 'channel',
+ title: formatMessage('db.man_platform_detl.platform_id', '闆嗚揣ID'),
+ dataIndex: 'platformId$',
width: 140,
ellipsis: true,
- ...getColumnSearchProps('channel'),
+ ...getColumnSearchProps('platformId$'),
},
{
- title: formatMessage('db.man_cache_site.site_no', '绔欑偣缂栧彿'),
- dataIndex: 'siteNo',
+ title: formatMessage('db.man_platform_detl.platform_no', '闆嗚揣缂栧彿'),
+ dataIndex: 'platformNo',
width: 140,
ellipsis: true,
- ...getColumnSearchProps('siteNo'),
+ ...getColumnSearchProps('platformNo'),
},
{
- title: formatMessage('db.man_cache_site.site_status', '绔欑偣鐘舵��'),
- dataIndex: 'siteStatus$',
+ title: formatMessage('db.man_platform_detl.order_id', '璁㈠崟'),
+ dataIndex: 'orderId',
width: 140,
ellipsis: true,
- ...getColumnSearchProps('siteStatus$'),
+ ...getColumnSearchProps('orderId'),
},
{
- title: formatMessage('db.man_cache_site.order_id', '璁㈠崟ID'),
- dataIndex: 'orderId$',
+ title: formatMessage('db.man_platform_detl.order_detl_id', '璁㈠崟鏄庣粏'),
+ dataIndex: 'orderDetlId$',
width: 140,
ellipsis: true,
- ...getColumnSearchProps('orderId$'),
+ ...getColumnSearchProps('orderDetlId$'),
},
{
- title: formatMessage('db.man_cache_site.order_no', '璁㈠崟缂栧彿'),
- dataIndex: 'orderNo',
+ title: formatMessage('db.man_platform_detl.task_detl_id', '浠诲姟鏄庣粏'),
+ dataIndex: 'taskDetlId$',
width: 140,
ellipsis: true,
- ...getColumnSearchProps('orderNo'),
+ ...getColumnSearchProps('taskDetlId$'),
},
- // {
- // 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_detl.matnr', '鍟嗗搧缂栧彿'),
+ dataIndex: 'matnr',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('matnr'),
+ },
+ {
+ title: formatMessage('db.man_platform_detl.batch', '鎵瑰彿'),
+ dataIndex: 'batch',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('batch'),
+ },
+ {
+ title: formatMessage('db.man_platform_detl.field_params', '绱㈠紩瀛楁'),
+ dataIndex: 'fieldParams',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('fieldParams'),
+ },
+ {
+ title: formatMessage('db.man_platform_detl.anfme', '闇�姹傛暟閲�'),
+ dataIndex: 'anfme',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('anfme'),
+ },
+ {
+ title: formatMessage('db.man_platform_detl.qty', '瀹為檯鏁伴噺'),
+ dataIndex: 'qty',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('qty'),
+ },
+ {
+ title: formatMessage('db.man_platform_detl.status', '鐘舵��'),
+ dataIndex: 'status$',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('status$'),
+ },
+ {
+ title: formatMessage('db.man_platform_detl.create_time', '娣诲姞鏃堕棿'),
+ dataIndex: 'createTime$',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('createTime$'),
+ },
+ {
+ title: formatMessage('db.man_platform_detl.create_by', '娣诲姞浜哄憳'),
+ dataIndex: 'createBy$',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('createBy$'),
+ },
+ {
+ title: formatMessage('db.man_platform_detl.update_time', '淇敼鏃堕棿'),
dataIndex: 'updateTime$',
width: 140,
ellipsis: true,
...getColumnSearchProps('updateTime$'),
},
{
- title: formatMessage('db.man_cache_site.update_by', '淇敼浜哄憳'),
+ title: formatMessage('db.man_platform_detl.update_by', '淇敼浜哄憳'),
dataIndex: 'updateBy$',
width: 140,
ellipsis: true,
...getColumnSearchProps('updateBy$'),
},
{
- title: formatMessage('db.man_cache_site.memo', '澶囨敞'),
+ title: formatMessage('db.man_platform_detl.memo', '澶囨敞'),
dataIndex: 'memo',
width: 140,
ellipsis: true,
...getColumnSearchProps('memo'),
},
- {
- title: formatMessage('common.operation', '鎿嶄綔'),
- name: 'oper',
- dataIndex: 'oper',
- key: 'oper',
- width: 140,
- fixed: 'right',
- },
+ // {
+ // title: formatMessage('common.operation', '鎿嶄綔'),
+ // name: 'oper',
+ // dataIndex: 'oper',
+ // key: 'oper',
+ // width: 140,
+ // fixed: 'right',
+ // },
];
const hasSelected = computed(() => state.selectedRowKeys.length > 0);
@@ -135,7 +170,7 @@
function getPage() {
state.loading = true;
- post('/api/cacheSite/page', {
+ post('/api/platformDetl/page', {
current: currentPage,
pageSize: pageSize,
condition: searchInput.value
@@ -169,7 +204,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/platformDetl/remove/' + rows.map((row) => row.id).join(','), {}).then(resp => {
let result = resp.data;
if (result.code === 200) {
message.success(result.msg);
@@ -187,7 +222,7 @@
}
const handleExport = async (intl) => {
- postBlob('/api/cacheSite/export', {}).then(result => {
+ postBlob('/api/platformDetl/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 +248,7 @@
<script>
export default {
- name: '鎾绔欑偣'
+ name: '闆嗚揣搴撳瓨'
}
</script>
@@ -224,7 +259,7 @@
<a-input-search v-model:value="searchInput" :placeholder="formatMessage('page.input', '璇疯緭鍏�')"
style="width: 200px;" @search="onSearch" />
<div class="table-header-right">
- <a-button @click="handleEdit(null)" type="primary">{{ formatMessage('page.add', '娣诲姞') }}</a-button>
+ <!-- <a-button @click="handleEdit(null)" type="primary">{{ formatMessage('page.add', '娣诲姞') }}</a-button> -->
<a-button @click="handleExport">{{ formatMessage('page.export', '瀵煎嚭') }}</a-button>
</div>
</div>
--
Gitblit v1.9.1