fix：渠道商品上架添加店铺判断，采购下单简单流程签署合同接口变更，确认电子合同签署传参变更

src/pages/commodity/products/addProductsItem/priceAttributeForm.tsx

@@ -495,6 +495,7 @@ const PriceAttributeForm: React.FC<Iprops> = (props) => {
     setPlanPrice(v.target.value)
     setProductPriceType(v.target.value)
     setIsChangePriceType(true)
+    priceForm.setFieldsValue({isMemberPrice: false})
   }
 
   const setPriceOk = () => {
@@ -756,7 +757,7 @@ const PriceAttributeForm: React.FC<Iprops> = (props) => {
         label={
           <span>
             会员折扣&nbsp;
-              <Tooltip title="是否允许会员使用会员折扣价购买当前商品">
+              <Tooltip title="是否允许会员使用会员折扣价购买当前商品，只支持现货商品">
               <QuestionCircleOutlined />
             </Tooltip>
           </span>

src/pages/commodity/products/directChannel.tsx

@@ -298,13 +298,13 @@ const DirectChannel: React.FC<{}> = () => {
 
   const onChangeUpShop = (values) => {
     // 判断上架之前是否有店铺 有即可以上下架
-    // PublicApi.getTemplateShopFindShop().then(res => {
-    //   if(res.data.logo){
+    PublicApi.getTemplateWebMemberChannelWebFindCurrMemberChannel().then(res => {
+      if(res.data.id){
         setCheckedValues(values)
-      // }else{
-      //   message.error('您还没有开通店铺，无法上下架商品！')
-      // }
-    // })
+      }else{
+        message.error('您还没有开通店铺，无法上下架商品！')
+      }
+    })
   }
 
   const handleUpDown = () => {

src/pages/transaction/components/createElectronModal/index.tsx

@@ -134,12 +134,12 @@ const CreateOrderElectronModal:React.FC<OrderElectronModalProps> = (props) => {
       message.error('请先选择电子合同模板')
       return ;
     }
-    const orderNo = data.orderNo
+    const orderId = data.orderId
     const signMemberId = data.createMemberId
 
     const params = {
       contractTemplateId,
-      orderNo,
+      orderId,
       signMemberId
     }
 

src/pages/transaction/purchaseOrder/orderCollect/apis/index.ts

@@ -67,7 +67,7 @@ export const fetchOrderApi = {
 
   // 生成电子合同
   async createContract(params) {
-    const { data } = await PublicApi.postOrderSignatureSignContractCreate(params, {ctlType: "none"})
+    const { data } = await PublicApi.postOrderSignaturePreOrderSignContractCreate(params, {ctlType: "none"})
     return data
   },
 

src/pages/transaction/purchaseOrder/orderCollect/components/memberModalTable/index.tsx

@@ -9,7 +9,8 @@ export interface MemberModalTableProps extends ModalTableProps {
   type?: 'radio' | 'checkbox',
   schemaAction: ISchemaFormActions | ISchemaFormAsyncActions,
   currentRef?: any,
-  confirmModal?()
+  confirmModal?(),
+  productRef?: any,
 }
 
 const MemberModalTable:React.FC<MemberModalTableProps> = (props) => {
@@ -38,6 +39,10 @@ const MemberModalTable:React.FC<MemberModalTableProps> = (props) => {
     // 清空之前可能存在的商品支付信息数据
     schemaAction.setFieldValue('orderProductRequests', [])
     schemaAction.setFieldValue('paymentInformationResponses', [])
+    if(props?.productRef) {
+      props.productRef.current.rowSelectionCtl.setSelectRow([])
+      props.productRef.current.rowSelectionCtl.setSelectedRowKeys([])
+    }
   }
   return (
     <ModalTable

src/pages/transaction/purchaseOrder/orderCollect/effects/index.ts

@@ -274,7 +274,15 @@ export const useElectronicContract = (ctx: ISchemaFormActions | ISchemaFormAsync
         })
       }
       if(data['electronicContractId']) {
-        fetchOrderApi.createContract({contractTemplateId: data['electronicContractId'], signMemberId: params['memberId'] }).then(_data => {
+        fetchOrderApi.createContract({
+          contractTemplateId: data['electronicContractId'],
+          signMemberId: params['memberId'],
+          signRoleId: params['memberRoleId'],
+          quotationNo: ctx.getFieldValue("quotationNo"),
+          orderProductRequests: ctx.getFieldValue('orderProductRequests'),
+          orderModel: ctx.getFieldValue('orderModel'),
+          deliveryAddresId: ctx.getFieldValue('deliveryAddresId'),
+        }).then(_data => {
           ctx.setFieldState("usingElectronicContracts", state => {
             state.props["x-component-props"].contract = { contractTemplateId: data['electronicContractId'], ..._data, }
           })

src/pages/transaction/purchaseOrder/orderCollect/index.tsx

@@ -510,7 +510,7 @@ const PurchaseOrderDetail:React.FC<PurchaseOrderDetailProps> = (props) => {
           />
         </Card>
         <ProductModalTable currentRef={productRef} schemaAction={addSchemaAction} sectionProps={sectionProps} forceRender/>
-        <MemberModalTable currentRef={memberRef} schemaAction={addSchemaAction}/>
+        <MemberModalTable currentRef={memberRef} productRef={productRef} schemaAction={addSchemaAction}/>
         {/* 询价报价单弹窗 */}
         <InquiryModalTable currentRef={inquiryRef} schemaAction={addSchemaAction}/>