diff --git a/anrui-base/anrui-base-biz/src/main/resources/ftl/carContract.ftl b/anrui-base/anrui-base-biz/src/main/resources/ftl/carContract.ftl index d1ca34cb1e..04cb8f8bac 100644 --- a/anrui-base/anrui-base-biz/src/main/resources/ftl/carContract.ftl +++ b/anrui-base/anrui-base-biz/src/main/resources/ftl/carContract.ftl @@ -859,7 +859,7 @@ - ${customerName!} + ${customerName!} @@ -970,7 +970,7 @@ - ${createOrgName!} + ${createOrgName!} diff --git a/anrui-base/anrui-base-biz/src/main/resources/ftl/carFin.ftl b/anrui-base/anrui-base-biz/src/main/resources/ftl/carFin.ftl index 5bf366cbed..49683090af 100644 --- a/anrui-base/anrui-base-biz/src/main/resources/ftl/carFin.ftl +++ b/anrui-base/anrui-base-biz/src/main/resources/ftl/carFin.ftl @@ -579,7 +579,7 @@ - ${createOrgName!} + ${createOrgName!} @@ -868,7 +868,7 @@ - ${idNo!} + ${idNo!} diff --git a/anrui-base/anrui-base-biz/src/main/resources/ftl/existingvehicles.ftl b/anrui-base/anrui-base-biz/src/main/resources/ftl/existingvehicles.ftl index a38a59e7b7..3f202213af 100644 --- a/anrui-base/anrui-base-biz/src/main/resources/ftl/existingvehicles.ftl +++ b/anrui-base/anrui-base-biz/src/main/resources/ftl/existingvehicles.ftl @@ -752,7 +752,7 @@ - ${createOrgName!} + ${createOrgName!} @@ -1106,6 +1106,20 @@ + + + + + + + + + + + + + + diff --git a/anrui-base/anrui-base-biz/src/main/resources/ftl/existingvehicles_black.ftl b/anrui-base/anrui-base-biz/src/main/resources/ftl/existingvehicles_black.ftl index f4f3d9f322..5bd01a9b09 100644 --- a/anrui-base/anrui-base-biz/src/main/resources/ftl/existingvehicles_black.ftl +++ b/anrui-base/anrui-base-biz/src/main/resources/ftl/existingvehicles_black.ftl @@ -752,7 +752,7 @@ - ${createOrgName!} + ${createOrgName!} diff --git a/anrui-base/anrui-base-biz/src/main/resources/ftl/invoicApply.ftl b/anrui-base/anrui-base-biz/src/main/resources/ftl/invoicApply.ftl index fb379a71eb..4a7596abc9 100644 --- a/anrui-base/anrui-base-biz/src/main/resources/ftl/invoicApply.ftl +++ b/anrui-base/anrui-base-biz/src/main/resources/ftl/invoicApply.ftl @@ -602,7 +602,7 @@ - ${createOrgName!} + ${createOrgName!} diff --git a/anrui-base/anrui-base-biz/src/main/resources/ftl/moneyFin.ftl b/anrui-base/anrui-base-biz/src/main/resources/ftl/moneyFin.ftl index 86d445bb7e..2a16b019e0 100644 --- a/anrui-base/anrui-base-biz/src/main/resources/ftl/moneyFin.ftl +++ b/anrui-base/anrui-base-biz/src/main/resources/ftl/moneyFin.ftl @@ -640,7 +640,7 @@ - ${createOrgName!} + ${createOrgName!} @@ -1115,7 +1115,7 @@ - ${customerName!} + ${customerName!} @@ -1205,7 +1205,7 @@ - ${idNo!} + ${idNo!} diff --git a/anrui-base/anrui-base-biz/src/main/resources/ftl/orderacar.ftl b/anrui-base/anrui-base-biz/src/main/resources/ftl/orderacar.ftl index 98b11ffd3b..3a422a31f0 100644 --- a/anrui-base/anrui-base-biz/src/main/resources/ftl/orderacar.ftl +++ b/anrui-base/anrui-base-biz/src/main/resources/ftl/orderacar.ftl @@ -868,7 +868,7 @@ - ${createOrgName!} + ${createOrgName!} diff --git a/anrui-base/anrui-base-biz/src/main/resources/ftl/orderacar_black.ftl b/anrui-base/anrui-base-biz/src/main/resources/ftl/orderacar_black.ftl index 4e98afa949..713217839d 100644 --- a/anrui-base/anrui-base-biz/src/main/resources/ftl/orderacar_black.ftl +++ b/anrui-base/anrui-base-biz/src/main/resources/ftl/orderacar_black.ftl @@ -868,7 +868,7 @@ - ${createOrgName!} + ${createOrgName!} diff --git a/anrui-base/anrui-base-biz/src/main/resources/ftl/receiveCar.ftl b/anrui-base/anrui-base-biz/src/main/resources/ftl/receiveCar.ftl index 97b4e899a9..7c5af24711 100644 --- a/anrui-base/anrui-base-biz/src/main/resources/ftl/receiveCar.ftl +++ b/anrui-base/anrui-base-biz/src/main/resources/ftl/receiveCar.ftl @@ -622,7 +622,7 @@ - ${createOrgName!} + ${createOrgName!} 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 49b1c22d75..4b2bfe1502 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 @@ -467,7 +467,7 @@ export default { this.temp.customerSid = resp.data.customerSid this.temp.mobile = resp.data.mobile this.temp.giftsDescription = resp.data.totaldiscount - this.temp.salesAllowance = resp.data.carDiscountPrice + // this.temp.salesAllowance = resp.data.carDiscountPrice this.temp.middleOne = resp.data.intermediaryName this.temp.rebateMoneyOne = resp.data.distributorPrice this.temp.middleTwo = resp.data.intermediaryName2 diff --git a/anrui-scm/anrui-scm-ui/src/views/purchasereceipt/purchasereceipt.vue b/anrui-scm/anrui-scm-ui/src/views/purchasereceipt/purchasereceipt.vue index 3591c55542..8a6ffccb11 100644 --- a/anrui-scm/anrui-scm-ui/src/views/purchasereceipt/purchasereceipt.vue +++ b/anrui-scm/anrui-scm-ui/src/views/purchasereceipt/purchasereceipt.vue @@ -347,11 +347,22 @@ export default { this.$message({ showClose: true, type: 'error', message: '请选择一条记录进行重推操作' }) return } else { + const loading = this.$loading({ + lock: true, + text: '数据推送中', + spinner: 'el-icon-loading', + background: 'rgba(0, 0, 0, 0.7)' + }) req.ctcgykd({ cgrkdSid: this.sids[0] }).then((resp) => { if (resp.success) { + loading.close() this.$message({ showClose: true, type: 'success', message: '推送成功' }) this.getList() + } else { + loading.close() } + }).catch(() => { + loading.close() }) } }, diff --git a/anrui-scm/anrui-scm-ui/src/views/shangzhuang/shangzhuangguanli/shangzhuangAdd.vue b/anrui-scm/anrui-scm-ui/src/views/shangzhuang/shangzhuangguanli/shangzhuangAdd.vue index 6f78a42e48..e6923511e8 100644 --- a/anrui-scm/anrui-scm-ui/src/views/shangzhuang/shangzhuangguanli/shangzhuangAdd.vue +++ b/anrui-scm/anrui-scm-ui/src/views/shangzhuang/shangzhuangguanli/shangzhuangAdd.vue @@ -96,7 +96,10 @@
篷布滑道
- + + + + @@ -110,13 +113,19 @@
自卸液压盖板
- + + + +
底板加热
- + + + + @@ -148,6 +157,9 @@ export default { color_list: [], refitMethod_list: [], plateMaterial_list: [], + tarpaulinSlide_list: [], + selfUnHyCoPl_list: [], + floorHeating_list: [], refitFactory_list: [], formobj: { sid: '', @@ -168,9 +180,12 @@ export default { plateThicknessBottom: '', plateThicknessEdge: '', tarpaulinSlide: '', + tarpaulinSlideKey: '', refrigerator: '', selfUnHyCoPl: '', + selfUnHyCoPlKey: '', floorHeating: '', + floorHeatingKey: '', useOrgSid: '', createOrgSid: '' }, @@ -225,6 +240,21 @@ export default { this.plateMaterial_list = res.data } }) + typeValues({ type: 'sz_pbhd' }).then((res) => { + if (res.success) { + this.tarpaulinSlide_list = res.data + } + }) + typeValues({ type: 'sz_zxyygb' }).then((res) => { + if (res.success) { + this.selfUnHyCoPl_list = res.data + } + }) + typeValues({ type: 'sz_dbjr' }).then((res) => { + if (res.success) { + this.floorHeating_list = res.data + } + }) }, changeInstallName(value) { let bb = null @@ -295,9 +325,69 @@ export default { this.formobj.plateMaterialValue = bb.name this.formobj.plateMaterialKey = bb.key }, + changeTarpaulinSlide(value) { + const choose = this.tarpaulinSlide_list.filter((item) => item.dictKey === value) + if (choose.length > 0) { + this.formobj.tarpaulinSlide = choose[0].dictValue + this.formobj.tarpaulinSlideKey = choose[0].dictKey + } + }, + clearTarpaulinSlide() { + this.formobj.tarpaulinSlide = '' + this.formobj.tarpaulinSlideKey = '' + }, + changeSelfUnHyCoPl(value) { + const choose = this.selfUnHyCoPl_list.filter((item) => item.dictKey === value) + if (choose.length > 0) { + this.formobj.selfUnHyCoPl = choose[0].dictValue + this.formobj.selfUnHyCoPlKey = choose[0].dictKey + } + }, + clearSelfUnHyCoPl() { + this.formobj.selfUnHyCoPl = '' + this.formobj.selfUnHyCoPlKey = '' + }, + changeFloorHeating(value) { + const choose = this.selfUnHyCoPl_list.filter((item) => item.dictKey === value) + if (choose.length > 0) { + this.formobj.floorHeating = choose[0].dictValue + this.formobj.floorHeatingKey = choose[0].dictKey + } + }, + clearFloorHeating() { + this.formobj.floorHeating = '' + this.formobj.floorHeatingKey = '' + }, handleReturn(isreload) { if (isreload === 'true') this.$emit('reloadlist') - this.formobj = {} + this.formobj = { + sid: '', + vehicleTypeKey: '', + vehicleTypeValue: '', + installNameKey: '', + installNameValue: '', + refitMethodKey: '', + refitMethodValue: '', + refitFactory: '', + colorKey: '', + colorValue: '', + wk_long: '', + wk_wide: '', + wk_high: '', + plateMaterialKey: '', + plateMaterialValue: '', + plateThicknessBottom: '', + plateThicknessEdge: '', + tarpaulinSlide: '', + tarpaulinSlideKey: '', + refrigerator: '', + selfUnHyCoPl: '', + selfUnHyCoPlKey: '', + floorHeating: '', + floorHeatingKey: '', + useOrgSid: '', + createOrgSid: '' + } this.$refs['form_obj'].resetFields() this.$emit('doback') },