Merge remote-tracking branch 'origin/master'

anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangneigou/cheliangneigouAdd.vue

@@ -392,6 +392,22 @@ export default {
     submitVehicleApply() {
       this.$refs['form_obj'].validate((valid) => {
         if (valid) {
+          if (this.formobj.baseInternalPurchaseVehicles.length > 0) {
+            for (var i = 0; i < this.formobj.baseInternalPurchaseVehicles.length; i++) {
+              if (this.formobj.baseInternalPurchaseVehicles[i].witPinMoney == '') {
+                this.$message({ showClose: true, type: 'error', message: '车辆列表中内销价格不能为空' })
+                return
+              }
+              if (this.formobj.baseInternalPurchaseVehicles[i].freight == '') {
+                this.$message({ showClose: true, type: 'error', message: '车辆列表中运费不能为空' })
+                return
+              }
+              if (this.formobj.baseInternalPurchaseVehicles[i].freight !== '' && this.formobj.baseInternalPurchaseVehicles[i].freight !== '0' && this.formobj.baseInternalPurchaseVehicles[i].freightUndertakerType == '') {
+                this.$message({ showClose: true, type: 'error', message: '车辆列表中运费承担方不能为空' })
+                return
+              }
+            }
+          }
           this.submitdisabled = true
           req.submitVehicleApply(this.formobj).then((res) => {
             if (res.success) {

anrui-scm/anrui-scm-ui/src/views/workFlow/cheliangneigouFlow/neigouguanli/neigouEdit.vue

@@ -382,6 +382,22 @@ export default {
     submitVehicleApply() {
       this.$refs['form_obj'].validate((valid) => {
         if (valid) {
+          if (this.formobj.baseInternalPurchaseVehicles.length > 0) {
+            for (var i = 0; i < this.formobj.baseInternalPurchaseVehicles.length; i++) {
+              if (this.formobj.baseInternalPurchaseVehicles[i].witPinMoney == '') {
+                this.$message({ showClose: true, type: 'error', message: '车辆列表中内销价格不能为空' })
+                return
+              }
+              if (this.formobj.baseInternalPurchaseVehicles[i].freight == '') {
+                this.$message({ showClose: true, type: 'error', message: '车辆列表中运费不能为空' })
+                return
+              }
+              if (this.formobj.baseInternalPurchaseVehicles[i].freight !== '' && this.formobj.baseInternalPurchaseVehicles[i].freight !== '0' && this.formobj.baseInternalPurchaseVehicles[i].freightUndertakerType == '') {
+                this.$message({ showClose: true, type: 'error', message: '车辆列表中运费承担方不能为空' })
+                return
+              }
+            }
+          }
           this.submitdisabled = true
           req.submitVehicleApply(this.formobj).then((res) => {
             if (res.success) {