From 67e6956e76106cdb7245bd1055f65b1f0e7c68e5 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期五, 21 三月 2025 14:52:25 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-admin/src/page/basicInfo/loc/InitModal.jsx | 29 +++++++++++++++++++----------
rsf-admin/src/page/login/index.jsx | 4 ++--
rsf-admin/public/favicon.ico | 0
rsf-admin/src/page/basicInfo/locArea/LocAreaList.jsx | 2 +-
rsf-admin/index.html | 2 +-
rsf-admin/src/page/basicInfo/matnr/PrintModal.jsx | 2 +-
6 files changed, 24 insertions(+), 15 deletions(-)
diff --git a/rsf-admin/index.html b/rsf-admin/index.html
index 3fe8724..036d6ab 100644
--- a/rsf-admin/index.html
+++ b/rsf-admin/index.html
@@ -9,7 +9,7 @@
<meta name="theme-color" content="#000000" />
<link rel="manifest" href="./manifest.json" />
<link rel="shortcut icon" href="./favicon.ico" />
- <title>rsf - vincent</title>
+ <title>鏅鸿兘浠撳偍WMS绠＄悊绯荤粺</title>
<style>
body {
margin: 0;
diff --git a/rsf-admin/public/favicon.ico b/rsf-admin/public/favicon.ico
index f922255..86d5e0a 100644
--- a/rsf-admin/public/favicon.ico
+++ b/rsf-admin/public/favicon.ico
Binary files differ
diff --git a/rsf-admin/src/page/basicInfo/loc/InitModal.jsx b/rsf-admin/src/page/basicInfo/loc/InitModal.jsx
index a677559..a02d8b9 100644
--- a/rsf-admin/src/page/basicInfo/loc/InitModal.jsx
+++ b/rsf-admin/src/page/basicInfo/loc/InitModal.jsx
@@ -63,6 +63,7 @@
const notify = useNotify();
const [formData, setFormData] = useState({
+ "warehouseId": null,
"areaId": undefined,
"endBay": undefined,
"endLev": undefined,
@@ -113,8 +114,26 @@
<Grid container spacing={2}>
<Grid item xs={4}>
<ReferenceInput
+ source="warehouseId"
+ reference="warehouse"
+ >
+ <AutocompleteInput
+ label="table.field.loc.warehouseId"
+ optionText="name"
+ onChange={(value) => handleChange(value, 'warehouseId')}
+ value={formData.warehouseId}
+ validate={[required()]}
+ filterToQuery={(val) => ({ name: val })}
+ />
+ </ReferenceInput>
+
+ </Grid>
+
+ <Grid item xs={4}>
+ <ReferenceInput
source="areaId"
reference="warehouseAreas"
+ filter={{ warehouseId: formData.warehouseId }}
>
<AutocompleteInput
label="table.field.loc.areaId"
@@ -128,16 +147,6 @@
</Grid>
- <Grid item xs={4}>
- <DictionarySelect
- label={translate("table.field.loc.locType")}
- name="locType"
- value={formData.locType}
- onChange={(e) => handleChange(e.target.value, 'locType')}
- size="small"
- dictTypeCode="sys_width_type"
- />
- </Grid>
<Grid item xs={4}>
<ReferenceArrayInput source="typeIds" reference="locType" >
diff --git a/rsf-admin/src/page/basicInfo/locArea/LocAreaList.jsx b/rsf-admin/src/page/basicInfo/locArea/LocAreaList.jsx
index ff1f348..9f92799 100644
--- a/rsf-admin/src/page/basicInfo/locArea/LocAreaList.jsx
+++ b/rsf-admin/src/page/basicInfo/locArea/LocAreaList.jsx
@@ -122,7 +122,7 @@
<NumberField source="id" />
<TextField source="name" label="table.field.locArea.name" />
<TextField source="code" label="table.field.locArea.code" />
- <NumberField source="areaId" label="table.field.locArea.areaId" />
+ <NumberField source="areaId$" label="table.field.locArea.areaId" />
{/* <ReferenceField source="locId" label="table.field.locArea.locId" reference="loc" link={false} sortable={false}>
<TextField source="warehouseId" />
</ReferenceField> */}
diff --git a/rsf-admin/src/page/basicInfo/matnr/PrintModal.jsx b/rsf-admin/src/page/basicInfo/matnr/PrintModal.jsx
index a0095c1..a2863a9 100644
--- a/rsf-admin/src/page/basicInfo/matnr/PrintModal.jsx
+++ b/rsf-admin/src/page/basicInfo/matnr/PrintModal.jsx
@@ -98,7 +98,7 @@
</FormControl>
<Box>
- <div ref={contentRef}>
+ <div ref={contentRef} style={{ display: 'flex', justifyContent: 'center' }}>
<table
className="contain"
style={{
diff --git a/rsf-admin/src/page/login/index.jsx b/rsf-admin/src/page/login/index.jsx
index 17c3f9c..877a367 100644
--- a/rsf-admin/src/page/login/index.jsx
+++ b/rsf-admin/src/page/login/index.jsx
@@ -56,7 +56,7 @@
backgroundSize: 'cover',
}}
>
- <video
+ {/* <video
autoPlay
loop
muted
@@ -76,7 +76,7 @@
{LOGIN_BACKGROUND === 'media' && (
<source src="/login_bg.mp4" type="video/mp4" />
)}
- </video>
+ </video> */}
<Card sx={{
width: 400,
--
Gitblit v1.9.1