From e77cab9228f3b8967bf526b6b47389ad2dc807c0 Mon Sep 17 00:00:00 2001
From: ndbs <nabs@LAPTOP-FJ5VQJ6J>
Date: Wed, 22 Dec 2021 12:02:35 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=AB=E6=8F=8F=E4=BA=8C=E7=BB=B4=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Views/StuVolunteer/FormApply.cshtml       | 673 ++++++++++--------
 .../Views/StuVolunteer/IndexAccount.js        |  10 +-
 .../Views/StuVolunteer/Link.cshtml            |  11 +-
 .../Views/StuVolunteer/QRCode.cshtml          |  19 +-
 .../Views/StuVolunteer/Search.cshtml          |  17 +-
 .../Views/StuVolunteer/SearchResult.cshtml    |  32 +-
 .../Views/StuVolunteer/server.js              |  14 +
 .../Learun.Application.Web.csproj             |   2 +-
 8 files changed, 424 insertions(+), 354 deletions(-)
 create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuVolunteer/server.js

diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuVolunteer/FormApply.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuVolunteer/FormApply.cshtml
index feccb5058..ad4b0851d 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuVolunteer/FormApply.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuVolunteer/FormApply.cshtml	
@@ -115,132 +115,148 @@
                 <form class="layui-form" action="">
                     <!--  / chickForm_sec1  -->
                     <div class="chickForm_sec1">
+                        @*<div class="chickInput">
+                <span class="chickInputLable"><span>*</span> 姓名</span>
+                <input type="text" id="StuName" name="StuName" lay-verify="required" placeholder="请输入姓名" class="layui-input">
+            </div>*@
+
                         <div class="chickInput">
-                            <span class="chickInputLable"><span>*</span> 姓名</span>
-                            <input type="text" id="StuName" name="StuName" lay-verify="required" placeholder="请输入姓名" class="layui-input">
-                        </div>
-                        <div class="chickInput">
-                            <span class="chickInputLable"><span>*</span> 性别</span>
+                            <span class="chickInputLable"><span>*</span> 专业一 </span>
                             <div class="chickInputBox chickInputBoxs">
-                                <select id="Gender" name="Gender" lay-verify="">
-                                    <option value="">请选择</option>
-                                    <option value="true">男</option>
-                                    <option value="false">女</option>
-                                </select>
-                            </div>
-                        </div>
-                        <div class="chickInput">
-                            <span class="chickInputLable">民族</span>
-                            <div class="chickInputBox">
-                                <select id="Nationals" name="Nationals" lay-verify="">
+                                <select id="MajorOne" name="MajorOne" lay-verify="">
                                     <option value="">请选择</option>
                                 </select>
                             </div>
                         </div>
                         <div class="chickInput">
-                            <span class="chickInputLable"><span>*</span> 住址</span>
-                            <input type="text" id="HomeAddress" name="HomeAddress" lay-verify="required" placeholder="请输入住址" class="layui-input">
-                        </div>
-                        <div class="chickInput">
-                            <span class="chickInputLable"><span>*</span> 身份证号</span>
-                            <input type="text" id="IDCard" name="IDCard" lay-verify="required" placeholder="请输入身份证号" class="layui-input">
-                        </div>
-                        <div class="chickInput">
-                            <span class="chickInputLable"><span>*</span> 手机号</span>
-                            <input type="text" id="StuMobile" name="StuMobile" lay-verify="required" placeholder="请输入手机号" class="layui-input">
-                        </div>
-                        <div class="chickInput">
-                            <span class="chickInputLable"><span>*</span> 毕业学校</span>
-                            <input type="text" id="FromSchool" name="FromSchool" lay-verify="required" placeholder="请输入毕业学校" class="layui-input">
-                        </div>
-                        <div class="chickInput">
-                            <span class="chickInputLable"><span>*</span> 中考总分</span>
-                            <input type="number" id="MidTermExam" name="MidTermExam" lay-verify="required" placeholder="请输入中考总分" class="layui-input">
-                        </div>
-                        <div class="chickInput">
-                            <span class="chickInputLable"> 特长</span>
-                            <input type="text" id="Specialty" name="Specialty" placeholder="请输入特长" class="layui-input">
-                        </div>
-                        <div class="chickInput">
-                            <span class="chickInputLable"><span>*</span> 地市</span>
+                            <span class="chickInputLable"><span>*</span> 专业二 </span>
                             <div class="chickInputBox chickInputBoxs">
-                                <select id="City" name="City" lay-verify="" lay-filter="City">
+                                <select id="MajorTwo" name="MajorTwo" lay-verify="">
                                     <option value="">请选择</option>
                                 </select>
                             </div>
-                            @*<input type="text" id="City" name="City" lay-verify="required" placeholder="请输入地市" class="layui-input">*@
                         </div>
                         <div class="chickInput">
-                            <span class="chickInputLable"><span>*</span> 县区</span>
+                            <span class="chickInputLable"><span>*</span> 专业三 </span>
                             <div class="chickInputBox chickInputBoxs">
-                                <select id="County" name="County" lay-verify="" lay-filter="County">
+                                <select id="MajorThree" name="MajorThree" lay-verify="">
                                     <option value="">请选择</option>
                                 </select>
                             </div>
-                            @*<input type="text" id="County" name="County" lay-verify="required" placeholder="请输入县区" class="layui-input">*@
                         </div>
                         <div class="chickInput">
-                            <span class="chickInputLable"><span>*</span> 专业</span>
+                            <span class="chickInputLable"><span>*</span> 服从安排</span>
                             <div class="chickInputBox chickInputBoxs">
