From 848d2bcd1c0c44304198bbf87d7c459d5911ca26 Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Thu, 13 Oct 2022 17:29:17 +0800 Subject: [PATCH 1/6] =?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=BC=80=E6=88=B7=E8=A1=8C=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E9=93=B6=E8=A1=8C=E8=B4=A6=E5=8F=B7=E5=88=97=E3=80=81?= =?UTF-8?q?=E5=8E=82=E5=AE=B6=E5=9B=9E=E6=AC=BE=E9=80=9A=E8=B7=AF=E5=88=97?= =?UTF-8?q?=E3=80=81=E4=BB=98=E6=AC=BE=E9=80=9A=E8=B7=AF=E7=BC=96=E7=A0=81?= =?UTF-8?q?=E5=88=97=E6=94=BE=E5=9C=A8=E5=88=97=E8=A1=A8=E7=9A=84=E5=89=8D?= =?UTF-8?q?=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/changshang/changshangguanli/changshangguanliAdd.vue | 4 ++-- .../src/views/changshang/changshangguanli/changshanglook.vue | 4 ++-- .../changshangguanli/relation/changshangBankInfo.vue | 4 ++-- 3 files changed, 6 insertions(+), 6 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 9658f64161..4ff4db21b5 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 @@ -323,14 +323,14 @@ + + - - diff --git a/anrui-base/anrui-base-ui/src/views/changshang/changshangguanli/changshanglook.vue b/anrui-base/anrui-base-ui/src/views/changshang/changshangguanli/changshanglook.vue index da9740b6e0..c4bdb67854 100644 --- a/anrui-base/anrui-base-ui/src/views/changshang/changshangguanli/changshanglook.vue +++ b/anrui-base/anrui-base-ui/src/views/changshang/changshangguanli/changshanglook.vue @@ -304,14 +304,14 @@ + + - - diff --git a/anrui-base/anrui-base-ui/src/views/changshang/changshangguanli/relation/changshangBankInfo.vue b/anrui-base/anrui-base-ui/src/views/changshang/changshangguanli/relation/changshangBankInfo.vue index 0bfb61a5d7..eedc30f223 100644 --- a/anrui-base/anrui-base-ui/src/views/changshang/changshangguanli/relation/changshangBankInfo.vue +++ b/anrui-base/anrui-base-ui/src/views/changshang/changshangguanli/relation/changshangBankInfo.vue @@ -113,7 +113,7 @@ - 厂家销售通路 + 厂家回款通路 @@ -125,7 +125,7 @@ - 付款通路编码 + 付款通路 From 8e2474c9c11b50fcf6491c0df5092931f4e070d8 Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Thu, 13 Oct 2022 17:44:23 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=AD=98=E6=94=BE?= =?UTF-8?q?=E5=9C=B0=E7=82=B9--=E5=BA=93=E7=AE=A1=E4=BA=BA=E5=91=98?= =?UTF-8?q?=E6=A8=A1=E7=B3=8A=E6=90=9C=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/anruiscm/scmwarehouse/scmwarehouseAdd.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anrui-scm/anrui-scm-ui/src/views/anruiscm/scmwarehouse/scmwarehouseAdd.vue b/anrui-scm/anrui-scm-ui/src/views/anruiscm/scmwarehouse/scmwarehouseAdd.vue index 9edad38c90..c31192b1f1 100644 --- a/anrui-scm/anrui-scm-ui/src/views/anruiscm/scmwarehouse/scmwarehouseAdd.vue +++ b/anrui-scm/anrui-scm-ui/src/views/anruiscm/scmwarehouse/scmwarehouseAdd.vue @@ -70,7 +70,7 @@ - + From db8ba3cb942bc1b5692b996f6e8f535a18d55596 Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Thu, 13 Oct 2022 17:46:43 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E5=AE=8C=E5=96=84=E6=97=A5=E5=B8=B8?= =?UTF-8?q?=E5=B7=A1=E6=A3=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/api/kucunguanli/polling.js | 4 +- .../relation/xunjianbaogaoAdd.vue | 2 +- .../richangxunjian/xunjianresolved.vue | 53 +++++++++++-------- 3 files changed, 35 insertions(+), 24 deletions(-) diff --git a/anrui-scm/anrui-scm-ui/src/api/kucunguanli/polling.js b/anrui-scm/anrui-scm-ui/src/api/kucunguanli/polling.js index 8439dfc343..095cec4116 100644 --- a/anrui-scm/anrui-scm-ui/src/api/kucunguanli/polling.js +++ b/anrui-scm/anrui-scm-ui/src/api/kucunguanli/polling.js @@ -70,9 +70,9 @@ export default { }) }, // 巡检报告(查看巡检报告) - getCarInspectionReport: function(data) { + getCarInspectionReport: function(sid, userSid) { return request({ - url: '/scm/v1/scmvehpatrolinspectionmonth/getCarInspectionReport/' + data, + url: '/scm/v1/scmvehpatrolinspectionmonth/getCarInspectionReport/' + sid + '/' + userSid, method: 'get' }) }, diff --git a/anrui-scm/anrui-scm-ui/src/views/kucunguanli/cheliangweihu/richangxunjian/relation/xunjianbaogaoAdd.vue b/anrui-scm/anrui-scm-ui/src/views/kucunguanli/cheliangweihu/richangxunjian/relation/xunjianbaogaoAdd.vue index 130dfed68d..51b12622ba 100644 --- a/anrui-scm/anrui-scm-ui/src/views/kucunguanli/cheliangweihu/richangxunjian/relation/xunjianbaogaoAdd.vue +++ b/anrui-scm/anrui-scm-ui/src/views/kucunguanli/cheliangweihu/richangxunjian/relation/xunjianbaogaoAdd.vue @@ -80,7 +80,7 @@ export default { }) this.formobj.mainSid = row.sid this.formobj.userSid = window.sessionStorage.getItem('userSid') - req.getCarInspectionReport(row.sid).then((resp) => { + req.getCarInspectionReport(row.sid, window.sessionStorage.getItem('userSid')).then((resp) => { if (resp.success) { this.formobj.totalNumber = resp.data.totalNumber this.formobj.actualNumber = resp.data.actualNumber diff --git a/anrui-scm/anrui-scm-ui/src/views/kucunguanli/cheliangweihu/richangxunjian/xunjianresolved.vue b/anrui-scm/anrui-scm-ui/src/views/kucunguanli/cheliangweihu/richangxunjian/xunjianresolved.vue index 9891bef7c1..2f31728d5d 100644 --- a/anrui-scm/anrui-scm-ui/src/views/kucunguanli/cheliangweihu/richangxunjian/xunjianresolved.vue +++ b/anrui-scm/anrui-scm-ui/src/views/kucunguanli/cheliangweihu/richangxunjian/xunjianresolved.vue @@ -190,28 +190,39 @@ export default { // this.$message({ showClose: true, type: 'error', message: '请填写巡检情况说明' }) // return // } + if (this.formobj.results === '') { + this.$message({ showClose: true, type: 'error', message: '处理结果不能为空' }) + return + } console.log(this.formobj) - this.formobj.carConditionValue = '问题已解决' - this.formobj.carConditionKey = '002' - this.$refs['form_obj'].validate((valid) => { - if (valid) { - this.submitdisabled = true - req.submitInspection(this.formobj).then((resp) => { - this.submitdisabled = false - if (resp.success) { - this.$message({ - showClose: true, - type: 'success', - message: resp.msg - }) - this.handleReturn('true') - } - }).catch(() => { - this.submitdisabled = false - }) - } else { - return false - } + const tip = '请确认问题是否已解决?' + this.$confirm(tip, '提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' + }).then(() => { + this.formobj.carConditionValue = '问题已解决' + this.formobj.carConditionKey = '002' + this.$refs['form_obj'].validate((valid) => { + if (valid) { + this.submitdisabled = true + req.submitInspection(this.formobj).then((resp) => { + this.submitdisabled = false + if (resp.success) { + this.$message({ + showClose: true, + type: 'success', + message: resp.msg + }) + this.handleReturn('true') + } + }).catch(() => { + this.submitdisabled = false + }) + } else { + return false + } + }) }) }, // 返回(===既判断) From 530d0b62bd9c3bfed156781cececb977e7d134f7 Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Thu, 13 Oct 2022 17:48:52 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E5=AE=8C=E5=96=84=E8=BD=A6=E8=BE=86?= =?UTF-8?q?=E9=94=80=E5=94=AE=E7=AE=A1=E7=90=86--=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E5=88=86=E5=85=AC=E5=8F=B8sid=E5=88=A4=E6=96=AD=E6=9D=A1?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cheliangxiaoshou/cheliangxiaoshouguanli.vue | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangxiaoshou/cheliangxiaoshouguanli.vue b/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangxiaoshou/cheliangxiaoshouguanli.vue index b8cd2e2ce6..538d171678 100644 --- a/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangxiaoshou/cheliangxiaoshouguanli.vue +++ b/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangxiaoshou/cheliangxiaoshouguanli.vue @@ -152,7 +152,7 @@ import { pagerList } from '@/api/cheliang/cheliangxiaoshou' import Pagination from '@/components/pagination' import pageye from '@/components/pagination/pageye' import ButtonBar from '@/components/ButtonBar' -import { typeValues } from '@/api/cheliang/dictcommons' +import { typeValues, getPathSidByUserSid } from '@/api/cheliang/dictcommons' import chelaingxiaoshouInfo from './chelaingxiaoshouInfo' export default { @@ -191,7 +191,8 @@ export default { saleDateEnd: '', saleDateStart: '', typeKey: '', - vinNo: '' + vinNo: '', + createOrgSid: '' }, current: 1, size: 5, @@ -202,7 +203,6 @@ export default { }, created() { // 加载列表 - this.getList() this.init() }, mounted() { @@ -215,6 +215,12 @@ export default { this.payType_list = res.data } }) + getPathSidByUserSid({ userSid: window.sessionStorage.getItem('userSid') }).then((resp) => { + if (resp.success) { + this.listQuery.params.createOrgSid = resp.data + this.getList() + } + }) }, // 搜索条件效果 clicksearchShow() { @@ -269,13 +275,14 @@ export default { saleDateEnd: '', saleDateStart: '', typeKey: '', - vinNo: '' + vinNo: '', + createOrgSid: '' }, current: 1, size: 5, total: 0 } - this.getList() + this.init() }, toInfo(row) { this.viewState = 2 From cb767dd92ce0c65860b3dda346b4b858242e213f Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Thu, 13 Oct 2022 17:49:21 +0800 Subject: [PATCH 5/6] =?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 --- .../yxt/anrui/base/api/basevehicleout/BaseVehicleOut.java | 2 ++ .../base/api/basevehicleout/BaseVehicleOutDetailsVo.java | 2 ++ .../anrui/base/api/basevehicleout/BaseVehicleOutDto.java | 2 ++ .../base/api/basevehicleout/BaseVehicleOutQuery.java | 2 ++ .../anrui/base/api/basevehicleout/BaseVehicleOutVo.java | 3 ++- .../basevehmodelconfig/BaseVehmodelConfigVehicleVos.java | 6 ++++++ .../base/api/basevehmodelconfig/BaseVehmodelConfigVo.java | 2 ++ .../base/biz/basemanufacturer/BaseManufacturerMapper.xml | 1 + .../biz/basemanufacturer/BaseManufacturerService.java | 6 ++++-- .../yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml | 6 ++++-- .../yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java | 6 +++--- .../base/biz/basevehicleout/BaseVehicleOutMapper.xml | 6 ++++-- .../base/biz/basevehicleout/BaseVehicleOutService.java | 1 + .../biz/basevehmodelconfig/BaseVehmodelConfigMapper.xml | 8 ++++++-- .../biz/basevehmodelconfig/BaseVehmodelConfigService.java | 4 ++-- .../ScmVehiclePatrolinspectionService.java | 1 + 16 files changed, 44 insertions(+), 14 deletions(-) diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOut.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOut.java index 2bf18613a5..fa5bf16f60 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOut.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOut.java @@ -79,4 +79,6 @@ public class BaseVehicleOut extends BaseEntity { private String middleCodeOne; @ApiModelProperty("中介人2编码") private String middleCodeTwo; + @ApiModelProperty("创建组织sid") + private String createOrgSid; // 创建组织sid } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutDetailsVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutDetailsVo.java index f68c39411b..e119f079c3 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutDetailsVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutDetailsVo.java @@ -58,4 +58,6 @@ public class BaseVehicleOutDetailsVo implements Vo { @ApiModelProperty("备注") private String remarks; private String saleDate; + @ApiModelProperty("创建组织sid") + private String createOrgSid; // 创建组织sid } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutDto.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutDto.java index a54f1640d7..11f478c287 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutDto.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutDto.java @@ -67,4 +67,6 @@ public class BaseVehicleOutDto implements Dto { private String middleCodeOne; @ApiModelProperty("中介人2编码") private String middleCodeTwo; + @ApiModelProperty("创建组织sid") + private String createOrgSid; // 创建组织sid } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutQuery.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutQuery.java index 995a15cd8a..d6a19f325b 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutQuery.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutQuery.java @@ -29,4 +29,6 @@ public class BaseVehicleOutQuery implements Query { private String customerName; @ApiModelProperty("合同编号") private String concatNo; + @ApiModelProperty("创建组织sid") + private String createOrgSid; // 创建组织sid } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutVo.java index 4f1253e432..f1468ec5c4 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutVo.java @@ -72,5 +72,6 @@ public class BaseVehicleOutVo implements Vo { @ApiModelProperty("返利金额2") private String rebateMoneyTwo; - + @ApiModelProperty("创建组织sid") + private String createOrgSid; // 创建组织sid } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigVehicleVos.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigVehicleVos.java index eda7c81eb5..da841fd237 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigVehicleVos.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigVehicleVos.java @@ -28,4 +28,10 @@ public class BaseVehmodelConfigVehicleVos implements Vo { private String configSid; @ApiModelProperty(value = "内部编码") private String insideCode; + @ApiModelProperty(value = "车型编码") + private String vehicleTypeCode; + @ApiModelProperty(value = "配置编码") + private String configCode; + @ApiModelProperty(value = "更多配置") + private String otherConfig; } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigVo.java index 8298fb7590..68fd114841 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigVo.java @@ -179,4 +179,6 @@ public class BaseVehmodelConfigVo implements Vo { private String remarks; @ApiModelProperty(value = "内部编码") private String insideCode; + @ApiModelProperty(value = "配置编码") + private String configCode; } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerMapper.xml index cb90de67b3..8fc9213100 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerMapper.xml @@ -20,6 +20,7 @@ bm.manufacturerCode FROM base_manufacturer bm ${ew.customSqlSegment} + AND bm.createOrg IS NULL OR bm.createOrg = "" diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java index bbb42d06d5..b944555371 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java @@ -228,6 +228,7 @@ public class BaseVehicleOutService extends MybatisBaseService pagging = baseMapper.selectPageVo(page, qw); PagerVo p = PagerUtil.pageToVo(pagging, null); diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigMapper.xml index b91fec524e..776dd522be 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigMapper.xml @@ -52,7 +52,8 @@ bmc.bumper, bmc.configName, - bvm.insideCode + bvm.insideCode, + bmc.configCode FROM base_vehmodel_config bvc LEFT JOIN base_vehicle_model bvm ON bvc.modelSid = bvm.sid @@ -339,7 +340,10 @@ bmc.sid as configSid, bvc.`guidedPrice`, bvc.manufactorSettlementPrice, - bvc.insideCode + bvc.insideCode, + bvm.vehicleTypeCode, + bmc.configCode, + bmc.otherConfig FROM base_vehmodel_config bvc LEFT JOIN base_vehicle_model bvm diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigService.java index 44af67f3c5..d82c5001f3 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigService.java @@ -682,10 +682,10 @@ public class BaseVehmodelConfigService extends MybatisBaseService wrapper.like("bvm.vehicleAlias", query.getVehicleAlias()).or().like("bvm.vehicleTypeCode", query.getVehicleAlias())); } if (StringUtils.isNotBlank(query.getConfigName())) { - qw.like("bmc.configName", query.getConfigName()); + qw.and(wrapper -> wrapper.like("bmc.configName", query.getConfigName()).or().like("bmc.configCode", query.getConfigName())); } qw.eq("bvm.isDelete", 0); qw.eq("bmc.isDelete", 0); diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionService.java index 79d3a1c959..48a4e9091e 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionService.java @@ -120,6 +120,7 @@ public class ScmVehiclePatrolinspectionService extends MybatisBaseService qw = new QueryWrapper<>(); qw.eq("createOrgSid", query.getCreateOrgSid()); + qw.eq("isDelete",0); if (StringUtils.isNotBlank(query.getVinNo())) { qw.like("vinNo", query.getVinNo()); } From 6b4a00d375b7b0f8777846b7c327e080ac132e91 Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Thu, 13 Oct 2022 17:50:01 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E5=AE=8C=E5=96=84=E8=BD=A6=E8=BE=86?= =?UTF-8?q?=E5=8F=B0=E8=B4=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/api/cheliang/basevehicle.js | 19 + .../cheliangtaizhang/cheliangtaizhang.vue | 673 ++++++++- .../cheliangtaizhang/cheliangtaizhangAdd.vue | 1245 +++++++---------- .../cheliangtaizhang/cheliangtaizhangInfo.vue | 240 ++-- .../relation/cheliangtaizhangChu.vue | 23 +- .../relation/chexingguanlianchangyong.vue | 5 + 6 files changed, 1292 insertions(+), 913 deletions(-) diff --git a/anrui-scm/anrui-scm-ui/src/api/cheliang/basevehicle.js b/anrui-scm/anrui-scm-ui/src/api/cheliang/basevehicle.js index 0e96540f7e..8ffacd3964 100644 --- a/anrui-scm/anrui-scm-ui/src/api/cheliang/basevehicle.js +++ b/anrui-scm/anrui-scm-ui/src/api/cheliang/basevehicle.js @@ -190,3 +190,22 @@ export function updateVehRemarks(data) { }) } +// 获取厂家销售通路 +export function actualList(data) { + return request({ + url: '/base/v1/basemanufacturer/selectNameByOrg', + method: 'get', + params: data + }) +} + +// 条件查询 +export function selVehModelByUseOrgSidAll(data) { + return request({ + url: '/base/basevehmodelconfig/selVehModelByUseOrgSidAll', + data: data, + method: 'post', + headers: { 'Content-Type': 'application/json' } + }) +} + 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 3fd4ca00ef..2d77a3f3b3 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,28 +6,230 @@
{{ searchxianshitit }} diff --git a/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/relation/cheliangtaizhangChu.vue b/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/relation/cheliangtaizhangChu.vue index 21e636df9b..f29663f397 100644 --- a/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/relation/cheliangtaizhangChu.vue +++ b/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/relation/cheliangtaizhangChu.vue @@ -229,6 +229,7 @@ export default { staffSid: '', // 销售专员sid type: '', // 出库类型 typeKey: '', // 出库类型Key + createOrgSid: '' }, payType_list: [], // 出库类型 org_list: [], // 销售部门 @@ -318,19 +319,27 @@ export default { this.temp.middleTwoSid = choosetItem[0].middleSid this.temp.middleCodeTwo = choosetItem[0].middleCode }, - showChu(multipleSelection) { + showChu(multipleSelection, createOrgSid) { this.temp.vinNo = multipleSelection[0].vinNo this.temp.vinSid = multipleSelection[0].sid + this.temp.createOrgSid = createOrgSid this.getType() }, // 保存 handleCreate() { - vehicleOutLibrary(this.temp).then((response) => { - if (response.success) { - this.$message({ showClose: true, type: 'success', message: '保存成功' }) - this.handleReturn('true') - } - }).catch(e => { + const tip = '请确认是否临时出库?' + this.$confirm(tip, '提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' + }).then(() => { + vehicleOutLibrary(this.temp).then((response) => { + if (response.success) { + this.$message({ showClose: true, type: 'success', message: '保存成功' }) + this.handleReturn('true') + } + }).catch(e => { + }) }) }, // 返回 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 3cdcbf7078..128cdc3776 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 @@ -147,6 +147,11 @@ {{ scope.row.manufactorSettlementPrice }} + + +