Merge branch 'master' of http://47.100.3.209:3000/gdc/yiliangyiyun-pc

src/views/contractManagement/acquisitionContractAdd.vue

@@ -792,7 +792,11 @@ import { isUndefined } from 'xe-utils/methods'
           return
         }
        }
-        
+        if(this.deptBudgetList.transactionSubject == '自营'){
+          delete this.deptBudgetList.jointVentureParties
+          delete this.deptBudgetList.jointPhone
+          delete this.deptBudgetList.jointVentureMarkup
+       }
         if (!this.deptBudgetList.buyerPhone) {
           this.$message({
             message: '请输入收购方电话！',

src/views/contractManagement/purchaseContractAdd.vue

@@ -1037,6 +1037,11 @@ import { isUndefined } from 'xe-utils/methods'
         }
 
         
+       }
+       if(this.deptBudgetList.transactionSubject == '自营'){
+          delete this.deptBudgetList.jointVentureParties
+          delete this.deptBudgetList.jointPhone
+          delete this.deptBudgetList.jointVentureMarkup
        }
         // if(this.deptBudgetList.placeDelivery.indexOf('省')>-1){
         //       this.$message({

src/views/contractManagement/salesContractAdd.vue

@@ -885,6 +885,11 @@
           })
           return
         }
+       }
+       if(this.deptBudgetList.transactionSubject == '自营'){
+          delete this.deptBudgetList.jointVentureParties
+          delete this.deptBudgetList.jointPhone
+          delete this.deptBudgetList.jointVentureMarkup
        }
         //   if(this.deptBudgetList.placeDelivery.indexOf('省')>-1){
         //       this.$message({