-                                <select id="MajorNo" name="MajorNo" lay-verify="">
+                                <select id="Gender" name="Gender" lay-verify="">
                                     <option value="">请选择</option>
+                                    <option value="true">是</option>
+                                    <option value="false">否</option>
                                 </select>
                             </div>
                         </div>
-                        <div class="chickInput">
-                            <span class="chickInputLable">身份证正面照片</span>
-                            <div class="chickInputBox">
-                                <div class="layui-upload-list UploadFile" id="IdCardPtoUpload1">
-                                    <img src="~/Content/images/chick1.png" class="layui-upload-img" />
-                                    <div>选择</div>
-                                </div>
-                            </div>
-                        </div>
-                        <div class="chickInput" hidden>
-                            <span class="chickInputLable" hidden><span>*</span> 身份证正面照片</span>
-                            <input type="text" id="IdCardPto1" name="IdCardPto1" class="layui-input">
-                        </div>
+                        @*
+            <div class="chickInput">
+                <span class="chickInputLable">民族</span>
+                <div class="chickInputBox">
+                    <select id="Nationals" name="Nationals" lay-verify="">
+                        <option value="">请选择</option>
+                    </select>
+                </div>
+            </div>
+            <div class="chickInput">
+                <span class="chickInputLable"><span>*</span> 住址</span>
+                <input type="text" id="HomeAddress" name="HomeAddress" lay-verify="required" placeholder="请输入住址" class="layui-input">
+            </div>
+            <div class="chickInput">
+                <span class="chickInputLable"><span>*</span> 身份证号</span>
+                <input type="text" id="IDCard" name="IDCard" lay-verify="required" placeholder="请输入身份证号" class="layui-input">
+            </div>
+            <div class="chickInput">
+                <span class="chickInputLable"><span>*</span> 手机号</span>
+                <input type="text" id="StuMobile" name="StuMobile" lay-verify="required" placeholder="请输入手机号" class="layui-input">
+            </div>
+            <div class="chickInput">
+                <span class="chickInputLable"><span>*</span> 毕业学校</span>
+                <input type="text" id="FromSchool" name="FromSchool" lay-verify="required" placeholder="请输入毕业学校" class="layui-input">
+            </div>
+            <div class="chickInput">
+                <span class="chickInputLable"><span>*</span> 中考总分</span>
+                <input type="number" id="MidTermExam" name="MidTermExam" lay-verify="required" placeholder="请输入中考总分" class="layui-input">
+            </div>
+            <div class="chickInput">
+                <span class="chickInputLable"> 特长</span>
+                <input type="text" id="Specialty" name="Specialty" placeholder="请输入特长" class="layui-input">
+            </div>
+            <div class="chickInput">
+                <span class="chickInputLable"><span>*</span> 地市</span>
+                <div class="chickInputBox chickInputBoxs">
+                    <select id="City" name="City" lay-verify="" lay-filter="City">
+                        <option value="">请选择</option>
+                    </select>
+                </div>
+            </div>
+            <div class="chickInput">
+                <span class="chickInputLable"><span>*</span> 县区</span>
+                <div class="chickInputBox chickInputBoxs">
+                    <select id="County" name="County" lay-verify="" lay-filter="County">
+                        <option value="">请选择</option>
+                    </select>
+                </div>
+            </div>
+            <div class="chickInput">
+                <span class="chickInputLable">身份证正面照片</span>
+                <div class="chickInputBox">
+                    <div class="layui-upload-list UploadFile" id="IdCardPtoUpload1">
+                        <img src="~/Content/images/chick1.png" class="layui-upload-img" />
+                        <div>选择</div>
+                    </div>
+                </div>
+            </div>
+            <div class="chickInput" hidden>
+                <span class="chickInputLable" hidden><span>*</span> 身份证正面照片</span>
+                <input type="text" id="IdCardPto1" name="IdCardPto1" class="layui-input">
+            </div>
 
-                        <div class="chickInput">
-                            <span class="chickInputLable">身份证反面照片</span>
-                            <div class="chickInputBox">
-                                <div class="layui-upload-list UploadFile" id="IdCardPtoUpload2">
-                                    <img src="~/Content/images/chick1.png" class="layui-upload-img" />
-                                    <div>选择</div>
-                                </div>
-                            </div>
-                        </div>
-                        <div class="chickInput" hidden>
-                            <span class="chickInputLable" hidden><span>*</span> 身份证反面照片</span>
-                            <input type="text" id="IdCardPto2" name="IdCardPto2" class="layui-input">
-                        </div>
-                        <div class="chickInput">
-                            <span class="chickInputLable">初中毕业证</span>
-                            <div class="chickInputBox">
-                                <div class="layui-upload-list" id="chickUpload">
-                                    <img src="~/Content/images/chick1.png" class="layui-upload-img" />
-                                    <div>选择</div>
-                                </div>
-                            </div>
-                        </div>
-                        <div class="chickInput" hidden>
-                            <span class="chickInputLable" hidden><span>*</span> 初中毕业证照片</span>
-                            <input type="text" id="MidDiplomaPto" name="MidDiplomaPto" class="layui-input">
-                        </div>
+            <div class="chickInput">
+                <span class="chickInputLable">身份证反面照片</span>
+                <div class="chickInputBox">
+                    <div class="layui-upload-list UploadFile" id="IdCardPtoUpload2">
+                        <img src="~/Content/images/chick1.png" class="layui-upload-img" />
+                        <div>选择</div>
+                    </div>
+                </div>
+            </div>
+            <div class="chickInput" hidden>
+                <span class="chickInputLable" hidden><span>*</span> 身份证反面照片</span>
+                <input type="text" id="IdCardPto2" name="IdCardPto2" class="layui-input">
+            </div>
+            <div class="chickInput">
+                <span class="chickInputLable">初中毕业证</span>
+                <div class="chickInputBox">
+                    <div class="layui-upload-list" id="chickUpload">
+                        <img src="~/Content/images/chick1.png" class="layui-upload-img" />
+                        <div>选择</div>
+                    </div>
+                </div>
+            </div>
+            <div class="chickInput" hidden>
+                <span class="chickInputLable" hidden><span>*</span> 初中毕业证照片</span>
+                <input type="text" id="MidDiplomaPto" name="MidDiplomaPto" class="layui-input">
+            </div>
 
