From 39519141a337dd81b1415990bfc73f6820368c09 Mon Sep 17 00:00:00 2001 From: Zhao Qiqi <1287235164@qq.com> Date: Sat, 6 Aug 2022 17:22:57 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E7=AE=A1=E7=90=86-=E8=BD=A6?= =?UTF-8?q?=E5=9E=8B=E8=AF=A6=E6=83=85=E5=85=AC=E5=85=B1=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E5=90=8E=E6=A1=A5=E5=92=8C=E9=80=9F=E6=AF=94=E7=9A=84=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E5=90=8D=EF=BC=9B=E4=BE=9B=E5=BA=94=E9=93=BE---?= =?UTF-8?q?=E5=A4=96=E9=87=87=E3=80=81=E8=BD=A6=E5=9E=8B=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E3=80=81=E8=BD=A6=E5=9E=8B=E7=AE=A1=E7=90=86=E3=80=81=E8=BD=A6?= =?UTF-8?q?=E8=BE=86=E5=8F=B0=E8=B4=A6=E4=B9=B0=E6=96=AD=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E6=B5=8B=E8=AF=95=E9=97=AE=E9=A2=98=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../vehicleconfiguration.vue | 28 ++- .../vehicleconfiguration.vue | 29 +-- .../baseoutsourcingapplicationAdd.vue | 16 +- .../cheliangtaizhang/cheliangtaizhang.vue | 14 +- .../relation/cheliangtaizhangMai.vue | 9 +- .../relation/chexingguanlianchangyong.vue | 2 +- .../relation/chexingpeizhijiageweihuAdd.vue | 48 +++- .../chexingpeizhi/changyongpeizhi.vue | 32 +++ .../chexingpeizhi/changyongpeizhiAdd.vue | 231 ++++++++++++------ .../chexingpeizhi/changyongpeizhiInfo.vue | 100 ++++---- 10 files changed, 346 insertions(+), 163 deletions(-) diff --git a/anrui-buscenter/anrui-buscenter-ui/src/components/VehicleConfigurationSub/vehicleconfiguration.vue b/anrui-buscenter/anrui-buscenter-ui/src/components/VehicleConfigurationSub/vehicleconfiguration.vue index 7a91a0b66b..17cfba9324 100644 --- a/anrui-buscenter/anrui-buscenter-ui/src/components/VehicleConfigurationSub/vehicleconfiguration.vue +++ b/anrui-buscenter/anrui-buscenter-ui/src/components/VehicleConfigurationSub/vehicleconfiguration.vue @@ -104,7 +104,11 @@ -
后桥速比
+
后桥
+ {{ formobj.rearAxleValue }} + + +
速比
{{ formobj.rearAxleRatio }} @@ -115,16 +119,16 @@
轮毂材质
{{ formobj.hubMaterial }} - +
导流罩
{{ formobj.baffleModel }} - + + +
悬架
{{ formobj.suspension }} - -
座椅
{{ formobj.seat }} @@ -137,16 +141,16 @@
鞍座
{{ formobj.saddle }} - +
轴距
{{ formobj.wheelbase }} - + + +
保险杠
{{ formobj.bumper }} - -
配置包
{{ formobj.configuringBao }} @@ -159,14 +163,14 @@
燃料箱
{{ formobj.fuelTank }} - +
多媒体
{{ formobj.multimedia }} - + - +
更多配置 diff --git a/anrui-scm/anrui-scm-ui/src/components/VehicleConfigurationSub/vehicleconfiguration.vue b/anrui-scm/anrui-scm-ui/src/components/VehicleConfigurationSub/vehicleconfiguration.vue index efdde0933d..6e198b70af 100644 --- a/anrui-scm/anrui-scm-ui/src/components/VehicleConfigurationSub/vehicleconfiguration.vue +++ b/anrui-scm/anrui-scm-ui/src/components/VehicleConfigurationSub/vehicleconfiguration.vue @@ -104,7 +104,11 @@ -
后桥速比
+
后桥
+ {{ formobj.rearAxleValue }} + + +
速比
{{ formobj.rearAxleRatio }} @@ -115,16 +119,17 @@
轮毂材质
{{ formobj.hubMaterial }} - +
导流罩
{{ formobj.baffleModel }} - + + + +
悬架
{{ formobj.suspension }} - -
座椅
{{ formobj.seat }} @@ -137,16 +142,16 @@
鞍座
{{ formobj.saddle }} - +
轴距
{{ formobj.wheelbase }} - + + +
保险杠
{{ formobj.bumper }} - -
配置包
{{ formobj.configuringBao }} @@ -159,14 +164,10 @@
燃料箱
{{ formobj.fuelTank }} - +
多媒体
{{ formobj.multimedia }} - - - -
更多配置 diff --git a/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/baseoutsourcingapplicationAdd.vue b/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/baseoutsourcingapplicationAdd.vue index c1f4af7c74..b72d50a496 100644 --- a/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/baseoutsourcingapplicationAdd.vue +++ b/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/baseoutsourcingapplicationAdd.vue @@ -22,19 +22,19 @@
金额单位：元
- *分公司名称 + 分公司名称 {{ formobj.useOrgName }} - *申请人 + 申请人 {{ formobj.createByName }} - *申请日期 + 申请日期 {{ formobj.applicationDate }} @@ -71,7 +71,7 @@ - *常用配置 + 常用配置 {{ formobj.configName }} @@ -85,7 +85,7 @@ --> - *销售指导价 + 销售指导价 {{ formobj.guidedPrice }} @@ -94,7 +94,7 @@ - *厂家合同价 + 厂家合同价 @@ -397,8 +397,8 @@ export default { modelSid: [{ required: true, message: '车型不能为空', trigger: 'blur' }], // 车型sid configSid: [{ required: true, message: '常用配置不能为空', trigger: 'blur' }], // 常用配置名称 purchasePrice: [{ required: true, message: '采购价格不能为空', trigger: 'blur' }], // 采购价格 - guidedPrice: [{ required: true, message: '销售指导价不能为空', trigger: 'blur' }], // 销售指导价 - manufactorSettlementPrice: [{ required: true, message: '厂家合同价不能为空', trigger: 'blur' }], // 厂家合同价 + // guidedPrice: [{ required: true, message: '销售指导价不能为空', trigger: 'blur' }], // 销售指导价 + // manufactorSettlementPrice: [{ required: true, message: '厂家合同价不能为空', trigger: 'blur' }], // 厂家合同价 num: [{ required: true, message: '台数不能为空', trigger: 'blur' }], // 台数 deposit: [{ required: true, message: '订金不能为空', trigger: 'blur' }], // 订金 // expenseName: [{ required: true, message: '费用名称不能为空', trigger: 'blur' }], // 费用名称 diff --git a/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/cheliangtaizhang.vue b/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/cheliangtaizhang.vue index 821ba12787..5c2b0409d9 100644 --- a/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/cheliangtaizhang.vue +++ b/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/cheliangtaizhang.vue @@ -479,8 +479,15 @@ export default { doMaiduan() { // salesDate settlementStatus if (this.sids.length > 0) { for (var i = 0; i < this.multipleSelection.length; i++) { - console.log(this.multipleSelection[i].salesDate == null || this.multipleSelection[i].salesDate == '') - console.log() + + if (this.multipleSelection[i].settlementStatus == '已买断') { + this.$message({ + showClose: true, + message: '所选车辆存在已买断状态车辆！', + type: 'error' + }) + return + } if ((this.multipleSelection[i].salesDate == null || this.multipleSelection[i].salesDate == '') && this.multipleSelection[i].settlementStatus !== '预买断') { this.$message({ showClose: true, @@ -489,8 +496,7 @@ export default { }) return } - if ((this.multipleSelection[i].salesDate == null || this.multipleSelection[i].salesDate == '') || this.multipleSelection[i].settlementStatus == '预买断') { - console.log('满足条件了？', this.multipleSelection[i].salesDate, this.multipleSelection[i].settlementStatus) + if ((this.multipleSelection[i].salesDate !== null || this.multipleSelection[i].salesDate !== '') || this.multipleSelection[i].settlementStatus == '预买断') { this.viewState = 7 const bb = [] this.multipleSelection.forEach((element) => { diff --git a/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/relation/cheliangtaizhangMai.vue b/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/relation/cheliangtaizhangMai.vue index 3766d735f2..5a047a45b3 100644 --- a/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/relation/cheliangtaizhangMai.vue +++ b/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/relation/cheliangtaizhangMai.vue @@ -25,7 +25,7 @@ - 买断日期 + *买断日期 @@ -38,7 +38,7 @@ - 上传买断证明 + *上传买断证明 @@ -71,7 +71,9 @@ export default { }, dialogFormVisible: false, imgList: [], - rules: {} + rules: { + solidDate: [{ required: true, message: '买断日期不能为空', trigger: 'blur' }], + } } }, methods: { @@ -130,6 +132,7 @@ export default { vinNo: '', commonAppendix: [] } + this.imgList = [] this.$emit('doback') } } diff --git a/anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/relation/chexingguanlianchangyong.vue b/anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/relation/chexingguanlianchangyong.vue index e7fadfb2e3..824eb60044 100644 --- a/anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/relation/chexingguanlianchangyong.vue +++ b/anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/relation/chexingguanlianchangyong.vue @@ -13,7 +13,7 @@
{{ searchxianshitit }}
- + 车型名称 - + {{ temp.vehicleAlias }} + + 内部编码 + + + + + + + 常用配置 - + {{ temp.configName }} @@ -37,19 +47,23 @@ - 厂家结算价(元) + *销售指导价(贷款) - - + + + 元 - 销售指导价(元) + *销售指导价(全款) - - + + + 元 @@ -75,7 +89,10 @@ export default { manufactorSettlementPrice: '', // 厂家结算价 guidedPrice: '' // 销售指导价 }, - rules: {} + rules: { + manufactorSettlementPrice: [{ required: true, message: '销售指导价(贷款)不能为空', trigger: 'blur' }], + guidedPrice: [{ required: true, message: '销售指导价(全款)不能为空', trigger: 'blur' }] + } } }, methods: { @@ -131,7 +148,16 @@ export default { display: flex; justify-content: center; } -.break_word{ - word-wrap:break-word; + +.break_word { + word-wrap: break-word; +} + +.tleftb_chang .el-form-item /deep/ .el-form-item__content { + line-height: 20px; +} + +.addinputw_jia { + margin-right: 10px; } diff --git a/anrui-scm/anrui-scm-ui/src/views/cheliang/chexingpeizhi/changyongpeizhi.vue b/anrui-scm/anrui-scm-ui/src/views/cheliang/chexingpeizhi/changyongpeizhi.vue index b73e861f83..ac1d04cd26 100644 --- a/anrui-scm/anrui-scm-ui/src/views/cheliang/chexingpeizhi/changyongpeizhi.vue +++ b/anrui-scm/anrui-scm-ui/src/views/cheliang/chexingpeizhi/changyongpeizhi.vue @@ -337,6 +337,13 @@ export default { searchxianshitit: '显示查询条件', btndisabled: false, btnList: [ + { + type: 'primary', + size: 'small', + icon: 'plus', + btnKey: 'toQuickAdd', + btnLabel: '快速新增' + }, { type: 'primary', size: 'small', @@ -463,6 +470,9 @@ export default { btnHandle(btnKey) { console.log('XXXXXXXXXXXXXXX ' + btnKey) switch (btnKey) { + case 'toQuickAdd': + this.toQuickAdd() + break case 'toAdd': this.toAdd() break @@ -730,6 +740,28 @@ export default { } this.getList() }, + toQuickAdd() { + if (this.sids.length === 1) { + this.viewState = 2 + const sid = this.sids[0] + this.$refs['divadd'].showQuickAdd(sid) + } else if (this.sids.length > 1) { + this.$notify({ + title: '提示', + message: '不能选中多个车型配置进行快速新增操作!', + type: 'info', + duration: 2000 + }) + } else { + this.$notify({ + title: '提示', + message: '没有选择车型配置进行快速新增操作!', + type: 'error', + duration: 2000 + }) + return + } + }, // 打开添加 toAdd() { this.viewState = 2 diff --git a/anrui-scm/anrui-scm-ui/src/views/cheliang/chexingpeizhi/changyongpeizhiAdd.vue b/anrui-scm/anrui-scm-ui/src/views/cheliang/chexingpeizhi/changyongpeizhiAdd.vue index bf8e10df74..b13025c171 100644 --- a/anrui-scm/anrui-scm-ui/src/views/cheliang/chexingpeizhi/changyongpeizhiAdd.vue +++ b/anrui-scm/anrui-scm-ui/src/views/cheliang/chexingpeizhi/changyongpeizhiAdd.vue @@ -79,25 +79,43 @@
- 后桥速比 + 后桥
- - + + + + + + + + + +
+ 速比 +
+ + - - + +
- 空调 + 空调
- - + + - - + + @@ -113,41 +131,47 @@ - +
- 导流罩 + 导流罩
- - + + - - + + - + + +
- 悬架 + 悬架
- - + + - - + + - -
- 座椅 + 座椅
- - + + - - + + @@ -175,41 +199,47 @@ - +
- 轴距 + 轴距
- - + + - - + + - + + +
- 保险杠 + 保险杠
- - + + - - + + - -
- 配置包 + 配置包
- - + + - - + + @@ -237,30 +267,32 @@ - +
- 多媒体 + 多媒体
- - + + - - + + - -
- -
- - - - - - - - + + + + + + + + + + + + @@ -318,6 +350,8 @@ export default { tireSize_list: [], // 轮胎规格 specification_list: [], // 驾驶室 rearAxleRatio_list: [], // 后桥速比 + rearAxleValue_list: [], // 后桥 + ratioValue_list: [], // 速比 airConditioner_list: [], // 空调 hubMaterial_list: [], // 轮毂材质 baffleModel_list: [], // 导流罩 @@ -358,6 +392,10 @@ export default { packingCase: '', // 货箱（重汽、欧曼） rearAxleRatio: '', // 后桥速比 rearAxleRatioKey: '', // 后桥速比key + rearAxleKey: '', // 后桥key + rearAxleValue: '', // 后桥value + ratioKey: '', // 速比key + ratioValue: '', // 速比value rearViewMirror: '', // 后视镜 rearViewMirrorKey: '', // 后视镜key saddle: '', // 鞍座（陕汽必须的字段） @@ -411,6 +449,20 @@ export default { }, methods: { // ----------------------------------方法-------------------- + showQuickAdd(row){ + this.$nextTick(() => { + this.$refs['dataForm'].clearValidate() + }) + this.stateId = 0 + this.viewTitle = '【新增】常用配置信息' + details(row.sid).then(resp => { + this.temp = resp.data + this.temp.sid = '' + console.log('1122334455',this.temp) + }) + this.getType() + this.getPathSid() + }, showAdd() { this.$nextTick(() => { this.$refs['dataForm'].clearValidate() @@ -496,13 +548,22 @@ export default { console.log('下拉框请求驾驶室', res.data) } }) - // 后桥速比 + // 后桥 + pullDown({ + type: 'rearAxle' + }).then((res) => { + if (res.code === '200') { + this.rearAxleValue_list = res.data + console.log('下拉框请求后桥', res.data) + } + }) + // 速比 原后桥速比 pullDown({ type: 'rearAxleRatio' }).then((res) => { if (res.code === '200') { this.rearAxleRatio_list = res.data - console.log('下拉框请求后桥速比', res.data) + console.log('下拉框请求速比', res.data) } }) // 空调 导流罩 护轮罩 独立热源 多媒体 @@ -776,6 +837,40 @@ export default { this.temp.rearAxleRatioKey = bb.key console.log('name', this.temp.rearAxleRatio) }, + changeRearAxleValue(value){ + console.log('触发下拉框按钮') + let bb = null + this.rearAxleValue_list.forEach((e) => { + if (e.dictValue === value) { + bb = { + type: e.dictType, + name: e.dictValue, + key: e.dictKey, + sid: e.sid + } + } + }) + this.temp.rearAxleValue = bb.name + this.temp.rearAxleKey = bb.key + console.log('name', this.temp.rearAxleValue) + }, + changeRatioValue(value){ + console.log('触发下拉框按钮') + let bb = null + this.ratioValue_list.forEach((e) => { + if (e.dictValue === value) { + bb = { + type: e.dictType, + name: e.dictValue, + key: e.dictKey, + sid: e.sid + } + } + }) + this.temp.ratioValue = bb.name + this.temp.ratioKey = bb.key + console.log('name', this.temp.ratioValue) + }, changeAirConditioner(value) { console.log('触发下拉框按钮') let bb = null diff --git a/anrui-scm/anrui-scm-ui/src/views/cheliang/chexingpeizhi/changyongpeizhiInfo.vue b/anrui-scm/anrui-scm-ui/src/views/cheliang/chexingpeizhi/changyongpeizhiInfo.vue index 051acf7377..6b8d39d7bf 100644 --- a/anrui-scm/anrui-scm-ui/src/views/cheliang/chexingpeizhi/changyongpeizhiInfo.vue +++ b/anrui-scm/anrui-scm-ui/src/views/cheliang/chexingpeizhi/changyongpeizhiInfo.vue @@ -17,7 +17,7 @@ - {{ temp.carColor }} + {{ temp.carColor }} @@ -27,7 +27,7 @@ - {{ temp.slowMachine }} + {{ temp.slowMachine }} @@ -37,7 +37,7 @@ - {{ temp.rearViewMirror }} + {{ temp.rearViewMirror }} @@ -47,7 +47,7 @@ - {{ temp.tireSize }} + {{ temp.tireSize }} @@ -57,19 +57,29 @@ - {{ temp.specification }} + {{ temp.specification }}
- 后桥速比 + 后桥 +
+ + + + {{ temp.rearAxleValue }} + + + +
+ 速比
- {{ temp.rearAxleRatio }} + {{ temp.rearAxleRatio }} @@ -79,7 +89,7 @@ - {{ temp.airConditioner }} + {{ temp.airConditioner }} @@ -89,31 +99,31 @@ - {{ temp.hubMaterial }} + {{ temp.hubMaterial }} - +
导流罩
- {{ temp.baffleModel }} + {{ temp.baffleModel }} - + + +
悬架
- {{ temp.suspension }} + {{ temp.suspension }} - -
座椅 @@ -121,7 +131,7 @@ - {{ temp.seat }} + {{ temp.seat }} @@ -131,7 +141,7 @@ - {{ temp.tireCover }} + {{ temp.tireCover }} @@ -141,31 +151,32 @@ - {{ temp.saddle }} + {{ temp.saddle }} - +
轴距
- {{ temp.wheelbase }} + {{ temp.wheelbase }} - + + + +
保险杠
- {{ temp.bumper }} + {{ temp.bumper }} - -
配置包 @@ -173,7 +184,7 @@ - {{ temp.configuringBao }} + {{ temp.configuringBao }} @@ -183,7 +194,7 @@ - {{ temp.independentSources }} + {{ temp.independentSources }} @@ -193,29 +204,29 @@ - {{ temp.fuelTank }} + {{ temp.fuelTank }} - +
多媒体
- - {{ temp.multimedia }} + + {{ temp.multimedia }} - -
- -
- - - - - - + + + + + + + + + + @@ -225,7 +236,7 @@ - {{ temp.otherConfig }} + {{ temp.otherConfig }} @@ -279,10 +290,15 @@ export default { line-height: 40px !important; font-weight: 600; } + .tleftb { text-align: left; } -.formaddcopy02 .el-row .el-col /deep/ .el-form-item .addinputInfo{ + +.formaddcopy02 .el-row .el-col /deep/ .el-form-item { margin-left: 65px; } +.formaddcopy02 .el-row .el-col .multimedia_sty /deep/ .el-form-item__content{ + line-height: 20px; +}