Browse Source

Merge remote-tracking branch 'origin/dev_v2' into dev_v2

钱惠东 1 week ago
parent
commit
fab103ba6a

+ 1 - 1
RuoYi-Vue-fast-master/src/main/java/com/ruoyi/project/business/domain/TqContract.java

@@ -67,7 +67,7 @@ public class TqContract extends BaseEntity
     private String currencyId;
 
     /** 合同金额 */
-    @Excel(name = "合同金额",i18nCode = "contract.amount", sort = 8)
+    @Excel(name = "合同金额",i18nCode = "contract.amount", sort = 8 )
     private BigDecimal amount;
 
     /** *签单日期 */

+ 3 - 3
RuoYi-Vue-fast-master/src/main/java/com/ruoyi/project/business/domain/TqContractLift.java

@@ -235,15 +235,15 @@ public class TqContractLift extends BaseEntity
     private String projectStatus;
 
     /** 排产月汇率 */
-    @Excel(name = "排产月汇率",i18nCode = "lift.mUsdRate4ProductionScheduling", sort= 54)
+    @Excel(name = "排产月汇率",i18nCode = "lift.rate4ProductionScheduling", sort= 54)
     private BigDecimal rate4ProductionScheduling;
 
     /** 发货月汇率 */
-    @Excel(name = "发货月汇率",i18nCode = "lift.mUsdRate4Shipment", sort= 56)
+    @Excel(name = "发货月汇率",i18nCode = "lift.rate4Shipment", sort= 56)
     private BigDecimal rate4Shipment;
 
     /** 签单月汇率 */
-    @Excel(name = "签单月汇率",i18nCode = "lift.mUsdRate4SigningContracts", sort= 58)
+    @Excel(name = "签单月汇率",i18nCode = "lift.rate4SigningContracts", sort= 58)
     private BigDecimal rate4SigningContracts;
 
     /** 电梯号 */

+ 2 - 0
RuoYi-Vue-fast-master/src/main/java/com/ruoyi/project/business/domain/bo/TqContractBo.java

@@ -146,6 +146,8 @@ public class TqContractBo extends BaseEntity
 
     private List<Long> flowStatus;
 
+    private String language;
+
 
 
 }

+ 2 - 2
RuoYi-Vue-fast-master/src/main/java/com/ruoyi/project/business/domain/vo/contract/TqContractVo.java

@@ -40,11 +40,11 @@ public class TqContractVo extends TqContract
     private String salesmanName;
 
     //代理商名称
-    @Excel(name = "代理商",i18nCode = "contract.agentName", sort = 10)
+    @Excel(name = "代理商",i18nCode = "lift.agentName", sort = 10)
     private String agentName;
 
     /** *终端客户名称 */
-    @Excel(name = "终端客户",i18nCode = "contract.endCustomersName", sort = 11)
+    @Excel(name = "终端客户",i18nCode = "lift.endCustomersName", sort = 11)
     private String endCustomersName;
 
 

+ 112 - 110
RuoYi-Vue-fast-master/src/main/resources/i18n/messages_en_US.properties

@@ -297,8 +297,8 @@ elevator.delete.hasValidation=该梯型存在规则校验数据,无法删除
 elevator.delete.hasCase=该梯型存在参数联动数据,无法删除!_US
 elevator.delete.hasBJ=该梯型存在报价数据,无法删除!_US
 agent.hasContract=Agreement signed or not
-elevator.add.exist=该梯型已存在!
-train.fileData.visibleRangeMsg=Каталоги и файлы должны быть выбраны хотя бы один
+elevator.add.exist=该梯型已存在!_US
+train.fileData.visibleRangeMsg=目录和文件必须至少选择一个_US
 elevator.optional.price.fail=电梯 [ {0} ] [ {1} ]加价项目计算失败,请检查电梯规格或选配项目配置_US
 currency.error.currencyUsed=以下币种[{0}]已被报价使用_US
 project.equipmentQuantity=Equipement quantity