-                        <div class="chickInput">
-                            <span class="chickInputLable">中考成绩截图</span>
-                            <div class="chickInputBox">
-                                <div class="layui-upload-list UploadFile" id="MidAchievementUpload">
-                                    <img src="~/Content/images/chick1.png" class="layui-upload-img" />
-                                    <div>选择</div>
-                                </div>
-                            </div>
-                        </div>
-                        <div class="chickInput" hidden>
-                            <span class="chickInputLable" hidden><span>*</span> 中考成绩照片</span>
-                            <input type="text" id="MidAchievementPto" name="MidAchievementPto" class="layui-input">
-                        </div>
+            <div class="chickInput">
+                <span class="chickInputLable">中考成绩截图</span>
+                <div class="chickInputBox">
+                    <div class="layui-upload-list UploadFile" id="MidAchievementUpload">
+                        <img src="~/Content/images/chick1.png" class="layui-upload-img" />
+                        <div>选择</div>
+                    </div>
+                </div>
+            </div>
+            <div class="chickInput" hidden>
+                <span class="chickInputLable" hidden><span>*</span> 中考成绩照片</span>
+                <input type="text" id="MidAchievementPto" name="MidAchievementPto" class="layui-input">
+            </div>*@
 
                         <div class="chickInput">
                             <span class="chickInputLable"> 备注</span>
@@ -248,7 +264,10 @@
                         </div>
                     </div>
                     <!--  / chickForm_sec1  -->
-                    <div class="chickBtn" lay-submit lay-filter="*">提交</div>
+                    <div class="chickBtn" lay-submit lay-filter="*">保存草稿</div>
+                    <div class="chickBtn" lay-submit lay-filter="*">保存并提交</div>
+                    @*<div class="submitBtn" lay-submit lay-filter="*">提交</div>
+                    <div class="saveBtn" lay-submit lay-filter="*">保存草稿</div>*@
                 </form>
             </div>
         </div>
@@ -261,27 +280,28 @@
     <script src="~/PhonePage/server.js"></script>
     <script>
         var today = formatDateTimesM();
