parent: a2177816 | 补丁 | 提交 | show whitespace
lbq
昨天 313e6ec716685ae4e55a4c6164790b1a31ee3e4d 
订单明细字段顺序优化3
6个文件已修改
36 ■■■■■ 已修改文件
rsf-admin/src/i18n/zh.js 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
rsf-admin/src/page/locPreview/LocPreviewItems.jsx 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
rsf-admin/src/page/orders/asnOrder/AsnOrderItemList.jsx 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
rsf-admin/src/page/orders/config/orderItemColumns.jsx 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
rsf-admin/src/page/waitPakin/WaitPakinEdit.jsx 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
rsf-admin/src/page/waitPakin/WaitPakinItemList.jsx 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 
 rsf-admin/src/i18n/zh.js


@@ -1024,7 +1024,7 @@


                matnrId: "物料id",


                matnrCode: "物料编码",


                asnId: "收货通知单号",


                asnCode: "收货通知单编码",


                asnCode: "单据编码",


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


                trackCode: "条形码",


                isptResult: '质检状态',




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


@@ -161,11 +161,11 @@


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


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


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


                <OrderCodeField source="orderId" label="table.field.locItem.orderId" />,


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


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


                <OrderCodeField source="orderId" label="table.field.locItem.orderId" />,


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


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


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


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


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


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


@@ -183,8 +183,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" />,                


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


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


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


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


@@ -217,7 +217,7 @@


                    expand={false}


                    expandSingle={true}


                    omit={['id', 'createTime', 'spec', 'model', 'locId', 'trackCode', 'orderItemId', 'matnrId', 'batch', 'createBy$', 'memo', 'fieldsIndex', 'statusBool', 'extendFields.[palletId]', 


                        'wareArea', 'locCode', 'type$', 'workQty', 'extendFields.[inStockType]', 'extendFields.[baseUnitId]', 'extendFields.[priceUnitId]', 'extendFields.[targetWareHouseId]', 'extendFields.[sourceWareHouseId]'


                        'wareArea', 'locCode', 'workQty', 'extendFields.[inStockType]', 'extendFields.[baseUnitId]', 'extendFields.[priceUnitId]', 'extendFields.[targetWareHouseId]', 'extendFields.[sourceWareHouseId]'


                    ]}


                >


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




 rsf-admin/src/page/orders/asnOrder/AsnOrderItemList.jsx


@@ -180,9 +180,9 @@


              'businessTime', 'extendFields.[businessTime]',


              'wkType', 'extendFields.[wkType]',


              'type', 'extendFields.[type]',


              'priceUnitId', 'purUnit',


              'priceUnitId', 


              'id', 'orderId', 'orderCode', 'poCode', 'poId','wkType', 


              'type', 'checkType', 'spec', 'model', 'purQty', 'purUnit', 


              'type', 'checkType', 'spec', 'model', 'purQty',


              'qrcode', 'trackCode', 'splrCode', 'splrName', 'projectCode', 


              'supplierId', 'supplierName',  'shipperId',


              // 'updateTime', 'updateBy', 'updateBy$',


@@ -223,7 +223,7 @@


          preferenceKey='asnOrderItem'


          bulkActionButtons={false}


          rowClick={(id, resource, record) => false}


          omit={['id', 'orderId', 'orderCode', 'poCode', 'poId', 'wkType', 'type', 'checkType', 'spec', 'model', 'purQty', 'purUnit', 'qrcode', 'trackCode', 'splrCode', 


          omit={['id', 'orderId', 'orderCode', 'poCode', 'poId', 'wkType', 'type', 'checkType', 'spec', 'model', 'purQty', 'qrcode', 'trackCode', 'splrCode', 


            'splrName', 'projectCode', 'supplierId', 'supplierName', 'priceUnitId', 'shipperId', 'businessTime', 'extendFields.[businessTime]', 'extendFields.[wkType]', 'extendFields.[type]']}


        >


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




 rsf-admin/src/page/orders/config/orderItemColumns.jsx


@@ -43,7 +43,7 @@


    <TextField source="maktx" label="table.field.asnOrderItem.maktx" key="maktx" />, //物料名称


    <TextField source="splrBatch" label="table.field.asnOrderItem.splrBatch" key="splrBatch" />, //批次


    <TextField source="spec" label="table.field.asnOrderItem.spec" key="spec" />, //规格


     <TextField source="unit" label="table.field.asnOrderItem.unit" key="unit" />, //单位


     <TextField source="purUnit" label="table.field.asnOrderItem.unit" key="purUnit" />, //单位


    <NumberField source="anfme" label="table.field.asnOrderItem.anfme" key="anfme" />, //应收数量


    <NumberField source="qty" label="table.field.asnOrderItem.qty" key="qty" />, //实收数量   


    <TextField source="targetWarehouseId" label="table.field.asnOrderItem.targetWarehouseId" key="targetWarehouseId" />, //建议目标仓




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


@@ -91,15 +91,21 @@


                                    readOnly


                                    source="anfme"


                                />


                                <SelectInput


                                <TextInput


                                    label="table.field.waitPakin.ioStatus"


                                    readOnly


                                    source="ioStatus"


                                    source="ioStatus$"


                                    parse={v => v}


                                />


                                {/* <SelectInput


                                    label="table.field.waitPakin.ioStatus"


                                    readOnly


                                    source="ioStatus$"


                                    choices={[


                                        { id: 0, name: '待入库' },


                                        { id: 1, name: ' 入库中' },


                                    ]}


                                />


                                /> */}


                            </Stack>


                        </Grid>


                    </Grid>




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


@@ -157,15 +157,19 @@


            const arr = [


                <NumberField source="id" />,


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


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


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


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


                // <OrderCodeField source="orderId" label="table.field.locItem.orderId" />,


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


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


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


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


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


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


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


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


                // <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" />,


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