huanghai
/
QingLong
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' of http://10.10.14.176:3000/huanghai/QingLong

Browse Source
main
黄海 2 years ago
parent c5b32563ac f0a4b6534a
commit ea62653174
6 changed files with 37 additions and 28 deletions
Show Stats Download Patch File Download Diff File

BIN
WebRoot/Excel/b20cd8b0-933b-4d45-aad7-2e8f14f09aa0.pdf
View File

Binary file not shown.

BIN
WebRoot/Excel/b20cd8b0-933b-4d45-aad7-2e8f14f09aa0.xlsx
View File

Binary file not shown.

13
WebRoot/view/tb/dis/publish.html
Unescape View File

@ -90,9 +90,9 @@
<div class="layui-input-inline" <div class="layui-input-inline"
style="margin-left: -16px;width: 150px !important;"> style="margin-left: -16px;width: 150px !important;">
<select id="orgTypeId" lay-filter="orgTypeId"> <select id="orgTypeId" lay-filter="orgTypeId">
<option value="-1">全部</option> <option value="2,3">全部</option>
<option value="16">学校</option> <option value="2">学校</option>
<option value="14">教辅单位</option> <option value="3">教辅单位</option>
</select> </select>
</div> </div>
<div class="layui-input-group" style="margin-left: -16px;"> <div class="layui-input-group" style="margin-left: -16px;">
@ -204,9 +204,8 @@
id: 'myTable', id: 'myTable',
url: '/QingLong/collect/getBureauList', url: '/QingLong/collect/getBureauList',
where: { where: {
org_type_id: $("#orgTypeId").val(), bureau_type_ids: $("#orgTypeId").val(),
query_type_id: 2, query_type_id: 2,
exclude_self: 1,
org_name: $("#org_name").val() org_name: $("#org_name").val()
}, },
// height: '374', // height: '374',
@ -223,7 +222,7 @@
{ title: '操作', align: 'center', width: "25%", templet: '#select-enable' } { title: '操作', align: 'center', width: "25%", templet: '#select-enable' }
]], ]],
skin: 'line', skin: 'line',
toolbar: '#table-toolbar', // toolbar: '#table-toolbar',
defaultToolbar: [], defaultToolbar: [],
parseData: function (res) { parseData: function (res) {
var data = res.data; var data = res.data;

10
WebRoot/view/tb/dis/task_list_w.html
Unescape View File

@ -43,11 +43,11 @@
<script type="text/html" id="table-bar"> <script type="text/html" id="table-bar">
<button type="button" class="layui-btn layui-btn-sm" title="转发" lay-event="publish"> <button type="button" class="layui-btn layui-btn-sm" title="转发" lay-event="publish" style="font-size: 12px !important;">
<i class="iconfont icon-fabu"></i> <i class="iconfont icon-fabu"></i> 转发
</button> </button>
<button type="button" class="layui-btn layui-btn-sm" title="查看" lay-event="view"> <button type="button" class="layui-btn layui-btn-sm" title="查看" lay-event="view" style="font-size: 12px !important;">
<i class="iconfont icon-chakan"></i> <i class="iconfont icon-chakan"></i> 查看
</button> </button>
@ -101,7 +101,7 @@
{ title: '任务名称', field: 'job_name', align: 'left', }, { title: '任务名称', field: 'job_name', align: 'left', },
{ title: '发布时间', field: 'publish_time', align: 'center', width: "15%" }, { title: '发布时间', field: 'publish_time', align: 'center', width: "15%" },
{ title: '截止时间', field: 'deadline_time', align: 'center', width: "15%" }, { title: '截止时间', field: 'deadline_time', align: 'center', width: "15%" },
{ title: '操作', align: 'left', width: "10%", toolbar: '#table-bar' } { title: '操作', align: 'left', width: "15%", toolbar: '#table-bar' }
]], ]],
skin: 'line', skin: 'line',
defaultToolbar: [] defaultToolbar: []

8
WebRoot/view/tb/dis/task_list_y.html
Unescape View File

@ -54,12 +54,12 @@
<script type="text/html" id="table-bar"> <script type="text/html" id="table-bar">
{{# if(d.forward_progress == 1){ }} {{# if(d.forward_progress == 1){ }}
<button type="button" class="layui-btn layui-btn-sm" title="提交给上级" lay-event="submitUpLevel"> <button type="button" class="layui-btn layui-btn-sm" title="提交给上级" lay-event="submitUpLevel" style="font-size: 12px !important;">
<i class="iconfont icon-tijiao"></i> <i class="iconfont icon-tijiao"></i> 提交给上级
</button> </button>
{{# } }} {{# } }}
<button type="button" class="layui-btn layui-btn-sm" title="查看" lay-event="view"> <button type="button" class="layui-btn layui-btn-sm" title="查看" lay-event="view" style="font-size: 12px !important;">
<i class="iconfont icon-chakan"></i> <i class="iconfont icon-chakan"></i> 查看
</button> </button>

34
WebRoot/view/tb/school/task_list.html
Unescape View File

@ -50,10 +50,10 @@
<i class="iconfont icon-tianbao"></i> 填报 <i class="iconfont icon-tianbao"></i> 填报
</button> </button>
{{# } }} {{# } }}
{{# if(d.is_finish === 1){ }} <button type="button" class="layui-btn layui-btn-sm" lay-event="view" style="font-size: 12px !important;">
<button type="button" class="layui-btn layui-btn-sm" lay-event="view" style="font-size: 12px !important;"> <i class="iconfont icon-chakan"></i> 查看
<i class="iconfont icon-chakan"></i> 查看 </button>
</button> {{# if(d.is_finish === 1){ }}
{{# if(d.job_type === 2){ }} {{# if(d.job_type === 2){ }}
<button type="button" class="layui-btn layui-btn-sm" lay-event="download" style="font-size: 12px !important;"> <button type="button" class="layui-btn layui-btn-sm" lay-event="download" style="font-size: 12px !important;">
<i class="iconfont icon-xiazai"></i> 下载 <i class="iconfont icon-xiazai"></i> 下载
@ -153,20 +153,30 @@
} }
window.view = function (obj) { window.view = function (obj) {
if (obj.data.job_type === 1) { if (obj.data.is_finish === 0) {
layer.open({ layer.open({
type: 2, type: 2,
title: '查看', title: '查看',
offset: 'r',
anim: 'slideLeft',
area: ['750px', '100%'],
shade: 0.1, shade: 0.1,
shadeClose: true, area: ['800px', '400px'],
content: "../form/view.html?job_id=" + obj.data.job_id content: '../dis/job_view.html?job_id=' + obj.data.job_id
}); });
} else { } else {
var base64Url = Base64.encode('/QingLong/collect/getJobBureauFillInfo?job_id=' + obj.data.job_id + '&type_id=2'); if (obj.data.job_type === 1) {
window.open('../exportPdf.html?url=' + base64Url, '_blank'); layer.open({
type: 2,
title: '查看',
offset: 'r',
anim: 'slideLeft',
area: ['750px', '100%'],
shade: 0.1,
shadeClose: true,
content: "../form/view.html?job_id=" + obj.data.job_id
});
} else {
var base64Url = Base64.encode('/QingLong/collect/getJobBureauFillInfo?job_id=' + obj.data.job_id + '&type_id=2');
window.open('../exportPdf.html?url=' + base64Url, '_blank');
}
} }
} }

Write Preview
Loading…
Cancel
Save