Merge remote-tracking branch 'origin/devlop-phyz' into devlop-phyz

1

2 天以前 314c7fb1e63eec344895e95a1a7ce4ad00ca9525

Merge remote-tracking branch 'origin/devlop-phyz' into devlop-phyz

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

@@ -47,6 +47,7 @@
import { PAGE_DRAWER_WIDTH, OPERATE_MODE, DEFAULT_PAGE_SIZE, DEFAULT_ITEM_PAGE_SIZE } from '@/config/setting';
import AsnOrderItemEdit from "./AsnOrderItemEdit";
import ImportButton from "../../components/ImportButton";
import { fetchInOrderItemColumns } from "../config/orderItemColumns";

const StyledDatagrid = styled(DatagridConfigurable)(({ theme }) => ({
  '& .css-1vooibu-MuiSvgIcon-root': {
@@ -172,56 +173,11 @@
  }, []);

  const getDynamicFields = async () => {
    const { data: { code, data, msg }, } = await request.get("/fields/enable/list");
    if (code == 200) {
      const arr = [
        <NumberField source="id" />,
        <NumberField source="orderId" label="table.field.asnOrderItem.orderId" />,
        <TextField source="orderCode" label="table.field.asnOrderItem.orderCode" />,
        <TextField source="poDetlId" label="table.field.asnOrderItem.poDetlId" />,
        <TextField source="poDetlCode" label="table.field.asnOrderItem.poDetlCode" />,
        <TextField source="platItemId" label="table.field.asnOrderItem.platItemId" />,
        <TextField source="matnrId" label="table.field.asnOrderItem.matnrId" />,
        <TextField source="matnrCode" label="table.field.asnOrderItem.matnrCode" />,
        <TextField source="maktx" label="table.field.asnOrderItem.maktx" />,
        <TextField source="splrBatch" label="table.field.asnOrderItem.splrBatch" />,
        <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="spec" label="table.field.asnOrderItem.spec" />,
        <TextField source="model" label="table.field.asnOrderItem.model" />,
        <NumberField source="anfme" label="table.field.asnOrderItem.anfme" />,
        <NumberField source="qty" label="table.field.asnOrderItem.qty" />,
        <TextField source="stockUnit" label="table.field.asnOrderItem.stockUnit" />,
        <NumberField source="purQty" label="table.field.asnOrderItem.purQty" />,
        <TextField source="purUnit" label="table.field.asnOrderItem.purUnit" />,
        <TextField source="splrCode" label="table.field.asnOrderItem.splrCode" />,
        <TextField source="splrName" label="table.field.asnOrderItem.splrName" />,
        <TextField source="isptResult$" label="table.field.asnOrderItem.isptResult" />,
        <TextField source="qrcode" label="table.field.asnOrderItem.qrcode" />,
        <TextField source="trackCode" label="table.field.asnOrderItem.barcode" />,
        <TextField source="packName" label="table.field.asnOrderItem.packName" />,

        // 银座新增
        <TextField source="trackCode" label="仓库" />,
        <TextField source="trackCode" label="行内号" />,
        <TextField source="packName" label="计划跟踪号" />,
      ]
      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 />,
        <ReferenceField source="updateBy" label="common.field.updateBy" reference="user" link={false} sortable={false}>
          <TextField source="nickname" />
        </ReferenceField>,
        <ReferenceField source="createBy" label="common.field.createBy" reference="user" link={false} sortable={false}>
          <TextField source="nickname" />
        </ReferenceField>,
        <DateField source="createTime" label="common.field.createTime" showTime />,
        // <TextField source="memo" label="common.field.memo" sortable={false} />,
      ]
      setColumns([...arr, ...fields, ...lastArr]);
    const result = await fetchInOrderItemColumns();
    if (result.success) {
      setColumns(result.columns);
    } else {
      notify(msg);
      notify(result.msg);
    }
  }


 rsf-admin/src/page/orders/outStock/OutOrderItemList.jsx

@@ -44,6 +44,7 @@
import request from '@/utils/request';
import { PAGE_DRAWER_WIDTH, OPERATE_MODE, DEFAULT_PAGE_SIZE, DEFAULT_ITEM_PAGE_SIZE } from '@/config/setting';
import OutOrderItemEdit from "./OutOrderItemEdit";
import { fetchOutOrderItemColumns } from "../config/orderItemColumns";

const StyledDatagrid = styled(DatagridConfigurable)(({ theme }) => ({
  '& .css-1vooibu-MuiSvgIcon-root': {
@@ -169,51 +170,11 @@
  }, []);

  const getDynamicFields = async () => {
    const { data: { code, data, msg }, } = await request.get("/fields/enable/list");
    if (code == 200) {
      const arr = [
        <NumberField source="id" />,
        <NumberField source="orderId" label="table.field.outStockItem.orderId" />,
        <TextField source="orderCode" label="table.field.outStockItem.orderCode" />,
        <TextField source="poCode" label="table.field.outStockItem.poCode" />,
        <TextField source="poDetlId" label="table.field.outStockItem.poDetlId" />,
        <TextField source="matnrId" label="table.field.outStockItem.matnrId" />,
        <TextField source="matnrCode" label="table.field.outStockItem.matnrCode" />,
        <TextField source="maktx" label="table.field.outStockItem.maktx" />,
        <TextField source="platOrderCode" label="table.field.outStockItem.platOrderCode" />,
        <NumberField source="anfme" label="table.field.outStockItem.anfme" />,
        <NumberField source="purQty" label="table.field.outStockItem.purQty" />,
        <NumberField source="workQty" label="table.field.outStockItem.workQty" />,
        <NumberField source="qty" label="table.field.outStockItem.qty" />,
        <TextField source="stockUnit" label="table.field.outStockItem.stockUnit" />,
        <TextField source="splrBatch" label="table.field.outStockItem.splrBatch" />,
        <TextField source="purUnit" label="table.field.outStockItem.purUnit" />,
        <TextField source="splrCode" label="table.field.outStockItem.splrCode" />,
        <TextField source="splrName" label="table.field.outStockItem.splrName" />,
        <TextField source="qrcode" label="table.field.outStockItem.qrcode" />,
        <TextField source="trackCode" label="table.field.outStockItem.barcode" />,
        <TextField source="packName" label="table.field.outStockItem.packName" />,

        // 银座新增
        <TextField source="trackCode" label="仓库" />,
        <TextField source="trackCode" label="行内号" />,
        <TextField source="packName" label="计划跟踪号" />,
      ]
      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 />,
        <ReferenceField source="updateBy" label="common.field.updateBy" reference="user" link={false} sortable={false}>
          <TextField source="nickname" />
        </ReferenceField>,
        <ReferenceField source="createBy" label="common.field.createBy" reference="user" link={false} sortable={false}>
          <TextField source="nickname" />
        </ReferenceField>,
        <DateField source="createTime" label="common.field.createTime" showTime />,
        <TextField source="memo" label="common.field.memo" sortable={false} />,
      ]
      setColumns([...arr, ...fields, ...lastArr]);
    const result = await fetchOutOrderItemColumns();
    if (result.success) {
      setColumns(result.columns);
    } else {
      notify(msg);
      notify(result.msg);
    }
  }

@@ -235,7 +196,7 @@
          preferenceKey='asnOrderItem'
          bulkActionButtons={false}
          rowClick={(id, resource, record) => false}
          omit={['id', 'orderId', 'orderCode', 'poDetlId', 'poDetlCode', 'platOrderCode','matnrId', 'spec', 'model', 'purQty', 'purUnit', 'qrcode', 'trackCode', 'splrCode', 'platWorkCode', 'projectCode', 'workQty']}
          omit={['id', 'orderId', 'orderCode', 'poDetlId', 'poDetlCode', 'platOrderCode', 'matnrId', 'spec', 'model', 'purQty', 'purUnit', 'qrcode', 'trackCode', 'splrCode', 'platWorkCode', 'projectCode', 'workQty']}
        >
          {columns.map((column) => column)}
        </StyledDatagrid>}