From 455950c1d7ca4406c9b7ff60eb30f5d4cc4ece8e Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 07 五月 2025 20:37:58 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop

---
 rsf-admin/src/page/orders/asnOrder/AsnOrderList.jsx |   45 ++++++++++++++++++++++++++++++---------------
 1 files changed, 30 insertions(+), 15 deletions(-)

diff --git a/rsf-admin/src/page/orders/asnOrder/AsnOrderList.jsx b/rsf-admin/src/page/orders/asnOrder/AsnOrderList.jsx
index a9c7a64..0627434 100644
--- a/rsf-admin/src/page/orders/asnOrder/AsnOrderList.jsx
+++ b/rsf-admin/src/page/orders/asnOrder/AsnOrderList.jsx
@@ -55,7 +55,7 @@
 import request from '@/utils/request';
 import DictionarySelect from "../../components/DictionarySelect";
 import ExitToAppIcon from '@mui/icons-material/ExitToApp';
-
+import ImportButton from "../../components/ImportButton";
 
 const StyledDatagrid = styled(DatagridConfigurable)(({ theme }) => ({
   '& .css-1vooibu-MuiSvgIcon-root': {
@@ -114,6 +114,8 @@
   const [modalType, setmodalType] = useState(0);
   const [select, setSelect] = useState(0);
   const billReload = useRef();
+  const notify = useNotify();
+  const refresh = useRefresh();
   const dicts = JSON.parse(localStorage.getItem('sys_dicts'))?.filter(dict => (dict.dictTypeCode == 'sys_business_type')) || [];
   return (
     <Box display="flex">
@@ -128,15 +130,16 @@
           marginRight: drawerVal ? `${PAGE_DRAWER_WIDTH}px` : 0,
         }}
         title={"menu.asnOrder"}
-        empty={<EmptyData onClick={() => { setCreateDialog(true); setmodalType(0) }} />}
+        empty={false}
         filters={filters}
-        filter={{deleted: 0}}
+        filter={{ deleted: 0 }}
         sort={{ field: "create_time", order: "desc" }}
         actions={(
           <TopToolbar>
             <FilterButton />
             <MyCreateButton onClick={() => { setCreateDialog(true); setmodalType(0) }} />
             <SelectColumnsButton preferenceKey='asnOrder' />
+            <ImportButton value={'asnOrderItem'} />
             <MyExportButton />
           </TopToolbar>
         )}
@@ -165,9 +168,10 @@
           <TextField cellClassName="wkType" source="wkType$" label="table.field.asnOrder.wkType" />
           <NumberField source="anfme" label="table.field.asnOrder.anfme" />
           <NumberField source="qty" label="table.field.asnOrder.qty" />
-          <TextField source="logisNo" label="table.field.asnOrder.logisNo" />
+          {/* <TextField source="logisNo" label="table.field.asnOrder.logisNo" /> */}
           <DateField source="arrTime" label="table.field.asnOrder.arrTime" showTime />
           <TextField source="rleStatus$" label="table.field.asnOrder.rleStatus" sortable={false} />
+          <TextField source="ntyStatus$" label="table.field.asnOrder.ntyStatus" />
           <TextField source="updateBy$" label="common.field.updateBy" />
           <DateField source="updateTime" label="common.field.updateTime" showTime />
           <TextField source="createBy$" label="common.field.createBy" />
@@ -179,7 +183,8 @@
             <MyButton setCreateDialog={setCreateDialog} setmodalType={setmodalType} />
             <InspectionButton />
             <CompleteButton />
-            <CloseButton />
+            <ODeleteButton  />
+            {/* <CloseButton /> */}
           </WrapperField>
         </StyledDatagrid>
       </List>
@@ -200,6 +205,14 @@
 }
 export default AsnOrderList;
 
+const ODeleteButton = () => {
+  const record = useRecordContext();
+  return (
+    record.exceStatus === 0 ? <DeleteButton  mutationMode="pessimistic"/> : <></>
+  )
+
+}
+
 const MyButton = ({ setCreateDialog, setmodalType }) => {
   const record = useRecordContext();
   const handleEditClick = (btn) => {
@@ -210,6 +223,7 @@
 
   };
   return (
+    record.exceStatus === 1 || record.exceStatus === 0 ?
     <Button
       color="primary"
       startIcon={<EditIcon />}
@@ -218,9 +232,11 @@
       label={'ra.action.edit'}
     >
     </Button>
+    : <></>
   )
 }
 
+//鎶ユ
 const InspectionButton = () => {
   const record = useRecordContext();
   const notify = useNotify();
@@ -240,11 +256,8 @@
     }
   }
 
-
   return (
-    <Button onClick={inspection} label={"toolbar.inspection"}>
-      <ConstructionIcon />
-    </Button>
+      <ConfirmButton label={"toolbar.inspection"} color="secondary" startIcon={<ConstructionIcon />} onConfirm={inspection} />
   )
 }
 
@@ -252,10 +265,11 @@
   const { selectedIds, onUnselectItems, data } = useListContext();
   const notify = useNotify();
   const refresh = useRefresh();
+  const translate = useTranslate();
   const inspection = (btn) => {
     btn.stopPropagation();
     if (selectedIds.length === 0) {
-      notify('璇烽�夋嫨閫氱煡鍗�');
+      notify(translate("request.error.select_error_order"));
       return;
     } else {
       const rows = data.filter((item) => selectedIds.includes(item.id))
@@ -327,6 +341,7 @@
   )
 }
 
+//瀹屾垚鍗曟嵁
 const CompleteButton = () => {
   const record = useRecordContext();
   const notify = useNotify();
@@ -343,10 +358,10 @@
   }
 
   return (
-    record.exceStatus === 1 && (record.anfme === record.qty ? <Button onClick={requestComplete} label={"toolbar.complete"} color="success">
-      <TaskIcon />
-    </Button> : <ConfirmButton label={"toolbar.complete"} color="success" data={'褰撳墠鏀惰揣鏁伴噺灏忎簬璁″垝鏁伴噺锛屾槸鍚︾‘璁ゅ畬鎴�'} startIcon={<TaskIcon />} onConfirm={requestComplete} />)
-
+    // record.exceStatus === 1 && (record.anfme === record.qty ? <Button onClick={requestComplete} label={"toolbar.complete"} color="secondary">
+    //   <TaskIcon />
+    // </Button> : )
+    record.exceStatus === 1 ? <ConfirmButton label={"toolbar.complete"} color="secondary"  startIcon={<TaskIcon />} onConfirm={requestComplete} /> : <></>
   )
 
 
@@ -368,6 +383,6 @@
   }
 
   return (
-    <ConfirmButton label={"toolbar.close"} color="error" data={'纭鏄惁鍏抽棴锛�'} startIcon={<CloseIcon />} onConfirm={requestClose} />
+    <ConfirmButton label={"toolbar.close"} color="error"  startIcon={<CloseIcon />} onConfirm={requestClose} />
   )
 }

--
Gitblit v1.9.1