Merge branch 'test' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into test

src/components/ModalTable/schema/index.ts

@@ -642,12 +642,13 @@ export const logisticsDeliverySearchSchema: ISchema = {
             }
           }
         },
-        inventoryId: {
+        invoicesType: {
           type: 'string',
-          "x-component": 'SearchSelect',
+          // fetchSearch: PublicApi.getWarehouseInvoicesTypeAll,
+          // "x-component": 'SearchSelect',
           'x-component-props': {
             placeholder: '单据类型',
-            fetchSearch: PublicApi.getWarehouseInvoicesTypeAll,
+
             style: {
               width: 160
             }

src/pages/logistics/addLogistics/components/ModalTableOrder.tsx

@@ -30,7 +30,7 @@ export interface ModalTableProps extends IStandardTableProps<any> {
 export const logisticsDeliverySearchSchema: ISchema = {
   type: 'object',
   properties: {
-    invoicesNo: {
+    orderNo: {
       type: 'string',
       'x-component': 'ModalSearch',
       'x-component-props': {
@@ -53,7 +53,7 @@ export const logisticsDeliverySearchSchema: ISchema = {
         },
       },
       properties: {
-        orderNo: {
+        memberName: {
           type: 'string',
           "x-component-props": {
             placeholder: '会员名称',
@@ -62,7 +62,7 @@ export const logisticsDeliverySearchSchema: ISchema = {
             }
           }
         },
-        invoicesAbstract: {
+        orderThe: {
           type: 'string',
           "x-component-props": {
             placeholder: '单据摘要',
@@ -71,7 +71,7 @@ export const logisticsDeliverySearchSchema: ISchema = {
             }
           }
         },
-        "[startTransactionTime,endTransactionTime]": {
+        "[startCreateTime,endCreateTime]": {
           type: 'string',
           "x-component": "dateSelect",
           "x-component-props": {
@@ -283,7 +283,7 @@ const ModalTableOrder: React.FC<ModalTableProps> = (props) => {
                       useStateFilterSearchLinkageEffect(
                         $,
                         actions,
-                        type === 1 ? 'invoicesNo' : 'applyNo',
+                        type === 1 ? 'orderNo' : 'applyNo',
                         FORM_FILTER_PATH,
                       );
                     }

src/pages/logistics/addLogistics/components/columns.ts

@@ -24,6 +24,34 @@ export const SelectGoodsColumns: ColumnType<any>[] = [
   }
 ]
 
+export const AfterSalesSelectGoodsColumns: ColumnType<any>[] = [
+  {
+    title: '商品ID',
+    key: 'productId',
+    dataIndex: 'productId',
+  },
+  {
+    title: '商品名称',
+    key: 'productName',
+    dataIndex: 'productName',
+  },
+  {
+    title: '品类',
+    key: 'category',
+    dataIndex: 'category',
+  },
+  {
+    title: '订单编号',
+    key: 'orderNo',
+    dataIndex: 'orderNo',
+  },
+  {
+    title: '品牌',
+    key: 'brand',
+    dataIndex: 'brand',
+  }
+]
+
 export const ExternalListColumns: ColumnType<any>[] = [
   {
     title: '流转顺序号',

src/pages/payandSettle/paySetting/components/payWayTable.tsx

@@ -68,7 +68,7 @@ const PayWayTable: React.FC<payWayTableParams> = (props) => {
     } else {
       onEdit(value, idType, modifyIndex)
     }
-
+    setedit({});
     setmodalvisible(false);
   }
 
@@ -109,7 +109,7 @@ const PayWayTable: React.FC<payWayTableParams> = (props) => {
         modalvisible={modalvisible}
         edit={edit}
         onOK={(value) => handleOk(value, type)}
-        onCancel={() => setmodalvisible(false)}
+        onCancel={() => { setmodalvisible(false); setedit({}); }}
       />
     </>
   )

src/pages/payandSettle/paySetting/components/setUpModal.tsx

@@ -71,10 +71,10 @@ const SetUpModal: React.FC<setUpModalParams> = (props) => {
   return (
     <Modal
       width={576}
-      title='新增参数配置'
+      title={`${Object.keys(edit).length > 0 ? `编辑` : '新增'}参数配置`}
       visible={modalvisible}
       onOk={handleOk}
-      onCancel={() => onCancel()}
+      onCancel={() => { onCancel(); form.resetFields(); }}
     >
       <Form
         form={form}

src/pages/transaction/confirmInquiryQuote/components/details.tsx

@@ -425,7 +425,7 @@ const Details: React.FC<parmas> = (props) => {
                       progressDot
                       current={data.externalState - 1}
                     >
-                      {Object.keys(data).length > 0 && data.externalInquiryListStateResponses.map((item, index) => {
+                      {(Object.keys(data).length > 0 && data.externalInquiryListStateResponses) && data.externalInquiryListStateResponses.map((item, index) => {
                         return (
                           <Step
                             key={index}
@@ -443,7 +443,7 @@ const Details: React.FC<parmas> = (props) => {
                       progressDot
                       current={Number(data.interiorState - 1)}
                     >
-                      {Object.keys(data).length > 0 && data.interiorRequisitionFormStateResponses.map((item, index) => {
+                      {(Object.keys(data).length > 0 && data.interiorRequisitionFormStateResponses ) && data.interiorRequisitionFormStateResponses.map((item, index) => {
                         return (
                           <Step
                             key={index}

src/pages/transaction/goodsOffer/addEnquiryOrder/addForm.tsx

@@ -39,6 +39,10 @@ const AddQuotes: React.FC<parmas> = (props) => {
           memberRoleId: res.data.memberRoleId,
           memberRoleName: res.data.memberRoleName
         })
+        setaddress({
+          fullAddress: res.data.fullAddress,
+          fullAddressId: res.data.fullAddressId
+        })
       }
     })
   }