Merge remote-tracking branch 'origin/master'

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

@@ -577,6 +577,7 @@
         left join base_vehicle_brand bb on bb.sid = bvm.carBrand
         <where>
             ${ew.sqlSegment}
+            and length(bvc.guidedPrice)>0
         </where>
         ORDER BY nowCarNum DESC
     </select>

anrui-scm/anrui-scm-ui/src/views/supplychain/caigoutuiku/caigoutuiku.vue

@@ -274,10 +274,11 @@ export default {
         cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
-        const _this = this
         req.delBySids(this.sids).then(resp => {
-          _this.$message({ type: 'success', message: resp.msg, showClose: true })
-          _this.loadList()
+          if (resp.success) {
+            this.$message({ type: 'success', message: resp.msg, showClose: true })
+          }
+          this.loadList()
         }).catch(e => {
         })
       }).catch(() => {

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

@@ -268,34 +268,29 @@ export default {
           this.list = response.data.records
         }
       })
-      this.listQuery.params.vinNoList = []
     },
     // 查询按钮
     handleFilter() {
+      this.listQuery.current = 1
       this.getList()
     },
     // 重置按钮
     handleReset() {
-      this.listQuery = {
-        current: 1,
-        size: 10,
-        params: {
-          brandSid: '',
-          driveForm: '',
-          emissionStandard: '',
-          fuelType: '',
-          gearboxType: '',
-          modelName: '',
-          power: '',
-          productLine: '',
-          vehicleAlias: '',
-          vehicleType: '',
-          vehicleVersion: '',
-          userSid: '',
-          vinNoList: []
-        },
-        total: 0
-      }
+      this.listQuery.current = 1
+      this.listQuery.size = 5
+      this.listQuery.total = 0
+      this.listQuery.params.brandSid = ''
+      this.listQuery.params.driveForm = ''
+      this.listQuery.params.emissionStandard = ''
+      this.listQuery.params.fuelType = ''
+      this.listQuery.params.gearboxType = ''
+      this.listQuery.params.modelName = ''
+      this.listQuery.params.power = ''
+      this.listQuery.params.productLine = ''
+      this.listQuery.params.vehicleAlias = ''
+      this.listQuery.params.vehicleType = ''
+      this.listQuery.params.vehicleVersion = ''
+      this.listQuery.params.userSid = ''
       this.getList()
     },
     handleSelectionChange(row) {

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

@@ -268,34 +268,29 @@ export default {
           this.list = response.data.records
         }
       })
-      this.listQuery.params.vinNoList = []
     },
     // 查询按钮
     handleFilter() {
+      this.listQuery.current = 1
       this.getList()
     },
     // 重置按钮
     handleReset() {
-      this.listQuery = {
-        current: 1,
-        size: 10,
-        params: {
-          brandSid: '',
-          driveForm: '',
-          emissionStandard: '',
-          fuelType: '',
-          gearboxType: '',
-          modelName: '',
-          power: '',
-          productLine: '',
-          vehicleAlias: '',
-          vehicleType: '',
-          vehicleVersion: '',
-          userSid: '',
-          vinNoList: []
-        },
-        total: 0
-      }
+      this.listQuery.current = 1
+      this.listQuery.size = 5
+      this.listQuery.total = 0
+      this.listQuery.params.brandSid = ''
+      this.listQuery.params.driveForm = ''
+      this.listQuery.params.emissionStandard = ''
+      this.listQuery.params.fuelType = ''
+      this.listQuery.params.gearboxType = ''
+      this.listQuery.params.modelName = ''
+      this.listQuery.params.power = ''
+      this.listQuery.params.productLine = ''
+      this.listQuery.params.vehicleAlias = ''
+      this.listQuery.params.vehicleType = ''
+      this.listQuery.params.vehicleVersion = ''
+      this.listQuery.params.userSid = ''
       this.getList()
     },
     handleSelectionChange(row) {