WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
高嵩
2022-09-23 14:51:35 +08:00
parent bcae7f63af aac1bd08d7
commit ac80775521
5 changed files with 44 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/db/蔚来标准sql/dev_third_record.sql
+9 -1
View File
@@ -1114,4 +1114,12 @@ INSERT INTO `laws_weilai`.`sys_permission`(`id`, `parent_id`, `name`, `url`, `co
-- 上报库 添加项目目标市场 2022-09-19
ALTER TABLE `laws_weilai`.`params_report`
ADD COLUMN `target_market` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '目标市场' AFTER `title`;
ADD COLUMN `target_market` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '目标市场' AFTER `title`;
-- 虚拟清单表修改备注字段长度由300改为1000 2022-09-23 未同步生产环境
ALTER TABLE `laws_weilai`.`dummy_inventory_info`
MODIFY COLUMN `remark` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注' AFTER `duty_territory`;
-- 法规清单表修改备注字段长度由300改为1000 2022-09-23 未同步生产环境
ALTER TABLE `laws_weilai`.`project_laws_inventory`
MODIFY COLUMN `remark` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注' AFTER `engineering_interface_person`;
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java
+3 -3
View File
@@ -1277,12 +1277,12 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
}
//备注 remark
if(StringUtils.isNotBlank(remark)){
if(remark.length() > 300){
if(remark.length() > 1000){
String message = "";
if(CutEnum.CN.getValue().equals(dummyInventoryInfoEOTemp.getCut())){
message = errorMsg + "备注不能超过300个字符, ";
message = errorMsg + "备注不能超过1000个字符, ";
}else{
message = errorMsg + " Note The value cannot exceed 300 characters, ";
message = errorMsg + " Note The value cannot exceed 1000 characters, ";
}
msgList.add(message);
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
+9 -9
View File
@@ -5199,12 +5199,12 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
}
//备注 remark
if(StringUtils.isNotBlank(remark)){
if(remark.length() > 300){
if(remark.length() > 1000){
String message = "";
if(CutEnum.CN.getValue().equals(projectLawsInventoryEOTemp.getCut())){
message = errorMsg + "备注不能超过300个字符, ";
message = errorMsg + "备注不能超过1000个字符, ";
}else{
message = errorMsg + " Note The value cannot exceed 300 characters, ";
message = errorMsg + " Note The value cannot exceed 1000 characters, ";
}
msgList.add(message);
}
@@ -5517,12 +5517,12 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
}
//备注 remark
if(StringUtils.isNotBlank(remark)){
if(remark.length() > 300){
if(remark.length() > 1000){
String message = "";
if(CutEnum.CN.getValue().equals(projectLawsInventoryEOTemp.getCut())){
message = errorMsg + "备注不能超过300个字符, ";
message = errorMsg + "备注不能超过1000个字符, ";
}else{
message = errorMsg + " Note The value cannot exceed 300 characters, ";
message = errorMsg + " Note The value cannot exceed 1000 characters, ";
}
msgList.add(message);
}
@@ -5824,12 +5824,12 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
// }
// //备注 remark
// if(StringUtils.isNotBlank(remark)){
// if(remark.length() > 300){
// if(remark.length() > 1000){
// String message = "";
// if(CutEnum.CN.getValue().equals(projectLawsInventoryEOTemp.getCut())){
// message = errorMsg + "备注不能超过300个字符, ";
// message = errorMsg + "备注不能超过1000个字符, ";
// }else{
// message = errorMsg + " Note The value cannot exceed 300 characters, ";
// message = errorMsg + " Note The value cannot exceed 1000 characters, ";
// }
// msgList.add(message);
// }
jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyFill.vue
+22 -1
View File
@@ -74,6 +74,7 @@
:columns="columns"
>
<span slot="operation" slot-scope="text,record">
<a class="text-operation" @click="copyClick(record)">{{$t('copy')}}</a>
<a class="text-operation" @click="viewClick(record)">{{$t('view')}}</a>
<a class="text-operation" @click="edit(record)">{{$t('edit')}}</a>
<a class="text-operation" @click="deleteLib(record)">{{$t('deleteLib')}}</a>
@@ -181,7 +182,7 @@
title: this.$t('operation'),
align: 'center',
fixed: 'right',
width: 180,
width: 190,
scopedSlots: { customRender: 'operation' }
}
]
@@ -192,6 +193,26 @@
this.getList()
},
methods: {
copyClick(row){
let _this = this
this.$confirm({
content: _this.$t('ConfirmReplication'),
onOk() {
let query = JSON.parse(JSON.stringify(row))
delete query.id
delete query.exportState
delete query.exportStateName
postAction('/report/lawsMonthlyReportWriteEO/add', query).then((res) => {
if (res.success) {
_this.$message.success(_this.$t('OperationSuccessful'))
_this.getList()
} else {
_this.$message.warning(res.message)
}
})
}
})
},
dateChange(item) {
this.queryParam[item.db_field_name] = this.queryParam[item.db_field_name] ? moment(this.queryParam[item.db_field_name]).format('YYYY-MM') : ''
this.queryParam = { ...this.queryParam }
jero-web/vue.config.js
+1 -1
View File
@@ -92,7 +92,7 @@ module.exports = {
}
}, */
'/jero-boot': {
target: 'http://localhost:8080', //请求本地 jero-boot后台项目
target: 'http://10.0.1.14:8080', //请求本地 jero-boot后台项目
// target: 'http://10.10.10.46:8101', //请求本地 jero-boot后台项目
// target: 'http://10.0.1.25:8080',
// target: 'http://10.0.1.5:8080',