Преглед на файлове

页面表单文件样式调整

songxy преди 1 година
родител
ревизия
9ce5f1dca2

+ 4 - 2
client/src/views/OaSystem/officeCenter/main/index.vue

@@ -9,7 +9,9 @@ defineOptions({
   name: 'OfficeCenter'
 })
 
-const iframeUrl: string = 'http://10.10.10.7:18080/workflow/HandlerCaseCenter/index'
+// const iframeUrl: string = 'http://10.10.10.7:18080/workflow/HandlerCaseCenter/index'
+const iframeUrl: string =
+  'http://localhost:6010/WorkFlow/index?flowInstanceId=018bbd46bf18087013178bbd3ebd000e&activityInstanceId=018bbd46bf34087013178bbd3ebd0012&_fm=018bb7307083087087e58bb722830009&participant=018bbd46bf4f087013178bbd3ebd0014&first=1&status=1&child=0&sourcewindowid=handlerCaseCenter&userId=dc794fe0-66fe-4b1d-9273-f747950b27c3'
 </script>
 
 <style lang="scss" scoped>
@@ -20,7 +22,7 @@ const iframeUrl: string = 'http://10.10.10.7:18080/workflow/HandlerCaseCenter/in
   border-radius: 20px;
   position: relative;
   text-align: center;
