diff --git a/jero-boot/db/蔚来标准sql/dev_third_record.sql b/jero-boot/db/蔚来标准sql/dev_third_record.sql index 4fa0f81cf..e09c41e5a 100644 --- a/jero-boot/db/蔚来标准sql/dev_third_record.sql +++ b/jero-boot/db/蔚来标准sql/dev_third_record.sql @@ -855,18 +855,17 @@ CREATE TABLE `laws_weilai`.`country_national_flag` ( `national_flag_url` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '国旗url', PRIMARY KEY (`id`) USING BTREE ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '国家与国旗中间表' ROW_FORMAT = Dynamic; --- 初始化数据 2022-08-09 -INSERT INTO `laws_weilai`.`country_national_flag` (`id`, `create_by`, `create_time`, `update_by`, `update_time`, `sys_org_code`, `country_name_cn`, `country_name_en`, `national_flag_id`, `national_flag_url`) VALUES ('11', NULL, NULL, NULL, NULL, NULL, '澳大利亚', 'Australia', NULL, '澳大利亚.jpg'); -INSERT INTO `laws_weilai`.`country_national_flag` (`id`, `create_by`, `create_time`, `update_by`, `update_time`, `sys_org_code`, `country_name_cn`, `country_name_en`, `national_flag_id`, `national_flag_url`) VALUES ('12', NULL, NULL, NULL, NULL, NULL, '新西兰', 'New Zealand', NULL, '新西兰.jpg'); -INSERT INTO `laws_weilai`.`country_national_flag` (`id`, `create_by`, `create_time`, `update_by`, `update_time`, `sys_org_code`, `country_name_cn`, `country_name_en`, `national_flag_id`, `national_flag_url`) VALUES ('13', NULL, NULL, NULL, NULL, NULL, '英国', 'UK', NULL, '英国.jpg'); -INSERT INTO `laws_weilai`.`country_national_flag` (`id`, `create_by`, `create_time`, `update_by`, `update_time`, `sys_org_code`, `country_name_cn`, `country_name_en`, `national_flag_id`, `national_flag_url`) VALUES ('2', NULL, NULL, NULL, NULL, NULL, '中国', 'China', NULL, '中国.jpg'); -INSERT INTO `laws_weilai`.`country_national_flag` (`id`, `create_by`, `create_time`, `update_by`, `update_time`, `sys_org_code`, `country_name_cn`, `country_name_en`, `national_flag_id`, `national_flag_url`) VALUES ('3', NULL, NULL, NULL, NULL, NULL, '中国香港', 'Hong Kong China', NULL, '中国香港.jpg'); -INSERT INTO `laws_weilai`.`country_national_flag` (`id`, `create_by`, `create_time`, `update_by`, `update_time`, `sys_org_code`, `country_name_cn`, `country_name_en`, `national_flag_id`, `national_flag_url`) VALUES ('4', NULL, NULL, NULL, NULL, NULL, '韩国', 'South Korea', NULL, '韩国.jpg'); -INSERT INTO `laws_weilai`.`country_national_flag` (`id`, `create_by`, `create_time`, `update_by`, `update_time`, `sys_org_code`, `country_name_cn`, `country_name_en`, `national_flag_id`, `national_flag_url`) VALUES ('5', NULL, NULL, NULL, NULL, NULL, '日本', 'Japan', NULL, '日本.jpg'); -INSERT INTO `laws_weilai`.`country_national_flag` (`id`, `create_by`, `create_time`, `update_by`, `update_time`, `sys_org_code`, `country_name_cn`, `country_name_en`, `national_flag_id`, `national_flag_url`) VALUES ('6', NULL, NULL, NULL, NULL, NULL, '新加坡', 'Singapore', NULL, '新加坡.jpg'); -INSERT INTO `laws_weilai`.`country_national_flag` (`id`, `create_by`, `create_time`, `update_by`, `update_time`, `sys_org_code`, `country_name_cn`, `country_name_en`, `national_flag_id`, `national_flag_url`) VALUES ('7', NULL, NULL, NULL, NULL, NULL, '马来西亚', 'Malaysia', NULL, '马来西亚.jpg'); +-- 初始化数据 2022-08-10 +INSERT INTO `laws_weilai`.`country_national_flag` (`id`, `create_by`, `create_time`, `update_by`, `update_time`, `sys_org_code`, `country_name_cn`, `country_name_en`, `national_flag_id`, `national_flag_url`) VALUES ('1', NULL, NULL, NULL, NULL, NULL, '欧盟', 'EU', NULL, '/jero-boot/nationalFlag/EU.png'); +INSERT INTO `laws_weilai`.`country_national_flag` (`id`, `create_by`, `create_time`, `update_by`, `update_time`, `sys_org_code`, `country_name_cn`, `country_name_en`, `national_flag_id`, `national_flag_url`) VALUES ('10', NULL, NULL, NULL, NULL, NULL, '美国', 'US', NULL, '/jero-boot/nationalFlag/US.png'); +INSERT INTO `laws_weilai`.`country_national_flag` (`id`, `create_by`, `create_time`, `update_by`, `update_time`, `sys_org_code`, `country_name_cn`, `country_name_en`, `national_flag_id`, `national_flag_url`) VALUES ('11', NULL, NULL, NULL, NULL, NULL, '澳大利亚', 'Australia', NULL, '/jero-boot/nationalFlag/Australia.png'); +INSERT INTO `laws_weilai`.`country_national_flag` (`id`, `create_by`, `create_time`, `update_by`, `update_time`, `sys_org_code`, `country_name_cn`, `country_name_en`, `national_flag_id`, `national_flag_url`) VALUES ('12', NULL, NULL, NULL, NULL, NULL, '新西兰', 'New Zealand', NULL, '/jero-boot/nationalFlag/NewZealand.png'); +INSERT INTO `laws_weilai`.`country_national_flag` (`id`, `create_by`, `create_time`, `update_by`, `update_time`, `sys_org_code`, `country_name_cn`, `country_name_en`, `national_flag_id`, `national_flag_url`) VALUES ('13', NULL, NULL, NULL, NULL, NULL, '英国', 'UK', NULL, '/jero-boot/nationalFlag/UK.png'); +INSERT INTO `laws_weilai`.`country_national_flag` (`id`, `create_by`, `create_time`, `update_by`, `update_time`, `sys_org_code`, `country_name_cn`, `country_name_en`, `national_flag_id`, `national_flag_url`) VALUES ('2', NULL, NULL, NULL, NULL, NULL, '中国', 'China', NULL, '/jero-boot/nationalFlag/China.png'); +INSERT INTO `laws_weilai`.`country_national_flag` (`id`, `create_by`, `create_time`, `update_by`, `update_time`, `sys_org_code`, `country_name_cn`, `country_name_en`, `national_flag_id`, `national_flag_url`) VALUES ('3', NULL, NULL, NULL, NULL, NULL, '中国香港', 'Hong Kong China', NULL, '/jero-boot/nationalFlag/China.png'); +INSERT INTO `laws_weilai`.`country_national_flag` (`id`, `create_by`, `create_time`, `update_by`, `update_time`, `sys_org_code`, `country_name_cn`, `country_name_en`, `national_flag_id`, `national_flag_url`) VALUES ('4', NULL, NULL, NULL, NULL, NULL, '韩国', 'South Korea', NULL, '/jero-boot/nationalFlag/SouthKorea.png'); +INSERT INTO `laws_weilai`.`country_national_flag` (`id`, `create_by`, `create_time`, `update_by`, `update_time`, `sys_org_code`, `country_name_cn`, `country_name_en`, `national_flag_id`, `national_flag_url`) VALUES ('5', NULL, NULL, NULL, NULL, NULL, '日本', 'Japan', NULL, '/jero-boot/nationalFlag/Japan.png'); +INSERT INTO `laws_weilai`.`country_national_flag` (`id`, `create_by`, `create_time`, `update_by`, `update_time`, `sys_org_code`, `country_name_cn`, `country_name_en`, `national_flag_id`, `national_flag_url`) VALUES ('6', NULL, NULL, NULL, NULL, NULL, '新加坡', 'Singapore', NULL, '/jero-boot/nationalFlag/Singapore.png'); +INSERT INTO `laws_weilai`.`country_national_flag` (`id`, `create_by`, `create_time`, `update_by`, `update_time`, `sys_org_code`, `country_name_cn`, `country_name_en`, `national_flag_id`, `national_flag_url`) VALUES ('7', NULL, NULL, NULL, NULL, NULL, '马来西亚', 'Malaysia', NULL, '/jero-boot/nationalFlag/Malaysia.png'); INSERT INTO `laws_weilai`.`country_national_flag` (`id`, `create_by`, `create_time`, `update_by`, `update_time`, `sys_org_code`, `country_name_cn`, `country_name_en`, `national_flag_id`, `national_flag_url`) VALUES ('8', NULL, NULL, NULL, NULL, NULL, '海湾地区', 'GCC', NULL, '海湾地区.jpg'); -INSERT INTO `laws_weilai`.`country_national_flag` (`id`, `create_by`, `create_time`, `update_by`, `update_time`, `sys_org_code`, `country_name_cn`, `country_name_en`, `national_flag_id`, `national_flag_url`) VALUES ('9', NULL, NULL, NULL, NULL, NULL, '阿联酋', 'UAE', NULL, '阿联酋.jpg'); -INSERT INTO `laws_weilai`.`country_national_flag` (`id`, `create_by`, `create_time`, `update_by`, `update_time`, `sys_org_code`, `country_name_cn`, `country_name_en`, `national_flag_id`, `national_flag_url`) VALUES ('1', NULL, NULL, NULL, NULL, NULL, '欧盟', 'EU', NULL, '欧盟.jpg'); -INSERT INTO `laws_weilai`.`country_national_flag` (`id`, `create_by`, `create_time`, `update_by`, `update_time`, `sys_org_code`, `country_name_cn`, `country_name_en`, `national_flag_id`, `national_flag_url`) VALUES ('10', NULL, NULL, NULL, NULL, NULL, '美国', 'US', NULL, '美国.jpg'); - +INSERT INTO `laws_weilai`.`country_national_flag` (`id`, `create_by`, `create_time`, `update_by`, `update_time`, `sys_org_code`, `country_name_cn`, `country_name_en`, `national_flag_id`, `national_flag_url`) VALUES ('9', NULL, NULL, NULL, NULL, NULL, '阿联酋', 'UAE', NULL, '/jero-boot/nationalFlag/UAE.png'); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java index dee86850c..3288a7854 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java @@ -293,7 +293,11 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl 1) { + msgEndStr = " have been deleted from the document library."; + } + String msgContent = "The standard " + StringUtils.join(serialNumberListTemp,",") + msgEndStr; homeDocumentDynamicEO.setMsgContent(msgContent); homeDocumentDynamicEO.setMsgContentInfo(msgContent); homeDocumentDynamicEOService.save(homeDocumentDynamicEO); @@ -2596,11 +2600,11 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl fileIdLIstTemp = new ArrayList<>(); @@ -2634,8 +2638,8 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl 0){ - String msgContent = msgContentSb.substring(0, msgContentSb.length() - 1); - String msgContentInfo = msgContentInfoSb.substring(0, msgContentInfoSb.length() - 1); + String msgContent = msgContentSb.substring(0, msgContentSb.length() - 1) + "."; + String msgContentInfo = msgContentInfoSb.substring(0, msgContentInfoSb.length() - 1) + "."; HomeDocumentDynamicEO homeDocumentDynamicEO = new HomeDocumentDynamicEO(); homeDocumentDynamicEO.setMsgContent(msgContent); homeDocumentDynamicEO.setMsgContentInfo(msgContentInfo); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/InventoryAffirmJob.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/InventoryAffirmJob.java index d339bf66d..e1c8e8369 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/InventoryAffirmJob.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/InventoryAffirmJob.java @@ -138,17 +138,17 @@ public class InventoryAffirmJob implements Job { /*String msgContentCN = "您" + projectLibraryBase.getProjectName() + "(项目名称)法规清单的任务确认剩余处理时间还有3天，请及时查看处理";*/ // XXX . - String msgContentEN = "The remaining processing time for the regulation list confirmation for " + String msgContentEN = "The remaining processing time for the regulation task confirmation for " + projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName()+ " " + projectLibraryBase.getTargetMarket() - + " are 3 days. Please check and handle it in time."; + + " are 3 days. Please check and address it in a timely manner."; String msgTitle = projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName()+ " " + projectLibraryBase.getTargetMarket() - + ": You have a regulation list confirmation task to complete"; + + ": You have a regulation task confirmation to complete"; FeishuMsgVo feishuMsgVo = new FeishuMsgVo(); feishuMsgVo.setContent("Hello! The remaining processing time for the task are 3 days. Please check and address it in a timely manner."); - feishuMsgVo.setTaskType("Regulation List Confirmation"); + feishuMsgVo.setTaskType("Regulation Task Confirmation"); feishuMsgVo.setProject(projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + " " + projectLibraryBase.getTargetMarket()); //飞书跳转链接 diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/application-dev.yml b/jero-boot/jero-boot-single-startup/src/main/resources/application-dev.yml index 512e14819..f3c8ae460 100644 --- a/jero-boot/jero-boot-single-startup/src/main/resources/application-dev.yml +++ b/jero-boot/jero-boot-single-startup/src/main/resources/application-dev.yml @@ -92,7 +92,7 @@ spring: mvc: static-path-pattern: /** resource: - static-locations: classpath:/static/,classpath:/public/,classpath:/home/ + static-locations: classpath:/static/,classpath:/public/,classpath:/home,/classpath:/nationalFlag/ autoconfigure: exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure datasource: diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/nationalFlag/Australia.png b/jero-boot/jero-boot-single-startup/src/main/resources/static/nationalFlag/Australia.png new file mode 100644 index 000000000..2c4a076c2 Binary files /dev/null and b/jero-boot/jero-boot-single-startup/src/main/resources/static/nationalFlag/Australia.png differ diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/nationalFlag/China.png b/jero-boot/jero-boot-single-startup/src/main/resources/static/nationalFlag/China.png new file mode 100644 index 000000000..c9634bd83 Binary files /dev/null and b/jero-boot/jero-boot-single-startup/src/main/resources/static/nationalFlag/China.png differ diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/nationalFlag/EU.png b/jero-boot/jero-boot-single-startup/src/main/resources/static/nationalFlag/EU.png new file mode 100644 index 000000000..af12bb40c Binary files /dev/null and b/jero-boot/jero-boot-single-startup/src/main/resources/static/nationalFlag/EU.png differ diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/nationalFlag/Japan.png b/jero-boot/jero-boot-single-startup/src/main/resources/static/nationalFlag/Japan.png new file mode 100644 index 000000000..06c061beb Binary files /dev/null and b/jero-boot/jero-boot-single-startup/src/main/resources/static/nationalFlag/Japan.png differ diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/nationalFlag/Malaysia.png b/jero-boot/jero-boot-single-startup/src/main/resources/static/nationalFlag/Malaysia.png new file mode 100644 index 000000000..b5031a0b6 Binary files /dev/null and b/jero-boot/jero-boot-single-startup/src/main/resources/static/nationalFlag/Malaysia.png differ diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/nationalFlag/NewZealand.png b/jero-boot/jero-boot-single-startup/src/main/resources/static/nationalFlag/NewZealand.png new file mode 100644 index 000000000..a523fa526 Binary files /dev/null and b/jero-boot/jero-boot-single-startup/src/main/resources/static/nationalFlag/NewZealand.png differ diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/nationalFlag/Singapore.png b/jero-boot/jero-boot-single-startup/src/main/resources/static/nationalFlag/Singapore.png new file mode 100644 index 000000000..7ef158e4f Binary files /dev/null and b/jero-boot/jero-boot-single-startup/src/main/resources/static/nationalFlag/Singapore.png differ diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/nationalFlag/SouthKorea.png b/jero-boot/jero-boot-single-startup/src/main/resources/static/nationalFlag/SouthKorea.png new file mode 100644 index 000000000..37cd978e8 Binary files /dev/null and b/jero-boot/jero-boot-single-startup/src/main/resources/static/nationalFlag/SouthKorea.png differ diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/nationalFlag/UAE.png b/jero-boot/jero-boot-single-startup/src/main/resources/static/nationalFlag/UAE.png new file mode 100644 index 000000000..d14615a6c Binary files /dev/null and b/jero-boot/jero-boot-single-startup/src/main/resources/static/nationalFlag/UAE.png differ diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/nationalFlag/UK.png b/jero-boot/jero-boot-single-startup/src/main/resources/static/nationalFlag/UK.png new file mode 100644 index 000000000..7119c8dd0 Binary files /dev/null and b/jero-boot/jero-boot-single-startup/src/main/resources/static/nationalFlag/UK.png differ diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/nationalFlag/US.png b/jero-boot/jero-boot-single-startup/src/main/resources/static/nationalFlag/US.png new file mode 100644 index 000000000..d3c69746f Binary files /dev/null and b/jero-boot/jero-boot-single-startup/src/main/resources/static/nationalFlag/US.png differ diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardList.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardList.vue index e3e4044bf..e9280d893 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardList.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardList.vue @@ -37,55 +37,26 @@
-
+
- 中国 + {{item.applyMarket_dictText}}
-
- - - 中国 - -
-
- - - 中国 - -
-
- - - 中国 - -
-
- - - 中国 - -
-
- - - 中国 - -
-
- -
+
+ +
+ {{$t('dataLoading')}}
@@ -101,11 +72,16 @@ applyMarketList: [], pageSize: 10, total: 0, - pageNo: 1 + pageNo: 1, + loading: false, + url: { + getInfoList: '/problemKnowledgeBase/countryCardManageReleaseEO/page' + } } }, mounted() { this.getApplyMarketList() + this.getList() }, methods: { getApplyMarketList() { @@ -118,10 +94,15 @@ }) }, searchQuery() { - + this.pageNo = 1 + this.getApplyMarketList() + this.getList() }, searchReset() { - + this.pageNo = 1 + this.getApplyMarketList() + this.queryParam = {} + this.getList() }, pageOnChange(page, pageSize) { this.pageNo = page @@ -135,14 +116,19 @@ getList() { let query = { pageNo: this.pageNo, - pageSize: this.pageSize + pageSize: this.pageSize, + releaseStatus: 'Have released', + ...this.queryParam } - postAction(this.url.getInfoList, query).then((res) => { + this.loading = true + getAction(this.url.getInfoList, query).then((res) => { if (res.success) { this.conList = res.result.records this.total = res.result.total + this.loading = false } else { this.conList = [] + this.loading = false } }) }, @@ -153,10 +139,13 @@ }) window.open(newUrl.href, '_blank') }, - contentClick() { + contentClick(row) { let newUrl = this.$router.resolve({ path: '/countryCardView', - query: {} + query: { + applyMarket: row.applyMarket, + id: row.id, + } }) window.open(newUrl.href, '_blank') } @@ -208,6 +197,7 @@ .content-box { width: 100%; + overflow: hidden; } .content-box-box { diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardView.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardView.vue index 65273ad93..6c194fd8a 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardView.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardView.vue @@ -26,16 +26,19 @@
- - + + + + 中国 - + +
中国 - +
@@ -63,7 +66,9 @@ data() { return { clientWidth: '', - isTrue: false + isTrue: false, + dataList: [], + list: '/problemKnowledgeBase/countryCardManageReleaseEO/queryCountryCardManageReleaseByApplyMarkets' } }, mounted() { @@ -72,6 +77,7 @@ this.clientWidth = 340 * 14 + 'px' this.isTrue = true }) + this.queryCountry() }, methods: { displayInformationClick() { @@ -80,8 +86,19 @@ newlyAddedClick() { this.$refs.countryCardViewAddRef.add() }, - countryCardViewAddForm() { + countryCardViewAddForm(val) { + }, + queryCountry() { + let applyMarkets = this.$route.query.applyMarket + let query = { + applyMarkets: applyMarkets + } + postAction(this.list, query).then((res) => { + if (res.success) { + + } + }) } } } diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardViewAdd.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardViewAdd.vue index da74db64a..2c1767b7a 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardViewAdd.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardViewAdd.vue @@ -14,14 +14,15 @@
- * {{$t('applicableMarket')}}
- +
@@ -34,15 +35,24 @@ {{$t('comparisonMarket')+(index+1)}} - + + + + {{ item.applyMarket_dictText}} + + + { this.formInline = {} + this.formInline.applyMarket = this.$route.query.applyMarket this.formInline.dataList = [{ relatedSection: '' }] + this.getList() this.formInline = { ...this.formInline } this.$refs.ruleForm.clearValidate() }) @@ -124,18 +140,71 @@ }, addData() { this.formInline.dataList.push({ - relatedSection: '' + applyMarket: '' }) + this.consolidateData() this.formInline = { ...this.formInline } }, deleteData() { this.formInline.dataList.pop() + this.consolidateData() this.formInline = { ...this.formInline } + }, + getList() { + let query = { + releaseStatus: 'Have released' + } + getAction(this.url.getInfoList, query).then((res) => { + if (res.success) { + this.applyMarketList = res.result + this.consolidateData() + } else { + this.applyMarketList = [] + } + }) + }, + consolidateData() { + let content = [] + content.push(this.$route.query.applyMarket) + content = content.join(',') + this.applyMarketList = this.applyMarketList.filter(res => { + return !content.includes(res.applyMarket) + }) + let contentIndex = [] + if (this.formInline.dataList && this.formInline.dataList.length > 0) { + this.formInline.dataList.forEach(res => { + contentIndex.push(res.applyMarket) + res.applyMarketList = [] + this.applyMarketList.forEach(val => { + res.applyMarketList.push(val) + }) + }) + } + contentIndex = contentIndex.join(',') + for (let i = 0; i < this.formInline.dataList.length; i++) { + for (let j = 0; j < this.formInline.dataList[i].applyMarketList.length; j++) { + if (contentIndex.includes(this.formInline.dataList[i].applyMarketList[j].applyMarket) + && this.formInline.dataList[i].applyMarket != this.formInline.dataList[i].applyMarketList[j].applyMarket) { + console.log(111) + console.log(j) + this.formInline.dataList[i].applyMarketList.splice(j, 1) + j-- + } + } + } + this.formInline = { ...this.formInline } + }, + applyMarketChange() { + this.consolidateData() } } } - +