From 48ad97c8a8afa2c9333bd00545dbc54bb4f0870a Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期五, 23 五月 2025 09:28:03 +0800
Subject: [PATCH] #盘点出库

---
 rsf-admin/src/page/orders/outStock/OutOrderList.jsx |   10 ++++------
 1 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/rsf-admin/src/page/orders/outStock/OutOrderList.jsx b/rsf-admin/src/page/orders/outStock/OutOrderList.jsx
index 2b181eb..fc4bb37 100644
--- a/rsf-admin/src/page/orders/outStock/OutOrderList.jsx
+++ b/rsf-admin/src/page/orders/outStock/OutOrderList.jsx
@@ -51,7 +51,7 @@
 import DictionarySelect from "../../components/DictionarySelect";
 import ImportButton from "../../components/ImportButton";
 import DetailsIcon from '@mui/icons-material/Details';
-import CancelIcon from '@mui/icons-material/Cancel';
+import CancelOutlinedIcon from '@mui/icons-material/CancelOutlined';
 import OutOrderCreate from "./OutOrderCreate";
 import AddIcon from '@mui/icons-material/Add';
 import OutOrderModal from "./OutOrderModal";
@@ -83,10 +83,10 @@
   <TextInput source="code" label="table.field.outStock.code" alwaysOn />,
   <TextInput source="poCode" label="table.field.outStock.poCode" />,
   <NumberInput source="poId" label="table.field.outStock.poId" />,
-  <ReferenceInput source="type" reference="dictData" filter={{ dictTypeCode: 'sys_business_type' }} label="table.field.outStock.type" alwaysOn>
+  <ReferenceInput source="type" reference="dictData" filter={{ dictTypeCode: 'sys_order_type', group: '2' }} label="table.field.outStock.type" alwaysOn>
     <AutocompleteInput label="table.field.outStock.type" optionValue="value" />
   </ReferenceInput>,
-  <ReferenceInput source="wkType" reference="dictData" filter={{ dictTypeCode: 'sys_business_type' }} label="table.field.outStock.wkType" alwaysOn>
+  <ReferenceInput source="wkType" reference="dictData" filter={{ dictTypeCode: 'sys_business_type', group: '2'}} label="table.field.outStock.wkType" alwaysOn>
     <AutocompleteInput label="table.field.outStock.wkType" optionValue="value" />
   </ReferenceInput>,
   <NumberInput source="anfme" label="table.field.outStock.anfme" />,
@@ -266,14 +266,12 @@
   return (
     <Button onClick={createByOrder} label={'toolbar.asnCreate'}> <AddIcon /> </Button>
   )
-
 }
 
 const CancelButton = () => {
   const record = useRecordContext();
   const notify = useNotify();
   const refresh = useRefresh();
-
   const cancelOrder = async () => {
     const { data: { code, data, msg } } = await request.get(`/outStock/cancel/${record?.id}`);
     if (code === 200) {
@@ -285,6 +283,6 @@
   }
 
   return (
-    <ConfirmButton label={"toolbar.cancel"} startIcon={<CancelIcon />} onConfirm={cancelOrder} />
+     record?.exceStatus == 0 ? <ConfirmButton label={"toolbar.cancel"} startIcon={<CancelOutlinedIcon />  } onConfirm={cancelOrder} /> : <></>
   )
 }

--
Gitblit v1.9.1