门户改造

src/pages/Buyer/orderEdit/index.js

@@ -135,15 +135,15 @@ class OrderEidt extends PureComponent {
         const { supplierData } = this.props;
         const { supplierId, saleModel } = this.state;
         if (supplierId) {
-          // 匹配账期
-          dispatch({
-            type: "orderEdit/getAccountPeriodInfo",
-            payload: {
-              saleOrg: supplierId, // 销售组织
-              customer: this.customerId, // 客户
-              saleModel: saleModel
-            }
-          });
+          // // 匹配账期
+          // dispatch({
+          //   type: "orderEdit/getAccountPeriodInfo",
+          //   payload: {
+          //     saleOrg: supplierId, // 销售组织
+          //     customer: this.customerId, // 客户
+          //     saleModel: saleModel
+          //   }
+          // });
           // 判断供应商是否为组织
           const isOrg = ifSupplierIsOrg(supplierId, supplierData);
           // 供应商是组织时，只设置ifOneSupplier为true，适配货补
@@ -785,6 +785,8 @@ class OrderEidt extends PureComponent {
           basePrice : price,
           dealPrice : price,
           salePrice : price,
+          ext09 : price,
+          ext10 : price * goodsDetail.orderNum,
           amount : price * goodsDetail.orderNum,
           dealAmount : goodsDetail.amount,
           baseGoodsOptId : opt[0].goodsOptDtos[0].id,
@@ -827,14 +829,14 @@ class OrderEidt extends PureComponent {
     const { dispatch, supplierData } = this.props;
     const { supplierId, saleModel } = this.state;
     // 匹配账期
-    dispatch({
-      type: "orderEdit/getAccountPeriodInfo",
-      payload: {
-        saleOrg: value, // 销售组织
-        customer: this.customerId, // 客户
-        saleModel: saleModel
-      }
-    });
+    // dispatch({
+    //   type: "orderEdit/getAccountPeriodInfo",
+    //   payload: {
+    //     saleOrg: value, // 销售组织
+    //     customer: this.customerId, // 客户
+    //     saleModel: saleModel
+    //   }
+    // });
     // 判断供应上是否为组织
     const isOrg = ifSupplierIsOrg(value, supplierData);
     // 供应商是组织时，只设置ifOneSupplier为true，适配货补
@@ -1044,12 +1046,12 @@ class OrderEidt extends PureComponent {
     }
     // totalDealAmount: 0, // 订单成交金额
     // totalAmount: 0, // 商品总金额（订单原金额）
-    if (parseFloat(orderCredit) + parseFloat(postData.totalDealAmount) < parseFloat(postData.totalAmount)) {
-      message.info("信用不足!");
-    }
-    if (!accountPeriodInfo || !accountPeriodInfo.name) {
-      message.info("未匹配到账期");
-    }
+    // if (parseFloat(orderCredit) + parseFloat(postData.totalDealAmount) < parseFloat(postData.totalAmount)) {
+    //   message.info("信用不足!");
+    // }
+    // if (!accountPeriodInfo || !accountPeriodInfo.name) {
+    //   message.info("未匹配到账期");
+    // }
     dispatch({
       type: "orderEdit/submitOrder",
       payload: postData
@@ -1091,6 +1093,8 @@ class OrderEidt extends PureComponent {
               salePrice: 0,
               promPrice: 0,
               dealPrice: 0,
+              ext09:0,
+              ext10:0,
               amount: 0, // 金额
               promAmount: 0, // 均摊到行上的整单降价促销金额
               dealAmount: 0, // 成交金额

src/pages/Buyer/orderList/index.js

@@ -378,15 +378,15 @@ class OrderList extends PureComponent {
           <div className={styles.orderStatusBox}>{text}</div>
         )
       },
-      {
-        title: "支付状态",
-        dataIndex: "paymentStatusName",
-        key: "paymentStatusName",
-        className: "alignCenter",
-        render: (text, record) => (
-          <div className={styles.orderStatusBox}>{text}</div>
-        )
-      },
+      // {
+      //   title: "支付状态",
+      //   dataIndex: "paymentStatusName",
+      //   key: "paymentStatusName",
+      //   className: "alignCenter",
+      //   render: (text, record) => (
+      //     <div className={styles.orderStatusBox}>{text}</div>
+      //   )
+      // },
       {
         title: "处理追踪",
         dataIndex: "reqOrderLogs",
@@ -405,6 +405,15 @@ class OrderList extends PureComponent {
           </div>
         )
       },
+      {
+        title: "是否修订",
+        dataIndex: "ext08",
+        key: "ext08",
+        className: "alignCenter",
+        render: (text, record) => (
+          <div className={styles.orderStatusBox}>{record.ext08 == '1' ? '已修订':'未修订'}</div>
+        )
+      },
       {
         title: "操作",
         dataIndex: "orderStatus",