parent: 3179e57a | 补丁 | 提交 | ignore whitespace
lbq
20 小时以前 f179aeba8c06b566c11eae933b2b72de921642dc 
订单明细字段顺序优化2
8个文件已修改
90 ■■■■■ 已修改文件
rsf-admin/src/i18n/zh.js 4 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
rsf-admin/src/page/locPreview/LocPreviewItems.jsx 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
rsf-admin/src/page/task/TaskEdit.jsx 26 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
rsf-admin/src/page/task/TaskItemList.jsx 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
rsf-admin/src/page/task/TaskPanel.jsx 23 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
rsf-admin/src/page/waitPakin/WaitPakinItemList.jsx 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
rsf-admin/src/page/waitPakin/WaitPakinList.jsx 4 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
rsf-admin/src/page/warehouseAreasItem/WarehouseAreasItemList.jsx 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 
 rsf-admin/src/i18n/zh.js


@@ -1028,7 +1028,7 @@


                asnItemId: "收货通知单明细id",


                trackCode: "条形码",


                isptResult: '质检状态',


                anfme: "应收数量",


                anfme: "数量",


                workQty: "执行中数量",


                unit: "单位",


                fieldsIndex: "扩展字段唯一标识",


@@ -1219,7 +1219,7 @@


                matnrId: "物料ID",


                maktx: "物料名称",


                unit: '单位',


                anfme: '订单数量',


                anfme: '数量',


                outQty: '调整数量',


                matnrCode: "物料编码",


                trackCode: "跟踪码",




 rsf-admin/src/page/locPreview/LocPreviewItems.jsx


@@ -174,11 +174,11 @@


                <TextField source="model" label="table.field.locItem.model" />,


                <TextField source="splrBatch" label="table.field.locItem.splrBatch" />,


                <TextField source="batch" label="table.field.locItem.batch" />,


                <TextField source="trackCode" label="table.field.locItem.trackCode" />,                


                <TextField source="trackCode" label="table.field.locItem.trackCode" />, 


                <TextField source="unit" label="table.field.locItem.unit" />,              


                <NumberField source="anfme" label="table.field.locItem.anfme" />,


                <NumberField source="workQty" label="table.field.locItem.workQty" />,


                <NumberField source="qty" label="table.field.locItem.qty" />,


                <TextField source="unit" label="table.field.locItem.unit" />,


                // <NumberField source="workQty" label="table.field.locItem.workQty" />,


                // <NumberField source="qty" label="table.field.locItem.qty" />,                


                <TextField source="fieldsIndex" label="table.field.locItem.fieldsIndex" />,


            ]


            const fields = data.map(el => <TextField key={el.fields} source={`extendFields.[${el.fields}]`} label={el.fieldsAlise} />)




 rsf-admin/src/page/task/TaskEdit.jsx


@@ -79,6 +79,19 @@


                                    readOnly


                                />


                                <TextInput


                                    label="table.field.task.barcode"


                                    source="barcode"


                                    readOnly


                                    parse={v => v}


                                />


                                <NumberInput


                                    label="table.field.task.sort"


                                    source="sort"


                                    readOnly


                                />                                


                            </Stack>


                            <Stack direction='row' gap={2}>


                                <TextInput


                                    label="table.field.task.orgLoc"


                                    source="orgLoc"


                                    readOnly


@@ -96,24 +109,11 @@


                                    readOnly


                                    parse={v => v}


                                />


                            </Stack>


                            <Stack direction='row' gap={2}>


                                <TextInput


                                    label="table.field.task.targSite"


                                    source="targSite"


                                    readOnly


                                    parse={v => v}


                                />


                                <TextInput


                                    label="table.field.task.barcode"


                                    source="barcode"


                                    readOnly


                                    parse={v => v}


                                />


                                <NumberInput


                                    label="table.field.task.sort"


                                    source="sort"


                                    readOnly


                                />


                            </Stack>


                        </Grid>




 rsf-admin/src/page/task/TaskItemList.jsx


