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

jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/controller/ParamsInfoEOController.java

@@ -10,6 +10,7 @@ import com.jero.common.aspect.annotation.AutoLog;
 import com.jero.common.constant.enums.CutEnum;
 import com.jero.common.system.base.controller.JeroController;
 import com.jero.modules.cert.template.entity.ParamsInfoEO;
+import com.jero.modules.cert.template.enums.ControlTypeEnum;
 import com.jero.modules.cert.template.service.IParamsInfoEOService;
 import com.jero.modules.cert.template.service.IParamsInfoPublishEOService;
 import com.jero.modules.cert.template.vo.ParamsInfoVO;
@@ -136,7 +137,8 @@ public class ParamsInfoEOController extends JeroController<ParamsInfoEO, IParams
 	@PostMapping(value = "/add")
 //	@RequiresPermissions("params:paramsInfo:add")
 	public Result<?> add(@Validated @RequestBody ParamsInfoEO paramsInfoEO) {
-		if (StringUtils.isEmpty(paramsInfoEO.getCertCategory())) {
+		if (StringUtils.isEmpty(paramsInfoEO.getCertCategory())
+				&& !ControlTypeEnum.Title.getValue().equals(paramsInfoEO.getControlType())) {
 			return Result.error("认证类别不能为空！");
 		}
 		boolean isSuccess = paramsInfoEOService.add(paramsInfoEO);
@@ -158,7 +160,8 @@ public class ParamsInfoEOController extends JeroController<ParamsInfoEO, IParams
 	@PostMapping(value = "/edit")
 	@RequiresPermissions("params:paramsInfo:edit")
 	public Result<?> edit(@Validated @RequestBody ParamsInfoEO paramsInfoEO) {
-		if (StringUtils.isEmpty(paramsInfoEO.getCertCategory())) {
+		if (StringUtils.isEmpty(paramsInfoEO.getCertCategory())
+				&& !ControlTypeEnum.Title.getValue().equals(paramsInfoEO.getControlType())) {
 			return Result.error("认证类别不能为空！");
 		}
 		boolean isSuccess = paramsInfoEOService.editById(paramsInfoEO);

jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java

@@ -1171,7 +1171,7 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl<ParamsInfoEOMapper, Par
 		List<String> stringMessage = new ArrayList<>();
 		List<String> nioNumberImport = new ArrayList<>(); // 记录导入的nio编号
 
-		int i = 1;    //记录行号
+		int i = 2;    //记录行号
 		//循环验证数据
 		for (ParamsInfoCnImport dto : paramsInfoEOList) {
 			//判断此行数据是否全部为空,是则不读取
@@ -1278,13 +1278,6 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl<ParamsInfoEOMapper, Par
 			errorMsg += (String)resultMap.get("errorMsg");
 			countError += (int)resultMap.get("countError");
 
-			// 认证类别
-			// 来源：认证类别sheet页
-			resultMap = validateMustAndLength(nioCertCategoryMap.get(nioNumber), "认证类别", "Cert Category", IsMustEnum.YES.getValue(), "1000", false, cut);
-			errorMsg += (String)resultMap.get("errorMsg");
-			countError += (int)resultMap.get("countError");
-			dto.setCertCategory(nioCertCategoryMap.get(nioNumber));
-
 //			String certCategory = dto.getCertCategory();
 //			resultMap = validateMustAndLength(certCategory, "认证类别", "cert category", IsMustEnum.YES.getValue(), "1000", false, cut);
 //			errorMsg += (String)resultMap.get("errorMsg");
@@ -1306,6 +1299,17 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl<ParamsInfoEOMapper, Par
 			controlType = (String)resultMap.get("value");
 			dto.setControlType(controlType);
 
+			// 认证类别
+			// 来源：认证类别sheet页
+			if (ControlTypeEnum.Title.getValue().equals(controlType)) {
+				resultMap = validateMustAndLength(nioCertCategoryMap.get(nioNumber), "认证类别", "Cert Category", IsMustEnum.NO.getValue(), "1000", false, cut);
+			} else {
+				resultMap = validateMustAndLength(nioCertCategoryMap.get(nioNumber), "认证类别", "Cert Category", IsMustEnum.YES.getValue(), "1000", false, cut);
+			}
+			errorMsg += (String)resultMap.get("errorMsg");
+			countError += (int)resultMap.get("countError");
+			dto.setCertCategory(nioCertCategoryMap.get(nioNumber));
+
 			// 控件备选值
 			String controlValues = dto.getControlValues();
 			if (ControlTypeEnum.PULL_SINGLE.getValue().equals(controlType)
@@ -1352,7 +1356,6 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl<ParamsInfoEOMapper, Par
 				dto.setControlVerify(null);
 			}
 
-
 			// 标题默认值
 			String titleDefaultValue = dto.getTitleDefaultValue();
 			if (ControlTypeEnum.Title.getValue().equals(controlType)) {
@@ -1427,7 +1430,7 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl<ParamsInfoEOMapper, Par
 
 			List<String> ccNioNumberImport = new ArrayList<>(); // 记录导入的nio编号
 
-			int j = 1;
+			int j = 2;
 			for (CertCategoryParamsInfoCnImport ccDto : ccDtoList) {
 				//判断此行数据是否全部为空,是则不读取
 				if (checkObjAllFieldsIsNull(ccDto)) {

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

@@ -71,7 +71,7 @@
                 <a class="text-operation" @click="viewClick(record)">{{$t('view')}}</a>
                  <a class="text-operation"
                     @click="subscribe(record)">
-                  {{!record.releaseCondition || record.releaseCondition == 'draft' ? $t('release') :$t('withdraw')}}
+                  {{!record.releaseStatus || record.releaseStatus == 'Draft' ? $t('release') :$t('withdraw')}}
                  </a>
                 <a class="text-operation"
                    @click="edit(record)">{{$t('edit')}}</a>
@@ -120,8 +120,8 @@
         pageSize: 10,
         pageNo: 1,
         url: {
-          list: '',
+          list: '/problemKnowledgeBase/countryCardManageReleaseEO/page',
-          deleteBatch: ''
+          deleteBatch: '/problemKnowledgeBase/countryCardManageReleaseEO/deleteBatch'
         },
         selectedRowKeys: [],
         columns: [
@@ -149,6 +149,7 @@
     },
     mounted() {
       document.title = 'Country Card-' + this.$t('managePublishing')
+      this.getList()
     },
     methods: {
       searchQuery() {
@@ -226,8 +227,31 @@
       edit() {
         this.$refs.countryCardReleaseAddRef.edit()
       },
-      subscribe() {
+      subscribe(record) {
-
+        let _this = this
+        this.$confirm({
+          content: record.releaseStatus == 'Draft' ? _this.$t('confirmRelease') : _this.$t('confirmWithdraw'),
+          onOk() {
+            let releaseCondition = ''
+            if (record.releaseStatus == 'Draft') {
+              releaseCondition = 'Have released'
+            } else {
+              releaseCondition = 'Draft'
+            }
+            let query = {
+              releaseStatus: releaseCondition,
+              ids: record.id
+            }
+            postAction('/problemKnowledgeBase/countryCardManageReleaseEO/batchUpdateReleaseStatus', query).then((res) => {
+              if (res.success) {
+                _this.$message.success(_this.$t('OperationSuccessful'))
+                _this.getList()
+              } else {
+                _this.$message.warning(_this.$t('operationFailed'))
+              }
+            })
+          }
+        })
       },
       viewClick() {
         let newUrl = this.$router.resolve({

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

@@ -195,6 +195,7 @@
           ]
         },
         title: '',
+        dropDownOptionsId: '',
         url: {
           add: '/problemKnowledgeBase/countryCardTempEO/add',
           edit: '/problemKnowledgeBase/countryCardTempEO/edit'
@@ -211,11 +212,24 @@
           this.isDisplay = false
         }
       },
+      getUUID() {
+        var str = []
+        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] = '-'
+        return str.join('')
+      },
       dropDownOptionsClick() {
-        this.$refs.optionMaintenanceRef.getData()
+        if (!this.dropDownOptionsId) {
+          this.dropDownOptionsId = this.getUUID()
+        }
+        this.$refs.optionMaintenanceRef.getData(this.dropDownOptionsId)
       },
       add() {
         this.visible = true
+        this.isDisplay = false
         this.title = this.$t('addLabel')
         this.$nextTick(() => {
           this.formInline = {}
@@ -227,6 +241,11 @@
         this.title = this.$t('editLabel')
         this.$nextTick(() => {
           this.formInline = data
+          if (this.formInline.lableType == 3) {
+            this.isDisplay = true
+          } else {
+            this.isDisplay = false
+          }
           this.$refs.ruleForm.clearValidate()
         })
       },

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

@@ -24,7 +24,7 @@
           :loading="loading">
            <span slot="operation" slot-scope="text,record">
               <a style="margin-right: 8px" @click="edit(record)">{{$t('edit')}}</a>
-              <a @click="deleteData">{{$t('delete')}}</a>
+              <a @click="deleteData(record)">{{$t('delete')}}</a>
            </span>
         </a-table>
         <div class="page" v-if="dataList.length > 0">
@@ -62,8 +62,8 @@
     data() {
       return {
         url: {
-          list: '',
+          list: '/problemKnowledgeBase/countryCardTempItemEO/page',
-          deleteOne: ''
+          deleteOne: '/problemKnowledgeBase/countryCardTempItemEO/deleteBatch'
         },
         visible: false,
         selectedRowKeys: [],
@@ -72,6 +72,7 @@
         pageNo: 1,
         pageSize: 10,
         total: 0,
+        dataId: '',
         columns: [
           {
             title: this.$t('name'),
@@ -104,8 +105,11 @@
     mounted() {
     },
     methods: {
-      getData() {
+      getData(id) {
+        this.dataId = id
+        this.pageNo = 1
         this.visible = true
+        this.replacePage()
       },
       handleCancel() {
         this.visible = false
@@ -115,9 +119,10 @@
         this.replacePage()
       },
       addLabelClick() {
-        this.$refs.optionMaintenanceAddRef.add()
+        this.$refs.optionMaintenanceAddRef.add(this.dataId)
       },
       edit(val) {
+        val.dataId = this.dataId
         this.$refs.optionMaintenanceAddRef.edit(JSON.parse(JSON.stringify(val)))
       },
       deleteData(val) {
@@ -125,10 +130,10 @@
         this.$confirm({
           content: _this.$t('ConfirmDelete'),
           onOk() {
-            deleteAction(_this.url.deleteOne, { id: val.id }).then((res) => {
+            deleteAction(_this.url.deleteOne, { ids: val.id }).then((res) => {
               if (res.success) {
                 _this.$message.success(_this.$t('OperationSuccessful'))
-                _this.getList()
+                _this.replacePage()
               } else {
                 _this.$message.warning(_this.$t('operationFailed'))
               }
@@ -148,10 +153,11 @@
       replacePage() {
         let query = {
           pageNo: this.pageNo,
-          pageSize: this.pageSize
+          pageSize: this.pageSize,
+          countryCardTempId: this.dataId
         }
         this.loading = true
-        postAction(this.url.list, query).then((res) => {
+        getAction(this.url.list, query).then((res) => {
           if (res.success) {
             this.dataList = res.result.records || []
             this.total = res.result.total

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

@@ -88,6 +88,7 @@
         confirmLoading: false,
         formInline: {},
         disabled: false,
+        dataId: '',
         rules: {
           name: [
             {
@@ -128,21 +129,27 @@
             }
           ]
         },
-        title: ''
+        title: '',
+        url: {
+          add: '/problemKnowledgeBase/countryCardTempItemEO/add',
+          edit: '/problemKnowledgeBase/countryCardTempItemEO/edit'
+        }
       }
     },
     mounted() {
     },
     methods: {
-      add() {
+      add(id) {
         this.visible = true
         this.title = this.$t('newlyAdded')
         this.$nextTick(() => {
           this.formInline = {}
           this.$refs.ruleForm.clearValidate()
         })
+        this.dataId = id
       },
       edit(data) {
+        this.dataId = data.id
         this.visible = true
         this.title = this.$t('edit')
         this.$nextTick(() => {
@@ -157,7 +164,24 @@
       handleOk() {
         this.$refs.ruleForm.validate(valid => {
           if (valid) {
-
+            let url = ''
+            if (this.formInline.id) {
+              url = this.url.edit
+            } else {
+              url = this.url.add
+            }
+            this.formInline.countryCardTempId = this.dataId
+            postAction(url, this.formInline).then((res) => {
+              if (res.success) {
+                this.$message.success(this.$t('OperationSuccessful'))
+                this.visible = false
+                this.confirmLoading = false
+                this.$emit('countryCardReleaseModelAddForm')
+              } else {
+                this.confirmLoading = false
+                this.$message.warning(this.$t('operationFailed'))
+              }
+            })
           }
         })
       },

jero-web/src/views/documentTools/documentComparison/components/commentList.vue

@@ -142,6 +142,7 @@
       },
       getData() {
         this.visible = true
+        this.commentContent = ''
         this.getList()
       },
       handleSubmit() {
@@ -162,7 +163,7 @@
         this.loading = true
         getAction(this.url.list, {
           id: this.$route.query.id,
-          commentContent: this.commentContent
+          str: this.commentContent
         }).then((res) => {
           if (res.success) {
             this.loading = false

jero-web/src/views/documentTools/documentComparison/components/comparisonResults.vue

@@ -169,7 +169,10 @@
         checkAll: false,
         isDisplay: false,
         fullCheckbox: false,
-        resultData: {}
+        resultData: {},
+        url: {
+          exportData: '/compare/sarFileCompareItemComment/exportResXls'
+        }
       }
     },
     mounted() {
@@ -190,7 +193,20 @@
         this.$refs.commentListRef.getData()
       },
       exportComparisonReportClick() {
-
+        let checkboxList = JSON.parse(JSON.stringify(this.checkboxList))
+        let fullCheckbox = this.fullCheckbox
+        let query = {
+          selectIds: checkboxList.join(','),
+          includeComments: fullCheckbox,
+          infoId: this.$route.query.id
+        }
+        downloadFile(this.url.exportData, this.resultData.serialNumberLeft + ' - ' + this.resultData.serialNumberRight + '.xls', query, this.Deselect)
+      },
+      Deselect() {
+        this.checkboxList = []
+        this.fullCheckbox = false
+        this.indeterminate = false
+        this.checkAll = false
       },
       getData() {
         let query = {

jero-web/src/views/parameter/parameterlist/components/addModel.vue

@@ -249,14 +249,14 @@
             </a-col>
           </a-row>
           <a-row :gutter="24">
-            <a-col :span="24" >
+            <a-col :span="24" v-if='contentList != []'>
               <a-tabs>
-                <a-tab-pane v-for='(item,index) in contentList' :tab="item.cut == 'cn' ? item.text : item.textEn" :key="index + 1">
+                <a-tab-pane  v-for='(item,index) in contentList' :tab="item.cut == 'cn' ? item.text : item.textEn" :key="index + 1">
                   <a-row :gutter="24">
                     <a-col :span="12">
                       <div class="box-title-text">
                         <div class="title-text">
-                        <span class="Required">*</span>
+                        <span class="Required" v-if='required'>*</span>
                         <span class="title-text-text"
                               :title="$t('ParameterNo')">{{$t('ParameterNo')}}</span>
                         </div>
@@ -271,7 +271,7 @@
                     <a-col :span="12">
                       <div class="box-title-text">
                         <div class="title-text">
-                          <span class="Required">*</span>
+                          <span class="Required" v-if='required'>*</span>
                           <span class="title-text-text" :title="$t('NParameterName')">{{$t('NParameterName')}}</span>
                         </div>
                         <a-form-model-item class="itemModel">
@@ -448,7 +448,6 @@ export default {
     } else if (long && long == 'en-us') {
       this.cut = 'en'
     }
-    console.log(this.cut)
   },
   methods: {
     getcontentListedEdit() {
@@ -595,6 +594,7 @@ export default {
                 item1.description= '' // 描述
             }
           })
+          console.log(this.contentList)
         };
 
       })
@@ -644,6 +644,11 @@ export default {
       // } else {
       //   value.technologyTerritory = value.technologyTerritory.split(',')
       // }
+      if(this.formInline.controlType == 11){
+        this.required = false
+      }else{
+        this.required = true
+      }
       this.formInline = value
       this.title = this.$t('edit')
       this.flag = 0
@@ -674,41 +679,44 @@ export default {
         return
       }
       let falg = 1
-      this.contentList.forEach((item,index) => {
+      if(this.formInline.controlType != 11){
-        let reg = /^[0-9a-zA-Z-/. ]{1,}$/
+        this.contentList.forEach((item,index) => {
-        // 编号的限制
+          let reg = /^[0-9a-zA-Z-/. ]{1,}$/
-        if(item.paramsNumber == '' || item.paramsNumber === undefined) {
+          // 编号的限制
-          this.$message.warning(this.$t('standard')+this.$t('cannotEmpty'))
+          if(item.paramsNumber == '' || item.paramsNumber === undefined ) {
-          falg = 0
+            this.$message.warning(this.$t('standard')+this.$t('cannotEmpty'))
-          return
+            falg = 0
-        } else if(item.paramsNumber.length > 15){
+            return
-          this.$message.warning(this.$t('standard')+this.$t('cantExeed')+'15'+this.$t('Characters'))
+          } else if(item.paramsNumber.length > 15){
-          falg = 0
+            this.$message.warning(this.$t('standard')+this.$t('cantExeed')+'15'+this.$t('Characters'))
-          return
+            falg = 0
-        } else if(item.paramsNumber.match(reg) === null) {
+            return
-          this.$message.warning(this.$t('standard')+this.$t('onlyThree'))
+          } else if(item.paramsNumber.match(reg) === null) {
-          falg = 0
+            this.$message.warning(this.$t('standard')+this.$t('onlyThree'))
-          return
-        }
-        // 参数名称的限制
-        if(item.paramsName == '' || item.paramsName === undefined) {
-          this.$message.warning(this.$t('ParameterName')+this.$t('cannotEmpty'))
-          falg = 0
-          return
-        } else if(item.paramsName.length > 100){
-          this.$message.warning(this.$t('ParameterName')+this.$t('cantExeed')+'100'+this.$t('Characters'))
-          falg = 0
-          return
-        }
-        if(item.description !== undefined && item.description !== null){
-          // 参数说明的限制
-          if(item.description.length > 2000){
-            this.$message.warning(this.$t('ParameterDescription')+this.$t('cantExeed')+'2000'+this.$t('Characters'))
             falg = 0
             return
           }
-        }
+          // 参数名称的限制
-      })
+          if(item.paramsNumber == '' || item.paramsNumber === undefined) {
+            this.$message.warning(this.$t('ParameterName')+this.$t('cannotEmpty'))
+            falg = 0
+            return
+          } else if(item.paramsName.length > 100){
+            this.$message.warning(this.$t('ParameterName')+this.$t('cantExeed')+'100'+this.$t('Characters'))
+            falg = 0
+            return
+          }
+          if(item.description !== undefined && item.description !== null){
+            // 参数说明的限制
+            if(item.description.length > 2000){
+              this.$message.warning(this.$t('ParameterDescription')+this.$t('cantExeed')+'2000'+this.$t('Characters'))
+              falg = 0
+              return
+            }
+          }
+        })
+      }
+
       if(falg === 1) {
         this.$refs.ruleForm.validate(valid => {
           if (valid) {