diff --git a/WebRoot/html/ypzs/view/apply.html b/WebRoot/html/ypzs/view/apply.html
index 5650ea7..3dd1ab5 100644
--- a/WebRoot/html/ypzs/view/apply.html
+++ b/WebRoot/html/ypzs/view/apply.html
@@ -173,12 +173,12 @@
                         url: "/FengHuang/yp/save",
                         data: { "task_id": taskId, "name": fields.name, "xb": fields.xb, "sfzh": fields.sfzh, "bx_id": stageId, "address": fields.address, "father_name": fields.father_name, "mother_name": fields.mother_name, "tel": fields.tel, "uuid": imgId },
                         success: function (data) {
-                            if (data) {
+                            if (data.success) {                                
                                 window.location = "./success.html";
                             } else {
                                 layer.msg(data.message, {
                                     icon: 2,
-                                    time: 2500
+                                    time: 3000
                                 });
                             }
                         }
diff --git a/WebRoot/html/ypzs/view/taskManageAdd.html b/WebRoot/html/ypzs/view/taskManageAdd.html
index 60c12d8..552c58f 100644
--- a/WebRoot/html/ypzs/view/taskManageAdd.html
+++ b/WebRoot/html/ypzs/view/taskManageAdd.html
@@ -120,7 +120,7 @@
                         bxids += key + ","
                         limits += data.field[key] + ","
                     }
-                });              
+                });
 
 
                 $.ajax({
@@ -128,7 +128,20 @@
                     data: { "task_name": taskName, "bx_ids": bxids.substr(0, bxids.length - 1), "limits": limits.substr(0, limits.length - 1) },
                     type: 'POST',
                     success: function (result) {
-                        console.log(result);
+                        if (result.success) {
+                            layer.msg("成功！", {
+                                icon: 1,
+                                time: 1500
+                            }, function () {
+                                parent.layer.close(parent.layer.getFrameIndex(window.name));
+                                parent.parentTableRender();
+                            });
+                        } else {
+                            layer.msg(result.message, {
+                                icon: 2,
+                                time: 1000
+                            });
+                        }
                     }
                 });
 
diff --git a/WebRoot/html/ypzs/view/taskManageEdit.html b/WebRoot/html/ypzs/view/taskManageEdit.html
index 264cc50..de6ad4a 100644
--- a/WebRoot/html/ypzs/view/taskManageEdit.html
+++ b/WebRoot/html/ypzs/view/taskManageEdit.html
@@ -26,17 +26,10 @@
                     </div>
                     <font color="red" style="font-weight: bold;">*</font>
                 </div>
-
             </div>
 
 
-
-
-
-
-            <!--商品规格表-->
             <div id="fairy-spec-table"></div>
-            <!--商品库存表-->
             <div id="fairy-sku-table"></div>
 
             <div class="bottom">
@@ -61,8 +54,11 @@
             var objResData = {};
 
 
