yinet-admin/pom.xml

@@ -95,6 +95,7 @@
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
+                <version>2.3.0.RELEASE</version>
                 <configuration>
                     <fork>true</fork> <!-- 如果没有该配置，devtools不会生效 -->
                 </configuration>

yinet-admin/src/main/java/com/yinet/web/controller/rlzy/RlzyApplyPrintController.java

@@ -110,7 +110,7 @@ public class RlzyApplyPrintController extends BaseController {
         RlzyApply build = null;
         if("zhengben".equals(type)){
             build = RlzyApply.builder().iszprint("1").id(applyId).build();
-        }else if("fubeng".equals(type)){
+        }else if("fuben".equals(type)){
             build = RlzyApply.builder().isfprint("1").id(applyId).build();
         }
         return  AjaxResult.success(rlzyApplyService.updateById(build));

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

@@ -147,12 +147,12 @@
             $.table.init(options);
         });
         function transact(id){
-            $.modal.open("申请办理","/rlzy/apply/edit/"+id,1020,760);
+            $.modal.open("申请办理","/rlzy/apply/edit/"+id,1305,895);
             $('.layui-layer-btn0').text("办理")
             $('.layui-layer-btn1').text("取消")
         }
         function show(id){
-            $.modal.open("查看","/rlzy/apply/edit/"+id,1020,760);
+            $.modal.open("查看","/rlzy/apply/edit/"+id,1305,895);
             $('.layui-layer-btn0').text("保存");
             $('.layui-layer-btn1').text("关闭")
         }

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

@@ -119,14 +119,22 @@
                 </div>
             </div>
             <div class="row">
-                <div class="col-sm-12">
+                <div class="col-sm-6">
                     <div class="form-group">
-                        <label class="col-sm-2 control-label">文件：</label>
-                        <div class="col-sm-10">
+                        <label class="col-sm-4 control-label">文件：</label>
+                        <div class="col-sm-8">
                             <img  style="width: 300px;height: 200px" th:src="*{file}" >
                         </div>
                     </div>
                 </div>
+                <div class="col-sm-6">
+                    <div class="form-group">
+                        <label class="col-sm-4 control-label">承诺书：</label>
+                        <div class="col-sm-8">
+                            <img  style="width: 300px;height: 200px" th:src="*{chengnuoshu}" >
+                        </div>
+                    </div>
+                </div>
             </div>
             <hr>
             <div class="row">

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

@@ -421,7 +421,7 @@
                 />
                 <input
                         id="chengnuoshu"
-                        name="file"
+                        name="chengnuoshu"
                         type="hidden"
                 />
 
@@ -482,7 +482,7 @@
                                     <a id="imgBase64"> </a>
                                 </div>
                                 <div class="col-md-12 yllist"    id="sqcn" style="display:none">
-                                    <a > </a>
+                                    <a id="cns"> </a>
                                 </div>
                             </div>
                         </div>
@@ -671,6 +671,18 @@
     function close_light() {
         module_lightctrl.close_light(RAIO_lightctrl_light.RAIO_LIGHTCTR_LIGHT_CAMERA);
     }
+    var nowfile=""
+    function selTr(e) {
+        nowfile=$(e).attr("data-id")
+        if(nowfile=="yyzz"){
+            $("#yyzz").show()
+            $("#sqcn").hide()
+        }else{
+            $("#yyzz").hide()
+            $("#sqcn").show()
+        }
+    }
+    var formData = ""
     window.onload = function () {
         // var baseUrl = "http://127.0.0.1:12345/";
         if (location.search != "")
@@ -703,24 +715,44 @@
                     Toast('res', "关闭控制灯结果" + code)
                 });
                 module_camera.sig_take_photo.connect(function (code, image) {
+
                     if (code == 0) {
                         Toast('res', '拍照成功');
                         addImage(image);
-                        var formData = getFileFromBase64(image,"人力资源设立.jpg");
-
-                        $.ajax({
-                            type: "post",
-                            url: ctx + "common/upload",
-                            data: formData,
-                            cache: false,
-                            contentType: false,
-                            processData: false,
-                            dataType: 'json',
-                            success: function (result) {
-                                console.log(result)
-                                $('#baseFile').val(result.fileName)
-                            }
-                        });
+                        formData = getFileFromBase64(image,"人力资源设立.jpg");
+                        console.log(formData)
+                        console.log(nowfile)
+                        if(nowfile=="yyzz"){
+                            $.ajax({
+                                type: "post",
+                                url: ctx + "common/upload",
+                                data: formData,
+                                cache: false,
+                                contentType: false,
+                                processData: false,
+                                dataType: 'json',
+                                success: function (result) {
+                                    console.log(result)
+                                    $('#baseFile').val(result.fileName)
+                                }
+                            });
+                        }else if (nowfile=="sqcn"){
+                            $.ajax({
+                                type: "post",
+                                url: ctx + "common/upload",
+                                data: formData,
+                                cache: false,
+                                contentType: false,
+                                processData: false,
+                                dataType: 'json',
+                                success: function (result) {
+                                    console.log(result)
+                                    $('#chengnuoshu').val(result.fileName)
+                                }
+                            });
+                        }
+
+
                     } else if (code == -1) {
                         Toast('errs', '摄像头未打开拍照失败');
                     } else {
@@ -750,19 +782,7 @@
         formData.append("file", fileOfBlob);
         return formData
     }
-var nowfile=""
-    function selTr(e) {
-        nowfile=$(e).attr("data-id")
-       if(nowfile=="yyzz"){
-           $("#yyzz").show()
-           $("#sqcn").hide()
-       }else{
-           $("#yyzz").hide()
-           $("#sqcn").show()
-       }
-
 
-    }
     function goBack() {
         history.go(-2);
     }

yinet-admin/src/main/resources/templates/rlzy/print/dylist.html

@@ -216,12 +216,6 @@
 								'content': '开始打印...',
 								'closeTime': 2000,
 							})
-							if(type=="zhengben"){
-								$('#printz'+pid).attr("disabled", true).removeAttr("onclick");
-							}
-							if(type=="fuben"){
-								$('#printf'+pid).attr("disabled", true).removeAttr("onclick");
-							}
 							$.ajax({
 								url: "/rlzy/print/updateApply",
 								type: "post",
@@ -286,6 +280,7 @@
             });
         }
         function printZPapers (id){
+			$('#printz'+id).attr("disabled", true).removeAttr("onclick");
         	var filepath="";
 			$.ajax({
 				url: "/rlzy/print/getSapplyData",
@@ -355,6 +350,7 @@
 
         }
 		function printFPapers (id){
+			$('#printf'+id).attr("disabled", true).removeAttr("onclick");
 			var filepath="";
 			$.ajax({
 				url: "/rlzy/print/getSapplyData",