From af964f7921ec8480d5bd05950dc4043a9154ab6b Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期一, 11 八月 2025 14:03:50 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-admin/src/page/orders/qlyInspect/QlyInspectList.jsx | 26 ++++++++++++++++++--------
1 files changed, 18 insertions(+), 8 deletions(-)
diff --git a/rsf-admin/src/page/orders/qlyInspect/QlyInspectList.jsx b/rsf-admin/src/page/orders/qlyInspect/QlyInspectList.jsx
index a2667dc..e741dfc 100644
--- a/rsf-admin/src/page/orders/qlyInspect/QlyInspectList.jsx
+++ b/rsf-admin/src/page/orders/qlyInspect/QlyInspectList.jsx
@@ -49,6 +49,7 @@
import AsnSelModal from "./AsnSelModal";
import InspectModal from "./InspectModal";
import QlyInspectOpCreate from './QlyInspectOpCreate';
+import ConfirmButton from "../../components/ConfirmButton";
const StyledDatagrid = styled(DatagridConfigurable)(({ theme }) => ({
'& .css-1vooibu-MuiSvgIcon-root': {
height: '.9em'
@@ -61,6 +62,11 @@
'& .opt': {
width: 200
},
+ '& .MuiTableCell-root': {
+ whiteSpace: 'nowrap',
+ overflow: 'visible',
+ textOverflow: 'unset'
+ }
}));
const filters = [
@@ -116,7 +122,7 @@
actions={(
<TopToolbar>
<AsnCreatButton />
- <MyCreateButton onClick={() => { setOpCreateDialog(true) }} />
+ {/* <MyCreateButton onClick={() => { setOpCreateDialog(true) }} /> */}
<FilterButton />
<SelectColumnsButton preferenceKey='qlyInspect' />
<MyExportButton />
@@ -129,15 +135,15 @@
bulkActionButtons={<BulkDeleteButton mutationMode={OPERATE_MODE} />}
rowClick={false}
expandSingle={true}
- omit={['id', 'createTime', 'createBy', 'memo', 'asnId', 'statusBool']}
+ omit={['id', 'createTime', 'createBy', 'memo', 'asnId', 'statusBool','createBy$']}
>
<NumberField source="id" />
<TextField source="code" label="table.field.qlyInspect.code" />
- <TextField source="isptStatus$" label="table.field.qlyInspect.isptStatus" />
<TextField source="wkType$" label="table.field.qlyInspect.wkType" />
<NumberField source="asnId" label="table.field.qlyInspect.asnId" />
<NumberField source="asnCode" label="table.field.qlyInspect.asnCode" />
<NumberField source="isptQty" label="table.field.qlyInspect.isptQty" />
+ <TextField source="isptStatus$" label="table.field.qlyInspect.isptStatus" />
<TextField source="updateBy$" label="common.field.updateBy" />
<DateField source="updateTime" label="common.field.updateTime" showTime />
<TextField source="createBy$" label="common.field.createBy" />
@@ -148,7 +154,7 @@
<EditButton label="toolbar.detail" />
<InspectionButton />
<CompleteButton />
- <CloseButton />
+ {/* <CloseButton /> */}
</WrapperField>
</StyledDatagrid>
</List>
@@ -171,6 +177,12 @@
}
export default QlyInspectList;
+
+const PrintLabelButton = () => {
+ const record = useRecordContext();
+
+
+}
const InspectionButton = () => {
const record = useRecordContext();
@@ -197,7 +209,7 @@
const notify = useNotify();
const refresh = useRefresh();
const requestComplete = async () => {
- const { data: { code, data, msg } } = await request.post(`/qlyInspect/update`, { ...record, isptStatus: '1' });
+ const { data: { code, data, msg } } = await request.post(`/qlyInspect/verify/complate/` + record?.id);
if (code === 200) {
notify(msg);
refresh()
@@ -207,9 +219,7 @@
}
return (
- record.isptStatus != 1 && record.isptStatus != 3 ? (<Button onClick={requestComplete} label={"toolbar.complete"} mutationMode={OPERATE_MODE}>
- <TaskIcon />
- </Button>) : (<></>)
+ record.isptStatus == 2 ? (<ConfirmButton label={"toolbar.verifyComfirm"} color="secondary" startIcon={<TaskIcon />} onConfirm={requestComplete} />) : (<></>)
)
}
--
Gitblit v1.9.1