parent: fb98f316 | 补丁 | 提交 | show whitespace
lbq
1 天以前 3da5cf0277ed8770a0b0f99721c4dafec72523df 
order字段顺序优化
5个文件已修改
48 ■■■■■ 已修改文件
rsf-admin/src/i18n/zh.js 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
rsf-admin/src/page/orders/asnOrder/AsnOrderItemList.jsx 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
rsf-admin/src/page/waitPakin/WaitPakinEdit.jsx 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
rsf-admin/src/page/waitPakin/WaitPakinItemList.jsx 4 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
rsf-admin/src/page/warehouseAreasItem/WarehouseAreasItemList.jsx 23 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 
 rsf-admin/src/i18n/zh.js


@@ -473,12 +473,12 @@


                matnrCode: "物料编码",


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


                workQty: '上架中',


                qty: '已完成',


                qty: '实收数量',


                barcode: "条形码",


                isptResult: '质检状态',


                anfme: "数量",


                batch: "批次号",


                unit: "计量单位",


                anfme: "应收数量",


                batch: "批次",


                unit: "单位",


                stockUnit: "库存单位",


                brand: "品牌",


                shipperId: "货主标识",




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


@@ -180,13 +180,14 @@


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


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


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


              'priceUnitId',


              'priceUnitId', 'purUnit', 'extendFields.[priceUnitId]',


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


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


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


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


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


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


              'createTime', 'createBy', 'createBy$',


              'extendFields.[inStockType]', 'extendFields.[baseUnitId]'


          ];


          const columns = result.columns.filter(col => !hiddenSources.includes(col.props.source));


          setColumns(columns);


@@ -222,7 +223,8 @@


          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', 'splrName', 'projectCode', 'supplierId', 'supplierName', 'priceUnitId', 'shipperId', 'businessTime', 'extendFields.[businessTime]', 'extendFields.[wkType]', 'extendFields.[type]']}


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


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


        >


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


        </StyledDatagrid>}




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


@@ -71,7 +71,7 @@


                                    parse={v => v}


                                    autoFocus


                                />


                                <SelectInput


                                {/* <SelectInput


                                    label="table.field.waitPakin.flagDefect"


                                    readOnly


                                    source="flagDefect"


@@ -79,8 +79,7 @@


                                        { id: 0, name: '否' },


                                        { id: 1, name: ' 是' },


                                    ]}


                                />




                                /> */}


                                <TextInput


                                    label="table.field.waitPakin.barcode"


                                    readOnly




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


@@ -157,6 +157,7 @@


            const arr = [


                <NumberField source="id" />,


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


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


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


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


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


@@ -164,7 +165,6 @@


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


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


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


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


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


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


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


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


                    preferenceKey='waitPakinItem'


                    bulkActionButtons={false}


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


                    omit={['id', 'pakinId', 'createTime', 'matnrId', 'createBy', 'memo', 'fieldsIndex', 'platWorkCode', 'projectCode']}


                    omit={['id', 'pakinId', 'createTime', 'matnrId', 'createBy', 'memo', 'fieldsIndex',  'projectCode']}    //'platWorkCode',


                >


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


                </StyledDatagrid>}




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


@@ -179,18 +179,21 @@


        if (code == 200) {


            const arr = [


                <NumberField key="id" source="id" />,


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


                <TextField key="areaName" source="areaName" label="收货区名称" />,    //table.field.warehouseAreasItem.areaName


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


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


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


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


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


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


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


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


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


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


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


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


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


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


                // <MyField source="isptQty" label="table.field.qlyIsptItem.anfme"


                //     onClick={(event, record, val) => {


@@ -199,10 +202,9 @@


                //         setDrawerVal(!!drawerVal && drawerVal === val ? null : val);


                //     }}


                // />,


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


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


                                


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


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


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


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


@@ -212,8 +214,8 @@


            ]


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


            const lastArr = [


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


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


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


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


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


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


@@ -253,8 +255,9 @@


                    preferenceKey='warehouseAreasItem'


                    bulkActionButtons={false}


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


                    omit={['prodTime','unit','platOrderCode','trackCode','id', 'createTime', 'memo', 'areaId', 'brand', 'createBy$',


                         'weight', 'matnrId', 'batch', 'shipperId', 'splrId', 'platWorkCode', 'projectCode','statusBool']}


                    omit={['prodTime','platOrderCode','id', 'createTime', 'memo', 'areaId', 'brand', 


                         'weight', 'splrId', 'projectCode','statusBool', 'extendFields.[priceUnitId]', 'isptResult$', 'extendFields.[inStockType]',


                         'matnrId', 'trackCode', 'workQty', 'batch', 'shipperId', 'isptResult', 'createBy$', 'createTime', 'extendFields.[baseUnitId]']}


                >


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


                </StyledDatagrid>}