diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysCategoryController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysCategoryController.java index 8d2e852d0..3a67cbe3e 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysCategoryController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysCategoryController.java @@ -119,6 +119,7 @@ public class SysCategoryController { public Result add(@RequestBody SysCategory sysCategory) { Result result = new Result(); try { + sysCategory.setName(sysCategory.getName().replace(" ","")); sysCategoryService.addSysCategory(sysCategory); result.success("添加成功！"); } catch (Exception e) { @@ -141,6 +142,7 @@ public class SysCategoryController { if(sysCategoryEntity==null) { result.error500("未找到对应实体"); }else { + sysCategory.setName(sysCategory.getName().replace(" ","")); sysCategoryService.updateSysCategory(sysCategory); result.success("修改成功!"); } diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictController.java index 79d6a9064..5b3375a33 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictController.java @@ -408,6 +408,8 @@ public class SysDictController { sysDict.setCreateTime(new Date()); sysDict.setDelFlag(CommonConstant.DEL_FLAG_0); + + sysDict.setDictName(sysDict.getDictName().replace(" ","")); sysDictService.save(sysDict); } result.success("保存成功！"); diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictItemController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictItemController.java index 15585d58f..2c8590910 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictItemController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictItemController.java @@ -100,6 +100,7 @@ public class SysDictItemController { } }else { try { + sysDictItem.setItemText(sysDictItem.getItemText().replace(" ","")); sysDictItem.setCreateTime(new Date()); sysDictItem.setDelFlag(CommonConstant.DEL_FLAG_0); sysDictItem.setItemValue(UUID.randomUUID().toString().replace("-", "")); @@ -135,6 +136,7 @@ public class SysDictItemController { result.error500("固定字段,不可删除"); } else { sysDictItem.setUpdateTime(new Date()); + sysDictItem.setItemText(sysDictItem.getItemText().replace(" ","")); boolean ok = sysDictItemService.updateById(sysDictItem); if (ok) { result.success("编辑成功!"); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectNameInfoEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectNameInfoEOController.java index eb494ffc2..26911c24f 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectNameInfoEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectNameInfoEOController.java @@ -1,25 +1,26 @@ package com.jero.modules.project.controller; -import java.util.Arrays; -import java.util.List; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import com.jero.common.api.vo.Result; -import com.jero.common.system.query.QueryGenerator; -import com.jero.modules.project.entity.ProjectNameInfoEO; -import com.jero.modules.project.service.IProjectNameInfoEOService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import lombok.extern.slf4j.Slf4j; +import com.jero.common.api.vo.Result; +import com.jero.common.aspect.annotation.AutoLog; import com.jero.common.system.base.controller.JeroController; +import com.jero.common.system.query.QueryGenerator; +import com.jero.modules.project.entity.ProjectNameInfoEO; +import com.jero.modules.project.service.IProjectNameInfoEOService; +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.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import org.springframework.web.servlet.ModelAndView; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import com.jero.common.aspect.annotation.AutoLog; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.util.Arrays; +import java.util.List; /** @@ -167,4 +168,15 @@ public class ProjectNameInfoEOController extends JeroController { * @return */ List queryList(); + + String getYapiInfo(); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectNameInfoEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectNameInfoEOServiceImpl.java index b00f734bc..d361c8985 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectNameInfoEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectNameInfoEOServiceImpl.java @@ -1,12 +1,15 @@ package com.jero.modules.project.service.impl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.modules.project.entity.ProjectNameInfoEO; import com.jero.modules.project.mapper.ProjectNameInfoEOMapper; import com.jero.modules.project.service.IProjectNameInfoEOService; +import com.jero.modules.space.service.SpaceServiceImpl; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.List; + import java.util.Date; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import java.util.List; /** * @Description: 项目名信息表 @@ -16,7 +19,8 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; */ @Service public class ProjectNameInfoEOServiceImpl extends ServiceImpl implements IProjectNameInfoEOService { - +@Autowired +private SpaceServiceImpl spaceService; /** * 保存 * @@ -86,4 +90,178 @@ public class ProjectNameInfoEOServiceImpl extends ServiceImpl queryList() { return list(); } +@Override + public String getYapiInfo(){ + String sign =""; + try { +// sign = spaceService.getSign(); + + String resultData = "{\n" + + " \"resultData\": [\n" + + " {\n" + + " \"modelCode\": \"ES8_00\",\n" + + " \"modelName\": \"ES8\",\n" + + " \"hardwarePltCode\": \"mhp_npa\",\n" + + " \"hardwarePltName\": \"NPA\",\n" + + " \"softwarePltCode\": \"msp_nt1\",\n" + + " \"softwarePltName\": \"NT1\",\n" + + " \"modelYearInfoList\": [\n" + + " {\n" + + " \"yearCode\": \"mp_g1.1\",\n" + + " \"yearName\": \"G1.1\"\n" + + " },\n" + + " {\n" + + " \"yearCode\": \"mp_g1.2\",\n" + + " \"yearName\": \"G1.2\"\n" + + " },\n" + + " {\n" + + " \"yearCode\": \"mp_g1.3\",\n" + + " \"yearName\": \"G1.3\"\n" + + " },\n" + + " {\n" + + " \"yearCode\": \"mp_g1.f\",\n" + + " \"yearName\": \"G1.F\"\n" + + " },\n" + + " {\n" + + " \"yearCode\": \"mp_g1.f.e\",\n" + + " \"yearName\": \"G1.F.E\"\n" + + " },\n" + + " {\n" + + " \"yearCode\": \"mp_my2018\",\n" + + " \"yearName\": \"MY2018\"\n" + + " },\n" + + " {\n" + + " \"yearCode\": \"mp_g1.5\",\n" + + " \"yearName\": \"G1.5\"\n" + + " }\n" + + " ]\n" + + " }，\n" + + " {\n" + + " \"modelCode\": \"FURY_00\",\n" + + " \"modelName\": \"FURY\",\n" + + " \"hardwarePltCode\": \"mhp_npa\",\n" + + " \"hardwarePltName\": \"NPA\",\n" + + " \"softwarePltCode\": \"msp_nt1\",\n" + + " \"softwarePltName\": \"NT1\",\n" + + " \"modelYearInfoList\": [\n" + + " {\n" + + " \"yearCode\": \"mp_g1.1\",\n" + + " \"yearName\": \"G1.1\"\n" + + " },\n" + + " {\n" + + " \"yearCode\": \"mp_g1.2\",\n" + + " \"yearName\": \"G1.2\"\n" + + " },\n" + + " {\n" + + " \"yearCode\": \"mp_g1.3\",\n" + + " \"yearName\": \"G1.3\"\n" + + " },\n" + + " {\n" + + " \"yearCode\": \"mp_g1.f\",\n" + + " \"yearName\": \"G1.F\"\n" + + " },\n" + + " {\n" + + " \"yearCode\": \"mp_g1.6\",\n" + + " \"yearName\": \"G1.6\"\n" + + " },\n" + + " {\n" + + " \"yearCode\": \"mp_g1.5\",\n" + + " \"yearName\": \"G1.5\"\n" + + " },\n" + + " {\n" + + " \"yearCode\": \"mp_g1.1.e\",\n" + + " \"yearName\": \"G1.1.E\"\n" + + " }\n" + + " ]\n" + + " },\n" + + " {\n" + + " \"modelCode\": \"FORCE_00\",\n" + + " \"modelName\": \"FORCE\",\n" + + " \"hardwarePltCode\": \"mhp_npb\",\n" + + " \"hardwarePltName\": \"NPB\",\n" + + " \"softwarePltCode\": \"msp_nt2\",\n" + + " \"softwarePltName\": \"NT2\",\n" + + " \"modelYearInfoList\": [\n" + + " {\n" + + " \"yearCode\": \"mp_g1.1\",\n" + + " \"yearName\": \"G1.1\"\n" + + " },\n" + + " {\n" + + " \"yearCode\": \"mp_g1.1.e\",\n" + + " \"yearName\": \"G1.1.E\"\n" + + " },\n" + + " {\n" + + " \"yearCode\": \"mp_g1.2\",\n" + + " \"yearName\": \"G1.2\"\n" + + " },\n" + + " {\n" + + " \"yearCode\": \"mp_g1.3\",\n" + + " \"yearName\": \"G1.3\"\n" + + " },\n" + + " {\n" + + " \"yearCode\": \"mp_g1.f\",\n" + + " \"yearName\": \"G1.F\"\n" + + " },\n" + + " {\n" + + " \"yearCode\": \"mp_g1.6\",\n" + + " \"yearName\": \"G1.6\"\n" + + " },\n" + + " {\n" + + " \"yearCode\": \"mp_g1.5\",\n" + + " \"yearName\": \"G1.5\"\n" + + " }\n" + + " ]\n" + + " },\n" + + " {\n" + + " \"modelCode\": \"Gemini_00\",\n" + + " \"modelName\": \"Gemini\",\n" + + " \"hardwarePltCode\": \"mhp_npa\",\n" + + " \"hardwarePltName\": \"NPA\",\n" + + " \"softwarePltCode\": \"msp_nt2\",\n" + + " \"softwarePltName\": \"NT2\",\n" + + " \"modelYearInfoList\": [\n" + + " {\n" + + " \"yearCode\": \"mp_g1.1\",\n" + + " \"yearName\": \"G1.1\"\n" + + " },\n" + + " {\n" + + " \"yearCode\": \"mp_g1.1.e\",\n" + + " \"yearName\": \"G1.1.E\"\n" + + " }\n" + + " ]\n" + + " },\n" + + " {\n" + + " \"modelCode\": \"Pegasus_00\",\n" + + " \"modelName\": \"Pegasus\",\n" + + " \"hardwarePltCode\": \"mhp_npc\",\n" + + " \"hardwarePltName\": \"NPC\",\n" + + " \"softwarePltCode\": \"msp_nt2\",\n" + + " \"softwarePltName\": \"NT2\",\n" + + " \"modelYearInfoList\": [\n" + + " {\n" + + " \"yearCode\": \"mp_g1.1\",\n" + + " \"yearName\": \"G1.1\"\n" + + " },\n" + + " {\n" + + " \"yearCode\": \"mp_g1.1.e\",\n" + + " \"yearName\": \"G1.1.E\"\n" + + " },\n" + + " {\n" + + " \"yearCode\": \"mp_G1.1.RH\",\n" + + " \"yearName\": \"G1.1.RH\"\n" + + " }\n" + + " ]\n" + + " }\n" + + " ],\n" + + " \"resultCode\": \"WL-0000\",\n" + + " \"resultDesc\": \"Success\"\n" + + "}"; + + + + } catch (Exception e) { + e.printStackTrace(); + }return sign; + } + } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/space/service/ISpaceService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/space/service/ISpaceService.java new file mode 100644 index 000000000..6c1f9132a --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/space/service/ISpaceService.java @@ -0,0 +1,26 @@ +package com.jero.modules.space.service; + +import java.io.IOException; + +public interface ISpaceService { + + /** + * 获取token + * @return + * @throws IOException + */ +// String getTenantAccessToken() throws IOException; + + /** + * 批量发送消息 + * @param userIds 用户域账号，对应数据库字段：third_id + * @param message 消息内容 + * @param title 消息类型 + * @param backUrl 消息内容中的跳转链接 + * @return + * @throws IOException + */ +// String batchSendMessage(String[] userIds, String message, String title, String backUrl) throws IOException; + + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/space/service/SpaceServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/space/service/SpaceServiceImpl.java new file mode 100644 index 000000000..2347963aa --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/space/service/SpaceServiceImpl.java @@ -0,0 +1,91 @@ +package com.jero.modules.space.service; + +import cn.hutool.http.HttpRequest; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Service; + +import java.security.MessageDigest; +import java.util.Arrays; +import java.util.HashMap; +import java.util.Map; + +@Slf4j +@Service +public class SpaceServiceImpl implements ISpaceService { + @Value("${Space.appId}") + private String appId; + + @Value("${Space.appSecret}") + private String appSecret; + + @Value("${Space.domainUrl}") + private String domainUrl; + + + /** + * 生成签名 + *@param map 参数 + *@param secretKey 加签密钥 + *@return String + *@throws Exception if secretKey is Empty + */ + public static String sign(Map map, String secretKey) throws Exception { + if (StringUtils.isEmpty(secretKey)) { + throw new Exception("secretKey can not be empty"); + } + StringBuilder contentBuffer = new StringBuilder(); + Object[] signParamArray = map.keySet().toArray(); + Arrays.sort(signParamArray); + for (Object key : signParamArray) { + Object value = map.get(key); + if (!"digest".equals(key) && value != null && !value.equals("")) { + contentBuffer.append(key + "=" + value + "&"); + } + } + String sign = contentBuffer.substring(0, contentBuffer.length() - 1) + secretKey; + return Md5(sign, "utf-8"); + } + + public static String Md5(String plainText, String encoding) throws Exception { + MessageDigest md = MessageDigest.getInstance("MD5"); + md.update(plainText.getBytes(encoding)); + byte b[] = md.digest(); + return byte2hex(b); + } + + public static String byte2hex(byte[] b) { + String hs = ""; + String stmp = ""; + for (int n = 0; n < b.length; n++) { + stmp = (Integer.toHexString(b[n] & 0XFF)); + if (stmp.length() == 1) + hs = hs + "0" + stmp; + else + hs = hs + stmp; + } + return hs.toUpperCase(); + } + + public String getSign() throws Exception { + Map paramMap = new HashMap(); + paramMap.put("bizData", "{\"module\":\"GRP\"}");//业务参数 + paramMap.put("timestamp", String.valueOf(System.currentTimeMillis()));//请求时间 + paramMap.put("appId", appId);//在Program Space中注册的appId + String sign = sign(paramMap,appSecret);//签名字符串 + paramMap.put("sign",sign);//签名字符串 + +// String response = HttpUtil.post(domainUrl, paramMap); + String response = HttpRequest.post(domainUrl) + .header("Content-Type", "application/x-www-form-urlencoded") + .form(paramMap)//表单内容 + .timeout(20000)//超时，毫秒 + .execute().body(); + +// String response = HttpRequestUtil.getResponseOfPOST(domainUrl, headerMap, null); + return response; + + } + +} \ No newline at end of file diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/impl/OnlCgformTagServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/impl/OnlCgformTagServiceImpl.java index d1c8c45fb..303c81a94 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/impl/OnlCgformTagServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/impl/OnlCgformTagServiceImpl.java @@ -85,7 +85,7 @@ public class OnlCgformTagServiceImpl extends ServiceImpl +
+ + + + + + + + + + + + + + + {{ $t('query') }} + {{ $t('reset') }} + + + + + + +
+ +
+
+ {{ $t('cancel') }} + {{ $t('submit') }} +
+
+ + + + + + \ No newline at end of file diff --git a/jero-web/src/components/TaskCutOffTime/index.vue b/jero-web/src/components/TaskCutOffTime/index.vue index 44086b7ea..dee4202f3 100644 --- a/jero-web/src/components/TaskCutOffTime/index.vue +++ b/jero-web/src/components/TaskCutOffTime/index.vue @@ -103,19 +103,18 @@ export default { }, handleTableChange(val) { }, - //新增 + //保存 handleSubmit() { let _this = this let param = {ids: this.selectedRowKeysArray, deadline: `${this.pickerDate}`, } - postAction('/params/collectManifest/updateDeadlineBatch', param).then((res) => { - if (res.success) { - this.loadData() - this.$emit('areaVisibleTaskCutOffTimeflag', false) - this.$message.success(res.message) - } else { - this.$message.warning(res.message) - } - }) + postAction('/params/collectManifest/updateDeadlineBatch', param).then((res) => { + if (res.success) { + this.$emit('areaVisibleTaskCutOffTimeflag', false) + this.$message.success(res.message) + } else { + this.$message.warning(res.message) + } + }) }, onChange(val) { this.pickerDate = moment(val).format('YYYY-MM-DD HH:mm:ss') diff --git a/jero-web/src/views/documentManage/splitting/modules/SplitText.vue b/jero-web/src/views/documentManage/splitting/modules/SplitText.vue index 1c9b4697f..33f9b7d38 100644 --- a/jero-web/src/views/documentManage/splitting/modules/SplitText.vue +++ b/jero-web/src/views/documentManage/splitting/modules/SplitText.vue @@ -220,36 +220,70 @@ if (file.file_name) { let name = file.file_name.split('.') let nameSuffix = name[name.length - 1] - if (nameSuffix.toLowerCase() === 'doc'||nameSuffix.toLowerCase() === 'docx'||nameSuffix.toLowerCase() === 'pdf') { - let params = { - attId: file.id, - title: file.title, - fileName:file.file_name, - serialNumber: file.serial_number, - connectId: file.connect_id, - fileGroup: this.fileGroup, - fileType:file.text_info + if(this.fileGroup === 'GSO') { + if (nameSuffix.toLowerCase() === 'doc'||nameSuffix.toLowerCase() === 'docx'||nameSuffix.toLowerCase() === 'pdf') { + let params = { + attId: file.id, + title: file.title, + fileName:file.file_name, + serialNumber: file.serial_number, + connectId: file.connect_id, + fileGroup: this.fileGroup, + fileType:file.text_info + } + + if(!this.submitFlag){ + this.submitFlag=true + postAction(`split/sarFileSplitInfo/add`, params).then(res => { + if (res.success) { + this.$message.success(this.$t('OperationSuccessful')) + eventBUs.$emit('searchReset') + this.visible = false; + this.$emit('visible', false) + } else { + this.$message.warning(res.message) + } + }).finally(()=>{ + this.submitFlag =false + + }) + this.$emit('exportVisible',true) + } + } else { + this.$message.warning(this.$t('OnlyWord')) } - - if(!this.submitFlag){ - this.submitFlag=true - postAction(`split/sarFileSplitInfo/add`, params).then(res => { - if (res.success) { - this.$message.success(this.$t('OperationSuccessful')) - eventBUs.$emit('searchReset') - this.visible = false; - this.$emit('visible', false) - } else { - this.$message.warning(res.message) - } - }).finally(()=>{ - this.submitFlag =false - - }) - this.$emit('exportVisible',true) - } } else { - this.$message.warning(this.$t('OnlyWord')) + if (nameSuffix.toLowerCase() === 'doc'||nameSuffix.toLowerCase() === 'docx') { + let params = { + attId: file.id, + title: file.title, + fileName:file.file_name, + serialNumber: file.serial_number, + connectId: file.connect_id, + fileGroup: this.fileGroup, + fileType:file.text_info + } + + if(!this.submitFlag){ + this.submitFlag=true + postAction(`split/sarFileSplitInfo/add`, params).then(res => { + if (res.success) { + this.$message.success(this.$t('OperationSuccessful')) + eventBUs.$emit('searchReset') + this.visible = false; + this.$emit('visible', false) + } else { + this.$message.warning(res.message) + } + }).finally(()=>{ + this.submitFlag =false + + }) + this.$emit('exportVisible',true) + } + } else { + this.$message.warning(this.$t('OnlyWordItem')) + } } } } diff --git a/jero-web/src/views/documentTools/virtualList/components/addModel.vue b/jero-web/src/views/documentTools/virtualList/components/addModel.vue index 4203bc568..ec82418de 100644 --- a/jero-web/src/views/documentTools/virtualList/components/addModel.vue +++ b/jero-web/src/views/documentTools/virtualList/components/addModel.vue @@ -40,7 +40,7 @@ :triggerChange="false" :dictCode="'state'"/> - + {{$t('query')}} {{$t('reset')}} @@ -265,8 +265,7 @@ } .title-text { - width: 20%; - min-width: 110px; + width: 33px; color: #000F16; display: inline-block; font-weight: 500; @@ -281,9 +280,8 @@ .box-input { display: inline-block; - width: 70%; + width: 100%; height: 38px; - margin-top: 2px; } .box-button { diff --git a/jero-web/src/views/documentTools/virtualList/components/editModel.vue b/jero-web/src/views/documentTools/virtualList/components/editModel.vue index 62d14c0ae..2e93313ab 100644 --- a/jero-web/src/views/documentTools/virtualList/components/editModel.vue +++ b/jero-web/src/views/documentTools/virtualList/components/editModel.vue @@ -55,13 +55,17 @@
- WVTA ID + {{$t('zoneOfApplication')}}
- - + + + + +
@@ -117,6 +121,24 @@ + +
+
+ {{$t('implementationCategory')}} +
+ + + +
+ + +
@@ -134,8 +156,6 @@
- -
@@ -154,6 +174,21 @@
+ + + +
+
+ WVTA ID +
+ + + +
+
@@ -171,6 +206,39 @@
+ + +
+
+ * + {{$t('certificationLevel')}} +
+ + + +
+ + +
+
+ {{$t('applicableSupplement')}} +
+ + + +
+ +
@@ -209,74 +277,6 @@
- - -
-
- * - {{$t('certificationLevel')}} -
- - - -
- - -
-
- {{$t('implementationCategory')}} -
- - - -
- - - - -
-
- {{$t('zoneOfApplication')}} -
- - - - - - -
- - -
-
- {{$t('applicableSupplement')}} -
- - - -
- -
diff --git a/jero-web/src/views/documentTools/virtualList/index.vue b/jero-web/src/views/documentTools/virtualList/index.vue index 95e35e94f..66d090504 100644 --- a/jero-web/src/views/documentTools/virtualList/index.vue +++ b/jero-web/src/views/documentTools/virtualList/index.vue @@ -178,7 +178,7 @@ total: 0, pageSize: 10, pageNo: 1, - title: '新增', + title: this.$t('newlyAdded'), columns: [ { title: this.$t('VirtualListName'), @@ -217,7 +217,7 @@ }, //添加 handleAdd() { - this.title = '新增' + this.title = this.$t('newlyAdded') this.formInline = {} this.visible = true this.$nextTick(() => { @@ -249,7 +249,7 @@ }, //编辑 edit(item) { - this.title = '编辑' + this.title = this.$t('edit') this.formInline = JSON.parse(JSON.stringify(item)) this.visible = true this.$nextTick(() => { @@ -514,7 +514,7 @@ .drawer-bootom-button { position: absolute; bottom: 0; - z-index:100; + z-index: 100; width: 100%; border-top: 1px solid #e8e8e8; padding: 10px 16px; diff --git a/jero-web/src/views/processCenter/components/engineeringConfirmation.vue b/jero-web/src/views/processCenter/components/engineeringConfirmation.vue index 3147ed8e1..902c8a6e5 100644 --- a/jero-web/src/views/processCenter/components/engineeringConfirmation.vue +++ b/jero-web/src/views/processCenter/components/engineeringConfirmation.vue @@ -6,21 +6,21 @@
-
+ v-if="$route.query.TaskKey == 'zrrclrw' && this.$route.query.isDisplay" + @click="distributionEngineerClick($t('distributionEngineer'),1)"> {{ $t('distributionEngineer') }}
{{ $t('reminderHandling') }}
+ v-if="$route.query.TaskKey == 'zrrclrw' && this.$route.query.isDisplay" + @click="distributionEngineerClick($t('addFeedback'),2)"> {{ $t('addFeedback') }}
@@ -384,7 +384,7 @@ ] }, visibleDetails: false, - columns: [ + columnsAll: [ { title: this.$t('serialNumber'), dataIndex: 'index', @@ -448,12 +448,27 @@ } }, mounted() { + this.$route.query.isDisplay = JSON.parse(this.$route.query.isDisplay) this.getList() }, + computed: { + columns() { + let columnResult = JSON.parse(JSON.stringify(this.columnsAll)) + if (this.$route.query.TaskKey != 'zrrclrw' || !this.$route.query.isDisplay) { + for (var i = 0; i < columnResult.length; i++) { + if (columnResult[i].title === this.$t('operation')) { + columnResult.splice(i, 1) + i-- + } + } + } + return columnResult + } + }, methods: { pageOnChange(page, pageSize) { this.pageNo = page - this.getList() + this.getDetails() }, handleOk() { this.$refs.ruleForm.validate(valid => { @@ -525,10 +540,13 @@ handleCancel() { this.visible = false }, - distributionEngineerClick(title) { + distributionEngineerClick(title, num) { this.title = title this.visible = true this.formInline = {} + if (num == 1) { + this.getReminderHandlingList(1) + } this.$nextTick(() => { this.$refs.ruleForm.validateField() }) @@ -563,9 +581,9 @@ }, reminderHandling() { this.visibleTable = true - this.getReminderHandlingList() + this.getReminderHandlingList(2) }, - getReminderHandlingList() { + getReminderHandlingList(num) { this.loadingTable = true let query = { taskDefinitionKey: 'dreDispose', @@ -574,6 +592,24 @@ getAction(this.url.queryByActiProcInstId, query).then((res) => { if (res.success) { this.dataSourceTable = res.result || [] + if (num == 1) { + this.distributionEngineerList = [] + let userName = [] + let userId = [] + if (this.dataSourceTable && this.dataSourceTable.length > 0) { + this.dataSourceTable.forEach(val => { + this.distributionEngineerList.push({ + name: val.userName, + userId: val.userId, + deliveryInstructions: val.deliveryInstructions + }) + userName.push(val.userName) + userId.push(val.userId) + }) + } + this.formInline.userId = userId.join(',') + this.formInline.userName = userName.join(',') + } this.loadingTable = false } else { this.dataSourceTable = [] diff --git a/jero-web/src/views/processCenter/components/footerProcess.vue b/jero-web/src/views/processCenter/components/footerProcess.vue index 574dbc2e8..3c01e42c5 100644 --- a/jero-web/src/views/processCenter/components/footerProcess.vue +++ b/jero-web/src/views/processCenter/components/footerProcess.vue @@ -15,7 +15,8 @@ {{$t('sendBack')}} - {{$t('adopt')}} + {{$t('Resubmit')}} + {{$t('submit')}}
@@ -59,7 +60,11 @@ isAdopt: { type: Boolean, default: false - } + }, + isResubmit:{ + type: Boolean, + default: false + }, }, methods: { terminationProcess() { @@ -82,6 +87,10 @@ }, backTo() { + }, + Resubmit(){ + let handlingTime = moment(new Date()).format('YYYY-MM-DD HH:mm:ss') + this.$emit('Resubmit', handlingTime) }, adopt() { let handlingTime = moment(new Date()).format('YYYY-MM-DD HH:mm:ss') @@ -108,7 +117,8 @@ .header-btn { margin-right: 10px; } - .header-btn:last-child{ + + .header-btn:last-child { margin-right: 0; } } diff --git a/jero-web/src/views/processCenter/components/reviewedByThePersonInCharge.vue b/jero-web/src/views/processCenter/components/reviewedByThePersonInCharge.vue index 5c81f85b6..8a919040e 100644 --- a/jero-web/src/views/processCenter/components/reviewedByThePersonInCharge.vue +++ b/jero-web/src/views/processCenter/components/reviewedByThePersonInCharge.vue @@ -10,12 +10,12 @@
- * + * {{$t('reviewResults')}}
- + @@ -42,7 +42,9 @@ {{$t('feedbackMessage')}}
- @@ -52,11 +54,12 @@
+ {{$t('projectDeliveryDescription')}}
- 爱上克里夫就的撒开了房间圣诞快乐房价士大夫打扫房间圣诞快乐房价是罚款乱收费考虑是否就但是考虑 + {{formInline.deliveryRequirements}}
@@ -66,11 +69,14 @@
+ * {{$t('feedbackFromTheEngineer')}}
- + @@ -81,10 +87,11 @@
- {{$t('Deliverables')}} + * + {{$t('Deliverables')}}
- + {{ (formInline.fileId === 'null' || formInline.fileId === '' || @@ -117,7 +124,7 @@
- 爱上克里夫就的撒开了房间圣诞快乐房价士大夫打扫房间圣诞快乐房价是罚款乱收费考虑是否就但是考虑 + {{formInline.approvalOpinion}}
@@ -135,14 +142,18 @@ {{$t('feedbackMessage')}} - - + @@ -155,7 +166,7 @@ components: { uploadFile }, - props: ['queryBy'], + props: ['queryBy', 'queryPersonInCharge'], data() { return { formInline: {}, @@ -176,21 +187,40 @@ } ], engineerFeedbackContent: [ + { + required: true, + message: this.$t('feedbackFromTheEngineer') + this.$t('cannotEmpty'), + trigger: 'blur' + }, { max: 300, message: this.$t('feedbackFromTheEngineer') + this.$t('cannotExceed') + 300 + this.$t('Characters'), trigger: 'blur' } + ], + fileId: [ + { + required: true, + message: this.$t('Deliverables') + this.$t('cannotEmpty'), + trigger: 'change' + } ] } } }, mounted() { + this.$route.query.isDisplay = JSON.parse(this.$route.query.isDisplay) if (this.queryBy) { this.formInline.reviewResult = this.queryBy.reviewResult || undefined this.formInline.approvalOpinion = '' this.formInline = { ...this.formInline } } + if (this.queryPersonInCharge) { + this.formInline.deliveryRequirements = this.queryPersonInCharge.deliveryRequirements + this.formInline.engineerFeedbackContent = this.queryPersonInCharge.engineerFeedbackContent + this.formInline.fileId = this.queryPersonInCharge.fileId + this.formInline = { ...this.formInline } + } }, methods: { submit(callBack) { @@ -273,7 +303,7 @@ } .title-text-fq { - width: 124px; + width: 130px; text-align: left; display: inline-block; font-weight: 500; diff --git a/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue b/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue index 71648ba3b..7c565020e 100644 --- a/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue +++ b/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue @@ -22,20 +22,23 @@ v-if="isDisplay" /> @@ -75,7 +78,9 @@ urlFrom: 'project/projectLibraryBase/queryById', queryProjectLawsInventoryInfoById: 'project/projectLawsInventoryEO/queryProjectLawsInventoryInfoById', queryTaskDetailByTaskIds: '/task/queryTaskDetailByTaskIds', - edit: '/project/projectTaskInventoryDetailEO/edit' + edit: '/project/projectTaskInventoryDetailEO/edit', + dreSubmit: '/project/projectTaskInventoryFeedbackEO/dreSubmit', + list: '/project/projectTaskInventoryFeedbackEO/list' }, queryBy: {}, queryProject: {}, @@ -136,24 +141,25 @@ title: this.$t('descriptionDeliverables'), value: this.$route.query.remarks } - ] + ], + queryPersonInCharge: {} } }, computed: { isSendBack() { - if (this.$route.query.TaskKey == 'fqrsh') { + if (this.$route.query.TaskKey == 'fqrsh' && this.$route.query.isDisplay) { return true } return false }, isTerminationProcess() { - if (this.$route.query.TaskKey == 'fqrsh') { + if (this.$route.query.TaskKey == 'fqrsh' && this.$route.query.isDisplay) { return true } return false }, isAdopt() { - if (this.$route.query.TaskKey == 'fqrsh') { + if (this.$route.query.TaskKey == 'fqrsh' && this.$route.query.isDisplay) { if (this.queryBy.reviewResult == 'Compliance' || this.queryBy.reviewResult == 'NA') { return true } @@ -161,27 +167,53 @@ return false }, isSubmit() { - if (this.$route.query.TaskKey == 'zrrclrw') { + if (this.$route.query.TaskKey == 'zrrclrw' && this.$route.query.isDisplay) { return true + } else if (this.$route.query.TaskKey == 'dreDispose' && this.$route.query.isDisplay) { + if (!this.queryPersonInCharge.engineerFeedbackContent && this.queryPersonInCharge.status != 'haveDone') { + return true + } + } + return false + }, + isResubmit() { + if (this.$route.query.TaskKey == 'dreDispose' && this.$route.query.isDisplay) { + if (this.queryPersonInCharge.engineerFeedbackContent && this.queryPersonInCharge.status != 'haveDone') { + return true + } } return false } }, mounted() { let _this = this - if (this.$route.query.taskIds) { - this.isDisplay = false - this.queryTaskDetailByTask(function() { - _this.queryProjectLawsInventoryInfo() - }) - } else { - this.loading = true - this.isDisplay = false - this.queryBy.projectLibraryId = this.$route.query.projectLibraryId - this.queryBy.id = this.$route.query.projectTaskInventoryId - this.queryProjectLawsInventoryInfo() + this.$route.query.isDisplay = JSON.parse(this.$route.query.isDisplay) + let query = { + actiProcInstId: this.$route.query.actiProcInstId, + createBy: this.userInfo().username } + this.loading = true + getAction(this.url.list, query).then((res) => { + if (res.success) { + this.queryPersonInCharge = res.result[1] || {} + if (this.$route.query.taskIds) { + this.isDisplay = false + this.queryTaskDetailByTask(function() { + _this.queryProjectLawsInventoryInfo() + }) + } else { + this.loading = true + this.isDisplay = false + this.queryBy.projectLibraryId = this.$route.query.projectLibraryId + this.queryBy.id = this.$route.query.projectTaskInventoryId + this.queryProjectLawsInventoryInfo() + } + } else { + this.dataSource = [] + } + }) }, + methods: { ...mapGetters(['userInfo']), terminationProcess(operatorTime) { @@ -209,12 +241,40 @@ } this.completeTask({ flag: 1, operatorTime: operatorTime }) }, + Resubmit(operatorTime) { + this.$refs.reviewedByThePersonInChargeRef.submit((res) => { + this.textLoading = this.$t('Submitting') + this.loading = true + res.operatorTime = operatorTime + if (this.$route.query.TaskKey == 'dreDispose') { + this.dreSubmit(res) + } + }) + }, submit(operatorTime) { this.$refs.reviewedByThePersonInChargeRef.submit((res) => { this.textLoading = this.$t('Submitting') this.loading = true res.operatorTime = operatorTime - this.completeTask(res) + if (this.$route.query.TaskKey == 'dreDispose') { + this.dreSubmit(res) + } else { + this.completeTask(res) + } + }) + }, + dreSubmit(val) { + let query = { + id: this.queryPersonInCharge.id, + engineerFeedbackContent: val.engineerFeedbackContent, + fileId: val.fileId, + flowType: this.$route.query.flowType, + actiProcInstId: this.$route.query.actiProcInstId, + projectTaskInventoryId: this.$route.query.projectTaskInventoryId, + deliveryRequirements: val.deliveryRequirements + } + putAction(this.url.dreSubmit, query).then((res) => { + }) }, completeTask(value) { diff --git a/jero-web/src/views/projectManagement/ParameterItemCollection/ProjectDetails/index.vue b/jero-web/src/views/projectManagement/ParameterItemCollection/ProjectDetails/index.vue index 7d8efe6c1..dc15a49ad 100644 --- a/jero-web/src/views/projectManagement/ParameterItemCollection/ProjectDetails/index.vue +++ b/jero-web/src/views/projectManagement/ParameterItemCollection/ProjectDetails/index.vue @@ -1,6 +1,6 @@ \ No newline at end of file diff --git a/jero-web/src/views/projectManagement/ProjectDetails/index.vue b/jero-web/src/views/projectManagement/ProjectDetails/index.vue index 7b96e95d9..e4c4eac73 100644 --- a/jero-web/src/views/projectManagement/ProjectDetails/index.vue +++ b/jero-web/src/views/projectManagement/ProjectDetails/index.vue @@ -90,7 +90,7 @@ title: this.$t('projectDetails'), textTitle: '项目详情', url: { - logList: '', + logList: '/project/projectLawsInventoryLogEO/page', historicalVersionUrl: '' } } @@ -119,7 +119,7 @@ text[num].classList.add('Virtual-detail-left-text-color') }, UpdateLogClick() { - this.$refs.updateLogRef.getList() + this.$refs.updateLogRef.getList({projectLibraryId: this.$route.query.id}) }, historicalVersionClick() { this.$refs.historicalVersionListRef.getList() diff --git a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue index 70f486201..d18ec4816 100644 --- a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue +++ b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue @@ -590,6 +590,7 @@ export default { // 截至时间确定弹框关闭 areaVisibleTaskCutOffTimeflag(val) { this.areaVisibleTaskCutOffTime = val + this.$refs.CollectionTabel.getTableList() }, handleModule() { diff --git a/jero-web/src/views/projectManagement/components/TaskList.vue b/jero-web/src/views/projectManagement/components/TaskList.vue index 83063f479..6626f9ec9 100644 --- a/jero-web/src/views/projectManagement/components/TaskList.vue +++ b/jero-web/src/views/projectManagement/components/TaskList.vue @@ -231,12 +231,14 @@ CurrentColor: { '1': '#f3dddd', '2': '#f6ebdb', - '3': '#dbf6e2' + '3': '#dbf6e2', + '4': '#ddf3f4' }, CurrentColorBox: { '1': '#E83030', '2': '#FDA71C', - '3': '#26BD4B' + '3': '#26BD4B', + '4': '#00B3BE' }, url: { list: '/project/projectTaskInventoryEO/list', @@ -273,6 +275,8 @@ }, verifyTaskClick(val, num, isTrue) { let query = {} + console.log(typeof isTrue) + return switch (num) { case 1: query = { @@ -283,7 +287,8 @@ id: this.$route.query.id, studioEngineer: this.$route.query.studioEngineer, serialNumber: val.serialNumber, - TaskKey: isTrue ? val.designTaskDefinitionKey : 'hhhhh', + TaskKey: val.designTaskDefinitionKey, + isDisplay: isTrue, flowType: 2, Sponsor: 'designInitiatorName', personLiable: 'designDutyName', @@ -304,8 +309,9 @@ studioEngineer: this.$route.query.studioEngineer, projectLibraryId: this.$route.query.id, serialNumber: val.serialNumber, - TaskKey: isTrue ? val.prehomoTaskDefinitionKey : 'hhhh', + TaskKey: val.prehomoTaskDefinitionKey, flowType: 3, + isDisplay: isTrue, id: this.$route.query.id, Sponsor: 'prehomoInitiatorName', personLiable: 'prehomoDutyName', @@ -327,8 +333,9 @@ studioEngineer: this.$route.query.studioEngineer, serialNumber: val.serialNumber, projectTaskInventoryId: val.projectLawsInventoryId, - TaskKey: isTrue ? val.verifyTaskDefinitionKey : 'hhhhh', + TaskKey: val.verifyTaskDefinitionKey, flowType: 4, + isDisplay: isTrue, Sponsor: 'verifyInitiatorName', personLiable: 'verifyDutyName', typeOfDeliverables: 'verifyDeliverableType_dictText', diff --git a/jero-web/src/views/projectManagement/components/TaskListModel.vue b/jero-web/src/views/projectManagement/components/TaskListModel.vue index fa98a23c3..80e5e71e0 100644 --- a/jero-web/src/views/projectManagement/components/TaskListModel.vue +++ b/jero-web/src/views/projectManagement/components/TaskListModel.vue @@ -73,11 +73,12 @@ {{ $t('green') }} - - - - - + + + + {{ $t('blue') }} + + @@ -143,6 +144,7 @@ this.disabled = true } } + console.log(val.conditionAssessment) this.formInline = val this.$nextTick(() => { this.$refs.ruleForm.clearValidate() diff --git a/jero-web/src/views/projectManagement/components/batSetting.vue b/jero-web/src/views/projectManagement/components/batSetting.vue index 6b65bc210..d0e883b8e 100644 --- a/jero-web/src/views/projectManagement/components/batSetting.vue +++ b/jero-web/src/views/projectManagement/components/batSetting.vue @@ -1,7 +1,7 @@