Merge remote-tracking branch 'origin/mergeBranch' into mergeBranch

src/HDrpManagement/orderManage/details/tabs/productlist.vue

@@ -404,7 +404,7 @@ export default {
       row.position = item.LOCATION
       row.batchno = item.LOT
       this.$set(this.tableData,index,row)
-      that.updateOrder({
+      this.updateOrder({
         "sa_orderid": this.data.sa_orderid, //订单ID
         "sys_enterpriseid": this.data.sys_enterpriseid, //企业ID
         "sa_contractid": this.data.contacts.contactsid, //合同ID