Browse Source

添加电子签章移动端功能。

zjj_happy 3 days ago
parent
commit
b7fdd1966e

+ 8
- 0
WebContent/WEB-INF/KmssConfig/yb/seal/plugin.xml View File

@@ -24,6 +24,14 @@
24 24
 				value="com.landray.kmss.yb.seal.model.YbSealMain"/>
25 25
 		</item>
26 26
 	</extension>
27
+	
28
+	<extension point="com.landray.kmss.sys.mobile.config">
29
+		<item name="info">
30
+			<param name="name" value="{yb-seal:module.yb.seal}" />
31
+			<param name="modelName" value="com.landray.kmss.yb.seal.model.YbSealUsedMain" />
32
+			<param name="defaultUrl" value="/yb/seal/mobile/sealUsed/nav.json" />
33
+		</item>
34
+	</extension>
27 35
 	<extension point="com.landray.kmss.sys.mobile.compress" model="*">
28 36
 		<item 
29 37
 			name="css-file">

+ 6
- 0
WebContent/WEB-INF/KmssConfig/yb/seal/spring-mvc.xml View File

@@ -65,6 +65,12 @@
65 65
 					key="list"
66 66
 					value="/yb/seal/yb_seal_used_main/ybSealUsedMain_list.jsp" />
67 67
 				<entry
68
+					key="listChildren.4m"
69
+					value="/yb/seal/mobile/sealUsed/list.jsp" />
70
+				<entry
71
+					key="list.4m"
72
+					value="/yb/seal/mobile/sealUsed/list.jsp" />
73
+				<entry
68 74
 					key="view.4m"
69 75
 					value="/yb/seal/mobile/sealUsed/view.jsp" />
70 76
 			</map>

+ 23
- 0
WebContent/yb/seal/mobile/sealUsed/index.jsp View File

@@ -0,0 +1,23 @@
1
+<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
2
+<%@ taglib uri="/WEB-INF/KmssConfig/sys/mobile/mui.tld" prefix="mui"%>
3
+<%@ include file="/sys/ui/jsp/common.jsp"%>
4
+<c:set var="tiny" value="true" scope="request" />
5
+<template:include ref="mobile.list" canHash="true">
6
+	<template:replace name="title">
7
+		<c:if test="${param.moduleName!=null && param.moduleName!=''}">
8
+			<c:out value="${param.moduleName}"></c:out>
9
+		</c:if>
10
+		<c:if test="${param.moduleName==null || param.moduleName==''}">
11
+			<c:out value="${lfn:message('yb-seal:seal.moduleName')}"></c:out>
12
+		</c:if>
13
+	</template:replace>
14
+	<template:replace name="head">
15
+		<mui:cache-file name="mui-nav.js" cacheType="md5"/>
16
+		<mui:cache-file name="mui-simpleCate.js" cacheType="md5" />
17
+		<mui:cache-file name="mui-sys-news.js" cacheType="md5" />
18
+		<mui:cache-file name="mui-sys-news.css" cacheType="md5"/>
19
+	</template:replace>	
20
+	<template:replace name="content">
21
+		<c:import url="/yb/seal/mobile/sealUsed/listview.jsp" charEncoding="UTF-8"></c:import>		
22
+	</template:replace>
23
+</template:include>

+ 13
- 0
WebContent/yb/seal/mobile/sealUsed/js/SealUsedItemListMixin.js View File

@@ -0,0 +1,13 @@
1
+define([
2
+    "dojo/_base/declare",
3
+	"mui/list/_TemplateItemListMixin",
4
+	"yb/seal/mobile/sealUsed/js/item/SealUsedItemMixin"
5
+	], function(declare, _TemplateItemListMixin, SealUsedItemMixin) {
6
+
7
+	return declare("yb.seal.mobile.sealUsed.js.SealUsedItemListMixin", [_TemplateItemListMixin], {
8
+		
9
+		itemRenderer: SealUsedItemMixin
10
+		
11
+	});
12
+	
13
+});

+ 40
- 0
WebContent/yb/seal/mobile/sealUsed/js/header/SealUsedMainPropertyMixin.js View File

@@ -0,0 +1,40 @@
1
+/**
2
+ * 筛选静态数据源
3
+ */
4
+define(["dojo/_base/declare","mui/i18n/i18n!yb-seal:seal.fdSealBusType", "mui/i18n/i18n!yb-seal:mobile"],
5
+		function(declare, fdImportanceMsg, msg) {
6
+  return declare("yb.seal.SealUsedMainPropertyMixin", null, {
7
+	  modelName: "com.landray.kmss.yb.seal.model.YbSealUsedTemplate",  
8
+    filters: [              
9
+      {
10
+        filterType: "FilterRadio",
11
+        name: "docStatus",
12
+        subject: msg['mobile.ybSealUsedMain.status'],
13
+        options: [
14
+          {name: msg['mobile.ybSealUsedMain.status.draft'], value: "10"},
15
+          {name: msg['mobile.ybSealUsedMain.status.pending'], value: "20"},
16
+          {name: msg['mobile.ybSealUsedMain.status.overrule'], value: "11"},
17
+          {name: msg['mobile.ybSealUsedMain.status.prepare'], value: "29"},
18
+          {name: msg['mobile.ybSealUsedMain.status.publish'], value: "30"}
19
+        ]
20
+      },
21
+      {
22
+          filterType: "FilterRadio",
23
+          name: "fdBusType",
24
+          subject: fdImportanceMsg['seal.fdSealBusType'],
25
+          options: [
26
+            {name: msg['mobile.ybSealUsedMain.noLimit'], value: ""},
27
+            {name: fdImportanceMsg["seal.fdSealBusType1"], value: "1"},
28
+            {name: fdImportanceMsg["seal.fdSealBusType2"], value: "2"},
29
+            {name: fdImportanceMsg["seal.fdSealBusType3"], value: "3"}
30
+          ]
31
+      },             
32
+      {
33
+          filterType: "FilterDatetime",
34
+          type: "date",
35
+          name: "docPublishTime",
36
+          subject: msg['mobile.ybSealUsedMain.docPublishTime']
37
+      }      
38
+    ]
39
+  })
40
+})

+ 37
- 0
WebContent/yb/seal/mobile/sealUsed/js/header/SealUsedMainPropertyTemplate.js View File

@@ -0,0 +1,37 @@
1
+/**
2
+ * 电子签章头部模板,
3
+ */
4
+define(['mui/createUtils', 'mui/i18n/i18n!yb-seal:mobile'], function(createUtils, msg){
5
+	
6
+	var h = createUtils.createTemplate;
7
+	// 排序(创建时间)
8
+	var docCreateTimeFilter = h('div', {
9
+		dojoType: 'mui/sort/SortItem',
10
+		dojoProps: {
11
+			name: 'docCreateTime',
12
+			subject: msg['mobile.ybSealUsedMain.docCreateTime'],
13
+			value: 'down'
14
+		}
15
+	});
16
+	// 排序(发布时间)
17
+	var publishTimeFilter = h('div', {
18
+		dojoType: 'mui/sort/SortItem',
19
+		dojoProps: {
20
+			name: 'docPublishTime',
21
+			subject: msg['mobile.ybSealUsedMain.docPublishTime'],
22
+			value: ''
23
+		}
24
+	});
25
+
26
+	
27
+	// 属性筛选器
28
+	var propertyFilter = h('div', {
29
+		className: 'muiHeaderItemRight',
30
+		dojoType: 'mui/property/FilterItem',
31
+		dojoMixins: 'yb/seal/mobile/sealUsed/js/header/SealUsedMainPropertyMixin'
32
+	});
33
+	
34
+	
35
+	return [docCreateTimeFilter,publishTimeFilter, propertyFilter].join('');
36
+	
37
+});

