From 5ec3cf3c31b52dd5fbbe87d30b11131eacfd9087 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Thu, 28 Jul 2022 12:06:15 +0800 Subject: [PATCH 1/4] =?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 --- .../anrui/base/biz/busvehicleorder/BusVehicleOrderMapper.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleorder/BusVehicleOrderMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleorder/BusVehicleOrderMapper.xml index f5c9bcad78..0129e99f4c 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleorder/BusVehicleOrderMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleorder/BusVehicleOrderMapper.xml @@ -182,7 +182,8 @@ bvm.vehicleName modelName, bva.applicationCode, bvo.remarks, - bvo.lockingNum + bvo.lockingNum, + bvo.subscriptionDate FROM bus_vehicle_order bvo LEFT JOIN bus_vehicle_apply_detail bvm ON bvo.purchaseApplyMediumModelSid = bvm.sid LEFT JOIN bus_vehicle_apply bva ON bvo.purchaseRequisitionSid = bva.sid From 8fa2bbfe892c13a4814a24bfe65364fab802b7cb Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Thu, 28 Jul 2022 13:35:05 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=AE=8C=E5=96=84=E6=8E=92=E4=BA=A7?= =?UTF-8?q?=E7=94=B3=E8=AF=B7=E4=B8=8A=E8=A3=85=E9=80=89=E6=8B=A9=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cheliangpaichan/cheliangpaichanAdd.vue | 48 +++- .../cheliangpaichan/cheliangpaichanInfo.vue | 14 +- .../shangzhuangpeizhiAdd.vue | 154 +++++++++++ .../shangzhuangpeizhiInfo.vue | 137 ++++++++++ .../cheliangpaichanDaiBanInfo.vue | 23 +- .../paichanguanli/cheliangpaichanEdit.vue | 74 +++++- .../cheliangpaichanYiBanInfo.vue | 25 +- .../shangzhuangpeizhiAdd.vue | 157 +++++++++++ .../shangzhuangpeizhiInfo.vue | 140 ++++++++++ .../shangzhuangselect/shuangzhuangpeizhi.vue | 249 ++++++++++++++++++ 10 files changed, 999 insertions(+), 22 deletions(-) create mode 100644 anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/shangzhuangselect/shangzhuangpeizhiAdd.vue create mode 100644 anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/shangzhuangselect/shangzhuangpeizhiInfo.vue create mode 100644 anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/shangzhuangselect/shuangzhuangpeizhi.vue diff --git a/anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangpaichan/cheliangpaichanAdd.vue b/anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangpaichan/cheliangpaichanAdd.vue index 230d56f040..efead194fa 100644 --- a/anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangpaichan/cheliangpaichanAdd.vue +++ b/anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangpaichan/cheliangpaichanAdd.vue @@ -106,7 +106,12 @@ + + + @@ -117,6 +122,7 @@ + @@ -124,13 +130,15 @@ import req from '@/api/supplychain/busvehicleapply' import configuration from './chexingbyconfiguration' import shangzhuangpeizhi from '../../../views/supplychain/cheliangpaichan/shangzhuangselect/shangzhuangpeizhi' +import shangzhuangpeizhiAdd from '../../../views/supplychain/cheliangpaichan/shangzhuangselect/shangzhuangpeizhiAdd' import { getPathSidByUserSid, fetchBySid } from '@/api/cheliang/dictcommons' export default { name: 'cheliangpaichanAdd', components: { configuration, - shangzhuangpeizhi + shangzhuangpeizhi, + shangzhuangpeizhiAdd }, data() { return { @@ -266,6 +274,7 @@ export default { insideCode: e.insideCode, // 内部编码 vehicleName: e.vehicleAlias, vehicleSid: e.modelSid, + guidePrice: '', busVehicleApplySz: { color: '', coverPlate: '', @@ -277,10 +286,12 @@ export default { refitFactory: '', refitMethod: '', refrigerator: '', - sid: '', + szSid: '', tarpaulinSlide: '', topName: '', - vehicleFunction: '' + vehicleFunction: '', + costPrice: '', + guidePrice: '' } }) if (e.insideCode) { @@ -349,11 +360,40 @@ export default { }, backPeizhi(val, index) { console.log(val, index) + this.viewState = 1 this.formobj.busVehicleApplyDetailList[index].busVehicleApplySz.color = val.colorValue this.formobj.busVehicleApplyDetailList[index].busVehicleApplySz.coverPlate = val.selfUnHyCoPl this.formobj.busVehicleApplyDetailList[index].busVehicleApplySz.floorHeating = val.floorHeating this.formobj.busVehicleApplyDetailList[index].busVehicleApplySz.otherConfig = val.moreConfig this.formobj.busVehicleApplyDetailList[index].busVehicleApplySz.overallDimension = val.wk + this.formobj.busVehicleApplyDetailList[index].busVehicleApplySz.plateMaterial = val.plateMaterialValue + this.formobj.busVehicleApplyDetailList[index].busVehicleApplySz.plateThickness = val.plateThickness + this.formobj.busVehicleApplyDetailList[index].busVehicleApplySz.refitFactory = val.refitFactory + this.formobj.busVehicleApplyDetailList[index].busVehicleApplySz.refitMethod = val.refitMethodValue + this.formobj.busVehicleApplyDetailList[index].busVehicleApplySz.refrigerator = val.refrigerator + this.formobj.busVehicleApplyDetailList[index].busVehicleApplySz.szSid = val.sid + this.formobj.busVehicleApplyDetailList[index].busVehicleApplySz.tarpaulinSlide = val.tarpaulinSlide + this.formobj.busVehicleApplyDetailList[index].busVehicleApplySz.topName = val.installNameValue + this.formobj.busVehicleApplyDetailList[index].busVehicleApplySz.vehicleFunction = val.vehicleTypeValue + this.formobj.busVehicleApplyDetailList[index].busVehicleApplySz.costPrice = '' + this.formobj.busVehicleApplyDetailList[index].busVehicleApplySz.guidePrice = '' + }, + handleUpdate(row) { + if (row !== null) { + this.viewState = 4 + this.$refs['divShangzhuangpeizhiAdd'].showInfo(row) + } else { + this.$message({ showClose: true, type: 'success', message: '请先选择上装信息' }) + } + }, + backPeizhiAdd(value) { + this.viewState = 1 + for (var i = 0; i < this.formobj.busVehicleApplyDetailList.length; i++) { + if (this.formobj.busVehicleApplyDetailList[i].busVehicleApplySz.szSid === value.szSid) { + this.formobj.busVehicleApplyDetailList[i].busVehicleApplySz = value + this.formobj.busVehicleApplyDetailList[i].guidePrice = value.guidePrice + } + } }, // 返回（===既判断） handleReturn(isreload) { diff --git a/anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangpaichan/cheliangpaichanInfo.vue b/anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangpaichan/cheliangpaichanInfo.vue index 32987d2050..12f9267dda 100644 --- a/anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangpaichan/cheliangpaichanInfo.vue +++ b/anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangpaichan/cheliangpaichanInfo.vue @@ -1,6 +1,6 @@ + + diff --git a/anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangpaichan/shangzhuangselect/shangzhuangpeizhiInfo.vue b/anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangpaichan/shangzhuangselect/shangzhuangpeizhiInfo.vue index e69de29bb2..2fa72a630d 100644 --- a/anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangpaichan/shangzhuangselect/shangzhuangpeizhiInfo.vue +++ b/anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangpaichan/shangzhuangselect/shangzhuangpeizhiInfo.vue @@ -0,0 +1,137 @@ + + + + + diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanDaiBanInfo.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanDaiBanInfo.vue index ad18d76501..76d2b574f8 100644 --- a/anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanDaiBanInfo.vue +++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanDaiBanInfo.vue @@ -1,6 +1,6 @@ + + diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/shangzhuangselect/shangzhuangpeizhiInfo.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/shangzhuangselect/shangzhuangpeizhiInfo.vue new file mode 100644 index 0000000000..8de5de807e --- /dev/null +++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/shangzhuangselect/shangzhuangpeizhiInfo.vue @@ -0,0 +1,140 @@ + + + + + diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/shangzhuangselect/shuangzhuangpeizhi.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/shangzhuangselect/shuangzhuangpeizhi.vue new file mode 100644 index 0000000000..787a1ecd16 --- /dev/null +++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/shangzhuangselect/shuangzhuangpeizhi.vue @@ -0,0 +1,249 @@ + + + + From be397e3929d394578d090f1748d6b23c1166d5a4 Mon Sep 17 00:00:00 2001 From: Zhao Qiqi <1287235164@qq.com> Date: Thu, 28 Jul 2022 13:52:02 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E9=93=BE---=E5=B8=B8?= =?UTF-8?q?=E7=94=A8=E9=85=8D=E7=BD=AE=E6=96=B0=E5=A2=9E=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E7=9A=84=E6=A0=B7=E5=BC=8F=E7=9A=84=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- anrui-scm/anrui-scm-ui/src/styles/index.scss | 2 +- .../chexingpeizhi/changyongpeizhiAdd.vue | 5 +- .../yancheguanli/vehiclechecklist.vue | 2 +- .../yancheguanli/yancheguanliAdd.vue | 225 +++++++++--------- .../yancheguanli/yancheguanliInfo.vue | 22 +- 5 files changed, 144 insertions(+), 112 deletions(-) diff --git a/anrui-scm/anrui-scm-ui/src/styles/index.scss b/anrui-scm/anrui-scm-ui/src/styles/index.scss index 775bbaf53f..5da55039b4 100644 --- a/anrui-scm/anrui-scm-ui/src/styles/index.scss +++ b/anrui-scm/anrui-scm-ui/src/styles/index.scss @@ -305,7 +305,7 @@ div:focus { line-height: 42px; .addinputw { //padding: 5px 0; - width: 65%; + width: calc(100% - 70px); margin-left: 80px; line-height: 42px; } 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 81569c81af..b61fdc5a37 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 @@ -1049,11 +1049,10 @@ export default { line-height: 40px !important; font-weight: 600; } -.addinputw02{ - width: 52% !important; +.formaddcopy02 .el-row /deep/ .el-col { + padding:0 8px; } .formaddcopy02 .el-row .el-col /deep/ .el-form-item .addinputw{ - width: 60%; margin-left: 65px; } .formaddcopy02 .el-row .el-col /deep/ .el-form-item .addinputwTwo{ diff --git a/anrui-scm/anrui-scm-ui/src/views/supplychain/yancheguanli/vehiclechecklist.vue b/anrui-scm/anrui-scm-ui/src/views/supplychain/yancheguanli/vehiclechecklist.vue index 1bebd6befa..cb01644b07 100644 --- a/anrui-scm/anrui-scm-ui/src/views/supplychain/yancheguanli/vehiclechecklist.vue +++ b/anrui-scm/anrui-scm-ui/src/views/supplychain/yancheguanli/vehiclechecklist.vue @@ -80,7 +80,7 @@ export default { handleReturn() { this.$emit('doback') }, - showEdit() { + showCheck() { getVehinspectItemInfo('a595bd5b-1df1-4465-916d-285d98af2039').then((resp) => { if (resp.success) { this.tableData = resp.data diff --git a/anrui-scm/anrui-scm-ui/src/views/supplychain/yancheguanli/yancheguanliAdd.vue b/anrui-scm/anrui-scm-ui/src/views/supplychain/yancheguanli/yancheguanliAdd.vue index 0327c2f0dc..ccbf5e8d97 100644 --- a/anrui-scm/anrui-scm-ui/src/views/supplychain/yancheguanli/yancheguanliAdd.vue +++ b/anrui-scm/anrui-scm-ui/src/views/supplychain/yancheguanli/yancheguanliAdd.vue @@ -1,121 +1,124 @@ @@ -124,15 +127,18 @@ import { getPathSidByUserSid } from '@/api/cheliang/dictcommons.js' import { getCarInspectedInfo, saveCarInspectedInfo, submitCarInspectedInfo } from '@/api/supplychain/yancheguanli' import { getUseOrgByUserSid } from '@/api/cheliang/basevehicle' import Upload from '@/components/uploadFile/uploadImg.vue' +import vehiclechecklist from '@/views/supplychain/yancheguanli/vehiclechecklist' export default { name: 'yancheguanliAdd', components: { - Upload + Upload, + vehiclechecklist }, data() { return { viewTitle: '', + isCheck:false, // --按钮菜单------- sid: '', datas: null, @@ -248,6 +254,13 @@ export default { // this.getZuZhi() // this.getUseOrg() // }, + handleChecklist(){ + this.isCheck = false + this.$refs['divchecklist'].showCheck() + }, + resetState(){ + this.isCheck = true + }, // 获得使用组织 getUseOrg() { const userSid = window.sessionStorage.getItem('userSid') diff --git a/anrui-scm/anrui-scm-ui/src/views/supplychain/yancheguanli/yancheguanliInfo.vue b/anrui-scm/anrui-scm-ui/src/views/supplychain/yancheguanli/yancheguanliInfo.vue index af08748401..d82a497009 100644 --- a/anrui-scm/anrui-scm-ui/src/views/supplychain/yancheguanli/yancheguanliInfo.vue +++ b/anrui-scm/anrui-scm-ui/src/views/supplychain/yancheguanli/yancheguanliInfo.vue @@ -1,6 +1,6 @@