fix: 商品查看上游供应商商品详情，订单支付添加资金模式字段，提交评标报告未评数据去重处理

src/pages/commodity/products/index.tsx

@@ -174,7 +174,7 @@ const Products: React.FC<{}> = () => {
   ];
 
   const previewUpper = (upId) => {
-
+    history.push(`/memberCenter/commodityAbility/commodity/products/detail?id=${upId}`)
   }
 
   /** 参照后台数据生成 */
@@ -464,10 +464,12 @@ const Products: React.FC<{}> = () => {
   const handleBatch = (type: string) => {
     // 判断 批量操作的商品类型相同、并且满足可上（审核通过，下架）下架（）的状态
     const rows = [...currentRefRow.current]
-    const canUp = currentRefRow.current.every(item => item.status === 4 || item.status === 6)
-    const canDown = !currentRefRow.current.some(item => item.status !== 5)
-    const isSamilar = currentRefRow.current.every(item => item.priceType === rows[0]['priceType'])
-    console.log(type, currentRefRow.current, canUp, canDown, isSamilar)
+    const canUp = rows.every(item => item.status === 4 || item.status === 6)
+    const canDown = !rows.some(item => item.status !== 5)
+    const isSamilar = rows.every(item => item.priceType === rows[0]['priceType'])
+    if(!rows.length) {
+      return message.error('请选择需要批量操作的商品')
+    }
     if(!isSamilar) {
       return message.error('批量操作仅限产品定价类型相同的商品')
     }

src/pages/procurement/callForBids/readySubmitReport/components/remarkBidReport/index.tsx

@@ -95,6 +95,12 @@ const RemarkBidReport: React.FC<RemarkBidReportProps> = ({editable}) => {
         }
       }
 
+      // 数据去重处理（主要针对没有专家评，但评标模板评标分类有重复）
+      dataSource = Object.values([...dataSource].map(item => ({ ...item, mockId: `${item.memberId}_${item.expertExtractRecordId}_${item.sort}` })).reduce((item, next)=>{
+        item[next.mockId] = next
+        return item
+      },{}))
+
       // 计算总分 计算平均分
       const computedData = groupBy(dataSource, 'memberName')
       const computedScore = Object.keys(computedData).map((item) => {

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

@@ -133,7 +133,7 @@ const OrderPayModal: React.FC<OrderPayModalProps> = (props) => {
           setCurrent(1)
           setPayStep(1)
           // 获取对公账户信息
-          PublicApi.getSettleAccountsCorporateAccountConfig({memberId: data.vendorMemberId, memberRoleId: data.vendorRoleId}).then(res => {
+          PublicApi.getSettleAccountsCommonCorporateAccountDetail({memberId: data.vendorMemberId, roleId: data.vendorRoleId, type: checked.fundMode}).then(res => {
             if(res.code === 1000) {
               setBlankAccountInfo(res.data)
               setSettleAccountsError(true)
@@ -276,6 +276,7 @@ const OrderPayModal: React.FC<OrderPayModalProps> = (props) => {
       paymentInformationId: payInfoObj.id,
       payType: checked.payType,
       payChannel: checked.id,
+      fundMode: checked.fundMode,
     }
     if(payStep === 2) {
       if(code.length != number.length){
@@ -387,10 +388,14 @@ const OrderPayModal: React.FC<OrderPayModalProps> = (props) => {
                 (item['payChannels'] as any[]).map(v => <div
                   key={v.payChannel}
                   className={cx(style.payRadio, (checked && v.payChannel === checked.id) ? style.active : '')}
-                  onClick={() => setChecked({ id: v.payChannel, channel: v.payChannelName, payType: item.payType, payTypeName: item.payTypeName })}>
-                    {
-                      v.payChannelName
-                    }
+                  onClick={() => setChecked({
+                    id: v.payChannel,
+                    channel: v.payChannelName,
+                    payType: item.payType,
+                    payTypeName: item.payTypeName,
+                    fundMode: item.fundMode
+                  })}>
+                    {v.payChannelName}
                   </div>)
               }
             </div>

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

@@ -28,7 +28,6 @@ const OrderPayTabs:React.FC<OrderPayTabsProps> = () => {
     // 过滤支付信息 取第一个待支付或者未到账的id
     if(data?.payments?.length) {
       let payments = data.payments.sort((a, b) => a.batchNo - b.batchNo).filter(item => item.showPayment)
-      console.log(data.payments.sort((a, b) => a.batchNo - b.batchNo), payments, 'lo')
       if(payments.length) {
         ctl.setPayId(payments[0].paymentId)
       }