+ 85
- 0
WebContent/yb/seal/mobile/sealUsed/js/item/SealUsedItemMixin.js View File

@@ -0,0 +1,85 @@
1
+define([
2
+    "dojo/_base/declare",
3
+    "dojo/dom-construct",
4
+    "dojo/dom-class",
5
+	"dojo/dom-style",
6
+	"dojo/dom-attr",
7
+	"dojox/mobile/_ItemBase",
8
+   	"mui/util",
9
+   	"mui/openProxyMixin",
10
+   	"mui/i18n/i18n!yb-seal:mobile"
11
+	], function(declare, domConstruct, domClass, domStyle, domAttr, ItemBase, util, openProxyMixin, msg) {
12
+	var item = declare("yb.seal.mobile.sealUsed.js.item.SealUsedItemMixin", [ItemBase,openProxyMixin], {
13
+		
14
+		tag:"li",
15
+		// 标题
16
+		label:"",
17
+		// 业务类型
18
+		fdBusType:"",
19
+		// 文档状态
20
+		docStatus:"",
21
+		// 创建时间
22
+		created:"",
23
+		// 创建者
24
+		creator:"",
25
+		//当前处理人
26
+		handlerName:"",	
27
+		// 详情页链接
28
+		href:"",
29
+		
30
+		
31
+		buildRendering:function(){
32
+			this.inherited(arguments);
33
+			this.domNode = this.containerNode = domConstruct.create(this.tag, { className:'muiNewsListItem' });
34
+			this.buildInternalRender();
35
+		},
36
+		
37
+		buildInternalRender : function() {
38
+
39
+		    var contentNode = domConstruct.create('div', {className:'muiNewsListItemContent'}, this.containerNode);
40
+			
41
+			// 标题DOM
42
+		    if(this.label){
43
+			   var subjectNode = domConstruct.create("div",{className:"muiNewsListItemTitle muiFontSizeM muiFontColorInfo"},contentNode);
44
+			   subjectNode.innerHTML = this.label;
45
+		    }
46
+		    
47
+			// 业务类型
48
+		    if(this.fdBusType){
49
+		    	var fdBusType = domConstruct.create("div",{className:"muiNewsListItemSummary muiFontSizeS",innerHTML:'业务类型:'+this.fdBusType},contentNode);
50
+		    }	
51
+			// 当前处理人
52
+			if(this.handlerName){
53
+				if(this.handlerName.indexOf('无') > -1) {
54
+					this.handlerName = '无';
55
+				}
56
+				this.createdNode = domConstruct.create("div",{className:"muiNewsListItemSummary muiFontSizeS",innerHTML:'当前处理人:'+this.handlerName},contentNode);
57
+			}
58
+			
59
+	        // 组件底部基本信息容器(创建人、创建时间、当前处理人)
60
+	        var footerContainer = domConstruct.create("div", { className: "muiNewsListItemFooter muiFontSizeS muiFontColorMuted" }, contentNode);
61
+		    
62
+		    // 创建人
63
+			if(this.creator){
64
+				this.createdNode = domConstruct.create("div",{className:"muiNewsListItemCreator",innerHTML:'创建人:'+this.creator},footerContainer);
65
+			}
66
+			
67
+			// 创建时间
68
+			if(this.created){
69
+				this.createdNode = domConstruct.create("div",{className:"muiNewsListItemCreated",innerHTML: '创建时间:'+this.created},footerContainer);
70
+			}
71
+			
72
+			// 绑定点击事件
73
+			if(this.href){
74
+				this.proxyClick(this.containerNode, this.href, '_blank');
75
+			}
76
+			
77
+		},
78
+		
79
+		_setLabelAttr: function(text){
80
+			if(text)
81
+				this._set("label", text);
82
+		}
83
+	});
84
+	return item;
85
+});

+ 52
- 0
WebContent/yb/seal/mobile/sealUsed/list.jsp View File

@@ -0,0 +1,52 @@
1
+<%@ page language="java" contentType="text/json; charset=UTF-8"	pageEncoding="UTF-8"%>
2
+<%@ include file="/sys/ui/jsp/common.jsp"%>
3
+
4
+<list:data>
5
+	<list:data-columns var="ybSealUsed" list="${queryPage.list }" varIndex="status" mobile="true">
6
+		<list:data-column property="fdId">
7
+		</list:data-column >
8
+	    <%--- 主题--%>	
9
+		<list:data-column col="label" title="${ lfn:message('yb-seal:seal.docSubject') }" escape="false">
10
+		    	<c:out value="${ybSealUsed.docSubject}"/>
11
+		</list:data-column>
12
+		<%--- 业务类型--%>
13
+		<list:data-column col="fdBusType"  title="${ lfn:message('yb-seal:seal.fdSealBusType')}" escape="false">
14
+		    <c:if test="${ybSealUsed.fdBusType == '1' }">
15
+				<c:out value="居民医保"></c:out>
16
+			</c:if>
17
+			<c:if test="${ybSealUsed.fdBusType == '2' }">
18
+				<c:out value="职工医保"></c:out>
19
+			</c:if>
20
+			<c:if test="${ybSealUsed.fdBusType == '3' }">
21
+				<c:out value="基金财务"></c:out>
22
+			</c:if>
23
+		</list:data-column>
24
+		<%--- 文档状态--%>
25
+		<list:data-column col="docStatus"  title="${ lfn:message('yb-seal:ybSealUsedMain.docStatus')}" >
26
+		    <sunbor:enumsShow value="${ybSealUsed.docStatus}" enumsType="common_status"/>
27
+		</list:data-column>
28
+		 <%-- 创建者 --%>
29
+		<list:data-column col="creator" title="${ lfn:message('yb-seal:ybSealUsedMain.docCreator') }" >
30
+		         <c:out value="${ybSealUsed.docCreator.fdName}"/>
31
+		</list:data-column>
32
+		
33
+		 <%--- 创建时间--%>
34
+	 	<list:data-column col="created" title="${ lfn:message('yb-seal:seal.docCreateTime') }">
35
+	        <kmss:showDate value="${ybSealUsed.docCreateTime}" type="date"></kmss:showDate>
36
+      	</list:data-column>
37
+      	
38
+		 <%-- 当前审批人 --%>
39
+		<list:data-column col="handlerName" title="${ lfn:message('yb-seal:sysWfNode.processingNode.currentProcessor') }" >
40
+		    <kmss:showWfPropertyValues  var="handlerValue" idValue="${ybSealUsed.fdId}" propertyName="handlerName" />
41
+			<c:out value="${handlerValue}"></c:out>
42
+		</list:data-column>
43
+		<%---链接--%>
44
+		<list:data-column col="href" escape="false">			
45
+				/yb/seal/yb_seal_used_main/ybSealUsedMain.do?method=view&fdId=${ybSealUsed.fdId}
46
+		</list:data-column>
47
+	</list:data-columns>
48
+	
49
+	<list:data-paging currentPage="${queryPage.pageno }"
50
+		pageSize="${queryPage.rowsize }" totalSize="${queryPage.totalrows }">
51
+	</list:data-paging>
52
+</list:data>

