fix: 修复加工能力 新增加工生产通知单参数问题，以及翻译bug

src/pages/handling/assign/allQuery/detail.tsx

@@ -76,7 +76,7 @@ const Info = () => {
         </div>
         {/* {intl.formatMessage({id: 'handling.detail.noticeDetail'})} */}
         <div style={cacheStyle} id="noticeDetails">
-          <MellowCard title="{intl.formatMessage({id: 'handling.detail.noticeDetail'})}">
+          <MellowCard title={intl.formatMessage({id: 'handling.detail.noticeDetail'})}>
             <Table rowKey={"id"} dataSource={initialValue?.details} columns={columns}/>
           </MellowCard>
         </div>

src/pages/handling/assign/create/common/columns/orderColumn.tsx

@@ -19,7 +19,7 @@ export const orderColumns = [
   },
   {
     title: `${intl.formatMessage({id: 'handling.purchasing.member'})}`,
-    dataIndex: 'memberName'
+    dataIndex: 'buyerMemberName'
   },
   {
     title: `${intl.formatMessage({id: 'handling.order.time'})}`,
@@ -28,24 +28,27 @@ export const orderColumns = [
   },
   {
     title: `${intl.formatMessage({id: 'handling.order.statusName'})}`,
-    dataIndex: 'externalStateName',
+    dataIndex: 'outerStatusName',
   },
   {
     title: `${intl.formatMessage({id: 'handling.order.type'})}`,
-    dataIndex: 'type',
-    render: (text, record) => {
-      // ：1.询价采购2.需求采购3.现货采购4.集采5.渠道直采6.渠道现货7.积分兑换8.渠道积分兑换
-      return (
-        <span>{ORDER_TYPE[text] || ''}</span>
-      )
-    }
+    dataIndex: 'orderTypeName',
+    // render: (text, record) => {
+    //   // ：1.询价采购2.需求采购3.现货采购4.集采5.渠道直采6.渠道现货7.积分兑换8.渠道积分兑换
+    //   return (
+    //     <span>{ORDER_TYPE[text] || ''}</span>
+    //   )
+    // }
   }
 ]
 
 export const orderProductColumns = [
   {
     title: `${intl.formatMessage({id: 'handling.assign.add.product.id'})}/${intl.formatMessage({id: 'handling.assign.add.product.name'})}`,
-    dataIndex: 'id'
+    dataIndex: 'id',
+    render: (text, record) => {
+      return `${record.orderProductId}/${record.name}`;
+    }
   },
   {
     title: `${intl.formatMessage({id: 'handling.assign.add.product.category'})}`,

src/pages/handling/assign/create/index.tsx

@@ -471,7 +471,7 @@ const Create = () => {
     const isOrderSource = source === ORDER_SOURCE
     const productList = isOrderSource ? formActions.getFieldValue('detail.layout1.orderList') : formActions.getFieldValue('detail.layout1.productList');
     // const productList = formActions.getFieldValue('detail.layout1.productList');
-    const { isHasTax, taxRate, processNum, processUnitPrice, enclosure, productProps } = values;
+    const { isHasTax, taxRate = 0, processNum, processUnitPrice, enclosure, productProps } = values;
     let shouldShowConfirmMsg = false;
 
     const newData = productList.map((_item) => {
@@ -561,7 +561,7 @@ const Create = () => {
     onSelect: onSelectChange,
     getCheckboxProps: (record: GetOrderCommonEnhancePageResponseDetail['products'][0]) => {
       return {
-        disabled: record.purchaseCount - record.processNum <= 0, // Column configuration not to be checked
+        disabled: +record.quantity - +record.enhanceCount <= 0, // Column configuration not to be checked
       }
     },
     onSelectAll: async (selected: boolean, selectedRows: GetOrderCommonEnhancePageResponseDetail['products'], changeRows: any[]) => {
@@ -754,6 +754,7 @@ const Create = () => {
       receiverAddressId,
       ...rest
     } = value;
+    console.log(rest);
     const formatDeliveryDate = moment(deliveryDate, 'YYYY-MM-DD').valueOf();
 
     const orderListFormated = orderList?.map((_item) => {
@@ -821,7 +822,7 @@ const Create = () => {
     let restData: RestDataType = {} as RestDataType
     if (deliveryType === 1) {
       restData = {
-        ...rest,
+        // ...rest,
         receiveAddress,
         receiveUserName,
         receiveUserTel,
@@ -846,6 +847,7 @@ const Create = () => {
       deliveryType,
       source,
       ...restData,
+      ...rest,
       outerTaskType: +processEnumRes.processEnum
     }
     const service = isEdit ? postEnhanceSupplierToBeAddUpdate : postEnhanceSupplierToBeAddAdd

src/pages/handling/assign/create/schema.tsx

@@ -277,15 +277,15 @@ const createSchema: ISchema = {
                       width: 65,
                     },
                   },
-                  mainPic: {
-                    title: intl.formatMessage({id: 'handling.assign.add.product.img'}),
-                    type: "string",
-                    "x-component": 'ReadOnly',
-                    'x-component-props': {
-                      isImage: true,
-                    },
-                    editable: false,
-                  },
+                  // mainPic: {
+                  //   title: intl.formatMessage({id: 'handling.assign.add.product.img'}),
+                  //   type: "string",
+                  //   "x-component": 'ReadOnly',
+                  //   'x-component-props': {
+                  //     isImage: true,
+                  //   },
+                  //   editable: false,
+                  // },
                   name: {
                     title: intl.formatMessage({id: 'handling.assign.add.product.img'}),
                     type: "string",
@@ -384,15 +384,15 @@ const createSchema: ISchema = {
                       width: 65,
                     },
                   },
-                  mainPic: {
-                    title: intl.formatMessage({id: 'handling.assign.add.product.img'}),
-                    type: "string",
-                    editable: false,
-                    "x-component": 'ReadOnly',
-                    'x-component-props': {
-                      isImage: true,
-                    },
-                  },
+                  // mainPic: {
+                  //   title: intl.formatMessage({id: 'handling.assign.add.product.img'}),
+                  //   type: "string",
+                  //   editable: false,
+                  //   "x-component": 'ReadOnly',
+                  //   'x-component-props': {
+                  //     isImage: true,
+                  //   },
+                  // },
                   name: {
                     title: intl.formatMessage({id: 'handling.assign.add.product.name'}),
                     type: "string",

src/pages/handling/assign/create/types.ts

@@ -118,11 +118,11 @@ export type SubmitDataType = {
 }
 
 export type RestDataType = {
-  processMemberId: number;
-  processName: string;
-  processRoleId: number;
-  // source: 1 | 2 | number & {};
-  summary: string;
+  // processMemberId: number;
+  // processName: string;
+  // processRoleId: number;
+  // // source: 1 | 2 | number & {};
+  // summary: string;
   receiveAddress?: string,
   receiveUserName?: string,
   receiveUserTel?: string,

src/pages/handling/assign/processStock/index.tsx

@@ -176,7 +176,8 @@ const processStock: React.FC<{}> = () => {
           ),
            [OuterAndInnerStatus.pending_exam_add_process]: (
             <Popconfirm
-              title={intl.formatMessage({id: 'handling.query.processStock.exam.deliverNo'}).replace(/{(.*?)}/, record.deliveryNo)}
+              title={intl.formatMessage({id: 'handling.query.processStock.exam.deliverNo'}, {deliveryNo: record.deliveryNo })}
+              // title={intl.formatMessage({id: 'handling.query.processStock.exam.deliverNo'}).replace(/{(.*?)}/, record.deliveryNo)}
               visible={visibleID === record.id}
               placement="left"
               okText={intl.formatMessage({id: 'common.button.confirm'})}
@@ -203,7 +204,7 @@ const processStock: React.FC<{}> = () => {
           ),
           [OuterAndInnerStatus.pending_exam_process_in_warehouse]: (
             <Popconfirm
-              title={intl.formatMessage({id: 'handling.query.processStock.exam.storageNo'}).replace(/{(.*?)}/, record.storageNo)}
+              title={intl.formatMessage({id: 'handling.query.processStock.exam.storageNo'}, { storageNo: record.storageNo })}
               visible={visibleID === record.id}
               placement="left"
               okText={intl.formatMessage({id: 'common.button.confirm'})}

src/pages/handling/assign/tobeAddQuery/detail.tsx

@@ -87,7 +87,7 @@ const Info = () => {
         </div>
         {/* {intl.formatMessage({id: 'handling.detail.noticeDetail'})} */}
         <div style={cacheStyle} id="noticeDetails">
-          <MellowCard title="{intl.formatMessage({id: 'handling.detail.noticeDetail'})}">
+          <MellowCard title={intl.formatMessage({id: 'handling.detail.noticeDetail'})}>
             <Table rowKey={"id"} dataSource={initialValue?.details} columns={columns}/>
           </MellowCard>
         </div>

src/pages/handling/assign/tobeAddStock/detail.tsx

@@ -67,7 +67,7 @@ const Info = () => {
         </div>
         {/* {intl.formatMessage({id: 'handling.detail.noticeDetail'})} */}
         <div style={cacheStyle} id="noticeDetails">
-          <MellowCard title="{intl.formatMessage({id: 'handling.detail.noticeDetail'})}">
+          <MellowCard title={intl.formatMessage({id: 'handling.detail.noticeDetail'})}>
             <Table rowKey={"id"} dataSource={initialValue?.details} columns={columns}/>
           </MellowCard>
         </div>

src/pages/handling/assign/tobeAddStock/index.tsx

@@ -40,7 +40,7 @@ const AllQuery = () => {
             {
               record.supplierInnerStatus === TO_BE_EXAM_STORAGE && (
                 <Popconfirm
-                  title={intl.formatMessage({id: 'handling.query.processStock.exam.storageNo'}).replace(/{(.*?)}/, record.storageNo)}
+                  title={intl.formatMessage({id: 'handling.query.processStock.exam.storageNo'}, { storageNo: record.storageNo })}
                   placement="left"
                   okText={intl.formatMessage({id: 'common.button.confirm'})}
                   cancelText={intl.formatMessage({id: 'common.button.cancel'})}

src/pages/handling/assign/tobeReceive/detail.tsx

@@ -102,7 +102,7 @@ const Info = () => {
         </div>
         {/* {intl.formatMessage({id: 'handling.detail.noticeDetail'})} */}
         <div style={cacheStyle} id="noticeDetails">
-          <MellowCard title="{intl.formatMessage({id: 'handling.detail.noticeDetail'})}">
+          <MellowCard title={intl.formatMessage({id: 'handling.detail.noticeDetail'})}>
             <Table rowKey={"id"} dataSource={initialValue?.details} columns={columns}/>
           </MellowCard>
         </div>

src/pages/handling/assign/tobeReviewII/detail.tsx

@@ -75,7 +75,7 @@ const Info = () => {
         </div>
         {/* {intl.formatMessage({id: 'handling.detail.noticeDetail'})} */}
         <div style={cacheStyle} id="noticeDetails">
-          <MellowCard title="{intl.formatMessage({id: 'handling.detail.noticeDetail'})}">
+          <MellowCard title={intl.formatMessage({id: 'handling.detail.noticeDetail'})}>
             <Table rowKey={"id"} dataSource={initialValue?.details} columns={columns}/>
           </MellowCard>
         </div>

src/pages/handling/assign/tobeSubmit/detail.tsx

@@ -71,7 +71,7 @@ const Info = () => {
         </div>
         {/* {intl.formatMessage({id: 'handling.detail.noticeDetail'})} */}
         <div style={cacheStyle} id="noticeDetails">
-          <MellowCard title="{intl.formatMessage({id: 'handling.detail.noticeDetail'})}">
+          <MellowCard title={intl.formatMessage({id: 'handling.detail.noticeDetail'})}>
             <Table rowKey={"id"} dataSource={initialValue?.details} columns={columns}/>
           </MellowCard>
         </div>

src/pages/handling/common/columns/detailNoticeInfoColumns.tsx

@@ -121,7 +121,7 @@ export const productColumn = [
       return (
         <div>
           {/* <p>{numFormat((purchaseCount))}</p> */}
-          <p>{record.unit}</p>
+          <span>{record.unit}</span>
         </div>
       )
     }

src/pages/handling/confirm/allQuery/detail.tsx

@@ -82,7 +82,7 @@ const Info = () => {
         </div>
         {/* {intl.formatMessage({id: 'handling.detail.noticeDetail'})} */}
         <div style={cacheStyle} id="noticeDetails">
-          <MellowCard title="{intl.formatMessage({id: 'handling.detail.noticeDetail'})}">
+          <MellowCard title={intl.formatMessage({id: 'handling.detail.noticeDetail'})}>
             <Table rowKey={"id"} dataSource={initialValue?.details} columns={columns}/>
           </MellowCard>
         </div>

src/pages/handling/confirm/pendingAddLogistics/detail.tsx

@@ -60,7 +60,7 @@ const Info = () => {
         </div>
         {/* {intl.formatMessage({id: 'handling.detail.noticeDetail'})} */}
         <div style={cacheStyle} id="noticeDetails">
-          <MellowCard title="{intl.formatMessage({id: 'handling.detail.noticeDetail'})}">
+          <MellowCard title={intl.formatMessage({id: 'handling.detail.noticeDetail'})}>
             <Table rowKey={"id"} dataSource={initialValue?.details} columns={columns}/>
           </MellowCard>
         </div>

src/pages/handling/confirm/pendingConfirm/detail.tsx

@@ -75,7 +75,7 @@ const Info = () => {
         </div>
         {/* {intl.formatMessage({id: 'handling.detail.noticeDetail'})} */}
         <div style={cacheStyle} id="noticeDetails">
-          <MellowCard title="{intl.formatMessage({id: 'handling.detail.noticeDetail'})}">
+          <MellowCard title={intl.formatMessage({id: 'handling.detail.noticeDetail'})}>
             <Table rowKey={"id"} dataSource={initialValue?.details} columns={columns}/>
           </MellowCard>
         </div>

src/pages/handling/confirm/pendingDelivered/detail.tsx

@@ -146,7 +146,7 @@ const Info = () => {
         </div>
         {/* {intl.formatMessage({id: 'handling.detail.noticeDetail'})} */}
         <div style={cacheStyle} id="noticeDetails">
-          <MellowCard title="{intl.formatMessage({id: 'handling.detail.noticeDetail'})}">
+          <MellowCard title={intl.formatMessage({id: 'handling.detail.noticeDetail'})}>
             <Table rowKey={"id"} dataSource={initialValue?.details} columns={columns}/>
           </MellowCard>
         </div>

src/pages/handling/confirm/pendingLevelII/detail.tsx

@@ -75,7 +75,7 @@ const Info = () => {
         </div>
         {/* {intl.formatMessage({id: 'handling.detail.noticeDetail'})} */}
         <div style={cacheStyle} id="noticeDetails">
-          <MellowCard title="{intl.formatMessage({id: 'handling.detail.noticeDetail'})}">
+          <MellowCard title={intl.formatMessage({id: 'handling.detail.noticeDetail'})}>
             <Table rowKey={"id"} dataSource={initialValue?.details} columns={columns}/>
           </MellowCard>
         </div>

src/pages/handling/confirm/pendingReceipt/detail.tsx

@@ -130,7 +130,7 @@ const Info = () => {
         </div>
         {/* {intl.formatMessage({id: 'handling.detail.noticeDetail'})} */}
         <div style={cacheStyle} id="noticeDetails">
-          <MellowCard title="{intl.formatMessage({id: 'handling.detail.noticeDetail'})}">
+          <MellowCard title={intl.formatMessage({id: 'handling.detail.noticeDetail'})}>
             <Table rowKey={"id"} dataSource={initialValue?.details} columns={columns}/>
           </MellowCard>
         </div>

src/pages/handling/confirm/pendingSubmit/detail.tsx

@@ -104,7 +104,7 @@ const Info = () => {
         </div>
         {/* {intl.formatMessage({id: 'handling.detail.noticeDetail'})} */}
         <div style={cacheStyle} id="noticeDetails">
-          <MellowCard title="{intl.formatMessage({id: 'handling.detail.noticeDetail'})}">
+          <MellowCard title={intl.formatMessage({id: 'handling.detail.noticeDetail'})}>
             <Table rowKey={"id"} dataSource={initialValue?.details} columns={columns}/>
           </MellowCard>
         </div>

src/pages/handling/confirm/processingInvoiceTobeAdd/index.tsx

@@ -51,7 +51,7 @@ const AllQuery = () => {
             {
               record.processInnerStatus === PENDING_VERIFY_PROCESS_DELIVERY && (
                 <Popconfirm
-                  title={intl.formatMessage({id: 'handling.query.processStock.exam.deliverNo'}).replace(/{deliveryNo}/, record.deliverNo)}
+                  title={intl.formatMessage({id: 'handling.query.processStock.exam.deliverNo'}, {deliveryNo: record.deliveryNo })}
                   // visible={visibleID === record.id}
                   placement="left"
                   okText={intl.formatMessage({id: 'common.button.confirm'})}