Merge branch 'feat-v2-220518-order' into 'v2-220518'

src/pages/transaction/purchaseOrder/orderCollectSrm/components/contractModalTable/index.tsx

@@ -61,7 +61,11 @@ const ContractModalTable:React.FC<ContractModalTableProps> = (props) => {
   const handleConfirm = () => {
     const item = rowSelectionCtl.selectRow[0]
     if (item) {
-      schemaAction.setFieldValue('products', [])
+      const productValue = schemaAction.getFieldValue('products')
+      // 有值才置空，否则会触发错误提示
+      if (productValue && productValue.length) {
+        schemaAction.setFieldValue('products', [])
+      }
       schemaAction.setFieldValue('contractNo', item.contractNo)
       schemaAction.setFieldValue('contract', item)
       schemaAction.setFieldValue('vendorMemberName', item.partyBName)

src/pages/transaction/purchaseOrder/orderCollectSrm/components/orderMaterialsDrawer/index.tsx

@@ -374,19 +374,6 @@ const OrderMaterialsDrawer: React.ForwardRefRenderFunction<OrderMaterialsDrawerR
       }}
       destroyOnClose
     >
-      {/* <NiceForm
-        previewPlaceholder=" "
-        onSubmit={handleSubmit}
-        actions={formActions}
-        value={{}}
-        components={{
-          MaterialsListField,
-        }}
-        schema={formSchema}
-        style={{
-          height: '100%',
-        }}
-      /> */}
       <PolymericTable
         rowKey="detailId"
         columns={columns}