From 4b17b1b1bc31e1d3f6e773deccc5dc901675450a Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 01 四月 2025 13:26:38 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-admin/src/page/qlyInspect/InspectModal.jsx | 68 ++++++++++++++++++++++++----------
1 files changed, 48 insertions(+), 20 deletions(-)
diff --git a/rsf-admin/src/page/qlyInspect/InspectModal.jsx b/rsf-admin/src/page/qlyInspect/InspectModal.jsx
index f977507..1828f2e 100644
--- a/rsf-admin/src/page/qlyInspect/InspectModal.jsx
+++ b/rsf-admin/src/page/qlyInspect/InspectModal.jsx
@@ -59,17 +59,15 @@
}
const handleSubmit = async () => {
- const data = tableData.filter(el => el.safeQty == 0)
- console.log(data);
- if (data.length) {
- // const { data: { code, data, msg } } = await request.post(`/qlyInspect/selected`, { ids: selectedRows });
-
- // if (code === 200) {
- // notify(msg);
- // refresh()
- // } else {
- // notify(msg);
- // }
+ const rows = tableData.filter(el => !(el.safeQty == 0 && el.disQty == 0))
+ if (rows.length) {
+ const { data: { code, data, msg } } = await request.post(`/qlyIsptItem/batch/update`, { isptItem: rows, type: '0' });
+ if (code === 200) {
+ notify(msg);
+ refresh()
+ } else {
+ notify(msg);
+ }
}
setOpen(false);
@@ -87,7 +85,7 @@
const data = res.data.data.records.map(item => {
return {
...item,
- isptResult: ''
+ isptResult: item.isptResult || ''
}
})
setTableData(data);
@@ -102,17 +100,38 @@
getData()
};
- const batchQualified = () => {
+ const batchQualified = async () => {
if (selectedRows.length) {
- console.log(selectedRows);
+ const rows = tableData.filter(el => selectedRows.includes(el.id));
+ const { data: { code, data, msg } } = await request.post(`/qlyIsptItem/batch/update`, { isptItem: rows, type: '1' });
+ if (code === 200) {
+ notify(msg);
+ getData()
+ refresh()
+ } else {
+ notify(msg);
+ }
+ } else {
+ notify('璇烽�夋嫨鐗╂枡');
}
- getData()
}
- const batchUnQualified = () => {
- console.log(selectedRows);
- getData()
+ const batchUnQualified = async () => {
+ if (selectedRows.length) {
+ const rows = tableData.filter(el => selectedRows.includes(el.id));
+ const { data: { code, data, msg } } = await request.post(`/qlyIsptItem/batch/update`, { isptItem: rows, type: '2' });
+ if (code === 200) {
+ notify(msg);
+ getData()
+ refresh()
+ } else {
+ notify(msg);
+ }
+
+ } else {
+ notify('璇烽�夋嫨鐗╂枡');
+ }
}
return (
@@ -200,7 +219,7 @@
{ field: 'splrName', headerName: translate('table.field.qlyIsptItem.splrName') },
{ field: 'splrBatch', headerName: translate('table.field.qlyIsptItem.splrBatch') },
{ field: 'stockBatch', headerName: translate('table.field.qlyIsptItem.stockBatch') },
- { field: 'rcptQty', headerName: translate('table.field.qlyIsptItem.rcptQty') },
+ { field: 'dlyQty', headerName: translate('table.field.qlyIsptItem.dlyQty') },
{
field: 'safeQty', headerName: translate('table.field.qlyIsptItem.safeQty'), editable: true, type: 'number',
renderHeader: () => (
@@ -213,8 +232,17 @@
),
},
{
+ field: 'disQty', headerName: translate('table.field.qlyIsptItem.disQty'), editable: true, type: 'number',
+ renderHeader: () => (
+ <strong>
+ {translate('table.field.qlyIsptItem.disQty')}
+ </strong>
+ ),
+ },
+
+ {
field: 'isptResult', headerName: translate('table.field.qlyIsptItem.isptResult'), width: 150, type: 'singleSelect',
- editable: true, valueOptions: [{ value: '1', label: '鍚堟牸' }, { value: '2', label: '涓嶅悎鏍�' }, { value: '3', label: '寰呭畾' }, { value: '4', label: '闄嶇骇浣跨敤' }],
+ editable: true, valueOptions: [{ value: '1', label: '鍚堟牸' }, { value: '2', label: '涓嶅悎鏍�' }, { value: '3', label: '寰呭畾' }, { value: '4', label: '閮ㄥ垎鍚堟牸' }],
},
--
Gitblit v1.9.1