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

src/views/businessManagement/salesOrder/detailsPageEdit.vue

@@ -2891,7 +2891,9 @@ export default {
           this.$set(list[item], 'orderQuantity', list[item].orderQuantity? list[item].orderQuantity: 0)
           // this.$set(list[item], 'amount', 0)
           this.$set(list[item], 'priceCategory', list[item].productCategory)
-          this.$set(list[item], 'priceType', this.policyForm.cname)
+          if(this.policyForm.cname){
+            this.$set(list[item], 'priceType', this.policyForm.cname)
+          }
           this.$set(list[item], 'cname', list[item].productCategory)
           this.$set(list[item], 'sort', this.maxGoodsNum + 1)
           this.$set(list[item], 'purchaseAmount', list[item].purchasePrice)