From d6775a4b96a6a3ded3be9d3f2044ba3f91c070a1 Mon Sep 17 00:00:00 2001
From: DESKTOP-LMJ82IJ\Eno <creaycat@gmail.com>
Date: 星期日, 13 四月 2025 15:07:59 +0800
Subject: [PATCH] #修改 编码规则修改

---
 rsf-admin/src/page/asnOrder/AsnOrderList.jsx |   81 +++++++++++++++++++++++++++-------------
 1 files changed, 54 insertions(+), 27 deletions(-)

diff --git a/rsf-admin/src/page/asnOrder/AsnOrderList.jsx b/rsf-admin/src/page/asnOrder/AsnOrderList.jsx
index c4da83b..c73a22c 100644
--- a/rsf-admin/src/page/asnOrder/AsnOrderList.jsx
+++ b/rsf-admin/src/page/asnOrder/AsnOrderList.jsx
@@ -41,6 +41,8 @@
 import EmptyData from "../components/EmptyData";
 import MyCreateButton from "../components/MyCreateButton";
 import MyExportButton from '../components/MyExportButton';
+import BillStatusField from '../components/BillStatusField';
+import ConfirmButton from '../components/ConfirmButton';
 import PageDrawer from "../components/PageDrawer";
 import MyField from "../components/MyField";
 import { PAGE_DRAWER_WIDTH, OPERATE_MODE, DEFAULT_PAGE_SIZE } from '@/config/setting';
@@ -49,8 +51,9 @@
 import FileDownloadIcon from '@mui/icons-material/FileDownload';
 import EditIcon from '@mui/icons-material/Edit';
 import TaskIcon from '@mui/icons-material/Task';
+import CloseIcon from '@mui/icons-material/Close';
 import request from '@/utils/request';
