Merge remote-tracking branch 'origin/master'

client/.env.dev

@@ -6,7 +6,7 @@ VITE_DEV=false
 # 请求路径
 # VITE_BASE_URL='http://10.10.9.113:48080'
 VITE_BASE_URL='http://10.10.10.7:18080'
-# VITE_BASE_URL='http://oa.zjugis.com:28080'
+# VITE_BASE_URL='https://oa.zjugis.com:28080'
 
 # VITE_BASE_URL='http://10.10.9.168:48080'
 

client/src/components/Tinymce/Tinymce.vue

@@ -148,6 +148,7 @@ const initOptions = computed(() => {
     object_resizing: false,
     auto_focus: true,
     paste_data_images: true,
+    convert_urls: false,
     skin: 'oxide',
     skin_url: '/resource/tinymce/skins/ui/oxide',
     content_css: '/resource/tinymce/skins/ui/oxide/content.min.css',

client/vite.config.ts

@@ -33,7 +33,7 @@ export default ({ command, mode }: ConfigEnv): UserConfig => {
       // 本地跨域代理. 目前注释的原因：暂时没有用途，server 端已经支持跨域
       proxy: {
         ['/widewebApi']: {
-          target: 'http://wideweb.niceued.com',
+          target: 'https://www.zjugis.com',
           ws: false,
           changeOrigin: true,
           rewrite: (path) => path.replace(new RegExp(`^/widewebApi`), ''),

zjugis-business/src/main/java/com/zjugis/business/flow/commoncost/event/CommonCostEvent.java

@@ -143,7 +143,7 @@ public class CommonCostEvent extends BaseController {
                 entity.setFlowFinishtime(LocalDateTime.now());
                 commonCostService.updateCommonCost(CommonCostConvert.INSTANCE.convert(entity));
                 //如果是代办，更新一下固定资产和外购存货的状态
-                if (entity.getIsAgent()==1) {
+                if (entity.getIsAgent() == 1) {
                     AssetProcureDO asset = new AssetProcureDO();
                     asset.setCommonCostId(flowInstanceId);
                     asset.setCommonCostStatus(FLOW_FINISHED);
@@ -155,7 +155,7 @@ public class CommonCostEvent extends BaseController {
                 }
                 List<CommonCostDetailDO> detailList = commonCostDetailService.getListByCommonCostId(entity.getId());
                 for (CommonCostDetailDO commonCostDetailDO : detailList) {
-                    projectCostService.updateCommonCost(commonCostDetailDO.getAmount(),commonCostDetailDO.getProjectId());
+                    projectCostService.updateCommonCost(commonCostDetailDO.getAmount(), commonCostDetailDO.getProjectId());
                     projectService.calcProject(commonCostDetailDO.getProjectId());
                     commonCostDetailDO.setFlowStatus(FLOW_FINISHED);
                     commonCostDetailService.updateCommonCostDetail(commonCostDetailDO);
@@ -187,7 +187,7 @@ public class CommonCostEvent extends BaseController {
                 entity.setFlowStatus(FLOW_NULLY);
                 entity.setIsvalid(0);
                 commonCostService.updateCommonCost(CommonCostConvert.INSTANCE.convert(entity));
-                if (entity.getIsAgent()==1) {
+                if (entity.getIsAgent() == 1) {
                     AssetProcureDO asset = new AssetProcureDO();
                     asset.setCommonCostId(flowInstanceId);
                     asset.setCommonCostStatus(0);
@@ -609,10 +609,10 @@ public class CommonCostEvent extends BaseController {
                 Set<String> zrbmIdList = new HashSet<>();
                 detailList.forEach(x -> {
                     Project project = projectService.selectById(x.getProjectId());
-                    if(project.getId().equals("31414c5bef38ca7eb9ce31612e84e8e8") || project.getId().equals("3ce706b5a67bb175929cda0117c11620") ){
+                    if (project.getId().equals("31414c5bef38ca7eb9ce31612e84e8e8") || project.getId().equals("3ce706b5a67bb175929cda0117c11620")) {
                         //卓一瑞
                         HashMap<String, String> map = new HashMap<>();
-                        map.put("id","d05dc4f4-ead4-4925-9aaa-0c4d3bc470b6");
+                        map.put("id", "d05dc4f4-ead4-4925-9aaa-0c4d3bc470b6");
                         userMaps.add(map);
                         return;
                     }
@@ -782,4 +782,29 @@ public class CommonCostEvent extends BaseController {
             throw new BusinessException("执行事件出错，请联系管理员！");
         }
     }
+
+    /**
+     * 出纳退件事件
+     *
+     * @param flowInstance 流程实例
+     * @return
+     */
+    @PostMapping("/cashierRejectEvent")
+    public String cashierRejectEvent(@ParamModel Map flowInstance) {
+        try {
+            if (!Objects.isNull(flowInstance) && flowInstance.containsKey("id")) {
+                String flowInstanceId = flowInstance.get("id").toString();
+                CommonCostDO entity = commonCostService.findByInstanceId(flowInstanceId);
+                entity.setFlowStatus(FLOW_PROCESS);
+                entity.setFlowFinishtime(LocalDateTime.now());
+                commonCostService.updateCommonCost(CommonCostConvert.INSTANCE.convert(entity));
+                return ok("true");
+            } else {
+                throw new BusinessException("执行事件出错，请联系管理员！");
+            }
+        } catch (Exception ex) {
+            log.error(ex.getMessage(), ex);
+            throw new BusinessException("执行事件出错，请联系管理员！");
+        }
+    }
 }

zjugis-business/src/main/java/com/zjugis/business/flow/travelcost/event/TravelCostEvent.java

@@ -554,4 +554,30 @@ public class TravelCostEvent extends BaseController {
         }
     }
 
+    /**
+     * 出纳退件事件
+     *
+     * @param flowInstance 流程实例
+     * @return
+     */
+    @PostMapping("/cashierRejectEvent")
+    public String cashierRejectEvent(@ParamModel Map flowInstance) {
+        try {
+            if (!Objects.isNull(flowInstance) && flowInstance.containsKey("id")) {
+                String flowInstanceId = flowInstance.get("id").toString();
+                TravelCostDO entity = travelCostService.findByInstanceId(flowInstanceId);
+                entity.setFlowStatus(FLOW_PROCESS);
+                entity.setFlowFinishtime(LocalDateTime.now());
+                travelCostService.updateTravelCost(TravelCostConvert.INSTANCE.convert(entity));
+                return ok("true");
+            } else {
+                throw new BusinessException("执行事件出错，请联系管理员！");
+            }
+        } catch (Exception ex) {
+            log.error(ex.getMessage(), ex);
+            throw new BusinessException("执行事件出错，请联系管理员！");
+        }
+    }
+
+
 }

zjugis-workflow/src/main/resources/templates/IModal/left.ftl

@@ -54,9 +54,11 @@
         <div class="workflow-left-layout"></div>
         <div class="z-comp-tab tab-thread oa_workflowtab" name="workflowtab" style="height: 100%;">
             <ul class="z-tab-bar">
-                <li z-tabindex="0"><a>流程办理</a></li>
                 <#if iMaterials>
+                    <li z-tabindex="0"><a>流程办理</a></li>
                     <li z-tabindex="1" class="on"><a>附件材料</a></li>
+                <#else>
+                    <li z-tabindex="0" class="on" style="width: 100%;text-align: left;"><a>流程办理</a></li>
                 </#if>
             </ul>
             <div class="z-tab-scroll">
@@ -149,14 +151,16 @@
     .oa_workflowtab .z-tab-bar {
         padding: 0px;
         margin-top: 20px;
-        border-left: 4px solid #2e77e6;
-        background: #ebf2fe;
-        border-top-right-radius: 20px;
-        border-bottom-right-radius: 20px;
-        width: 70%;
         text-align: center;
         font-weight: bold;
-        color: #000;
+        color: #333;
+        display: flex;
+        background: #e8f0fb;
+        width: calc(100% - 20px);
+        margin-left: 10px;
+        margin-right: 10px;
+        border-radius: 5px;
+        overflow: hidden;
     }
     .tab-thread .z-tab-bar {
         border-bottom: 0px;
@@ -165,18 +169,17 @@
         float: none;
         display: inline-block;
         padding: 10px 20px;
-        border-radius: 4px 4px 0px 0px;
         border: 0px;
+        width: 50%;
     }
     .tab-thread .z-tab-bar li.on {
-        border: 0px;
         background: #2e77e6;
     }
     .oa_workflowtab .z-tab-bar>li>a {
         top: 0px;
         padding: 0px;
-        color: #000;
-        font-size: 18px;
+        color: #333;
+        font-size: 15px;
     }
     .oa_workflowtab .z-tab-bar .on a {
         color: #fff !important;