-
+  overflow: hidden;
   > iframe {
     width: 100%;
     height: 100%;

+ 1 - 1
zjugis-business/src/main/resources/application.yaml

@@ -50,7 +50,7 @@ zjugis:
 serviceUrl:
   sysUrl: http://localhost:6010
   workflow-client: http://localhost:6010
-  UI: http://114.215.200.79:81/UI
+  UI: http://localhost:6090
   ui_version: http://114.215.200.79:81/UI
   z_workflow: http://localhost:6090
 

+ 2 - 2
zjugis-business/src/main/resources/bootstrap-local.yaml

@@ -9,10 +9,10 @@ spring:
       discovery:
         service: business
         server-addr: 10.10.10.7:8848
-        namespace: f444858c-ae8b-4b7d-aa45-2c3238895348
+        namespace: 2cf329b5-95c5-4b3b-9112-8e09eb8f67cf
       config:
         server-addr: 10.10.10.7:8848 # Nacos 服务器地址
-        namespace: f444858c-ae8b-4b7d-aa45-2c3238895348        # 命名空间。这里使用 dev 开发环境
+        namespace: 2cf329b5-95c5-4b3b-9112-8e09eb8f67cf       # 命名空间。这里使用 dev 开发环境
         group: DEFAULT_GROUP # 使用的 Nacos 配置分组,默认为 DEFAULT_GROUP
         name: # 使用的 Nacos 配置集的 dataId,默认为 spring.application.name
         file-extension: yaml

+ 154 - 132
zjugis-business/src/main/resources/templates/WorkFlow/form1.ftl

@@ -1,140 +1,54 @@
 <div class="z-form-wrap" name="demoForm1">
-    <div class="z-form-row z-subtitle text-info z-border-title">
-        <strong>基础信息A</strong>
+    <div class="form-wrap-title">
+        <i class="icon"></i> 基础信息A
     </div>
     <div class="z-form-row">
-        <div class="z-form-group z-col-50">
-            <div class="z-form-label z-col-30">文本只读</div>
-            <div class="z-form-control z-col-70">
+        <div class="form-group">
+            <div class="form-label">文本只读</div>
+            <div class="form-item">
                 <div class="z-comp-input" name="demoForm1$field1">
                     <input type="text" value="张三">
                 </div>
             </div>
         </div>
-        <div class="z-form-group z-col-50">
-            <div class="z-form-label z-col-30">文本</div>
-            <div class="z-form-control z-col-70">
-                <div class="z-comp-input" name="demoForm1$field2">
-                    <input type="text" value="张三">
-                </div>
-            </div>
-        </div>
-    </div>
-    <div class="z-form-row">
-        <div class="z-form-group z-col-50">
-            <div class="z-form-label z-col-30">单选只读</div>
-            <div class="z-form-control z-col-70">
-                <div class="z-comp-radio" name="demoForm1$field3">
-                    <div class="z-radio-item checked" value="1"><i></i>男</div>
-                    <div class="z-radio-item" value="2"><i></i>女</div>
+        <div class="form-group">
+            <div class="form-label">下拉框</div>
+            <div class="form-item">
+                <div class="z-comp-select" name="" value="1"
+                     data='[{"value":1,"text":"下拉框"},{"value":2,"text":"下拉搜索"},{"value":3,"text":"下拉树"}]'>
+                    <div class="z-inputselect-bar">
+                        <span>下拉框</span><i></i>
+                    </div>
                 </div>
             </div>
         </div>
-        <div class="z-form-group z-col-50">
-            <div class="z-form-label z-col-30">单选</div>
-            <div class="z-form-control z-col-70">
-                <div class="z-comp-radio" name="demoForm1$field4">
-                    <div class="z-radio-item checked" value="0"><i></i>男</div>
-                    <div class="z-radio-item" value="1"><i></i>女</div>
+        <div class="form-group">
+            <div class="form-label">文本框</div>
+            <div class="form-item">
+                <div class="z-comp-textarea z-readonly" name="demoForm1$field10">
+                    <textarea></textarea>
                 </div>
             </div>
         </div>
-    </div>
-    <div class="z-form-row">
-        <div class="z-form-group z-col-50">
-            <div class="z-form-label z-col-30">数字只读</div>
-            <div class="z-form-control z-col-70">
+        <div class="form-group">
+            <div class="form-label">数字只读</div>
+            <div class="form-item">
                 <div class="z-comp-input" name="demoForm1$field5">
                     <input type="number" value="25">
                 </div>
             </div>
         </div>
-        <div class="z-form-group z-col-50">
-            <div class="z-form-label z-col-30">数字</div>
-            <div class="z-form-control z-col-70">
-                <div class="z-comp-input" name="demoForm1$field6">
-                    <input type="number" value="25">
-                </div>
-            </div>
-        </div>
-    </div>
-    <div class="z-form-row">
-        <div class="z-form-group z-col-50">
-            <div class="z-form-label z-col-30">复选</div>
-            <div class="z-form-control z-col-70">
-                <div class="z-comp-checkbox" name="">
-                    <div class="z-checkbox-item checked"><i></i>选demoForm1$field7项1</div>
-                </div>
-                <div class="z-comp-checkbox" name="demoForm1$field7">
-                    <div class="z-checkbox-item"><i></i>选项2</div>
-                </div>
-            </div>
-        </div>
-
-    </div>
-    <div class="z-form-row">
-        <div class="z-form-group z-col-50">
-            <div class="z-form-label z-col-30">日期</div>
-            <div class="z-form-control z-col-70">
+        <div class="form-group">
+            <div class="form-label">日期</div>
+            <div class="form-item">
                 <div class="z-comp-date" name="demoForm1$field8">
                     <input type="text" value="2015-05-03">
                 </div>
             </div>
         </div>
-        <div class="z-form-group z-col-50">
-            <div class="z-form-label z-col-30">日期+时间</div>
-            <div class="z-form-control z-col-70">
-                <div class="z-comp-datetime" name="demoForm1$field9">
-                    <input type="text" value="2015-05-03 05:03:05">
-                </div>
-            </div>
-        </div>
-    </div>
-    <div class="z-form-row">
-        <div class="z-form-label z-col-15">文本框</div>
-        <div class="z-form-control z-col-85">
-            <div class="z-comp-textarea" name="demoForm1$field10">
-                <textarea></textarea>
-            </div>
-        </div>
-    </div>
-    <div class="z-form-row">
-        <div class="z-form-group z-col-50">
-            <div class="z-form-label z-col-30">输入框</div>
-            <div class="z-form-control z-col-70">
-                <div class="z-comp-input" name="demoForm1$field11">
-                    <div class="z-inputselect-bar">
-                        <input type="text" placeholder="输入框">
-                    </div>
-                </div>
-            </div>
-        </div>
-        <div class="z-form-group z-col-50">
-            <div class="z-form-label z-col-30">搜索条</div>
-            <div class="z-form-control z-col-70">
-                <div class="z-comp-input" name="demoForm1$field12">
-                    <div class="z-inputselect-bar">
-                        <input type="text" placeholder="搜索条"><i></i>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-    <div class="z-form-row">
-        <div class="z-form-group z-col-50">
-            <div class="z-form-label z-col-30">文本搜索</div>
-            <div class="z-form-control z-col-70">
-                <div class="z-comp-inputsearch" name="demoForm1$field13"
-                     data='[{"value":"浙江"},{"value":"江苏"},{"value":"山东"}]'>
-                    <div class="z-inputselect-bar">
-                        <input type="text" placeholder="文本搜索"><i></i>
-                    </div>
-                </div>
-            </div>
-        </div>
-        <div class="z-form-group z-col-50">
-            <div class="z-form-label z-col-30">文本下拉</div>
-            <div class="z-form-control z-col-70">
+        <div class="form-group z-form-group">
+            <div class="form-label">文本下拉</div>
+            <div class="form-item z-form-control">
                 <div class="z-comp-inputselect" name="demoForm1$field14"
                      data='[{"value":"浙江"},{"value":"江苏"},{"value":"山东"}]'>
                     <div class="z-inputselect-bar">
@@ -143,30 +57,138 @@
                 </div>
             </div>
         </div>
-    </div>
-    <div class="z-form-row">
-        <div class="z-form-group z-col-50">
-            <div class="z-form-label z-col-30">下拉框</div>
-            <div class="z-form-control z-col-70">
-                <div class="z-comp-select" name="" value="1"
-                     data='[{"value":1,"text":"下拉框"},{"value":2,"text":"下拉搜索"},{"value":3,"text":"下拉树"}]'>
-                    <div class="z-inputselect-bar">
-                        <span>下拉框</span><i></i>
-                    </div>
+        <div class="form-group">
+            <div class="form-label">复选</div>
+            <div class="form-item">
+                <div class="z-comp-checkbox" name="">
+                    <div class="z-checkbox-item checked"><i></i>选demoForm1$field7项1</div>
+                </div>
+                <div class="z-comp-checkbox" name="demoForm1$field7">
+                    <div class="z-checkbox-item"><i></i>选项2</div>
                 </div>
             </div>
         </div>
-        <div class="z-form-group z-col-50">
-            <div class="z-form-label z-col-30">下拉搜索</div>
-            <div class="z-form-control z-col-70">
-                <div class="z-comp-selectsearch" name="" value="2"
-                     data='[{"value":1,"text":"下拉框"},{"value":2,"text":"下拉搜索"},{"value":3,"text":"下拉树"}]'>
-                    <div class="z-inputselect-bar">
-                        <span>下拉搜索</span><i></i>
-                    </div>
+        <div class="form-group">
+            <div class="form-label">单选只读</div>
+            <div class="form-item">
+                <div class="z-comp-radio" name="demoForm1$field3">
+                    <div class="z-radio-item checked" value="1"><i></i>男</div>
+                    <div class="z-radio-item" value="2"><i></i>女</div>
                 </div>
             </div>
         </div>
     </div>
+
+    <div class="form-wrap-title">
+        <i class="icon"></i> 基础信息A
+    </div>
+    <div class="table-wrap">
+        <button type="button" class="addTableTrHandle">新增1</button>
+        <table>
+            <thead>
+            <tr>
+                <th>序号</th>
+                <th>起始时间</th>
+                <th>截止时间</th>
+                <th>备注</th>
+                <th>操作</th>
+            </tr>
+            </thead>
+            <tbody class="table-wrap-tbody">
+                <tr>
+                    <td>1</td>
+                    <td>
+                        <div class="z-comp-date" name="demoForm1$field8">
+                            <input type="text" value="2015-05-03">
+                        </div>
+                    </td>
+                    <td>
+                        <div class="z-comp-date" name="demoForm1$field8">
+                            <input type="text" value="2015-05-03">
+                        </div>
+                    </td>
+                </tr>
+            </tbody>
+        </table>
+    </div>
 </div>
-<#--<script type="text/javascript" src="/WorkFlow/js/form1.js"></script>-->
+<style type="text/css">
+    .form-wrap-title {
+        font-size: 18px;
+        color: #2D333C;
+        font-weight: bold;
+        display: flex;
+        align-items: center;
+        padding: 10px;
+    }
+    .form-wrap-title>i {
+        width: 18px;
+        height: 18px;
+        margin-right: 5px;
+        background: url("./imgs/form-wrap-title-icon.png") no-repeat;
+        background-size: 100% 100%;
+    }
+    .form-group {
+    }
+    .form-label {
+        color: #404956;
+        font-size: 16px;
+    }
+    .form-item {
+        margin: 10px 0px;
+    }
+    .form-group .form-label {
+        margin-bottom: 10px;
+    }
+    .form-item input[type=text],
+    .form-item input[type=number],
+    .form-item textarea,
+    .form-item .z-comp-input,
+    .form-item .z-radio-item,
+    .form-item .z-comp-inputsearch,
+    .form-item .z-comp-inputselect,
+    .form-item .z-comp-select,
+    .form-item .z-comp-select .z-inputselect-bar>span,
+    .form-item .z-comp-selectsearch,
+     .form-item .z-comp-selecttree,
+     .form-item .z-checkbox-item,
+    .form-item .z-comp-textarea,
+     .form-item .z-selecttree {
+        font-size: 16px;
+        color: #121518;
+    }
+    .form-item .z-readonly,
+    .form-item .z-readonly input,
+    .form-item .z-readonly textarea {
+        background: #F5F5F5;
+    }
+    /** 表格样式 **/
+    .table-wrap table {
+        margin-top: 10px;
+        width: 100%;
+        border-collapse: collapse;
+    }
+    .table-wrap thead {
+        background: #F2F4F8;
+    }
+    .table-wrap tr {
+        border: 1px solid #E8EBF1;
+    }
+    .table-wrap th {
+        font-weight: 500;
+        font-size: 16px;
+        color: #505A69;
+    }
+    .table-wrap table th,
+    .table-wrap table td {
+        padding: 5px 10px;
+        font-size: 16px;
+    }
+
+    .table-wrap table td input {
+        font-size: 16px;
+    }
+</style>
+    <script src="https://lf9-cdn-tos.bytecdntp.com/cdn/expire-1-M/jquery/2.1.2/jquery.min.js"
+            type="application/javascript"></script>
+<script type="text/javascript" src="/WorkFlow/js/form1.js"></script>

BIN
zjugis-business/src/main/resources/templates/WorkFlow/imgs/form-wrap-title-icon.png


+ 25 - 4
zjugis-business/src/main/resources/templates/WorkFlow/index.ftl

@@ -1,16 +1,18 @@
 <@w.workFlow javascripts=['/WorkFlow/js/index.js'] styles=['/WorkFlow/css/form.css'] >
     <div class="z-position">
         <div class="z-comp-tab scroll" name="tab">
-            <ul class="z-tab-bar">
-                <li z-tabindex="0" class="on"><a>基础信息A</a></li>
-                <li z-tabindex="1"><a>基础信息B</a></li>
+            <div class="oa_tabBox">
+                <ul class="z-tab-bar">
+                    <li z-tabindex="0" class="on"><a>基础信息A</a></li>
+                    <li z-tabindex="1"><a>基础信息B</a></li>
                 <#if WORKFLOW.MATERIALS! != "">
                     <li z-tabindex="2"><a>收件材料</a></li>
                 </#if>
                 <#if WORKFLOW.OPINION! != "">
                     <li z-tabindex="3"><a>意见内容</a></li>
                 </#if>
-            </ul>
+                </ul>
+            </div>
             <div class="z-tab-scroll">
                 <div class="z-tab-content on">
                     ${form1!}
@@ -51,4 +53,23 @@
 
 
     </div>
+<style type="text/css">
+    .oa_tabBox {
+        border-bottom: 2px solid #E1E9F5;
+    }
+    .oa_tabBox>.z-tab-bar {
+        border-bottom: 0px;
+    }
+    .oa_tabBox>.z-tab-bar .on {
+        border-bottom: 0px;
+    }
+    .oa_tabBox>.z-tab-bar a {
+        font-size: 18px;
+        font-weight: bold;
+    }
+    .oa_tabBox>.z-tab-bar .on>a {
+        border-bottom: 3px solid #2E77E6;
+        color: #2E77E6;
+    }
+</style>
 </@w.workFlow>

+ 22 - 0
zjugis-business/src/main/resources/templates/WorkFlow/js/form1.js

@@ -16,5 +16,27 @@
 				}
 			})
 		}
