From 7adaf930e0fff8def3bcf34fd0d55a11a700d85e Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Wed, 15 Jan 2025 10:28:28 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E5=AE=8C=E5=96=84=E4=BB=98=E6=AC=BE?= =?UTF-8?q?=E7=94=B3=E8=AF=B7=20--=20=E4=B8=8A=E8=A3=85=E3=80=81=E6=8C=82?= =?UTF-8?q?=E8=BD=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/api/anruifinmanagement/payment.js | 24 +- .../fukuanshenqing/paymentAdd.vue | 207 +++++++++++++++--- .../fukuanshenqing/paymentInfo.vue | 65 +++++- .../fukuanshenqing/relation/top.vue | 168 ++++++++++++++ .../fukuanshenqing/relation/trailerCar.vue | 174 +++++++++++++++ .../fukuanguanli/fukuanDaiBanInfo.vue | 61 +++++- .../fukuanguanli/fukuanEdit.vue | 201 ++++++++++++++--- .../fukuanguanli/fukuanYiBanInfo.vue | 59 ++++- .../fukuanguanli/relation/top.vue | 168 ++++++++++++++ .../fukuanguanli/relation/trailerCar.vue | 174 +++++++++++++++ 10 files changed, 1229 insertions(+), 72 deletions(-) create mode 100644 anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/fukuanshenqing/relation/top.vue create mode 100644 anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/fukuanshenqing/relation/trailerCar.vue create mode 100644 anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/fukuanguanliFlow/fukuanguanli/relation/top.vue create mode 100644 anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/fukuanguanliFlow/fukuanguanli/relation/trailerCar.vue diff --git a/anrui-buscenter/anrui-finmanage-ui/src/api/anruifinmanagement/payment.js b/anrui-buscenter/anrui-finmanage-ui/src/api/anruifinmanagement/payment.js index ce8d6c7900..1ea697e64b 100644 --- a/anrui-buscenter/anrui-finmanage-ui/src/api/anruifinmanagement/payment.js +++ b/anrui-buscenter/anrui-finmanage-ui/src/api/anruifinmanagement/payment.js @@ -10,12 +10,30 @@ export default { headers: { 'Content-Type': 'application/json' } }) }, - // 查询分页列表 - pageList: function(params) { + // 查询分页列表 -- 选择主车车辆 + pageList: function(data) { return request({ url: '/base/v1/basevehicle/selectPayVehicleList', method: 'post', - data: params, + data: data, + headers: { 'Content-Type': 'application/json' } + }) + }, + // 查询分页列表 -- 选择挂车 + trailerApply: function(data) { + return request({ + url: '/base/v1/basetrailer/payApply', + method: 'post', + data: data, + headers: { 'Content-Type': 'application/json' } + }) + }, + // 查询分页列表 -- 选择上装 + topApply: function(data) { + return request({ + url: '/base/v1/basevehinstall/payApply', + method: 'post', + data: data, headers: { 'Content-Type': 'application/json' } }) }, diff --git a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/fukuanshenqing/paymentAdd.vue b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/fukuanshenqing/paymentAdd.vue index d78cbb1a89..350c8d6f05 100644 --- a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/fukuanshenqing/paymentAdd.vue +++ b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/fukuanshenqing/paymentAdd.vue @@ -54,7 +54,7 @@
*是否涉及车辆
- + 是 否 @@ -204,12 +204,67 @@ +
+
+
挂车列表
+ 选择 +
+ + + + + + + + + + + + + + + + + + + +
+
+
+
上装列表
+ 选择 +
+ + + + + + + + + + + + + + + + + + +
- - @@ -244,6 +299,12 @@ 关闭 + + + + + + @@ -257,6 +318,8 @@ import req from '@/api/anruifinmanagement/payment' import { typeValues, getOrgSidByPath, getInvoicingList, brandDown, selectNameByOrg, getTypeValueList } from '@/api/jichuxinxi/dictcommons' import vehcile from './relation/vehcile' +import trailerCar from './relation/trailerCar' +import top from './relation/top' import paymentInformationAdd from './relation/paymentInformationAdd' import paymentInformationInfo from './relation/paymentInformationInfo' import tops from '@/components/publicPage/tops' @@ -265,6 +328,8 @@ export default { name: 'PaymentAdd', components: { vehcile, + trailerCar, + top, paymentInformationAdd, paymentInformationInfo, tops @@ -277,6 +342,8 @@ export default { tableKey: 0, vehicleKey: 1, paymentKey: 2, + trailerKey: 3, + topKey: 4, index: 0, carBrand_list: [], costRange_list: [], @@ -312,8 +379,10 @@ export default { carBrandSid: '', // 品牌sid carBrandName: '', // 品牌名称 orgSidPath: '', - detailsList: [], - vehicleList: [] + detailsList: [], // 付款信息列表 + vehicleList: [], // 主车车辆列表 + trailerList: [], // 挂车列表 + topList: [] // 上装列表 }, rules: { carBrandName: [{ required: true, message: '品牌不能为空', trigger: 'change' }], @@ -452,8 +521,12 @@ export default { const choose = this.costType_list.filter((item) => item.dictValue === value) if (choose.length > 0 && choose !== null) { this.formobj.costTypeKey = choose[0].dictKey + if (this.formobj.costTypeKey !== '001') { + this.formobj.isVeh = '0' + } } else { this.formobj.costTypeKey = '' + this.formobj.isVeh = '' } }, changePayCompany(value) { @@ -489,6 +562,35 @@ export default { handleDelete(index) { this.formobj.detailsList.splice(index, 1) }, + changeCostTitle(value, row) { + const choose = this.costTitle_list.filter((item) => item.dictValue === value) + if (choose.length > 0 && choose !== null) { + row.costTitleKey = choose[0].dictKey + } else { + row.costTitleKey = '' + } + }, + changePaymentType(value, row) { + const choose = this.payment_list.filter((item) => item.dictValue === value) + if (choose.length > 0 && choose !== null) { + row.paymentTypeKey = choose[0].dictKey + } else { + row.paymentTypeKey = '' + } + }, + changeActualPay(value, row) { + const choose = this.actualPay_list.filter((item) => item.actualPay === value) + if (choose.length > 0 && choose !== null) { + row.actualPay = choose[0].actualPay + row.receiveCompany = choose[0].accountName + row.bank = choose[0].depositBank + row.receivingAccount = choose[0].bankAccount + } else { + row.actualPay = '' + row.bank = '' + row.receivingAccount = '' + } + }, handleAddPayment(row, index) { if (row.paymentType === '') { this.$message({ showClose: true, type: 'error', message: '付款方式不能为空' }) @@ -620,33 +722,64 @@ export default { this.viewState = 5 this.$refs['divTops'].showInfo({ sid: row.topSid }) }, - changeCostTitle(value, row) { - const choose = this.costTitle_list.filter((item) => item.dictValue === value) - if (choose.length > 0 && choose !== null) { - row.costTitleKey = choose[0].dictKey - } else { - row.costTitleKey = '' - } + trailerSelect() { + this.viewState = 6 + this.$refs['divTrailer'].showData(this.formobj.trailerList, this.formobj.useOrgSid) }, - changePaymentType(value, row) { - const choose = this.payment_list.filter((item) => item.dictValue === value) - if (choose.length > 0 && choose !== null) { - row.paymentTypeKey = choose[0].dictKey - } else { - row.paymentTypeKey = '' + trailerDelete(index) { + this.formobj.trailerList.splice(index, 1) + }, + backTrailer(value) { + this.viewState = 1 + value = JSON.parse(JSON.stringify(value)) + if (value.length > 0) { + value.forEach((e) => { + this.formobj.trailerList.push({ + trailerTypeValue: e.trailerTypeValue, // 挂车名称 + size: e.size, // 外观尺寸 + vinNo: e.vinNo, // 挂车车架号 + trailerSid: e.trailerSid, // 挂车sid + color: e.color, // 箱体颜色 + costPrice: e.costPrice, // 厂家结算价 + brandName: e.brandName, // 品牌名称 + vehModel: e.vehModel, // 车型别名 + zcVinNo: e.zcVinNo, // 主车车架号 + contractNo: e.contractNo, // 合同编号 + saleOrderNo: e.saleOrderNo, // 销售订单号 + customerName: e.customerName, // 客户名称 + payType: e.payType // 销售类型 + }) + }) } }, - changeActualPay(value, row) { - const choose = this.actualPay_list.filter((item) => item.actualPay === value) - if (choose.length > 0 && choose !== null) { - row.actualPay = choose[0].actualPay - row.receiveCompany = choose[0].accountName - row.bank = choose[0].depositBank - row.receivingAccount = choose[0].bankAccount - } else { - row.actualPay = '' - row.bank = '' - row.receivingAccount = '' + topSelect() { + this.viewState = 7 + this.$refs['divTop'].showData(this.formobj.topList, this.formobj.useOrgSid) + }, + topDelete(index) { + this.formobj.topList.splice(index, 1) + }, + backTop(value) { + this.viewState = 1 + value = JSON.parse(JSON.stringify(value)) + if (value.length > 0) { + value.forEach((e) => { + this.formobj.topList.push({ + installNameValue: e.installNameValue, // 上装名称 + topSid: e.topSid, // 上装sid + size: e.size, // 外观尺寸 + vinNo: e.vinNo, // 车架号 + vehiSid: e.vehiSid, // 车辆sid + color: e.color, // 箱体颜色 + costPrice: e.costPrice, // 厂家结算价 + brandName: e.brandName, // 品牌名称 + vehModel: e.vehModel, // 车型别名 + contractNo: e.contractNo, // 合同编号 + saleOrderNo: e.saleOrderNo, // 销售订单号 + customerName: e.customerName, // 客户名称 + payType: e.payType // 销售类型 + }) + }) } }, saveOrUpdate() { @@ -745,6 +878,16 @@ export default { }, 0) sums[index] += '' this.formobj.carTotal = sums[index] += '' + } else if (column.property === 'costPrice') { + sums[index] = values.reduce((prev, curr) => { + const value = Number(curr) + if (!isNaN(value)) { + return prev + curr + } else { + return prev + } + }, 0) + sums[index] += '' } }) return sums @@ -781,8 +924,10 @@ export default { carBrandSid: '', // 品牌sid carBrandName: '', // 品牌名称 orgSidPath: '', - detailsList: [], - vehicleList: [] + detailsList: [], // 付款信息列表 + vehicleList: [], // 主车车辆列表 + trailerList: [], // 挂车列表 + topList: [] // 上装列表 } this.submitdisabled = false this.$refs['form_obj'].resetFields() diff --git a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/fukuanshenqing/paymentInfo.vue b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/fukuanshenqing/paymentInfo.vue index df53e5987f..832a84512d 100644 --- a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/fukuanshenqing/paymentInfo.vue +++ b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/fukuanshenqing/paymentInfo.vue @@ -121,6 +121,47 @@ +
+
挂车列表
+ + + + + + + + + + + + + + + + +
+
+
上装列表
+ + + + + + + + + + + + + + + +
@@ -179,6 +220,8 @@ export default { tableKey: 0, vehicleKey: 1, paymentKey: 2, + trailerKey: 3, + topKey: 4, index: 0, formobj: { billNo: '', // 申请编号 @@ -207,8 +250,10 @@ export default { carBrandSid: '', // 品牌sid carBrandName: '', // 品牌名称 orgSidPath: '', - detailsList: [], - vehicleList: [] + detailsList: [], // 付款信息列表 + vehicleList: [], // 主车车辆列表 + trailerList: [], // 挂车列表 + topList: [] // 上装列表 }, rules: {}, paymentVisible: false, // 付款明细表 -- 新增付款信息弹框 @@ -300,6 +345,16 @@ export default { }, 0) sums[index] += '' this.formobj.carTotal = sums[index] += '' + } else if (column.property === 'costPrice') { + sums[index] = values.reduce((prev, curr) => { + const value = Number(curr) + if (!isNaN(value)) { + return prev + curr + } else { + return prev + } + }, 0) + sums[index] += '' } }) return sums @@ -335,8 +390,10 @@ export default { carBrandSid: '', // 品牌sid carBrandName: '', // 品牌名称 orgSidPath: '', - detailsList: [], - vehicleList: [] + detailsList: [], // 付款信息列表 + vehicleList: [], // 主车车辆列表 + trailerList: [], // 挂车列表 + topList: [] // 上装列表 } this.$refs['form_obj'].resetFields() this.$emit('doback') diff --git a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/fukuanshenqing/relation/top.vue b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/fukuanshenqing/relation/top.vue new file mode 100644 index 0000000000..db1859bf22 --- /dev/null +++ b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/fukuanshenqing/relation/top.vue @@ -0,0 +1,168 @@ + + + + + diff --git a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/fukuanshenqing/relation/trailerCar.vue b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/fukuanshenqing/relation/trailerCar.vue new file mode 100644 index 0000000000..50277d3700 --- /dev/null +++ b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/fukuanshenqing/relation/trailerCar.vue @@ -0,0 +1,174 @@ + + + + + diff --git a/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/fukuanguanliFlow/fukuanguanli/fukuanDaiBanInfo.vue b/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/fukuanguanliFlow/fukuanguanli/fukuanDaiBanInfo.vue index a89cd035c4..0fc373a07e 100644 --- a/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/fukuanguanliFlow/fukuanguanli/fukuanDaiBanInfo.vue +++ b/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/fukuanguanliFlow/fukuanguanli/fukuanDaiBanInfo.vue @@ -123,6 +123,47 @@ +
+
挂车列表
+ + + + + + + + + + + + + + + + +
+
+
上装列表
+ + + + + + + + + + + + + + + +
@@ -203,6 +244,8 @@ export default { tableKey: 0, vehicleKey: 1, paymentKey: 2, + trailerKey: 3, + topKey: 4, index: 0, formobj: { billNo: '', // 申请编号 @@ -231,8 +274,10 @@ export default { carBrandSid: '', // 品牌sid carBrandName: '', // 品牌名称 orgSidPath: '', - detailsList: [], - vehicleList: [] + detailsList: [], // 付款信息列表 + vehicleList: [], // 主车车辆列表 + trailerList: [], // 挂车列表 + topList: [] // 上装列表 }, rules: {}, paymentVisible: false, // 付款明细表 -- 新增付款信息弹框 @@ -377,6 +422,16 @@ export default { }, 0) sums[index] += '' this.formobj.carTotal = sums[index] += '' + } else if (column.property === 'costPrice') { + sums[index] = values.reduce((prev, curr) => { + const value = Number(curr) + if (!isNaN(value)) { + return prev + curr + } else { + return prev + } + }, 0) + sums[index] += '' } }) return sums @@ -389,7 +444,7 @@ export default { this.operation = val this.currentLink = true this.dialogList.comment = '同意' - req.getNextNodesForSubmit({ taskDefKey: this.current.taskDefKe, businessSid: this.linkByParameter.businessSid }).then((resp) => { + req.getNextNodesForSubmit({ taskDefKey: this.current.taskDefKey, businessSid: this.linkByParameter.businessSid }).then((resp) => { if (resp.success) { var arr = resp.data this.nextNode = arr[0] diff --git a/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/fukuanguanliFlow/fukuanguanli/fukuanEdit.vue b/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/fukuanguanliFlow/fukuanguanli/fukuanEdit.vue index ffce22ff96..e7bc30cd7b 100644 --- a/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/fukuanguanliFlow/fukuanguanli/fukuanEdit.vue +++ b/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/fukuanguanliFlow/fukuanguanli/fukuanEdit.vue @@ -53,7 +53,7 @@
*是否涉及车辆
- + 是 否 @@ -203,12 +203,67 @@ +
+
+
挂车列表
+ 选择 +
+ + + + + + + + + + + + + + + + + + + +
+
+
+
上装列表
+ 选择 +
+ + + + + + + + + + + + + + + + + + +
- - @@ -243,6 +298,12 @@ 关闭 + + + + + + @@ -256,6 +317,8 @@ import req from '@/api/anruifinmanagement/payment' import { typeValues, brandDown, selectNameByOrg, getInvoicingList, getTypeValueList } from '@/api/jichuxinxi/dictcommons' import vehcile from './relation/vehcile' +import trailerCar from './relation/trailerCar' +import top from './relation/top' import paymentInformationAdd from './relation/paymentInformationAdd' import paymentInformationInfo from './relation/paymentInformationInfo' import tops from '@/views/workFlow/publicPage/tops' @@ -264,6 +327,8 @@ export default { name: 'FuKuanEdit', components: { vehcile, + trailerCar, + top, paymentInformationAdd, paymentInformationInfo, tops @@ -276,6 +341,8 @@ export default { tableKey: 0, vehicleKey: 1, paymentKey: 2, + trailerKey: 3, + topKey: 4, index: 0, carBrand_list: [], costRange_list: [], @@ -311,8 +378,10 @@ export default { carBrandSid: '', // 品牌sid carBrandName: '', // 品牌名称 orgSidPath: '', - detailsList: [], - vehicleList: [] + detailsList: [], // 付款信息列表 + vehicleList: [], // 主车车辆列表 + trailerList: [], // 挂车列表 + topList: [] // 上装列表 }, rules: { carBrandName: [{ required: true, message: '品牌不能为空', trigger: 'change' }], @@ -443,8 +512,12 @@ export default { const choose = this.costType_list.filter((item) => item.dictValue === value) if (choose.length > 0 && choose !== null) { this.formobj.costTypeKey = choose[0].dictKey + if (this.formobj.costTypeKey !== '001') { + this.formobj.isVeh = '0' + } } else { this.formobj.costTypeKey = '' + this.formobj.isVeh = '' } }, changePayCompany(value) { @@ -480,6 +553,35 @@ export default { handleDelete(index) { this.formobj.detailsList.splice(index, 1) }, + changeCostTitle(value, row) { + const choose = this.costTitle_list.filter((item) => item.dictValue === value) + if (choose.length > 0 && choose !== null) { + row.costTitleKey = choose[0].dictKey + } else { + row.costTitleKey = '' + } + }, + changePaymentType(value, row) { + const choose = this.payment_list.filter((item) => item.dictValue === value) + if (choose.length > 0 && choose !== null) { + row.paymentTypeKey = choose[0].dictKey + } else { + row.paymentTypeKey = '' + } + }, + changeActualPay(value, row) { + const choose = this.actualPay_list.filter((item) => item.actualPay === value) + if (choose.length > 0 && choose !== null) { + row.actualPay = choose[0].actualPay + row.receiveCompany = choose[0].accountName + row.bank = choose[0].depositBank + row.receivingAccount = choose[0].bankAccount + } else { + row.actualPay = '' + row.bank = '' + row.receivingAccount = '' + } + }, handleAddPayment(row, index) { if (row.paymentType === '') { this.$message({ showClose: true, type: 'error', message: '付款方式不能为空' }) @@ -611,33 +713,64 @@ export default { this.viewState = 5 this.$refs['divTops'].showInfo({ sid: row.topSid }) }, - changeCostTitle(value, row) { - const choose = this.costTitle_list.filter((item) => item.dictValue === value) - if (choose.length > 0 && choose !== null) { - row.costTitleKey = choose[0].dictKey - } else { - row.costTitleKey = '' - } + trailerSelect() { + this.viewState = 6 + this.$refs['divTrailer'].showData(this.formobj.trailerList, this.formobj.useOrgSid) }, - changePaymentType(value, row) { - const choose = this.payment_list.filter((item) => item.dictValue === value) - if (choose.length > 0 && choose !== null) { - row.paymentTypeKey = choose[0].dictKey - } else { - row.paymentTypeKey = '' + trailerDelete(index) { + this.formobj.trailerList.splice(index, 1) + }, + backTrailer(value) { + this.viewState = 1 + value = JSON.parse(JSON.stringify(value)) + if (value.length > 0) { + value.forEach((e) => { + this.formobj.trailerList.push({ + trailerTypeValue: e.trailerTypeValue, // 挂车名称 + size: e.size, // 外观尺寸 + vinNo: e.vinNo, // 挂车车架号 + trailerSid: e.trailerSid, // 挂车sid + color: e.color, // 箱体颜色 + costPrice: e.costPrice, // 厂家结算价 + brandName: e.brandName, // 品牌名称 + vehModel: e.vehModel, // 车型别名 + zcVinNo: e.zcVinNo, // 主车车架号 + contractNo: e.contractNo, // 合同编号 + saleOrderNo: e.saleOrderNo, // 销售订单号 + customerName: e.customerName, // 客户名称 + payType: e.payType // 销售类型 + }) + }) } }, - changeActualPay(value, row) { - const choose = this.actualPay_list.filter((item) => item.actualPay === value) - if (choose.length > 0 && choose !== null) { - row.actualPay = choose[0].actualPay - row.receiveCompany = choose[0].accountName - row.bank = choose[0].depositBank - row.receivingAccount = choose[0].bankAccount - } else { - row.actualPay = '' - row.bank = '' - row.receivingAccount = '' + topSelect() { + this.viewState = 7 + this.$refs['divTop'].showData(this.formobj.topList, this.formobj.useOrgSid) + }, + topDelete(index) { + this.formobj.topList.splice(index, 1) + }, + backTop(value) { + this.viewState = 1 + value = JSON.parse(JSON.stringify(value)) + if (value.length > 0) { + value.forEach((e) => { + this.formobj.topList.push({ + installNameValue: e.installNameValue, // 上装名称 + topSid: e.topSid, // 上装sid + size: e.size, // 外观尺寸 + vinNo: e.vinNo, // 车架号 + vehiSid: e.vehiSid, // 车辆sid + color: e.color, // 箱体颜色 + costPrice: e.costPrice, // 厂家结算价 + brandName: e.brandName, // 品牌名称 + vehModel: e.vehModel, // 车型别名 + contractNo: e.contractNo, // 合同编号 + saleOrderNo: e.saleOrderNo, // 销售订单号 + customerName: e.customerName, // 客户名称 + payType: e.payType // 销售类型 + }) + }) } }, saveOrUpdate() { @@ -750,6 +883,16 @@ export default { }, 0) sums[index] += '' this.formobj.carTotal = sums[index] += '' + } else if (column.property === 'costPrice') { + sums[index] = values.reduce((prev, curr) => { + const value = Number(curr) + if (!isNaN(value)) { + return prev + curr + } else { + return prev + } + }, 0) + sums[index] += '' } }) return sums diff --git a/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/fukuanguanliFlow/fukuanguanli/fukuanYiBanInfo.vue b/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/fukuanguanliFlow/fukuanguanli/fukuanYiBanInfo.vue index c57a1fdf5e..b47b0fb266 100644 --- a/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/fukuanguanliFlow/fukuanguanli/fukuanYiBanInfo.vue +++ b/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/fukuanguanliFlow/fukuanguanli/fukuanYiBanInfo.vue @@ -121,6 +121,47 @@ +
+
挂车列表
+ + + + + + + + + + + + + + + + +
+
+
上装列表
+ + + + + + + + + + + + + + + +
@@ -178,6 +219,8 @@ export default { tableKey: 0, vehicleKey: 1, paymentKey: 2, + trailerKey: 3, + topKey: 4, index: 0, formobj: { billNo: '', // 申请编号 @@ -206,8 +249,10 @@ export default { carBrandSid: '', // 品牌sid carBrandName: '', // 品牌名称 orgSidPath: '', - detailsList: [], - vehicleList: [] + detailsList: [], // 付款信息列表 + vehicleList: [], // 主车车辆列表 + trailerList: [], // 挂车列表 + topList: [] // 上装列表 }, rules: {}, paymentVisible: false, // 付款明细表 -- 新增付款信息弹框 @@ -335,6 +380,16 @@ export default { }, 0) sums[index] += '' this.formobj.carTotal = sums[index] += '' + } else if (column.property === 'costPrice') { + sums[index] = values.reduce((prev, curr) => { + const value = Number(curr) + if (!isNaN(value)) { + return prev + curr + } else { + return prev + } + }, 0) + sums[index] += '' } }) return sums diff --git a/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/fukuanguanliFlow/fukuanguanli/relation/top.vue b/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/fukuanguanliFlow/fukuanguanli/relation/top.vue new file mode 100644 index 0000000000..91eb9b19f5 --- /dev/null +++ b/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/fukuanguanliFlow/fukuanguanli/relation/top.vue @@ -0,0 +1,168 @@ + + + + + diff --git a/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/fukuanguanliFlow/fukuanguanli/relation/trailerCar.vue b/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/fukuanguanliFlow/fukuanguanli/relation/trailerCar.vue new file mode 100644 index 0000000000..bc647f6ae3 --- /dev/null +++ b/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/fukuanguanliFlow/fukuanguanli/relation/trailerCar.vue @@ -0,0 +1,174 @@ + + + + + From 8fba381cb29872fafc9becf5245d606a7f09caa9 Mon Sep 17 00:00:00 2001 From: ligaode Date: Wed, 15 Jan 2025 10:37:24 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FinPaymentapplyService.java | 2 +- .../FinPaymentrecordService.java | 2 +- .../main/resources/ftl/prePaymentApply.ftl | 158 +++++++++--------- 3 files changed, 82 insertions(+), 80 deletions(-) diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyService.java index d90cb9987c..ecd019ec91 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyService.java @@ -357,7 +357,7 @@ public class FinPaymentapplyService extends MybatisBaseService - - - - - - - + + + + + + - - - - - - - + - - + + - - - - - - - - - - - - - - - - - + - + - - + - + @@ -181,26 +159,38 @@ - - + + ${applyCode!} + + + + + + - - + - - + + + + + + + @@ -212,10 +202,15 @@ - - + + + + + + @@ -919,39 +914,6 @@ - - - - - - - - - - - - 下载人： - - - - - - ${downName!} - - - - - - 下载时间： - - - - - - ${downTime!} - - @@ -1046,6 +1008,46 @@ + + + + + + + + + + + + 下载人： + + + + + + ${downName!} + + + + + + + + + + + + + 下载时间： + + + + + + ${downTime!} + + From a111ce1acbfc78b76c67e72323d80165b7870c08 Mon Sep 17 00:00:00 2001 From: ligaode Date: Wed, 15 Jan 2025 10:48:39 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../scm/api/scmvehrebate/ScmVehRebateQuery.java | 12 +++++++----- .../scm/biz/scmvehrebate/ScmVehRebateService.java | 4 ++-- .../scmvehrebatewith/ScmVehRebateWithService.java | 1 + 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateQuery.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateQuery.java index 12c5049dc2..5a9ebfba50 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateQuery.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateQuery.java @@ -51,19 +51,21 @@ import java.util.List; @ApiModel(value = "单车返利表 查询条件", description = "单车返利表 查询条件") public class ScmVehRebateQuery implements Query { - @ApiModelProperty("品牌") + @ApiModelProperty("品牌") private String brandName; - @ApiModelProperty("车型名称") + @ApiModelProperty("车型名称") private String vehModelName; - @ApiModelProperty("车架号") + @ApiModelProperty("车架号") private String vinNo; @ApiModelProperty("创建开始日期") private String createStartTime; @ApiModelProperty("创建结束日期") private String createEndTime; - @ApiModelProperty("返利类型key") + @ApiModelProperty("返利类型key") private String rebateTypeKey; - @ApiModelProperty("返利名称") + @ApiModelProperty("返利类型value") + private String rebateTypeValue; + @ApiModelProperty("返利名称") private String rebateName; @ApiModelProperty("状态") private String state; diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateService.java index 4db1737acc..8109ef86d7 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateService.java @@ -268,8 +268,8 @@ public class ScmVehRebateService extends MybatisBaseService Date: Wed, 15 Jan 2025 11:18:00 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8D=8F=E5=90=8C?= =?UTF-8?q?=E5=8A=9E=E5=85=ACoa=E8=8E=B7=E5=8F=96=E7=BB=84=E7=BB=87?= =?UTF-8?q?=E6=9C=BA=E6=9E=84=E7=9A=84=E6=A0=91=E5=BD=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/flowtask/FlowTaskService.java | 3 + .../sysorganization/OaSysOrganizationVo.java | 26 ++++++++ .../sysorganization/SysOrganizationFeign.java | 6 ++ .../SysOrganizationFeignFallback.java | 5 ++ .../SysOrganizationMapper.java | 6 +- .../sysorganization/SysOrganizationMapper.xml | 66 ++++++++++++------- .../sysorganization/SysOrganizationRest.java | 52 ++++++++++----- .../SysOrganizationService.java | 44 +++++++++++++ 8 files changed, 165 insertions(+), 43 deletions(-) create mode 100644 anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/OaSysOrganizationVo.java diff --git a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java index ac5ed0ed75..7fe5e9582e 100644 --- a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java +++ b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java @@ -400,6 +400,9 @@ public class FlowTaskService extends MybatisBaseService> selectAppOrganization(@RequestParam(value = "sid", required = false) String sid); + + @ApiOperation("手机OA获取组织架构") + @ResponseBody + @GetMapping("/selectAppOrganization2") + public ResultBean> selectAppOrganization2(@RequestParam(value = "sid", required = false) String sid); + @ApiOperation("组织架构") @ResponseBody @GetMapping("/selectListOrg") diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeignFallback.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeignFallback.java index 13d3897069..7397a1229c 100644 --- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeignFallback.java +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeignFallback.java @@ -117,6 +117,11 @@ public class SysOrganizationFeignFallback implements SysOrganizationFeign { return ResultBean.fireFail().setMsg("接口anrui_portal/sysorganization/selectAppOrganization无法访问"); } + @Override + public ResultBean> selectAppOrganization2(String sid) { + return null; + } + @Override public ResultBean> selectListOrg() { return null; diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.java index 5c7eff9a67..c13b2f9c02 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.java @@ -50,8 +50,12 @@ public interface SysOrganizationMapper extends BaseMapper { List selectAppOrganization(); + List selectAppOrganization2(); + List selectAppOrganizationByPsid(@Param("psid") String psid); + List selectAppOrganizationByPsid2(@Param("psid") String psid); + List treeList(String psid); SysOrganization selectOrgCode(); @@ -134,7 +138,7 @@ public interface SysOrganizationMapper extends BaseMapper { List tranTwo(String sid); - List tranThree(@Param("sid") String sid,@Param("deptSid") String deptSid); + List tranThree(@Param("sid") String sid, @Param("deptSid") String deptSid); List tranfour(String sid); diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.xml b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.xml index b4fcc7872e..33e089df78 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.xml +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.xml @@ -77,6 +77,15 @@ WHERE org.psid = (SELECT sid FROM sys_organization WHERE psid = '0') + + + + SELECT * - FROM sys_organization LIMIT 0,1 + FROM sys_organization + LIMIT 0,1 select distinct si.name staffName, si.sid staffSid, su.sid userSid from sys_staff_org so - left join sys_staffinfo si on so.staffSid = si.sid - left join sys_user su on su.staffSid = si.sid + left join sys_staffinfo si on so.staffSid = si.sid + left join sys_user su on su.staffSid = si.sid where so.orgSid = #{orgDeptSid} and si.personTypeKey != '01' @@ -198,8 +217,8 @@ @@ -256,9 +275,9 @@ SELECT * FROM sys_organization WHERE ( - orgAttributeKey = 'fwz_002' - OR orgAttributeKey = 'fwz_003' - ) + orgAttributeKey = 'fwz_002' + OR orgAttributeKey = 'fwz_003' + ) AND psid = #{sid} @@ -267,15 +286,15 @@ FROM sys_organization WHERE orgAttributeKey = 'fwz_001' AND ( - psid = - (SELECT psid - FROM sys_organization - WHERE sid = #{sid}) - OR sid = - (SELECT psid - FROM sys_organization - WHERE sid = #{sid}) - ) + psid = + (SELECT psid + FROM sys_organization + WHERE sid = #{sid}) + OR sid = + (SELECT psid + FROM sys_organization + WHERE sid = #{sid}) + ) AND sid != #{sid} @@ -285,7 +304,7 @@ WHERE orgAttributeKey = 'fwz_001' AND sid != #{deptSid} AND (psid = #{sid} - OR sid = #{sid}) + OR sid = #{sid})