From fcbb4059f11d1e2b320d581bf6f960d9965142c6 Mon Sep 17 00:00:00 2001
From: pjb <123456>
Date: 星期二, 08 七月 2025 08:58:18 +0800
Subject: [PATCH] Merge branch 'ycds-wms-dev' of http://47.97.1.152:5880/r/zy-asrs-master into ycds-wms-dev
---
zy-asrs-admin/src/views/base/zpalletBarcode/index.vue | 80 +++++++++++++++++++++++++++++++--------
1 files changed, 63 insertions(+), 17 deletions(-)
diff --git a/zy-asrs-admin/src/views/base/zpalletBarcode/index.vue b/zy-asrs-admin/src/views/base/zpalletBarcode/index.vue
index 322ae7c..39bf8bd 100644
--- a/zy-asrs-admin/src/views/base/zpalletBarcode/index.vue
+++ b/zy-asrs-admin/src/views/base/zpalletBarcode/index.vue
@@ -21,6 +21,7 @@
let openGenerate = ref(false);
let generateBarcodeValue = ref("80000001");
+let pakinType = ref(1);
let generateNum = ref(100);
const state = reactive({
@@ -211,6 +212,7 @@
post('/api/zpalletBarcode/generate', {
barcode: generateBarcodeValue.value,
num: generateNum.value,
+ type: pakinType.value
}).then((resp) => {
let result = resp.data;
if (result.code == 200) {
@@ -226,21 +228,54 @@
})
}
-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);
- }
- })
+const handleDelete = () => {
+ if (state.selectedRowKeys.length == 0) {
+ message.warning(formatMessage('common.select', '璇烽�夋嫨'));
+ return;
+ }
- printChild.value.printData = tmp;
- printChild.value.open = true;
+ Modal.confirm({
+ title: formatMessage('page.delete', '鍒犻櫎'),
+ content: formatMessage('page.delete.confirm', '纭畾鍒犻櫎璇ラ」鍚楋紵'),
+ maskClosable: true,
+ onOk: async () => {
+ const hide = message.loading(formatMessage('common.loading', '璇锋眰涓�'));
+ try {
+ post('/api/zpalletBarcode/remove/' + state.selectedRowKeys).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', '璇锋眰澶辫触'));
+ }
+ },
+ });
+
+ console.log(state.selectedRowKeys);
+
+}
+
+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>
@@ -257,9 +292,12 @@
<div class="table-header">
<div>
<a-input-search v-model:value="searchInput" :placeholder="formatMessage('page.input', '璇疯緭鍏�')"
- style="width: 200px;" @search="onSearch" />
+ style="width: 200px; margin: 0 10px;" @search="onSearch" />
<a-button @click="handlePrint()" type="primary">
{{ formatMessage('db.man_zpallet_barcode.batchPrint', '鎵归噺鎵撳嵃') }}
+ </a-button>
+ <a-button @click="handleDelete()" danger style="margin: 0 10px;">
+ {{ formatMessage('db.man_zpallet_barcode.batchPrint', '鎵归噺鍒犻櫎') }}
</a-button>
</div>
<div class="table-header-right">
@@ -272,13 +310,14 @@
<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" @resizeColumn="handleResizeColumn" :loading="state.loading">
+ :scroll="{ y: 768, scrollToFirstRowOnChange: true }" :columns="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" danger @click="handleDel([record])">{{ formatMessage('page.delete', '鍒犻櫎')
- }}</a-button>
+ }}</a-button>
</div>
</template>
</template>
@@ -293,6 +332,13 @@
<a-form-item :label="formatMessage('db.man_zpallet_barcode.generateNum', '鐢熸垚鏁伴噺')">
<a-input v-model:value="generateNum" />
</a-form-item>
+ <a-form-item :label="formatMessage('db.man_container.type', '鎵樼洏绫诲瀷')" name="type">
+ <a-select v-model:value="pakinType" :options="[
+ { label: '骞冲簱鎵樼洏', value: 1 },
+ { label: '绔嬪簱鎵樼洏', value: 2 },
+ ]">
+ </a-select>
+ </a-form-item>
</a-form>
</a-modal>
--
Gitblit v1.9.1