Browse Source

Merge remote-tracking branch 'origin/master'

master
God 1 year ago
parent
commit
1a94bc2446
  1. 2
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleDto.java
  2. 3
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleExportQuery.java
  3. 2
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleExportVo.java
  4. 4
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleQuery.java
  5. 3
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleSelectVo.java
  6. 3
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleVo.java
  7. 4
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml
  8. 9
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java
  9. 28
      anrui-buscenter/anrui-buscenter-ui/src/components/publicPage/dingdanInfo.vue
  10. 9
      anrui-scm/anrui-scm-ui/src/api/cheliang/basevehiclecertificate.js
  11. 16
      anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/cheliangtaizhang.vue
  12. 19
      anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/cheliangtaizhangAdd.vue
  13. 12
      anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/cheliangtaizhangInfo.vue
  14. 64
      anrui-scm/anrui-scm-ui/src/views/cheliang/hegezhengtaizhang/hegezhengtaizhangAdd.vue

2
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleDto.java

@ -166,4 +166,6 @@ public class BaseVehicleDto implements Dto {
@ApiModelProperty(value = "组织全路径")
private String orgSidPath;
@ApiModelProperty("厂家开票日期")
private String manDate;
}

3
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleExportQuery.java

@ -59,6 +59,9 @@ public class BaseVehicleExportQuery implements Query {
@ApiModelProperty(value = "买断结束日期")
private String solidEndDate;
private String manDateStart;
private String manDateEnd;
@ApiModelProperty(value = "分公司名称")
private String orgName;
private String userSid;

2
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleExportVo.java

@ -139,6 +139,8 @@ public class BaseVehicleExportVo implements Vo {
@ExportEntityMap(CnName = "买断日期", EnName = "solidDate")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private String solidDate;
@ExportEntityMap(CnName = "厂家开票日期",EnName = "manDate")
private String manDate;
@ExportEntityMap(CnName = "全款销售指导价", EnName = "guidedPrice")
private String guidedPrice;
@ExportEntityMap(CnName = "贷款销售指导价", EnName = "manufactorSettlementPrice")

4
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleQuery.java

@ -64,6 +64,10 @@ public class BaseVehicleQuery implements Query {
private String solidStartDate;
@ApiModelProperty(value = "买断结束日期")
private String solidEndDate;
@ApiModelProperty("厂家开票日期开始")
private String manDateStart;
@ApiModelProperty("厂家开票日期结束")
private String manDateEnd;
@ApiModelProperty(value = "买断状态")
private String settlementStatus;

3
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleSelectVo.java

@ -158,4 +158,7 @@ public class BaseVehicleSelectVo implements Vo {
private String orgPriceDate;
@ApiModelProperty(value = "组织全路径")
private String orgSidPath;
@ApiModelProperty("厂家开票日期")
private String manDate;
}

3
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleVo.java

@ -270,4 +270,7 @@ public class BaseVehicleVo implements Vo {
private String totalDealPrice;
@ApiModelProperty(value = "公司入库日期")
private String orgPriceDate;
@ApiModelProperty("厂家开票日期")
private String manDate;
}

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

@ -128,7 +128,8 @@
bvcf.carModel,
bvm.modelName AS modelNameQuan,
bvm.`brandName` AS vehModelBrandName,
bvc.guidedPrice
bvc.guidedPrice,
bv.manDate
FROM
base_vehicle bv
LEFT JOIN base_vehicle_model bvm
@ -1678,6 +1679,7 @@
bv.priceDate,
bv.solidDate,
bv.salePrice,
bv.manDate,
bv.createOrgSid,
bv.createOrgName,
bv.useOrgName,

9
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java

@ -732,8 +732,13 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
if (StringUtils.isNotBlank(pagerQuery.getConfigName())) {//常用配置名称
qw.eq("bmc.configName", pagerQuery.getConfigName());
}
//厂家开票日期
qw.apply(StringUtils.isNotEmpty(pagerQuery.getManDateStart()), "date_format (bv.manDate,'%Y-%m-%d') >= date_format('" + pagerQuery.getManDateStart() + "','%Y-%m-%d')").
apply(StringUtils.isNotEmpty(pagerQuery.getManDateEnd()), "date_format (bv.manDate,'%Y-%m-%d') <= date_format('" + pagerQuery.getManDateEnd() + "','%Y-%m-%d')"
);
qw.orderByDesc("bv.createOrgSid");
qw.orderByDesc("bv.priceDate");
}
List<BaseVehicleExportVo> baseVehicleExportVoList = baseMapper.selByExcel(qw);
int id = 1;
@ -4133,6 +4138,10 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
qw.apply(StringUtils.isNotEmpty(pricestartDate), "date_format (bv.priceDate,'%Y-%m-%d') >= date_format('" + pricestartDate + "','%Y-%m-%d')").
apply(StringUtils.isNotEmpty(priceEndDate), "date_format (bv.priceDate,'%Y-%m-%d') <= date_format('" + priceEndDate + "','%Y-%m-%d')"
);
//厂家开票日期
qw.apply(StringUtils.isNotEmpty(pagerQuery.getManDateStart()), "date_format (bv.manDate,'%Y-%m-%d') >= date_format('" + pagerQuery.getManDateStart() + "','%Y-%m-%d')").
apply(StringUtils.isNotEmpty(pagerQuery.getManDateEnd()), "date_format (bv.manDate,'%Y-%m-%d') <= date_format('" + pagerQuery.getManDateEnd() + "','%Y-%m-%d')"
);
//销售日期
String salesStartDate = pagerQuery.getSalesStartDate();
String salesEndDate = pagerQuery.getSalesEndDate();

28
anrui-buscenter/anrui-buscenter-ui/src/components/publicPage/dingdanInfo.vue

@ -67,7 +67,10 @@
<el-form-item><span class="addinputInfo">{{ formobj.licensePlateValue }}</span></el-form-item>
</el-col>
</el-row>
<div class="title">车型信息</div>
<div class="title titleOne">
<div>车型信息</div>
<el-button type="primary" size="mini" @click="lookConfig">查看车型详情</el-button>
</div>
<el-row>
<el-col :span="24" class="tlineheightb">
<el-form-item><span class="addinputInfo" style="margin-left: 0px !important;">{{ formobj.busSalesOrderModel.modelConfig }}</span></el-form-item>
@ -304,17 +307,22 @@
</el-form>
</div>
</div>
<!-- 查看金融方案 -->
<financialschemeInfo ref="divInfo" v-show="viewState == 2" @doback="resetState"/>
<!-- 车型配置标准页面 -->
<modelstandardconfiguration v-show="viewState == 3" ref="divModel" @doback="resetState"/>
</div>
</template>
<script>
import { fetchDetailsBySid } from '@/api/salesManagement/orderManagement'
import financialschemeInfo from './financialschemeInfo'
import modelstandardconfiguration from '@/views/chexingchaxun/modelinquire/modelstandardconfiguration'
export default {
name: 'XiaoShouDingDanInfo',
components: {
financialschemeInfo
financialschemeInfo,
modelstandardconfiguration
},
data() {
return {
@ -392,6 +400,15 @@ export default {
this.viewState = 2
this.$refs['divInfo'].showInfo(this.formobj.solutionsDetailsssVo, '03')
},
lookConfig() {
this.viewState = 3
const row = {
modelSid: this.formobj.busSalesOrderModel.modelSid,
configSid: this.formobj.busSalesOrderModel.modelConfigSid,
vehModelConfigSid: this.formobj.busSalesOrderModel.modelSidAndConfigSid
}
this.$refs['divModel'].showInfo(this.formobj.busSalesOrderModel.modelSid, row)
},
//
getSummaries(param) {
const { columns, data } = param
@ -493,6 +510,13 @@ export default {
.addinputInfo {
margin-left: 120px !important;
}
.titleOne {
padding: 7px;
display: flex;
flex-direction: row;
justify-content: space-between;
align-items: center;
}
.jinrong {
padding: 7px;
font-weight: bold;

9
anrui-scm/anrui-scm-ui/src/api/cheliang/basevehiclecertificate.js

@ -30,6 +30,15 @@ export function Update(data) {
})
}
// 修改
export function updateVinNo(data) {
return request({
url: 'base/v1/basevehiclecertificate/updateVinNo',
method: 'post',
params: data
})
}
// 删除
export function deleteBySids(data) {
return request({

16
anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/cheliangtaizhang.vue

@ -249,6 +249,11 @@
<span style="padding: 0 8px"></span>
<el-date-picker value-format="yyyy-MM-dd" v-model="listQuery.params.solidEndDate" clearable type="date" placeholder="结束日期"/>
</el-form-item>
<el-form-item label="厂家开票日期">
<el-date-picker value-format="yyyy-MM-dd" v-model="listQuery.params.manDateStart" clearable type="date" placeholder="开始日期"/>
<span style="padding: 0 8px"></span>
<el-date-picker value-format="yyyy-MM-dd" v-model="listQuery.params.manDateEnd" clearable type="date" placeholder="结束日期"/>
</el-form-item>
</el-collapse-item>
</el-collapse>
</el-form>
@ -305,6 +310,7 @@
<el-table-column prop="arrivalDate" width="130" label="物流到车日期" align="center"/>
<el-table-column prop="returnDate" width="130" label="退库日期" align="center"/>
<el-table-column prop="solidDate" width="130" label="买断日期" align="center"/>
<el-table-column prop="manDate" width="130" label="厂家开票日期" align="center"/>
<el-table-column prop="salesDate" width="130" label="销售日期" align="center"/>
<el-table-column width="140" label="存放地点" align="center">
<template slot-scope="scope">
@ -376,6 +382,7 @@
<el-table-column prop="vehicleTypeCode" width="100" label="车型编码" align="center"/>
<el-table-column prop="configCode" width="100" label="配置编码" align="center"/>
<el-table-column prop="remarks" width="130" label="备注" align="center"/>
<el-table-column prop="warrantyCardNo" width="130" label="保修卡号" align="center"/>
<el-table-column prop="createOrgName" width="130" label="创建组织名称" align="center"/>
<el-table-column prop="vehModelBrandName" width="130" label="品牌" align="center"/>
<el-table-column prop="vehicleTypeValue" width="130" label="功能" align="center"/>
@ -386,7 +393,6 @@
<!-- <el-table-column prop="jacketPrice" width="200" label="上装价格" align="center"/>-->
<!-- <el-table-column prop="refitFactory" width="200" label="上装委改厂" align="center"/>-->
<!--最新版车辆台账表中不包含以下字段暂时放到最后-->
<el-table-column prop="warrantyCardNo" width="130" label="保修卡号" align="center"/>
<el-table-column prop="departmentValue" width="130" label="系别" align="center"/>
</el-table>
</div>
@ -680,7 +686,9 @@ export default {
orgSidPath: '',
otherConfigOne: '',
otherConfigTwo: '',
otherConfigThree: ''
otherConfigThree: '',
manDateStart: '',
manDateEnd: ''
},
current: 1,
size: 5,
@ -1170,7 +1178,9 @@ export default {
orgSidPath: '',
otherConfigOne: '',
otherConfigTwo: '',
otherConfigThree: ''
otherConfigThree: '',
manDateStart: '',
manDateEnd: ''
},
current: 1,
size: 5,

19
anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/cheliangtaizhangAdd.vue

@ -57,7 +57,6 @@
<span>{{ temp.insideCode }}</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
@ -167,8 +166,8 @@
</el-col>
<el-col :span="8">
<el-form-item>
<span slot="label">保修卡号</span>
<el-input v-model="temp.warrantyCardNo" maxlength="125" placeholder="" class="addinputw" clearable/>
<span slot="label">内部编码</span>
<span>{{ temp.manDate }}</span>
</el-form-item>
</el-col>
</el-row>
@ -235,12 +234,18 @@
</el-col>
</el-row>
<el-row>
<el-col :span="16">
<el-col :span="8">
<el-form-item>
<span slot="label">备注</span>
<el-input v-model="temp.remarks" maxlength="125" placeholder="" class="addinputw" clearable/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item>
<span slot="label">保修卡号</span>
<el-input v-model="temp.warrantyCardNo" maxlength="125" placeholder="" class="addinputw" clearable/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item prop="isProblemVeh">
<span slot="label">是否为问题车辆</span>
@ -377,7 +382,8 @@ export default {
supplierName: '',
supplierSid: '',
freight: '',
vehMark: ''
vehMark: '',
manDate: ''
}, //
dialogFormVisible: false, //
dialogStatus: '', //
@ -664,7 +670,8 @@ export default {
supplierName: '',
supplierSid: '',
freight: '',
vehMark: ''
vehMark: '',
manDate: ''
}
this.$emit('doback')
},

12
anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/cheliangtaizhangInfo.vue

@ -141,8 +141,8 @@
</el-col>
<el-col :span="8">
<el-form-item>
<span slot="label">保修卡号</span>
<span>{{ temp.warrantyCardNo }}</span>
<span slot="label">厂家开票日期</span>
<span>{{ temp.manDate }}</span>
</el-form-item>
</el-col>
</el-row>
@ -207,12 +207,18 @@
</el-col>
</el-row>
<el-row>
<el-col :span="16">
<el-col :span="8">
<el-form-item>
<span slot="label">备注</span>
<span>{{ temp.remarks }}</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item>
<span slot="label">保修卡号</span>
<span>{{ temp.warrantyCardNo }}</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item>
<span slot="label">是否为问题车辆</span>

64
anrui-scm/anrui-scm-ui/src/views/cheliang/hegezhengtaizhang/hegezhengtaizhangAdd.vue

@ -4,6 +4,7 @@
<div>{{ viewTitle }}</div>
<div>
<el-button type="primary" size="small" @click="handleCreate()">保存</el-button>
<el-button type="primary" size="small" @click="saveVinNo()">仅保存车架号</el-button>
<el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
</div>
</div>
@ -299,16 +300,16 @@
<el-dialog center :visible.sync="dialogVisible" width="50%" :close-on-click-modal="false">
<el-form class="formadd">
<el-row style="border-top: 1px solid #E0E3EB">
<el-col :span="3" class="tleftb">
<el-col :span="4" class="tleftb">
<span>说明原因</span>
</el-col>
<el-col :span="21">
<el-col :span="20">
<el-form-item><el-input v-model="smRemarks" type="textarea" :rows="3" maxlength="125" placeholder="" class="addinputw addinputw_remarks" clearable/></el-form-item>
</el-col>
</el-row>
</el-form>
<span slot="footer" class="dialog-footer">
<el-button type="primary" size="small" @click="handleCreate"> </el-button>
<el-button type="primary" size="small" @click="handleConfirm"> </el-button>
<el-button size="small" @click="handleQuXiao"> </el-button>
</span>
</el-dialog>
@ -316,9 +317,10 @@
</template>
<script>
import { details, SaveList, Update } from '@/api/cheliang/basevehiclecertificate'
import { details, SaveList, Update, updateVinNo } from '@/api/cheliang/basevehiclecertificate'
import { typeValues } from '@/api/cheliang/dictcommons'
import ImageUpload from '@/components/uploadFile/ManyImageUpload' //
export default {
name: 'PinpaiAdd',
components: { ImageUpload },
@ -329,6 +331,7 @@ export default {
smRemarks: '',
FormLoading: false,
listLoading: false,
vinNodisabled: false,
temp: {
createOrgSid: '',
certificateSituation: '',
@ -462,10 +465,54 @@ export default {
fileChangeIt(files, imgFiles) {
this.temp.certificatePhoto = imgFiles
},
handleConfirm() {
if (this.vinNodisabled) {
this.saveVinNo()
} else {
this.handleCreate()
}
},
handleQuXiao() {
this.smRemarks = ''
this.dialogVisible = false
},
saveVinNo() {
if (this.temp.vinNo !== '' && this.temp.vinNo !== null && this.temp.vinNo !== undefined && this.temp.vinNo.length < 17) {
this.$message({ showClose: true, type: 'error', message: '请检查车架号的长度应为17位' })
return
}
this.temp.smRemarks = this.smRemarks
updateVinNo({ sid: this.temp.sid, vinNo: this.temp.vinNo, smRemarks: this.temp.smRemarks }).then((response) => {
this.FormLoading = false
if (response.success) {
if (response.msg !== '该车架号后八位与车辆台账中车架号不符,请填写说明原因') {
this.dialogFormVisible = false
this.$notify({
title: '提示',
message: '修改成功',
type: 'success',
duration: 2000
})
this.handleReturn('true')
} else {
const tip = response.msg
this.$confirm(tip, '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.smRemarks = ''
this.dialogVisible = true
this.vinNodisabled = true
})
}
}
})
},
//
handleCreate() {
if (this.temp.vinNo !== '' && this.temp.vinNo !== null && this.temp.vinNo !== undefined && this.temp.vinNo.length < 17 && this.temp.vinNo.length !== 8) {
this.$message({ showClose: true, type: 'error', message: '请检查车架号的长度应为8位或17位' })
if (this.temp.vinNo !== '' && this.temp.vinNo !== null && this.temp.vinNo !== undefined && this.temp.vinNo.length < 17) {
this.$message({ showClose: true, type: 'error', message: '请检查车架号的长度应为17位' })
return
}
if (this.temp.certificateStateValue === '正式' && this.temp.carModel === '') {
@ -522,10 +569,6 @@ export default {
}
})
},
handleQuXiao() {
this.smRemarks = ''
this.dialogVisible = false
},
//
handleReturn(isreload) {
if (isreload === 'true') this.$emit('reloadlist')
@ -539,6 +582,7 @@ export default {
} //
this.dialogVisible = false
this.smRemarks = ''
this.vinNodisabled= false
this.$emit('doback')
}
}

Loading…
Cancel
Save