From 06b1f67905f2682578f1cd1866516388562df926 Mon Sep 17 00:00:00 2001
From: kgdxpr <kgdxpr@163.com>
Date: Sun, 23 Apr 2023 16:01:20 +0800
Subject: [PATCH] 'commit'

---
 WebRoot/html/ypzs/view/apply.html    |   4 +-
 WebRoot/html/ypzs/view/taskView.html | 182 +++++----------------------
 2 files changed, 32 insertions(+), 154 deletions(-)
diff --git a/WebRoot/html/ypzs/view/apply.html b/WebRoot/html/ypzs/view/apply.html
index 3dd1ab5..2a204ad 100644
--- a/WebRoot/html/ypzs/view/apply.html
+++ b/WebRoot/html/ypzs/view/apply.html
@@ -9,10 +9,12 @@
 </head>
 
 <body class="pear-container layui-form">
-    <h1 class="title" style="text-align: center;margin-top: 10px;" id="title"></h1>
+    <!-- <h1 class="title" style="text-align: center;margin-top: 10px;" id="title"></h1> -->
 
     <div class="layui-card"
         style="width: 700px;position: absolute;top: 50%;left: 50%;transform: translate(-50%, -50%);-webkit-transform: translate(-50%, -50%);-moz-transform: translate(-50%, -50%); ">
+        <h1 class="title" style="text-align: center;margin: 15px 0 10px 0;" id="title"></h1>
+
         <div class="layui-card-header">报名申请表</div>
         <div class="layui-card-body">
             <div style="margin: 5px 0 25px 0">
diff --git a/WebRoot/html/ypzs/view/taskView.html b/WebRoot/html/ypzs/view/taskView.html
index 0015bf5..d912cb8 100644
--- a/WebRoot/html/ypzs/view/taskView.html
+++ b/WebRoot/html/ypzs/view/taskView.html
@@ -7,28 +7,22 @@
     <link rel="stylesheet" href="../../component/pear/css/pear.css" />
 </head>
 
-<body class="pear-container">
+<body class="layui-form">
     <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>
+                <label class="layui-form-label" style="width: 55px;">班型：</label>
+                <div class="layui-input-inline" id="typeSelectView" style="margin-right: 8px;">
+                </div>
+                <script id="typeSelectScript" type="text/html">
+                    <select name="typeSelect" id="bxSelect" lay-filter="selctOnchange">                    
+                        {{#  layui.each(d, function(index, item){ }}
+                            <option value="{{item.bx_id}}">{{item.bx_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">
@@ -40,24 +34,26 @@
 
     <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 class="pear-btn pear-btn-warming pear-btn-sm" lay-event="view" 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 () {
+        layui.use(['table', 'laytpl', 'form', 'jquery', 'common'], function () {
             let table = layui.table;
             let form = layui.form;
+            let laytpl = layui.laytpl
             let $ = layui.jquery;
             let common = layui.common;
 
+            let taskId = GetQueryString("task_id");
+
             let cols = [
                 [
                     { field: '', title: '序号', align: 'center', type: 'numbers', width: "5%" }
@@ -76,7 +72,8 @@
             $.ajax({
                 type: "GET",
                 dataType: "json",
-                url: "/Mars/getFormTypeList",
+                async: false,
+                url: "/FengHuang/yp/getTaskLimit?task_id=" + taskId,
                 success: function (data) {
                     var typeSelectTpl = typeSelectScript.innerHTML,
                         typeSelectView = document.getElementById('typeSelectView');
@@ -87,13 +84,12 @@
                 }
             });
 
-
             tableRender()
 
             function tableRender() {
                 table.render({
                     elem: '#task-table',
-                    url: '/FengHuang/yp/getTaskInfo?task_id=17&bx_id=3&page=1&limit=10',
+                    url: '/FengHuang/yp/getTaskInfo?task_id=' + taskId + '&bx_id=' + $("#bxSelect").val() + '&page=1&limit=10',
                     where: {
                         keyword: $("#templateName").val()
                     },
@@ -109,147 +105,27 @@
                 });
             }
 
-            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) {
+            form.on('select(selctOnchange)', function (data) {
                 tableRender();
             });
 
-            form.on('submit(task-reset)', function (data) {
-                $("#templateName").val("");
+            table.on('tool(task-table)', function (data) {                
+                if (data.event === 'view') {
+                    window.open('/FengHuang/' + data.data.pic);
+                }
             });
 
-            // 新增任务
-            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 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);
 
-            function getPublishText(data) {
-                if (data.is_publish === 1) {
-                    return "<span style='color:green;'>已发布</span>";
-                } else {
-                    return "<span style='color:red;'>未发布</span>";
-                }
+                if (r != null) return unescape(r[2]);
+                return null;
             }
 
-
         })
     </script>
 </body>