+ 44
- 0
WebContent/yb/seal/mobile/sealUsed/listview.jsp View File

@@ -0,0 +1,44 @@
1
+<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
2
+<%@ include file="/sys/ui/jsp/common.jsp"%>
3
+
4
+<%-- 导航头部,通常放导航页签、搜索 --%>
5
+<div data-dojo-type="mui/header/Header" data-dojo-props="height:'4.4rem'" class="muiHeaderNav">
6
+    <%-- Tab页签(注:当使用MobileCfgNavBar构建页签栏时,如果有模块有配置扩展点,则优先通过modelName从“移动办公--移动应用管理--应用页签配置”)读取数据 ,若无相关配置数据则读取defaultUrl配置的静态数据 --%>
7
+	<div data-dojo-type="mui/nav/MobileCfgNavBar" 
8
+		 data-dojo-props="modelName:'com.landray.kmss.yb.seal.model.YbSealUsedMain'"> 
9
+	</div>
10
+	
11
+	<%-- 搜索 --%>
12
+	<div data-dojo-type="mui/search/SearchButtonBar"
13
+		 data-dojo-props="modelName:'com.landray.kmss.yb.seal.model.YbSealUsedMain'">
14
+	</div>
15
+	
16
+</div>
17
+
18
+<%-- 筛选器头部,通常放排序、标签筛选器、重要筛选器、筛选器。  
19
+	 	注1: 根据nav.json定义的headerTemplate进行渲染
20
+	 	注2: 考虑到移动端大小问题,业务应该在排序、标签筛选器、重要筛选器三个组件中三选一
21
+--%>
22
+<div data-dojo-type="mui/header/NavHeader">
23
+    <%-- 排序(发布时间)  --%>
24
+	<div data-dojo-type="mui/sort/SortItem" 
25
+	    data-dojo-props="name:'docPublishTime',subject:'<bean:message bundle="yb-seal" key="mobile.ybSealUsedMain.docPublishTime" />',value:'down'">
26
+	</div>
27
+
28
+	<%-- 默认筛选器头部模板 --%>
29
+	<div class="muiHeaderItemRight" 
30
+		 data-dojo-type="mui/property/FilterItem"
31
+		 data-dojo-mixins="yb/seal/mobile/sealUsed/js/header/SealUsedMainPropertyMixin"></div>
32
+</div>
33
+
34
+
35
+<%--  页签内容展示区域,可纵向上下滑动   --%>
36
+<div data-dojo-type="mui/list/NavView">
37
+	<%--  默认列表模板   --%>
38
+	<ul data-dojo-type="mui/list/HashJsonStoreList" 
39
+		data-dojo-mixins="yb/seal/mobile/sealUsed/js/SealUsedItemListMixin">
40
+	</ul>
41
+</div>
42
+
43
+
44
+		

+ 17
- 0
WebContent/yb/seal/mobile/sealUsed/nav.json View File

@@ -0,0 +1,17 @@
1
+[
2
+	{ 
3
+		url : "/yb/seal/yb_seal_used_main/ybSealUsedMain.do?method=list&q.mydoc=waitForMe",
4
+		text : "list.approval",
5
+		headerTemplate : "/yb/seal/mobile/sealUsed/js/header/SealUsedMainPropertyTemplate.js"
6
+	},
7
+	{ 
8
+		url : "/yb/seal/yb_seal_used_main/ybSealUsedMain.do?method=list&q.mydoc=authorize",
9
+		text : "list.approved", 
10
+		headerTemplate : "/yb/seal/mobile/sealUsed/js/header/SealUsedMainPropertyTemplate.js"
11
+	},
12
+	{ 
13
+		url : "/yb/seal/yb_seal_used_main/ybSealUsedMain.do?method=list&q.mydoc=create",
14
+		text : "list.create2",
15
+		headerTemplate : "/yb/seal/mobile/sealUsed/js/header/SealUsedMainPropertyTemplate.js"
16
+	}
17
+]

+ 10
- 0
WebContent/yb/seal/mobile/sealUsed/nav.jsp View File

@@ -0,0 +1,10 @@
1
+<%@ page language="java" contentType="text/plain; charset=UTF-8"
2
+	pageEncoding="UTF-8"%>
3
+	<%@ include file="/sys/ui/jsp/common.jsp"%>
4
+[
5
+	{ 
6
+		url : "/yb/seal/yb_seal_used_main/ybSealUsedMain.do?method=list", 
7
+		text : "${lfn:message('yb-seal:ybSealUsedMain.portlet.sealused')}", 
8
+		selected : true 
9
+	}
10
+]

+ 118
- 0
WebContent/yb/seal/mobile/sealUsed/resource/css/newsListItem.css View File