-        var EmpNo = request('EmpNo'); //'XCMY1002';
+        //var CardId = request('IDCARD'); //'XCMY1002';
         layui.use(['form', 'laydate', 'upload'], function () {
             var form = layui.form;
             //登录按钮点击
             form.on('submit(*)', function (data) {
-                if (!$('#IdCardPto1').val() || !$('#IdCardPto2').val()) {
-                    alert('请上传身份证照片！');
-                    return;
-                }
-                if (!$('#MidDiplomaPto').val()) {
-                    alert('请上传初中毕业证照片！');
-                    return;
-                }
-                if (!$('#MidAchievementPto').val()) {
-                    alert('请上传中考成绩截图！');
-                    return;
-                }
+                //if (!$('#IdCardPto1').val() || !$('#IdCardPto2').val()) {
+                //    alert('请上传身份证照片！');
+                //    return;
+                //}
+                //if (!$('#MidDiplomaPto').val()) {
+                //    alert('请上传初中毕业证照片！');
+                //    return;
+                //}
+                //if (!$('#MidAchievementPto').val()) {
+                //    alert('请上传中考成绩截图！');
+                //    return;
+                //}
+
                 var strEntity = JSON.stringify(data.field);
-                //strEntity.EmpNo = EmpNo;
+                strEntity.CardId = CardId;
                 $.ajax({
-                    url: '/EducationalAdministration/StuEnrollPhone/SaveForm?keyValue=&EmpNo=' + EmpNo,
+                    url: '/EducationalAdministration/StuVolunteer/DraftForm?keyValue=&IDCARD=' + CardId,
                     data: { strEntity: strEntity },
                     type: "POST",
                     dataType: "json",
@@ -290,7 +310,7 @@
                     success: function (data) {
                         if (data.code == 200) {
                             alert('报名成功，请等待考试通知');
-                            location.href = '/EducationalAdministration/StuEnrollPhone/Link?EmpNo=' + EmpNo;
+                            location.href = '/EducationalAdministration/StuVolunteer/Link?CardId=' + CardId;
                         } else {
                             return alert(data.data);
                         }
@@ -302,6 +322,29 @@
                     complete: function () {
                     }
                 });
+                //保存并提交
+                //$.ajax({
+                //    url: '/EducationalAdministration/StuVolunteer/SubmitForm?keyValue=&IDCARD=' + CardId,
+                //    data: { strEntity: strEntity },
+                //    type: "POST",
+                //    dataType: "json",
+                //    async: true,
+                //    cache: false,
+                //    success: function (data) {
+                //        if (data.code == 200) {
+                //            alert('报名成功，请等待考试通知');
+                //            location.href = '/EducationalAdministration/StuVolunteer/Link?CardId=' + CardId;
+                //        } else {
+                //            return alert(data.data);
+                //        }
+                //    },
+                //    error: function (XMLHttpRequest, textStatus, errorThrown) {
+                //    },
+                //    beforeSend: function () {
+                //    },
+                //    complete: function () {
+                //    }
+                //});
                 return false; //阻止表单跳转。如果需要表单跳转，去掉这段即可。
 
             });
@@ -316,168 +359,168 @@
 
             var upload = layui.upload;
 
-            //初中毕业证
-            var uploadInst = upload.render({
-                elem: '#chickUpload',
-                url: '/EducationalAdministration/EmpInfoEnternal/UploadImg',
-                exts: 'jpg|png|gif|',
-                multiple: false,
-                before: function (obj) {
-                    //预读本地文件示例，不支持ie8
-                    obj.preview(function (index, file, result) {
-                        $('#chickUpload').html('<img src="' + result + '" alt="">') //图片链接（base64）
-                    });
-                },
-                done: function (res) {
-                    //如果上传失败
-                    if (res.code != 200) {
-                        return layer.msg('上传失败');
-                    } else {
-                        $("#MidDiplomaPto").val(res.data.folderId)
-                    }
-                    //上传成功
-                },
-                error: function () {
-                    //演示失败状态，并实现重传
-                    var demoText = $('#demoText');
-                    demoText.html('<span style="color: #FF5722;">上传失败</span> <a class="layui-btn layui-btn-xs demo-reload">重试</a>');
-                    demoText.find('.demo-reload').on('click', function () {
-                        uploadInst.upload();
-                    });
-                }
-            });
-
-            //身份证正面照片
-            var uploadIdCard = upload.render({
-                elem: '#IdCardPtoUpload1',
-                url: '/EducationalAdministration/EmpInfoEnternal/UploadImg',
-                exts: 'jpg|png|gif|',
-                multiple: true,
-                before: function (obj) {
-                    //预读本地文件示例，不支持ie8
-                    obj.preview(function (index, file, result) {
-                        $('#IdCardPtoUpload1').html('<img src="' + result + '" alt="">') //图片链接（base64）
-                    });
-                },
-                done: function (res) {
-                    //如果上传失败
-                    if (res.code != 200) {
-                        return layer.msg('上传失败');
-                    } else {
-                        $("#IdCardPto1").val(res.data.folderId)
-                    }
-                    //上传成功
-                },
-                error: function () {
-                    //演示失败状态，并实现重传
-                    var demoText = $('#demoText');
-                    demoText.html('<span style="color: #FF5722;">上传失败</span> <a class="layui-btn layui-btn-xs demo-reload">重试</a>');
-                    demoText.find('.demo-reload').on('click', function () {
-                        uploadIdCard.upload();
-                    });
-                }
-            });
-
-            //身份证反面照片
-            var uploadIdCard = upload.render({
-                elem: '#IdCardPtoUpload2',
-                url: '/EducationalAdministration/EmpInfoEnternal/UploadImg',
-                exts: 'jpg|png|gif|',
-                multiple: true,
-                before: function (obj) {
-                    //预读本地文件示例，不支持ie8
-                    obj.preview(function (index, file, result) {
-                        $('#IdCardPtoUpload2').html('<img src="' + result + '" alt="">') //图片链接（base64）
-                    });
-                },
-                done: function (res) {
-                    //如果上传失败
-                    if (res.code != 200) {
-                        return layer.msg('上传失败');
-                    } else {
-                        $("#IdCardPto2").val(res.data.folderId)
-                    }
-                    //上传成功
-                },
-                error: function () {
-                    //演示失败状态，并实现重传
-                    var demoText = $('#demoText');
-                    demoText.html('<span style="color: #FF5722;">上传失败</span> <a class="layui-btn layui-btn-xs demo-reload">重试</a>');
-                    demoText.find('.demo-reload').on('click', function () {
-                        uploadIdCard.upload();
-                    });
-                }
-            });
+            ////初中毕业证
+            //var uploadInst = upload.render({
+            //    elem: '#chickUpload',
+            //    url: '/EducationalAdministration/EmpInfoEnternal/UploadImg',
+            //    exts: 'jpg|png|gif|',
+            //    multiple: false,
+            //    before: function (obj) {
+            //        //预读本地文件示例，不支持ie8
+            //        obj.preview(function (index, file, result) {
+            //            $('#chickUpload').html('<img src="' + result + '" alt="">') //图片链接（base64）
+            //        });
+            //    },
+            //    done: function (res) {
+            //        //如果上传失败
+            //        if (res.code != 200) {
+            //            return layer.msg('上传失败');
+            //        } else {
+            //            $("#MidDiplomaPto").val(res.data.folderId)
+            //        }
+            //        //上传成功
+            //    },
+            //    error: function () {
+            //        //演示失败状态，并实现重传
+            //        var demoText = $('#demoText');
+            //        demoText.html('<span style="color: #FF5722;">上传失败</span> <a class="layui-btn layui-btn-xs demo-reload">重试</a>');
+            //        demoText.find('.demo-reload').on('click', function () {
+            //            uploadInst.upload();
+            //        });
+            //    }
+            //});
+
+            ////身份证正面照片
+            //var uploadIdCard = upload.render({
+            //    elem: '#IdCardPtoUpload1',
+            //    url: '/EducationalAdministration/EmpInfoEnternal/UploadImg',
+            //    exts: 'jpg|png|gif|',
+            //    multiple: true,
+            //    before: function (obj) {
+            //        //预读本地文件示例，不支持ie8
+            //        obj.preview(function (index, file, result) {
+            //            $('#IdCardPtoUpload1').html('<img src="' + result + '" alt="">') //图片链接（base64）
+            //        });
+            //    },
+            //    done: function (res) {
+            //        //如果上传失败
+            //        if (res.code != 200) {
+            //            return layer.msg('上传失败');
+            //        } else {
+            //            $("#IdCardPto1").val(res.data.folderId)
+            //        }
+            //        //上传成功
+            //    },
+            //    error: function () {
+            //        //演示失败状态，并实现重传
+            //        var demoText = $('#demoText');
+            //        demoText.html('<span style="color: #FF5722;">上传失败</span> <a class="layui-btn layui-btn-xs demo-reload">重试</a>');
+            //        demoText.find('.demo-reload').on('click', function () {
+            //            uploadIdCard.upload();
+            //        });
+            //    }
+            //});
+
+            ////身份证反面照片
+            //var uploadIdCard = upload.render({
+            //    elem: '#IdCardPtoUpload2',
+            //    url: '/EducationalAdministration/EmpInfoEnternal/UploadImg',
+            //    exts: 'jpg|png|gif|',
+            //    multiple: true,
+            //    before: function (obj) {
+            //        //预读本地文件示例，不支持ie8
+            //        obj.preview(function (index, file, result) {
+            //            $('#IdCardPtoUpload2').html('<img src="' + result + '" alt="">') //图片链接（base64）
+            //        });
+            //    },
+            //    done: function (res) {
+            //        //如果上传失败
+            //        if (res.code != 200) {
+            //            return layer.msg('上传失败');
+            //        } else {
+            //            $("#IdCardPto2").val(res.data.folderId)
+            //        }
+            //        //上传成功
+            //    },
+            //    error: function () {
+            //        //演示失败状态，并实现重传
+            //        var demoText = $('#demoText');
+            //        demoText.html('<span style="color: #FF5722;">上传失败</span> <a class="layui-btn layui-btn-xs demo-reload">重试</a>');
+            //        demoText.find('.demo-reload').on('click', function () {
+            //            uploadIdCard.upload();
+            //        });
+            //    }
+            //});
             //中考成绩截图
-            var uploadMidAchieve = upload.render({
-                elem: '#MidAchievementUpload',
-                url: '/EducationalAdministration/EmpInfoEnternal/UploadImg',
-                before: function (obj) {
-                    //预读本地文件示例，不支持ie8
-                    obj.preview(function (index, file, result) {
-                        $('#MidAchievementUpload').html('<img src="' + result + '" alt="">') //图片链接（base64）
-                    });
-                },
-                done: function (res) {
-                    //如果上传失败
-                    if (res.code != 200) {
-                        return layer.msg('上传失败');
-                    } else {
-                        $("#MidAchievementPto").val(res.data.folderId);
-                    }
-                    //上传成功
-                },
-                error: function () {
-                    //演示失败状态，并实现重传
-                    var demoText = $('#demoText');
-                    demoText.html('<span style="color: #FF5722;">上传失败</span> <a class="layui-btn layui-btn-xs demo-reload">重试</a>');
-                    demoText.find('.demo-reload').on('click', function () {
-                        uploadMidAchieve.upload();
-                    });
-                }
-            });
-
-            //监听地市
-            form.on('select(City)', function (data) {
-                //绑定县区
-                $.ajax({
-                    url: "/EducationalAdministration/EmpInfoEnternal/GetMap?code=" + "DIC_AREA" + "&where=" + "aparent='" + data.value + "'",
-                    async: false,
-                    success: function (msg) {
-                        var companys = $.parseJSON(msg).data.data;
-                        var str = '<option value="">请选择</option>';
-                        $.each(companys,
-                            function (i, item) {
-                                str += '<option value="' + item.acode + '">' + item.aname + '</option>';
-                            });
-                        $("#County").html(str);
-                    },
-                });
-                //绑定专业
-
-
-                form.render();
-            });
-            //监听县区
-            form.on('select(County)', function (data) {
-                //绑定专业
-                $.ajax({
-                    url: "/EducationalAdministration/EmpInfoEnternal/GetMap?code=" + "CdMajorInfo" + "&where=" + "Area='" + data.value + "'",
-                    async: false,
-                    success: function (msg) {
-                        var companys = $.parseJSON(msg).data.data;
-                        var str = '<option value="">请选择</option>';
-                        $.each(companys,
-                            function (i, item) {
-                                str += '<option value="' + item.id + '">' + item.majorname + '</option>'
-                            })
-                        $("#MajorNo").html(str);
-                    },
-                });
-
-
-                form.render();
-            });
+            //var uploadMidAchieve = upload.render({
+            //    elem: '#MidAchievementUpload',
+            //    url: '/EducationalAdministration/EmpInfoEnternal/UploadImg',
+            //    before: function (obj) {
+            //        //预读本地文件示例，不支持ie8
+            //        obj.preview(function (index, file, result) {
+            //            $('#MidAchievementUpload').html('<img src="' + result + '" alt="">') //图片链接（base64）
+            //        });
+            //    },
+            //    done: function (res) {
+            //        //如果上传失败
+            //        if (res.code != 200) {
+            //            return layer.msg('上传失败');
+            //        } else {
+            //            $("#MidAchievementPto").val(res.data.folderId);
+            //        }
+            //        //上传成功
+            //    },
+            //    error: function () {
+            //        //演示失败状态，并实现重传
+            //        var demoText = $('#demoText');
+            //        demoText.html('<span style="color: #FF5722;">上传失败</span> <a class="layui-btn layui-btn-xs demo-reload">重试</a>');
+            //        demoText.find('.demo-reload').on('click', function () {
+            //            uploadMidAchieve.upload();
+            //        });
+            //    }
+            //});
+
+            ////监听地市
+            //form.on('select(City)', function (data) {
+            //    //绑定县区
+            //    $.ajax({
+            //        url: "/EducationalAdministration/EmpInfoEnternal/GetMap?code=" + "DIC_AREA" + "&where=" + "aparent='" + data.value + "'",
+            //        async: false,
+            //        success: function (msg) {
+            //            var companys = $.parseJSON(msg).data.data;
+            //            var str = '<option value="">请选择</option>';
+            //            $.each(companys,
+            //                function (i, item) {
+            //                    str += '<option value="' + item.acode + '">' + item.aname + '</option>';
+            //                });
+            //            $("#County").html(str);
+            //        },
+            //    });
+            //    //绑定专业
+
+
+            //    form.render();
+            //});
+            ////监听县区
+            //form.on('select(County)', function (data) {
+            //    //绑定专业
+            //    $.ajax({
+            //        url: "/EducationalAdministration/EmpInfoEnternal/GetMap?code=" + "CdMajorInfo" + "&where=" + "Area='" + data.value + "'",
+            //        async: false,
+            //        success: function (msg) {
+            //            var companys = $.parseJSON(msg).data.data;
+            //            var str = '<option value="">请选择</option>';
+            //            $.each(companys,
+            //                function (i, item) {
+            //                    str += '<option value="' + item.id + '">' + item.majorname + '</option>'
+            //                })
+            //            $("#MajorNo").html(str);
+            //        },
+            //    });
+
+
+            //    form.render();
+            //});
         });
         $(window).load(function () {
             //$('.chickInputBoxs input').attr('lay-verify', 'required');
@@ -492,52 +535,78 @@
                         function (i, item) {
                             str += '<option value="' + item.id + '">' + item.majorname + '</option>'
                         })
-                    $("#MajorNo").html(str);
+                    $("#MajorOne").html(str);
                 },
             });
