From aa11585ecee2019be8e0e77605bef0ad86b18f75 Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Thu, 27 Oct 2022 13:40:23 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=AE=A2=E6=88=B7?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2--=E6=84=8F=E5=90=91=E8=BD=A6=E5=9E=8B?= =?UTF-8?q?=E3=80=81=E8=B7=9F=E8=BF=9B=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kehuguanli/kehuchaxun/genjinlook.vue | 288 ++++++++++++++++ .../kehuguanli/kehuchaxun/kehuchaxun.vue | 82 ++--- .../kehuchaxun/yixiangchexinglook.vue | 307 ++++++++++++++++++ 3 files changed, 630 insertions(+), 47 deletions(-) create mode 100644 anrui-buscenter/anrui-buscenter-ui/src/views/kehuguanli/kehuchaxun/genjinlook.vue create mode 100644 anrui-buscenter/anrui-buscenter-ui/src/views/kehuguanli/kehuchaxun/yixiangchexinglook.vue diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/kehuguanli/kehuchaxun/genjinlook.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/kehuguanli/kehuchaxun/genjinlook.vue new file mode 100644 index 0000000000..23619320b6 --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-ui/src/views/kehuguanli/kehuchaxun/genjinlook.vue @@ -0,0 +1,288 @@ + + + + diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/kehuguanli/kehuchaxun/kehuchaxun.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/kehuguanli/kehuchaxun/kehuchaxun.vue index 41874d1ba1..5c4d50b89e 100644 --- a/anrui-buscenter/anrui-buscenter-ui/src/views/kehuguanli/kehuchaxun/kehuchaxun.vue +++ b/anrui-buscenter/anrui-buscenter-ui/src/views/kehuguanli/kehuchaxun/kehuchaxun.vue @@ -1,7 +1,7 @@ - + @@ -80,16 +90,14 @@ {{ scope.row.remind_day }} - + - + @@ -99,9 +107,9 @@ - - - + + + @@ -112,8 +120,8 @@ import Pagination from '@/components/pagination' import pageye from '@/components/pagination/pageye' import ButtonBar from '@/components/ButtonBar' import kehudanganInfo from '../../kehuguanli/kehudangan/kehudanganinfo.vue' -import cheliangxuqiu from '../../kehuguanli/cheliangxuqiu/cheliangxuqiu' -import genjinjiluguanli from '@/views/kehuguanli/kehugenjinjilu/genjinjiluguanli.vue' +import yixiangchexinglook from './yixiangchexinglook' +import genjinlook from './genjinlook' export default { name: 'kehuchaxun', @@ -122,8 +130,8 @@ export default { pageye, ButtonBar, kehudanganInfo, - cheliangxuqiu, - genjinjiluguanli + yixiangchexinglook, + genjinlook }, data() { return { @@ -257,13 +265,13 @@ export default { }, // 打开意向车型(车辆需求) handleCheliang(row) { - this.viewState = 6 - this.$refs['openCheXu'].cheLiang(row.sid, this.upLevel, row.name, '01') + this.viewState = 3 + this.$refs['divYiXiang'].cheLiang(row.sid, this.upLevel, row.name) }, // 打开跟进记录 handleJiLu(row) { - this.viewState = 5 - this.$refs['Newpage'].newpage(row.sid, row.name, '02') + this.viewState = 2 + this.$refs['divGenJin'].newpage(row.sid, row.name) }, // 勾选 handleSelectionChange(row) { @@ -278,7 +286,7 @@ export default { this.viewState = 4 this.$refs['Info'].openInfo(row.sid) }, - handleReturn() { + resetState() { this.viewState = 1 }, // ---------------------数据字典---------------------------------------- @@ -318,24 +326,4 @@ export default { } diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/kehuguanli/kehuchaxun/yixiangchexinglook.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/kehuguanli/kehuchaxun/yixiangchexinglook.vue new file mode 100644 index 0000000000..6019d267d9 --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-ui/src/views/kehuguanli/kehuchaxun/yixiangchexinglook.vue @@ -0,0 +1,307 @@ + + + + + From ad9fee82f8e709367925d16e0b76c702b2c364f0 Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Thu, 27 Oct 2022 14:11:12 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E5=AE=8C=E5=96=84=E8=BD=A6=E8=BE=86?= =?UTF-8?q?=E5=8F=B0=E8=B4=A6--=E6=9D=A1=E4=BB=B6=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=A8=A1=E5=9D=97=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cheliangtaizhang/cheliangtaizhang.vue | 449 +++++++++--------- 1 file changed, 214 insertions(+), 235 deletions(-) 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 9ab0e44ca0..5a5ad0b6d3 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 @@ -6,236 +6,216 @@
{{ searchxianshitit }}
- -
-
- -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-
-
- -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-
-
- -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 至 - - - - - - -
-
- + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 至 + + + + + + +
查询 @@ -488,6 +468,7 @@ export default { dialogVisible: false, dialogRemarks: false, index: 0, + activeNames: ['1'], searchxianshitit: '显示查询条件', btndisabled: false, // --按钮菜单------- @@ -1399,10 +1380,8 @@ export default { .addinputw { width: 99%; } -.divStyle { - display: flex; - flex-direction: row; - justify-content: flex-start; - align-items: center; +/deep/ .collapseStyle .el-collapse-item__header { + background-color: #EDF1F7; + font-size: 16px; } From 870e3f5f1c8e99bc132b1994ae505531f0889de7 Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Thu, 27 Oct 2022 17:34:19 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=90=88=E6=A0=BC?= =?UTF-8?q?=E8=AF=81=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hegezhengtaizhang/hegezhengtaizhangAdd.vue | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/anrui-scm/anrui-scm-ui/src/views/cheliang/hegezhengtaizhang/hegezhengtaizhangAdd.vue b/anrui-scm/anrui-scm-ui/src/views/cheliang/hegezhengtaizhang/hegezhengtaizhangAdd.vue index 227f671b7a..49f5a1ed58 100644 --- a/anrui-scm/anrui-scm-ui/src/views/cheliang/hegezhengtaizhang/hegezhengtaizhangAdd.vue +++ b/anrui-scm/anrui-scm-ui/src/views/cheliang/hegezhengtaizhang/hegezhengtaizhangAdd.vue @@ -142,7 +142,7 @@ 车架号： - + @@ -320,7 +320,7 @@
- + @@ -332,8 +332,8 @@ - 确 定 - 取 消 + 确 定 + 取 消
@@ -764,6 +764,10 @@ export default { } }) }, + handleQuXiao() { + this.smRemarks = '' + this.dialogVisible = false + }, // 打开修改 handleUpdate(row) { // this.resetTemp() From 33116c2d4b84492ae2a312cf225da075c5dcbd1f Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Thu, 27 Oct 2022 17:34:40 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basevehiclecertificate/BaseVehicleCertificateRest.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclecertificate/BaseVehicleCertificateRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclecertificate/BaseVehicleCertificateRest.java index eee96c46a7..a5ee88dc24 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclecertificate/BaseVehicleCertificateRest.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclecertificate/BaseVehicleCertificateRest.java @@ -165,7 +165,9 @@ public class BaseVehicleCertificateRest implements BaseVehicleCertificateFeign { remarks = ""; } String smRemarks = dto.getSmRemarks(); - remarks += smRemarks + "由原车架号" + baseVehicleCertificate.getVinNo() + "改成新车架号" + vinNo; + if (!vinNo.equals(vinNo1)){ + remarks += smRemarks + "由原车架号" + baseVehicleCertificate.getVinNo() + "改成新车架号" + vinNo; + } baseVehicleService.updateVinNoByVehSid(vinNo, baseVehicleCertificate.getVehicleSid()); dto.setRemarks(remarks); baseVehicleCertificateService.updateBySid(dto.toMap(), sid); From 28b0f8d095a4f037aa7d162a78966e593b6dfa3d Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Thu, 27 Oct 2022 17:36:05 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=8E=82=E5=95=86?= =?UTF-8?q?=E7=AE=A1=E7=90=86--=E5=8E=82=E5=90=8D=E5=90=8D=E7=A7=B0?= =?UTF-8?q?=E3=80=81=E9=80=9A=E8=AE=AF=E5=9C=B0=E5=9D=80=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E9=95=BF=E5=BA=A6=E4=B8=8D=E5=A4=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../changshang/changshangguanli/changshangguanliAdd.vue | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/anrui-base/anrui-base-ui/src/views/changshang/changshangguanli/changshangguanliAdd.vue b/anrui-base/anrui-base-ui/src/views/changshang/changshangguanli/changshangguanliAdd.vue index a813af754a..e6d2ecf595 100644 --- a/anrui-base/anrui-base-ui/src/views/changshang/changshangguanli/changshangguanliAdd.vue +++ b/anrui-base/anrui-base-ui/src/views/changshang/changshangguanli/changshangguanliAdd.vue @@ -22,8 +22,7 @@ - - + @@ -61,7 +60,7 @@ - +