@@ -0,0 +1,118 @@
1
+.muiNewsListItem{
2
+	position: relative;
3
+    padding-left: 1.2rem;
4
+    padding-right: 1.2rem;
5
+    margin-top: 1.2rem;
6
+}
7
+
8
+.muiNewsListItem{
9
+	padding-bottom: 1rem;
10
+}
11
+.muiNewsListItem:after{
12
+    content: " ";
13
+    position: absolute;
14
+    z-index: 2;
15
+    bottom: 0;
16
+    left: 0;
17
+    right: 0;
18
+    border-bottom: 1rem solid #F2F2F2;
19
+}
20
+
21
+.muiNewsListItemTitle{
22
+	min-height: 2.2rem;
23
+    font-weight: normal;
24
+    overflow: hidden;
25
+    text-overflow: ellipsis;
26
+    word-break: break-all;
27
+    word-wrap: break-word;
28
+    -webkit-line-clamp: 2;
29
+    display: -webkit-box;
30
+    -webkit-box-orient: vertical;
31
+    box-orient: vertical;
32
+    -webkit-box-pack: start;
33
+    box-pack: start;
34
+    -webkit-box-align: start;
35
+    box-align: start;	
36
+}
37
+
38
+.muiNewsListItemTopTag{
39
+	display: inline-block; 
40
+	font-size: var(--muiFontSizeS);
41
+    color: var(--muiFontColor);
42
+    margin-right: .4rem;
43
+    padding-top: 0;
44
+    padding-bottom: 0;
45
+    height: 1.8rem;
46
+    line-height: 2rem;  
47
+}
48
+
49
+.muiNewsListItemSummary{
50
+	font-weight: normal;
51
+    overflow: hidden;
52
+    text-overflow: ellipsis;
53
+    word-break: break-all;
54
+    word-wrap: break-word;
55
+    -webkit-line-clamp: 2;
56
+    display: -webkit-box;
57
+    -webkit-box-orient: vertical;
58
+    box-orient: vertical;
59
+    -webkit-box-pack: start;
60
+    box-pack: start;
61
+    -webkit-box-align: start;
62
+    box-align: start;	
63
+}
64
+
65
+.muiNewsListItemSummary{
66
+    color: #646A86;
67
+    margin-top: 1rem;
68
+}
69
+
70
+.muiNewsListItemIcon{
71
+	margin-top: 1rem;
72
+	height: 17rem;
73
+	box-shadow: 0 0 30px 0 rgba(153,179,210,0.20);
74
+    border-radius: .6rem;
75
+}
76
+
77
+.muiNewsListItemIcon .muiNewsListItemImg{
78
+    display: block;
79
+    height: 100%;
80
+    background-position: 50%;
81
+    background-size: cover;
82
+    border-radius: .6rem;
83
+}
84
+
85
+.muiNewsListItemFooter{
86
+	margin-top: 1rem;
87
+	margin-bottom: 1rem;
88
+}
89
+
90
+.muiNewsListItemFooter>div{
91
+	display: inline-block;
92
+    height: 2rem;
93
+    line-height: 2rem;
94
+    vertical-align: bottom;
95
+}
96
+.muiNewsListItemFooter>div.muiNewsListItemCreator {
97
+    max-width: 12rem;
98
+    text-overflow: ellipsis;
99
+    white-space: nowrap;
100
+    overflow: hidden;
101
+}
102
+
103
+.muiNewsListItemFooter>div.muiNewsListItemCreated{
104
+	margin-left: 1rem;
105
+}
106
+
107
+.muiNewsListItemFooter>div.muiNewsListItemRead{
108
+	float: right;
109
+}
110
+
111
+.muiNewsListItemRead .muiNewsListItemReadNum{
112
+	margin-right: .4rem;
113
+    font-family: "landray-number", fontnumber,-apple-system, SF UI Text, Arial, PingFang SC, Hiragino Sans GB, Microsoft YaHei, WenQuanYi Micro Hei, sans-serif;
114
+}
115
+
116
+.muiNewsListItemRead .muiNewsListItemReadViewText{
117
+
118
+}

+ 184
- 198
WebContent/yb/seal/mobile/sealUsed/view.jsp View File

@@ -1,17 +1,18 @@
1 1
 <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
2 2
 <%@ include file="/sys/ui/jsp/common.jsp"%>
3 3
 <%@ taglib uri="/WEB-INF/KmssConfig/sys/mobile/mui.tld" prefix="mui"%>
4
+<c:set var="tiny" value="true" scope="request" />
4 5
 <%@ taglib uri="/WEB-INF/KmssConfig/sys/person/person.tld" prefix="person"%>
5 6
 
6 7
 <template:include ref="mobile.view" compatibleMode="true">
7 8
 	<template:replace name="title">
8
-		<c:out value="${jySealUsedMainForm.docSubject}"></c:out>
9
+		<c:out value="${ybSealUsedMainForm.docSubject}"></c:out>
9 10
 	</template:replace>
10 11
 	<template:replace name="head">
11 12
 		<mui:min-file name="mui-seal-used-view.css"/>
12 13
 	</template:replace>
13 14
 	<template:replace name="content">
14
-		<html:form action="/jy/seal/jy_seal_used_main/jySealUsedMain.do">
15
+		<html:form action="/yb/seal/yb_seal_used_main/ybSealUsedMain.do">
15 16
 		<div id="scrollView"
16 17
 			data-dojo-type="mui/view/DocScrollableView"
17 18
 			data-dojo-mixins="mui/form/_ValidateMixin">
@@ -19,12 +20,12 @@
19 20
 				<div class="muiFlowInfoW muiFormContent">
20 21
 					 <header class="muiFlowHeader">
21 22
 		                <div class="muiProcessIcon">
22
-		                    <img class="muiProcessImg" src='<person:headimageUrl personId="${jySealUsedMainForm.docCreatorId}"/>'/>
23
+		                    <img class="muiProcessImg" src='<person:headimageUrl personId="${ybSealUsedMainForm.docCreatorId}"/>'/>
23 24
 		                </div>
24 25
 		                <div class="muiProcessTitle">
25 26
 		                    <xform:text property="docCreatorName" mobile="true"/>
26 27
 		                </div>
27
-		                <c:if test="${jySealUsedMainForm.docStatus eq '30'}">
28
+		                <c:if test="${ybSealUsedMainForm.docStatus eq '30'}">
28 29
 			                <div class="muiProcessStatus" id="statusDiv">
29 30
 			                    <i class="mui mui-processPass"></i>
30 31
 			                </div>
@@ -33,7 +34,7 @@
33 34
 					<table class="muiSimple" cellpadding="0" cellspacing="0">
34 35
 						<tr>
35 36
 							<td class="muiTitle">
36
-								<bean:message bundle="jy-seal" key="seal.docSubject" />
37
+								<bean:message bundle="yb-seal" key="seal.docSubject" />
37 38
 							</td><td>
38 39
 								<xform:text property="docSubject" mobile="true"/>
39 40
 							</td>
@@ -43,70 +44,90 @@
43 44
 				<div data-dojo-type="mui/panel/Content" data-dojo-props="title:'审批内容',icon:'mui-ul'">
44 45
 					<table class="muiSimple" cellpadding="0" cellspacing="0">
45 46
 						<html:hidden property="fdId"/>
46
-						<html:hidden property="jySealMainListIds"/>
47
+						<input type="hidden" id="sealNameTxt" />
48
+						<input type="hidden" id="sealCodeTxt" />
49
+						<input type="hidden" id="ukeyNumTxt" />
47 50
 						<tr>
48 51
 						<td class="muiTitle">
49
-							<bean:message  bundle="jy-seal" key="seal.fdNo"/>
52
+							<bean:message  bundle="yb-seal" key="seal.fdNumber"/>
50 53
 						</td>
51 54
 						<td >
52 55
 							<xform:text property="fdNo" mobile="true"/>
53 56
 						</td>
54 57
 					</tr>
55
-						<%--印章名称--%>
58
+					<%--业务类型--%>
56 59
 					<tr>
57 60
 						<td class="muiTitle">
58
-							<bean:message  bundle="jy-seal" key="seal.selectSeal"/>
61
+							<bean:message  bundle="yb-seal" key="seal.fdSealBusType"/>
59 62
 						</td>
60 63
 						<td>
61
-							<xform:text property="jySealMainListNames" mobile="true"/>
64
+							<c:if test="${ybSealUsedMainForm.fdBusType == '1' }">
65
+								<c:out value="居民医保"></c:out>
66
+							</c:if>
67
+							<c:if test="${ybSealUsedMainForm.fdBusType == '2' }">
68
+								<c:out value="职工医保"></c:out>
69
+							</c:if>
70
+							<c:if test="${ybSealUsedMainForm.fdBusType == '3' }">
71
+								<c:out value="基金财务"></c:out>
72
+							</c:if>
62 73
 						</td>
63 74
 					</tr>
64 75
 					<tr>
65 76
 						<td class="muiTitle">
66
-							<bean:message  bundle="jy-seal" key="seal.className"/>
77
+							<bean:message  bundle="yb-seal" key="seal.fdAddCompSeal"/>
67 78
 						</td>
