修改前端

src/views/appoint/components/saleContract/saleOrderSteel.vue

@@ -435,18 +435,33 @@ export default {
         getCookie("userId") +
         "&i=" +
         new Date();
+      this.option2.requestUrl =
+        "/api/v1/ams/getSaleOrderReportedes?apiId=408&consigneeSsoId=" +
+        getCookie("userId") +
+        "&i=" +
+        new Date();
     } else if (getCookie("orgCode") == "xiaoshouyewuyuan") {
       this.option.requestUrl =
         "/api/v1/ams/getSaleOrderInfoes?apiId=408&saler=" +
         getCookie("loginName") +
         "&i=" +
         new Date();
+      this.option2.requestUrl =
+        "/api/v1/ams/getSaleOrderReportedes?apiId=408&saler=" +
+        getCookie("loginName") +
+        "&i=" +
+        new Date();
     } else {
       this.option.requestUrl =
         "/api/v1/ams/getSaleOrderInfoes?apiId=408&consigneeSsoId=" +
         null +
         "&i=" +
         new Date();
+      this.option2.requestUrl =
+        "/api/v1/ams/getSaleOrderReportedes?apiId=408&consigneeSsoId=" +
+        null +
+        "&i=" +
+        new Date();
     }
     let loadTime1 = new Date(
       new Date(new Date().toLocaleDateString()).getTime() +
@@ -588,6 +603,11 @@ export default {
                 map.salerName = e[e1];
               }
               if (e1.includes("摘要")) {
+                if (e[e1].includes("范围定尺")) {
+                  map.saleRemark = e[e1];
+                } else {
+                  map.saleRemark = e[e1];
+                }
                 map.saleRemark = e[e1];
                 let regex = /钢材.*组/g;
                 if (e[e1].match(regex)) {
@@ -596,7 +616,7 @@ export default {
                 let regex1 = /范围.*米/g;
                 if (e[e1].match(regex1)) {
                   map.steelMeters = Number(
-                    str.match(regex)[0].match(/(\d+(\.\d+)?)/g)
+                    e[e1].match(regex1)[0].match(/(\d+(\.\d+)?)/g)
                   );
                 }
               }
@@ -717,7 +737,6 @@ export default {
       // result即为所求
       let result = Object.values(map1);
       console.log(result);
-      debugger;
       //遍历数组
       let saleOrderListMap = [];
       result.forEach((saleOrderList, index) => {

src/views/inward/components/truckOrder/purInwardTruckOrder.vue

@@ -265,16 +265,16 @@ export default {
     },
     getRequestUrl() {
       if (getCookie("orgCode") == "chengyunshang") {
-        (this.first.requestUrl =
+        this.first.requestUrl =
           "/api/v1/oms/getPurInwardOrderList?apiId=432&orderStatus=4&planEnableStatus=1&carrierId=" +
           this.carrierUserId +
           "&test=" +
-          new Date()),
-          (this.Received.requestUrl =
-            "/api/v1/oms/getPurInwardOrderList?apiId=432&orderStatus=5&planEnableStatus=1&carrierId=" +
-            this.carrierUserId +
-            "&test=" +
-            new Date());
+          new Date();
+        this.Received.requestUrl =
+          "/api/v1/oms/getPurInwardOrderList?apiId=432&orderStatus=5&planEnableStatus=1&carrierId=" +
+          this.carrierUserId +
+          "&test=" +
+          new Date();
         this.completed.requestUrl =
           "/api/v1/oms/getPurInwardOrderList?apiId=432&orderStatus=2&carrierId=" +
           getCookie("userId");