@@ -147,17 +147,19 @@


                <NumberField source="orderId" label="table.field.taskItem.orderId" />,


                <NumberField source="orderType$" label="table.field.taskItem.orderType" />,


                <NumberField source="wkType$" label="table.field.taskItem.wkType" />,


                <TextField source="platWorkCode" label="table.field.asnOrderItem.platWorkCode" />,


                <TextField source="platItemId" label="table.field.asnOrderItemLog.platItemId" />,


                <NumberField source="orderItemId" label="table.field.taskItem.orderItemId" />,


                <NumberField source="matnrId" label="table.field.taskItem.matnrId" />,


                <TextField source="maktx" label="table.field.taskItem.maktx" />,


                <TextField source="matnrCode" label="table.field.taskItem.matnrCode" />,


                <TextField source="maktx" label="table.field.taskItem.maktx" />,


                <TextField source="batch" label="table.field.taskItem.batch" />,           


                <TextField source="unit" label="table.field.taskItem.unit" />,


                <NumberField source="anfme" label="table.field.taskItem.anfme" />,


                <TextField source="platOrderCode" label="table.field.asnOrderItem.platOrderCode" />,


                <TextField source="platWorkCode" label="table.field.asnOrderItem.platWorkCode" />,


                <TextField source="projectCode" label="table.field.asnOrderItem.projectCode" />,


                <TextField source="batch" label="table.field.taskItem.batch" />,


                <TextField source="isptResult$" label="table.field.taskItem.isptResult" />,


                // <TextField source="platOrderCode" label="table.field.asnOrderItem.platOrderCode" />,




                // <TextField source="projectCode" label="table.field.asnOrderItem.projectCode" />,


                // <TextField source="isptResult$" label="table.field.taskItem.isptResult" />,


                <TextField source="spec" label="table.field.taskItem.spec" />,


                <TextField source="model" label="table.field.taskItem.model" />,


            ]


@@ -200,7 +202,7 @@


                    rowClick={false}


                    // expand={() => <TaskItemPanel />}


                    expandSingle={true}


                    omit={['id', 'createTime', 'createBy', 'memo', 'taskId', 'orderId', 'orderItemId', 'matnrId', 'platWorkCode', 'projectCode','statusBool']}


                    omit={['id', 'createTime', 'createBy', 'memo', 'taskId', 'orderId', 'orderItemId', 'matnrId', 'projectCode','statusBool', 'createBy$', 'spec', 'model']}


                >


                    {columns.map((column) => column)}


                </StyledDatagrid>}




 rsf-admin/src/page/task/TaskPanel.jsx


@@ -64,21 +64,24 @@


                        <NumberField source="taskId" label="table.field.taskItem.taskId" />


                        <NumberField source="orderId" label="table.field.taskItem.orderId" />


                        <NumberField source="orderType$" label="table.field.taskItem.orderType" />


                        <TextField source="sourceCode" label="table.field.taskItem.sourceCode" />


                        {/* <TextField source="sourceCode" label="table.field.taskItem.sourceCode" /> */}


                        <NumberField source="orderItemId" label="table.field.taskItem.orderItemId" />


                        <NumberField source="matnrId" label="table.field.taskItem.matnrId" />


                        <NumberField source="wkType$" label="table.field.taskItem.wkType" />,


                        <TextField source="platWorkCode" label="table.field.asnOrderItem.platWorkCode" />,


                        <TextField source="platItemId" label="table.field.asnOrderItemLog.platItemId" />,


                        {/* <NumberField source="matnrId" label="table.field.taskItem.matnrId" /> */}


                        <TextField source="matnrCode" label="table.field.taskItem.matnrCode" />


                        <TextField source="maktx" label="table.field.taskItem.maktx" />                        


                        <TextField source="maktx" label="table.field.taskItem.maktx" />   


                        <TextField source="batch" label="table.field.taskItem.batch" />                     


                        <TextField source="unit" label="table.field.taskItem.unit" />


                        <NumberField source="anfme" label="table.field.taskItem.anfme" />


                        <TextField source="batch" label="table.field.taskItem.batch" />


                        <TextField source="spec" label="table.field.taskItem.spec" />


                        <TextField source="model" label="table.field.taskItem.model" />


                        <NumberField source="anfme" label="table.field.taskItem.anfme" />                       


                        {/* <TextField source="spec" label="table.field.taskItem.spec" />


                        <TextField source="model" label="table.field.taskItem.model" /> */}


                        <TextField source="updateBy$" label="common.field.updateBy"/>


                        <TextField source="createBy$" label="common.field.createBy"/>


                        {/* <TextField source="createBy$" label="common.field.createBy"/> */}


                        <DateField source="updateTime" label="common.field.updateTime" showTime />


                        <DateField source="createTime" label="common.field.createTime" showTime />


                        <TextField source="memo" label="common.field.memo" sortable={false} />


                        {/* <DateField source="createTime" label="common.field.createTime" showTime /> */}


                        {/* <TextField source="memo" label="common.field.memo" sortable={false} /> */}


                    </StyledDatagrid>


                </List>


            </Box>




 rsf-admin/src/page/waitPakin/WaitPakinItemList.jsx