68 79
 						<td>
69
-							<xform:text property="fdSealModel" mobile="true"/>
70
-						</td>
71
-					</tr>
72
-					<tr>
73
-						<td class="muiTitle">
74
-							<bean:message bundle="jy-seal" key="jySealUsedMain.fdDocument"/>
75
-						</td>
76
-						<td>
77
-							<xform:text property="fdDocument"  mobile="true"/>
80
+							<c:if test="${ybSealUsedMainForm.fdAddCompSeal == false}">
81
+								<c:out value="否"></c:out>
82
+							</c:if>
83
+							<c:if test="${ybSealUsedMainForm.fdAddCompSeal == true}">
84
+								<c:out value="是"></c:out>
85
+							</c:if>
78 86
 						</td>
79 87
 					</tr>
88
+					<c:if test="${ybSealUsedMainForm.fdAddCompSeal == true }">
89
+						<tr>
90
+							<td class="muiTitle">
91
+								<bean:message  bundle="yb-seal" key="seal.selectCompSeal"/>
92
+							</td>
93
+							<td>
94
+								<xform:text property="fdCompSealName" mobile="true"/>
95
+							</td>
96
+						</tr>
97
+						<tr>
98
+							<td class="muiTitle">
99
+								<bean:message bundle="yb-seal" key="ybSealUsedMain.fdCompSealKeyText"/>
100
+							</td>
101
+							<td>
102
+								<xform:text property="fdCompSealKeyText"  mobile="true"/>
103
+							</td>
104
+						</tr>
105
+					</c:if>
80 106
 					<tr>
81 107
 						<td class="muiTitle">
82
-							<bean:message bundle="jy-seal" key="jySealUsedMain.fdDocumentLink"/>
108
+							<bean:message bundle="yb-seal" key="seal.viewCurSealFile"/>
83 109
 						</td>
84 110
 						<td>
85
-							<xform:text property="fdDocumentLink" mobile="true"/>
111
+							<button type="button" style="width:100px;height:25px; border:0px; background-color:#47b5e6 " onclick="viewSealFile('${ybSealUsedMainForm.fdDocumentLink}')">
112
+									 查看
113
+							</button>
86 114
 						</td>
87 115
 					</tr>
88
-						<%--    用印文件类别--%>
89 116
 					<tr>
90 117
 						<td class="muiTitle">
91
-							<bean:message  bundle="jy-seal" key="jySealUsedMain.usedSealType"/>
92
-						</td>
93
-						<td>
94
-							<xform:text property="fdJySealFileTypeName" mobile="true"/>
95
-						</td>
96
-					</tr>
97
-						<tr>
98
-						<td class="muiTitle">
99
-							<bean:message  bundle="jy-seal" key="jySealUsedMain.matter"/>
118
+							<bean:message bundle="yb-seal" key="seal.viewOrgSealFile"/>
100 119
 						</td>
101 120
 						<td>
102
-							<xform:text property="fdJySealMatterName" mobile="true"/>
121
+							<button type="button" style="width:100px;height:25px; border:0px; background-color:#47b5e6 " onclick="viewSealFile('${ybSealUsedMainForm.fdOrgDocumentLink}')">
122
+									 查看
123
+							</button>
103 124
 						</td>
104 125
 					</tr>
105 126
 					<tr>
106 127
 						<td class="muiTitle">
107
-							<bean:message  bundle="jy-seal" key="jySealUsedMain.fdReason"/>
128
+							<bean:message  bundle="yb-seal" key="ybSealUsedMain.fdRemark"/>
108 129
 						</td><td>
109
-						<xform:text property="fdReason" mobile="true"/>
130
+						<xform:text property="fdRemark" mobile="true"/>
110 131
 					    </td>
111 132
 					</tr>
112 133
 					<tr>
@@ -115,14 +136,14 @@
115 136
 						 <td>
116 137
 						<c:import url="/sys/attachment/mobile/import/view.jsp"
117 138
 								  charEncoding="UTF-8">
118
-							<c:param name="formName" value="jySealUsedMainForm"></c:param>
139
+							<c:param name="formName" value="ybSealUsedMainForm"></c:param>
119 140
 							<c:param name="fdKey" value="attachment"></c:param>
120 141
 						</c:import>
121 142
 				     	</td>
122 143
 					</tr>
123 144
 					<tr>
124 145
 						<td class="muiTitle">
125
-							<bean:message bundle="jy-seal" key="jySealUsedMain.docCreator"/>
146
+							<bean:message bundle="yb-seal" key="ybSealUsedMain.docCreator"/>
126 147
 						</td><td>
127 148
 						<xform:text property="docCreatorName" mobile="true"/>
128 149
 
@@ -130,7 +151,7 @@
130 151
 					</tr>
131 152
 					<tr>
132 153
 						<td class="muiTitle">
133
-							<bean:message  bundle="jy-seal" key="jySealUsedMain.docCreateTime"/>
154
+							<bean:message  bundle="yb-seal" key="seal.docCreateTime"/>
134 155
 						</td><td>
135 156
 							<xform:text property="docCreateTime" mobile="true"/>
136 157
 						</td>
@@ -138,179 +159,158 @@
138 159
 						<br/>
139 160
 					</table>
140 161
 				</div>
141
-					<c:if test="${jySealUsedMainForm.fdUseSealType == '0' }">
142
-						<div  class="txtContent">
143
-							<%@include file="/jy/seal/mobile/sealUsed/Sealprinting_view.jsp"%>
144
-				   		 </div>
145
-					</c:if>
146
-					<c:if test="${jySealUsedMainForm.fdUseSealType == '1' }">
147
-						<div  class="txtContent">
148
-							<%@include file="/jy/seal/mobile/sealUsed/Sealprinting_elec_view.jsp"%>
149
-				   		 </div>
150
-					</c:if>
151
-					<br/>
162
+				<%--流程记录--%>
152 163
 				<div data-dojo-type="mui/panel/Content" data-dojo-props="title:'流程记录',icon:'mui-ul'">
153
-					<c:import url="/sys/lbpmservice/mobile/lbpm_audit_note/import/view.jsp" charEncoding="UTF-8">
154
-						<c:param name="fdModelId" value="${jySealUsedMainForm.fdId }"/>
155
-						<c:param name="fdModelName" value="com.landray.kmss.jy.seal.model.JySealUsedMain"/>
156
-						<c:param name="formBeanName" value="jySealUsedMainForm"/>
157
-					</c:import>
158
-				</div>
164
+                     <c:import url="/sys/lbpmservice/mobile/lbpm_audit_note/import/view.jsp" charEncoding="UTF-8">
165
+                         <c:param name="fdModelId" value="${ybSealUsedMainForm.fdId}" />
166
+                         <c:param name="fdModelName" value="com.landray.kmss.yb.seal.model.YbSealUsedMain" />
167
+                         <c:param name="formBeanName" value="ybSealUsedMainForm" />
168
+                     </c:import>
169
+                 </div>
159 170
 			</div>