-
-            //民族
             $.ajax({
-                url: "/EducationalAdministration/EmpInfoEnternal/GetMap?code=" + "BCdNationality",
+                url: "/EducationalAdministration/EmpInfoEnternal/GetMap?code=" + "CdMajorInfo",
                 async: false,
                 success: function (msg) {
                     var companys = $.parseJSON(msg).data.data;
                     var str = '<option value="">请选择</option>';
                     $.each(companys,
                         function (i, item) {
-                            str += '<option value="' + item.nationalityno + '">' + item.nationality + '</option>'
+                            str += '<option value="' + item.id + '">' + item.majorname + '</option>'
                         })
-                    $("#Nationals").html(str);
+                    $("#MajorTwo").html(str);
                 },
             });
-            //地市
             $.ajax({
-                url: "/EducationalAdministration/EmpInfoEnternal/GetMap?code=" + "DIC_CITY" + "&where=" + "cparent='650000'",
+                url: "/EducationalAdministration/EmpInfoEnternal/GetMap?code=" + "CdMajorInfo",
                 async: false,
                 success: function (msg) {
                     var companys = $.parseJSON(msg).data.data;
                     var str = '<option value="">请选择</option>';
                     $.each(companys,
                         function (i, item) {
-                            str += '<option value="' + item.ccode + '">' + item.cname + '</option>'
+                            str += '<option value="' + item.id + '">' + item.majorname + '</option>'
                         })
-                    $("#City").html(str);
-                },
-            });
-            //县区
-            $.ajax({
-                url: "/EducationalAdministration/EmpInfoEnternal/GetMap?code=" + "DIC_AREA",
-                async: false,
-                success: function (msg) {
-                    var companys = $.parseJSON(msg).data.data;
-                    var str = '<option value="">请选择</option>';
-                    $.each(companys,
-                        function (i, item) {
-                            str += '<option value="' + item.acode + '">' + item.aname + '</option>';
-                        });
-                    $("#County").html(str);
+                    $("#MajorThree").html(str);
                 },
             });
