From 8900f9da1c540112c798309eb789ab007e922c8e Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期四, 10 七月 2025 16:52:21 +0800
Subject: [PATCH] #前端
---
rsf-admin/src/page/orders/purchase/PurchaseList.jsx | 9 ++
rsf-admin/src/page/contract/ContractEdit.jsx | 4
rsf-admin/src/page/orders/wave/WaveList.jsx | 12 ++-
rsf-admin/src/page/waveRule/WaveRuleList.jsx | 5 -
rsf-admin/src/page/orders/delivery/DeliveryList.jsx | 10 ++
rsf-admin/src/page/basicInfo/locType/LocTypeList.jsx | 2
rsf-admin/src/page/orders/purchase/PurchaseItemList.jsx | 7 ++
rsf-admin/src/page/basicInfo/locAreaMat/LocAreaMatList.jsx | 2
rsf-admin/src/page/container/ContainerEdit.jsx | 4
rsf-admin/src/page/orders/delivery/DeliveryItemList.jsx | 8 ++
rsf-admin/src/i18n/zh.js | 17 +++--
rsf-admin/src/page/orders/outStock/OutOrderList.jsx | 2
rsf-admin/src/page/orders/qlyInspect/QlyInspectList.jsx | 7 ++
rsf-admin/src/i18n/en.js | 1
rsf-admin/src/page/orders/delivery/DeliveryEdit.jsx | 4
rsf-admin/src/page/basicInfo/locAreaMat/LocAreaMatEdit.jsx | 4
rsf-admin/src/page/orders/outStock/OutOrderItemList.jsx | 8 ++
rsf-admin/src/page/waveRule/WaveRuleEdit.jsx | 4
rsf-admin/src/page/histories/asnOrderLog/AsnOrderItemLogList.jsx | 6 ++
rsf-admin/src/page/container/ContainerList.jsx | 2
rsf-admin/src/page/orders/purchase/PurchaseEdit.jsx | 4
rsf-admin/src/page/orders/asnOrder/AsnOrderList.jsx | 15 +++-
rsf-admin/src/page/basicInfo/locType/LocTypeEdit.jsx | 4
rsf-admin/src/page/contract/ContractList.jsx | 2
rsf-admin/src/page/histories/asnOrderLog/AsnOrderLogList.jsx | 7 ++
rsf-admin/src/page/task/TaskItemList.jsx | 2
rsf-admin/src/page/warehouseAreas/WarehouseAreasList.jsx | 6 --
rsf-admin/src/page/task/TaskList.jsx | 8 ++
rsf-admin/src/page/waitPakin/WaitPakinList.jsx | 7 ++
rsf-admin/src/page/histories/waitPakinLog/WaitPakinLogList.jsx | 2
30 files changed, 117 insertions(+), 58 deletions(-)
diff --git a/rsf-admin/src/i18n/en.js b/rsf-admin/src/i18n/en.js
index 7a1e395..9f0fe72 100644
--- a/rsf-admin/src/i18n/en.js
+++ b/rsf-admin/src/i18n/en.js
@@ -842,6 +842,7 @@
groupQty: 'Group Qty',
qty: "qty",
orderNum: "orderNum",
+ progress:"progress"
},
waveItem: {
waveId: "waveId",
diff --git a/rsf-admin/src/i18n/zh.js b/rsf-admin/src/i18n/zh.js
index cf686ce..c16f735 100644
--- a/rsf-admin/src/i18n/zh.js
+++ b/rsf-admin/src/i18n/zh.js
@@ -435,7 +435,7 @@
splrId: "渚涘簲鍟嗘爣璇�",
weight: "鏀惰揣閲嶉噺",
prodTime: "鐢熶骇鏃ユ湡",
- splrBtch: "渚涘簲鍟嗘壒娆�",
+ splrBtch: "鎵规",
},
loc: {
warehouseId: "鎵�灞炰粨搴�",
@@ -681,7 +681,7 @@
purQty: "涓嬪崟鏁伴噺",
purUnit: "鍗曚綅",
qty: "瀹屾垚鏁伴噺",
- splrBatch: "渚涘簲鍟嗘壒娆�",
+ splrBatch: "鎵规",
splrCode: "渚涘簲鍟嗙紪鐮�",
splrName: "渚涘簲鍟嗗悕绉�",
qrcode: "浜岀淮鐮�",
@@ -719,7 +719,7 @@
purUnit: "閲囪喘鍗曚綅",
qty: "宸插畬鎴愭暟閲�",
splrCode: "渚涘簲鍟嗙紪鐮�",
- splrBatch: "渚涘簲鍟嗘壒娆�",
+ splrBatch: "鎵规",
splrName: "渚涘簲鍟嗗悕绉�",
qrcode: "浜岀淮鐮�",
trackCode: "鏉″舰鐮�",
@@ -771,7 +771,7 @@
printQty: "鎵撳嵃鏁伴噺",
splrName: "渚涘簲鍟嗗悕绉�",
splrCode: "渚涘簲鍟嗙紪鐮�",
- splrBatch: "渚涘簲鍟嗘壒娆�",
+ splrBatch: "鎵规",
},
purchaseItem: {
purchaseId: "PO涓诲崟鏍囪瘑",
@@ -786,7 +786,7 @@
printQty: "鎵撳嵃鏁伴噺",
splrName: "渚涘簲鍟嗗悕绉�",
splrCode: "渚涘簲鍟嗙紪鐮�",
- splrBatch: "渚涘簲鍟嗘壒娆�",
+ splrBatch: "鎵规",
},
fields: {
fields: "瀛楁",
@@ -872,6 +872,7 @@
groupQty: '鍝佺被鏁�',
qty: "瀹屾垚鏁伴噺",
orderNum: "鍗曟嵁鏁�",
+ progress:"杩涘害"
},
waveItem: {
waveId: "娉㈡ID",
@@ -880,7 +881,7 @@
matnrName: "鐗╂枡鍚嶇О",
matnrCode: "鐗╂枡缂栫爜",
batch: "鎵规",
- splrBatch: "渚涘簲鍟嗘壒娆�",
+ splrBatch: "鎵规",
orderCode: "婧愬崟鍙�",
orderItemId: "婧愬崟鏄庣粏ID",
unit: "鍗曚綅",
@@ -986,7 +987,7 @@
qty: "鎬绘暟",
splrCode: "渚涘簲鍟嗙紪鐮�",
batch: "鎵规",
- splrBatch: "渚涘簲鍟嗘壒娆�",
+ splrBatch: "鎵规",
splrName: "渚涘簲鍟嗗悕绉�",
trackCode: "璺熻釜鐮�",
barcode: "鏉″舰鐮�",
@@ -1011,7 +1012,7 @@
workQty: '鎵ц鏁�',
qty: '瀹屾垚鏁�',
batch: "鎵规",
- splrBatch: "渚涘簲鍟嗘壒娆�",
+ splrBatch: "鎵规",
spec: "瑙勬牸",
model: "鍨嬪彿",
fieldsIndex: "鍔ㄦ�佺储寮�",
diff --git a/rsf-admin/src/page/basicInfo/locAreaMat/LocAreaMatEdit.jsx b/rsf-admin/src/page/basicInfo/locAreaMat/LocAreaMatEdit.jsx
index 9b0c23f..4253adf 100644
--- a/rsf-admin/src/page/basicInfo/locAreaMat/LocAreaMatEdit.jsx
+++ b/rsf-admin/src/page/basicInfo/locAreaMat/LocAreaMatEdit.jsx
@@ -121,14 +121,14 @@
</Stack>
</Grid>
- <Grid item xs={12} md={4}>
+ {/* <Grid item xs={12} md={4}>
<Typography variant="h6" gutterBottom>
{translate('common.edit.title.common')}
</Typography>
<StatusSelectInput />
<Box mt="2em" />
<MemoInput />
- </Grid>
+ </Grid> */}
</Grid>
</SimpleForm>
</Edit >
diff --git a/rsf-admin/src/page/basicInfo/locAreaMat/LocAreaMatList.jsx b/rsf-admin/src/page/basicInfo/locAreaMat/LocAreaMatList.jsx
index d7c816e..e1c0533 100644
--- a/rsf-admin/src/page/basicInfo/locAreaMat/LocAreaMatList.jsx
+++ b/rsf-admin/src/page/basicInfo/locAreaMat/LocAreaMatList.jsx
@@ -115,7 +115,7 @@
rowClick={(id, resource, record) => false}
expand={() => <LocAreaMatPanel />}
expandSingle={true}
- omit={['id', 'createTime', 'createBy', 'memo']}
+ omit={['id', 'createTime', 'createBy', 'memo','statusBool','updateBy']}
>
<NumberField source="id" />
<TextField source="code" label="table.field.locAreaMat.code" />
diff --git a/rsf-admin/src/page/basicInfo/locType/LocTypeEdit.jsx b/rsf-admin/src/page/basicInfo/locType/LocTypeEdit.jsx
index 666cd88..a62c347 100644
--- a/rsf-admin/src/page/basicInfo/locType/LocTypeEdit.jsx
+++ b/rsf-admin/src/page/basicInfo/locType/LocTypeEdit.jsx
@@ -95,14 +95,14 @@
</Stack>
</Grid>
- <Grid item xs={12} md={4}>
+ {/* <Grid item xs={12} md={4}>
<Typography variant="h6" gutterBottom>
{translate('common.edit.title.common')}
</Typography>
<StatusSelectInput />
<Box mt="2em" />
<MemoInput />
- </Grid>
+ </Grid> */}
</Grid>
</SimpleForm>
</Edit >
diff --git a/rsf-admin/src/page/basicInfo/locType/LocTypeList.jsx b/rsf-admin/src/page/basicInfo/locType/LocTypeList.jsx
index 5fd0003..2fed32b 100644
--- a/rsf-admin/src/page/basicInfo/locType/LocTypeList.jsx
+++ b/rsf-admin/src/page/basicInfo/locType/LocTypeList.jsx
@@ -119,7 +119,7 @@
<BulkDeleteButton />
</>}
rowClick={(id, resource, record) => false}
- omit={['id', 'createTime', 'createBy', 'memo']}
+ omit={['id', 'createTime', 'createBy', 'memo','statusBool','updateBy']}
>
<NumberField source="id" />
{/* <TextField source="uuid" label="table.field.locType.uuid" /> */}
diff --git a/rsf-admin/src/page/container/ContainerEdit.jsx b/rsf-admin/src/page/container/ContainerEdit.jsx
index e1623bd..9edd15e 100644
--- a/rsf-admin/src/page/container/ContainerEdit.jsx
+++ b/rsf-admin/src/page/container/ContainerEdit.jsx
@@ -184,14 +184,14 @@
</Stack>
</Grid>
- <Grid item xs={12} md={4}>
+ {/* <Grid item xs={12} md={4}>
<Typography variant="h6" gutterBottom>
{translate('common.edit.title.common')}
</Typography>
<StatusSelectInput />
<Box mt="2em" />
<MemoInput />
- </Grid>
+ </Grid> */}
</Grid>
</SimpleForm>
</Edit >
diff --git a/rsf-admin/src/page/container/ContainerList.jsx b/rsf-admin/src/page/container/ContainerList.jsx
index ab55a51..b99b12a 100644
--- a/rsf-admin/src/page/container/ContainerList.jsx
+++ b/rsf-admin/src/page/container/ContainerList.jsx
@@ -134,7 +134,7 @@
preferenceKey='container'
bulkActionButtons={() => <BulkDeleteButton mutationMode={OPERATE_MODE} />}
rowClick={(id, resource, record) => false}
- omit={['id', 'createTime', 'createBy', 'memo']}
+ omit={['id', 'createTime', 'createBy', 'memo','statusBool','updateBy']}
>
<NumberField source="id" />
{/* <TextField source="code" label="table.field.container.code" /> */}
diff --git a/rsf-admin/src/page/contract/ContractEdit.jsx b/rsf-admin/src/page/contract/ContractEdit.jsx
index ef0e6b5..ea823bf 100644
--- a/rsf-admin/src/page/contract/ContractEdit.jsx
+++ b/rsf-admin/src/page/contract/ContractEdit.jsx
@@ -89,14 +89,14 @@
</Stack>
</Grid>
- <Grid item xs={12} md={4}>
+ {/* <Grid item xs={12} md={4}>
<Typography variant="h6" gutterBottom>
{translate('common.edit.title.common')}
</Typography>
<StatusSelectInput />
<Box mt="2em" />
<MemoInput />
- </Grid>
+ </Grid> */}
</Grid>
</SimpleForm>
</Edit >
diff --git a/rsf-admin/src/page/contract/ContractList.jsx b/rsf-admin/src/page/contract/ContractList.jsx
index 72b1f82..f28ccb2 100644
--- a/rsf-admin/src/page/contract/ContractList.jsx
+++ b/rsf-admin/src/page/contract/ContractList.jsx
@@ -112,7 +112,7 @@
preferenceKey='contract'
bulkActionButtons={() => <BulkDeleteButton mutationMode={OPERATE_MODE} />}
rowClick={(id, resource, record) => false}
- omit={['id', 'createTime', 'createBy', 'memo']}
+ omit={['id', 'createTime', 'createBy', 'memo','statusBool','updateBy']}
>
<NumberField source="id" />
<TextField source="code" label="table.field.contract.code" />
diff --git a/rsf-admin/src/page/histories/asnOrderLog/AsnOrderItemLogList.jsx b/rsf-admin/src/page/histories/asnOrderLog/AsnOrderItemLogList.jsx
index 8d966b2..3f49ef0 100644
--- a/rsf-admin/src/page/histories/asnOrderLog/AsnOrderItemLogList.jsx
+++ b/rsf-admin/src/page/histories/asnOrderLog/AsnOrderItemLogList.jsx
@@ -54,6 +54,12 @@
'& .opt': {
width: 200
},
+ '& .MuiTableCell-root': {
+ whiteSpace: 'nowrap',
+ overflow: 'visible',
+ textOverflow: 'unset'
+ }
+
}));
const filters = [
diff --git a/rsf-admin/src/page/histories/asnOrderLog/AsnOrderLogList.jsx b/rsf-admin/src/page/histories/asnOrderLog/AsnOrderLogList.jsx
index 7680e2e..e0369b6 100644
--- a/rsf-admin/src/page/histories/asnOrderLog/AsnOrderLogList.jsx
+++ b/rsf-admin/src/page/histories/asnOrderLog/AsnOrderLogList.jsx
@@ -60,6 +60,11 @@
'& .opt': {
width: 150
},
+ '& .MuiTableCell-root': {
+ whiteSpace: 'nowrap',
+ overflow: 'visible',
+ textOverflow: 'unset'
+ }
}));
const filters = [
@@ -134,7 +139,7 @@
rowClick={'edit'}
expand={false}
expandSingle={true}
- omit={['id', 'createTime', 'createBy', 'memo', 'rleStatus']}
+ omit={['id', 'createTime', 'createBy', 'memo','logisNo', 'poId', 'rleStatus$','statusBool','createBy$']}
>
<NumberField source="id" />
<TextField source="code" label="table.field.asnOrderLog.code" />
diff --git a/rsf-admin/src/page/histories/waitPakinLog/WaitPakinLogList.jsx b/rsf-admin/src/page/histories/waitPakinLog/WaitPakinLogList.jsx
index 7ae94d1..e2e6e12 100644
--- a/rsf-admin/src/page/histories/waitPakinLog/WaitPakinLogList.jsx
+++ b/rsf-admin/src/page/histories/waitPakinLog/WaitPakinLogList.jsx
@@ -115,7 +115,7 @@
rowClick={'edit'}
expand={false}
expandSingle={true}
- omit={['id', 'createTime', 'createBy', 'memo']}
+ omit={['id', 'createTime', 'createBy', 'memo','statusBool']}
>
<NumberField source="id" />
<NumberField source="pakinId" label="table.field.waitPakinLog.pakinId" />
diff --git a/rsf-admin/src/page/orders/asnOrder/AsnOrderList.jsx b/rsf-admin/src/page/orders/asnOrder/AsnOrderList.jsx
index ea3aae5..43a9442 100644
--- a/rsf-admin/src/page/orders/asnOrder/AsnOrderList.jsx
+++ b/rsf-admin/src/page/orders/asnOrder/AsnOrderList.jsx
@@ -69,14 +69,21 @@
},
'& .column-name': {
},
- '& .opt': {
- width: 220
- },
+
'& .wkType': {
width: 110
},
'& .status': {
width: 90
+ },
+ '& .MuiTableCell-root': {
+ whiteSpace: 'nowrap',
+ overflow: 'visible',
+ textOverflow: 'unset'
+ },
+ '& .opt': {
+ width: 220,
+
},
}));
@@ -163,7 +170,7 @@
</>}
rowClick={false}
expandSingle={true}
- omit={['id', 'createTime', 'createBy', 'memo', 'logisNo', 'poId', 'rleStatus$']}
+ omit={['id', 'createTime', 'createBy', 'memo', 'logisNo', 'poId', 'rleStatus$','createBy$']}
>
<NumberField source="id" />
<TextField source="code" label="table.field.asnOrder.code" />
diff --git a/rsf-admin/src/page/orders/delivery/DeliveryEdit.jsx b/rsf-admin/src/page/orders/delivery/DeliveryEdit.jsx
index d619b4d..6113334 100644
--- a/rsf-admin/src/page/orders/delivery/DeliveryEdit.jsx
+++ b/rsf-admin/src/page/orders/delivery/DeliveryEdit.jsx
@@ -133,14 +133,14 @@
/>
</Stack>
</Grid>
- <Grid item xs={8} md={2}>
+ {/* <Grid item xs={8} md={2}>
<Typography variant="h6" gutterBottom>
{translate('common.edit.title.common')}
</Typography>
<StatusSelectInput />
<Box mt="2em" />
<MemoInput />
- </Grid>
+ </Grid> */}
</Grid>
</SimpleForm>
</Edit >
diff --git a/rsf-admin/src/page/orders/delivery/DeliveryItemList.jsx b/rsf-admin/src/page/orders/delivery/DeliveryItemList.jsx
index ab2f160..f654583 100644
--- a/rsf-admin/src/page/orders/delivery/DeliveryItemList.jsx
+++ b/rsf-admin/src/page/orders/delivery/DeliveryItemList.jsx
@@ -53,6 +53,12 @@
'& .opt': {
width: 150
},
+ '& .MuiTableCell-root': {
+ whiteSpace: 'nowrap',
+ overflow: 'visible',
+ textOverflow: 'unset'
+ }
+
}));
const filters = [
@@ -121,7 +127,7 @@
}}
expand={false}
expandSingle={true}
- omit={['id', 'createTime', 'deliveryId', 'fieldsIndex', 'printQty', 'nromQty', 'createBy', 'memo']}
+ omit={['id', 'createTime', 'deliveryId', 'fieldsIndex', 'printQty', 'nromQty', 'createBy', 'memo','statusBool','createBy$','splrCode']}
>
<NumberField source="id" />
<NumberField source="deliveryId" label="table.field.deliveryItem.deliveryId" />
diff --git a/rsf-admin/src/page/orders/delivery/DeliveryList.jsx b/rsf-admin/src/page/orders/delivery/DeliveryList.jsx
index 3124c3a..68ab69c 100644
--- a/rsf-admin/src/page/orders/delivery/DeliveryList.jsx
+++ b/rsf-admin/src/page/orders/delivery/DeliveryList.jsx
@@ -58,6 +58,12 @@
'& .opt': {
width: 200
},
+ '& .MuiTableCell-root': {
+ whiteSpace: 'nowrap',
+ overflow: 'visible',
+ textOverflow: 'unset'
+ }
+
}));
const filters = [
@@ -122,7 +128,7 @@
rowClick={(id, resource, record) => false}
expand={false}
expandSingle={true}
- omit={['id', 'createTime', 'createBy', 'platId', 'platCode', 'memo', 'startTime','qty', 'endTime', 'updateBy', 'createTime']}
+ omit={['id', 'createTime', 'createBy', 'platId', 'platCode', 'memo', 'startTime', 'endTime', 'updateBy', 'createTime','createBy$']}
>
<NumberField source="id" />
<TextField source="code" label="table.field.delivery.code" />
@@ -131,7 +137,7 @@
<TextField source="wkType$" label="table.field.delivery.wkType" />
<TextField source="source" label="table.field.delivery.source" />
<NumberField source="anfme" label="table.field.delivery.anfme" />
- <NumberField source="workQty" label="table.field.delivery.qty" />
+ <NumberField source="workQty" label="table.field.delivery.workQty" />
<NumberField source="qty" label="table.field.delivery.qty" />
<TextField source="platCode" label="table.field.delivery.platCode" />
<DateField source="startTime" label="table.field.delivery.startTime" showTime />
diff --git a/rsf-admin/src/page/orders/outStock/OutOrderItemList.jsx b/rsf-admin/src/page/orders/outStock/OutOrderItemList.jsx
index 21579c4..c484563 100644
--- a/rsf-admin/src/page/orders/outStock/OutOrderItemList.jsx
+++ b/rsf-admin/src/page/orders/outStock/OutOrderItemList.jsx
@@ -55,6 +55,12 @@
'& .opt': {
width: 200
},
+ '& .MuiTableCell-root': {
+ whiteSpace: 'nowrap',
+ overflow: 'visible',
+ textOverflow: 'unset'
+ }
+
}));
const filters = [
@@ -127,7 +133,7 @@
preferenceKey='outStockItem'
bulkActionButtons={false}
rowClick={false}
- omit={['id', 'createTime', 'createBy', 'memo', 'poDetlId', 'purQty', 'purUnit', 'trackCode', 'packName', 'qrcode', 'splrName', 'matnrId', 'asnId']}
+ omit={['id', 'createTime', 'createBy', 'memo', 'poDetlId', 'purQty', 'purUnit', 'trackCode', 'packName', 'qrcode', 'splrCode', 'matnrId', 'asnId','platOrderCode']}
>
<NumberField source="id" />
<NumberField source="asnId" label="table.field.outStockItem.asnId" />
diff --git a/rsf-admin/src/page/orders/outStock/OutOrderList.jsx b/rsf-admin/src/page/orders/outStock/OutOrderList.jsx
index b0ec005..47f94a0 100644
--- a/rsf-admin/src/page/orders/outStock/OutOrderList.jsx
+++ b/rsf-admin/src/page/orders/outStock/OutOrderList.jsx
@@ -173,7 +173,7 @@
bulkActionButtons={<PublicTaskButton setWaveRule={setWaveRule} setSelectIds={setSelectIds} />}
rowClick={false}
expandSingle={true}
- omit={['id', 'createTime', 'createBy', 'memo', 'rleStatus$']}
+ omit={['id', 'createTime', 'createBy$', 'memo', 'rleStatus$']}
>
<NumberField source="id" />
<TextField source="code" label="table.field.outStock.code" />
diff --git a/rsf-admin/src/page/orders/purchase/PurchaseEdit.jsx b/rsf-admin/src/page/orders/purchase/PurchaseEdit.jsx
index dd146a1..3953ed2 100644
--- a/rsf-admin/src/page/orders/purchase/PurchaseEdit.jsx
+++ b/rsf-admin/src/page/orders/purchase/PurchaseEdit.jsx
@@ -128,14 +128,14 @@
/>
</Stack>
</Grid>
- <Grid item xs={6} md={2}>
+ {/* <Grid item xs={6} md={2}>
<Typography variant="h6" gutterBottom>
{translate('common.edit.title.common')}
</Typography>
<StatusSelectInput />
<Box mt="2em" />
<MemoInput />
- </Grid>
+ </Grid> */}
</Grid>
</SimpleForm>
</Edit >
diff --git a/rsf-admin/src/page/orders/purchase/PurchaseItemList.jsx b/rsf-admin/src/page/orders/purchase/PurchaseItemList.jsx
index 204641e..1c205e7 100644
--- a/rsf-admin/src/page/orders/purchase/PurchaseItemList.jsx
+++ b/rsf-admin/src/page/orders/purchase/PurchaseItemList.jsx
@@ -44,6 +44,11 @@
'& .opt': {
width: 200
},
+ '& .MuiTableCell-root': {
+ whiteSpace: 'nowrap',
+ overflow: 'visible',
+ textOverflow: 'unset'
+ }
}));
const filters = [
@@ -117,7 +122,7 @@
setSelect(record)
setEditDialog(true)
}}
- omit={['id', 'createTime', 'purchaseId', 'platItemId','asnQty', 'printQty', 'createBy', 'memo']}
+ omit={['id', 'createTime', 'purchaseId', 'platItemId','asnQty', 'printQty', 'createBy', 'memo','splrCode','createBy$','statusBool']}
>
<NumberField source="id" />
<NumberField source="purchaseId" label="table.field.purchaseItem.purchaseId" />
diff --git a/rsf-admin/src/page/orders/purchase/PurchaseList.jsx b/rsf-admin/src/page/orders/purchase/PurchaseList.jsx
index bc2d2c4..5c50456 100644
--- a/rsf-admin/src/page/orders/purchase/PurchaseList.jsx
+++ b/rsf-admin/src/page/orders/purchase/PurchaseList.jsx
@@ -58,6 +58,11 @@
'& .opt': {
width: 200
},
+ '& .MuiTableCell-root': {
+ whiteSpace: 'nowrap',
+ overflow: 'visible',
+ textOverflow: 'unset'
+ }
}));
const filters = [
@@ -113,7 +118,7 @@
actions={(
<TopToolbar>
<FilterButton />
- <MyCreateButton onClick={() => { setCreateDialog(true) }} />
+ {/* <MyCreateButton onClick={() => { setCreateDialog(true) }} /> */}
<SelectColumnsButton preferenceKey='purchase' />
<ImportButton value={'purchaseItem'} />
<MyExportButton />
@@ -127,7 +132,7 @@
rowClick={false}
expand={false}
expandSingle={true}
- omit={['id', 'createTime', 'createBy','channel', 'platCode', 'memo', 'channel','startTime','workQty', 'endTime']}
+ omit={['id', 'createTime', 'createBy','channel', 'platCode', 'memo', 'channel','startTime','workQty', 'endTime','createBy$']}
>
<NumberField source="id" />
<TextField source="code" label="table.field.purchase.code" />
diff --git a/rsf-admin/src/page/orders/qlyInspect/QlyInspectList.jsx b/rsf-admin/src/page/orders/qlyInspect/QlyInspectList.jsx
index f099c0a..e741dfc 100644
--- a/rsf-admin/src/page/orders/qlyInspect/QlyInspectList.jsx
+++ b/rsf-admin/src/page/orders/qlyInspect/QlyInspectList.jsx
@@ -62,6 +62,11 @@
'& .opt': {
width: 200
},
+ '& .MuiTableCell-root': {
+ whiteSpace: 'nowrap',
+ overflow: 'visible',
+ textOverflow: 'unset'
+ }
}));
const filters = [
@@ -130,7 +135,7 @@
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" />
diff --git a/rsf-admin/src/page/orders/wave/WaveList.jsx b/rsf-admin/src/page/orders/wave/WaveList.jsx
index 3a1f78d..96e5f0b 100644
--- a/rsf-admin/src/page/orders/wave/WaveList.jsx
+++ b/rsf-admin/src/page/orders/wave/WaveList.jsx
@@ -28,6 +28,7 @@
import { PAGE_DRAWER_WIDTH, OPERATE_MODE, DEFAULT_PAGE_SIZE, DEFAULT_WAVE_AUTO_EXCE } from '@/config/setting';
import PlayArrowOutlinedIcon from '@mui/icons-material/PlayArrowOutlined';
import PauseCircleOutlineIcon from '@mui/icons-material/PauseCircleOutline';
+import PauseIcon from '@mui/icons-material/Pause';
import StopCircleOutlinedIcon from '@mui/icons-material/StopCircleOutlined';
import StopOutlinedIcon from '@mui/icons-material/StopOutlined';
import { Box, Typography, Card, Stack, LinearProgress } from '@mui/material';
@@ -151,7 +152,7 @@
rowClick={(id, resource, record) => false}
expand={<WavePannel />}
expandSingle={true}
- omit={['id', 'createTime', 'createBy', 'createBy$']}
+ omit={['id', 'createTime', 'createBy', 'createBy$','memo']}
>
<NumberField source="id" />
<TextField source="code" label="table.field.wave.code" />
@@ -164,8 +165,9 @@
<TextField source="updateBy$" label="common.field.updateBy" />
<DateField source="updateTime" label="common.field.updateTime" showTime />
<TextField source="createBy$" label="common.field.createBy" />
+
+ <CustomProcess source="progress" label="table.field.wave.progress" />
<TextField source="memo" label="common.field.memo" sortable={false} />
- <CustomProcess source="progress" />
<TextField source="exceStatus$" label="table.field.wave.exceStatus" sortable={false} />
<WrapperField cellClassName="opt" label="common.field.opt">
<PauseButton />
@@ -295,7 +297,7 @@
}
}
return (
- autoExce ? <Button label="toolbar.pause" onClick={pauseClick} startIcon={<PauseCircleOutlineIcon />} /> : <></>
+ autoExce ? <Button label="toolbar.pause" onClick={pauseClick} startIcon={<PauseIcon />} /> : <></>
)
}
@@ -313,7 +315,7 @@
refresh()
}
return (
- record?.exceStatus == 1 ? <Button label="toolbar.pause" onClick={pauseClick} startIcon={<StopCircleOutlinedIcon />} /> : <></>
+ record?.exceStatus == 1 ? <Button label="toolbar.pause" onClick={pauseClick} startIcon={<PauseIcon />} /> : <></>
)
}
@@ -331,6 +333,6 @@
refresh()
}
return (
- record?.exceStatus == 2 ? <Button label="toolbar.continuePub" onClick={continueClick} startIcon={<PauseCircleOutlineIcon />} /> : <></>
+ record?.exceStatus == 2 ? <Button label="toolbar.continuePub" onClick={continueClick} startIcon={<PlayArrowOutlinedIcon />} /> : <></>
)
}
\ No newline at end of file
diff --git a/rsf-admin/src/page/task/TaskItemList.jsx b/rsf-admin/src/page/task/TaskItemList.jsx
index b481f78..76e19e7 100644
--- a/rsf-admin/src/page/task/TaskItemList.jsx
+++ b/rsf-admin/src/page/task/TaskItemList.jsx
@@ -200,7 +200,7 @@
rowClick={false}
// expand={() => <TaskItemPanel />}
expandSingle={true}
- omit={['id', 'createTime', 'createBy', 'memo', 'taskId', 'orderId', 'orderItemId', 'matnrId', 'platWorkCode', 'projectCode']}
+ omit={['id', 'createTime', 'createBy', 'memo', 'taskId', 'orderId', 'orderItemId', 'matnrId', 'platWorkCode', 'projectCode','statusBool']}
>
{columns.map((column) => column)}
</StyledDatagrid>}
diff --git a/rsf-admin/src/page/task/TaskList.jsx b/rsf-admin/src/page/task/TaskList.jsx
index b460c03..49479c4 100644
--- a/rsf-admin/src/page/task/TaskList.jsx
+++ b/rsf-admin/src/page/task/TaskList.jsx
@@ -54,6 +54,12 @@
'& .opt': {
width: 248
},
+ '& .MuiTableCell-root': {
+ whiteSpace: 'nowrap',
+ overflow: 'visible',
+ textOverflow: 'unset'
+ }
+
}));
@@ -135,7 +141,7 @@
rowClick={false}
expand={<TaskPanel />}
expandSingle={true}
- omit={['id', 'createTime', 'createBy', 'memo', 'robotCode', 'exceStatus', 'expDesc', 'expCode', 'status']}
+ omit={['id', 'createTime', 'createBy$', 'memo', 'robotCode', 'exceStatus', 'expDesc', 'expCode', 'status','warehType$']}
>
<NumberField source="id" />
<TextField source="taskCode" label="table.field.task.taskCode" />
diff --git a/rsf-admin/src/page/waitPakin/WaitPakinList.jsx b/rsf-admin/src/page/waitPakin/WaitPakinList.jsx
index f8213de..e63471c 100644
--- a/rsf-admin/src/page/waitPakin/WaitPakinList.jsx
+++ b/rsf-admin/src/page/waitPakin/WaitPakinList.jsx
@@ -60,6 +60,11 @@
'& .opt': {
width: 210
},
+ '& .MuiTableCell-root': {
+ whiteSpace: 'nowrap',
+ overflow: 'visible',
+ textOverflow: 'unset'
+ }
}));
const filters = [
@@ -167,7 +172,7 @@
{/* <BulkDeleteButton mutationMode={OPERATE_MODE} /> */}
</>}
rowClick={false}
- omit={['id', 'createTime', 'createBy', 'memo']}
+ omit={['id', 'createTime', 'createBy', 'memo','statusBool']}
>
<NumberField source="id" />
<TextField source="code" label="table.field.waitPakin.code" />
diff --git a/rsf-admin/src/page/warehouseAreas/WarehouseAreasList.jsx b/rsf-admin/src/page/warehouseAreas/WarehouseAreasList.jsx
index 02ad461..2ab6e3b 100644
--- a/rsf-admin/src/page/warehouseAreas/WarehouseAreasList.jsx
+++ b/rsf-admin/src/page/warehouseAreas/WarehouseAreasList.jsx
@@ -59,12 +59,6 @@
'& .opt': {
width: 200
},
- '& .RaDatagrid-cell': {
- whiteSpace: 'nowrap',
- overflow: 'visible',
- textOverflow: 'unset',
- maxWidth: 'none'
- },
'& .MuiTableCell-root': {
whiteSpace: 'nowrap',
overflow: 'visible',
diff --git a/rsf-admin/src/page/waveRule/WaveRuleEdit.jsx b/rsf-admin/src/page/waveRule/WaveRuleEdit.jsx
index 0291814..2fee55f 100644
--- a/rsf-admin/src/page/waveRule/WaveRuleEdit.jsx
+++ b/rsf-admin/src/page/waveRule/WaveRuleEdit.jsx
@@ -92,14 +92,14 @@
</Stack>
</Grid>
- <Grid item xs={12} md={4}>
+ {/* <Grid item xs={12} md={4}>
<Typography variant="h6" gutterBottom>
{translate('common.edit.title.common')}
</Typography>
<StatusSelectInput />
<Box mt="2em" />
<MemoInput />
- </Grid>
+ </Grid> */}
</Grid>
</SimpleForm>
</Edit >
diff --git a/rsf-admin/src/page/waveRule/WaveRuleList.jsx b/rsf-admin/src/page/waveRule/WaveRuleList.jsx
index fc7861c..dbc6feb 100644
--- a/rsf-admin/src/page/waveRule/WaveRuleList.jsx
+++ b/rsf-admin/src/page/waveRule/WaveRuleList.jsx
@@ -113,10 +113,9 @@
<StyledDatagrid
preferenceKey='waveRule'
bulkActionButtons={() => <BulkDeleteButton mutationMode={OPERATE_MODE} />}
- rowClick={(id, resource, record) => false}
- expand={() => <WaveRulePanel />}
+ rowClick={(id, resource, record) => false}
expandSingle={true}
- omit={['id', 'createTime', 'createBy', 'memo']}
+ omit={['id', 'createTime', 'createBy', 'memo','statusBool','updateBy']}
>
<NumberField source="id" />
<TextField source="code" label="table.field.waveRule.code" />
--
Gitblit v1.9.1