+            let taskId = GetQueryString("task_id");
+
+
             $.ajax({
-                url: "/FengHuang/yp/getTask?task_id=2",
+                url: "/FengHuang/yp/getTask?task_id=" + taskId,
                 async: false,
                 type: 'GET',
                 success: function (result) {
@@ -73,11 +69,10 @@
 
 
             $.ajax({
-                url: "/FengHuang/yp/getBx?task_id=2",
+                url: "/FengHuang/yp/getBx?task_id=" + taskId,
                 async: false,
                 type: 'GET',
                 success: function (result) {
-
                     var childs = [];
                     result.data.forEach((item) => {
                         var obj = {};
@@ -125,9 +120,6 @@
             });
 
             form.on('submit(submit)', function (data) {
-
-                layer.alert(JSON.stringify(data.field), { title: '提交的数据' });
-
                 var taskName = "";
                 var bxids = "";
                 var limits = "";
@@ -144,15 +136,38 @@
 
                 $.ajax({
                     url: "/FengHuang/yp/updateTask",
-                    data: { "task_id": 2, "task_name": taskName, "bx_ids": bxids.substr(0, bxids.length - 1), "limits": limits.substr(0, limits.length - 1) },
+                    data: { "task_id": taskId, "task_name": taskName, "bx_ids": bxids.substr(0, bxids.length - 1), "limits": limits.substr(0, limits.length - 1) },
                     type: 'POST',
                     success: function (result) {
-                        console.log(result);
+                        if (result.success) {
+                            layer.msg("成功！", {
+                                icon: 1,
+                                time: 1500
+                            }, function () {
+                                parent.layer.close(parent.layer.getFrameIndex(window.name));
+                                parent.parentTableRender();
+                            });
+                        } else {
+                            layer.msg(result.message, {
+                                icon: 2,
+                                time: 1000
+                            });
+                        }
                     }
                 });
 
                 return false;
             });
+
+
+            function GetQueryString(name, istop) {
+                var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)", "i");
+                var r = window.location.search.substr(1).match(reg);
+                if (typeof (istop) != "undefined") r = top.location.search.substr(1).match(reg);
+
+                if (r != null) return unescape(r[2]);
+                return null;
+            }
         });
     </script>
 </body>
diff --git a/WebRoot/html/ypzs/view/taskManageList.html b/WebRoot/html/ypzs/view/taskManageList.html
index 1322151..a056918 100644
--- a/WebRoot/html/ypzs/view/taskManageList.html
+++ b/WebRoot/html/ypzs/view/taskManageList.html
@@ -8,7 +8,7 @@
 </head>
 
 <body class="pear-container">
-   
+
     <div class="layui-card">
         <div class="layui-card-body">
             <table id="task-table" lay-filter="task-table"></table>
@@ -23,17 +23,18 @@
     </script>
 
     <script type="text/html" id="tableOperate">
-        {{#  if(d.is_publish === 0){ }}
-        <button class="pear-btn pear-btn-primary pear-btn-sm" lay-event="edit" title="修改"><i class="layui-icon layui-icon-edit"></i>
-        </button>
-        <button class="pear-btn pear-btn-warming pear-btn-sm" lay-event="publish" title="发布"><i class="icon pear-icon pear-icon-share"></i>
-        </button>
+        {{#  if(d.is_run === 0){ }}        
+        <button class="pear-btn pear-btn-warming pear-btn-sm" lay-event="start" title="启动"><i class="icon pear-icon pear-icon-setting"></i>
+        </button>      
         {{#  } }}
-        {{#  if(d.fill_count > 0){ }}
-        <button class="pear-btn pear-btn-primary pear-btn-sm" lay-event="taskFillInfo" title="查看填报情况"><i class="layui-icon layui-icon-form"></i>
-        </button>
+        {{#  if(d.is_run > 0){ }}
+        <button class="pear-btn pear-btn-warming pear-btn-sm" lay-event="stop" title="停止"><i class="icon pear-icon pear-icon-stop"></i>
+        </button>        
         {{#  } }}
-        
+        <button class="pear-btn pear-btn-primary pear-btn-sm" lay-event="edit" title="编辑"><i class="layui-icon layui-icon-edit"></i>
+        </button>
+        <button class="pear-btn  pear-btn-sm" lay-event="view" title="查看报名情况"><i class="layui-icon layui-icon-form"></i>
+        </button>
         <button class="pear-btn pear-btn-danger pear-btn-sm" lay-event="remove" title="删除"><i class="layui-icon layui-icon-delete"></i>
         </button>
     </script>
@@ -47,7 +48,7 @@
     </script>
 
     <script src="../component/layui/layui.js"></script>
-    <script src="../component/pear/pear.js"></script>    
+    <script src="../component/pear/pear.js"></script>
 
     <script>
         layui.use(['table', 'form', 'jquery', 'common'], function () {
@@ -60,13 +61,8 @@
                 [
                     { field: '', title: '序号', align: 'center', type: 'numbers', width: "5%" }
                     , { field: 'task_name', title: '任务名称', align: 'center' }
-                    , { field: 'module_name', title: '所用模板名称', align: 'center' }
                     , { field: 'create_time', title: '创建时间', align: 'center', width: "10%" }
-                    , { field: 'end_date', title: '结束时间', align: 'center', width: "10%" }
-                    , { field: 'all_count', title: '应填报数', align: 'center', width: "10%" }
-                    , { field: 'fill_count', title: '已填报数', align: 'center', width: "10%" }
-                    // , { field: '', title: '已填报数', align: 'center', width: "10%", templet: '#taskFill' }
-                    , { field: '', title: '发布状态', align: 'center', width: "10%", templet: getPublishText }
+                    , { field: '', title: '状态', align: 'center', width: "10%", templet: getPublishText }
                     , { field: '', title: '操作', toolbar: '#tableOperate', align: 'center', width: "15%" }
                 ]
             ]
@@ -76,7 +72,7 @@
             function tableRender() {
                 table.render({
                     elem: '#task-table',
-                    url: '/Mars/listTask',
+                    url: '/FengHuang/yp/listTask',
                     where: {
                         keyword: $("#templateName").val()
                     },
@@ -94,17 +90,17 @@
             }
 
             table.on('tool(task-table)', function (data) {
-                if (data.event === 'publish') {
-                    taskPublish(data.data.task_id);
+                if (data.event === 'start') {
+                    startTask(data.data.task_id);
+                } else if (data.event === 'stop') {
+                    stopTask(data.data.task_id);
                 } else if (data.event === 'edit') {
                     taskEdit(data.data.task_id);
                 }
                 else if (data.event === 'remove') {
                     taskRemove(data.data.task_id);
-                } else if (data.event === 'taskFillInfo') {
-                    if (data.data.fill_count > 0) {
-                        taskFillInfo(data.data.task_id, data.data.module_id);
-                    }
+                } else if (data.event === 'view') {
+                    taskView(data.data.task_id);
                 }
             });
 
@@ -114,21 +110,13 @@
                 }
             });
 
-            form.on('submit(task-query)', function (data) {
-                tableRender();
-            });
-
-            form.on('submit(task-reset)', function (data) {
-                $("#templateName").val("");
-            });
-
             // 新增任务
             window.taskAdd = function () {
                 layer.open({
                     type: 2,
                     title: '新增任务',
                     shade: 0.1,
-                    area: ['830px', '580px'],
+                    area: ['830px', '500px'],
                     content: './taskManageAdd.html'
                 });
             }
@@ -137,9 +125,9 @@
             window.taskEdit = function (taskId) {
                 layer.open({
                     type: 2,
-                    title: '新增任务',
+                    title: '编辑任务',
                     shade: 0.1,
-                    area: ['850px', '721px'],
+                    area: ['830px', '500px'],
                     content: './taskManageEdit.html?task_id=' + taskId
                 });
             }
@@ -151,12 +139,12 @@
                     title: '提示'
                 }, function (index) {
                     $.ajax({
-                        url: "/Mars/delTask",
+                        url: "/FengHuang/yp/delTask",
                         data: { "task_id": taskId },
                         type: 'POST',
                         success: function (result) {
                             if (result.success) {
-                                layer.msg(result.message, {
+                                layer.msg("删除成功！", {
                                     icon: 1,
                                     time: 1000
                                 }, function () {
@@ -173,19 +161,48 @@
                 });
             }
 
-            // 发布任务
-            window.taskPublish = function (taskId) {
-                layer.confirm('确定要发布任务？', {
+            // 启动任务
+            window.startTask = function (taskId) {
+                layer.confirm('启动该任务会自动停止其他任务，确定要启动任务吗？', {
                     icon: 3,
                     title: '提示'
                 }, function (index) {
                     $.ajax({
-                        url: "/Mars/publishTask",
+                        url: "/FengHuang/yp/startTask",
                         data: { "task_id": taskId },
                         type: 'post',
                         success: function (result) {
                             if (result.success) {
+                                layer.msg("启动成功！", {
+                                    icon: 1,
+                                    time: 1500
+                                }, function () {
+                                    refresh();
+                                });
+                            } else {
                                 layer.msg(result.message, {
+                                    icon: 2,
+                                    time: 1000
+                                });
+                            }
+                        }
+                    });
+                });
+            }
+
+            // 停止任务
+            window.stopTask = function (taskId) {
+                layer.confirm('确定要停止任务吗？', {
+                    icon: 3,
+                    title: '提示'
+                }, function (index) {
+                    $.ajax({
+                        url: "/FengHuang/yp/stopTask",
+                        data: { "task_id": taskId },
+                        type: 'post',
+                        success: function (result) {
+                            if (result.success) {
+                                layer.msg("停止成功！", {
                                     icon: 1,
                                     time: 1500
                                 }, function () {
@@ -203,16 +220,16 @@
             }
 
             // 查看填报情况
-            window.taskFillInfo = function (taskId, moduleId) {
+            window.taskView = function (taskId) {
                 layer.open({
                     type: 2,
-                    title: '查看填报情况',
+                    title: '查看报名情况',
                     shade: 0.1,
                     shade: false,
                     maxmin: false,
                     move: false,
                     area: ['100%', '100%'],
-                    content: './taskFillInfo.html?task_id=' + taskId + '&module_id=' + moduleId
+                    content: './taskView.html?task_id=' + taskId
                 });
             }
 
@@ -226,10 +243,10 @@
             }
 
             function getPublishText(data) {
-                if (data.is_publish === 1) {
-                    return "<span style='color:green;'>已发布</span>";
+                if (data.is_run === 0) {
+                    return "<span style='color:red;'>已停止</span>";
                 } else {
-                    return "<span style='color:red;'>未发布</span>";
+                    return "<span style='color:green;'>已启动</span>";
                 }
             }
 
diff --git a/WebRoot/html/ypzs/view/taskView.html b/WebRoot/html/ypzs/view/taskView.html
new file mode 100644
index 0000000..0015bf5
--- /dev/null
+++ b/WebRoot/html/ypzs/view/taskView.html
@@ -0,0 +1,257 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+    <meta charset="utf-8">
+    <title></title>
+    <link rel="stylesheet" href="../../component/pear/css/pear.css" />
+</head>
+
+<body class="pear-container">
+    <div class="layui-card">
+        <div class="layui-card-body">
+
+            <div class="layui-inline" style="margin: 5px 0 5px 0">
+                <label class="layui-form-label" style="width: 75px;">班型：</label>
+                <div class="layui-input-inline" id="SelectView"></div>
+                <script id="SelectScript" type="text/html">
+					<select name="typeSelect">						
+						{{#  layui.each(d.data, function(index, item){ }}
+							<option value="{{item.type_id}}">{{item.type_name}}</option>
+						{{#  }); }}
+					</select>
+                </script>
+            </div>
+
+            <div class="layui-inline" style="margin-left: 15px">
+                <button class="layui-btn" lay-submit lay-filter="task-query">
+                    <i class="layui-icon layui-icon-search"></i>
+                    查询
+                </button>
+            </div>
+        </div>
+    </div>
+    <div class="layui-card">
+        <div class="layui-card-body">
+            <table id="task-table" lay-filter="task-table"></table>
+        </div>
+    </div>
+
+
+    <script type="text/html" id="tableOperate">
+
+        <button class="pear-btn pear-btn-warming pear-btn-sm" lay-event="publish" title="查看户口本照片"><i class="icon pear-icon pear-icon-picture"></i>
+        </button>
+        
+    </script>
+
+
+
+
+    <script src="../../component/layui/layui.js"></script>
+    <script src="../../component/pear/pear.js"></script>
+
+    <script>
+        layui.use(['table', 'form', 'jquery', 'common'], function () {
+            let table = layui.table;
+            let form = layui.form;
+            let $ = layui.jquery;
+            let common = layui.common;
+
+            let cols = [
+                [
+                    { field: '', title: '序号', align: 'center', type: 'numbers', width: "5%" }
+                    , { field: 'name', title: '姓名', align: 'center' }
+                    , { field: 'xb', title: '性别', align: 'center' }
+                    , { field: 'sfzh', title: '身份证号', align: 'center', width: "10%" }
+                    , { field: 'bx_name', title: '报名学段', align: 'center', width: "10%" }
+                    , { field: 'address', title: '家庭住址', align: 'center', width: "10%" }
+                    , { field: 'father_name', title: '父亲姓名', align: 'center', width: "10%" }
+                    , { field: 'mother_name', title: '母亲姓名', align: 'center', width: "10%" }
+                    , { field: 'tel', title: '联系电话', align: 'center', width: "10%" }
+                    , { field: '', title: '查看户口本照片', toolbar: '#tableOperate', align: 'center', width: "10%" }
+                ]
+            ]
+
+            $.ajax({
+                type: "GET",
+                dataType: "json",
+                url: "/Mars/getFormTypeList",
+                success: function (data) {
+                    var typeSelectTpl = typeSelectScript.innerHTML,
+                        typeSelectView = document.getElementById('typeSelectView');
+                    laytpl(typeSelectTpl).render(data, function (html) {
+                        typeSelectView.innerHTML = html;
+                        form.render()
+                    });
+                }
+            });
+
+
+            tableRender()
+
+            function tableRender() {
+                table.render({
+                    elem: '#task-table',
+                    url: '/FengHuang/yp/getTaskInfo?task_id=17&bx_id=3&page=1&limit=10',
+                    where: {
+                        keyword: $("#templateName").val()
+                    },
+                    page: {
+                        limit: 15
+                        , layout: ['count', 'prev', 'page', 'next', 'skip']
+                        , prev: "上一页"
+                        , next: "下一页"
+                    },
+                    cols: cols,
+                    skin: 'line',
+                    defaultToolbar: []
+                });
+            }
+
+            table.on('tool(task-table)', function (data) {
+                if (data.event === 'publish') {
+                    taskPublish(data.data.task_id);
+                } else if (data.event === 'edit') {
+                    taskEdit(data.data.task_id);
+                }
+                else if (data.event === 'remove') {
+                    taskRemove(data.data.task_id);
+                } else if (data.event === 'taskFillInfo') {
+                    if (data.data.fill_count > 0) {
+                        taskFillInfo(data.data.task_id, data.data.module_id);
+                    }
+                }
+            });
+
+            table.on('toolbar(task-table)', function (data) {
+                if (data.event === 'add') {
+                    window.taskAdd();
+                }
+            });
+
+            form.on('submit(task-query)', function (data) {
+                tableRender();
+            });
+
+            form.on('submit(task-reset)', function (data) {
+                $("#templateName").val("");
+            });
+
+            // 新增任务
+            window.taskAdd = function () {
+                layer.open({
+                    type: 2,
+                    title: '新增任务',
+                    shade: 0.1,
+                    area: ['850px', '781px'],
+                    content: './taskManageAdd.html'
+                });
+            }
+
+            // 编辑任务
+            window.taskEdit = function (taskId) {
+                layer.open({
+                    type: 2,
+                    title: '新增任务',
+                    shade: 0.1,
+                    area: ['850px', '721px'],
+                    content: './taskManageEdit.html?task_id=' + taskId
+                });
+            }
+
+            // 删除任务
+            window.taskRemove = function (taskId) {
+                layer.confirm('确定要删除该任务？', {
+                    icon: 3,
+                    title: '提示'
+                }, function (index) {
+                    $.ajax({
+                        url: "/Mars/delTask",
+                        data: { "task_id": taskId },
+                        type: 'POST',
+                        success: function (result) {
+                            if (result.success) {
+                                layer.msg(result.message, {
+                                    icon: 1,
+                                    time: 1000
+                                }, function () {
+                                    refresh();
+                                });
+                            } else {
+                                layer.msg(result.msg, {
+                                    icon: 2,
+                                    time: 1000
+                                });
+                            }
+                        }
+                    })
+                });
+            }
+
+            // 发布任务
+            window.taskPublish = function (taskId) {
+                layer.confirm('确定要发布任务？', {
+                    icon: 3,
+                    title: '提示'
+                }, function (index) {
+                    $.ajax({
+                        url: "/Mars/publishTask",
+                        data: { "task_id": taskId },
+                        type: 'post',
+                        success: function (result) {
+                            if (result.success) {
+                                layer.msg(result.message, {
+                                    icon: 1,
+                                    time: 1500
+                                }, function () {
+                                    refresh();
+                                });
+                            } else {
+                                layer.msg(result.message, {
+                                    icon: 2,
+                                    time: 1000
+                                });
+                            }
+                        }
+                    });
+                });
+            }
+
+            // 查看填报情况
+            window.taskFillInfo = function (taskId, moduleId) {
+                layer.open({
+                    type: 2,
+                    title: '查看填报情况',
+                    shade: 0.1,
+                    shade: false,
+                    maxmin: false,
+                    move: false,
+                    area: ['100%', '100%'],
+                    content: './taskFillInfo.html?task_id=' + taskId + '&module_id=' + moduleId
+                });
+            }
+
+            // 弹出窗口用
+            window.parentTableRender = function () {
+                refresh();
+            }
+
+            window.refresh = function (param) {
+                table.reload('task-table');
+            }
+
+            function getPublishText(data) {
+                if (data.is_publish === 1) {
+                    return "<span style='color:green;'>已发布</span>";
+                } else {
+                    return "<span style='color:red;'>未发布</span>";
+                }
+            }
+
+
+        })
+    </script>
+</body>
+
+</html>
\ No newline at end of file