From e83dacb5066a86db29dbdc232218d8aba6adc95f Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期五, 02 八月 2024 13:34:04 +0800
Subject: [PATCH] #
---
zy-asrs-admin/src/views/in/waitPakin/index.vue | 198 ++++++++++++++++++++++++++-----------------------
1 files changed, 105 insertions(+), 93 deletions(-)
diff --git a/zy-asrs-admin/src/views/in/waitPakin/index.vue b/zy-asrs-admin/src/views/in/waitPakin/index.vue
index a9e94fa..f0d3219 100644
--- a/zy-asrs-admin/src/views/in/waitPakin/index.vue
+++ b/zy-asrs-admin/src/views/in/waitPakin/index.vue
@@ -7,15 +7,19 @@
import EditView from './edit.vue'
import { formatMessage } from '@/utils/localeUtils.js';
import useTableSearch from '@/utils/tableUtils.jsx';
+import GenerateTaskView from '@/components/task/generateTask/index.vue';
const context = getCurrentInstance()?.appContext.config.globalProperties;
const router = useRouter();
+
+const emit = defineEmits(['pageReload'])
const TABLE_KEY = 'table-waitPakin';
let currentPage = 1;
let pageSize = 10;
const searchInput = ref("")
const editChild = ref(null)
+const generateTaskChild = ref(null)
let tableData = ref([]);
getPage();
@@ -26,97 +30,97 @@
} = useTableSearch();
const columns = [
- {
- title: formatMessage('db.man_wait_pakin.order_id', '璁㈠崟ID'),
- dataIndex: 'orderId$',
- width: 140,
- ellipsis: true,
- ...getColumnSearchProps('orderId$'),
- },
- {
- title: formatMessage('db.man_wait_pakin.order_no', '璁㈠崟缂栧彿'),
- dataIndex: 'orderNo',
- width: 140,
- ellipsis: true,
- ...getColumnSearchProps('orderNo'),
- },
- {
- title: formatMessage('db.man_wait_pakin.barcode', '鎵樼洏鐮�'),
- dataIndex: 'barcode',
- width: 140,
- ellipsis: true,
- ...getColumnSearchProps('barcode'),
- },
- {
- title: formatMessage('db.man_wait_pakin.matnr', '鐗╂枡鍙�'),
- dataIndex: ['detl$','mat$','matnr'],
- width: 140,
- ellipsis: true,
- ...getColumnSearchProps('detl$.matnr'),
- },
- {
- title: formatMessage('db.man_wait_pakin.batch', '鎵瑰彿'),
- dataIndex: ['detl$','batch'],
- width: 140,
- ellipsis: true,
- ...getColumnSearchProps('detl$.matnr'),
- },
- {
- title: formatMessage('db.man_wait_pakin.anfme', '缁勬墭鏁伴噺'),
- dataIndex: 'anfme',
- width: 140,
- ellipsis: true,
- ...getColumnSearchProps('anfme'),
- },
- {
- title: formatMessage('db.man_wait_pakin.io_status', '缁勬墭鐘舵��'),
- dataIndex: 'ioStatus$',
- width: 140,
- ellipsis: true,
- ...getColumnSearchProps('ioStatus$'),
- },
- {
- title: formatMessage('db.man_wait_pakin.status', '鐘舵��'),
- dataIndex: 'status$',
- width: 140,
- ellipsis: true,
- ...getColumnSearchProps('status$'),
- },
- {
- title: formatMessage('db.man_wait_pakin.create_time', '娣诲姞鏃堕棿'),
- dataIndex: 'createTime$',
- width: 140,
- ellipsis: true,
- ...getColumnSearchProps('createTime$'),
- },
- {
- title: formatMessage('db.man_wait_pakin.create_by', '娣诲姞浜哄憳'),
- dataIndex: 'createBy$',
- width: 140,
- ellipsis: true,
- ...getColumnSearchProps('createBy$'),
- },
- {
- title: formatMessage('db.man_wait_pakin.update_time', '淇敼鏃堕棿'),
- dataIndex: 'updateTime$',
- width: 140,
- ellipsis: true,
- ...getColumnSearchProps('updateTime$'),
- },
- {
- title: formatMessage('db.man_wait_pakin.update_by', '淇敼浜哄憳'),
- dataIndex: 'updateBy$',
- width: 140,
- ellipsis: true,
- ...getColumnSearchProps('updateBy$'),
- },
- {
- title: formatMessage('db.man_wait_pakin.memo', '澶囨敞'),
- dataIndex: 'memo',
- width: 140,
- ellipsis: true,
- ...getColumnSearchProps('memo'),
- },
+ {
+ title: formatMessage('db.man_wait_pakin.order_id', '璁㈠崟ID'),
+ dataIndex: 'orderId$',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('orderId$'),
+ },
+ {
+ title: formatMessage('db.man_wait_pakin.order_no', '璁㈠崟缂栧彿'),
+ dataIndex: 'orderNo',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('orderNo'),
+ },
+ {
+ title: formatMessage('db.man_wait_pakin.barcode', '鎵樼洏鐮�'),
+ dataIndex: 'barcode',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('barcode'),
+ },
+ {
+ title: formatMessage('db.man_wait_pakin.matnr', '鐗╂枡鍙�'),
+ dataIndex: ['detl$', 'mat$', 'matnr'],
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('detl$.matnr'),
+ },
+ {
+ title: formatMessage('db.man_wait_pakin.batch', '鎵瑰彿'),
+ dataIndex: ['detl$', 'batch'],
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('detl$.matnr'),
+ },
+ {
+ title: formatMessage('db.man_wait_pakin.anfme', '缁勬墭鏁伴噺'),
+ dataIndex: 'anfme',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('anfme'),
+ },
+ {
+ title: formatMessage('db.man_wait_pakin.io_status', '缁勬墭鐘舵��'),
+ dataIndex: 'ioStatus$',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('ioStatus$'),
+ },
+ {
+ title: formatMessage('db.man_wait_pakin.status', '鐘舵��'),
+ dataIndex: 'status$',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('status$'),
+ },
+ {
+ title: formatMessage('db.man_wait_pakin.create_time', '娣诲姞鏃堕棿'),
+ dataIndex: 'createTime$',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('createTime$'),
+ },
+ {
+ title: formatMessage('db.man_wait_pakin.create_by', '娣诲姞浜哄憳'),
+ dataIndex: 'createBy$',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('createBy$'),
+ },
+ {
+ title: formatMessage('db.man_wait_pakin.update_time', '淇敼鏃堕棿'),
+ dataIndex: 'updateTime$',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('updateTime$'),
+ },
+ {
+ title: formatMessage('db.man_wait_pakin.update_by', '淇敼浜哄憳'),
+ dataIndex: 'updateBy$',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('updateBy$'),
+ },
+ {
+ title: formatMessage('db.man_wait_pakin.memo', '澶囨敞'),
+ dataIndex: 'memo',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('memo'),
+ },
{
title: formatMessage('common.operation', '鎿嶄綔'),
@@ -215,7 +219,11 @@
}
function handleTableReload(value) {
- getPage()
+ emit('pageReload', 'reload')
+}
+
+const generateTask = () => {
+ generateTaskChild.value.open = true;
}
</script>
@@ -233,6 +241,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="generateTask()" type="primary">{{ formatMessage('page.generateTask', '鐢熸垚浠诲姟') }}</a-button>
<a-button @click="handleEdit(null)" type="primary">{{ formatMessage('page.add', '娣诲姞') }}</a-button>
<a-button @click="handleExport">{{ formatMessage('page.export', '瀵煎嚭') }}</a-button>
</div>
@@ -251,12 +260,15 @@
</template>
<template v-if="column.dataIndex === 'ioStatus$'">
- <a-switch :checked="record.ioStatus == 1" :checked-children="formatMessage('waitPakin.switch.open','鍏ュ簱涓�')" :un-checked-children="formatMessage('waitPakin.switch.close','寰呭叆搴�')" :disabled="true" />
+ <a-switch :checked="record.ioStatus == 1" :checked-children="formatMessage('waitPakin.switch.open', '鍏ュ簱涓�')"
+ :un-checked-children="formatMessage('waitPakin.switch.close', '寰呭叆搴�')" :disabled="true" />
</template>
</template>
</a-table>
</div>
+
+ <GenerateTaskView ref="generateTaskChild" @tableReload="handleTableReload" />
</template>
<style></style>
--
Gitblit v1.9.1