Merge branch 'master' of 121.41.102.225:Nidong/jiufang into hw

src/views/BidSystem/ProductDeOrder/infoDetail.vue

@@ -915,7 +915,7 @@ export default {
         if (this.search_state) {
           this.axios
             .post("/api/order_area_details", {
-              order_no: this.$route.query.order_no,
+              order_no: this.$route.query.order_no || this.saveData.order_no,
               oa_id: this.$route.query.oa_id,
               page_index: this.page_index,
               page_size: this.page_size,

src/views/OrderMannage/BusinessOrderlist/edit.vue

@@ -4032,6 +4032,7 @@ export default {
             element.measureCalc = element.e_title;
           });
           this.tableData.splice(rowIndex, 1, row);
+          row.extArray = [];
           row.get_first_data = false;
           // this.$forceUpdate();
         });