Merge remote-tracking branch 'origin/dev_pro2.0' into dev_pro2.0

云

32 分钟以前 5367b3b4d92588c4e76728e6bd4ad6aae0cbb967

 src/views/wls/itemreceipt/data.ts

@@ -19,7 +19,7 @@
import { generateAutoCode } from '#/api/mes/md/autocode/record';
import { getRangePickerDefaultProps } from '#/utils';
import { MdItemSelect } from '#/views/mes/md/item/components';
import { MdVendorSelect } from '#/views/mes/md/vendor/components';
import { ErpSupplierSelect } from '#/views/erp/purchase/supplier/components';
import {
  WmArrivalNoticeLineSelect,
  WmArrivalNoticeSelect,
@@ -115,19 +115,38 @@
          await formApi?.setValues({
            purchaseOrderCode: notice?.purchaseOrderCode,
            vendorId: notice?.vendorId,
            vendorName: notice?.vendorName,
          });
        },
        status: MesWmArrivalNoticeStatusEnum.PENDING_RECEIPT,
      },
    },
    {
      fieldName: 'vendorName',
      component: 'Input',
      dependencies: {
        triggerFields: [''],
        show: () => false,
      },
    },
    {
      fieldName: 'vendorId',
      label: '供应商',
      component: markRaw(MdVendorSelect),
      component: markRaw(ErpSupplierSelect),
      componentProps: {
        placeholder: '请选择供应商',
        onChange: async (supplier?: any) => {
          await formApi?.setFieldValue('vendorName', supplier?.name);
        },
      },
      rules: 'selectRequired',
      dependencies: {
        triggerFields: ['vendorName'],
        componentProps: (values) => ({
          placeholder: '请选择供应商',
          supplierName: values.vendorName as string,
        }),
      },
    },
    {
      fieldName: 'purchaseOrderCode',
@@ -174,7 +193,7 @@
    {
      fieldName: 'vendorId',
      label: '供应商',
      component: markRaw(MdVendorSelect),
      component: markRaw(ErpSupplierSelect),
      componentProps: {
        placeholder: '请选择供应商',
      },