Sfoglia il codice sorgente

ocr集成 word模板 签名集成

xiao-xx 1 anno fa
parent
commit
cf7330c862

+ 2 - 2
yinet-admin/src/main/resources/templates/rlzy/apply/edit.html

@@ -146,7 +146,7 @@
                     <div class="form-group">
                         <label class="col-sm-4 control-label">编号:</label>
                         <div class="col-sm-8">
-                            (冀)人服证字﹝[[${year}]]﹞0133000
+                            (冀)人服证字﹝[[${year}]]﹞01330
                             <input name="licenseNumber" style="width: 50px;text-align: center;" th:field="*{licenseNumber}" type="text">
                             23号
                         </div>
@@ -156,7 +156,7 @@
                     <div class="form-group">
                         <label class="col-sm-4 control-label">许可文号:</label>
                         <div class="col-sm-8">
-                            赵行审人资许决﹝[[${year}]]﹞00
+                            赵行审人资许决﹝[[${year}]]﹞
                             <input name="licenseCode" style="width: 50px;text-align: center;" th:field="*{licenseCode}" type="text">
                         </div>

+ 18 - 14
yinet-admin/src/main/resources/templates/rlzy/print/apply.html

@@ -600,17 +600,18 @@
         var Url = getRootPath_web();
         console.log(Url+$("#printFilePath").val())
         Toast('', '打印指定网页文件');
-        module_printer.print_webpage2(
+        module_printer.print_net_file(
             Url+$("#printFilePath").val(),
-            1,     //打印数量
-            0,     //打印纸盒选择(0:使用默认纸盒,1:使用纸盒1,2:使用纸盒2,5:使用手动纸盒)
-            0,       //打印纸张选择(0:A4,1:A3,2:A5)
-            1,      //是否彩色打印(0:黑白打印,1:彩色打印)
-            1,     //是否横向打印(0:纵向,1:横向)
-            0     //是否需要返回实际打印结果(0:不需要,1:需要
+            "doc",
+            1,        //打印数量
+            0,//打印纸盒选择(0使用默认纸盒,1使用纸盒1,2使用纸盒2,3使用纸盒3,4使用纸盒4,5使用手动纸盒
+            0,//选择纸张规格 0 A4 ,1 A3, 2 A5
+            0, //选择打印色彩 0 黑白打印 1 彩色打印
+            0,// 是否横向打印 0 纵向 1横向
+            0,//仅支持doc、docx、pdf双面打印,默认单面打印 0否 1 是
+            0//是否需要返回实际打印结果  0不 1 要
         );
 
-
     }
 
     function getRootPath_web() {
@@ -637,7 +638,7 @@
         $("#content1").hide()
         $("#content2").show()
         cl_openidA4photos(0, 1);
-        open_light()
+
     }
 
     function goBackStep() {
@@ -672,8 +673,10 @@
                     $("#content2").hide()
                 }
                 else{
-                    cl_openidA4photos(0, 1);
-                    alert(res.msg)
+                    // cl_openidA4photos(0, 1);
+                    alert("智能识别未能识别该营业执照,请手动填写信息")
+                    $("#content1").show()
+                    $("#content2").hide()
                 }
             },
             error:function(){
@@ -785,7 +788,7 @@
 
     //材料上传--打开摄像头
     function cl_openidA4photos(size, type) {
-
+        open_light()
         var oViewport;
         var offsetWidth;
         var offsetHeight;
@@ -1080,16 +1083,17 @@
                             break;
                     }
                     if(code=='0'){
+                        $.modal.closeLoading()
                         $.modal.loading("开始打印");
                         window.setTimeout(function(){
                             $.modal.closeLoading()
-                        },2000)
+                        },6000)
                     }
                     console.log(info)
                 });
 
                 cl_openidA4photos(0, 1);
-                open_light()
+
             });
         }
 

+ 2 - 2
yinet-admin/src/main/resources/templates/rlzy/print/fuben.html

@@ -250,7 +250,7 @@
 	<img src="/rlzy/images/bg2.jpg" style="position: absolute;left: 0;top: 0;width: 100%;height: 100%;"/>
 	<img src="/rlzy/images/dzz.png" style="position: absolute;left: 14%;top: 71%;width: 800px;height: 800px;"/>
 	<div class="fbbh">
-		(冀)人服证字〔[[${year}]]〕0133000[[${rlzyApply.licenseNumber}]]23
+		(冀)人服证字〔[[${year}]]〕01330[[${rlzyApply.licenseNumber}]]23
 	</div>
 	<div class="mc">
 		<div>
@@ -286,7 +286,7 @@
 		<div>
 			<span>许</span><span>可</span><span>文</span><span>号</span>
 		</div>
-		<div>赵行审人资许决﹝[[${year}]]﹞00[[${rlzyApply.licenseCode}]]号</div>
+		<div>赵行审人资许决﹝[[${year}]]﹞[[${rlzyApply.licenseCode}]]号</div>
 	</div>
 	<div class="fwfw">
 		<div>

+ 2 - 2
yinet-admin/src/main/resources/templates/rlzy/print/zhengben.html

@@ -248,7 +248,7 @@
 			<img src="/rlzy/images/bg1.jpg" style="position: absolute;left: 0;top: 0;width: 100%;height: 100%;"/>
 			<img src="/rlzy/images/dzz.png" style="position: absolute;left: 59%;top: 71%;width: 800px;height: 800px;"/>
 			<div class="fbbh">
-				(冀)人服证字〔[[${year}]]〕0133000[[${rlzyApply.licenseNumber}]]23
+				(冀)人服证字〔[[${year}]]〕01330[[${rlzyApply.licenseNumber}]]23
 			</div>
 			<div class="mc">
 				<div>
@@ -284,7 +284,7 @@
 				<div>
 					<span>许</span><span>可</span><span>文</span><span>号</span>
 				</div>
-				<div>赵行审人资许决﹝[[${year}]]﹞00[[${rlzyApply.licenseCode}]]号</div>
+				<div>赵行审人资许决﹝[[${year}]]﹞[[${rlzyApply.licenseCode}]]号</div>
 			</div>
 			<div class="fwfw">
 				<div>