160
-			<c:if test="${jySealUsedMainForm.docStatus >= '30' }">
171
+
172
+			<c:if test="${ybSealUsedMainForm.docStatus >= '30' || ybSealUsedMainForm.docStatus < '20' }">
161 173
 				<ul data-dojo-type="mui/tabbar/TabBar" fixed="bottom" >
162 174
 					<li data-dojo-type="mui/back/BackButton"></li>
163
-					<%--<c:import url="/sys/evaluation/mobile/import/view.jsp" charEncoding="UTF-8">--%>
164
-						<%--<c:param name="formName" value="jySealUsedMainForm"></c:param>--%>
165
-					<%--</c:import>--%>
166
-					<c:import url="/sys/bookmark/mobile/import/view.jsp" charEncoding="UTF-8">
167
-						<c:param name="fdModelName" value="${jySealUsedMainForm.modelClass.name}"></c:param>
168
-						<c:param name="fdModelId" value="${jySealUsedMainForm.fdId}"></c:param>
169
-						<c:param name="fdSubject" value="${jySealUsedMainForm.docSubject}"></c:param>
170
-					</c:import>
171
-					<li data-dojo-type="mui/tabbar/TabBarButtonGroup" data-dojo-props="icon1:'mui mui-more'">
172
-						<div data-dojo-type="mui/back/HomeButton"></div>
173
-						<%--<c:import url="/sys/relation/mobile/import/view.jsp" charEncoding="UTF-8">--%>
174
-							<%--<c:param name="formName" value="jySealUsedMainForm"></c:param>--%>
175
-						<%--</c:import>--%>
176
-					</li>
175
+					<li data-dojo-type="mui/back/HomeButton"></li>
177 176
 				</ul>
178 177
 			</c:if>
179
-			<c:if test="${jySealUsedMainForm.docStatus < '30' }">
180
-				<template:include file="/sys/lbpmservice/mobile/import/bar.jsp"
181
-								  docStatus="${jySealUsedMainForm.docStatus}"
182
-								  editUrl="javascript:building();"
183
-								  formName="jySealUsedMainForm">
184
-					<template:replace name="group">
185
-						<template:super/>
186
-						<%--<c:import url="/sys/relation/mobile/import/view.jsp" charEncoding="UTF-8">--%>
187
-							<%--<c:param name="formName" value="jySealUsedMainForm"></c:param>--%>
188
-						<%--</c:import>--%>
189
-					</template:replace>
178
+			<c:if test="${ybSealUsedMainForm.docStatus == '20' }">
179
+				<template:include file="/sys/lbpmservice/mobile/import/tarbar.jsp" 
180
+				      docStatus="${ybSealUsedMainForm.docStatus}" 
181
+					  editUrl=""
182
+					  formName="ybSealUsedMainForm"
183
+					  viewName="lbpmView"
184
+					  allowReview="true">
190 185
 				</template:include>
191 186
 			</c:if>
192 187
 		</div>
193 188
 			<c:import url="/sys/lbpmservice/mobile/import/view.jsp" charEncoding="UTF-8">
194
-				<c:param name="formName" value="jySealUsedMainForm" />
195
-				<c:param name="fdKey" value="jySealUsedTemplate" />
189
+				<c:param name="formName" value="ybSealUsedMainForm" />
190
+				<c:param name="fdKey" value="ybSealUsedTemplate" />
196 191
 				<c:param name="backTo" value="scrollView" />
197
-				<c:param name="onClickSubmitButton" value="checkConfirm" />
192
+				<c:param name="viewName" value="lbpmView" />
193
+				<c:param name="onClickSubmitButton" value="signSubmit();" />
198 194
 			</c:import>
199 195
 			<script type="text/javascript">