-
+import DictionarySelect from "../components/DictionarySelect";
 
 const StyledDatagrid = styled(DatagridConfigurable)(({ theme }) => ({
   '& .css-1vooibu-MuiSvgIcon-root': {
@@ -62,7 +65,10 @@
   '& .column-name': {
   },
   '& .opt': {
-    width: 300
+    width: 320
+  },
+  '& .status': {
+    width: 100
   },
 }));
 
@@ -72,7 +78,9 @@
   <TextInput source="poCode" label="table.field.asnOrder.poCode" />,
   <NumberInput source="poId" label="table.field.asnOrder.poId" />,
   <TextInput source="type" label="table.field.asnOrder.type" />,
-  <TextInput source="wkType" label="table.field.asnOrder.wkType" />,
+  <ReferenceInput source="wkType" reference="dictData" filter={{dictTypeCode: 'sys_business_type'}}  label="table.field.asnOrder.wkType">
+    <AutocompleteInput label="table.field.asnOrder.wkType" optionValue="value" />
+  </ReferenceInput>,
   <NumberInput source="anfme" label="table.field.asnOrder.anfme" />,
   <NumberInput source="qty" label="table.field.asnOrder.qty" />,
   <TextInput source="logisNo" label="table.field.asnOrder.logisNo" />,
@@ -85,26 +93,24 @@
   />,
 
   <TextInput label="common.field.memo" source="memo" />,
-  <SelectInput
-    label="common.field.status"
-    source="status"
-    choices={[
-      { id: '1', name: 'common.enums.statusTrue' },
-      { id: '0', name: 'common.enums.statusFalse' },
-    ]}
-    resettable
+  <DictionarySelect
+    label='table.field.asnOrder.exceStatus'
+    name="exceStatus"
+    dictTypeCode="sys_asn_exce_status"
+    alwaysOn
   />,
+
 ]
 
 const AsnOrderList = () => {
   const translate = useTranslate();
-
   const [createDialog, setCreateDialog] = useState(false);
   const [drawerVal, setDrawerVal] = useState(false);
   const [modalType, setmodalType] = useState(0);
   const billReload = useRef();
-
   const navigate = useNavigate();
+  const dicts = JSON.parse(localStorage.getItem('sys_dicts'))?.filter(dict => (dict.dictTypeCode == 'sys_business_type')) || [];
+
   const assign = (record) => {
     navigate(`/asnOrderItem?asnId=${record.id}`);
   };
@@ -126,17 +132,16 @@
         sort={{ field: "create_time", order: "desc" }}
         actions={(
           <TopToolbar>
-
             <FilterButton />
             <MyCreateButton onClick={() => { setCreateDialog(true); setmodalType(0) }} />
             <SelectColumnsButton preferenceKey='asnOrder' />
-
             <MyExportButton />
           </TopToolbar>
         )}
         perPage={DEFAULT_PAGE_SIZE}
       >
         <StyledDatagrid
+          sx={{ width: '100%' }}
           preferenceKey='asnOrder'
           bulkActionButtons={<> <InspectionsButton /><BulkDeleteButton mutationMode={OPERATE_MODE} /></>}
           rowClick={() => false}
@@ -149,23 +154,21 @@
           <TextField source="poCode" label="table.field.asnOrder.poCode" />
           <NumberField source="poId" label="table.field.asnOrder.poId" />
           <TextField source="type$" label="table.field.asnOrder.type" />
+          {/* <ReferenceField source="updateBy" label="common.field.updateBy" reference="user" link={false} sortable={false}>
+            <TextField source="wkType" />
+          </ReferenceField> */}
+          {/* <AutocompleteInput choices={dicts} optionText="label" label="table.field.qlyInspect.wkType" source="wkType" optionValue="value" /> */}
           <TextField 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" />
           <DateField source="arrTime" label="table.field.asnOrder.arrTime" showTime />
           <TextField source="rleStatus$" label="table.field.asnOrder.rleStatus" sortable={false} />
-
-          <ReferenceField source="updateBy" label="common.field.updateBy" reference="user" link={false} sortable={false}>
-            <TextField source="nickname" />
-          </ReferenceField>
+          <TextField source="updateBy$" label="common.field.updateBy" />
           <DateField source="updateTime" label="common.field.updateTime" showTime />
-          <ReferenceField source="createBy" label="common.field.createBy" reference="user" link={false} sortable={false}>
-            <TextField source="nickname" />
-          </ReferenceField>
+          <TextField source="createBy$" label="common.field.createBy" />
           <DateField source="createTime" label="common.field.createTime" showTime />
-          <TextField source="exceStatus$" label="common.field.status" />
-          {/* <BooleanField source="statusBool" label="common.field.status" sortable={false} /> */}
+          <BillStatusField cellClassName="status" source="exceStatus" label="table.field.asnOrder.exceStatus" />
           <TextField source="memo" label="common.field.memo" sortable={false} />
           <WrapperField cellClassName="opt" label="common.field.opt" width={300} >
             {/* <Button label="toolbar.print" onClick={print}>
@@ -183,7 +186,8 @@
             </Button> */}
             <InspectionButton />
             <CompleteButton />
-            <DeleteButton sx={{ padding: '1px', fontSize: '.75rem' }} mutationMode={OPERATE_MODE} />
+            {/* <DeleteButton sx={{ padding: '1px', fontSize: '.75rem' }} mutationMode={OPERATE_MODE} /> */}
+            <CloseButton />
           </WrapperField>
         </StyledDatagrid>
       </List>
@@ -301,8 +305,31 @@
 
 
   return (
-    <Button onClick={requestComplete} label={"toolbar.complete"} color="success">
+    record.exceStatus === 1 && (record.anfme === record.qty ? <Button onClick={requestComplete} label={"toolbar.complete"} color="success">
       <TaskIcon />
-    </Button>
+    </Button> : <ConfirmButton label={"toolbar.complete"} color="success" data={'褰撳墠鏀惰揣鏁伴噺灏忎簬璁″垝鏁伴噺锛屾槸鍚︾‘璁ゅ畬鎴�'} startIcon={<TaskIcon />} onConfirm={requestComplete} />)
+
+  )
+
+
+}
+
+const CloseButton = () => {
+  const record = useRecordContext();
+  const notify = useNotify();
+  const refresh = useRefresh();
+  const requestClose = async () => {
+    const { data: { code, data, msg } } = await request.post(`/asnOrder/close/${record.id}`);
+
+    if (code === 200) {
+      notify(msg);
+      refresh()
+    } else {
+      notify(msg);
+    }
+  }
+
+  return (
+    <ConfirmButton label={"toolbar.close"} color="error" data={'纭鏄惁鍏抽棴锛�'} startIcon={<CloseIcon />} onConfirm={requestClose} />
   )
 }

--
Gitblit v1.9.1