Merge remote-tracking branch 'origin/master'

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

@@ -419,6 +419,11 @@
                         name="file"
                         type="hidden"
                 />
+                <input
+                        id="chengnuoshu"
+                        name="file"
+                        type="hidden"
+                />
 
             </form>
         </div>
@@ -433,7 +438,7 @@
                             <div style="height:810px;overflow:auto">
                                 <table class="table table-bordered">
                                     <tbody>
-                                    <tr class="info"  >
+                                    <tr class="info"  data-id="yyzz" onclick="selTr(this)">
                                         <td>
                                             1
                                         </td>
@@ -441,6 +446,14 @@
                                             <a   class="list">营业执照</a>
                                         </td>
                                     </tr>
+                                    <tr class="info" data-id="sqcn"  onclick="selTr(this)">
+                                        <td>
+                                            2
+                                        </td>
+                                        <td>
+                                            <a   class="list">申请人承诺</a>
+                                        </td>
+                                    </tr>
 
                                     </tbody>
                                 </table>
@@ -465,9 +478,12 @@
                         <div class="col-md-3" style="height:100%">
                             <h3 class="title" style="text-align:center">—— 预览 ——</h3>
                             <div id="ylDivList" style="height:810px;overflow:auto" >
-                                <div class="col-md-12 yllist"    >
+                                <div class="col-md-12 yllist"    id="yyzz" >
                                     <a id="imgBase64"> </a>
                                 </div>
+                                <div class="col-md-12 yllist"    id="sqcn" style="display:none">
+                                    <a > </a>
+                                </div>
                             </div>
                         </div>
                     </div>
@@ -734,7 +750,19 @@
         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);
     }
@@ -747,13 +775,23 @@
 
     function addImage(base64) {
         var base64 = "data:image/jpeg;base64," + base64;
-        if($("#baseFile").val()!=""&&$("#baseFile").val()!=undefined){
-            alert("请勿重复拍照")
-            return ;
+        if(nowfile=="yyzz"){
+            if($("#baseFile").val()!=""&&$("#baseFile").val()!=undefined){
+                alert("请勿重复拍照")
+                return ;
+            }
+            $("#baseFile").val(base64);
+        }else{
+            if($("#chengnuoshu").val()!=""&&$("#chengnuoshu").val()!=undefined){
+                alert("请勿重复拍照")
+                return ;
+            }
+            $("#chengnuoshu").val(base64);
         }
-        $("#baseFile").val(base64);
+
         var imghtml='<li ><i class="iconfont icon-guanbi" onClick="delImage(this)"></i><img src="'+base64+'" style="width:100%;height:200px;z-index:100;"/></li>'
-        $(".yllist").append(imghtml);
+        $("#"+nowfile).append(imghtml);
+
     }
     </script>
 </body>

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

@@ -15,6 +15,11 @@
 			    font-family:'HYSS2J';
 			    src: url('/rlzy/css/hyss2j.ttf');
 			}
+			body{
+
+				width:100%;
+				height:100%;
+			}
 			.main{
 				width:3508px;
 				height:4961px;

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

@@ -15,6 +15,11 @@
 			    font-family:'HYSS2J';
 			    src: url('/rlzy/css/hyss2j.ttf');
 			}
+			body{
+				transform: rotate(90deg);
+				width:100%;
+				height:100%;
+			}
 			.main{
 				width:3508px;
 				height:4961px;