+		$(document).ready(function(){
+            ;(function(){
+                var dateTimeStr = '\n' +
+                    '                        <div class="z-comp-date" name="demoForm1$field85">\n' +
+                    '                            <input type="text" value="2015-05-03">\n' +
+                    '                        </div>';
+                $(".addTableTrHandle").click(function(){
+                    var trDom = document.createElement("tr");
+                    $(trDom).html('<td>1</td><td>'+dateTimeStr+'</td><td>'+dateTimeStr+'</td><td>'+dateTimeStr+'</td>')
+					var tdDelDom = document.createElement("td")
+					$(tdDelDom).html("刪除").click(function(){
+						alert("刪除")
+					})
+                    $(trDom).append(tdDelDom)
+                    $('.table-wrap-tbody').append(trDom)
+
+                    z.ui.laydate("[name='demoForm1$field85']").init({
+                        type: 'date'
+                    });
+                });
+            })();
+		})
 	}
 }())

+ 54 - 5
zjugis-business/src/main/resources/templates/public/workFlow.ftl

@@ -2,12 +2,61 @@
     <@h.html title=title
     javascripts = (WORKFLOW.JS![])+javascripts
     styles= (WORKFLOW.CSS![]) + styles >
-        ${WORKFLOW.TOP!}
-        <div class="z-position workflow-main" ${WORKFLOW.MainStyle!}>
+        <div class="z-position workflow-main" ${WORKFLOW.MainStyle!} style="top: 0px;">
             ${WORKFLOW.LEFT!}