+
+            ////民族
+            //$.ajax({
+            //    url: "/EducationalAdministration/EmpInfoEnternal/GetMap?code=" + "BCdNationality",
+            //    async: false,
+            //    success: function (msg) {
+            //        var companys = $.parseJSON(msg).data.data;
+            //        var str = '<option value="">请选择</option>';
+            //        $.each(companys,
+            //            function (i, item) {
+            //                str += '<option value="' + item.nationalityno + '">' + item.nationality + '</option>'
+            //            })
+            //        $("#Nationals").html(str);
+            //    },
+            //});
+            ////地市
+            //$.ajax({
+            //    url: "/EducationalAdministration/EmpInfoEnternal/GetMap?code=" + "DIC_CITY" + "&where=" + "cparent='650000'",
+            //    async: false,
+            //    success: function (msg) {
+            //        var companys = $.parseJSON(msg).data.data;
+            //        var str = '<option value="">请选择</option>';
+            //        $.each(companys,
+            //            function (i, item) {
+            //                str += '<option value="' + item.ccode + '">' + item.cname + '</option>'
+            //            })
+            //        $("#City").html(str);
+            //    },
+            //});
+            ////县区
+            //$.ajax({
+            //    url: "/EducationalAdministration/EmpInfoEnternal/GetMap?code=" + "DIC_AREA",
+            //    async: false,
+            //    success: function (msg) {
+            //        var companys = $.parseJSON(msg).data.data;
+            //        var str = '<option value="">请选择</option>';
+            //        $.each(companys,
+            //            function (i, item) {
+            //                str += '<option value="' + item.acode + '">' + item.aname + '</option>';
+            //            });
+            //        $("#County").html(str);
+            //    },
+            //});
             renderForm();
 
         });
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuVolunteer/IndexAccount.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuVolunteer/IndexAccount.js
index 3d0e8a7cc..a8927cd8a 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuVolunteer/IndexAccount.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuVolunteer/IndexAccount.js	
@@ -24,19 +24,17 @@ var bootstrap = function ($, learun) {
 
             //生成二维码
             $("#lr_qrcode").on('click', function () {
-                var keyValue = $('#gridtable').jfGridValue('ID');
-                var StuName = $('#gridtable').jfGridValue('StuName');
-                if (learun.checkrow(keyValue)) {
+                //if (learun.checkrow(keyValue)) {
                     learun.layerForm({
                         id: 'formcard',
-                        title: '生成二维码',
-                        url: top.$.rootUrl + '/EducationalAdministration/StuVolunteer/QRCode?keyValue=' + keyValue + '&StuName=' + escape(StuName),
+                        title: '扫描二维码',
+                        url: top.$.rootUrl + '/EducationalAdministration/StuVolunteer/Link',
                         width: 700,
                         height: 300,
                         btn: null,
                         end: function () { refreshGirdData(); }
                     });
-                }
+                //}
 
             })
             //// 录取
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuVolunteer/Link.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuVolunteer/Link.cshtml
index bde8452c7..fe560c26b 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuVolunteer/Link.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuVolunteer/Link.cshtml	
@@ -14,21 +14,20 @@
     <div>
         <a href="" id="stuenroll">报名</a>
         <br /><br />
-        <a href="" id="loc">查询考试地点及时间</a><br /><br />
+        @*<a href="" id="loc">查询考试地点及时间</a><br /><br />*@
         <a href="" id="res">查询录取结果</a>
     </div>
     <script src="/Content/jquery/jquery-1.10.2.min.js"></script>
-<script src="~/PhonePage/server.js"></script>
-
+    <script src="~/Areas/EducationalAdministration/Views/StuVolunteer/server.js"></script>
 <script>
     $(function() {
         var EmpNo = request('EmpNo');
         //报名
-        $('#stuenroll').attr('href', '/EducationalAdministration/StuEnrollPhone/Form?EmpNo=' + EmpNo);
+        $('#stuenroll').attr('href', '/EducationalAdministration/StuVolunteer/FormApply?EmpNo=' + EmpNo);
         //查询考试地点及时间
-        $('#loc').attr('href', '/EducationalAdministration/StuEnrollPhone/Search?type=1');
+        //$('#loc').attr('href', '/EducationalAdministration/StuVolunteer/Search?type=1');
         //查询录取结果
-        $('#res').attr('href', '/EducationalAdministration/StuEnrollPhone/Search?type=2');
+        $('#res').attr('href', '/EducationalAdministration/StuVolunteer/Search?type=2');
     })
 
 </script>
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuVolunteer/QRCode.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuVolunteer/QRCode.cshtml
index 241abcaa5..9d7099435 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuVolunteer/QRCode.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuVolunteer/QRCode.cshtml	
@@ -8,7 +8,7 @@
     <title>CardPrint</title>
     @Html.AppendJsFile("/Content/jquery/jquery-1.10.2.min.js", "/Content/jquery/plugin/jqprint/jquery.jqprint-0.3.js")
     <script src="/Content/js/qrcode.min.js"></script>
-    <script src="~/PhonePage/server.js"></script>
+    <script src="~/Areas/EducationalAdministration/Views/StuVolunteer/server.js"></script>
     <link href="~/Content/cardprint/CardPrint.css" rel="stylesheet" />
     <script>
         function request(d) {
@@ -38,11 +38,8 @@
             width: 80,
             height: 80
         });
