Merge remote-tracking branch 'origin/master'

anrui-scm/anrui-scm-ui/src/views/ruzhang/ruzhangguanli/ruzhangAdd.vue

@@ -741,10 +741,6 @@ export default {
         this.$message({ showClose: true, type: 'error', message: '一次运费不能为空' })
         return
       }
-      if (this.formobj.onceFreight == 0) {
-        this.$message({ showClose: true, type: 'error', message: '因一次运费不能为零，请完善一次运费' })
-        return
-      }
       for (var i = 0; i < this.formobj.vehicleList.length; i++) {
         if (this.formobj.vehicleList[i].vinNo !== '' && this.formobj.vehicleList[i].engineNo === '') {
           this.$message({ showClose: true, type: 'error', message: '车架号:' + this.formobj.vehicleList[i].vinNo + '的发动机号不能为空' })
@@ -809,10 +805,6 @@ export default {
         this.$message({ showClose: true, type: 'error', message: '一次运费不能为空' })
         return
       }
-      if (this.formobj.onceFreight == 0) {
-        this.$message({ showClose: true, type: 'error', message: '因一次运费不能为零，请完善一次运费' })
-        return
-      }
       if (this.formobj.priceDate === '' || this.formobj.priceDate === null) {
         this.$message({ showClose: true, type: 'error', message: '厂家入库日期不能为空' })
         return

anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangEdit.vue

@@ -750,10 +750,6 @@ export default {
         this.$message({ showClose: true, type: 'error', message: '一次运费不能为空' })
         return
       }
-      if (this.formobj.onceFreight == 0) {
-        this.$message({ showClose: true, type: 'error', message: '因一次运费不能为零，请完善一次运费' })
-        return
-      }
       if (this.formobj.departureDate === '') {
         this.$message({ showClose: true, type: 'error', message: '厂家发车日期不能为空' })
         return
@@ -832,10 +828,6 @@ export default {
         this.$message({ showClose: true, type: 'error', message: '一次运费不能为空' })
         return
       }
-      if (this.formobj.onceFreight == 0) {
-        this.$message({ showClose: true, type: 'error', message: '因一次运费不能为零，请完善一次运费' })
-        return
-      }
       if (this.formobj.priceDate === '' || this.formobj.priceDate === null) {
         this.$message({ showClose: true, type: 'error', message: '厂家入库日期不能为空' })
         return