@@ -164,7 +164,7 @@


                <TextField source="maktx" label="table.field.waitPakinItem.maktx" />,


                <TextField source="batch" label="table.field.waitPakinItem.batch" />,


                <NumberField source="anfme" label="table.field.waitPakinItem.anfme" />,


                <NumberField source="qty" label="table.field.waitPakinItem.qty" />,


                // <NumberField source="qty" label="table.field.waitPakinItem.qty" />,


                <TextField source="unit" label="table.field.waitPakinItem.unit" />,


                <TextField source="platOrderCode" label="table.field.asnOrderItem.platOrderCode" />,


                <TextField source="projectCode" label="table.field.asnOrderItem.projectCode" />,


@@ -174,8 +174,8 @@


            ]


            const fields = data.map(el => <TextField key={el.fields} source={`extendFields.[${el.fields}]`} label={el.fieldsAlise} />)


            const lastArr = [


                <DateField source="updateTime" label="common.field.updateTime" showTime />,


                <TextField source="updateBy$" label="common.field.updateBy" />,                


                <TextField source="updateBy$" label="common.field.updateBy" />,


                <DateField source="updateTime" label="common.field.updateTime" showTime />,                


                <TextField source="createBy$" label="common.field.createBy" />,


                <DateField source="createTime" label="common.field.createTime" showTime />,


                <TextField source="memo" label="common.field.memo" sortable={false} />,




 rsf-admin/src/page/waitPakin/WaitPakinList.jsx


@@ -179,8 +179,8 @@


                    <TextField source="barcode" label="table.field.waitPakin.barcode" />


                    <NumberField source="anfme" label="table.field.waitPakin.anfme" />


                    <TextField source="ioStatus$" label="table.field.waitPakin.ioStatus" sortable={false} />


                     <DateField source="updateTime" label="common.field.updateTime" showTime />


                    <TextField source="updateBy$" label="common.field.updateBy" />                   


                    <TextField source="updateBy$" label="common.field.updateBy" />      


                    <DateField source="updateTime" label="common.field.updateTime" showTime />                                 


                    <DateField source="createTime" label="common.field.createTime" showTime />


                    <BooleanField source="statusBool" label="common.field.status" sortable={false} />


                    <TextField source="memo" label="common.field.memo" sortable={false} />




 rsf-admin/src/page/warehouseAreasItem/WarehouseAreasItemList.jsx


@@ -190,6 +190,7 @@


                <TextField key="splrBatch" source="splrBatch" label="table.field.warehouseAreasItem.splrBtch" />,


                <TextField key="batch" source="batch" label="table.field.warehouseAreasItem.batch" />,


                <TextField key="trackCode" source="trackCode" label="table.field.warehouseAreasItem.barcode" />,


                <TextField key="unit" source="unit" label="table.field.warehouseAreasItem.unit" />,


                <NumberField key="anfme" source="anfme" label="table.field.warehouseAreasItem.anfme" />,


                <NumberField key="workQty" source="workQty" label="table.field.warehouseAreasItem.workQty" />,


                <NumberField key="qty" source="qty" label="table.field.warehouseAreasItem.qty" />,


@@ -203,7 +204,7 @@


                //     }}


                // />,


                                


                <TextField key="unit" source="unit" label="table.field.warehouseAreasItem.unit" />,


                


                // <TextField key="stockUnit" source="stockUnit" label="table.field.warehouseAreasItem.stockUnit" />,


                <TextField key="brand" source="brand" label="table.field.warehouseAreasItem.brand" />,


                <TextField key="shipperId" source="shipperId" label="table.field.warehouseAreasItem.shipperId" />,