Merge remote-tracking branch 'origin/master'

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml

@@ -1050,6 +1050,7 @@
                         or bv.vehicleStateValue = '在途'
                         or bv.vehicleStateValue = '调入'
                 )
+        and bv.isDelete = 0
         order by isFictitious, bv.locationName, bv.vinNo desc
     </select>
 
@@ -1069,6 +1070,7 @@
         or bv.vehicleStateValue = '在途'
         or bv.vehicleStateValue = '调入'
         )
+        and bv.isDelete = 0
         <if test="list != null and list.size() != 0">
             and bv.sid in
             <foreach collection="list" item="item" index="index" open="(" separator="," close=")">

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

@@ -730,6 +730,12 @@ export default {
         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 + '的发动机号不能为空' })
+          return
+        }
+      }
       if (this.freightChecked) {
         this.formobj.deductionFreight = 0
       } else {
@@ -804,6 +810,12 @@ export default {
         this.$message({ showClose: true, type: 'error', message: '物流发车日期不能为空' })
         return
       }
+      for (var k = 0; k < this.formobj.vehicleList.length; k++) {
+        if (this.formobj.vehicleList[k].vinNo !== '' && this.formobj.vehicleList[k].engineNo === '') {
+          this.$message({ showClose: true, type: 'error', message: '车架号:' + this.formobj.vehicleList[k].vinNo + '的发动机号不能为空' })
+          return
+        }
+      }
       if (this.freightChecked) {
         this.formobj.deductionFreight = 0
       } else {

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

@@ -747,6 +747,12 @@ export default {
         this.$message({ showClose: true, type: 'error', message: '公司入库日期不能为空' })
         return
       }
+      for (var k = 0; k < this.formobj.vehicleList.length; k++) {
+        if (this.formobj.vehicleList[k].vinNo !== '' && this.formobj.vehicleList[k].engineNo === '') {
+          this.$message({ showClose: true, type: 'error', message: '车架号:' + this.formobj.vehicleList[k].vinNo + '的发动机号不能为空' })
+          return
+        }
+      }
       if (this.freightChecked) {
         this.formobj.deductionFreight = 0
       } else {
@@ -827,6 +833,12 @@ export default {
         this.$message({ showClose: true, type: 'error', message: '物流发车日期不能为空' })
         return
       }
+      for (var k = 0; k < this.formobj.vehicleList.length; k++) {
+        if (this.formobj.vehicleList[k].vinNo !== '' && this.formobj.vehicleList[k].engineNo === '') {
+          this.$message({ showClose: true, type: 'error', message: '车架号:' + this.formobj.vehicleList[k].vinNo + '的发动机号不能为空' })
+          return
+        }
+      }
       if (this.freightChecked) {
         this.formobj.deductionFreight = 0
       } else {