From d433306dd16e228d0661e7b6eae328d3a41adb6a Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Thu, 7 Jul 2022 08:53:39 +0800 Subject: [PATCH 01/16] =?UTF-8?q?=E6=9C=88=E6=8A=A5=E6=95=B4=E5=90=88?= =?UTF-8?q?=E5=AF=BC=E5=87=BA(=E4=B8=B4=E6=97=B6)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LawsMonthlyReportWriteEOController.java | 12 +++ .../entity/LawsMonthlyReportWriteEO.java | 4 + .../ILawsMonthlyReportWriteEOService.java | 3 + .../LawsMonthlyReportWriteEOServiceImpl.java | 83 ++++++++++++++++++ .../jero/modules/report/util/WordUtil.java | 87 +++++++++++++++++++ 5 files changed, 189 insertions(+) create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/util/WordUtil.java diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/controller/LawsMonthlyReportWriteEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/controller/LawsMonthlyReportWriteEOController.java index aef3b081d..8c873e5d6 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/controller/LawsMonthlyReportWriteEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/controller/LawsMonthlyReportWriteEOController.java @@ -10,6 +10,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; @@ -22,6 +23,7 @@ import org.springframework.web.servlet.ModelAndView; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import java.io.IOException; import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -172,4 +174,14 @@ public class LawsMonthlyReportWriteEOController extends JeroController exportMonthlyReport(LawsMonthlyReportWriteEO lawsMonthlyReportWriteEO) throws IOException { + return lawsMonthlyReportWriteEOService.exportMonthlyReport(lawsMonthlyReportWriteEO); + } + } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/entity/LawsMonthlyReportWriteEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/entity/LawsMonthlyReportWriteEO.java index 16af6ede5..d5244a469 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/entity/LawsMonthlyReportWriteEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/entity/LawsMonthlyReportWriteEO.java @@ -187,4 +187,8 @@ public class LawsMonthlyReportWriteEO implements Serializable { @TableField(exist = false) private String cut; + //导出 + @TableField(exist = false) + private String ids; + } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/ILawsMonthlyReportWriteEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/ILawsMonthlyReportWriteEOService.java index 82c461d68..503feabb0 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/ILawsMonthlyReportWriteEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/ILawsMonthlyReportWriteEOService.java @@ -3,6 +3,7 @@ package com.jero.modules.report.service; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; import com.jero.modules.report.entity.LawsMonthlyReportWriteEO; +import org.springframework.http.ResponseEntity; import javax.servlet.http.HttpServletRequest; import java.util.List; @@ -74,4 +75,6 @@ public interface ILawsMonthlyReportWriteEOService extends IService exportMonthlyReport(LawsMonthlyReportWriteEO lawsMonthlyReportWriteEO); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java index 8906e352a..60deb8c14 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java @@ -18,13 +18,21 @@ import com.jero.modules.report.service.ILawsMonthlyReportTitleTemplateEOService; import com.jero.modules.report.service.ILawsMonthlyReportWriteEOService; import com.jero.modules.report.service.INewOpinionTemplateEOService; import com.jero.modules.report.service.INewStandardTemplateEOService; +import com.jero.modules.report.util.WordUtil; import com.jero.modules.system.entity.SysCategory; import com.jero.modules.system.service.impl.SysCategoryServiceImpl; import com.jero.modules.system.util.StringUtils; +import org.apache.poi.xwpf.usermodel.ParagraphAlignment; +import org.apache.poi.xwpf.usermodel.XWPFDocument; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Service; import javax.servlet.http.HttpServletRequest; +import java.io.File; +import java.io.FileOutputStream; +import java.io.IOException; import java.util.ArrayList; import java.util.Arrays; import java.util.Date; @@ -48,6 +56,8 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl exportMonthlyReport(LawsMonthlyReportWriteEO lawsMonthlyReportWriteEO) { + ResponseEntity result = null; + //获取数据 + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + if(StringUtils.isNotBlank(lawsMonthlyReportWriteEO.getMonth())){ + wrapper.eq(LawsMonthlyReportWriteEO::getMonth,lawsMonthlyReportWriteEO.getMonth()); + } + if(StringUtils.isNotBlank(lawsMonthlyReportWriteEO.getIds())){ + wrapper.in(LawsMonthlyReportWriteEO::getId,StringUtils.join(lawsMonthlyReportWriteEO.getIds(),"")); + } + List lawsMonthlyReportWriteEOS = this.list(wrapper); + //月报填写列表所有的章节目录 + List memoriesChapterList = lawsMonthlyReportWriteEOS.stream() + .map(LawsMonthlyReportWriteEO::getMemoriesChapter).distinct().collect(Collectors.toList()); + + //所有的章节目录 + List lawsMonthlyReportTitleTemplateEOS = lawsMonthlyReportTitleTemplateEOService.list(); + lawsMonthlyReportTitleTemplateEOS = lawsMonthlyReportTitleTemplateEOS.stream() + .filter(e -> memoriesChapterList.contains(e.getId())).collect(Collectors.toList()); + + String path = uploadpath + "/tempZip"; + File fileTemp = new File(path); + if (fileTemp.exists()) { + fileTemp.delete(); + } + fileTemp.mkdirs(); + createWord(path,lawsMonthlyReportWriteEOS,lawsMonthlyReportTitleTemplateEOS); + + + + + return null; + } + + /** + * + * @param path + * @param lawsMonthlyReportWriteEOS 列表数据 + * @param lawsMonthlyReportTitleTemplateEOS 章节目录 + */ + private void createWord(String path, + List lawsMonthlyReportWriteEOS, + List lawsMonthlyReportTitleTemplateEOS){ + //蔚来汽车法规月报-202004-主页面-CN + //NIO Monthly Report on Automobile Regulations-202004-Main Page-EN + String memoriesChapterCN = path + File.separator +"蔚来汽车法规月报" + lawsMonthlyReportWriteEOS.get(0).getMonth()+"主页面-CN.docx"; + String memoriesChapterEN = path + File.separator +"NIO Monthly Report on Automobile Regulations-" + lawsMonthlyReportWriteEOS.get(0).getMonth()+"-Main Page-EN.docx"; + + File wordFile = new File(memoriesChapterCN); + if(!wordFile.exists()){ + try { + wordFile.getParentFile().mkdirs(); + wordFile.createNewFile(); + } catch (IOException e) { + log.error("文件《"+memoriesChapterCN+"》创建失败"); + } + } + + try (XWPFDocument document = new XWPFDocument(); + FileOutputStream out = new FileOutputStream(wordFile)) { + WordUtil.exportWord(document, memoriesChapterCN, null, ParagraphAlignment.CENTER, 0, 12, false, true, "Microsoft YaHei UI"); + + + + } catch (IOException e) { + log.error("文件创建异常,异常信息为：" + e.getMessage()); + } + + + + } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/util/WordUtil.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/util/WordUtil.java new file mode 100644 index 000000000..607d5da73 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/util/WordUtil.java @@ -0,0 +1,87 @@ +package com.jero.modules.report.util; + +import cn.hutool.core.util.ObjectUtil; +import org.apache.commons.lang.StringUtils; +import org.apache.poi.xwpf.usermodel.ParagraphAlignment; +import org.apache.poi.xwpf.usermodel.XWPFDocument; +import org.apache.poi.xwpf.usermodel.XWPFParagraph; +import org.apache.poi.xwpf.usermodel.XWPFRun; + +public class WordUtil { + /** + * 导出工具示例 + * + * @param document POI文件类 + * @param text 输出文本 + * @param textColor 字体颜色 + * @param align 字体位置，默认居左 + * @param spaceNum 预留空格数，默认不留空格 + * @param fontSize 字体大小，默认11 + * @param isNewline 是否换行，换行后文本失效 + * @param isBold 是否加粗，默认不加粗 + * @param fontFamily 字体，默认宋体 + */ + public static void exportWord(XWPFDocument document, + String text, + String textColor, + ParagraphAlignment align, + Integer spaceNum, + Integer fontSize, + Boolean isNewline, + Boolean isBold, + String fontFamily) { + + document.createParagraph(); + + //添加标题 + XWPFParagraph titleParagraph = document.createParagraph(); + //设置段落左对齐 + if (align == null) { + titleParagraph.setAlignment(ParagraphAlignment.LEFT); + } else { + titleParagraph.setAlignment(align); + } + + XWPFRun titleParagraphRun = titleParagraph.createRun(); + if (isNewline) { + titleParagraphRun.setText("\r"); + } else { + //封装文字内容 + StringBuilder newText = new StringBuilder(); + for (int i = 0; i < spaceNum; i++) { + newText.append(" "); + } + newText.append(text); + titleParagraphRun.setText(newText.toString()); + + //设置颜色 + if (StringUtils.isNotEmpty(textColor)) { + titleParagraphRun.setColor(textColor); + } else { + titleParagraphRun.setColor("000000"); + } + //设置文字大小 + if (ObjectUtil.isNotEmpty(fontSize)) { + titleParagraphRun.setFontSize(fontSize); + } else { + titleParagraphRun.setFontSize(11); + } + + //设置加粗 + if (ObjectUtil.isNotEmpty(isBold)) { + titleParagraphRun.setBold(isBold); + } else { + titleParagraphRun.setBold(false); + } + + //设置字体样式 + if (StringUtils.isNotEmpty(fontFamily)) { + titleParagraphRun.setFontFamily(fontFamily); + } else { + titleParagraphRun.setFontFamily("宋体"); + } + + } + } +} + From 9d27eabd99a98437891ef2079ae4ae2becbf3138 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Thu, 7 Jul 2022 09:38:47 +0800 Subject: [PATCH 02/16] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93?= =?UTF-8?q?=E5=B7=B2=E7=9F=A5bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ParameterItemCollectionList.vue | 29 ++++++++++--------- .../components/TaskParameterCollection.vue | 4 +-- 2 files changed, 18 insertions(+), 15 deletions(-) diff --git a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue index 6006c8b5b..5b8e110c1 100644 --- a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue +++ b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue @@ -304,7 +304,7 @@ -
+
{{ currentPersonRole =='homo'? $t('certifiedEngineer'): (currentPersonRole =='sdt'? $t('engineeringInterfacePerson'): $t('completedBy')) }}{{$t('Datastatusis')}} - + '{{$t('CollectionInitiated')}}'、'{{$t('ReturnedPerson')}}'{{$t('or')}}'{{$t('alteration')}}' - + '{{$t('Submitted')}}'{{$t('or')}}'{{$t('alteration')}}' - + '{{$t('CollectionInitiated')}}' - + '{{$t('handledInterface')}}'{{$t('or')}}'{{$t('Filledreturn')}}' - + '{{$t('completed')}}'{{$t('or')}}'{{$t('ReturnedEngineer')}}' - + {{$t('Submitted')}} - + '{{$t('handledInterface')}}'{{$t('or')}}'{{$t('Filledreturn')}}' - + '{{$t('completed')}}'{{$t('or')}}'{{$t('ReturnedEngineer')}}' - + '{{$t('handledInterface')}}'{{$t('or')}}'{{$t('Filledreturn')}}' - + {{$t('completed')}} - + {{$t('Submitted')}} {{$t('timeoperation')}} @@ -1674,4 +1674,7 @@ } } } + .text-wraning{ + word-break: break-word; + } \ No newline at end of file diff --git a/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue b/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue index 3a0c09d0e..d2cc97db2 100644 --- a/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue +++ b/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue @@ -155,14 +155,14 @@ title: this.$t('collectionCompletionTime'), align: 'center', dataIndex: 'finishTime', - width: 160, + width: 180, ellipsis: true, scopedSlots: { customRender: 'collectionCompletionTime' } }, { title: this.$t('Version'), align: 'center', - width: 50, + width: 80, ellipsis: true, dataIndex: 'version' }, From 76e1054cc97323d4b78ce1a8c603dcc616150bc6 Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Thu, 7 Jul 2022 09:53:13 +0800 Subject: [PATCH 03/16] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/searchalonesplit/index.vue | 8 +++---- .../searchCenter/components/whole.vue | 23 +++++++++++-------- .../commponts/conventionalmodle.vue | 6 ++--- 3 files changed, 19 insertions(+), 18 deletions(-) diff --git a/jero-web/src/components/searchalonesplit/index.vue b/jero-web/src/components/searchalonesplit/index.vue index 77bfd3a66..ee71b3b6e 100644 --- a/jero-web/src/components/searchalonesplit/index.vue +++ b/jero-web/src/components/searchalonesplit/index.vue @@ -23,14 +23,14 @@
{{item.db_field_txt}}
-
{{item.db_field_txt}}
-
@@ -90,14 +90,14 @@
{{item.db_field_txt}}
-
{{item.db_field_txt}}
-
diff --git a/jero-web/src/views/documentTools/searchCenter/components/whole.vue b/jero-web/src/views/documentTools/searchCenter/components/whole.vue index 899af7f78..43aaff7fb 100644 --- a/jero-web/src/views/documentTools/searchCenter/components/whole.vue +++ b/jero-web/src/views/documentTools/searchCenter/components/whole.vue @@ -11,31 +11,34 @@
- + - - - + - - + v-html="item.serial_number"> - - + + + + + + + + +
@@ -122,6 +123,7 @@ export default { return { certCategoryParamsInfoEOList: [], orderBy: '1', + textLoading:false, selectedRowKeysArray: '', token:Vue.ls.get(ACCESS_TOKEN), loading: false, @@ -235,11 +237,14 @@ export default { }, // 发布版本 releaseVersion() { + this.textLoading = true getAction('params/paramsInfo/publish', { paramsTemplateId: this.$route.query.id }).then((res) => { if (res.success) { this.$message.success(res.result) + this.textLoading = false } else { this.$message.warning(res.message) + this.textLoading = false } }) }, diff --git a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue index 5b8e110c1..32dfd34d3 100644 --- a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue +++ b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue @@ -1124,7 +1124,8 @@ let data = JSON.parse(JSON.stringify(this.dataSource)) let selectedRowKeysValue = [] data.forEach(res => { - if (res.state == 'Wait Fill' || res.state == '待填写') { + if (res.state == 'Wait Fill' || res.state == '待填写' || res.state == '认证工程师退回' || + res.state == 'Cert Back') { selectedRowKeysValue.push(res) } }) From 4524f45031c71ece7a474a458268dc345d8b5a9a Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Fri, 8 Jul 2022 14:40:54 +0800 Subject: [PATCH 10/16] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93?= =?UTF-8?q?=E5=B7=B2=E7=9F=A5bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/evaluationResultsList.vue | 114 ++++++++++++++++-- .../collectionOfRegulatoryOpinions/index.vue | 72 +++++++++-- .../processForm/processDetails/index.vue | 13 +- 3 files changed, 171 insertions(+), 28 deletions(-) diff --git a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/evaluationResultsList.vue b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/evaluationResultsList.vue index eb55411df..fb1d93dfa 100644 --- a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/evaluationResultsList.vue +++ b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/evaluationResultsList.vue @@ -24,33 +24,69 @@ :data-source="dataSource" :columns="columns" > + + + {{$t('viewFile')}} + + -- + +
+ +
- 对外意见归档: + 对外意见归档: +
+ + {{$t('clickUpload')}} +
+
+ + {{$t('viewFile')}} +
{{$t('cancel')}}
- + +
+ \ No newline at end of file diff --git a/jero-web/src/views/businessSupport/regulationReport/components/modules/defaultTemplate.vue b/jero-web/src/views/businessSupport/regulationReport/components/modules/defaultTemplate.vue index 80632e53a..cdd5dd3a4 100644 --- a/jero-web/src/views/businessSupport/regulationReport/components/modules/defaultTemplate.vue +++ b/jero-web/src/views/businessSupport/regulationReport/components/modules/defaultTemplate.vue @@ -9,7 +9,7 @@
@@ -23,7 +23,7 @@
@@ -42,6 +42,7 @@ tree-node-filter-prop="title" v-model="formInline.technologyTerritory" :maxTagCount="1" + :disabled="disabled" :getPopupContainer="triggerNode=> triggerNode.parentNode" class="box-input" style="width: 100%" @@ -62,6 +63,7 @@ @@ -78,6 +80,7 @@ @@ -91,6 +94,7 @@ @@ -110,6 +114,7 @@ @input="handleInput('usage')" :placeholder="$t('PleaseSelect')+$t('usage')" :type="'select'" + :disabled="disabled" :triggerChange="false" :dictCode="'yong4_fa3'"/> @@ -183,6 +188,7 @@ @@ -197,6 +203,7 @@ @@ -211,6 +218,7 @@ @@ -225,6 +233,7 @@ @@ -239,10 +248,11 @@ + v-model="formInline.lawsContact"/> @@ -255,7 +265,7 @@ @@ -272,7 +282,7 @@ export default { name: 'defaultTemplate', - props: ['formInlineQuery'], + props: ['formInlineQuery', 'disabled'], components: { PersonnelSelection }, @@ -358,8 +368,7 @@ ] }, formInline: {}, - CategoryTreeList: [], - disabled: false + CategoryTreeList: [] } }, mounted() { @@ -367,20 +376,24 @@ this.$nextTick(() => { if (this.formInlineQuery.id) { this.formInline = JSON.parse(JSON.stringify(this.formInlineQuery)) - if(this.formInline.technologyTerritory){ + if (this.formInline.technologyTerritory) { this.formInline.technologyTerritory = this.formInline.technologyTerritory.split(',') } this.formInline = { ...this.formInline } } else { this.formInline = {} - this.formInline.lawsContactName = this.userInfo().username - this.formInline.lawsContact = this.userInfo().id + this.formInline.lawsContact = this.userInfo().username + this.formInline.lawsContactName = this.userInfo().id this.formInline = { ...this.formInline } } }) }, methods: { ...mapGetters(['userInfo']), + getStandData(value) { + this.formInline.titleCn = value.serial_number + ' ' + value.title + this.formInline.titleEn = value.serial_number + ' ' + value.title_en + }, getSysCategoryTree() { getAction('/sys/category/getSysCategoryTree', {}).then((res) => { if (res.success) { diff --git a/jero-web/src/views/businessSupport/regulationReport/components/modules/fillAdd.vue b/jero-web/src/views/businessSupport/regulationReport/components/modules/fillAdd.vue index 2258f7fb4..22f173f08 100644 --- a/jero-web/src/views/businessSupport/regulationReport/components/modules/fillAdd.vue +++ b/jero-web/src/views/businessSupport/regulationReport/components/modules/fillAdd.vue @@ -15,12 +15,14 @@
- * + * {{$t('fillInTheMonth')}}
- + @@ -28,7 +30,9 @@
- {{$t('bringInStandardInformation')}} + {{$t('bringInStandardInformation')}} +
@@ -36,15 +40,16 @@
- * + * {{$t('chapterContents')}}
- +
- * + * {{$t('contentTemplate')}}
- + - - - + + +
{{$t('cancel')}} - {{$t('submit')}} + {{$t('submit')}} +
+
@@ -101,14 +108,17 @@ import defaultTemplate from './defaultTemplate' import solicitOpinions from './solicitOpinions' import releaseStandard from './releaseStandard' + import addModel from './addModel' import { getAction, postAction, downloadFile } from '@/api/manage' + import moment from 'moment' export default { name: 'fillAdd', components: { defaultTemplate, solicitOpinions, - releaseStandard + releaseStandard, + addModel }, data() { return { @@ -140,7 +150,9 @@ confirmLoading: false, title: '', disabled: false, + isTrue: false, chapterContentsList: [], + templateDisabled: false, contentTemplateList: [ { id: '1', @@ -165,6 +177,12 @@ mounted() { }, methods: { + bringInStandardInformationClick() { + this.$refs.addModelRef.addModel() + }, + addModelForm(value) { + this.$refs.defaultTemplateRef.getStandData(value) + }, getTree() { getAction('/report/lawsMonthlyReportTitleTemplateEO/list', {}).then((res) => { if (res.success) { @@ -174,37 +192,53 @@ } }) }, + dateChange(item) { + this.formInline[item.db_field_name] = this.formInline[item.db_field_name] ? moment(this.formInline[item.db_field_name]).format('YYYY-MM') : '' + this.formInline = { ...this.formInline } + }, add() { + this.isTrue = false + this.templateDisabled = false this.getTree() this.title = this.$t('addContent') this.visible = true this.disabled = false + this.formInline = {} this.$nextTick(() => { - this.formInline = {} this.formInline.contentTemplate = '1' this.formInline = { ...this.formInline } + this.isTrue = true this.$refs.ruleForm.clearValidate() }) }, edit(row) { this.getTree() + this.isTrue = false this.title = this.$t('editContent') this.visible = true this.disabled = false + this.templateDisabled = true this.$nextTick(() => { this.formInline = row if (this.formInline.memoriesChapter) { this.formInline.memoriesChapter = this.formInline.memoriesChapter.split(',') } + this.isTrue = true this.$refs.ruleForm.clearValidate() }) }, view(row) { this.title = this.$t('viewContent') this.visible = true + this.isTrue = false + this.templateDisabled = true this.disabled = true this.$nextTick(() => { this.formInline = row + if (this.formInline.memoriesChapter) { + this.formInline.memoriesChapter = this.formInline.memoriesChapter.split(',') + } + this.isTrue = true this.$refs.ruleForm.clearValidate() }) }, @@ -237,17 +271,16 @@ } }) let query = Object.assign(val, { - month: JSON.stringify(formInline.month), + month: formInline.month, memoriesChapter: formInline.memoriesChapter, contentTemplate: formInline.contentTemplate }) - postAction(url, query).then((res) => { if (res.success) { this.$message.success(this.$t('OperationSuccessful')) this.visible = false this.confirmLoading = false - this.$emit('fillTableAddForm') + this.$emit('fillAddForm') } else { this.confirmLoading = false this.$message.warning(this.$t('operationFailed')) @@ -260,7 +293,15 @@ } } +