200
-				require(['dojo/ready','dijit/registry','mui/dialog/Confirm','dojo/dom','dojo/dom-attr','dojo/query','dojo/topic',"dojo/store/Memory","mui/dialog/Tip","mui/util"],
201
-						function(ready,registry,Confirm,dom,domAttr,query,topic,Memory,Tip,util){
196
+				require(["mui/form/ajax-form!ybSealUsedMainForm"]);
197
+			</script>
198
+			<script type="text/javascript">
199
+				require(['dojo/topic', 'mui/dialog/Confirm', 'mui/dialog/Tip', 'dojo/request', 'dojo/dom'], 
200
+						function(topic, Confirm, Tip, request, dom) {
202 201
 							var result;
203
-							var flag=false;
204
-							window.checkConfirm=function (){
205
-								//获取审批操作项
206
-								var oprGroup=document.getElementsByClassName('mblIconArea handler_pass selected');
207
-								if(oprGroup.length>0){
202
+							var flag=true;
203
+							window.signSubmit=function (){
204
+								//操作类型为通过类型 ,才做签章动作
205
+								if(lbpm.globals.getCurrentOperation().operation && lbpm.globals.getCurrentOperation().operation['isPassType'] == true){								
208 206
 									//获取当前节点信息
209
-									var nodeObj = lbpm.globals.getCurrentNodeObj();
210
-									var id =nodeObj.id;
211
-									
212
-									
213
-									if(id=="N9"){
214
-										checkSeal();
215
-										if(result!=0){
216
-											return;
207
+									var nodeId = lbpm.nowNodeId;
208
+									var keyword = "经办人";
209
+									//根据节点确定签章关键字 
210
+									var signFlag = true;
211
+									var compSealSign = 0;
212
+									if(nodeId=="N4"){
213
+										keyword = "经办人";
214
+									} else if(nodeId=="N5"){
215
+										keyword = "复核人";
216
+									} else if(nodeId=="N6"){
217
+										keyword = "审核人";
218
+										if(fdAddCompSeal=="true" || fdAddCompSeal==true){
219
+											compSealSign = 1;
217 220
 										}
218
-										Confirm('<div style="line-height:2rem;">是否立即前往盖章?</div>','',function(value){
219
-											if(value==true){
220
-												Com_Submit(document.jySealUsedMainForm, 'mobileUpdate');
221
-											}
222
-										});
223
-									}else if(id=="N14"){
224
-										Confirm('<div style="line-height:2rem;">请确认待盖章文件与审批文件内容是否一致。</div>','',function(value){
225
-											if(value==true){
226
-												checkElecFile();
227
-												if(flag){
228
-													Com_Submit(document.jySealUsedMainForm, 'mobileUpdate');
229
-												}
230
-												
231
-											}
232
-										});
221
+									} else if(nodeId=="N7"){
222
+										keyword = "审批人";
233 223
 									} else {
234
-										Com_Submit(document.jySealUsedMainForm, 'mobileUpdate');
224
+										signFlag = false;
235 225
 									}
236
-								}else{
237
-									Com_Submit(document.jySealUsedMainForm, 'mobileUpdate');
238
-								}
239
-							};
240
-							window.checkSeal=function(method){
241
-								var ids=$("input[name='jySealMainListIds']").val();
242
-								$.ajax({
243
-									url: '${LUI_ContextPath}/jy/seal/jy_seal_used_main/jySealUsedMain.do?method=checkSeal&ids='+ids+'',
244
-									type: 'get',
245
-									data:'',
246
-									success: function (data) {
247
-										var html="";
248
-										$.each(data, function (key, value) {
249
-											//循环遍历后台传过来的json数据
250
-											html += "<tr><td> 印章名称 </td> <td> " + value.result + "</td></tr><tr><td >预计归还时间</td><td style='width:50%'>" + value.time + "</td></tr>";
251
-										});
252
-										if(html==""){
253
-											result=0;
254
-										}else{
255
-											Tip.tip({text:"您要使用的印章已被外借!", icon:'mui mui-warn'});
226
+									if(signFlag) {
227
+										var fileUrl = '${ybSealUsedMainForm.fdDocumentLink}';
228
+										if(!fileUrl || fileUrl.length == 0) {
229
+											Tip.tip({text:"待签章文件地址为空,无法签章!", icon:'mui mui-warn'});
230
+											return false;
256 231
 										}
257
-									}
258
-								});
259
-							};
260
-							window.checkElecFile=function(){
261
-								$.ajax({
262
-									url: '${LUI_ContextPath}/jy/seal/jy_seal_used_main/jySealUsedMain.do?method=getSignCount',
263
-									type: 'post',
264
-									data:{"id":'${ jySealUsedMainForm.fdId }'},
265
-									async: false,
266
-									success: function (data) {
267
-										if(data){
268
-											if(data[0]=='0'){
269
-												flag = true;
270
-											}else{
271
-												Tip.tip({text:"您还有未盖章文件!", icon:'mui mui-warn'});
272
-												flag = false;
232
+										var ukeyCode = $("#ukeyNumTxt").val();
233
+										var sealCode = $("#sealCodeTxt").val();
234
+										if(!sealCode || sealCode.length < 5) {
235
+											if(!ukeyCode || ukeyCode.length < 5) {
236
+												Tip.tip({text:"系统中不存在您的签章信息,无法签章!", icon:'mui mui-warn'});
237
+											} else {
238
+												Tip.tip({text:"请在PC端使用ukey进行签章!", icon:'mui mui-warn'});
273 239
 											}
274
-										}else{
275
-											flag =  false;
240
+											return false;
241
+										} else {
242
+											Confirm('<span>是否已确认签章文件内容?</span>', '', function(check, d) {
243
+												if(!check) {
244
+													return false;
245
+												}
246
+												
247
+												var processTip = Tip.processing();
248
+												processTip.show(); //显示调用
249
+												request('${LUI_ContextPath}/yb/seal/yb_seal_used_main/ybSealUsedMain.do?method=submitCentralSign', {
250
+													method: 'post',
251
+													handleAs : 'json',
252
+													data: {
253
+														'fdId': "${ybSealUsedMainForm.fdId}", 
254
+														'signKeyword': keyword, 
255
+														'compSealSign': compSealSign
256
+													}
257
+												}).then(function(res){
258
+													processTip.hide();
259
+
260
+													Tip.success({
261
+														text: '签章成功!'
262
+													});
263
+													flag = true;
264
+
265
+													Com_Submit(document.ybSealUsedMainForm, 'update');
266
+												}, function(err) {
267
+													processTip.hide();													
268
+													Tip.fail({
269
+														text: '签章失败!'
270
+													});
271
+													
272
+												});
273
+											}, false, function() {
274
+											
275
+											});
276 276
 										}
277
+									} else {
278
+										flag = true;
279
+										Com_Submit(document.ybSealUsedMainForm, 'update');
277 280
 									}
281
+								} else {
282
+									flag = true;
283
+									Com_Submit(document.ybSealUsedMainForm, 'update');
284
+								}
285
+								return flag;
278 286
 									
279
-							});
280
-							};
281
-							window.goSeal=function(id){
282
-								 $.ajax({
283
-										url: '${LUI_ContextPath}/jy/seal/jy_seal_used_main/jySealUsedMain.do?method=goSeal',
284
-										type: 'post',
285
-										data:{"id":id},
286
-										success: function (data) {
287
-											if(data){
288
-												if(data.length==1){
289
-													var url = data[0].url;
290
-													window.location.href = url;
291
-												}else if(data.length>1){
292
-													openDialog(data);
293
-												}else{
294
-													alert("您已签署完成");
295
-												}
296
-											}
297
-										}
298
-										
299
-								});
300 287
 							};
301
-							window.openDialog=function(data){
302
-			 					window.sessionStorage.removeItem("sealDia");
303
-			 					var sealData = JSON.stringify(data);
304
-			 					window.sessionStorage.setItem("sealDia",sealData);
305
-			 					var url="${LUI_ContextPath}/jy/seal/jy_seal_used_main/signDialog.jsp";
306
-			 					window.location.href = url;
307
-				 			};
308 288
 						})
289
+						
290
+				function viewSealFile(url){
291
+					if(!url || url.length == 0) {
292
+						alert("签章文件地址为空,无法查看!");
293
+					} else {
294
+						window.open(url,"_blank");
295
+					}
296
+				}	
309 297
 			</script>
298
+			<c:if test="${ybSealUsedMainForm.docStatus eq '20'}">
310 299
 			<script type="text/javascript">
311
-				require(["mui/form/ajax-form!jySealUsedMainForm"]);
300
+				require(["dojo/ready"], function(ready) {
301
+					ready(function() {
302
+						//console.log("******************");
303
+						var userSeals = JSON.parse('${ybSealUsedMainForm.userSeals}');
304
+						if(userSeals.length > 0){
305
+							$("#sealNameTxt").val(userSeals[0].sealName);
306
+							$("#sealCodeTxt").val(userSeals[0].sealCode);
307
+							$("#ukeyNumTxt").val(userSeals[0].ukeyNum);
308
+						}
309
+					});
310
+				});
312 311
 			</script>
313
-		    <c:if test="${jySealUsedMainForm.docStatus eq '30'}">
312
+			</c:if>
313
+		    <c:if test="${ybSealUsedMainForm.docStatus eq '30'}">
314 314
 			<script type="text/javascript">
315 315
 				require(["dojo/ready"], function(ready) {
316 316
 					ready(function() {
@@ -321,18 +321,4 @@
321 321
 			</c:if>
322 322
 	</html:form>
323 323
 	</template:replace>
324
-</template:include>
325
-<%!
326
-public boolean isDingInEnter(String useragent){
327
-	String USERAGENG_DINGTALK="DingTalk";
328
-	if(useragent.indexOf(USERAGENG_DINGTALK)!=-1){
329
-		return true;
330
-	}
331
-	return false;
332
-}
333
-
334
-public String getEncodeString(String str)throws Exception{
335
-	return java.net.URLEncoder.encode(str,"UTF-8");
336
-}
337
-
338
-%>
324
+</template:include>

+ 2
- 3
WebContent/yb/seal/yb_seal_used_main/index.jsp View File

@@ -48,13 +48,12 @@
48 48
 				<ui:varParam name="title" value="${ lfn:message('yb-seal:seal.usedmainMange') }" />
49 49
 				<ui:varParam name="button">
50 50
 					[
51
-						<kmss:auth requestURL="/yb/seal/yb_seal_used_main/ybSealUsedMain.do?method=add">
51
+						
52 52
 						{
53 53
 							"text": "",
54
-							"href": "javascript:addDoc();",
54
+							"href": "",
55 55
 							"icon": "km_signature"
56 56
 						}
57
-						</kmss:auth>
58 57
 					]
59 58
 				</ui:varParam>
60 59
 			</ui:combin>

+ 5
- 5
WebContent/yb/seal/yb_seal_used_main/pdfsign/pdfsign.js View File

@@ -213,13 +213,13 @@ function test_SOF_GetCertInfoByOid(certId) {
213 213
 //关键字签章
214 214
 function ukeyKeywordSignPdf(uk_code, fileUrl, keyword, lSearchType, lMultiSeal, XOffset, YOffset) {
215 215
 	//1、确认用户的签章信息与插入的ukey是否匹配
216
-	var checkRes = checkUkeyInfo(uk_code);
216
+	//var checkRes = checkUkeyInfo(uk_code);
217 217
 
218
-	if(checkRes) {
218
+	//if(checkRes) {
219 219
 		return KeywordSignPdfReturnData(fileUrl, keyword, lSearchType, lMultiSeal, XOffset, YOffset);
220
-	} else {
221
-		return '';
222
-	}
220
+	//} else {
221
+	//	return '';
222
+	//}
223 223
 }
224 224
 
225 225
 //关键字签章,签章成功返回值为签章后base64数据,签章失败返回值为失败原因

+ 40
- 9
WebContent/yb/seal/yb_seal_used_main/ybSealUsedMain_view.jsp View File

@@ -55,14 +55,22 @@
55 55
 			seajs.use(['lui/dialog'],function(dialog){
56 56
 				//ukey签名
57 57
 				window.doUkeySign=function(keyword, compSealSign){
58
-					//dialog.loading(); // 显示loading遮罩层
58
+					var flag = false;
59
+					var fileUrl = '${ybSealUsedMainForm.fdDocumentLink}';
60
+					if(!fileUrl || fileUrl.length == 0) {
61
+						dialog.alert("待签章文件地址为空,无法签章!");
62
+						return flag;
63
+					}	
64
+					var ukeyCode = $("#ukeyNumTxt").val();
65
+					var checkRes = checkUkeyInfo(ukeyCode);
66
+					if(!checkRes) {
67
+						return flag;
68
+					}
59 69
 					//设置签章类型
60 70
 		            var lSearchType = 1; // 1正序 -1逆序
61 71
 		            var lMultiSeal = 1; // 0单签 1所有位置都签
62 72
 					var fileUrl = '${ybSealUsedMainForm.fdDocumentLink}';
63 73
 					var signParam = $("#signParamTxt").val();
64
-					var ukeyCode = $("#ukeyNumTxt").val();
65
-					var flag = false;
66 74
 					if((!ukeyCode || ukeyCode.length < 1) || (!signParam || signParam.length < 1)) {
67 75
 						dialog.alert("系统中不存在您的签章信息,无法签章!");
68 76
 					} else {
@@ -72,6 +80,7 @@
72 80
 						} else {
73 81
 							var XOffset = signOffsets[0];
74 82
 							var YOffset = signOffsets[1];
83
+							dialog.loading();
75 84
 							var resdata = ukeyKeywordSignPdf(ukeyCode, fileUrl, keyword, lSearchType, lMultiSeal, XOffset, YOffset)
76 85
 							if ("" != resdata) {
77 86
 								//将签名后的base64数据存储到cos服务器
@@ -83,9 +92,15 @@
83 92
 									success: function (data) {
84 93
 										if(data && data.code=='1'){
85 94
 											flag = true;
95
+											dialog.loading().hide();
86 96
 											return flag;
87 97
 										}
88
-									}
98
+									},
99
+							        error: function(err) {
100
+					                	alert(err);
101
+					                	dialog.loading().hide();
102
+										return flag;
103
+					                }
89 104
 									
90 105
 								});
91 106
 		                    } else {
@@ -94,18 +109,19 @@
94 109
 						}
95 110
 					}
96 111
 
97
-					//dialog.loading().hide();
112
+					dialog.loading().hide();
98 113
 					return flag;
99 114
 				};
100 115
 				
101 116
 				//集中式签章
102 117
 				window.doCentralSign=function(keyword, compSealSign){
103
-					//dialog.loading(); // 显示loading遮罩层
118
+					//
104 119
 					var sealCode = $("#sealCodeTxt").val();
105 120
 					var flag = false;
106 121
 					if(!sealCode || sealCode.length < 1) {
107 122
 						dialog.alert("系统中不存在您的签章信息,无法签章!");
108 123
 					} else {
124
+						dialog.loading(); // 显示loading遮罩层
109 125
 						//调用集中式签章接口
110 126
 						$.ajax({
111 127
 							url: '${LUI_ContextPath}/yb/seal/yb_seal_used_main/ybSealUsedMain.do?method=submitCentralSign',
@@ -115,14 +131,20 @@
115 131
 							success: function (data) {
116 132
 								if(data && data.code=='1'){
117 133
 									flag = true;
134
+									dialog.loading().hide();
118 135
 									return flag;
119 136
 								}
120
-							}
137
+							},
138
+					        error: function(err) {
139
+			                	alert(err);
140
+			                	dialog.loading().hide();
141
+								return flag;
142
+			                }
121 143
 							
122 144
 						});
123 145
 					}
124 146
 
125
-					//dialog.loading().hide();
147
+					dialog.loading().hide();
126 148
 					return flag;
127 149
 				};
128 150
 			});
@@ -187,6 +209,11 @@
187 209
 					}
188 210
 					
189 211
 					if(signFlag) {
212
+						var fileUrl = '${ybSealUsedMainForm.fdDocumentLink}';
213
+						if(!fileUrl || fileUrl.length == 0) {
214
+							dialog.alert("待签章文件地址为空,无法签章!");
215
+							return false;
216
+						}
190 217
 						var ukeyCode = $("#ukeyNumTxt").val();
191 218
 						var sealCode = $("#sealCodeTxt").val();
192 219
 						if((!ukeyCode || ukeyCode.length < 1) && (!sealCode || sealCode.length < 1)) {
@@ -354,7 +381,11 @@
354 381
 	 window.location.href=url;
355 382
   }
356 383
   function viewSealFile(url){
357
-	  window.open(url,"_blank");
384
+	  if(!url || url.length == 0) {
385
+			alert("签章文件地址为空,无法查看!");
386
+		} else {
387
+			window.open(url,"_blank");
388
+		}
358 389
   }
359 390
 	  
360 391
 		</script>	

+ 1
- 1
src/com/landray/kmss/yb/seal/ApplicationResources.properties
File diff suppressed because it is too large
View File


+ 1
- 1
src/com/landray/kmss/yb/seal/actions/YbSealUsedMainAction.java View File

@@ -760,7 +760,7 @@ public class YbSealUsedMainAction extends ExtendAction {
760 760
 	        }
761 761
 			if (responseEntity != null) {
762 762
 				String result = EntityUtils.toString(responseEntity);
763
-				System.out.println("Response: " + result);
763
+				//System.out.println("Response: " + result);
764 764
 				JSONObject resObj = JSONObject.fromObject(result);
765 765
 				Integer code = resObj.getInt("code");
766 766
 				if (code == null) {

Loading…
Cancel
Save