-            ${WORKFLOW.RBefore!}
-            <#nested />
-            ${WORKFLOW.RAfter!}
+            <div class="workflow-right right z-position oa_formBox oa_formBox_line">
+                <div>
+                    ${WORKFLOW.TOP!}
+                </div>
+                <div>
+                    ${WORKFLOW.RBefore!}
+                    <#nested />
+                    ${WORKFLOW.RAfter!}
+                </div>
+            </div>
         </div>
+    <style type="text/css">
+        .oa_formBox>div:nth-child(1)>.workflow-top {
+            display: flex;
+            flex-direction: column;
+        }
+        .oa_formBox>div:nth-child(2){
+            position: relative;
+            height: calc(100% - 40px)
+        }
+        .oa_formBox>div:nth-child(2)>.z-position {
+            float: none;
+            position: static;
+        }
+        .oa_formBox .btn-info {
+            background: #2E77E6;
+        }
+        .oa_formBox .z-comp-input,
+        .oa_formBox .z-comp-inputsearch,
+        .oa_formBox .z-comp-inputselect,
+        .oa_formBox .z-comp-select,
+        .oa_formBox .z-comp-selectsearch,
+        .oa_formBox .z-comp-selecttree,
+        .oa_formBox .z-comp-textarea,
+        .oa_formBox .z-selecttree {
+            border-color: #DEE0E3;
+        }
+        .oa_formBox .z-border-title {
+            border: 0px;
+            color: #2D333C;
+        }
+        /*.oa_formBox_line .z-form-group {*/
+            /*display: flex;*/
+            /*flex-direction: column;*/
+        /*}*/
+        /*.oa_formBox_line .z-form-row .z-form-label,*/
+        /*.oa_formBox_line .z-form-group .z-form-label {*/
+            /*text-align: left;*/
+        /*}*/
+        /*.oa_formBox_line .z-form-row .z-form-control,*/
+        /*.oa_formBox_line .z-form-group .z-form-control {*/
+            /*width: 100%;*/
+        /*}*/
+    </style>
     </@h.html>
 </#macro>