@@ -308,8 +308,8 @@ lead.convert.mustBeConvertProject=Leads need to be pre-positioned for [Conversio
 relatedCase.validateDeleteError=This linkage use case has been referenced by a quote and cannot be deleted!
 validation.validateDeleteError=This checking rule has been quoted and cannot be deleted!
 excel.message.templateNotEmpty=The import template cannot be empty
-message.alertAudit.quotation=您有一份非标报价单需要评审确认,报价单号为:{0}({1})
-message.alertAudit.bargain=您收到一份报价单议价请求,请审批,报价单号为:{0}({1})
+message.alertAudit.quotation=您有一份非标报价单需要评审确认,报价单号为:{0}({1})_US
+message.alertAudit.bargain=您收到一份报价单议价请求,请审批,报价单号为:{0}({1})_US
 area.elevator.mismatch=[{0}] The elevator model in the area where the unlinked project is located, pleas modify it!
 quotation.review=您有一份非标报价单需要评审确认,报价单号为:{0}_US
 quotation.review.pass=Your quotation: {0} have already finished
@@ -320,9 +320,9 @@ selectItem.paraCode=Option code
 selectItem.paraPic=Options picture
 project.currency=Currency
 project.equipmentSpecifications=Equipment specifications
-account.exportSheetName=Customer management data
-project.exportSheetName=Project management data
-project.message.awaitingReview=You have a project pending review, project number: {0}
+account.exportSheetName=客户管理数据_US
+project.exportSheetName=项目管理数据_US
+project.message.awaitingReview=您有一个项目待审核,项目编号为:{0}_US
 agent.firstCooperationYear=Year of first cooperation
 project.deviceTotal=Total equipment
 project.priceTotal=Total Amount
@@ -345,18 +345,18 @@ project.stand=Specification
 project.unit.price=Unit Price
 target.completion.rate=Rate of completion
 project.progress=Project status
-area.existElevatorModel.cannot.delete=已有电梯区域配置使用,无法删除(EN)
+area.existElevatorModel.cannot.delete=已有电梯区域配置使用,无法删除_US
 project.expectedInstallStartDate=Expected date of start  installation
 quotation.review.reject=Your quotation: {0} Rejected
 quotation.approve.reject=Your request for quotation negotiation has been rejected, please check the result, quotation number: {0}
-quotation.techAdvice.electric=技术意见(电气)
-quotation.techAdvice.machine=技术意见(机械)
+quotation.techAdvice.electric=技术意见(电气)_US
+quotation.techAdvice.machine=技术意见(机械)_US
 agent.protocolStartDate=Effective date of the agreement
 agent.protocolEndDate=Date of expiry of the agreement
 agent.authorizedArea=Authorised area
 project.competitor=Competitor
-message.projectDealDay=Hello, the project you are responsible for:【{0}】has passed the customer's decision date. Please confirm the progress
-message.agentContractDay=Hello, there are still【{0}】days left until the signing of the agent {1} that you are responsible for. Please confirm
+message.projectDealDay=您好,您负责的项目:【{0}】已过客户决定日期,请确认进度_US
+message.agentContractDay=您好,您负责的代理商【{0}】签约还剩{1}天到期,请确认_US
 quotation.sale.reject=Your quotation: {0} Rejected
 train.question.questionContext.required=题目内容不能为空_US
 train.question.questionType.required=题目类型不能为空_US
@@ -369,101 +369,103 @@ common.data.noPermession=没有权限访问数据!_US
 project.origin.equipment=设备信息_US
 project.origin.quotation=报价信息_US
 train.question.answer.tolong=选项答案不能超过500个字符_US
-lift.contractNo=合同编号 _ES
-lift.contractName=合同名称 _ES
-lift.areaName=区域 _ES
-lift.countryName=国家 _ES
-lift.city=城市 _ES
-lift.salesmanName=业务员 _ES
-lift.endCustomersName=终端客户 _ES
-lift.tradeTerms=贸易条款 _ES
-lift.agentName=代理商 _ES
-lift.paymentMethod=付款方式 _ES
-lift.currencyId=币种 _ES
-lift.amountOfMoney=金额 _ES
-lift.signingDate=签单日期 _ES
-lift.remark=备注 _ES
-lift.productionOrderNo=生产令号 _ES
-lift.contractNoVersionNo=合同号-版本号 _ES
-lift.salesModel=业务员 _ES
-lift.contractAmendmentDate=合同更改日期 _ES
-lift.productCategory=产品类别 _ES
-lift.elevatorModel=梯型 _ES
-lift.specification=规格 _ES
-lift.count=数量 _ES
-lift.currency=币种 _ES
-lift.unitPrice=单价 _ES
-lift.quotationDiscount=报价折扣 _ES
-lift.expectedProductionScheduleDate=预计排产日期 _ES
-lift.hopeToScheduleProductionDate=希望排产日期 _ES
-lift.actualProductionScheduleDate=实际排产日期 _ES
-lift.productionScheduleDate=排产日期 _ES
-lift.reasonForProjectCancellationAndSus=项目取消暂停原因 _ES
-lift.reasonForDelayedOverdueShipment=延期过期发货原因 _ES
-lift.reasonForNonScheduling=未排产原因 _ES
-lift.hopeForDeliveryDate=希望发货日 _ES
-lift.actualDeliveryDate=实际发货日 _ES
-lift.port=港口 _ES
-lift.productionOrderStatus=生产订单状态 _ES
-lift.reviewDiscount=评审折扣 _ES
-lift.reviewShippingCosts=评审运费 _ES
-lift.reviewCommission=评审佣金 _ES
-lift.commissionPaymentDate=佣金付款日期 _ES
-lift.payoutDate=收款日期 _ES
-lift.receivingBank=收款银行 _ES
-lift.receivedAmount=已收金额 _ES
-lift.paymentRatio=收款比例 _ES
-lift.accountsReceivableBalance=应收余额 _ES
-lift.planAdjustmentDate=计划调整日期 _ES
-lift.actualInlandFreightCost=实际内陆运费 _ES
-lift.actualOceanFreight=实际海运费 _ES
-lift.invoiceDate=开票日期 _ES
-lift.customsDeclarationMonth=报关月份 _ES
-lift.subsequentCollectionOfShippingFees=后续收取运费 _ES
-lift.collectionDate=收取日期 _ES
-lift.planInlandFreightCost=预计内陆运费 _ES
-lift.planOceanFreight=预计海运费 _ES
-lift.projectStatus=项目状态 _ES
-lift.mUsdRate4ProductionScheduling=排产月美元汇率 _ES
-lift.mEuroRate4ProductionScheduling=排产月月欧元汇率 _ES
-lift.mUsdRate4Shipment=发货月美元汇率 _ES
-lift.mEuroRate4Shipment=发货月欧元汇率 _ES
-lift.mUsdRate4SigningContracts=签单月美元汇率 _ES
-lift.mEuroRate4SigningContracts=签单月欧元汇率 _ES
-lift.elevatorCode=电梯号 _ES
-lift.origin=来源 _ES
-lift.elevatorType=设备类型 _ES
-lift.quotationNoVersion=报价编号-版本 _ES
-lift.projectName=项目名称 _ES
-lift.quoter=报价者 _ES
-lift.additionalCost=附加费用 _ES
-lift.otherCost=其他费用 _ES
-contract.contractNo=合同编号 _ES
-contract.contractName=合同名称 _ES
-contract.areaName=区域 _ES
-contract.countryName=国家 _ES
-contract.city=城市 _ES
-contract.salesmanName=业务员 _ES
-contract.endCustomers=终端客户 _ES
-contract.tradeTerms=贸易条款 _ES
-contract.agentId=代理商 _ES
-contract.paymentMethod=付款方式 _ES
-contract.salesModel=销售模式 _ES
-contract.currencyId=币种 _ES
-contract.amount=合同金额 _ES
-contract.signingDate=签单日期 _ES
-contract.paymentRatio=付款比例 _ES
-contract.approveStatus=审批状态 _ES
-contract.remark=备注 _ES
-contract.status=合同状态(履行中,已取消 _ES
-contract.mUsdRate4SigningContracts=签单月美元汇率 _ES
-contract.mEuroRate4SigningContracts=签单月欧元汇率 _ES
-contract.buyers=买方 _ES
-contract.address=地址 _ES
-contract.telephone=电话 _ES
-contract.email=邮件 _ES
-contract.shippingMark=商标 _ES
-contract.shipmentPort=装船口岸 _ES
-contract.destinationPort=目的口岸 _ES
-contract.shipmentDeadline=装船期限 _ES
-contract.representative=代表人 _ES
+lift.contractNo=合同编号_US
+lift.contractName=合同名称_US
+lift.areaName=区域_US
+lift.countryName=国家_US
+lift.city=城市_US
+lift.salesmanName=业务员_US
+lift.endCustomersName=终端客户_US
+lift.tradeTerms=贸易条款_US
+lift.agentName=代理商_US
+lift.paymentMethod=付款方式_US
+lift.currencyId=币种_US
+lift.amountOfMoney=金额_US
+lift.signingDate=签单日期_US
+lift.remark=备注_US
+lift.productionOrderNo=生产令号_US
+lift.contractNoVersionNo=合同号-版本号_US
+lift.salesModel=业务员_US
+lift.contractAmendmentDate=合同更改日期_US
+lift.productCategory=产品类别_US
+lift.elevatorModel=梯型_US
+lift.specification=规格_US
+lift.count=数量_US
+lift.currency=币种_US
+lift.unitPrice=单价_US
+lift.quotationDiscount=报价折扣_US
+lift.expectedProductionScheduleDate=预计排产日期_US
+lift.hopeToScheduleProductionDate=希望排产日期_US
+lift.actualProductionScheduleDate=实际排产日期_US
+lift.productionScheduleDate=排产日期_US
+lift.reasonForProjectCancellationAndSus=项目取消暂停原因_US
+lift.reasonForDelayedOverdueShipment=延期过期发货原因_US
+lift.reasonForNonScheduling=未排产原因_US
+lift.hopeForDeliveryDate=希望发货日_US
+lift.actualDeliveryDate=实际发货日_US
+lift.port=港口_US
+lift.productionOrderStatus=生产订单状态_US
+lift.reviewDiscount=评审折扣_US
+lift.reviewShippingCosts=评审运费_US
+lift.reviewCommission=评审佣金_US
+lift.commissionPaymentDate=佣金付款日期_US
+lift.payoutDate=收款日期_US
+lift.receivingBank=收款银行_US
+lift.receivedAmount=已收金额_US
+lift.paymentRatio=收款比例_US
+lift.accountsReceivableBalance=应收余额_US
+lift.planAdjustmentDate=计划调整日期_US
+lift.actualInlandFreightCost=实际内陆运费_US
+lift.actualOceanFreight=实际海运费_US
+lift.invoiceDate=开票日期_US
+lift.customsDeclarationMonth=报关月份_US
+lift.subsequentCollectionOfShippingFees=后续收取运费_US
+lift.collectionDate=收取日期_US
+lift.planInlandFreightCost=预计内陆运费_US
+lift.planOceanFreight=预计海运费_US
+lift.projectStatus=项目状态_US
+lift.rate4ProductionScheduling=排产月汇率 _ES
+lift.rate4Shipment=发货月汇率 _ES
+lift.rate4SigningContracts=签单月汇率 _ES
+lift.mEuroRate4Shipment=发货月欧元汇率_US
+lift.mUsdRate4SigningContracts=签单月美元汇率_US
+lift.mEuroRate4SigningContracts=签单月欧元汇率_US
+lift.elevatorCode=电梯号_US
+lift.origin=来源_US
+lift.elevatorType=设备类型_US
+lift.quotationNoVersion=报价编号-版本_US
+lift.projectName=项目名称_US
+lift.quoter=报价者_US
+lift.additionalCost=附加费用_US
+lift.otherCost=其他费用_US
+contract.contractNo=合同编号_US
+contract.contractName=合同名称_US
+contract.areaName=区域_US
+contract.countryName=国家_US
+contract.city=城市_US
+contract.salesmanName=业务员_US
+contract.endCustomers=终端客户_US
+contract.tradeTerms=贸易条款_US
+contract.agentId=代理商_US
+contract.paymentMethod=付款方式_US
+contract.salesModel=销售模式_US
+contract.currencyId=币种_US
+contract.amount=合同金额_US
+contract.signingDate=签单日期_US
+contract.paymentRatio=付款比例_US
+contract.approveStatus=审批状态_US
+contract.remark=备注_US
+contract.status=合同状态(履行中,已取消_US
+contract.mUsdRate4SigningContracts=签单月美元汇率_US
+contract.mEuroRate4SigningContracts=签单月欧元汇率_US
+contract.buyers=买方_US
+contract.address=地址_US
+contract.telephone=电话_US
+contract.email=邮件_US
+contract.shippingMark=商标_US
+contract.shipmentPort=装船口岸_US
+contract.destinationPort=目的口岸_US
+contract.shipmentDeadline=装船期限_US
+contract.representative=代表人_US
+project.reasonType=丢单原因_US
+project.loseRemark=Lost remark

+ 112 - 110
RuoYi-Vue-fast-master/src/main/resources/i18n/messages_es_ES.properties

@@ -297,8 +297,8 @@ elevator.delete.hasValidation=该梯型存在规则校验数据,无法删除
 elevator.delete.hasCase=该梯型存在参数联动数据,无法删除!_ES
 elevator.delete.hasBJ=该梯型存在报价数据,无法删除!_ES
 agent.hasContract=Acuerdo firmado o no
-elevator.add.exist=该梯型已存在!
-train.fileData.visibleRangeMsg=Los directorios y archivos deben seleccionarse al menos uno
+elevator.add.exist=该梯型已存在!_ES
+train.fileData.visibleRangeMsg=目录和文件必须至少选择一个_ES
 elevator.optional.price.fail=电梯 [ {0} ] [ {1} ]加价项目计算失败,请检查电梯规格或选配项目配置_ES
 currency.error.currencyUsed=以下币种[{0}]已被报价使用_ES
 project.equipmentQuantity=Cantidad de equipamiento
@@ -308,8 +308,8 @@ lead.convert.mustBeConvertProject=Pista necesita [Proyecto de Conversión] condi
 relatedCase.validateDeleteError=0
 validation.validateDeleteError=La regla ya está citada en la cotización , no elimina
 excel.message.templateNotEmpty=Plantilla importada no puede ser vacía
-message.alertAudit.quotation=您有一份非标报价单需要评审确认,报价单号为:{0}({1})
-message.alertAudit.bargain=您收到一份报价单议价请求,请审批,报价单号为:{0}({1})
+message.alertAudit.quotation=您有一份非标报价单需要评审确认,报价单号为:{0}({1})_ES
+message.alertAudit.bargain=您收到一份报价单议价请求,请审批,报价单号为:{0}({1})_ES
 area.elevator.mismatch=Modelo de ascensor en ese área donde proyecto no asociado está ubicado , por favor modificarlo
 quotation.review=您有一份非标报价单需要评审确认,报价单号为:{0}_ES
 quotation.review.pass=Su cotización: {0} lista
@@ -320,9 +320,9 @@ selectItem.paraCode=Número de serie de artículo opcional
 selectItem.paraPic=Foto de artículo opcional
 project.currency=Tipo de moneda
 project.equipmentSpecifications=Especificación de equipamiento
-account.exportSheetName=Datos de gestión de clientes
-project.exportSheetName=datos de gestión de proyectos
-project.message.awaitingReview=Tienes un proyecto pendiente de revisión, número de proyecto: {0}
+account.exportSheetName=客户管理数据_ES
+project.exportSheetName=项目管理数据_ES
+project.message.awaitingReview=您有一个项目待审核,项目编号为:{0}_ES
 agent.firstCooperationYear=Año de primera cooperación
 project.deviceTotal=Cantidad total de equipos
 project.priceTotal=Importe
@@ -345,18 +345,18 @@ project.stand=Especificación
 project.unit.price=Precio de unidad
 target.completion.rate=Tasa de terminación
 project.progress=Proceso de proyecto
-area.existElevatorModel.cannot.delete=已有电梯区域配置使用,无法删除(ES)
+area.existElevatorModel.cannot.delete=已有电梯区域配置使用,无法删除_ES
 project.expectedInstallStartDate=Fecha de anticipar a empezar para instalación
 quotation.review.reject=Su cotización: {0} rechazada
 quotation.approve.reject=Rechazamiento de requerimiento de negociación en su cotización ,por favor ve resultado, No. Cotización :{0}
-quotation.techAdvice.electric=技术意见(电气)
-quotation.techAdvice.machine=技术意见(机械)
+quotation.techAdvice.electric=技术意见(电气)_ES
+quotation.techAdvice.machine=技术意见(机械)_ES
 agent.protocolStartDate=Fecha de validad de acuerdo
 agent.protocolEndDate=Fecha de vencimiento de acuerdo
 agent.authorizedArea=Región autorizada
 project.competitor=Contrario de competitor
-message.projectDealDay=Hola, el proyecto del que es responsable:【{0}】ha pasado la fecha de decisión del cliente, por favor confirme el progreso
-message.agentContractDay=Hola, el agente a su cargo【{0}】firmó el contrato con {1} días restantes, por favor confirme
+message.projectDealDay=您好,您负责的项目:【{0}】已过客户决定日期,请确认进度_ES
+message.agentContractDay=您好,您负责的代理商【{0}】签约还剩{1}天到期,请确认_ES
 quotation.sale.reject=Su cotización: {0} rechazada
 train.question.questionContext.required=题目内容不能为空_ES
 train.question.questionType.required=题目类型不能为空_ES
@@ -369,101 +369,103 @@ common.data.noPermession=没有权限访问数据!_ES
 project.origin.equipment=设备信息_ES
 project.origin.quotation=报价信息_ES
 train.question.answer.tolong=选项答案不能超过500个字符_ES
-lift.contractNo=合同编号 _ES
-lift.contractName=合同名称 _ES
-lift.areaName=区域 _ES
-lift.countryName=国家 _ES
-lift.city=城市 _ES
-lift.salesmanName=业务员 _ES
-lift.endCustomersName=终端客户 _ES
-lift.tradeTerms=贸易条款 _ES
-lift.agentName=代理商 _ES
-lift.paymentMethod=付款方式 _ES
-lift.currencyId=币种 _ES
-lift.amountOfMoney=金额 _ES
-lift.signingDate=签单日期 _ES
-lift.remark=备注 _ES
-lift.productionOrderNo=生产令号 _ES
-lift.contractNoVersionNo=合同号-版本号 _ES
-lift.salesModel=业务员 _ES
-lift.contractAmendmentDate=合同更改日期 _ES
-lift.productCategory=产品类别 _ES
-lift.elevatorModel=梯型 _ES
-lift.specification=规格 _ES
-lift.count=数量 _ES
-lift.currency=币种 _ES
-lift.unitPrice=单价 _ES
-lift.quotationDiscount=报价折扣 _ES
-lift.expectedProductionScheduleDate=预计排产日期 _ES
-lift.hopeToScheduleProductionDate=希望排产日期 _ES
-lift.actualProductionScheduleDate=实际排产日期 _ES
-lift.productionScheduleDate=排产日期 _ES
-lift.reasonForProjectCancellationAndSus=项目取消暂停原因 _ES
-lift.reasonForDelayedOverdueShipment=延期过期发货原因 _ES
-lift.reasonForNonScheduling=未排产原因 _ES
-lift.hopeForDeliveryDate=希望发货日 _ES
-lift.actualDeliveryDate=实际发货日 _ES
-lift.port=港口 _ES
-lift.productionOrderStatus=生产订单状态 _ES
-lift.reviewDiscount=评审折扣 _ES
-lift.reviewShippingCosts=评审运费 _ES
-lift.reviewCommission=评审佣金 _ES
-lift.commissionPaymentDate=佣金付款日期 _ES
-lift.payoutDate=收款日期 _ES
-lift.receivingBank=收款银行 _ES
-lift.receivedAmount=已收金额 _ES
-lift.paymentRatio=收款比例 _ES
-lift.accountsReceivableBalance=应收余额 _ES
-lift.planAdjustmentDate=计划调整日期 _ES
-lift.actualInlandFreightCost=实际内陆运费 _ES
-lift.actualOceanFreight=实际海运费 _ES
-lift.invoiceDate=开票日期 _ES
-lift.customsDeclarationMonth=报关月份 _ES
-lift.subsequentCollectionOfShippingFees=后续收取运费 _ES
-lift.collectionDate=收取日期 _ES
-lift.planInlandFreightCost=预计内陆运费 _ES
-lift.planOceanFreight=预计海运费 _ES
-lift.projectStatus=项目状态 _ES
-lift.mUsdRate4ProductionScheduling=排产月美元汇率 _ES
-lift.mEuroRate4ProductionScheduling=排产月月欧元汇率 _ES
-lift.mUsdRate4Shipment=发货月美元汇率 _ES
-lift.mEuroRate4Shipment=发货月欧元汇率 _ES
-lift.mUsdRate4SigningContracts=签单月美元汇率 _ES
-lift.mEuroRate4SigningContracts=签单月欧元汇率 _ES
-lift.elevatorCode=电梯号 _ES
-lift.origin=来源 _ES
-lift.elevatorType=设备类型 _ES
-lift.quotationNoVersion=报价编号-版本 _ES
-lift.projectName=项目名称 _ES
-lift.quoter=报价者 _ES
-lift.additionalCost=附加费用 _ES
-lift.otherCost=其他费用 _ES
-contract.contractNo=合同编号 _ES
-contract.contractName=合同名称 _ES
-contract.areaName=区域 _ES
-contract.countryName=国家 _ES
-contract.city=城市 _ES
-contract.salesmanName=业务员 _ES
-contract.endCustomers=终端客户 _ES
-contract.tradeTerms=贸易条款 _ES
-contract.agentId=代理商 _ES
-contract.paymentMethod=付款方式 _ES
-contract.salesModel=销售模式 _ES
-contract.currencyId=币种 _ES
-contract.amount=合同金额 _ES
-contract.signingDate=签单日期 _ES
-contract.paymentRatio=付款比例 _ES
-contract.approveStatus=审批状态 _ES
-contract.remark=备注 _ES
-contract.status=合同状态(履行中,已取消 _ES
-contract.mUsdRate4SigningContracts=签单月美元汇率 _ES
-contract.mEuroRate4SigningContracts=签单月欧元汇率 _ES
-contract.buyers=买方 _ES
-contract.address=地址 _ES
-contract.telephone=电话 _ES
-contract.email=邮件 _ES
-contract.shippingMark=商标 _ES
-contract.shipmentPort=装船口岸 _ES
-contract.destinationPort=目的口岸 _ES
-contract.shipmentDeadline=装船期限 _ES
-contract.representative=代表人 _ES
+lift.contractNo=合同编号_ES
+lift.contractName=合同名称_ES
+lift.areaName=区域_ES
+lift.countryName=国家_ES
+lift.city=城市_ES
+lift.salesmanName=业务员_ES
+lift.endCustomersName=终端客户_ES
+lift.tradeTerms=贸易条款_ES
+lift.agentName=代理商_ES
+lift.paymentMethod=付款方式_ES
+lift.currencyId=币种_ES
+lift.amountOfMoney=金额_ES
+lift.signingDate=签单日期_ES
+lift.remark=备注_ES
+lift.productionOrderNo=生产令号_ES
+lift.contractNoVersionNo=合同号-版本号_ES
+lift.salesModel=业务员_ES
+lift.contractAmendmentDate=合同更改日期_ES
+lift.productCategory=产品类别_ES
+lift.elevatorModel=梯型_ES
+lift.specification=规格_ES
+lift.count=数量_ES
+lift.currency=币种_ES
+lift.unitPrice=单价_ES
+lift.quotationDiscount=报价折扣_ES
+lift.expectedProductionScheduleDate=预计排产日期_ES
+lift.hopeToScheduleProductionDate=希望排产日期_ES
+lift.actualProductionScheduleDate=实际排产日期_ES
+lift.productionScheduleDate=排产日期_ES
+lift.reasonForProjectCancellationAndSus=项目取消暂停原因_ES
+lift.reasonForDelayedOverdueShipment=延期过期发货原因_ES
+lift.reasonForNonScheduling=未排产原因_ES
+lift.hopeForDeliveryDate=希望发货日_ES
+lift.actualDeliveryDate=实际发货日_ES
+lift.port=港口_ES
+lift.productionOrderStatus=生产订单状态_ES
+lift.reviewDiscount=评审折扣_ES
+lift.reviewShippingCosts=评审运费_ES
+lift.reviewCommission=评审佣金_ES
+lift.commissionPaymentDate=佣金付款日期_ES
+lift.payoutDate=收款日期_ES
+lift.receivingBank=收款银行_ES
+lift.receivedAmount=已收金额_ES
+lift.paymentRatio=收款比例_ES
+lift.accountsReceivableBalance=应收余额_ES
+lift.planAdjustmentDate=计划调整日期_ES
+lift.actualInlandFreightCost=实际内陆运费_ES
+lift.actualOceanFreight=实际海运费_ES
+lift.invoiceDate=开票日期_ES
+lift.customsDeclarationMonth=报关月份_ES
+lift.subsequentCollectionOfShippingFees=后续收取运费_ES
+lift.collectionDate=收取日期_ES
+lift.planInlandFreightCost=预计内陆运费_ES
+lift.planOceanFreight=预计海运费_ES
+lift.projectStatus=项目状态_ES
+lift.rate4ProductionScheduling=排产月汇率 _ES
+lift.rate4Shipment=发货月汇率 _ES
+lift.rate4SigningContracts=签单月汇率 _ES
+lift.mEuroRate4Shipment=发货月欧元汇率_ES
+lift.mUsdRate4SigningContracts=签单月美元汇率_ES
+lift.mEuroRate4SigningContracts=签单月欧元汇率_ES
+lift.elevatorCode=电梯号_ES
+lift.origin=来源_ES
+lift.elevatorType=设备类型_ES
+lift.quotationNoVersion=报价编号-版本_ES
+lift.projectName=项目名称_ES
+lift.quoter=报价者_ES
+lift.additionalCost=附加费用_ES
+lift.otherCost=其他费用_ES
+contract.contractNo=合同编号_ES
+contract.contractName=合同名称_ES
+contract.areaName=区域_ES
+contract.countryName=国家_ES
+contract.city=城市_ES
+contract.salesmanName=业务员_ES
+contract.endCustomers=终端客户_ES
+contract.tradeTerms=贸易条款_ES
+contract.agentId=代理商_ES
+contract.paymentMethod=付款方式_ES
+contract.salesModel=销售模式_ES
+contract.currencyId=币种_ES
+contract.amount=合同金额_ES
+contract.signingDate=签单日期_ES
+contract.paymentRatio=付款比例_ES
+contract.approveStatus=审批状态_ES
+contract.remark=备注_ES
+contract.status=合同状态(履行中,已取消_ES
+contract.mUsdRate4SigningContracts=签单月美元汇率_ES
+contract.mEuroRate4SigningContracts=签单月欧元汇率_ES
+contract.buyers=买方_ES
+contract.address=地址_ES
+contract.telephone=电话_ES
+contract.email=邮件_ES
+contract.shippingMark=商标_ES
+contract.shipmentPort=装船口岸_ES
+contract.destinationPort=目的口岸_ES
+contract.shipmentDeadline=装船期限_ES
+contract.representative=代表人_ES
+project.reasonType=丢单原因_ES
+project.loseRemark=Nota de pérdida de pedidos

+ 112 - 110
RuoYi-Vue-fast-master/src/main/resources/i18n/messages_ru_RU.properties

@@ -297,8 +297,8 @@ elevator.delete.hasValidation=该梯型存在规则校验数据,无法删除
 elevator.delete.hasCase=该梯型存在参数联动数据,无法删除!_RU
 elevator.delete.hasBJ=该梯型存在报价数据,无法删除!_RU
 agent.hasContract=Заключен ли договор
-elevator.add.exist=该梯型已存在!
-train.fileData.visibleRangeMsg=You must select at least one directory or file.
+elevator.add.exist=该梯型已存在!_RU
+train.fileData.visibleRangeMsg=目录和文件必须至少选择一个_RU
 elevator.optional.price.fail=电梯 [ {0} ] [ {1} ]加价项目计算失败,请检查电梯规格或选配项目配置_RU
 currency.error.currencyUsed=以下币种[{0}]已被报价使用_RU
 project.equipmentQuantity=Количество оборудования
@@ -308,8 +308,8 @@ lead.convert.mustBeConvertProject=Лид требует предваритель
 relatedCase.validateDeleteError=Этот вариант использования связи указан в предложении и не может быть удален!
 validation.validateDeleteError=Это правило проверки указано в предложении и не может быть удалено!
 excel.message.templateNotEmpty=Шаблон импорта не может быть пустым
-message.alertAudit.quotation=您有一份非标报价单需要评审确认,报价单号为:{0}({1})
-message.alertAudit.bargain=您收到一份报价单议价请求,请审批,报价单号为:{0}({1})
+message.alertAudit.quotation=您有一份非标报价单需要评审确认,报价单号为:{0}({1})_RU
+message.alertAudit.bargain=您收到一份报价单议价请求,请审批,报价单号为:{0}({1})_RU
 area.elevator.mismatch=[{0}] Модель лифта в районе, где расположен несвязанный проект, измените ее!
 quotation.review=您有一份非标报价单需要评审确认,报价单号为:{0}_RU
 quotation.review.pass=Ваше предложение: {0} была сделана ставка
@@ -320,9 +320,9 @@ selectItem.paraCode=Кодировка опции
 selectItem.paraPic=Изображений опции
 project.currency=Валюта
 project.equipmentSpecifications=Технические характеристики оборудования
-account.exportSheetName=Данные управления клиентами
-project.exportSheetName=данные управления проектом
-project.message.awaitingReview=У вас есть проект на рассмотрении, номер проекта: {0}
+account.exportSheetName=客户管理数据_RU
+project.exportSheetName=项目管理数据_RU
+project.message.awaitingReview=您有一个项目待审核,项目编号为:{0}_RU
 agent.firstCooperationYear=Год первого сотрудничества
 project.deviceTotal=Общее количество устройств
 project.priceTotal=Общая стоимость
@@ -345,18 +345,18 @@ project.stand=Спецификация
 project.unit.price=Цена за единицу
 target.completion.rate=Коэффициент завершения
 project.progress=Прогресс проекта
-area.existElevatorModel.cannot.delete=已有电梯区域配置使用,无法删除(RU)
+area.existElevatorModel.cannot.delete=已有电梯区域配置使用,无法删除_RU
 project.expectedInstallStartDate=Ожидаемая дата начала установки
 quotation.review.reject=Ваше предложение: {0} отклонено
 quotation.approve.reject=Ваш запрос на обсуждение предложения переговоров отклонен. Проверьте результат. Номер предложения: {0}
-quotation.techAdvice.electric=技术意见(电气)
-quotation.techAdvice.machine=技术意见(机械)
+quotation.techAdvice.electric=技术意见(电气)_RU
+quotation.techAdvice.machine=技术意见(机械)_RU
 agent.protocolStartDate=Дата вступления соглашения в силу
 agent.protocolEndDate=Дата окончания срока  соглашения
 agent.authorizedArea=Разрешенная зона
 project.competitor=Конкуренты
-message.projectDealDay=Здравствуйте, проект, за который вы отвечаете:【{0}】прошел дату решения клиента, пожалуйста, подтвердите прогресс
-message.agentContractDay=Здравствуйте, у вашего ответственного агента【{0}】осталось несколько дней до истечения срока действия {1} контракта, пожалуйста, подтвердите
+message.projectDealDay=您好,您负责的项目:【{0}】已过客户决定日期,请确认进度_RU
+message.agentContractDay=您好,您负责的代理商【{0}】签约还剩{1}天到期,请确认_RU
 quotation.sale.reject=Ваше предложение: {0} отклонено
 train.question.questionContext.required=题目内容不能为空_RU
 train.question.questionType.required=题目类型不能为空_RU
@@ -369,101 +369,103 @@ common.data.noPermession=没有权限访问数据!_RU
 project.origin.equipment=设备信息_RU
 project.origin.quotation=报价信息_RU
 train.question.answer.tolong=选项答案不能超过500个字符_RU
-lift.contractNo=合同编号 RU
-lift.contractName=合同名称 RU
-lift.areaName=区域 RU
-lift.countryName=国家 RU
-lift.city=城市 RU
-lift.salesmanName=业务员 RU
-lift.endCustomersName=终端客户 RU
-lift.tradeTerms=贸易条款 RU
-lift.agentName=代理商 RU
-lift.paymentMethod=付款方式 RU
-lift.currencyId=币种 RU
-lift.amountOfMoney=金额 RU
-lift.signingDate=签单日期 RU
-lift.remark=备注 RU
-lift.productionOrderNo=生产令号 RU
-lift.contractNoVersionNo=合同号-版本号 RU
-lift.salesModel=业务员 RU
-lift.contractAmendmentDate=合同更改日期 RU
-lift.productCategory=产品类别 RU
-lift.elevatorModel=梯型 RU
-lift.specification=规格 RU
-lift.count=数量 RU
-lift.currency=币种 RU
-lift.unitPrice=单价 RU
-lift.quotationDiscount=报价折扣 RU
-lift.expectedProductionScheduleDate=预计排产日期 RU
-lift.hopeToScheduleProductionDate=希望排产日期 RU
-lift.actualProductionScheduleDate=实际排产日期 RU
-lift.productionScheduleDate=排产日期 RU
-lift.reasonForProjectCancellationAndSus=项目取消暂停原因 RU
-lift.reasonForDelayedOverdueShipment=延期过期发货原因 RU
-lift.reasonForNonScheduling=未排产原因 RU
-lift.hopeForDeliveryDate=希望发货日 RU
-lift.actualDeliveryDate=实际发货日 RU
-lift.port=港口 RU
-lift.productionOrderStatus=生产订单状态 RU
-lift.reviewDiscount=评审折扣 RU
-lift.reviewShippingCosts=评审运费 RU
-lift.reviewCommission=评审佣金 RU
-lift.commissionPaymentDate=佣金付款日期 RU
-lift.payoutDate=收款日期 RU
-lift.receivingBank=收款银行 RU
-lift.receivedAmount=已收金额 RU
-lift.paymentRatio=收款比例 RU
-lift.accountsReceivableBalance=应收余额 RU
-lift.planAdjustmentDate=计划调整日期 RU
-lift.actualInlandFreightCost=实际内陆运费 RU
-lift.actualOceanFreight=实际海运费 RU
-lift.invoiceDate=开票日期 RU
-lift.customsDeclarationMonth=报关月份 RU
-lift.subsequentCollectionOfShippingFees=后续收取运费 RU
-lift.collectionDate=收取日期 RU
-lift.planInlandFreightCost=预计内陆运费 RU
-lift.planOceanFreight=预计海运费 RU
-lift.projectStatus=项目状态 RU
-lift.mUsdRate4ProductionScheduling=排产月美元汇率 RU
-lift.mEuroRate4ProductionScheduling=排产月月欧元汇率 RU
-lift.mUsdRate4Shipment=发货月美元汇率 RU
-lift.mEuroRate4Shipment=发货月欧元汇率 RU
-lift.mUsdRate4SigningContracts=签单月美元汇率 RU
-lift.mEuroRate4SigningContracts=签单月欧元汇率 RU
-lift.elevatorCode=电梯号 RU
-lift.origin=来源 RU
-lift.elevatorType=设备类型 RU
-lift.quotationNoVersion=报价编号-版本 RU
-lift.projectName=项目名称 RU
-lift.quoter=报价者 RU
-lift.additionalCost=附加费用 RU
-lift.otherCost=其他费用 RU
-contract.contractNo=合同编号 RU
-contract.contractName=合同名称 RU
-contract.areaName=区域 RU
-contract.countryName=国家 RU
-contract.city=城市 RU
-contract.salesmanName=业务员 RU
-contract.endCustomers=终端客户 RU
-contract.tradeTerms=贸易条款 RU
-contract.agentId=代理商 RU
-contract.paymentMethod=付款方式 RU
-contract.salesModel=销售模式 RU
-contract.currencyId=币种 RU
-contract.amount=合同金额 RU
-contract.signingDate=签单日期 RU
-contract.paymentRatio=付款比例 RU
-contract.approveStatus=审批状态 RU
-contract.remark=备注 RU
-contract.status=合同状态(履行中,已取消 RU
-contract.mUsdRate4SigningContracts=签单月美元汇率 RU
-contract.mEuroRate4SigningContracts=签单月欧元汇率 RU
-contract.buyers=买方 RU
-contract.address=地址 RU
-contract.telephone=电话 RU
-contract.email=邮件 RU
-contract.shippingMark=商标 RU
-contract.shipmentPort=装船口岸 RU
-contract.destinationPort=目的口岸 RU
-contract.shipmentDeadline=装船期限 RU
-contract.representative=代表人 RU
+lift.contractNo=合同编号_RU
+lift.contractName=合同名称_RU
+lift.areaName=区域_RU
+lift.countryName=国家_RU
+lift.city=城市_RU
+lift.salesmanName=业务员_RU
+lift.endCustomersName=终端客户_RU
+lift.tradeTerms=贸易条款_RU
+lift.agentName=代理商_RU
+lift.paymentMethod=付款方式_RU
+lift.currencyId=币种_RU
+lift.amountOfMoney=金额_RU
+lift.signingDate=签单日期_RU
+lift.remark=备注_RU
+lift.productionOrderNo=生产令号_RU
+lift.contractNoVersionNo=合同号-版本号_RU
+lift.salesModel=业务员_RU
+lift.contractAmendmentDate=合同更改日期_RU
+lift.productCategory=产品类别_RU
+lift.elevatorModel=梯型_RU
+lift.specification=规格_RU
+lift.count=数量_RU
+lift.currency=币种_RU
+lift.unitPrice=单价_RU
+lift.quotationDiscount=报价折扣_RU
+lift.expectedProductionScheduleDate=预计排产日期_RU
+lift.hopeToScheduleProductionDate=希望排产日期_RU
+lift.actualProductionScheduleDate=实际排产日期_RU
+lift.productionScheduleDate=排产日期_RU
+lift.reasonForProjectCancellationAndSus=项目取消暂停原因_RU
+lift.reasonForDelayedOverdueShipment=延期过期发货原因_RU
+lift.reasonForNonScheduling=未排产原因_RU
+lift.hopeForDeliveryDate=希望发货日_RU
+lift.actualDeliveryDate=实际发货日_RU
+lift.port=港口_RU
+lift.productionOrderStatus=生产订单状态_RU
+lift.reviewDiscount=评审折扣_RU
+lift.reviewShippingCosts=评审运费_RU
+lift.reviewCommission=评审佣金_RU
+lift.commissionPaymentDate=佣金付款日期_RU
+lift.payoutDate=收款日期_RU
+lift.receivingBank=收款银行_RU
+lift.receivedAmount=已收金额_RU
+lift.paymentRatio=收款比例_RU
+lift.accountsReceivableBalance=应收余额_RU
+lift.planAdjustmentDate=计划调整日期_RU
+lift.actualInlandFreightCost=实际内陆运费_RU
+lift.actualOceanFreight=实际海运费_RU
+lift.invoiceDate=开票日期_RU
+lift.customsDeclarationMonth=报关月份_RU
+lift.subsequentCollectionOfShippingFees=后续收取运费_RU
+lift.collectionDate=收取日期_RU
+lift.planInlandFreightCost=预计内陆运费_RU
+lift.planOceanFreight=预计海运费_RU
+lift.projectStatus=项目状态_RU
+lift.rate4ProductionScheduling=排产月汇率 RU
+lift.rate4Shipment=发货月汇率 RU
+lift.rate4SigningContracts=签单月汇率 RU
+lift.mEuroRate4Shipment=发货月欧元汇率_RU
+lift.mUsdRate4SigningContracts=签单月美元汇率_RU
+lift.mEuroRate4SigningContracts=签单月欧元汇率_RU
+lift.elevatorCode=电梯号_RU
+lift.origin=来源_RU
+lift.elevatorType=设备类型_RU
+lift.quotationNoVersion=报价编号-版本_RU
+lift.projectName=项目名称_RU
+lift.quoter=报价者_RU
+lift.additionalCost=附加费用_RU
+lift.otherCost=其他费用_RU
+contract.contractNo=合同编号_RU
+contract.contractName=合同名称_RU
+contract.areaName=区域_RU
+contract.countryName=国家_RU
+contract.city=城市_RU
+contract.salesmanName=业务员_RU
+contract.endCustomers=终端客户_RU
+contract.tradeTerms=贸易条款_RU
+contract.agentId=代理商_RU
+contract.paymentMethod=付款方式_RU
+contract.salesModel=销售模式_RU
+contract.currencyId=币种_RU
+contract.amount=合同金额_RU
+contract.signingDate=签单日期_RU
+contract.paymentRatio=付款比例_RU
+contract.approveStatus=审批状态_RU
+contract.remark=备注_RU
+contract.status=合同状态(履行中,已取消_RU
+contract.mUsdRate4SigningContracts=签单月美元汇率_RU
+contract.mEuroRate4SigningContracts=签单月欧元汇率_RU
+contract.buyers=买方_RU
+contract.address=地址_RU
+contract.telephone=电话_RU
+contract.email=邮件_RU
+contract.shippingMark=商标_RU
+contract.shipmentPort=装船口岸_RU
+contract.destinationPort=目的口岸_RU
+contract.shipmentDeadline=装船期限_RU
+contract.representative=代表人_RU
+project.reasonType=丢单原因_RU
+project.loseRemark=Размер не должен превышать

+ 6 - 4
RuoYi-Vue-fast-master/src/main/resources/i18n/messages_zh_CN.properties

@@ -424,9 +424,9 @@ lift.collectionDate=收取日期
 lift.planInlandFreightCost=预计内陆运费
 lift.planOceanFreight=预计海运费
 lift.projectStatus=项目状态
-lift.mUsdRate4ProductionScheduling=排产月美元汇率
-lift.mEuroRate4ProductionScheduling=排产月月欧元汇率
-lift.mUsdRate4Shipment=发货月美元汇率
+lift.rate4ProductionScheduling=排产月汇率
+lift.rate4Shipment=发货月汇率
+lift.rate4SigningContracts=签单月汇率
 lift.mEuroRate4Shipment=发货月欧元汇率
 lift.mUsdRate4SigningContracts=签单月美元汇率
 lift.mEuroRate4SigningContracts=签单月欧元汇率
@@ -466,4 +466,6 @@ contract.shippingMark=商标
 contract.shipmentPort=装船口岸
 contract.destinationPort=目的口岸
 contract.shipmentDeadline=装船期限
-contract.representative=代表人
+contract.representative=代表人
+project.reasonType=丢单原因
+project.loseRemark=丢单备注

+ 10 - 9
RuoYi-Vue-fast-master/src/main/resources/mybatis/business/contract/TqContractLiftMapper.xml

@@ -113,21 +113,22 @@
                    END AS area_name,
                 t1.dict_label as elevatorTypeName
         from tq_contract_lift l
-            left join sys_user u on l.salesman = u.user_id  AND l.del_flag = u.del_flag
-            left join sys_user u2 on CAST(l.quoter AS SIGNED)  = u2.user_id AND l.del_flag = u2.del_flag
-            left join tb_agent ag on l.agent_id = ag.agent_id AND l.del_flag = ag.del_flag
-            left join tc_account account on l.end_customers = account.account_id AND l.del_flag = account.del_flag
-            left join tb_country country on country.country_id = l.country_id  AND l.del_flag = country.del_flag
-            left join tb_area area on area.area_id = l.area_id  AND l.del_flag = area.del_flag
-            left join sys_dict_data t1 on t1.dict_type = 'elevator_type' and l.elevator_type = t1.dict_value
-            left join tq_contract contract on contract.contract_no = l.contract_no  AND l.del_flag = contract.del_flag
+            LEFT JOIN sys_user u on l.salesman = u.user_id  AND l.del_flag = u.del_flag
+            LEFT JOIN sys_user u2 on CAST(l.quoter AS SIGNED)  = u2.user_id AND l.del_flag = u2.del_flag
+            LEFT JOIN tb_agent ag on l.agent_id = ag.agent_id AND l.del_flag = ag.del_flag
+            LEFT JOIN tc_account account on l.end_customers = account.account_id AND l.del_flag = account.del_flag
+            LEFT JOIN tb_country country on country.country_id = l.country_id  AND l.del_flag = country.del_flag
+            LEFT JOIN tb_area area on area.area_id = l.area_id  AND l.del_flag = area.del_flag
+            LEFT JOIN sys_dict_data t1 on t1.dict_type = 'elevator_type' and l.elevator_type = t1.dict_value
+            LEFT JOIN tq_contract contract on contract.contract_no = l.contract_no  AND l.del_flag = contract.del_flag
+            LEFT JOIN (select count(*) as version,contract_no from tq_contract_history where del_flag = '0' group by contract_no) v on v.contract_no = l.contract_no
     </sql>
 
     <select id="selectTqContractLiftList" resultType="com.ruoyi.project.business.domain.vo.contract.TqContractLiftVo">
         <include refid="selectTqContractLiftVo"/>
         <where>
             l.del_flag != '1'
-            <if test="approveStatus != null  and approveStatus != ''"> and contract.approve_status = #{approveStatus}</if>
+            <if test="approveStatus != null  and approveStatus != ''"> and (contract.approve_status = #{approveStatus} or CAST(SUBSTRING_INDEX(l.contract_no_version_no, '-', -1) AS UNSIGNED) &lt; v.version)</if>
             <if test="contractNo != null  and contractNo != ''"> and l.contract_no like concat('%', #{contractNo}, '%')</if>
             <if test="contractName != null  and contractName != ''"> and l.contract_name like concat('%', #{contractName}, '%')</if>
             <if test="areaId != null and areaId.size() > 0">

+ 19 - 3
RuoYi-Vue-fast-master/src/main/resources/mybatis/business/contract/TqContractMapper.xml

@@ -95,10 +95,26 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id = #{id}
     </select>
     <select id="selectTqContractBoList" resultMap="TqContractVoResult">
-        select ah.*,account.account_name as account_name,flow.status as flowStatus  from tq_contract as ah
-        left join sys_user u on ah.salesman = u.user_id and u.del_flag = '0'
-        left join tc_account account on ah.end_customers = account.account_id  and account.del_flag = '0'
+        select ah.*,account.account_name as account_name,flow.status as flowStatus,u.nick_name as salesman_name,ag.agent_name,
+            CASE #{language}
+            WHEN 'chinese' THEN country.country_name
+            WHEN 'english' THEN country.country_nameUS
+            WHEN 'russia' THEN country.country_nameRU
+            WHEN 'spanish' THEN country.country_nameES
+            END AS country_name,
+            CASE #{language}
+            WHEN 'chinese' THEN area.area_name
+            WHEN 'english' THEN area.area_nameUS
+            WHEN 'russia' THEN area.area_nameRU
+            WHEN 'spanish' THEN area.area_nameES
+            END AS area_name
+               from tq_contract as ah
+        LEFT JOIN sys_user u on ah.salesman = u.user_id and u.del_flag = '0'
+        LEFT JOIN tc_account account on ah.end_customers = account.account_id  and account.del_flag = '0'
         LEFT JOIN flow flow ON ah.id = flow.business_id and ah.contract_no = flow.business_desc and flow.del_flag = '0'
+        LEFT JOIN tb_country country on country.country_id = ah.country_id  AND ah.del_flag = country.del_flag
+        LEFT JOIN tb_area area on area.area_id = ah.area_id  AND ah.del_flag = area.del_flag
+        left join tb_agent ag on ah.agent_id = ag.agent_id AND ah.del_flag = ag.del_flag
         <where>
             ah.del_flag != '1'
             and flow.del_flag = '0'

+ 2 - 0
ruoyi-ui-vue2/src/components/element/form/items/Select.vue

@@ -36,6 +36,7 @@
         :key="item[`${valueProp}`]"
         :value="item[`${valueProp}`]"
         :label="item[`${labelProp}`]"
+        :title="item[`${labelProp}`]"
       />
       </el-select>
       </span>
@@ -63,6 +64,7 @@
         :key="item[`${valueProp}`]"
         :value="item[`${valueProp}`]"
         :label="item[`${labelProp}`]"
+        :title="item[`${labelProp}`]"
         :disabled="disabledFunc(item)"
       />
     </el-select>

+ 11 - 16
ruoyi-ui-vue2/src/views/contract/edit.vue

@@ -765,7 +765,7 @@ export default {
           this.getHistoryForm();
         } else {
           //编辑或者变更
-          await this.getAccount();
+          await this.getContractInformation();
 
         }
       } else {
@@ -970,7 +970,7 @@ export default {
       }
     },
     /** 查询合同信息 */
-    async getAccount() {
+    async getContractInformation() {
       if (this.contractId !== null) {
         await getContractById(this.contractId).then(response => {
           this.form = response.data;
@@ -1028,6 +1028,8 @@ export default {
             if(this.type === 'amendment'  ){
               //补充变更原因
               this.contractHistory.changeRemark =  this.amendmentForm.remark
+              //将合同金额的千分位恢复
+              this.contractHistory.amount = delcommafy(this.contractHistory.amount)
               //添加履历信息
               contract.tqContractHistory = Object.assign({}, this.contractHistory);
             }
@@ -1662,21 +1664,14 @@ export default {
   margin-right: 5px;
 }
 
-
 ::v-deep  .my-select .el-select-dropdown__item {
-  width: 320px;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-}
-
-::v-deep .my-select .el-select-dropdown__item:hover {
-  overflow: visible; /* 鼠标悬停时显示全部内容 */
-  white-space: nowrap; /* 设置换行 */
-  max-height: none; /* 去掉最大高度限制 */
-  background: white; /* 可选,用于突出显示悬停 */
-  z-index: 1; /* 确保悬停时的元素在上层 */
+  span {
+    max-width: 170px;
+    display: inline-block;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+  }
 }
 
-
 </style>

+ 1 - 6
ruoyi-ui-vue2/src/views/contract/index.vue

@@ -271,8 +271,6 @@ export default {
         city: null,
         agentType: null,
         hasContract: null,
-        parentAgentId: null,
-        parentSalerId: null,
         agentLevel: null,
         discount: null,
         head: null,
@@ -282,10 +280,7 @@ export default {
         status: null,
         permissionChar: null,
         origin: null,
-        firstCooperationYear: null,
-        protocolStartDate: null,
-        protocolEndDate: null,
-        authorizedArea: null
+        language: this.$i18n.locale,
       },
       curCountryOps: [],
       // 区域tree