From 4a2408cf21e1c60196d798ab971f00328d9ca249 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期五, 18 四月 2025 16:20:02 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-admin/src/page/orders/asnOrder/AsnOrderModal.jsx | 22 ++++++++++++++--------
1 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/rsf-admin/src/page/orders/asnOrder/AsnOrderModal.jsx b/rsf-admin/src/page/orders/asnOrder/AsnOrderModal.jsx
index 94a86e0..1dab7ad 100644
--- a/rsf-admin/src/page/orders/asnOrder/AsnOrderModal.jsx
+++ b/rsf-admin/src/page/orders/asnOrder/AsnOrderModal.jsx
@@ -57,6 +57,7 @@
import { DataGrid, useGridApiRef } from '@mui/x-data-grid';
import DictionarySelect from "../../components/DictionarySelect";
import DictSelect from "../../components/DictSelect";
+import "./asnOrder.css";
const AsnOrderModal = (props) => {
const { open, setOpen, asnId, billReload } = props;
@@ -317,7 +318,8 @@
getOptions();
}, []);
const getOptions = async () => {
- const parmas = {
+ const parmas = {
+ "type": "supplier"
}
const {
data: { code, data, msg },
@@ -360,7 +362,8 @@
getOptions();
}, []);
const getOptions = async () => {
- const parmas = {
+ const parmas = {
+ "type": "supplier"
}
const {
data: { code, data, msg },
@@ -420,33 +423,35 @@
},
{
field: 'anfme',
- headerName: translate('table.field.asnOrderItem.anfme'),
+ headerName: translate('table.field.asnOrderItem.anfme')+"*",
type: 'number',
minWidth: 100,
flex: 1,
editable: true,
- valueFormatter: (val) => val < 0 ? 0 : val
+ valueFormatter: (val) => val < 0 ? 0 : val,
+ headerClassName: "custom",
},
{
field: 'splrCode',
- headerName: translate('table.field.asnOrderItem.splrCode'),
+ headerName: translate('table.field.asnOrderItem.splrCode')+"*",
minWidth: 100,
flex: 1,
editable: true,
renderEditCell: (params) => (
<SelectInputSplrCodeEditCell {...params} />
),
+ headerClassName: "custom",
},
{
field: 'splrName',
- headerName: translate('table.field.asnOrderItem.splrName'),
+ headerName: translate('table.field.asnOrderItem.splrName')+"*",
minWidth: 100,
flex: 1,
editable: true,
renderEditCell: (params) => (
<SelectInputSplrNameEditCell {...params} />
),
-
+ headerClassName: "custom",
},
// {
// field: 'packName',
@@ -463,10 +468,11 @@
// },
{
field: 'poCode',
- headerName: translate('table.field.asnOrderItem.poDetlCode'),
+ headerName: translate('table.field.asnOrderItem.poDetlCode')+"*",
minWidth: 100,
flex: 1,
editable: true,
+ headerClassName: "custom",
},
{
--
Gitblit v1.9.1