+ 2 - 2
zjugis-module-adm/zjugis-module-adm-biz/src/main/resources/bootstrap-local.yaml

@@ -5,7 +5,7 @@ spring:
     nacos:
       server-addr: 10.10.10.7:8848
       discovery:
-        namespace: f444858c-ae8b-4b7d-aa45-2c3238895348 # 命名空间。这里使用 dev 开发环境
+        namespace: 2cf329b5-95c5-4b3b-9112-8e09eb8f67cf # 命名空间。这里使用 dev 开发环境
         metadata:
           version: 1.0.0 # 服务实例的版本号,可用于灰度发布
 
@@ -17,7 +17,7 @@ spring:
       # Nacos Config 配置项,对应 NacosConfigProperties 配置属性类
       config:
         server-addr: 10.10.10.7:8848 # Nacos 服务器地址
-        namespace: f444858c-ae8b-4b7d-aa45-2c3238895348 # 命名空间 dev 的ID,不能直接使用 dev 名称。创建命名空间的时候需要指定ID为 dev,这里使用 dev 开发环境
+        namespace: 2cf329b5-95c5-4b3b-9112-8e09eb8f67cf # 命名空间 dev 的ID,不能直接使用 dev 名称。创建命名空间的时候需要指定ID为 dev,这里使用 dev 开发环境
         group: DEFAULT_GROUP # 使用的 Nacos 配置分组,默认为 DEFAULT_GROUP
         name: ${spring.application.name} # 使用的 Nacos 配置集的 dataId,默认为 spring.application.name
         file-extension: yaml # 使用的 Nacos 配置集的 dataId 的文件拓展名,同时也是 Nacos 配置集的配置格式,默认为 properties

