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

src/pages/contract/manage/QueryList/index.tsx

@@ -121,11 +121,13 @@ const QueryList = () => {
     dataIndex: 'state',
     align: 'left',
     render: (text, record) => {
+      console.log(record.outerStatus)
       return (
         <div>
           {
-            record.outerStatus != 7 || record.outerStatus != 9 ? <span style={{ color: '#00B37A', marginRight: 20, cursor: 'pointer', }} onClick={() => invalid(record.id)}>作废</span> : <span> </span>
+            record.outerStatus != 7 && record.outerStatus != 9 && <span style={{ color: '#00B37A', marginRight: 20, cursor: 'pointer', }} onClick={() => invalid(record.id)}>作废</span>
           }
+
           {
             record.outerStatus == 6 ? <span style={{ color: '#00B37A', marginRight: 20, cursor: 'pointer', }} onClick={() => like(record)}>合同变更</span> : <span> </span>
           }

src/pages/transaction/_public/order/constant.ts

@@ -96,10 +96,10 @@ export const tableListSchema: any = () => {
               placeholder: '请输入订单摘要',
             }
           },
-          "memberName": {
+          "supplyMembersName": {
             type: 'string',
             "x-component-props": {
-              placeholder: '请输入采购会员名称'
+              placeholder: '请输入供应会员名称'
             }
           },
           "type": {

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

@@ -60,7 +60,7 @@ const formatting = (data, property) => {
     nweData[i] = nweData[i].map(item => {
       // 单独处理100账结 101月结
       if(item.id === -1){
-        return { value: item.settlementWay, label: item.settlementWay === 100 ? `账期${item.settlementDays}天` : `月结${item.settlementDate}号`, channel: item.id }
+        return { value: item.settlementWay, label: item.settlementWay === 100 ? `账期${item.settlementDays}天` : `月结${item.settlementDate}号`, channel: item.payType }
       } else {
         return { value: item.id, label: item.way, channel: item.payType }
       }
@@ -85,8 +85,8 @@ const OrderPayModal: React.FC<OrderPayModalProps> = (props) => {
   const { data, payList, currentPayInfoId } = useContext(OrderDetailContext)
   const transformPayList: any = data ? formatting(payList, "payType") : []
   /** 先隐藏账期月结 */
-  delete transformPayList['-1']
-  // console.log(transformPayList, 'trans')
+  // delete transformPayList['-1']
+  console.log(transformPayList, 'trans')
   const [visible, setVisible] = useState(false)
   const [checked, setChecked] = useState<any>({})
   const [current, setCurrent] = useState(0) // 0选择方式 1线下支付方式 2授信支付 3余额支付 4微信支付 5货到付款 6支付宝 100账期 101月结 1000清除
@@ -331,7 +331,8 @@ const OrderPayModal: React.FC<OrderPayModalProps> = (props) => {
     let params: any = {
       id: Number(id),
       paymentInformationId: PayInfoObj.id,
-      payTypeId: checked.id,
+      // 大于100为账期月结 id固定为-1
+      payTypeId: checked.id >= 100 && -1,
       payType: checked.channel,
     }
 
@@ -633,7 +634,7 @@ const OrderPayModal: React.FC<OrderPayModalProps> = (props) => {
             支付渠道：
             </span>
             <span className={style.amount}>
-            {transformPayList['-1'][0]['label']}
+            {transformPayList['5'][0]['label']}
             </span>
           </p>
           <p>
@@ -664,7 +665,7 @@ const OrderPayModal: React.FC<OrderPayModalProps> = (props) => {
             支付渠道：
             </span>
             <span className={style.amount}>
-            {transformPayList['-1'][0]['label']}
+            {transformPayList['6'][0]['label']}
             </span>
           </p>
           <p>

src/pages/transaction/purchaseOrder/index.tsx

@@ -125,6 +125,9 @@ const PurchaseOrder: React.FC<PurchaseOrderProps> = (props) => {
 
   /** 参照后台数据生成 */
   const renderOptionButton = (record: any) => {
+    if(record.button === 1) {
+      record.button = null
+    }
     const statusAndOperationList = {
       '2': ['取消订单'],
       '3': ['售后'],
@@ -242,7 +245,7 @@ const PurchaseOrder: React.FC<PurchaseOrderProps> = (props) => {
                 title: '当前id',
                 visible: false,
               },
-              reason: {
+              cancelReason: {
                 type: 'textarea',
                 "x-component-props": {
                   rows: 4,

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

@@ -162,9 +162,10 @@ const MaterialModalTable:React.FC<MaterialModalTableProps> = (props) => {
       schemaAction.setFieldValue('orderProductRequests', addMaterialProcessField(rowSelectionCtl.selectRow, productData))
       confirmModal && confirmModal()
       setVisible(false)
-    } else {
-      message.error(res.message)
     }
+    // else {
+    //   message.error(res.message)
+    // }
   }
 
   const fetchMaterialList = (values) => {

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

@@ -173,9 +173,10 @@ const ProductModalTable:React.FC<ProductModalTableProps> = (props) => {
       schemaAction.setFieldValue('orderProductRequests', await filterProductDataById(productData, rowSelectionCtl.selectRow))
       confirmModal && confirmModal()
       setVisible(false)
-    } else {
-      message.error(res.message)
     }
+    // else {
+    //   message.error(res.message)
+    // }
   }
 
   const fetchProductList = (values) => {

src/pages/transaction/saleOrder/index.tsx

@@ -153,7 +153,7 @@ const SaleOrder: React.FC<SaleOrderProps> = (props) => {
                 title: '当前id',
                 visible: false,
               },
-              reason: {
+              cancelReason: {
                 type: 'textarea',
                 "x-component-props": {
                   rows: 4,