Merge branch 'mergeBranch' into redUrgent

# Conflicts:
#	src/HDrpManagement/orderManage/index.vue

src/HDrpManagement/contractManage/components/productList/productBillno.vue

@@ -45,7 +45,6 @@
           class="inline-16"
           title="自报价单添加"
           :tablecolsAdd="tablecolsAdd"
-          :tradefield="data.tradefield"
           :data="data"
           @closeDrawer="closeDrawer"
           @addSuccess="queryProuctAdds"