+ 2 - 2
zjugis-module-system/zjugis-module-system-biz/src/main/resources/bootstrap-local.yaml

@@ -5,7 +5,7 @@ spring:
     nacos:
       server-addr: 10.10.10.7:8848
       discovery:
-        namespace: f444858c-ae8b-4b7d-aa45-2c3238895348 # 命名空间。这里使用 dev 开发环境
+        namespace: 2cf329b5-95c5-4b3b-9112-8e09eb8f67cf # 命名空间。这里使用 dev 开发环境
         metadata:
           version: 1.0.0 # 服务实例的版本号,可用于灰度发布
 
@@ -17,7 +17,7 @@ spring:
       # Nacos Config 配置项,对应 NacosConfigProperties 配置属性类
       config:
         server-addr: 10.10.10.7:8848 # Nacos 服务器地址
-        namespace: f444858c-ae8b-4b7d-aa45-2c3238895348 # 命名空间 dev 的ID,不能直接使用 dev 名称。创建命名空间的时候需要指定ID为 dev,这里使用 dev 开发环境
+        namespace: 2cf329b5-95c5-4b3b-9112-8e09eb8f67cf # 命名空间 dev 的ID,不能直接使用 dev 名称。创建命名空间的时候需要指定ID为 dev,这里使用 dev 开发环境
         group: DEFAULT_GROUP # 使用的 Nacos 配置分组,默认为 DEFAULT_GROUP
         name: ${spring.application.name} # 使用的 Nacos 配置集的 dataId,默认为 spring.application.name
         file-extension: yaml # 使用的 Nacos 配置集的 dataId 的文件拓展名,同时也是 Nacos 配置集的配置格式,默认为 properties

+ 1 - 1
zjugis-workflow/src/main/java/com/zjugis/z_workflow/utils/BtnUtil.java