-        var keyValue = request('keyValue');//二维码
-        var EmpName = request('EmpName');
-        $('.qrcodeTxt').html(unescape(EmpName));
         $(function () {
-            var url = currentUrl + '/EducationalAdministration/StuEnrollPhone/Link?EmpNo=' + keyValue;
+            var url = currentUrl + '/EducationalAdministration/StuVolunteer/Link';
             
             qrcode.makeCode(url);
             //$("#btnprint").on("click", function () {
@@ -51,12 +48,12 @@
 
 
         });
-        // 打印表单
-        function AddPrintContent3() {
-            $('#btnprint').css('display', 'none')
-            window.print();
-            $('#btnprint').css('display', 'block')
-        }
+        //// 打印表单
+        //function AddPrintContent3() {
+        //    $('#btnprint').css('display', 'none')
+        //    window.print();
+        //    $('#btnprint').css('display', 'block')
+        //}
     </script>
 </body>
 
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuVolunteer/Search.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuVolunteer/Search.cshtml
index e4bb28516..d7d555c23 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuVolunteer/Search.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuVolunteer/Search.cshtml	
@@ -30,16 +30,12 @@
                     <!--  / chickForm_sec1  -->
                     <div class="chickForm_sec1">
                         <div class="chickInput">
-                            <span class="chickInputLable"><span>*</span> 姓名</span>
-                            <input type="text" id="StuName" name="StuName" lay-verify="required" placeholder="请输入姓名" class="layui-input">
+                            <span class="chickInputLable"><span>*</span> 账号</span>
+                            <input type="text" id="txtAccount" name="StuName" lay-verify="required" placeholder="请输入身份号" class="layui-input">
                         </div>
                         <div class="chickInput">
                             <span class="chickInputLable"><span>*</span> 身份证号</span>
-                            <input type="text" id="IDCard" name="IDCard" lay-verify="required" placeholder="请输入身份证号" class="layui-input">
-                        </div>
-                        <div class="chickInput">
-                            <span class="chickInputLable"><span>*</span> 手机号</span>
-                            <input type="text" id="StuMobile" name="StuMobile" lay-verify="required" placeholder="请输入手机号" class="layui-input">
+                            <input type="password" id="txtPass" name="IDCard" lay-verify="required" placeholder="请输入身份证号" class="layui-input">
                         </div>
                     </div>
                     <!--  / chickForm_sec1  -->
