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

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/controller/LawsMonthlyReportTitleTemplateEOController.java

@@ -100,7 +100,7 @@ public class LawsMonthlyReportTitleTemplateEOController extends JeroController<L
 	 */
 	@AutoLog(value = "月报标题模板-编辑")
 	@ApiOperation(value="月报标题模板-编辑", notes="月报标题模板-编辑")
-	@GetMapping(value = "/edit")
+	@PostMapping(value = "/edit")
 	public Result<?> edit(@Validated @RequestBody LawsMonthlyReportTitleTemplateEO lawsMonthlyReportTitleTemplateEO) {
 		lawsMonthlyReportTitleTemplateEOService.editById(lawsMonthlyReportTitleTemplateEO);
 		return Result.OK("编辑成功!");

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportManageEOServiceImpl.java

@@ -103,6 +103,7 @@ public class LawsMonthlyReportManageEOServiceImpl extends ServiceImpl<LawsMonthl
 			query.in("create_by",sysUser.getUsername()).in("issue_status", InventoryStateEnum.TO_BE_RELEASED.getValue())
 					.or().in("issue_status",InventoryStateEnum.ISSUE.getValue());
 		});
+		queryWrapper.orderByDesc("create_time");
 		Page<LawsMonthlyReportManageEO> pageInfo = this.page(page, queryWrapper);
 		return pageInfo;
 	}

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportTitleTemplateEOServiceImpl.java

@@ -5,12 +5,15 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.jero.common.constant.enums.CutEnum;
+import com.jero.common.exception.JeroBootException;
 import com.jero.common.system.query.QueryGenerator;
 import com.jero.modules.report.entity.LawsMonthlyReportTitleTemplateEO;
+import com.jero.modules.report.entity.LawsMonthlyReportWriteEO;
 import com.jero.modules.report.mapper.LawsMonthlyReportTitleTemplateEOMapper;
 import com.jero.modules.report.service.ILawsMonthlyReportTitleTemplateEOService;
 import com.jero.modules.report.vo.LawsMonthlyReportTitleTemplateVO;
 import com.jero.modules.system.util.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.servlet.http.HttpServletRequest;