@@ -144,7 +144,7 @@ public class BtnUtil {
 				html.append("btn-num='").append(this.btnNum).append("'");
 			}
 			html.append("class='").append(this.className).append("'>");
-			html.append("<i class='").append(this.iClassName).append("'></i> ");
+			// html.append("<i class='").append(this.iClassName).append("'></i> "); 隐藏Btn图标
 
 			html.append(this.value).append("</a>");
 			html.append("</li>");

+ 4 - 2
zjugis-workflow/src/main/resources/static/css/workFlow.css

@@ -191,7 +191,6 @@ workflow-icon-folder_open {
 
 .workflow-top {
     /* height: 50px; */
-    background: #2486DA;
     width: 100%;
 }
 
@@ -349,11 +348,14 @@ ul {
     text-overflow: ellipsis;
     white-space: nowrap;
     overflow: hidden;
-    text-align: left;
+    text-align: center;
+    color: #000;
+    font-size: 32px;
 }
 
 ul[name=workflow-top-btns] {
     float: right;
+    padding: 15px 20px;
 }
 
 

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

@@ -52,11 +52,11 @@
     <div class="workflow-slidebtn left-close left" data-open="1" data-position="left" name="slidebtn"></div>
     <div class="workflow-left z-btn-bar text-left left">
         <div class="workflow-left-layout"></div>
-        <div class="z-comp-tab tab-thread" name="workflowtab" style="height: 100%;">
+        <div class="z-comp-tab tab-thread oa_workflowtab" name="workflowtab" style="height: 100%;">
             <ul class="z-tab-bar">
-                <li z-tabindex="0" class="on"><a>流程办理</a></li>
+                <li z-tabindex="0"><a>流程办理</a></li>
                 <#if iMaterials>
-                    <li z-tabindex="1"><a>附件材料</a></li>
+                    <li z-tabindex="1" class="on"><a>附件材料</a></li>
                 </#if>
             </ul>
             <div class="z-tab-scroll">
@@ -145,6 +145,36 @@
         </div>
     </div>
 </#if>
+<style type="text/css">
+    .oa_workflowtab .z-tab-bar {
+        padding: 0px;
+        border-bottom: 2px solid #2e77e6;
+    }
+    .oa_workflowtab .z-tab-bar>li {
+        float: none;
+        display: inline-block;
+        padding: 10px 20px;
+        border-radius: 4px 4px 0px 0px;
+        border: 0px;
+    }
+    .tab-thread .z-tab-bar li.on {
+        border: 0px;
+        background: #2e77e6;
+    }
+    .oa_workflowtab .z-tab-bar>li>a {
+        top: 0px;
+        padding: 0px;
+    }
+    .oa_workflowtab .z-tab-bar .on a {
+        color: #fff !important;
+        background: none;
+    }
+    .leftmenu-item .active.itemtext {
+        color: #2e77e6;
+        font-weight: bold;
+        font-size: 17px;
+    }
+</style>
 <script>
 	window.flowleftcfg = {
 		leftCfg: '${leftCfg!"1"}',

+ 7 - 6
zjugis-workflow/src/main/resources/templates/IModal/top.ftl

@@ -6,9 +6,13 @@
     var iTopCurrentOpinion = "${iTopCurrentOpinion!0}";
 </script>
 <#if child == 0>
-    <div class="workflow-top batch-operation-btns clearfix text-right">
-     <span class="workflow-title">
-         <div class="workflow-title-text"><i class="fa fa-edit"></i> ${flowName!}
+    <div class="workflow-top batch-operation-btns clearfix text-right111">
+
+        <ul name="workflow-top-btns">
+            ${btnHTML!}
+        </ul>
+        <span class="workflow-title">
+         <div class="workflow-title-text">${flowName!}
              <#if flowDesc??>
                  <span title="${flowDesc!}" class="des">[<span>${flowDesc!}</span>]</span>
              </#if>
@@ -28,9 +32,6 @@
              </div>
          </#if>
     </span>
-        <ul name="workflow-top-btns">
-            ${btnHTML!}
-        </ul>
     </div>
 </#if>
 <#if ic==true>