@@ -53,17 +49,16 @@
     <script src="~/Content/js/jquery.min.js"></script>
     <script src="~/Content/layui/layui.all.js"></script>
     <script src="~/Content/vue/vue.js"></script>
-    <script src="~/PhonePage/server.js"></script>
+    <script src="~/Areas/EducationalAdministration/Views/StuVolunteer/server.js"></script>
     <script>
         //var today = formatDateTimesM();
-        var type = request('type'); //'XCMY1002';
         layui.use(['form', 'laydate', 'upload'], function () {
             var form = layui.form;
             //按钮点击
             form.on('submit(*)', function (data) {
                 //var strEntity = JSON.stringify(data.field);
-                
-                location.href = '/EducationalAdministration/StuEnrollPhone/SearchResult?type=' + type + '&StuName=' + encodeURI(encodeURI($('#StuName').val())) + '&IDCard=' + $('#IDCard').val() + '&StuMobile=' + $('#StuMobile').val();
+                console.log(13123);
+                location.href = '/EducationalAdministration/StuVolunteer/SearchResult?type=' + type + '&StuName=' + encodeURI(encodeURI($('#StuName').val())) + '&IDCard=' + $('#IDCard').val();
                 //$.ajax({
                 //    url: '/EducationalAdministration/StuEnrollPhone/SearchForm?type=' + type,
                 //    data: { strEntity: strEntity },
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuVolunteer/SearchResult.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuVolunteer/SearchResult.cshtml
index b31a431f6..6cd316061 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuVolunteer/SearchResult.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuVolunteer/SearchResult.cshtml	
@@ -44,15 +44,15 @@
                         <div class="chickInput" id="locdiv">
                             <span class="chickInputLable"><span>*</span> 考试信息</span>
                             <div id="examDiv" readonly="readonly" style="font-size: 12px;">
-                                
-                                    
-                                    
-                                
-                                
-                                    
-                                    
-                                
-                                
+
+
+
+
+
+
+
+
+
                             </div>
                         </div>
                         <div class="chickInput" id="admdiv">
@@ -74,12 +74,10 @@
     <script src="~/Content/js/jquery.min.js"></script>
     <script src="~/Content/layui/layui.all.js"></script>
     <script src="~/Content/vue/vue.js"></script>
-    <script src="~/PhonePage/server.js"></script>
+    <script src="~/Areas/EducationalAdministration/Views/StuVolunteer/server.js"></script>
     <script>
-        var type = request('type');
         var StuName = request('StuName');
         var IDCard = request('IDCard');
-        var StuMobile = request('StuMobile');
         layui.use(['form', 'laydate', 'upload'], function () {
             var form = layui.form;
             //按钮点击
@@ -124,7 +122,7 @@
             if (type == '1') {
                 //查询考试地点及时间
                 $('#locdiv').show();
-               //$('#timediv').show();
+                //$('#timediv').show();
                 $('#admdiv').hide();;
             } else {
                 $('#admdiv').show();
@@ -133,7 +131,7 @@
             }
             //查询
             $.ajax({
-                url: '/EducationalAdministration/StuEnrollPhone/SearchForm?type=' + type,
+                url: '/EducationalAdministration/StuVolunteer/SearchForm?type=' + type,
                 data: { StuName: decodeURI(StuName), IDCard: IDCard, StuMobile: StuMobile },
                 type: "GET",
                 dataType: "json",
@@ -174,11 +172,11 @@
                                     html += '<input type="text" class="layui-input" readonly="readonly" value="' + etime + '" style="margin: -39px 0 0 40px; width: 85%;font-size: 12px;">';
                                     html += '</div>';
                                     html += '<br/>';
-                                    
+
                                 }
                             }
                             $('#examDiv').html(html);
-                        } 
+                        }
                     } else {
                         alert(data.info);
                     }
@@ -190,7 +188,7 @@
                 complete: function () {
                 }
             });
-            
+
             renderForm()
 
         })
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuVolunteer/server.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuVolunteer/server.js
new file mode 100644
index 000000000..5b87bb2ba
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuVolunteer/server.js	
@@ -0,0 +1,14 @@
+//api地址
+var serverurl = "http://localhost:31173";
+//当前项目地址
+var currentUrl = "http://192.168.50.127:12345";
+//地址栏传参
+function request(d) {
+    for (var c = location.search.slice(1).split("&"), a = 0; a < c.length; a++) {
+        var b = c[a].split("=");
+        if (b[0] == d)
+            if ("undefined" == unescape(b[1])) break;
+            else return unescape(b[1])
+    }
+    return ""
+};
\ No newline at end of file
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj b/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj
index 553f353a0..89fccd2fd 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj	
@@ -1097,7 +1097,7 @@
     <Content Include="Areas\EducationalAdministration\Views\StuVolunteer\IndexEnroll.js" />
     <Content Include="Areas\EducationalAdministration\Views\StuVolunteer\IndexLabel.js" />
     <Content Include="Areas\EducationalAdministration\Views\StuVolunteer\IndexStatus.js" />
-    <Content Include="Areas\EducationalAdministration\Views\StuVolunteer\QRCode.js" />
+    <Content Include="Areas\EducationalAdministration\Views\StuVolunteer\server.js" />
     <Content Include="Areas\EducationalAdministration\Views\Sys_ReceiveDocument\FormView.js" />
     <Content Include="Areas\EducationalAdministration\Views\Sys_ReceiveDocument\Form.cshtml" />
     <Content Include="Areas\EducationalAdministration\Views\Sys_ReceiveDocument\Form.js" />