From d91f895c3dbd4f11afb265eaf46b0cd3f88befd3 Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Wed, 25 May 2022 11:04:09 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=B5=8B=E8=AF=95=E6=96=87?= =?UTF-8?q?=E6=A1=A3=E4=B8=AD=E4=BE=9B=E5=BA=94=E9=93=BE=E7=AE=A1=E7=90=86?= =?UTF-8?q?--=E5=B8=B8=E7=94=A8=E9=85=8D=E7=BD=AE=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E3=80=81=E8=BD=A6=E5=9E=8B=E7=AE=A1=E7=90=86=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/api/cheliang/basemodelconfig.js | 20 +- .../src/api/cheliang/basevehiclemodel.js | 20 +- .../src/views/cheliang/chexing/chexing.vue | 4 +- .../src/views/cheliang/chexing/chexingAdd.vue | 14 +- .../chexing/relation/changyongpeizhi.vue | 6 +- .../relation/chexingguanlianchangyong.vue | 41 +- .../relation/chexingpeizhijiageweihuAdd.vue | 4 +- .../chexingpeizhi/changyongpeizhi.vue | 1393 +++++-------- .../chexingpeizhi/changyongpeizhiAdd.vue | 1793 +++++++---------- .../chexingpeizhi/changyongpeizhiInfo.vue | 211 +- .../ohter/changyongpeizhiInfo.vue | 255 +-- .../ohter/changyongpeizhiRel.vue | 812 ++++---- 12 files changed, 1907 insertions(+), 2666 deletions(-) diff --git a/anrui-scm/anrui-scm-ui/src/api/cheliang/basemodelconfig.js b/anrui-scm/anrui-scm-ui/src/api/cheliang/basemodelconfig.js index d1d69d633f..f3eb906fe5 100644 --- a/anrui-scm/anrui-scm-ui/src/api/cheliang/basemodelconfig.js +++ b/anrui-scm/anrui-scm-ui/src/api/cheliang/basemodelconfig.js @@ -1,11 +1,12 @@ import request from '@/utils/request' import qs from 'qs' +import {data} from "autoprefixer"; // 车型与常用配置关联表条件查询 已改 export function pagerList(data) { return request({ - url: '/base/basevehmodelconfig/listPage', data, - //url: '/base/v1/basemodelconfig/pagerList', data, + url: '/base/basevehmodelconfig/listPage', + data, method: 'post', headers: { 'Content-Type': 'application/json' } }) @@ -14,7 +15,8 @@ export function pagerList(data) { // 常用配置 export function getList(data) { return request({ - url: '/base/v1/basemodelconfig/pagerList', data, + url: '/base/v1/basemodelconfig/pagerList', + data, method: 'post', headers: { 'Content-Type': 'application/json' } }) @@ -30,14 +32,12 @@ export function setRel(data) { } // PC-车型与常用配置解除关联关系 -export function deleteRel(params) { +export function deleteRel(data) { return request({ url: '/base/basevehmodelconfig/checkRelieve', method: 'DELETE', - params: { - modelSid: params.modelSid, - configurationItemsSid: params.configurationItemsSid - } + data: data, + headers: { 'Content-Type': 'application/json' } }) } @@ -60,7 +60,7 @@ export function update(data) { }) } -//添加 +// 添加 export function SaveList(data) { return request({ url: '/base/v1/basemodelconfig/save', // data, @@ -70,7 +70,7 @@ export function SaveList(data) { }) } -//修改 +// 修改 export function Update(data, sid) { return request({ url: '/base/v1/basemodelconfig/update/' + sid, diff --git a/anrui-scm/anrui-scm-ui/src/api/cheliang/basevehiclemodel.js b/anrui-scm/anrui-scm-ui/src/api/cheliang/basevehiclemodel.js index b629b02cd3..a10130f30e 100644 --- a/anrui-scm/anrui-scm-ui/src/api/cheliang/basevehiclemodel.js +++ b/anrui-scm/anrui-scm-ui/src/api/cheliang/basevehiclemodel.js @@ -32,7 +32,7 @@ export function deleteBySids(params) { }) } -//详情回显 已改 +// 详情回显 已改 export function details(data) { return request({ url: '/base/v1/basevehiclemodel/details/' + data, @@ -41,7 +41,7 @@ export function details(data) { }) } -//编辑回显 已改 +// 编辑回显 已改 export function getAll(data) { return request({ url: '/base/v1/basevehiclemodel/getAll/' + data, @@ -50,12 +50,12 @@ export function getAll(data) { }) } -//车型列表导出 +// 车型列表导出 export function basefinbankExportExcel(data) { return request({ url: '/base/v1/basevehiclemodel/exportExcel' + data, method: 'get', - responseType: 'blob',// 表明返回服务器返回的数据类型 + responseType: 'blob', // 表明返回服务器返回的数据类型 data: qs.stringify(data) }) } @@ -106,7 +106,7 @@ export function namesDownBySid(data) { }) } -//根据车型模糊查询下拉框 暂时没有用 +// 根据车型模糊查询下拉框 暂时没有用 export function selectDownPlus(data) { return request({ url: '/base/v1/basevehiclemodel/selectDownPlus', @@ -115,6 +115,16 @@ export function selectDownPlus(data) { }) } +// 常用配置--车型关联 +export function selectVehModelByConfigSid(data) { + return request({ + url: '/base/v1/basevehiclemodel/selectVehModelByConfigSid ', + method: 'post', + data: data, + headers: { 'Content-Type': 'application/json' } + }) +} + // 获取组织(单选组织架构) 暂时没有用 export function getOrg(data) { return request({ diff --git a/anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/chexing.vue b/anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/chexing.vue index 8bedd49d49..833f4f7ac7 100644 --- a/anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/chexing.vue +++ b/anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/chexing.vue @@ -87,7 +87,7 @@
车型信息列表
- +
@@ -135,7 +135,7 @@
- +
diff --git a/anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/chexingAdd.vue b/anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/chexingAdd.vue index 9897dcabe5..132c0279d0 100644 --- a/anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/chexingAdd.vue +++ b/anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/chexingAdd.vue @@ -900,12 +900,14 @@ }, zuzhi0(data) { data.forEach((e) => { - if (e.children.length != 0) { - this.zuzhi0(e.children) - } else { - delete e.children - this.dataArr.push(e) - return + if (e.children) { + if (e.children.length != 0) { + this.zuzhi0(e.children) + } else { + delete e.children + this.dataArr.push(e) + return + } } }) }, diff --git a/anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/relation/changyongpeizhi.vue b/anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/relation/changyongpeizhi.vue index e1fa6f3262..99ddf06dc4 100644 --- a/anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/relation/changyongpeizhi.vue +++ b/anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/relation/changyongpeizhi.vue @@ -110,7 +110,7 @@ - +
@@ -122,7 +122,7 @@
常用配置列表
- +
@@ -227,7 +227,7 @@
- +
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 6f16fbdce4..178f01f123 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 @@ -132,7 +132,7 @@ 价格维护 - + @@ -311,11 +311,6 @@ export default { priceValidity: '', // 价格有效期 isCommonModel: '' // 是否常用车型 }, - // 解除关系所需字段 - checkRelieve_list: { - modelSid: '', - configurationItemsSid: '' - }, sids: [], configurationItemsSid_list: [], // 简述配置sid chesid: '', @@ -356,7 +351,6 @@ export default { }, showGuanlian(row) { this.setRelList.modelSid = row.sid - this.checkRelieve_list.modelSid = row.sid this.chesid = row.sid this.title = row.modelName this.listQuery.params.modelSid = row.sid @@ -558,28 +552,14 @@ export default { if (this.sids.length === 0) { this.$message({ showClose: true, type: 'error', message: '请选择一条记录进行操作' }) return + } else { + console.log('解除关系所需参数', this.configurationItemsSid_list) + deleteRel(this.configurationItemsSid_list).then((response) => { + if (response.success) { + this.getList() + } + }) } - if (this.sids.length > 1) { - this.$message({ showClose: true, type: 'error', message: '只能选择一条记录进行操作' }) - return - } - // if (this.sids.length > 0) { - console.log('解除关系所需参数', this.checkRelieve_list) - this.checkRelieve_list.configurationItemsSid = this.configurationItemsSid_list[0] - deleteRel(this.checkRelieve_list).then((response) => { - if (response.success) { - this.getList() - } - }) - // } else { - // this.$notify({ - // title: '提示', - // message: '没有选择车型配置!!', - // type: 'error', - // duration: 2000 - // }) - // return - // } }, // 返回 handleReturn() { @@ -599,7 +579,10 @@ export default { const bb = [] row.forEach((element) => { aa.push(element.sid) - bb.push(element.configurationItemsSid) + bb.push({ + modelSid: element.modelSid, + configurationItemsSid: element.configurationItemsSid + }) }) this.sids = aa this.configurationItemsSid_list = bb diff --git a/anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/relation/chexingpeizhijiageweihuAdd.vue b/anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/relation/chexingpeizhijiageweihuAdd.vue index 4b0fd8b623..651281d3c1 100644 --- a/anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/relation/chexingpeizhijiageweihuAdd.vue +++ b/anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/relation/chexingpeizhijiageweihuAdd.vue @@ -37,7 +37,7 @@ - 厂家结算价 + 厂家结算价(万元) @@ -45,7 +45,7 @@ - 销售指导价 + 销售指导价(万元) 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 3f0ad22414..c8171dfd6b 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 @@ -1,4 +1,4 @@ - 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 59bd061580..a6ab25c375 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 @@ -3,9 +3,8 @@
常用配置详情
- 下载 - 返回 + 关闭
@@ -13,11 +12,11 @@
常用配置详情
- 车身颜色 + 颜色 - {{temp.carColor}} + {{ temp.carColor }} @@ -25,7 +24,7 @@ - {{temp.slowMachine}} + {{ temp.slowMachine }} @@ -33,15 +32,15 @@ - {{temp.rearViewMirror}} + {{ temp.rearViewMirror }} - 轮胎规格 + 轮胎 - {{temp.tireSize}} + {{ temp.tireSize }} @@ -49,7 +48,7 @@ - {{temp.specification}} + {{ temp.specification }} @@ -59,7 +58,7 @@ - {{temp.rearAxleRatio}} + {{ temp.rearAxleRatio }} @@ -67,7 +66,7 @@ - {{temp.airConditioner}} + {{ temp.airConditioner }} @@ -75,7 +74,7 @@ - {{temp.hubMaterial}} + {{ temp.hubMaterial }} @@ -83,7 +82,7 @@ - {{temp.baffleModel}} + {{ temp.baffleModel }} @@ -91,7 +90,7 @@ - {{temp.suspension}} + {{ temp.suspension }} @@ -101,7 +100,7 @@ - {{temp.seat}} + {{ temp.seat }} @@ -109,7 +108,7 @@ - {{temp.tireCover}} + {{ temp.tireCover }} @@ -117,7 +116,7 @@ - {{temp.saddle}} + {{ temp.saddle }} @@ -125,7 +124,7 @@ - {{temp.wheelbase}} + {{ temp.wheelbase }} @@ -133,7 +132,7 @@ - {{temp.bumper}} + {{ temp.bumper }} @@ -143,7 +142,7 @@ - {{temp.configuringBao}} + {{ temp.configuringBao }} @@ -151,27 +150,31 @@ - {{temp.independentSources}} + {{ temp.independentSources }} - 油箱/气罐 + 燃料箱 - {{temp.fuelTank}} + {{ temp.fuelTank }} - 多媒体 + 多媒体 - {{temp.multimedia}} + {{ temp.multimedia }} - - + + 货箱 + + + {{ temp.packingCase }} + @@ -179,7 +182,7 @@ - {{temp.otherConfig}} + {{ temp.otherConfig }} @@ -189,125 +192,47 @@ diff --git a/anrui-scm/anrui-scm-ui/src/views/cheliang/chexingpeizhi/ohter/changyongpeizhiInfo.vue b/anrui-scm/anrui-scm-ui/src/views/cheliang/chexingpeizhi/ohter/changyongpeizhiInfo.vue index 225cb74b4f..204251e4a6 100644 --- a/anrui-scm/anrui-scm-ui/src/views/cheliang/chexingpeizhi/ohter/changyongpeizhiInfo.vue +++ b/anrui-scm/anrui-scm-ui/src/views/cheliang/chexingpeizhi/ohter/changyongpeizhiInfo.vue @@ -3,7 +3,7 @@
车型详情
- 返回 + 关闭
@@ -14,16 +14,16 @@ 品牌 - - {{temp.carBrand}} + + {{ temp.brandName }} 车型编码 - - {{temp.otherConfig}} + + {{ temp.vehicleTypeCode }} @@ -32,16 +32,16 @@ 功能 - - {{temp.vehicleFunction}} + + {{ temp.vehicleTypeValue }} 系列 - - {{temp.series}} + + {{ temp.productLineValue }} @@ -50,16 +50,16 @@ 驱动 - - {{temp.driveForm}} + + {{ temp.driveFormValue }} 马力 - - {{temp.power}} + + {{ temp.powerValue }} @@ -68,16 +68,16 @@ 版本 - - {{temp.vehicleVersion}} + + {{ temp.vehicleVersionValue }} 燃料 - - {{temp.fuelType}} + + {{ temp.fuelTypeValue }} @@ -86,16 +86,16 @@ 变速箱 - - {{temp.gearboxType}} + + {{ temp.gearboxTypeValue }} 排放标准 - - {{temp.emissionStandard}} + + {{ temp.emissionStandardValue }} @@ -104,16 +104,16 @@ 发动机型号 - - {{temp.engineType}} + + {{ temp.engineTypeValue }} 细分市场 - - {{temp.marketSegments}} + + {{ temp.marketSegments }} @@ -122,35 +122,31 @@ 规格型号 - - {{temp.specifications}} + + {{ temp.specifications }} - 系别 + 系别 - - {{temp.series}} + + {{ temp.departmentValue }} - 内部编码 + 内部编码 - - {{temp.carColor}} + + {{ temp.insideCode }} - 货箱 - - {{temp.slowMachine}} -
@@ -160,116 +156,111 @@
diff --git a/anrui-scm/anrui-scm-ui/src/views/cheliang/chexingpeizhi/ohter/changyongpeizhiRel.vue b/anrui-scm/anrui-scm-ui/src/views/cheliang/chexingpeizhi/ohter/changyongpeizhiRel.vue index 6917e15697..ab66a6c4d5 100644 --- a/anrui-scm/anrui-scm-ui/src/views/cheliang/chexingpeizhi/ohter/changyongpeizhiRel.vue +++ b/anrui-scm/anrui-scm-ui/src/views/cheliang/chexingpeizhi/ohter/changyongpeizhiRel.vue @@ -3,11 +3,10 @@
-
常用配置管理
+
常用配置关联车型
- 解除关系 - 进入车型详情 - 返回 + 解除关联 + 关闭
@@ -15,179 +14,65 @@
-
常用配置列表
- +
关联车型信息列表
+
- +
- +
@@ -246,333 +128,337 @@