From db2c3d7fe3d1e89b49b9628f408ba883dc75dc51 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 03 七月 2025 17:11:43 +0800
Subject: [PATCH] no message
---
zy-asrs-admin/src/views/out/wave/index.vue | 680 +++++++++++++++++++++++++++++---------------------------
1 files changed, 348 insertions(+), 332 deletions(-)
diff --git a/zy-asrs-admin/src/views/out/wave/index.vue b/zy-asrs-admin/src/views/out/wave/index.vue
index 098a2a2..6a4b61a 100644
--- a/zy-asrs-admin/src/views/out/wave/index.vue
+++ b/zy-asrs-admin/src/views/out/wave/index.vue
@@ -1,332 +1,348 @@
-<script setup>
-import { getCurrentInstance, ref, computed, reactive } from 'vue';
-import { useRouter } from "vue-router";
-import { get, post, postBlob } from '@/utils/request.js'
-import { message, Modal } from 'ant-design-vue';
-import { logout } from '@/config.js';
-import EditView from './edit.vue'
-import { formatMessage } from '@/utils/localeUtils.js';
-import useTableSearch from '@/utils/tableUtils.jsx';
-import OrderOutMergePreviewView from '@/components/orderOut/orderOutMergePreview/index.vue';
-const context = getCurrentInstance()?.appContext.config.globalProperties;
-
-const router = useRouter();
-
-const TABLE_KEY = 'table-wave';
-let currentPage = 1;
-let pageSize = 10;
-const searchInput = ref("")
-const editChild = ref(null)
-const orderOutMergePreviewChild = ref(null);
-
-const state = reactive({
- selectedRowKeys: [],
- loading: false,
- columns: [],
-});
-
-let tableData = ref([]);
-getPage();
-
-const {
- getColumnSearchProps,
- handleResizeColumn,
-} = useTableSearch();
-
-let tableDataColSpan = []
-const customColSpanProps = (index) => {
- let count = tableDataColSpan[index];
- if (count == null) {
- count = 0;
- }
- return {
- rowSpan: count,
- };
-}
-
-state.columns = [
- {
- title: formatMessage('db.man_wave.wave_no', '娉㈡鍙�'),
- dataIndex: 'waveNo',
- width: 140,
- ellipsis: true,
- ...getColumnSearchProps('waveNo'),
- customCell: (_, index) => {
- return customColSpanProps(index)
- },
- },
- {
- title: formatMessage('db.man_wave.waveType$', '绫诲瀷'),
- dataIndex: 'waveType$',
- width: 140,
- ellipsis: true,
- ...getColumnSearchProps('waveType$'),
- customCell: (_, index) => {
- return customColSpanProps(index)
- },
- },
- {
- title: formatMessage('db.man_wave.orderNo', '璁㈠崟鍙�'),
- dataIndex: ['orderNo'],
- width: 140,
- ellipsis: true,
- ...getColumnSearchProps('waveType$'),
- },
- {
- title: formatMessage('db.man_wave.matnr', '鍟嗗搧缂栧彿'),
- dataIndex: ['mat$', 'matnr'],
- width: 140,
- ellipsis: true,
- ...getColumnSearchProps('matnr'),
- },
- {
- title: formatMessage('db.man_wave.maktx', '鍟嗗搧鍚嶇О'),
- dataIndex: ['mat$', 'maktx'],
- width: 140,
- ellipsis: true,
- ...getColumnSearchProps('maktx'),
- },
- {
- title: formatMessage('db.man_wave.batch', '鎵瑰彿'),
- dataIndex: ['mat$', 'batch'],
- width: 140,
- ellipsis: true,
- ...getColumnSearchProps('batch'),
- },
- {
- title: formatMessage('db.man_wave.anfme', '鏁伴噺'),
- dataIndex: ['anfme'],
- width: 140,
- ellipsis: true,
- ...getColumnSearchProps('anfme'),
- },
-
-];
-
-const hasSelected = computed(() => state.selectedRowKeys.length > 0);
-const start = () => {
- state.loading = true;
- // ajax request after empty completing
- setTimeout(() => {
- state.loading = false;
- state.selectedRowKeys = [];
- }, 1000);
-};
-const onSelectChange = selectedRowKeys => {
- // console.log('selectedRowKeys changed: ', selectedRowKeys);
- state.selectedRowKeys = selectedRowKeys;
-};
-
-function getPage() {
- state.loading = true;
-
- post('/api/wave/page', {
- current: currentPage,
- pageSize: pageSize,
- condition: searchInput.value
- }).then((resp) => {
- let result = resp.data;
- if (result.code == 200) {
- let data = result.data.records;
-
- let tmp = []
- let idx = 0;
- let colSpan = []
- data.forEach((item) => {
- let count = 0;
-
- item.waveDetlList.forEach((val) => {
- count += val.orderDetl$.length;
- val.orderDetl$.forEach((detl) => {
- detl.key = idx;
- detl.waveNo = item.waveNo;
- detl.waveId = item.id;
- detl.waveType = item.waveType;
- detl.waveType$ = item.waveType$;
- tmp.push(detl)
- })
- })
-
- colSpan[idx] = count;
- idx += count;
- })
-
- tableDataColSpan = colSpan;
- tableData.value = tmp;
-
- state.loading = false;
-
- } else if (result.code === 401) {
- message.error(result.msg);
- logout()
- } else {
- message.error(result.msg);
- }
- })
-}
-
-const fieldList = [];
-getColumns();
-//鍔犺浇鎵╁睍瀛楁
-async function getColumns() {
- let fieldResp = await post('/api/matField/list', {
- unique: 1
- })
- let fieldResult = fieldResp.data;
- let tmp = state.columns;
- if (fieldResult.code == 200) {
- let data = fieldResult.data;
-
- data.forEach((item) => {
- tmp.push({
- title: formatMessage(item.language, item.describe),
- name: item.name,
- dataIndex: item.name,
- key: item.name,
- width: 140,
- editable: true,
- })
-
- fieldList.push(item.name);
- })
-
- tmp.push({
- title: formatMessage('common.operation', '鎿嶄綔'),
- name: 'oper',
- dataIndex: 'oper',
- key: 'oper',
- width: 200,
- fixed: 'right',
- customCell: (_, index) => {
- return customColSpanProps(index)
- },
- })
-
- state.columns = tmp;
-
- } else if (result.code === 401) {
- message.error(result.msg);
- logout()
- } else {
- message.error(result.msg);
- }
-}
-
-// const handleEdit = (item) => {
-// editChild.value.open = true;
-// editChild.value.formData = item == null ? editChild.value.initFormData : JSON.parse(JSON.stringify(item));
-// editChild.value.isSave = item == null;
-// }
-
-const handleGenerateOut = (item) => {
- console.log(item);
-
- get('/api/wave/list/' + item.waveId, {}).then(resp => {
- let result = resp.data;
- let data = result.data;
- let orderIds = []
- data.forEach((item) => {
- orderIds.push(item.orderId)
- })
-
- orderOutMergePreviewChild.value.open = true;
- orderOutMergePreviewChild.value.records = orderIds;
- })
-}
-
-const handleDel = (rows) => {
- Modal.confirm({
- title: formatMessage('page.delete', '鍒犻櫎'),
- content: formatMessage('page.delete.confirm', '纭畾鍒犻櫎璇ラ」鍚楋紵'),
- maskClosable: true,
- onOk: async () => {
- const hide = message.loading(formatMessage('common.loading', '璇锋眰涓�'));
- try {
- let waveIds = []
- rows.forEach((item) => {
- waveIds.push(item.waveId)
- })
-
- post('/api/out/wave/cancel', waveIds).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', '璇锋眰澶辫触'));
- }
- },
- });
-}
-
-const handleExport = async (intl) => {
- postBlob('/api/wave/export', {}).then(result => {
- const blob = new Blob([result.data], { type: 'application/vnd.ms-excel' });
- window.location.href = window.URL.createObjectURL(blob);
- return true;
- })
-};
-
-const onSearch = () => {
- // console.log('search');
- getPage()
-}
-
-const onPageChange = (page, size) => {
- currentPage = page;
- pageSize = size;
- getPage();
-}
-
-function handleTableReload(value) {
- getPage()
-}
-
-const handleChildReload = () => {
- handleTableReload()
-}
-
-</script>
-
-<script>
-export default {
- name: '娉㈡绠＄悊'
-}
-</script>
-
-<template>
- <div>
- <EditView ref="editChild" @tableReload="handleTableReload" />
- <div class="table-header">
- <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="handleExport">{{ formatMessage('page.export', '瀵煎嚭') }}</a-button>
- </div> -->
- </div>
- <a-table :data-source="tableData" :defaultExpandAllRows="false" :key="TABLE_KEY" rowKey="index"
- :scroll="{ y: 768, scrollToFirstRowOnChange: true }" :columns="state.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;">
- <a-button type="link" primary @click="handleGenerateOut(record)">{{ formatMessage('page.generateOut',
- '鐢熸垚鍑哄簱浠诲姟')
- }}</a-button>
- <a-button type="link" danger @click="handleDel([record])">{{ formatMessage('page.delete', '鍒犻櫎')
- }}</a-button>
- </div>
- </template>
- </template>
- </a-table>
-
- <OrderOutMergePreviewView ref="orderOutMergePreviewChild" @reload="handleChildReload" />
- </div>
-</template>
-
-<style></style>
+<script setup>
+import { getCurrentInstance, ref, computed, reactive, watch } from 'vue';
+import { useRouter } from "vue-router";
+import { get, post, postBlob } from '@/utils/request.js'
+import { message, Modal } from 'ant-design-vue';
+import { logout } from '@/config.js';
+import EditView from './edit.vue'
+import { formatMessage } from '@/utils/localeUtils.js';
+import useTableSearch from '@/utils/tableUtils.jsx';
+import OrderOutWavePreviewView from '@/components/orderOut/orderOutWavePreview/index.vue';
+const context = getCurrentInstance()?.appContext.config.globalProperties;
+
+const router = useRouter();
+
+const TABLE_KEY = 'table-wave';
+let currentPage = 1;
+let pageSize = 10;
+const searchInput = ref("")
+const searchParam = ref({
+ waveNo: null,
+ matnr: null,
+ batch: null,
+})
+const editChild = ref(null)
+const orderOutWavePreviewChild = ref(null);
+
+const state = reactive({
+ selectedRowKeys: [],
+ loading: false,
+ columns: [],
+});
+
+let tableData = ref([]);
+getPage();
+
+const {
+ getColumnSearchProps,
+ handleResizeColumn,
+} = useTableSearch();
+
+let tableDataColSpan = []
+const customColSpanProps = (index) => {
+ let count = tableDataColSpan[index];
+ // console.log(index + ' ----=====-->' + count)
+ if (count == null || count == undefined) {
+ count = 0;
+ }
+ // console.log(' ----=====-->' + count)
+ return {
+ rowSpan: count,
+ };
+}
+
+state.columns = [
+ {
+ title: formatMessage('db.man_wave.wave_no', '娉㈡鍙�'),
+ dataIndex: 'waveNo',
+ width: 180,
+ ellipsis: true,
+ ...getColumnSearchProps('waveNo'),
+ customCell: (_, index) => {
+ return customColSpanProps(index)
+ },
+ },
+ {
+ title: formatMessage('db.man_wave.waveType$', '绫诲瀷'),
+ dataIndex: 'waveType$',
+ width: 110,
+ ellipsis: true,
+ ...getColumnSearchProps('waveType$'),
+ customCell: (_, index) => {
+ return customColSpanProps(index)
+ },
+ },
+ {
+ title: formatMessage('db.man_wave.waveStatus$', '鐘舵��'),
+ dataIndex: 'waveStatus$',
+ width: 120,
+ ellipsis: true,
+ ...getColumnSearchProps('waveStatus$'),
+ customCell: (_, index) => {
+ return customColSpanProps(index)
+ },
+ },
+ {
+ title: formatMessage('db.man_wave.matnr', '鍟嗗搧缂栧彿'),
+ dataIndex: ['mat$', 'matnr'],
+ width: 180,
+ ellipsis: true,
+ ...getColumnSearchProps('matnr'),
+ },
+ {
+ title: formatMessage('db.man_wave.maktx', '鍟嗗搧鍚嶇О'),
+ dataIndex: ['mat$', 'maktx'],
+ width: 180,
+ ellipsis: true,
+ ...getColumnSearchProps('maktx'),
+ },
+ {
+ title: formatMessage('db.man_wave.batch', '鎵瑰彿'),
+ dataIndex: ['batch'],
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('batch'),
+ },
+ {
+ title: formatMessage('db.man_wave.anfme', '鏁伴噺'),
+ dataIndex: ['anfme'],
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('anfme'),
+ },
+ {
+ title: formatMessage('db.man_wave.work_qty', '宸ヤ綔鏁伴噺'),
+ dataIndex: ['workQty'],
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('workQty'),
+ },
+
+];
+
+const hasSelected = computed(() => state.selectedRowKeys.length > 0);
+const start = () => {
+ state.loading = true;
+ // ajax request after empty completing
+ setTimeout(() => {
+ state.loading = false;
+ state.selectedRowKeys = [];
+ }, 1000);
+};
+const onSelectChange = selectedRowKeys => {
+ // console.log('selectedRowKeys changed: ', selectedRowKeys);
+ state.selectedRowKeys = selectedRowKeys;
+};
+
+function getPage() {
+ state.loading = true;
+
+ post('/api/wave/page', {
+ current: currentPage,
+ pageSize: pageSize,
+ condition: searchInput.value,
+ _param: searchParam.value,
+ }).then((resp) => {
+ let result = resp.data;
+ if (result.code == 200) {
+ let data = result.data.records;
+
+ let tmp = []
+ let idx = 0;
+ let colSpan = []
+ data.forEach((item) => {
+ let count = 0;
+ item.waveDetlList.forEach((detl) => {
+ detl.waveStatus = item.waveStatus;
+ detl.waveStatus$ = item.waveStatus$;
+ detl.waveType = item.waveType;
+ detl.waveType$ = item.waveType$;
+ count++;
+ tmp.push(detl)
+ })
+
+ colSpan[idx] = count;
+ idx += count;
+ })
+
+ tableDataColSpan = colSpan;
+ // console.log('=========>');
+ // console.log(tmp)
+ // console.log(tableDataColSpan);
+ tableData.value = tmp;
+ state.loading = false;
+ } else if (result.code === 401) {
+ message.error(result.msg);
+ logout()
+ } else {
+ message.error(result.msg);
+ }
+ })
+}
+
+const fieldList = [];
+getColumns();
+//鍔犺浇鎵╁睍瀛楁
+async function getColumns() {
+ let fieldResp = await post('/api/matField/list', {
+ unique: 1
+ })
+ let fieldResult = fieldResp.data;
+ let tmp = state.columns;
+ if (fieldResult.code == 200) {
+ let data = fieldResult.data;
+
+ data.forEach((item) => {
+ tmp.push({
+ title: formatMessage(item.language, item.describe),
+ name: item.name,
+ dataIndex: item.name,
+ key: item.name,
+ width: 140,
+ editable: true,
+ })
+
+ fieldList.push(item.name);
+ })
+
+ tmp.push({
+ title: formatMessage('common.operation', '鎿嶄綔'),
+ name: 'oper',
+ dataIndex: 'oper',
+ key: 'oper',
+ width: 200,
+ fixed: 'right',
+ customCell: (_, index) => {
+ return customColSpanProps(index)
+ },
+ })
+
+ state.columns = tmp;
+
+ } else if (result.code === 401) {
+ message.error(result.msg);
+ logout()
+ } else {
+ message.error(result.msg);
+ }
+}
+
+// const handleEdit = (item) => {
+// editChild.value.open = true;
+// editChild.value.formData = item == null ? editChild.value.initFormData : JSON.parse(JSON.stringify(item));
+// editChild.value.isSave = item == null;
+// }
+
+const handleGenerateOut = (waveId) => {
+ orderOutWavePreviewChild.value.open = true;
+ orderOutWavePreviewChild.value.waveId = waveId;
+}
+
+const handleDel = (rows) => {
+ Modal.confirm({
+ title: formatMessage('page.cancel', '鍙栨秷'),
+ content: formatMessage('page.cancel.confirm', '纭畾鍙栨秷璇ラ」鍚楋紵'),
+ maskClosable: true,
+ onOk: async () => {
+ const hide = message.loading(formatMessage('common.loading', '璇锋眰涓�'));
+ try {
+ let waveIds = []
+ rows.forEach((item) => {
+ waveIds.push(item.waveId)
+ })
+
+ post('/api/out/wave/cancel', waveIds).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', '璇锋眰澶辫触'));
+ }
+ },
+ });
+}
+
+const handleExport = async (intl) => {
+ postBlob('/api/wave/export', {}).then(result => {
+ const blob = new Blob([result.data], { type: 'application/vnd.ms-excel' });
+ window.location.href = window.URL.createObjectURL(blob);
+ return true;
+ })
+};
+
+const onSearch = () => {
+ // console.log('search');
+ getPage()
+}
+
+const onPageChange = (page, size) => {
+ currentPage = page;
+ pageSize = size;
+ getPage();
+}
+
+function handleTableReload(value) {
+ getPage()
+}
+
+const handleChildReload = () => {
+ handleTableReload()
+}
+
+</script>
+
+<script>
+export default {
+ name: '娉㈡绠＄悊'
+}
+</script>
+
+<template>
+ <div>
+ <EditView ref="editChild" @tableReload="handleTableReload" />
+ <div class="table-header">
+ <div>
+ <a-input v-model:value="searchParam.waveNo" :placeholder="formatMessage('page.wave.waveNo.input', '璇疯緭鍏ユ尝娆″彿')"
+ style="width: 140px;margin-right: 10px;" />
+ <a-input v-model:value="searchParam.matnr" :placeholder="formatMessage('page.wave.matnr.input', '璇疯緭鍏ュ晢鍝佺紪鍙�')"
+ style="width: 140px;margin-right: 10px;" />
+ <a-input v-model:value="searchParam.batch" :placeholder="formatMessage('page.wave.batch.input', '璇疯緭鍏ユ壒鍙�')"
+ style="width: 140px;margin-right: 10px;" />
+
+ <a-input-search v-model:value="searchInput" :placeholder="formatMessage('page.input', '璇疯緭鍏�')"
+ style="width: 200px;" @search="onSearch" />
+ </div>
+ <!-- <div class="table-header-right">
+ <a-button @click="handleEdit(null)" type="primary">{{ formatMessage('page.add', '娣诲姞') }}</a-button>
+ <a-button @click="handleExport">{{ formatMessage('page.export', '瀵煎嚭') }}</a-button>
+ </div> -->
+ </div>
+ <a-table :data-source="tableData" :defaultExpandAllRows="false" :key="TABLE_KEY" rowKey="index"
+ :scroll="{ y: 768, scrollToFirstRowOnChange: true }" :columns="state.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;">
+ <a-button type="link" primary :disabled="record.waveStatus != 0"
+ @click="handleGenerateOut(record.waveId)">{{
+ formatMessage('page.generateOut',
+ '鐢熸垚鍑哄簱浠诲姟')
+ }}</a-button>
+ <a-button type="link" danger @click="handleDel([record])">{{ formatMessage('page.cancel', '鍙栨秷')
+ }}</a-button>
+ </div>
+ </template>
+ </template>
+ </a-table>
+
+ <OrderOutWavePreviewView ref="orderOutWavePreviewChild" @reload="handleChildReload" />
+ </div>
+</template>
+
+<style></style>
--
Gitblit v1.9.1