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

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

@@ -631,7 +631,7 @@ export default {
       })
     },
     rowChange (val,index) {
-      if (this.data.status != '特殊订单') {
+      if (this.data.type != '特殊订单') {
         if (val.qty > val.orderminqty){
           if ((val.qty-val.orderminqty)/val.orderaddqty > 0){
             let k = ((val.qty-val.orderminqty)/val.orderaddqty).toFixed(0)