Merge branch 'dev' into 'purchaseDev'

bug修改

See merge request new-business/drp-web!104

src/views/purchase/PurchaseDemandList/add.vue

@@ -957,7 +957,7 @@ export default {
       this.basicForm.puDemandItemList[this.tableIndex].contacts = null
       this.basicForm.puDemandItemList[this.tableIndex].contactsPhone = null
       this.basicForm.puDemandItemList[this.tableIndex].address = null
-      this.basicForm.puDemandItemList[this.tableIndex].priceType = null
+      this.basicForm.puDemandItemList[this.tableIndex].priceType = 'order'
       this.basicForm.puDemandItemList[this.tableIndex].lastWarehouseName = null
       this.basicForm.puDemandItemList[this.tableIndex].lastWarehouse = null
       this.basicForm.puDemandItemList[this.tableIndex].lastAllocation = null