@@ -30,6 +33,8 @@ import java.util.stream.Collectors;
 @Service
 public class LawsMonthlyReportTitleTemplateEOServiceImpl extends ServiceImpl<LawsMonthlyReportTitleTemplateEOMapper, LawsMonthlyReportTitleTemplateEO> implements ILawsMonthlyReportTitleTemplateEOService {
 
+	@Autowired
+	private LawsMonthlyReportWriteEOServiceImpl lawsMonthlyReportWriteEOService;
 	/**
 	 * 保存
 	 *
@@ -98,6 +103,21 @@ public class LawsMonthlyReportTitleTemplateEOServiceImpl extends ServiceImpl<Law
 	 */
 	@Override
     public void deleteByIds(List<String> ids) {
+		//标题下存在内容或子标题时不能删除
+		//1. 判断是否存在子标题
+		LambdaQueryWrapper<LawsMonthlyReportTitleTemplateEO> wrapper = new LambdaQueryWrapper<>();
+		wrapper.in(LawsMonthlyReportTitleTemplateEO::getParentId,ids);
+		List<LawsMonthlyReportTitleTemplateEO> list = this.list(wrapper);
+		if(list.size() != 0){
+			throw new JeroBootException("该标题下存在子标题,不能删除");
+		}
+		//2. 判断是否存在内容  memories_chapter
+		LambdaQueryWrapper<LawsMonthlyReportWriteEO> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+		lambdaQueryWrapper.in(LawsMonthlyReportWriteEO::getMemoriesChapter,ids);
+		List<LawsMonthlyReportWriteEO> lawsMonthlyReportWriteEOS = lawsMonthlyReportWriteEOService.list(lambdaQueryWrapper);
+		if(lawsMonthlyReportWriteEOS.size() != 0){
+			throw new JeroBootException("该标题下存在新增内容,不能删除");
+		}
 		removeByIds(ids);
     }
 

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java

@@ -10,6 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.jero.common.constant.enums.CutEnum;
 import com.jero.common.constant.enums.ModuleEnum;
 import com.jero.common.system.query.QueryGenerator;
+import com.jero.common.system.vo.LoginUser;
 import com.jero.generater.modules.online.cgform.entity.OnlCgformField;
 import com.jero.generater.modules.online.cgform.service.impl.OnlCgformFieldServiceImpl;
 import com.jero.modules.document.enums.FieldTypeEnum;
@@ -29,11 +30,14 @@ 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.entity.SysDictItem;
+import com.jero.modules.system.enums.ProjectRoleEnum;
+import com.jero.modules.system.service.impl.SysBaseApiImpl;
 import com.jero.modules.system.service.impl.SysCategoryServiceImpl;
 import com.jero.modules.system.service.impl.SysDictItemServiceImpl;
 import com.jero.modules.system.util.StringUtils;
 import org.apache.poi.xwpf.usermodel.ParagraphAlignment;
 import org.apache.poi.xwpf.usermodel.XWPFDocument;
+import org.apache.shiro.SecurityUtils;
 import org.aspectj.util.FileUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -81,6 +85,8 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl<LawsMonthly
 	private BussDocumentLibraryEOMapper bussDocumentLibraryEOMapper;
 	@Autowired
 	private SysDictItemServiceImpl sysDictItemServiceImpl;
+	@Autowired
+	private SysBaseApiImpl sysBaseApi;
 	/**
 	 * 保存
 	 *
@@ -92,6 +98,7 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl<LawsMonthly
 		Date now = new Date();
 		lawsMonthlyReportWriteEO.setCreateTime(now);
 		lawsMonthlyReportWriteEO.setUpdateTime(now);
+		lawsMonthlyReportWriteEO.setExportState(ExportStateEnum.NOT_EXPORT.getValue());
 		save(lawsMonthlyReportWriteEO);
 
 		if(ContentTemplateEnum.NEW_REQUEST_LIST_TEMPLATE.getValue().equals(lawsMonthlyReportWriteEO.getContentTemplate())){
@@ -261,6 +268,13 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl<LawsMonthly
 													   Integer pageSize,
 													   HttpServletRequest req) {
 		QueryWrapper<LawsMonthlyReportWriteEO> queryWrapper = QueryGenerator.initQueryWrapper(lawsMonthlyReportWriteEOTemp, req.getParameterMap());
+		queryWrapper.orderByDesc("create_time");
+		//管理员查看全部数据,其余人只能查看自己的数据
+		LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+		List<String> rolesList = sysBaseApi.getRolesByUsername(currentUser.getUsername());
+		if(!rolesList.contains(ProjectRoleEnum.ADMIN.getCode())){
+			queryWrapper.in("create_by",currentUser.getUsername());
+		}
 		Page<LawsMonthlyReportWriteEO> page = new Page<LawsMonthlyReportWriteEO>(pageNo, pageSize);
 		Page<LawsMonthlyReportWriteEO> pageInfo = this.page(page, queryWrapper);
 		//法规月报id
@@ -522,6 +536,8 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl<LawsMonthly
 		}else{
 			content = "Content";
 		}
+		//单独设置每页右侧的时间
+		WordUtil.exportWordMonth(document, lawsMonthlyReportWriteEOS.get(0).getMonth(), null, ParagraphAlignment.RIGHT, 0, 12, false, true, "微软雅黑");
 		WordUtil.exportWord(document, titleCN, null, ParagraphAlignment.CENTER, 0, 12, false, true, "Microsoft YaHei UI");
 		WordUtil.exportWord(document, content, null, ParagraphAlignment.LEFT, 0, 12, false, true, "Microsoft YaHei UI");
 		int oneCount = 1;
@@ -597,7 +613,9 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl<LawsMonthly
 			content = "Content";
 		}
 		WordUtil.exportWord(document, titleCN, null, ParagraphAlignment.CENTER, 0, 12, false, true, "Microsoft YaHei UI");
-		WordUtil.exportWord(document, content, null, ParagraphAlignment.LEFT, 0, 12, false, true, "Microsoft YaHei UI");
+		//单独设置每页右侧的时间
+		WordUtil.exportWordMonth(document, lawsMonthlyReportWriteEOS.get(0).getMonth(), null, ParagraphAlignment.RIGHT, 0, 12, false, true, "Microsoft YaHei UI");
+//		WordUtil.exportWord(document, content, null, ParagraphAlignment.LEFT, 0, 12, false, true, "Microsoft YaHei UI");
 		int oneCount = 1;
 
 		for (LawsMonthlyReportTitleTemplateEO lawsMonthlyReportTitleTemplateEO : reportTitleOneList) {

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/util/WordUtil.java

@@ -103,6 +103,100 @@ 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 exportWordMonth(XWPFDocument document,
+                                  String text,
+                                  String textColor,
+                                  ParagraphAlignment align,
+                                  Integer spaceNum,
+                                  Integer fontSize,
+                                  Boolean isNewline,
+                                  Boolean isBold,
+                                  String fontFamily) {
+
+//        CTSectPr sectPr = document.getDocument().getBody().addNewSectPr();
+//        XWPFHeaderFooterPolicy policy = new XWPFHeaderFooterPolicy(document, sectPr);
+//
+//        //添加页眉
+//        CTP ctpHeader = CTP.Factory.newInstance();
+//        CTR ctrHeader = ctpHeader.addNewR();
+//        CTText ctHeader = ctrHeader.addNewT();
+//        String headerText = "Java POI create MS word file.";
+//        ctHeader.setStringValue(headerText);
+//        XWPFParagraph headerParagraph = new XWPFParagraph(ctpHeader, document);
+//        //设置为右对齐
+//        headerParagraph.setAlignment(ParagraphAlignment.RIGHT);
+//        XWPFParagraph[] parsHeader = new XWPFParagraph[1];
+//        parsHeader[0] = headerParagraph;
+//        try {
+//            policy.createHeader(XWPFHeaderFooterPolicy.DEFAULT, parsHeader);
+//        } catch (IOException e) {
+//            e.printStackTrace();
+//        }
+
+
+        //添加标题
+        XWPFParagraph titleParagraph = document.createParagraph();
+        //设置段落左对齐
+        if (align == null) {
+            titleParagraph.setAlignment(ParagraphAlignment.RIGHT);
+        } 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("宋体");
+            }
+
+        }
+    }
 
     public static void exportWordExcelDefault(XWPFDocument document,
                                               LawsMonthlyReportWriteEO lawsMonthlyReportWriteEO,

jero-web/src/common/lang/en-us.js

@@ -40,7 +40,7 @@ module.exports = {
   userName: 'User Name',
   department: 'Department',
   status: 'Status',
-  Operation: 'Operation',
+  operation: 'Operation',
   aRcord: 'A Rcord',
   OperationAllowedAccount: 'This Operation is not Allowed for administrator account, please select again!',
   confirm: 'Confirm',
@@ -860,6 +860,7 @@ module.exports = {
   experimentFailed: 'Test Failed',
   toBeStarted: 'Not Start',
   inProgress: 'In Progress',
+  Underway: 'Underway',
   green: 'Green',
   red: 'Red',
   blue: 'Blue',
@@ -1235,4 +1236,6 @@ module.exports = {
   showOrNot: 'Show or not',
   comparisonMarket: 'Comparison Market',
   share: 'share',
+  simplifiedChinese:'Simplified Chinese',
+  uploadOnly:'Upload only',
 }

jero-web/src/common/lang/zh-cn.js

@@ -874,6 +874,7 @@ module.exports = {
   experimentFailed: '实验失败',
   toBeStarted: '待开始',
   inProgress: '进行中',
+  Underway:'进行中',
   green: '绿',
   red: '红',
   blue: '蓝',
@@ -1338,4 +1339,6 @@ module.exports = {
   showOrNot:'是否展示',
   comparisonMarket:'对比市场',
   share:'分享',
+  simplifiedChinese:'简体中文',
+  uploadOnly:'只能上传',
 }

jero-web/src/components/PersonnelSelection/index.vue

@@ -15,6 +15,7 @@
     <div class="box-title-text" v-if="isInput">
       <a-input :class="{'box-input':!isClass}" :value="value"
                readonly
+               :title="value"
                @click.native="standardClick"
                :placeholder="$t('PleaseSelect')+query.db_field_txt"/>
     </div>

jero-web/src/components/TaskCutOffTime/index.vue

@@ -68,6 +68,7 @@
         </div>
       </div>
     </a-modal>
+    <JLoading :loading="textLoading">{{this.$t('pleaseWaitWhileRunning')}}</JLoading>
   </div>
 </template>
 
@@ -91,6 +92,7 @@ export default {
       editId: '',
       visibleoperationFailed:false,
       newVisible: false,
+      textLoading:false,
       NotSelectedRowKeysValue:[],
       labelCol: {
         xs: { span: 24 },
@@ -220,6 +222,7 @@ export default {
                 // _this.$message.success(this.$t('OperationSuccessful'))
                 if(res.data.result.length == 0){
                   this.visibleoperationFailed = false
+                  this.textLoading = false
                   _this.$message.success(this.$t('OperationSuccessful'))
                   this.$emit('areaVisibleTaskCutOffTimeflag', false)
                   this.$emit('GetgetTableList')
@@ -227,6 +230,7 @@ export default {
                 }else{
                   this.NotSelectedRowKeysValue = res.data.result
                   this.visibleoperationFailed = true
+                  this.textLoading = false
                 }
 
                 // this.$emit('areaVisibleTaskCutOffTimeflag', false)

jero-web/src/components/TaskCutOffTime/indexonekey.vue

@@ -69,6 +69,7 @@
         </div>
       </div>
     </a-modal>
+    <JLoading :loading="textLoading">{{this.$t('pleaseWaitWhileRunning')}}</JLoading>
   </div>
 </template>
 
@@ -223,10 +224,12 @@ export default {
                   _this.$message.success(this.$t('OperationSuccessful'))
                   this.$emit('areaVisibleTaskCutOffTimeAll', false)
                   this.$emit('GetgetTableList')
+                  this.textLoading = false
 
                 }else{
                   this.NotSelectedRowKeysValue = res.data.result
                   this.visibleoperationFailed = true
+                  this.textLoading = false
                 }
 
                 // this.$emit('areaVisibleTaskCutOffTime', false)

jero-web/src/components/uploadFile/file.vue

@@ -34,7 +34,7 @@
 
   export default {
     name: 'file',
-    props: ['disableds', 'disabled', 'thisFileUploadUrl', 'readonly', 'thisFileType', 'isUploadFile', 'isMultiple', 'restrictUploads'],
+    props: ['disableds', 'disabled', 'thisFileUploadUrl', 'readonly', 'thisFileType', 'isUploadFile', 'isMultiple', 'restrictUploads', 'Uploadable'],
     data() {
       return {
         visible: false,
@@ -68,7 +68,7 @@
       if (this.isMultiple) {
         this.multiple = false
       }
-      this.accept = this.restrictUploads ? '.docx,.doc' : '*.*'
+      this.accept = this.restrictUploads ? this.Uploadable : '*.*'
       // console.log(this.thisFileType,this.thisFileSize,this.thisFileUploadUrl);
     },
     methods: {
@@ -99,10 +99,10 @@
           let index1 = fileName.lastIndexOf('.')
           let index2 = fileName.length
           let fileSuffix = fileName.substring(index1, index2)
-          if (fileSuffix == '.docx' || fileSuffix == '.doc') {
+          if (this.Uploadable.includes(fileSuffix)) {
 
           } else {
-            this.$message.warning(this.$t('onlyFilesUploaded'))
+            this.$message.warning(this.$t('uploadOnly') + this.Uploadable + this.$t('file'))
             return false
           }
         }

jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/evaluationResultsList.vue

@@ -10,7 +10,7 @@
       :visible="visible"
       style="height: 100%;overflow: auto;padding-bottom: 53px;">
       <div class="table-operator-right">
-        <div @click="handleExport" class="operator-text">
+        <div @click="handleExport" v-if="formInline.createBy == userInfoQuery.username" class="operator-text">
           <a-icon type="export" :rotate="-90"/>
           {{$t('export')}}
         </div>
@@ -201,7 +201,7 @@
         this.pageNo = page
         this.getList()
       },
-      SizeChange(pageSize) {
+      SizeChange(page, pageSize) {
         this.pageNo = 1
         this.pageSize = pageSize
         this.getList()

jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess.vue

@@ -43,6 +43,7 @@
                 </div>
                 <a-form-model-item class="itemModel" prop="endTime">
                   <a-date-picker class="box-input"
+                                 :disabledDate="disabledDate"
                                  :placeholder="$t('PleaseSelect')+$t('closingDate')"
                                  @change="dateChange('endTime')"
                                  :getCalendarContainer="(trigger) => trigger.parentNode"
@@ -162,6 +163,13 @@
               message: this.$t('Assessor') + this.$t('cannotEmpty'),
               trigger: 'change'
             }
+          ],
+          taskExplain: [
+            {
+              max: 300,
+              message: this.$t('taskDescription') + this.$t('cannotExceed') + 300 + this.$t('Characters'),
+              trigger: 'blur'
+            }
           ]
         },
         searchParmes: {},
@@ -172,12 +180,14 @@
             align: 'center',
             dataIndex: 'serial_number',
             width: 170,
+            ellipsis: true,
             scopedSlots: { customRender: 'serial_number' }
           },
           {
             title: this.$t('title'),
             align: 'center',
             dataIndex: 'title',
+            ellipsis: true,
             width: 170,
             scopedSlots: { customRender: 'titleName' }
           },
@@ -228,11 +238,14 @@
     },
     methods: {
       ...mapGetters(['userInfo']),
+      disabledDate(current) {
+        return current && current < moment().subtract(1, 'day')
+      },
       pageOnChange(page) {
         this.pageNo = page
         this.getList()
       },
-      SizeChange(pageSize) {
+      SizeChange(page, pageSize) {
         this.pageNo = 1
         this.pageSize = pageSize
         this.getList()
@@ -298,13 +311,13 @@
         this.formInline[item] = this.formInline[item] ? moment(this.formInline[item]).format('YYYY-MM-DD') : ''
       },
       getUUID() {
-        var str=[];
+        var str = []
-        var Chars='0123456789abcdefghijklmnopqrstuvwxyz';
+        var Chars = '0123456789abcdefghijklmnopqrstuvwxyz'
         for (var i = 0; i < 36; i++) {
           str[i] = Chars.substr(Math.floor(Math.random() * 16), 1)
         }
-        str[0]=str[8]=str[13]=str[18]=str[23]='-';
+        str[0] = str[8] = str[13] = str[18] = str[23] = '-'
-        return str.join("")
+        return str.join('')
       },
       submit() {
         this.$refs.ruleForm.validate(valid => {

jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/index.vue

@@ -92,6 +92,9 @@
         :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
         :columns="columns"
       >
+         <span slot="serialNumber" :title="text" slot-scope="text,result">
+              <span>{{text}}</span>
+         </span>
         <span slot="operation" slot-scope="text,record">
            <a class="text-operation" @click="viewProcessClick(record)">{{$t('viewProcess')}}</a>
            <a class="text-operation" v-if="record.gatherResult == 'Completed'"
@@ -129,7 +132,7 @@
         //url传参严格按照当前命名
         url: {
           list: '/lawsOpinionGather/lawsOpinionGatherEO/page',
-          getSysCategoryTree: '/sys/category/getSysCategoryTree',
+          getSysCategoryTree: '/sys/category/getSysCategoryTree'
         },
         loading: false,
         toggleSearchStatus: false,
@@ -144,11 +147,11 @@
         gatherResultList: [
           {
             value: 'Underway',
-            name:this.$t('inProgress'),
+            name: this.$t('Underway')
           },
           {
             value: 'Completed',
-            name:this.$t('Finished'),
+            name: this.$t('Finished')
           }
         ],
         columns: [
@@ -156,12 +159,15 @@
             title: this.$t('standard'),
             align: 'center',
             dataIndex: 'serialNumber',
-            width: 170
+            ellipsis: true,
+            width: 170,
+            scopedSlots: { customRender: 'serialNumber' }
           },
           {
             title: this.$t('title'),
             align: 'center',
             dataIndex: 'title',
+            ellipsis: true,
             width: 170
           },
           {
@@ -233,7 +239,7 @@
         this.pageNo = page
         this.getList()
       },
-      SizeChange(pageSize) {
+      SizeChange(page, pageSize) {
         this.pageNo = 1
         this.pageSize = pageSize
         this.getList()

jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardRelease.vue

@@ -164,7 +164,7 @@
         this.pageNo = page
         this.getList()
       },
-      SizeChange(pageSize) {
+      SizeChange(page,pageSize) {
         this.pageNo = 1
         this.pageSize = pageSize
         this.getList()

jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardView.vue

@@ -21,44 +21,17 @@
               {{$t('addComparison')}}
             </div>
           </div>
-          <div class="content-box">
+          <div style="overflow: auto;height: calc(100vh - 160px);">
-            <div class="content-box-left">
+            <div class="content-box" :style="{'width':clientWidth}" v-if="isTrue">
-              <div class="content-box-left-text">
+              <div style="width: 100%" v-for="(item1,index) in 14" class="content-box-top">
-                hadhasdasdhadashdjk
+                <div v-for="(item2,index2) in 16" style="width: 340px;display: inline-block" class="content-box-left">
-              </div>
+                  <div class="content-box-box-top" v-if="index == 0">
-              <div class="content-box-left-text">
-                hadhasdasdhadashdjk
-              </div>
-              <div class="content-box-left-text">
-                hadhasdasdhadashdjk
-              </div>
-              <div class="content-box-left-text">
-                hadhasdasdhadashdjk
-              </div>
-              <div class="content-box-left-text">
-                hadhasdasdhadashdjk
-              </div>
-              <div class="content-box-left-text">
-                hadhasdasdhadashdjk
-              </div>
-              <div class="content-box-left-text">
-                hadhasdasdhadashdjk
-              </div>
-              <div class="content-box-left-text">
-                hadhasdasdhadashdjk
-              </div>
-              <div class="content-box-left-text">
-                hadhasdasdhadashdjk
-              </div>
-            </div>
-            <div class="content-box-right" v-for="item1 in 9">
-              <div class="content-box-box-top">
                     <img src="../../../../assets/mobileHome.png" class="content-box-box-img" alt="">
                     <span class="content-box-box-text">
                       中国
                 </span>
                   </div>
-              <div class="content-box-box" v-for="item in 9">
+                  <div class="content-box-box" v-else>
                     <img src="../../../../assets/mobileHome.png" class="content-box-box-img" alt="">
                     <span class="content-box-box-text">
                       中国
@@ -69,6 +42,8 @@
             </div>
           </div>
         </div>
+      </div>
+    </div>
     <displayInformationModel ref="displayInformationModelRef"/>
     <countryCardViewAdd ref="countryCardViewAddRef" @countryCardViewAddForm="countryCardViewAddForm"/>
   </div>
@@ -78,6 +53,7 @@
   import { getAction, postAction, downloadFile } from '@/api/manage'
   import displayInformationModel from './displayInformationModel'
   import countryCardViewAdd from './countryCardViewAdd'
+
   export default {
     name: 'countryCardView',
     components: {
@@ -85,9 +61,17 @@
       countryCardViewAdd
     },
     data() {
-      return {}
+      return {
+        clientWidth: '',
+        isTrue: false
+      }
     },
     mounted() {
+      this.isTrue = false
+      this.$nextTick(() => {
+        this.clientWidth = 340 * 14 + 'px'
+        this.isTrue = true
+      })
     },
     methods: {
       displayInformationClick() {
@@ -180,36 +164,8 @@
   }
 
   .content-box {
-    overflow: auto;
-    white-space: nowrap;
     position: relative;
-  }
-
-  .content-box-left {
-    width: 200px;
     background: #fff;
-    z-index: 111;
-    display: inline-block;
-    position: sticky;
-    left: 0;
-    border-top: 1px #d9d9d9 solid;
-    border-left: 1px #d9d9d9 solid;
-    border-bottom: 1px #d9d9d9 solid;
-    border-right: 1px #d9d9d9 solid;
-  }
-
-  .content-box-left-text {
-    font-size: 16px;
-    color: #040B29;
-    font-weight: 400;
-    text-align: center;
-    border-bottom: 1px #d9d9d9 solid;
-    height: 80px;
-    line-height: 80px;
-  }
-
-  .content-box-left-text:last-child {
-    border-bottom: none;
   }
 
   .content-box-box-top {
@@ -217,28 +173,10 @@
     height: 160px;
     display: inline-block;
     cursor: pointer;
-    border-left: 1px #d9d9d9 solid;
-    border-top: 1px #d9d9d9 solid;
-    border-right: 1px #d9d9d9 solid;
-    border-bottom: 1px #d9d9d9 solid;
-    position: sticky;
-    top: 0;
-    z-index: 111;
     background: #fff;
-  }
+    border-right: 1px #d9d9d9 solid;
-
-  .content-box-right {
-    width: 339px;
-    position: relative;
-    display: inline-block;
     border-top: 1px #d9d9d9 solid;
-    border-right: 1px #d9d9d9 solid;
     border-bottom: 1px #d9d9d9 solid;
-  }
-
-  .content-box-right:last-child {
-    border-right: 1px #d9d9d9 solid;
-  }
 
     .content-box-box-img {
       width: 70%;
@@ -253,16 +191,51 @@
       font-weight: 500;
       color: #040B29;
     }
+  }
+
+  .content-box-left:first-child .content-box-box-top {
+    border-left: 1px #d9d9d9 solid;
+  }
 
   .content-box-box {
-    width: 100%;
+    width: 340px;
+    display: inline-block;
     height: 80px;
+    background: #fff;
+    border-right: 1px #d9d9d9 solid;
     border-bottom: 1px #d9d9d9 solid;
     cursor: pointer;
+
+    .content-box-box-img {
+      width: 70%;
+      height: 100%;
     }
 
-  .content-box-box:last-child {
+    .content-box-box-text {
-    border-bottom: none;
+      display: inline-block;
+      width: 30%;
+      text-align: center;
+      font-size: 18px;
+      font-weight: 500;
+      color: #040B29;
+    }
   }
 
+  .content-box-left:first-child .content-box-box {
+    border-left: 1px #d9d9d9 solid;
+  }
+
+  .content-box-left:first-child {
+    position: sticky;
+    left: 0;
+    z-index: 110;
+    background: #fff;
+  }
+
+  .content-box-top:first-child {
+    position: sticky;
+    top: 0;
+    z-index: 111;
+    background: #fff;
+  }
 </style>

jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyFill.vue

@@ -185,7 +185,7 @@
         this.pageNo = page
         this.getList()
       },
-      SizeChange(pageSize) {
+      SizeChange(page,pageSize) {
         this.pageNo = 1
         this.pageSize = pageSize
         this.getList()

jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyManagement.vue

@@ -44,7 +44,7 @@
         :columns="columns"
       >
           <span slot="language" slot-scope="text,record">
-                <span>{{text == 1?$t('chinese'):$t('English')}}</span>
+                <span>{{text == 1?$t('simplifiedChinese'):$t('English')}}</span>
           </span>
         <span slot="RegulationMonthlyName" slot-scope="text,record">
              <a @click="preview(record)">{{text}}</a>
@@ -151,7 +151,7 @@
             title: this.$t('operation'),
             align: 'center',
             fixed: 'right',
-            width: 180,
+            width: 240,
             scopedSlots: { customRender: 'operation' }
           }
         ]
@@ -179,7 +179,7 @@
         this.pageNo = page
         this.getList()
       },
-      SizeChange(pageSize) {
+      SizeChange(page, pageSize) {
         this.pageNo = 1
         this.pageSize = pageSize
         this.getList()

jero-web/src/views/businessSupport/regulationReport/components/modules/defaultTemplate.vue

@@ -249,11 +249,11 @@
           </div>
           <a-form-model-item class="itemModel">
             <PersonnelSelection
-              :query="{db_field_name:'lawsContactName',db_field_txt:$t('regulatoryContact')}"
+              :query="{db_field_name:'lawsContact',db_field_txt:$t('regulatoryContact')}"
               :personneQuery="formInline"
               :disabled="disabled"
               @change="PersonnelSelectionChange"
-              v-model="formInline.lawsContact"/>
+              v-model="formInline.lawsContactName"/>
           </a-form-model-item>
         </div>
       </a-col>
@@ -382,6 +382,12 @@
           } else {
             this.formInline.technologyTerritory = []
           }
+          if (!this.formInline.useMethod) {
+            this.formInline.useMethod = undefined
+          }
+          if (!this.formInline.state) {
+            this.formInline.state = undefined
+          }
           this.formInline = { ...this.formInline }
         } else {
           this.formInline = {}
@@ -443,6 +449,12 @@
                 formInline[res] = formInline[res].join(',')
               }
             })
+            if (!formInline.state || formInline.state == '' || formInline.state == 'null') {
+              formInline.state = ''
+            }
+            if (!formInline.useMethod || formInline.useMethod == '' || formInline.useMethod == 'null') {
+              formInline.useMethod = ''
+            }
             callback && callback(formInline)
           }
         })

jero-web/src/views/businessSupport/regulationReport/components/modules/fillTable.vue

@@ -97,7 +97,7 @@
             title: this.$t('operation'),
             align: 'center',
             fixed: 'right',
-            width: 180,
+            width: 280,
             scopedSlots: { customRender: 'operation' }
           }
         ]

jero-web/src/views/businessSupport/regulationReport/components/modules/fillTableAdd.vue

@@ -51,6 +51,7 @@
                           class="box-input"
                           :getPopupContainer="triggerNode=> triggerNode.parentNode"
                           allowClear
+                          :disabled="isParentId"
                           v-model="formInline.parentId">
                   <a-select-option v-for="(item, key) in ParentList"
                                    :key="item.id"
@@ -110,7 +111,8 @@
         url: {
           add: '/report/lawsMonthlyReportTitleTemplateEO/add',
           edit: '/report/lawsMonthlyReportTitleTemplateEO/edit'
-        }
+        },
+        isParentId: false
       }
     },
     mounted() {
@@ -131,6 +133,7 @@
         this.visible = true
         this.getParent()
         this.$nextTick(() => {
+          this.isParentId = false
           this.formInline = {}
           this.$refs.ruleForm.clearValidate()
         })
@@ -139,8 +142,13 @@
         this.title = this.$t('edit')
         this.visible = true
         this.getParent()
+        this.isParentId = false
         this.$nextTick(() => {
           this.formInline = row
+          if (!row.parentId) {
+            this.formInline.parentId = undefined
+            this.isParentId = true
+          }
           this.$refs.ruleForm.clearValidate()
         })
       },

jero-web/src/views/businessSupport/regulationReport/components/modules/managementAdd.vue

@@ -38,7 +38,6 @@
                 <a-form-model-item class="itemModel" prop="language">
                   <a-select :placeholder="$t('PleaseSelect')+$t('monthlyLanguage')"
                             :disabled="disabled"
-                            class="box-input"
                             :getPopupContainer="triggerNode=> triggerNode.parentNode"
                             allowClear
                             v-model="formInline.language">
@@ -61,7 +60,8 @@
         <a-button @click="handleSubmit" type="primary" :loading="confirmLoading">{{$t('submit')}}</a-button>
       </div>
     </a-drawer>
-    <uploadFile ref="uploadFile" :isMultiple="true" @uploadSuccess="uploadSuccess"></uploadFile>
+    <uploadFile ref="uploadFile" :restrictUploads="true" :isMultiple="true" :Uploadable="'.docx,.doc,.pdf'"
+                @uploadSuccess="uploadSuccess"></uploadFile>
   </div>
 </template>
 
@@ -95,7 +95,7 @@
         visible: false,
         languageList: [
           {
-            text: this.$t('chinese'),
+            text: this.$t('simplifiedChinese'),
             value: 1
           },
           {
@@ -275,7 +275,7 @@
 
   .button-text {
     height: 38px;
-    width: calc(100% - 100px);
+    width: 100%;
     line-height: 38px;
     background: #fff;
     border: 1px #00B3BE solid;

jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue

@@ -250,12 +250,14 @@
             align: 'center',
             dataIndex: 'serial_number',
             width: 170,
+            ellipsis: true,
             scopedSlots: { customRender: 'serial_number' }
           },
           {
             title: this.$t('title'),
             align: 'center',
             dataIndex: 'title',
+            ellipsis: true,
             width: 170,
             scopedSlots: { customRender: 'titleName' }
           },
@@ -335,7 +337,7 @@
         this.pageNo = page
         this.getList()
       },
-      SizeChange(pageSize) {
+      SizeChange(page, pageSize) {
         this.pageNo = 1
         this.pageSize = pageSize
         this.getList()

jero-web/src/views/businessSupport/technologyAssessment/components/processInformation.vue

@@ -101,7 +101,7 @@
         this.pageNo = page
         this.getList()
       },
-      SizeChange(pageSize) {
+      SizeChange(page,pageSize) {
         this.pageNo = 1
         this.pageSize = pageSize
         this.getList()

jero-web/src/views/businessSupport/technologyAssessment/index.vue

@@ -306,7 +306,7 @@
         this.pageNo = page
         this.getList()
       },
-      SizeChange(pageSize) {
+      SizeChange(page,pageSize) {
         this.pageNo = 1
         this.pageSize = pageSize
         this.getList()

jero-web/src/views/documentTools/documentComparison/index.vue

@@ -210,7 +210,7 @@
         this.pageNo = page
         this.getList()
       },
-      SizeChange(pageSize) {
+      SizeChange(page,pageSize) {
         this.pageNo = 1
         this.pageSize = pageSize
         this.getList()

jero-web/src/views/documentTools/documentTranslation/components/addModel.vue

@@ -94,7 +94,7 @@
         </a-row>
       </a-form-model>
     </a-modal>
-    <uploadFile ref="uploadFile" :restrictUploads="true" :isMultiple="true" @uploadSuccess="uploadSuccess"/>
+    <uploadFile ref="uploadFile" :restrictUploads="true" :Uploadable="'.docx,.doc,'" :isMultiple="true" @uploadSuccess="uploadSuccess"/>
     <standardData ref="standardDataRef" @standardDataForm="standardDataForm"/>
   </div>
 </template>

jero-web/src/views/documentTools/documentTranslation/index.vue

@@ -249,7 +249,7 @@
         this.pageNo = page
         this.getList()
       },
-      SizeChange(pageSize) {
+      SizeChange(page,pageSize) {
         this.pageNo = 1
         this.pageSize = pageSize
         this.getList()

jero-web/src/views/processCenter/components/feedbackInformation.vue

@@ -5,7 +5,7 @@
         {{title}}
       </div>
     </div>
-    <div class="content-text">
+    <div class="content-text-text">
       <a-form-model :model="formInline" class="formAdd" :rules="rules" ref="ruleForm">
         <div v-for="(item,index) in formInline.dataList" :key="index">
           <div class="feedbackPoint">
@@ -41,18 +41,15 @@
             <a-col :span="12">
               <div class="box-title-text">
                 <div class="title-text">
-                  <span class="Required">*</span>
+                  <span class="title-text-text" :title="$t('enclosure')">{{$t('enclosure')}}</span>
-                  <span class="title-text-text"
-                        :title="$t('questionsSuggestions')">{{$t('questionsSuggestions')}}</span>
                 </div>
-                <a-form-model-item class="itemModel" :prop="'dataList.'+index+'.issueOrSuggest'"
+                <a-form-model-item class="itemModel" prop="accessoryFile">
-                                   :rules="[{ required: true, message: $t('questionsSuggestions') + $t('cannotEmpty'), trigger: 'blur'},
+                  <a-button type="primary" class="button-text"
-                                   {max: 300,message: $t('questionsSuggestions') + $t('cannotExceed') + 300 + $t('Characters'),trigger: 'blur'
+                            @click="clickButtonToUpload('accessoryFile',index)">
-                                    }]">
+                    {{ (item.accessoryFile === 'null' || item.accessoryFile === '' ||
-                  <a-input class="box-input"
+                    item.accessoryFile == null) ? $t('clickUpload') : $t('viewUploadedFiles')
-                           :disabled="disabled"
+                    }}
-                           v-model="item.issueOrSuggest"
+                  </a-button>
-                           :placeholder="$t('PleaseEnter')+$t('questionsSuggestions')"/>
                 </a-form-model-item>
               </div>
             </a-col>
@@ -63,26 +60,30 @@
                 <div class="title-text">
                   <span class="title-text-text" :title="$t('reason')">{{$t('reason')}}</span>
                 </div>
-                <a-form-model-item class="itemModel">
+                <a-form-model-item class="itemModel"
-                  <a-input class="box-input"
+                                   :prop="'dataList.'+index+'.reason'"
+                                   :rules="[{max: 300,message: $t('reason') + $t('cannotExceed') + 300 + $t('Characters'),trigger: 'blur'
+                                    }]">
+                  <a-textarea :placeholder="$t('PleaseEnter')+$t('reason')"
                               :disabled="disabled"
-                           v-model="item.reason"
+                              v-model="item.reason" :rows="4"/>
-                           :placeholder="$t('PleaseEnter')+$t('reason')"/>
                 </a-form-model-item>
               </div>
             </a-col>
             <a-col :span="12">
               <div class="box-title-text">
                 <div class="title-text">
-                  <span class="title-text-text" :title="$t('enclosure')">{{$t('enclosure')}}</span>
+                  <span class="Required">*</span>
+                  <span class="title-text-text"
+                        :title="$t('questionsSuggestions')">{{$t('questionsSuggestions')}}</span>
                 </div>
-                <a-form-model-item class="itemModel" prop="accessoryFile">
+                <a-form-model-item class="itemModel" :prop="'dataList.'+index+'.issueOrSuggest'"
-                  <a-button type="primary" class="button-text"
+                                   :rules="[{ required: true, message: $t('questionsSuggestions') + $t('cannotEmpty'), trigger: 'blur'},
-                            @click="clickButtonToUpload('accessoryFile',index)">
+                                   {max: 300,message: $t('questionsSuggestions') + $t('cannotExceed') + 300 + $t('Characters'),trigger: 'blur'
-                    {{ (item.accessoryFile === 'null' || item.accessoryFile === '' ||
+                                    }]">
-                    item.accessoryFile == null) ? $t('clickUpload') : $t('viewUploadedFiles')
+                  <a-textarea :placeholder="$t('PleaseEnter')+$t('questionsSuggestions')"
-                    }}
+                              :disabled="disabled"
-                  </a-button>
+                              v-model="item.issueOrSuggest" :rows="4"/>
                 </a-form-model-item>
               </div>
             </a-col>

jero-web/src/views/processCenter/components/standardContent.vue

@@ -9,7 +9,8 @@
       </div>
     </div>
     <div class="content-text">
-      <div class="text-field" v-for="(item,index) in standardContentList" :key="index">
+      <div class="text-field" :class="{'text-content-button-one':item.type == 4 ? true :false}"
+           v-for="(item,index) in standardContentList" :key="index">
         <span class="text-field-left" :title="item.title">{{item.title}}</span>
         <span class="text-field-right text-field-right-url"
               :title="queryForm[item.value]"
@@ -21,7 +22,6 @@
               @click="clickButtonToUpload(queryForm[item.value])"
               v-if="item.type == 2 && queryForm[item.value]"
         >{{ $t('viewFile') }}</span>
-
         <span class="text-field-right"
               :title="queryForm[item.value]" v-else
         >{{queryForm[item.value]}}</span>
@@ -60,12 +60,12 @@
       },
       title: {
         type: String,
-        default:'',
+        default: ''
       },
       isConfirmationDeadline: {
         type: Boolean,
-        default:false,
+        default: false
-      },
+      }
     },
     components: {
       viewFileModel
@@ -77,6 +77,7 @@
     },
     mounted() {
       this.queryForm = this.standardContentQuery
+      this.queryForm.taskExplain = 'sdf dsjf;l sdf;ldsf ;lsdfkj d;lsfkds;lfdksf第三方是德国搞定过分乐观看待给对方；公开地方领导反馈给东丽的反馈给管库给的给'
     },
     methods: {
       urlClick(val) {
@@ -147,5 +148,40 @@
         cursor: pointer;
       }
     }
+
+    .text-content-button-one {
+      width: 100%;
+
+      .text-field-left {
+        width: 124px;
+        display: inline-block;
+        font-size: 14px;
+        font-weight: 400;
+        color: #6F7385;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+        overflow: hidden;
+        margin-right: 24px;
+        float: left;
+        margin-top: 3px;
+      }
+
+      .text-field-right {
+        width: calc(100% - 200px);
+        display: inline-block;
+        font-size: 16px;
+        text-overflow: ellipsis;
+        white-space: pre-wrap;
+        overflow: visible;
+        float: left;
+        color: #040B29;
+        font-weight: 400;
+      }
+
+      .text-field-right-url {
+        color: #00B3BE !important;
+        cursor: pointer;
+      }
+    }
   }
 </style>

jero-web/src/views/processCenter/processForm/regulatoryProcess/index.vue

@@ -88,7 +88,8 @@
           {},
           {
             title: this.$t('taskDescription'),
-            value: 'taskExplain'
+            value: 'taskExplain',
+            type:4,
           }
           // {
           //   title: this.$t('remarks'),

jero-web/src/views/regulatoryEarlyWarning/index.vue

@@ -298,7 +298,7 @@
         this.pageNo = page
         this.getList()
       },
-      SizeChange(pageSize) {
+      SizeChange(page,pageSize) {
         this.pageNo = 1
         this.pageSize = pageSize
         this.getList()