From ac4341ea6b66ae02427d39d35f41d42d78b2eb2e Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期五, 14 二月 2025 10:08:32 +0800
Subject: [PATCH] #
---
zy-asrs-admin/src/views/base/mat/index.vue | 303 ++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 268 insertions(+), 35 deletions(-)
diff --git a/zy-asrs-admin/src/views/base/mat/index.vue b/zy-asrs-admin/src/views/base/mat/index.vue
index 414c1ee..e6e6de7 100644
--- a/zy-asrs-admin/src/views/base/mat/index.vue
+++ b/zy-asrs-admin/src/views/base/mat/index.vue
@@ -1,11 +1,19 @@
<script setup>
import { getCurrentInstance, ref, computed, reactive } from 'vue';
import { useRouter } from "vue-router";
-import { get, post, postBlob } from '@/utils/request.js'
+import { get, post, postBlob, postForm } from '@/utils/request.js'
import { message, Modal } from 'ant-design-vue';
-import { logout } from '@/config.js';
+import { globalState, logout } from '@/config.js';
import EditView from './edit.vue'
import { formatMessage } from '@/utils/localeUtils.js';
+import useTableSearch from '@/utils/tableUtils.jsx';
+import MatPrint from '@/components/print/matPrint/index.vue';
+import {
+ DownOutlined,
+ UploadOutlined,
+ DownloadOutlined,
+} from "@ant-design/icons-vue";
+
const context = getCurrentInstance()?.appContext.config.globalProperties;
const router = useRouter();
@@ -14,155 +22,241 @@
let currentPage = 1;
let pageSize = 10;
const searchInput = ref("")
+const searchParam = ref({
+ matnr: null,
+ maktx: null,
+ specs: null,
+ model: null,
+})
const editChild = ref(null)
+const printChild = ref(null);
+
+const state = reactive({
+ selectedRowKeys: [],
+ loading: false,
+ columns: []
+});
let tableData = ref([]);
+getColumns();
getPage();
-const columns = [
+const {
+ getColumnSearchProps,
+ handleResizeColumn,
+} = useTableSearch();
+
+
+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;
+};
+
+state.columns = [
+ {
+ title: '#ID',
+ dataIndex: 'id',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('id'),
+ },
{
title: formatMessage('db.man_mat.tag_id', '鎵�灞炲綊绫�'),
dataIndex: 'tagId$',
width: 140,
ellipsis: true,
+ ...getColumnSearchProps('tagId$'),
},
{
title: formatMessage('db.man_mat.matnr', '鍟嗗搧缂栧彿'),
dataIndex: 'matnr',
width: 140,
ellipsis: true,
+ ...getColumnSearchProps('matnr'),
},
{
title: formatMessage('db.man_mat.maktx', '鍟嗗搧鍚嶇О'),
dataIndex: 'maktx',
width: 140,
ellipsis: true,
+ ...getColumnSearchProps('maktx'),
},
{
title: formatMessage('db.man_mat.name', '鍒悕'),
dataIndex: 'name',
width: 140,
ellipsis: true,
+ ...getColumnSearchProps('name'),
},
{
title: formatMessage('db.man_mat.specs', '瑙勬牸'),
dataIndex: 'specs',
width: 140,
ellipsis: true,
+ ...getColumnSearchProps('specs'),
},
{
title: formatMessage('db.man_mat.model', '鍨嬪彿'),
dataIndex: 'model',
width: 140,
ellipsis: true,
+ ...getColumnSearchProps('model'),
},
{
title: formatMessage('db.man_mat.color', '棰滆壊'),
dataIndex: 'color',
width: 140,
ellipsis: true,
+ ...getColumnSearchProps('color'),
},
{
title: formatMessage('db.man_mat.brand', '鍝佺墝'),
dataIndex: 'brand',
width: 140,
ellipsis: true,
+ ...getColumnSearchProps('brand'),
},
{
title: formatMessage('db.man_mat.unit', '鍗曚綅'),
dataIndex: 'unit',
width: 140,
ellipsis: true,
+ ...getColumnSearchProps('unit'),
},
{
title: formatMessage('db.man_mat.price', '鍗曚环'),
dataIndex: 'price',
width: 140,
ellipsis: true,
+ ...getColumnSearchProps('price'),
},
{
title: formatMessage('db.man_mat.sku', 'sku'),
dataIndex: 'sku',
width: 140,
ellipsis: true,
+ ...getColumnSearchProps('sku'),
},
{
title: formatMessage('db.man_mat.units', '鍗曚綅閲�'),
dataIndex: 'units',
width: 140,
ellipsis: true,
+ ...getColumnSearchProps('units'),
},
{
title: formatMessage('db.man_mat.barcode', '鏉＄爜'),
dataIndex: 'barcode',
width: 140,
ellipsis: true,
+ ...getColumnSearchProps('barcode'),
},
{
title: formatMessage('db.man_mat.origin', '浜у湴'),
dataIndex: 'origin',
width: 140,
ellipsis: true,
+ ...getColumnSearchProps('origin'),
},
{
title: formatMessage('db.man_mat.manu', '鍘傚'),
dataIndex: 'manu',
width: 140,
ellipsis: true,
+ ...getColumnSearchProps('manu'),
},
{
title: formatMessage('db.man_mat.manu_date', '鐢熶骇鏃ユ湡'),
dataIndex: 'manuDate',
width: 140,
ellipsis: true,
+ ...getColumnSearchProps('manuDate'),
},
{
title: formatMessage('db.man_mat.item_num', '鍝侀」鏁�'),
dataIndex: 'itemNum',
width: 140,
ellipsis: true,
+ ...getColumnSearchProps('itemNum'),
},
{
title: formatMessage('db.man_mat.weight', '閲嶉噺'),
dataIndex: 'weight',
width: 140,
ellipsis: true,
+ ...getColumnSearchProps('weight'),
},
{
title: formatMessage('db.man_mat.length', '闀垮害'),
dataIndex: 'length',
width: 140,
ellipsis: true,
+ ...getColumnSearchProps('length'),
},
{
title: formatMessage('db.man_mat.volume', '浣撶Н'),
dataIndex: 'volume',
width: 140,
ellipsis: true,
+ ...getColumnSearchProps('volume'),
},
{
title: formatMessage('db.man_mat.three_code', '涓夋柟缂栫爜'),
dataIndex: 'threeCode',
width: 140,
ellipsis: true,
+ ...getColumnSearchProps('threeCode'),
},
{
title: formatMessage('db.man_mat.supp', '渚涘簲鍟�'),
dataIndex: 'supp',
width: 140,
ellipsis: true,
+ ...getColumnSearchProps('supp'),
},
{
title: formatMessage('db.man_mat.supp_code', '渚涘簲鍟嗙紪鐮�'),
dataIndex: 'suppCode',
width: 140,
ellipsis: true,
+ ...getColumnSearchProps('suppCode'),
},
{
title: formatMessage('db.man_mat.dead_time', '淇濊川鏈�'),
dataIndex: 'deadTime',
width: 140,
ellipsis: true,
+ ...getColumnSearchProps('deadTime'),
+ },
+ {
+ title: formatMessage('db.man_mat.safeStockLimit', '瀹夊叏搴撳瓨涓婇檺'),
+ dataIndex: 'safeStockLimit',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('safeStockLimit'),
+ },
+ {
+ title: formatMessage('db.man_mat.safeStockMinimum', '瀹夊叏搴撳瓨涓嬮檺'),
+ dataIndex: 'safeStockMinimum',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('safeStockMinimum'),
+ },
+ {
+ title: formatMessage('db.man_mat.validity', '鏈夋晥鏈�'),
+ dataIndex: 'validity',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('validity'),
},
{
@@ -170,24 +264,28 @@
dataIndex: 'uuid',
width: 140,
ellipsis: true,
+ ...getColumnSearchProps('uuid'),
},
{
title: formatMessage('db.man_mat.flag', '鏍囪瘑'),
dataIndex: 'flag',
width: 140,
ellipsis: true,
+ ...getColumnSearchProps('flag'),
},
{
title: formatMessage('db.man_mat.sort', '鎺掑簭'),
dataIndex: 'sort',
width: 140,
ellipsis: true,
+ ...getColumnSearchProps('sort'),
},
{
title: formatMessage('db.man_mat.status', '鐘舵��'),
dataIndex: 'status$',
width: 140,
ellipsis: true,
+ ...getColumnSearchProps('status$'),
},
// {
// title: formatMessage('db.man_mat.create_time', '娣诲姞鏃堕棿'),
@@ -218,45 +316,63 @@
dataIndex: 'memo',
width: 140,
ellipsis: true,
+ ...getColumnSearchProps('memo'),
},
- {
- title: formatMessage('common.operation', '鎿嶄綔'),
- name: 'oper',
- dataIndex: 'oper',
- key: 'oper',
- width: 140,
- },
];
-const state = reactive({
- selectedRowKeys: [],
- loading: false,
-});
-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;
-};
+//鍔犺浇鎵╁睍瀛楁
+async function getColumns() {
+ let fieldResp = await post('/api/matField/list', {
+ fieldType: 0
+ })
+ let fieldResult = fieldResp.data;
+ let tmp = state.columns;
+ if (fieldResult.code == 200) {
+ let data = fieldResult.data;
-function getPage() {
+ data.forEach((item) => {
+ tmp.push({
+ title: formatMessage(item.language, item.describe),
+ name: item.name,
+ dataIndex: item.name,
+ key: item.name,
+ width: 140,
+ })
+ })
+
+ tmp.push({
+ title: formatMessage('common.operation', '鎿嶄綔'),
+ name: 'oper',
+ dataIndex: 'oper',
+ key: 'oper',
+ width: 140,
+ fixed: 'right',
+ })
+
+ state.columns = tmp;
+ } else if (result.code === 401) {
+ message.error(result.msg);
+ logout()
+ } else {
+ message.error(result.msg);
+ }
+}
+
+async function getPage() {
+ state.loading = true;
post('/api/mat/page', {
current: currentPage,
pageSize: pageSize,
- condition: searchInput.value
+ condition: searchInput.value,
+ _param: searchParam.value,
}).then((resp) => {
let result = resp.data;
if (result.code == 200) {
let data = result.data;
tableData.value = data;
+
+ state.loading = false;
} else if (result.code === 401) {
message.error(result.msg);
logout()
@@ -298,7 +414,10 @@
}
const handleExport = async (intl) => {
- postBlob('/api/mat/export', {}).then(result => {
+ postBlob('/api/mat/export', {
+ condition: searchInput.value,
+ _param: searchParam.value,
+ }).then(result => {
const blob = new Blob([result.data], { type: 'application/vnd.ms-excel' });
window.location.href = window.URL.createObjectURL(blob);
return true;
@@ -316,8 +435,78 @@
getPage();
}
+const showTotalPage = (total, range) => {
+ return formatMessage('page.total.head', '鎬昏') + total + formatMessage('page.total.footer', '鏉�')
+}
+
function handleTableReload(value) {
getPage()
+}
+
+const matFieldList = ref(null);
+MatFieldQuery();
+
+function MatFieldQuery() {
+ post('/api/matField/list', {}).then(resp => {
+ let result = resp.data;
+ matFieldList.value = result.data;
+ })
+}
+
+const handleSyncMatClick = (e) => {
+ if (e.key == 'import') {
+ importTemplate()
+ } else if (e.key == 'export') {
+ exportTemplate()
+ }
+}
+
+const importTemplate = () => {
+ //瀵煎叆妯℃澘
+}
+
+const exportTemplate = () => {
+ //妯℃澘瀵煎嚭
+ postBlob('/api/mat/exportTemplate', {}).then(result => {
+ const blob = new Blob([result.data], { type: 'application/vnd.ms-excel' });
+ window.location.href = window.URL.createObjectURL(blob);
+ return true;
+ })
+}
+
+const fileList = ref([]);
+const handleUploadChange = info => {
+ if (info.file.status !== 'uploading') {
+ // console.log(info.file, info.fileList);
+ }
+ if (info.file.status === 'done') {
+ let result = info.file.response;
+ if (result.code == 200) {
+ message.success(`${info.file.name} ${formatMessage('page.upload.success', '涓婁紶鎴愬姛')}`);
+ getPage()
+ } else {
+ message.error(result.msg);
+ }
+ } else if (info.file.status === 'error') {
+ message.error(`${info.file.name} file upload failed.`);
+ }
+};
+
+const handlePrint = () => {
+ if (state.selectedRowKeys.length == 0) {
+ message.warning(formatMessage('common.select', '璇烽�夋嫨'));
+ return;
+ }
+ let data = tableData.value.records;
+ let tmp = [];
+ data.forEach((item) => {
+ if (state.selectedRowKeys.indexOf(item.id) != -1) {
+ tmp.push(item);
+ }
+ })
+
+ printChild.value.printData = tmp;
+ printChild.value.open = true;
}
</script>
@@ -332,21 +521,63 @@
<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>
+ <a-input v-model:value="searchParam.matnr" :placeholder="formatMessage('page.mat.matnr.input', '璇疯緭鍏ュ晢鍝佺紪鍙�')"
+ style="width: 140px;margin-right: 10px;" />
+ <a-input v-model:value="searchParam.maktx" :placeholder="formatMessage('page.mat.matnr.input', '璇疯緭鍏ュ晢鍝佸悕绉�')"
+ style="width: 140px;margin-right: 10px;" />
+ <a-input v-model:value="searchParam.specs" :placeholder="formatMessage('page.mat.matnr.input', '璇疯緭鍏ヨ鏍�')"
+ style="width: 140px;margin-right: 10px;" />
+ <a-input v-model:value="searchParam.model" :placeholder="formatMessage('page.mat.matnr.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-dropdown>
+ <template #overlay>
+ <a-menu @click="handleSyncMatClick">
+ <a-menu-item key="import">
+ <a-upload v-model:file-list="fileList" name="file" action="/api/mat/upload" @change="handleUploadChange"
+ :showUploadList="false" :headers="{
+ Authorization: globalState.token
+ }">
+ <UploadOutlined />
+ {{ formatMessage('page.mat.import', '鍟嗗搧瀵煎叆') }}
+ </a-upload>
+ </a-menu-item>
+
+ <a-menu-item key="export">
+ <DownloadOutlined />
+ {{ formatMessage('page.mat.export.template', '瀵煎嚭妯℃澘') }}
+ </a-menu-item>
+ </a-menu>
+ </template>
+ <a-button>
+ {{ formatMessage('page.mat.sync', '鏁版嵁鍚屾') }}
+ <DownOutlined />
+ </a-button>
+ </a-dropdown>
+ <a-button @click="handlePrint()" type="primary">
+ {{ formatMessage('db.man_zpallet_barcode.batchPrint', '鎵归噺鎵撳嵃') }}
+ </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>
<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">
+ :pagination="{ total: tableData.total, showTotal: showTotalPage, onChange: onPageChange }"
+ :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="handleEdit(record)">{{ formatMessage('page.edit', '缂栬緫') }}</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>
@@ -355,6 +586,8 @@
</template>
</a-table>
</div>
+
+ <MatPrint ref="printChild" />
</template>
<style></style>
--
Gitblit v1.9.1