+
@@ -38,7 +38,7 @@
-
工程总数（项）
+
@@ -48,7 +48,7 @@
-
护线员人数（人）
+
@@ -68,7 +68,7 @@
-
杆塔总数（基）
+
@@ -78,7 +78,7 @@
-
本月未巡视（基）
+
diff --git a/hxy-web/html/dataStatistics/wagesStatistics/wagesStatisticsDetails.html b/hxy-web/html/dataStatistics/wagesStatistics/wagesStatisticsDetails.html
index 7913cea..45ff64b 100644
--- a/hxy-web/html/dataStatistics/wagesStatistics/wagesStatisticsDetails.html
+++ b/hxy-web/html/dataStatistics/wagesStatistics/wagesStatisticsDetails.html
@@ -2,7 +2,9 @@
- 工资上报
+ 详情
+
+
@@ -10,7 +12,8 @@
-
+
+
@@ -60,18 +63,19 @@
align-items: center;
border: 1px #E9E9E9 solid;
}
- #title>div:nth-child(1),
- #title>div:nth-child(2),
- #title>div:nth-child(3),
- #title>div:nth-child(4),
- #title>div:nth-child(5),
- #title>div:nth-child(6),
- #title>div:nth-child(8)
+ #title>div
{
- width: 10%;
+ width: 13%;
}
- #title>div:nth-child(7){
- width: 25%;
+ #title>div:nth-child(1)
+ {
+ width: 20%;
+ margin-left: 1%;
+ margin-right: 1%;
+ }
+ #title>div:nth-child(7)
+ {
+ width: 40%;
}
#title>div:nth-child(1){
display: flex;
@@ -111,6 +115,10 @@
color: #409EFF;
font-weight: 800;
}
+ #month>input{
+ border: none;
+ color: #409EFF;
+ }
@@ -130,29 +138,34 @@
+
+
+
+
diff --git a/hxy-web/html/dataStatistics/wagesStatistics/wagesStatisticsList.html b/hxy-web/html/dataStatistics/wagesStatistics/wagesStatisticsList.html
index eeef86d..33d14fe 100644
--- a/hxy-web/html/dataStatistics/wagesStatistics/wagesStatisticsList.html
+++ b/hxy-web/html/dataStatistics/wagesStatistics/wagesStatisticsList.html
@@ -10,7 +10,7 @@
-
+
@@ -34,17 +34,17 @@
本月特巡天数（天）
护线员数量
--
合计费用
- --
+ --
通讯费用
- --
+ --
奖惩费用
- --
+ --
实发工资
- --
+ --
- --
+
-
+
-
+
-
+
-
+
@@ -35,7 +35,7 @@
-
线路总数（项）
+
@@ -45,7 +45,7 @@
-
护线员人数（人）
+
@@ -55,7 +55,7 @@
-
杆塔总数（基）
+
@@ -65,7 +65,7 @@
-
本月已巡视（基）
+
@@ -75,7 +75,7 @@
-
本月未巡视（基）
+
diff --git a/hxy-web/html/wireManager/project/projectImport.html b/hxy-web/html/wireManager/project/projectImport.html
index 9132aab..8c0bf41 100644
--- a/hxy-web/html/wireManager/project/projectImport.html
+++ b/hxy-web/html/wireManager/project/projectImport.html
@@ -18,6 +18,7 @@
@@ -309,7 +314,7 @@
-
-
本月特巡天数（天）
+
+预览图：@@ -318,7 +323,7 @@
+
银行卡信息
diff --git a/hxy-web/html/wireManager/staff/staffImport.html b/hxy-web/html/wireManager/staff/staffImport.html
index 7616ce7..b3142f9 100644
--- a/hxy-web/html/wireManager/staff/staffImport.html
+++ b/hxy-web/html/wireManager/staff/staffImport.html
@@ -29,7 +29,7 @@
填写导入数据信息
请按照数据模板的格式准备导入数据，模板中的表头名称不可更改，表头行不能删除。
diff --git a/hxy-web/image/fileIcon/WORD.png b/hxy-web/image/fileIcon/WORD.png
new file mode 100644
index 0000000..6f7be11
Binary files /dev/null and b/hxy-web/image/fileIcon/WORD.png differ
diff --git a/hxy-web/image/fileIcon/docx.png b/hxy-web/image/fileIcon/docx.png
new file mode 100644
index 0000000..c0d0a91
Binary files /dev/null and b/hxy-web/image/fileIcon/docx.png differ
diff --git a/hxy-web/image/fileIcon/excel.png b/hxy-web/image/fileIcon/excel.png
new file mode 100644
index 0000000..2ec4ee9
Binary files /dev/null and b/hxy-web/image/fileIcon/excel.png differ
diff --git a/hxy-web/image/fileIcon/file.png b/hxy-web/image/fileIcon/file.png
new file mode 100644
index 0000000..2e2b698
Binary files /dev/null and b/hxy-web/image/fileIcon/file.png differ
diff --git a/hxy-web/image/fileIcon/fileLook.png b/hxy-web/image/fileIcon/fileLook.png
new file mode 100644
index 0000000..c9fff68
Binary files /dev/null and b/hxy-web/image/fileIcon/fileLook.png differ
diff --git a/hxy-web/image/fileIcon/pdf.png b/hxy-web/image/fileIcon/pdf.png
new file mode 100644
index 0000000..3ddb252
Binary files /dev/null and b/hxy-web/image/fileIcon/pdf.png differ
diff --git a/hxy-web/image/fileIcon/picture.png b/hxy-web/image/fileIcon/picture.png
new file mode 100644
index 0000000..d543a62
Binary files /dev/null and b/hxy-web/image/fileIcon/picture.png differ
diff --git a/hxy-web/image/fileIcon/xlsx.png b/hxy-web/image/fileIcon/xlsx.png
new file mode 100644
index 0000000..1dca025
Binary files /dev/null and b/hxy-web/image/fileIcon/xlsx.png differ
diff --git a/hxy-web/image/fileIcon/yulan.png b/hxy-web/image/fileIcon/yulan.png
new file mode 100644
index 0000000..b9cb221
Binary files /dev/null and b/hxy-web/image/fileIcon/yulan.png differ
diff --git a/hxy-web/js/dataStatistics/index.js b/hxy-web/js/dataStatistics/index.js
index 2f68db9..2ca83de 100644
--- a/hxy-web/js/dataStatistics/index.js
+++ b/hxy-web/js/dataStatistics/index.js
@@ -384,7 +384,7 @@ function monthRateEcharts(data) {
// 为echarts对象加载数据
myChart.setOption(option);
myChart.on('click', function (params, charts, event) {
- detailsClick();
+ // detailsClick();
});
}
diff --git a/hxy-web/js/dataStatistics/staff/staffList.js b/hxy-web/js/dataStatistics/staff/staffList.js
index 5d08815..9502965 100644
--- a/hxy-web/js/dataStatistics/staff/staffList.js
+++ b/hxy-web/js/dataStatistics/staff/staffList.js
@@ -99,11 +99,13 @@ function init(){
if(personStatus == '1'){
text = '在职';
color = '#19BE6B';
- }
- if(personStatus == '2'){
+ }else if(personStatus == '2'){
text = '离职';
color = '#F56C6C';
- }
+ }else{
+ text = '在职';
+ color = '#19BE6B';
+ }
html += ""
html += ` `
html += `${text}`
diff --git a/hxy-web/js/dataStatistics/viewStatistics/viewStatisticsDetails.js b/hxy-web/js/dataStatistics/viewStatistics/viewStatisticsDetails.js
index c6a5ddf..6aa7126 100644
--- a/hxy-web/js/dataStatistics/viewStatistics/viewStatisticsDetails.js
+++ b/hxy-web/js/dataStatistics/viewStatistics/viewStatisticsDetails.js
@@ -381,7 +381,7 @@ function setData(){
url: PATH_URL + "/makeInfo/getUserDetail",
dataType: 'json',
data: {
- id: id
+ id: id,makeMonth:localStorage.getItem("resultdataMakeMonth")
},
success: function (data) {
$("#username").text(data.data.userName);
diff --git a/hxy-web/js/dataStatistics/wagesStatistics/wagesStatisticsDetails.js b/hxy-web/js/dataStatistics/wagesStatistics/wagesStatisticsDetails.js
index d984ffc..2b64bc7 100644
--- a/hxy-web/js/dataStatistics/wagesStatistics/wagesStatisticsDetails.js
+++ b/hxy-web/js/dataStatistics/wagesStatistics/wagesStatisticsDetails.js
@@ -1,73 +1,88 @@
-
-
+var yjId = $(window.parent.parent.document).find("input[id='taskSourceId']").attr("stationId");
var pers = []
-var table,form,layer
-layui.use(['form','layer','table'], function () {
+var table,form,layer,laydate;
+var times = getCurrentDateTimeArr();
+layui.use(['form','layer','table', 'laydate'], function () {
table = layui.table;
form = layui.form;
layer = layui.layer;
-
- //测试
- setData(null);
+ laydate = layui.laydate;
+ // 渲染时间选择器
+ // laydate.render({
+ // elem: '#wagesMonth',
+ // type: 'month',
+ // format: 'yyyy-MM',
+ // fullPanel: true,
+ // value: times[0] + "-" + times[1]
+ // });
- // 触发submit提交 按钮点击或者表单被执行提交时触发
- form.on('submit(query)', function (data) {
- // 对表格进行重载。id 即 table表格的id
- table.reload('table', {
- // //设定异步数据接口的额外参数
- where: data.field
- })
- return false; // 阻止表单跳转。如果需要表单跳转，去掉这段即可。
- });
- form.on('submit(reset)', function () {
- $('#username').val('');
- $('#proname').val('');
- form.render();
- let obj = {
- username:'',
- proname:'',
- }
- // 对表格进行重载。id 即 table表格的id
- table.reload('table', {
- // //设定异步数据接口的额外参数
- where: obj
- })
- return false; // 阻止表单跳转。如果需要表单跳转，去掉这段即可。
- });
+ //取消按钮点击
+ $("#closeBt").click(() => {
+ var index = parent.layer.getFrameIndex(window.name); //先得到当前 iframe层的索引
+ parent.layer.close(index); //再执行关闭
+ })
+ //保存按钮点击
+ $("#submitBt").click(() => {
+ save();
+ })
init();
});
- // 静态数据
- var tableData = [
- {id: 1, username: '李云飞', idNumber: '342224196202241356', lineName: '500kV大宝Ⅰ回线',phone:'15665366624',bank:'中国银行',bankNumber:'xxxxxxxxxxxxxxxxxxxx',UnionPayNumber:'xxxxxxxxxxxx',visitationWorkSecond:'33',laborPrice:'10',visitationWorkDay:'5',laborPriceDay:'115', totalPrice: '800', messages: '100', bonusPenaltys: '100', remark: '绩效奖励', netSalarys: '1000'},
- {id: 2, username: '李云飞', idNumber: '342224196202241356', lineName: '500kV大宝Ⅰ回线',phone:'15665366624',bank:'中国银行',bankNumber:'xxxxxxxxxxxxxxxxxxxx',UnionPayNumber:'xxxxxxxxxxxx',visitationWorkSecond:'33',laborPrice:'10',visitationWorkDay:'5',laborPriceDay:'115', totalPrice: '800', messages: '100', bonusPenaltys: '100', remark: '绩效奖励', netSalarys: '1000'},
- {id: 3, username: '李云飞', idNumber: '342224196202241356', lineName: '500kV大宝Ⅰ回线',phone:'15665366624',bank:'中国银行',bankNumber:'xxxxxxxxxxxxxxxxxxxx',UnionPayNumber:'xxxxxxxxxxxx',visitationWorkSecond:'33',laborPrice:'10',visitationWorkDay:'5',laborPriceDay:'115', totalPrice: '800', messages: '100', bonusPenaltys: '100', remark: '绩效奖励', netSalarys: '1000'},
- {id: 4, username: '李云飞', idNumber: '342224196202241356', lineName: '500kV大宝Ⅰ回线',phone:'15665366624',bank:'中国银行',bankNumber:'xxxxxxxxxxxxxxxxxxxx',UnionPayNumber:'xxxxxxxxxxxx',visitationWorkSecond:'33',laborPrice:'10',visitationWorkDay:'5',laborPriceDay:'115', totalPrice: '800', messages: '100', bonusPenaltys: '100', remark: '绩效奖励', netSalarys: '1000'},
- {id: 4, username: '李云飞', idNumber: '342224196202241356', lineName: '500kV大宝Ⅰ回线',phone:'15665366624',bank:'中国银行',bankNumber:'xxxxxxxxxxxxxxxxxxxx',UnionPayNumber:'xxxxxxxxxxxx',visitationWorkSecond:'33',laborPrice:'10',visitationWorkDay:'5',laborPriceDay:'115', totalPrice: '800', messages: '100', bonusPenaltys: '100', remark: '绩效奖励', netSalarys: '1000'},
- {id: 4, username: '李云飞', idNumber: '342224196202241356', lineName: '500kV大宝Ⅰ回线',phone:'15665366624',bank:'中国银行',bankNumber:'xxxxxxxxxxxxxxxxxxxx',UnionPayNumber:'xxxxxxxxxxxx',visitationWorkSecond:'33',laborPrice:'10',visitationWorkDay:'5',laborPriceDay:'115', totalPrice: '800', messages: '100', bonusPenaltys: '100', remark: '绩效奖励', netSalarys: '1000'},
- {id: 4, username: '李云飞', idNumber: '342224196202241356', lineName: '500kV大宝Ⅰ回线',phone:'15665366624',bank:'中国银行',bankNumber:'xxxxxxxxxxxxxxxxxxxx',UnionPayNumber:'xxxxxxxxxxxx',visitationWorkSecond:'33',laborPrice:'10',visitationWorkDay:'5',laborPriceDay:'115', totalPrice: '800', messages: '100', bonusPenaltys: '100', remark: '绩效奖励', netSalarys: '1000'},
- {id: 4, username: '李云飞', idNumber: '342224196202241356', lineName: '500kV大宝Ⅰ回线',phone:'15665366624',bank:'中国银行',bankNumber:'xxxxxxxxxxxxxxxxxxxx',UnionPayNumber:'xxxxxxxxxxxx',visitationWorkSecond:'33',laborPrice:'10',visitationWorkDay:'5',laborPriceDay:'115', totalPrice: '800', messages: '100', bonusPenaltys: '100', remark: '绩效奖励', netSalarys: '1000'},
- {id: 4, username: '李云飞', idNumber: '342224196202241356', lineName: '500kV大宝Ⅰ回线',phone:'15665366624',bank:'中国银行',bankNumber:'xxxxxxxxxxxxxxxxxxxx',UnionPayNumber:'xxxxxxxxxxxx',visitationWorkSecond:'33',laborPrice:'10',visitationWorkDay:'5',laborPriceDay:'115', totalPrice: '800', messages: '100', bonusPenaltys: '100', remark: '绩效奖励', netSalarys: '1000'},
- {id: 4, username: '李云飞', idNumber: '342224196202241356', lineName: '500kV大宝Ⅰ回线',phone:'15665366624',bank:'中国银行',bankNumber:'xxxxxxxxxxxxxxxxxxxx',UnionPayNumber:'xxxxxxxxxxxx',visitationWorkSecond:'33',laborPrice:'10',visitationWorkDay:'5',laborPriceDay:'115', totalPrice: '800', messages: '100', bonusPenaltys: '100', remark: '绩效奖励', netSalarys: '1000'},
- {id: 4, username: '李云飞', idNumber: '342224196202241356', lineName: '500kV大宝Ⅰ回线',phone:'15665366624',bank:'中国银行',bankNumber:'xxxxxxxxxxxxxxxxxxxx',UnionPayNumber:'xxxxxxxxxxxx',visitationWorkSecond:'33',laborPrice:'10',visitationWorkDay:'5',laborPriceDay:'115', totalPrice: '800', messages: '100', bonusPenaltys: '100', remark: '绩效奖励', netSalarys: '1000'},
- {id: 4, username: '李云飞', idNumber: '342224196202241356', lineName: '500kV大宝Ⅰ回线',phone:'15665366624',bank:'中国银行',bankNumber:'xxxxxxxxxxxxxxxxxxxx',UnionPayNumber:'xxxxxxxxxxxx',visitationWorkSecond:'33',laborPrice:'10',visitationWorkDay:'5',laborPriceDay:'115', totalPrice: '800', messages: '100', bonusPenaltys: '100', remark: '绩效奖励', netSalarys: '1000'},
- {id: 4, username: '李云飞', idNumber: '342224196202241356', lineName: '500kV大宝Ⅰ回线',phone:'15665366624',bank:'中国银行',bankNumber:'xxxxxxxxxxxxxxxxxxxx',UnionPayNumber:'xxxxxxxxxxxx',visitationWorkSecond:'33',laborPrice:'10',visitationWorkDay:'5',laborPriceDay:'115', totalPrice: '800', messages: '100', bonusPenaltys: '100', remark: '绩效奖励', netSalarys: '1000'},
- {id: 4, username: '李云飞', idNumber: '342224196202241356', lineName: '500kV大宝Ⅰ回线',phone:'15665366624',bank:'中国银行',bankNumber:'xxxxxxxxxxxxxxxxxxxx',UnionPayNumber:'xxxxxxxxxxxx',visitationWorkSecond:'33',laborPrice:'10',visitationWorkDay:'5',laborPriceDay:'115', totalPrice: '800', messages: '100', bonusPenaltys: '100', remark: '绩效奖励', netSalarys: '1000'},
- {id: 4, username: '李云飞', idNumber: '342224196202241356', lineName: '500kV大宝Ⅰ回线',phone:'15665366624',bank:'中国银行',bankNumber:'xxxxxxxxxxxxxxxxxxxx',UnionPayNumber:'xxxxxxxxxxxx',visitationWorkSecond:'33',laborPrice:'10',visitationWorkDay:'5',laborPriceDay:'115', totalPrice: '800', messages: '100', bonusPenaltys: '100', remark: '绩效奖励', netSalarys: '1000'},
- {id: 4, username: '李云飞', idNumber: '342224196202241356', lineName: '500kV大宝Ⅰ回线',phone:'15665366624',bank:'中国银行',bankNumber:'xxxxxxxxxxxxxxxxxxxx',UnionPayNumber:'xxxxxxxxxxxx',visitationWorkSecond:'33',laborPrice:'10',visitationWorkDay:'5',laborPriceDay:'115', totalPrice: '800', messages: '100', bonusPenaltys: '100', remark: '绩效奖励', netSalarys: '1000'},
- {id: 4, username: '李云飞', idNumber: '342224196202241356', lineName: '500kV大宝Ⅰ回线',phone:'15665366624',bank:'中国银行',bankNumber:'xxxxxxxxxxxxxxxxxxxx',UnionPayNumber:'xxxxxxxxxxxx',visitationWorkSecond:'33',laborPrice:'10',visitationWorkDay:'5',laborPriceDay:'115', totalPrice: '800', messages: '100', bonusPenaltys: '100', remark: '绩效奖励', netSalarys: '1000'},
- {id: 4, username: '李云飞', idNumber: '342224196202241356', lineName: '500kV大宝Ⅰ回线',phone:'15665366624',bank:'中国银行',bankNumber:'xxxxxxxxxxxxxxxxxxxx',UnionPayNumber:'xxxxxxxxxxxx',visitationWorkSecond:'33',laborPrice:'10',visitationWorkDay:'5',laborPriceDay:'115', totalPrice: '800', messages: '100', bonusPenaltys: '100', remark: '绩效奖励', netSalarys: '1000'},
- {id: 4, username: '李云飞', idNumber: '342224196202241356', lineName: '500kV大宝Ⅰ回线',phone:'15665366624',bank:'中国银行',bankNumber:'xxxxxxxxxxxxxxxxxxxx',UnionPayNumber:'xxxxxxxxxxxx',visitationWorkSecond:'33',laborPrice:'10',visitationWorkDay:'5',laborPriceDay:'115', totalPrice: '800', messages: '100', bonusPenaltys: '100', remark: '绩效奖励', netSalarys: '1000'},
- {id: 4, username: '李云飞', idNumber: '342224196202241356', lineName: '500kV大宝Ⅰ回线',phone:'15665366624',bank:'中国银行',bankNumber:'xxxxxxxxxxxxxxxxxxxx',UnionPayNumber:'xxxxxxxxxxxx',visitationWorkSecond:'33',laborPrice:'10',visitationWorkDay:'5',laborPriceDay:'115', totalPrice: '800', messages: '100', bonusPenaltys: '100', remark: '绩效奖励', netSalarys: '1000'},
- {id: 4, username: '李云飞', idNumber: '342224196202241356', lineName: '500kV大宝Ⅰ回线',phone:'15665366624',bank:'中国银行',bankNumber:'xxxxxxxxxxxxxxxxxxxx',UnionPayNumber:'xxxxxxxxxxxx',visitationWorkSecond:'33',laborPrice:'10',visitationWorkDay:'5',laborPriceDay:'115', totalPrice: '800', messages: '100', bonusPenaltys: '100', remark: '绩效奖励', netSalarys: '1000'},
- {id: 4, username: '李云飞', idNumber: '342224196202241356', lineName: '500kV大宝Ⅰ回线',phone:'15665366624',bank:'中国银行',bankNumber:'xxxxxxxxxxxxxxxxxxxx',UnionPayNumber:'xxxxxxxxxxxx',visitationWorkSecond:'33',laborPrice:'10',visitationWorkDay:'5',laborPriceDay:'115', totalPrice: '800', messages: '100', bonusPenaltys: '100', remark: '绩效奖励', netSalarys: '1000'},
- {id: 4, username: '李云飞', idNumber: '342224196202241356', lineName: '500kV大宝Ⅰ回线',phone:'15665366624',bank:'中国银行',bankNumber:'xxxxxxxxxxxxxxxxxxxx',UnionPayNumber:'xxxxxxxxxxxx',visitationWorkSecond:'33',laborPrice:'10',visitationWorkDay:'5',laborPriceDay:'115', totalPrice: '800', messages: '100', bonusPenaltys: '100', remark: '绩效奖励', netSalarys: '1000'},
- {id: 4, username: '李云飞', idNumber: '342224196202241356', lineName: '500kV大宝Ⅰ回线',phone:'15665366624',bank:'中国银行',bankNumber:'xxxxxxxxxxxxxxxxxxxx',UnionPayNumber:'xxxxxxxxxxxx',visitationWorkSecond:'33',laborPrice:'10',visitationWorkDay:'5',laborPriceDay:'115', totalPrice: '800', messages: '100', bonusPenaltys: '100', remark: '绩效奖励', netSalarys: '1000'},
- {id: 4, username: '李云飞', idNumber: '342224196202241356', lineName: '500kV大宝Ⅰ回线',phone:'15665366624',bank:'中国银行',bankNumber:'xxxxxxxxxxxxxxxxxxxx',UnionPayNumber:'xxxxxxxxxxxx',visitationWorkSecond:'33',laborPrice:'10',visitationWorkDay:'5',laborPriceDay:'115', totalPrice: '800', messages: '100', bonusPenaltys: '100', remark: '绩效奖励', netSalarys: '1000'},
-
- ];
+//查询
+function queryClick(){
+ table.reload('layui_table', {
+ // //设定异步数据接口的额外参数
+ where: {
+ 'userName': $("#username").val(),
+ 'proName': $("#proName").val(),
+ 'yjId': $('#yjId').val(),
+ 'wagesMonth': $('#wagesMonth').val()
+ }
+ })
+}
+//重置
+function resetClick(){
+ $("#username").val('');
+ $("#proName").val('');
+ table.reload('layui_table', {
+ where: {
+ 'userName': '',
+ 'proName': '',
+ 'yjId': $('#yjId').val(),
+ 'wagesMonth': times[0] + "-" + times[1]
+ },
+ })
+}
+
+//页面赋值
+function setData(yjId,yjName,gsName,wagesMonth){
+ $("#wagesMonth").val(wagesMonth);
+ $("#yjId").val(yjId);
+ $.ajax({
+ type: 'POST',
+ url: PATH_URL + '/wages/getWagesNum',
+ contentType: "application/json; charset=utf-8",
+ data: JSON.stringify({"userName": '', "proName": '', "yjId": yjId, "wagesMonth": wagesMonth}),
+ success: function (data) {
+ console.log('data:',data.data)
+ if(data.code == '200'){
+ $("#inspectionStation").text(yjName);
+ $("#subComName").text(gsName);
+ $("#proNum").text(data.data.proNum);
+ $("#lineProtector").text(data.data.userNum);
+
+ $("#allPriceNum").text(data.data.allPriceNum);
+ $("#phonePriceNum").text(data.data.phonePriceNum);
+ $("#rewardNum").text(data.data.rewardNum);
+ $("#wagesNum").text(data.data.wagesNum);
+ }
+
+ }
+ })
+
+}
/**
* 初始化数据
@@ -75,11 +90,16 @@ layui.use(['form','layer','table'], function () {
function init(){
// 渲染表格
table.render({
+ id: 'layui_table',
elem: '#table',
- // url: "/sys/achievement",
- // page: true,
+ url: PATH_URL + '/wages/getWagesById',
+ where: {
+ 'yjId': $('#yjId').val(),
+ 'wagesMonth': $('#wagesMonth').val()
+ },
+ page: true, //开启分页
+ method:'post',
skin: 'line', // 表格样式
- data: tableData,
cols: [[
{
title: '序号',
@@ -87,34 +107,31 @@ function init(){
align: 'center',
type: 'numbers'
},
- {field:'username', title: '姓 名',align: 'center',},
+ {field:'userName', title: '姓 名',align: 'center',},
{field:'idNumber', title: '身份证号',align: 'center',},
- {field:'lineName', title: '管辖线路名称',align: 'center',},
+ {field:'proName', title: '管辖线路名称',align: 'center',},
{field:'phone', title: '手机号',align: 'center',},
{field:'bank', title: '开户行',align: 'center',},
- {field:'bankNumber', title: '银行卡号',align: 'center'},
- {field:'UnionPayNumber', title: '银联号',align: 'center'},
- {field:'visitationWorkSecond', title: '巡视工作量（基*次）',align: 'center', },
- {field:'laborPrice', title: '约定巡视工价（元/(基*次)）',align: 'center', },
- {field:'visitationWorkDay', title: '特巡工作量（人*天）',align: 'center', },
- {field:'laborPriceDay', title: '约定特巡工价（元/(人*天)）',align: 'center', },
- {field:'totalPrice', title: '合价（元）',align: 'center', },
- {field:'messages', title: '通讯费',align: 'center', },
- {field:'bonusPenaltys', title: '奖惩',align: 'center', },
- {field:'remark', title: '备注',align: 'center', },
- {field:'netSalarys', title: '实发工资',align: 'center', },
+ {field:'bankCard', title: '银行卡号',align: 'center'},
+ {field:'unionpayNum', title: '银联号',align: 'center'},
+ {field:'xsNum', title: '巡视工作量（基*次）',align: 'center', },
+ {field:'xsPrice', title: '约定巡视工价（元/(基*次)）',align: 'center', },
+ {field:'txNum', title: '特巡工作量（人*天）',align: 'center', },
+ {field:'txPrice', title: '约定特巡工价（元/(人*天)）',align: 'center', },
+ {field:'allPrice', title: '合价（元）',align: 'center'},
+ {field:'phonePrice', title: '通讯费',align: 'center'},
+ {field:'reward', title: '奖惩',align: 'center'},
+ {field:'remarks', title: '备注',align: 'center'},
+ {field:'wages', title: '实发工资',align: 'center'},
]],
+ done: function(res,curr,count){
+ //checkPermission();
+ }
});
-
}
-//页面赋值
-function setData(data){
- $("#inspectionStation").text("迪庆运检站");
- $("#subComName").text("运检二公司");
- $("#proNum").text("60");
- $("#lineProtector").text("16");
- $("#month").text("3月")
+//判断是否为数字
+function isNumber(variable){
+ return !isNaN(Number(variable));
}
-
diff --git a/hxy-web/js/dataStatistics/wagesStatistics/wagesStatisticsList.js b/hxy-web/js/dataStatistics/wagesStatistics/wagesStatisticsList.js
index 655f05c..8985fb4 100644
--- a/hxy-web/js/dataStatistics/wagesStatistics/wagesStatisticsList.js
+++ b/hxy-web/js/dataStatistics/wagesStatistics/wagesStatisticsList.js
@@ -1,4 +1,6 @@
+var yjId = $(window.parent.document).find("input[id='taskSourceId']").attr("stationId");
+var fgsId = $(window.parent.document).find("select[id='subComId']").val();
var pers = []
var table,form,laydate
layui.use(['form','layer','table','laydate'], function () {
@@ -8,13 +10,14 @@ layui.use(['form','layer','table','laydate'], function () {
//初始化日期选择框
laydate.render({
- elem: '#dataTime',
+ elem: '#wagesMonth',
type: 'month',
});
// 触发submit提交 按钮点击或者表单被执行提交时触发
form.on('submit(query)', function (data) {
console.log("搜索")
// 对表格进行重载。id 即 table表格的id
+ data.field.fgsId=fgsId;
table.reload('table', {
// //设定异步数据接口的额外参数
page:{curr : 1}
@@ -24,13 +27,13 @@ layui.use(['form','layer','table','laydate'], function () {
});
$("#reset").click(function(){
console.log("重置")
- $('#search1').val('');
- $('#search2').val('');
- $('#search3').val('');
+ $('#proName').val('');
+ $('#yjName').val('');
+ $('#wagesMonth').val('');
let obj = {
- search1:'',
- search2:'',
- search3:''
+ proName:'',
+ yjName:'',fgsId:fgsId,
+ wagesMonth:''
}
// 对表格进行重载。id 即 table表格的id
table.reload('table', {
@@ -43,128 +46,133 @@ layui.use(['form','layer','table','laydate'], function () {
init();
});
- // 静态数据
- var tableData = [
- {id: 1, comName: '运检一公司',sName: '昆明运检一站', month: '2024-03', personNum: '21', stationNum: '2,810', specialPatrolNum: '235', messageCost: '1', bonusPenalty: '0', actualRelease: '3,055'},
- {id: 1, comName: '运检一公司',sName: '昆明运检一站', month: '2024-03', personNum: '21', stationNum: '2,810', specialPatrolNum: '235', messageCost: '1', bonusPenalty: '0', actualRelease: '3,055'},
- {id: 1, comName: '运检一公司',sName: '昆明运检一站', month: '2024-03', personNum: '21', stationNum: '2,810', specialPatrolNum: '235', messageCost: '1', bonusPenalty: '0', actualRelease: '3,055'},
- {id: 1, comName: '运检一公司',sName: '昆明运检一站', month: '2024-03', personNum: '21', stationNum: '2,810', specialPatrolNum: '235', messageCost: '1', bonusPenalty: '0', actualRelease: '3,055'},
- {id: 1, comName: '运检一公司',sName: '昆明运检一站', month: '2024-03', personNum: '21', stationNum: '2,810', specialPatrolNum: '235', messageCost: '1', bonusPenalty: '0', actualRelease: '3,055'},
- {id: 1, comName: '运检一公司',sName: '昆明运检一站', month: '2024-03', personNum: '21', stationNum: '2,810', specialPatrolNum: '235', messageCost: '1', bonusPenalty: '0', actualRelease: '3,055'},
- {id: 1, comName: '运检一公司',sName: '昆明运检一站', month: '2024-03', personNum: '21', stationNum: '2,810', specialPatrolNum: '235', messageCost: '1', bonusPenalty: '0', actualRelease: '3,055'},
- {id: 1, comName: '运检一公司',sName: '昆明运检一站', month: '2024-03', personNum: '21', stationNum: '2,810', specialPatrolNum: '235', messageCost: '1', bonusPenalty: '0', actualRelease: '3,055'},
- {id: 1, comName: '运检一公司',sName: '昆明运检一站', month: '2024-03', personNum: '21', stationNum: '2,810', specialPatrolNum: '235', messageCost: '1', bonusPenalty: '0', actualRelease: '3,055'},
- {id: 1, comName: '运检一公司',sName: '昆明运检一站', month: '2024-03', personNum: '21', stationNum: '2,810', specialPatrolNum: '235', messageCost: '1', bonusPenalty: '0', actualRelease: '3,055'},
- {id: 1, comName: '运检一公司',sName: '昆明运检一站', month: '2024-03', personNum: '21', stationNum: '2,810', specialPatrolNum: '235', messageCost: '1', bonusPenalty: '0', actualRelease: '3,055'},
- {id: 1, comName: '运检一公司',sName: '昆明运检一站', month: '2024-03', personNum: '21', stationNum: '2,810', specialPatrolNum: '235', messageCost: '1', bonusPenalty: '0', actualRelease: '3,055'},
- {id: 1, comName: '运检一公司',sName: '昆明运检一站', month: '2024-03', personNum: '21', stationNum: '2,810', specialPatrolNum: '235', messageCost: '1', bonusPenalty: '0', actualRelease: '3,055'},
- {id: 1, comName: '运检一公司',sName: '昆明运检一站', month: '2024-03', personNum: '21', stationNum: '2,810', specialPatrolNum: '235', messageCost: '1', bonusPenalty: '0', actualRelease: '3,055'},
- {id: 1, comName: '运检一公司',sName: '昆明运检一站', month: '2024-03', personNum: '21', stationNum: '2,810', specialPatrolNum: '235', messageCost: '1', bonusPenalty: '0', actualRelease: '3,055'},
- {id: 1, comName: '运检一公司',sName: '昆明运检一站', month: '2024-03', personNum: '21', stationNum: '2,810', specialPatrolNum: '235', messageCost: '1', bonusPenalty: '0', actualRelease: '3,055'},
- {id: 1, comName: '运检一公司',sName: '昆明运检一站', month: '2024-03', personNum: '21', stationNum: '2,810', specialPatrolNum: '235', messageCost: '1', bonusPenalty: '0', actualRelease: '3,055'},
- {id: 1, comName: '运检一公司',sName: '昆明运检一站', month: '2024-03', personNum: '21', stationNum: '2,810', specialPatrolNum: '235', messageCost: '1', bonusPenalty: '0', actualRelease: '3,055'}
- ];
+
/**
* 初始化数据
*/
function init(){
- var subComId = $(window.parent.document).find("select[id='subComId']").val();
// 渲染表格
table.render({
elem: '#table',
where: {
- fgsId: subComId
+ fgsId: fgsId
},
- // url: "/sys/achievement",
+ url: PATH_URL + '/wages/getWagesEscalationList',
page: true,
+ method: 'post',
skin: 'line', // 表格样式
- cols: [[
- {
- title: '序号',
- field: 'zizeng',
- align: 'center',
- type: 'numbers',
- width: '5%'
- },
- {field:'comName', title: '分公司',align: 'center'},
- {field:'sName', title: '运检站',align: 'center'},
- {field:'month', title: '月份',align: 'center'},
- {field:'personNum', title: '人数',align: 'center'},
- {field:'stationNum', title: '巡视运检站（基*次）',align: 'center'},
- {field:'specialPatrolNum', title: '特巡天数（人*天）',align: 'center'},
- {field:'messageCost', title: '通讯费',align: 'center'},
- {field:'bonusPenalty', title: '奖惩',align: 'center'},
- {field:'actualRelease', title: '实发金额',align: 'center'},
- {
- field: '',
- title: '操作',
- align: 'center',
- width: '20%',
- templet: function(d){
- var id= d.id;
- var html = ``
- return html;
- },
- }
- ]],
- data: tableData
+ cols: [
+ [{
+ title: '序号',
+ field: 'zizeng',
+ align: 'center',
+ type: 'numbers'
+ },
+ {
+ field: 'fgsName',
+ title: '分公司',
+ align: 'center',
+ },
+ {
+ field: 'yjName',
+ title: '运检站',
+ align: 'center',
+ },
+ {
+ field: 'wagesMonth',
+ title: '月份',
+ align: 'center',
+ },
+ {
+ field: 'peopleNum',
+ title: '人数',
+ align: 'center',
+ },
+ {
+ field: 'xsNum',
+ title: '巡视运检站（基*次）',
+ align: 'center',
+ },
+ {
+ field: 'txNum',
+ title: '特巡天数（人*天）',
+ align: 'center',
+ width: 170
+ },
+ {
+ field: 'phonePrice',
+ title: '通讯费',
+ align: 'center',
+ width: 170
+ },
+ {
+ field: 'reward',
+ title: '奖惩',
+ align: 'center',
+ },
+ {
+ field: 'wages',
+ title: '实发金额',
+ align: 'center',
+ },
+ {
+ field: '',
+ title: '操作',
+ align: 'center',
+ width: '20%',
+ templet: function(d){
+ var yjId= d.yjId;
+ var yjName= d.yjName;
+ var gsName= d.fgsName;
+ var wagesMonth= d.wagesMonth;
+ var html = ``
+ return html;
+ },
+ }
+ ]
+ ],
});
}
-//详情
-function detailsView(id) {
- /* $.ajax({
- type: 'post',
- contentType: "application/x-www-form-urlencoded",
- url: oiPlanUrl + '/monthlyPlanSubmission/getDataById',
- dataType: 'json',
- data: {
- id: id
- },
- success: function (data) {
- var index = layer.open({
- title: ['详情', 'color:#3B70A1;background-color:#E8ECEB;font-size:20px'],
- type: 2,
- content: './wagesReport/producePayrollDetails.html',
- area: [width, height],
- maxmin: false,
- success: function (layero, index) {
- console.log(data);
- var myIframe = window[layero.find('iframe')[0]['name']];
- myIframe.hideSubmit();
- // var fnc = myIframe.setData(data.data); //aaa()为子页面的方法
- },
- });
- }
- }) */
-
- //测试
+
+/**
+ * 查看
+ * */
+function detailsView(yjId,yjName,gsName,wagesMonth) {
let height = '98%';
let width = '99%';
+ //测试
var index = layer.open({
- title: ['工资清单详情', 'color:#3B70A1;background-color:#E8ECEB;font-size:20px'],
- type: 2,
- content: './wagesStatisticsDetails.html',
- area: [width, height],
- maxmin: false,
- success: function (layero, index) {
- // var myIframe = window[layero.find('iframe')[0]['name']];
- // myIframe.hideSubmit();
- // var fnc = myIframe.setData(data.data); //aaa()为子页面的方法
-
- },
+ title: ['详情', 'color:#3B70A1;background-color:#E8ECEB;font-size:20px'],
+ type: 2,
+ content: './wagesStatisticsDetails.html',
+ area: [width, height],
+ maxmin: false,
+ success: function(layero, index) {
+ // //打开页面成功时执行
+ var myIframe = window[layero.find('iframe')[0]['name']];
+ //getTaskSource()为子页面的方法
+ myIframe.setData(yjId, yjName, gsName, wagesMonth);
+
+ },
});
}
//导出
-function exportData(){
- // let search1 = $('#search1').val();
- // let search2 = $('#search2').val();
- window.location.href = oiPlanUrl + "/monthlyPlanSubmission/export?token=" + token;
+function exportData() {
+ var yjName = $("#yjName").val();
+ var proName = $("#proName").val();
+ var yjName = $("#yjName").val();
+ var wagesMonth = $("#wagesMonth").val();
+
+ window.location.href = PATH_URL + `/wages/exportWagesEscalationDatas?token=` + token +
+ "&yjName=" + yjName +
+ "&proName=" + proName +
+ "&wagesMonth=" + wagesMonth+ "&fgsId=" + fgsId
}
\ No newline at end of file
diff --git a/hxy-web/js/wireManager/attendance/attendance.js b/hxy-web/js/wireManager/attendance/attendance.js
index a99ba80..b73e579 100644
--- a/hxy-web/js/wireManager/attendance/attendance.js
+++ b/hxy-web/js/wireManager/attendance/attendance.js
@@ -38,15 +38,19 @@ layui.use(['form','layer','table','laydate','element'], function () {
if(tabIndex==0){
tableType = 'layui_table1';
initTable1();
+ $("#exportBt").css("display","")
}else if(tabIndex==1){
tableType = 'layui_table2';
initTable2();
+ $("#exportBt").css("display","none")
}else if(tabIndex==2){
tableType = 'layui_table3';
initTable3("", "", "", times[0] + "-" + times[1]);
+ $("#exportBt").css("display","none")
}else{
tableType = 'layui_table1';
initTable1();
+ $("#exportBt").css("display","")
}
});
@@ -355,9 +359,18 @@ function checkView(obj) {
//导出
function exportData() {
- // let search1 = $('#search1').val();
- // let search2 = $('#search2').val();
- window.location.href = oiPlanUrl + "/monthlyPlanSubmission/export?token=" + token;
-
+ var yjId = $(window.parent.document).find("input[id='taskSourceId']").attr("stationId");
+ let userName = $('#userName').val();
+ let proName = $('#proName').val();
+ let yjName = $('#yjName').val();
+ let startMakeMonth = $('#makeMonth').val();
+ let endMakeMonth = $('#makeMonth').val();
+ window.location.href = PATH_URL + `/attendance/exportData?token=` + token
+ + "&userName=" + userName
+ + "&proName=" + proName
+ + "&yjName=" + yjName
+ + "&yjId=" + yjId
+ + "&startMakeMonth=" + startMakeMonth
+ + "&endMakeMonth=" + endMakeMonth
}
\ No newline at end of file
diff --git a/hxy-web/js/wireManager/attendance/attendanceDetail.js b/hxy-web/js/wireManager/attendance/attendanceDetail.js
index 67072b5..9ef871c 100644
--- a/hxy-web/js/wireManager/attendance/attendanceDetail.js
+++ b/hxy-web/js/wireManager/attendance/attendanceDetail.js
@@ -55,6 +55,7 @@ function setData(data){
function getView(data){
+ console.log(data,"data");
var oneMakeList = data.data.oneMakeList;
$("#firstViewBox").html('');
let html1 = ``;
@@ -91,7 +92,7 @@ function getView(data){
${oneMakeList[i].gtName}
- 
+ 
+
-
+ 
+
-
+ 
+
diff --git a/hxy-web/js/wireManager/index.js b/hxy-web/js/wireManager/index.js
index 59ad348..1f5f383 100644
--- a/hxy-web/js/wireManager/index.js
+++ b/hxy-web/js/wireManager/index.js
@@ -337,7 +337,7 @@ function monthRateEcharts(data) {
// 为echarts对象加载数据
myChart.setOption(option);
myChart.on('click', function (params, charts, event) {
- detailsClick();
+ // detailsClick();
});
}
diff --git a/hxy-web/js/wireManager/project/projectImport.js b/hxy-web/js/wireManager/project/projectImport.js
index 8a026d5..ae47744 100644
--- a/hxy-web/js/wireManager/project/projectImport.js
+++ b/hxy-web/js/wireManager/project/projectImport.js
@@ -37,6 +37,7 @@ layui.use(['layer', 'form', 'upload'], function () {
});
function setParam(data){
parentValue = data;
+ $("#yjId").val(data.yjId);
}
function getProjectSelect(proId) {
@@ -45,6 +46,7 @@ function getProjectSelect(proId) {
type: 'post',
url: PATH_URL + "/lineProject/getProList",
data: {
+ yjId:$("#yjId").val()
},
success: function (data) {
console.log("获取工程下拉列表OK");
diff --git a/hxy-web/js/wireManager/project/projectList.js b/hxy-web/js/wireManager/project/projectList.js
index 7b79d82..b390666 100644
--- a/hxy-web/js/wireManager/project/projectList.js
+++ b/hxy-web/js/wireManager/project/projectList.js
@@ -1,4 +1,5 @@
var pers = []
+var yjId = $(window.parent.document).find("input[id='taskSourceId']").attr("stationId");
var table,form,layer;
layui.use(['form','layer','table'], function () {
table = layui.table;
@@ -275,7 +276,8 @@ function importData(){
var myIframe = window[layero.find('iframe')[0]['name']];
var json = {
type: '1',
- proId: ""
+ proId: "",
+ yjId:yjId
}
myIframe.setParam(json)
},
diff --git a/hxy-web/js/wireManager/staff/contractView.js b/hxy-web/js/wireManager/staff/contractView.js
new file mode 100644
index 0000000..83d68ac
--- /dev/null
+++ b/hxy-web/js/wireManager/staff/contractView.js
@@ -0,0 +1,175 @@
+var Base64 = {
+ _keyStr: "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=",
+ encode: function(e) {
+ var t = "";
+ var n, r, i, s, o, u, a;
+ var f = 0;
+ e = Base64._utf8_encode(e);
+ while (f < e.length) {
+ n = e.charCodeAt(f++);
+ r = e.charCodeAt(f++);
+ i = e.charCodeAt(f++);
+ s = n >> 2;
+ o = (n & 3) << 4 | r >> 4;
+ u = (r & 15) << 2 | i >> 6;
+ a = i & 63;
+ if (isNaN(r)) {
+ u = a = 64
+ } else if (isNaN(i)) {
+ a = 64
+ }
+ t = t + this._keyStr.charAt(s) + this._keyStr.charAt(o) + this._keyStr.charAt(u) + this._keyStr.charAt(a)
+ }
+ return t
+ },
+ decode: function(e) {
+ var t = "";
+ var n, r, i;
+ var s, o, u, a;
+ var f = 0;
+ e = e.replace(/[^A-Za-z0-9+/=]/g, "");
+ while (f < e.length) {
+ s = this._keyStr.indexOf(e.charAt(f++));
+ o = this._keyStr.indexOf(e.charAt(f++));
+ u = this._keyStr.indexOf(e.charAt(f++));
+ a = this._keyStr.indexOf(e.charAt(f++));
+ n = s << 2 | o >> 4;
+ r = (o & 15) << 4 | u >> 2;
+ i = (u & 3) << 6 | a;
+ t = t + String.fromCharCode(n);
+ if (u != 64) {
+ t = t + String.fromCharCode(r)
+ }
+ if (a != 64) {
+ t = t + String.fromCharCode(i)
+ }
+ }
+ t = Base64._utf8_decode(t);
+ return t
+ },
+ _utf8_encode: function(e) {
+ e = e.replace(/rn/g, "n");
+ var t = "";
+ for (var n = 0; n < e.length; n++) {
+ var r = e.charCodeAt(n);
+ if (r < 128) {
+ t += String.fromCharCode(r)
+ } else if (r > 127 && r < 2048) {
+ t += String.fromCharCode(r >> 6 | 192);
+ t += String.fromCharCode(r & 63 | 128)
+ } else {
+ t += String.fromCharCode(r >> 12 | 224);
+ t += String.fromCharCode(r >> 6 & 63 | 128);
+ t += String.fromCharCode(r & 63 | 128)
+ }
+ }
+ return t
+ },
+ _utf8_decode: function(e) {
+ var t = "";
+ var n = 0;
+ var r = c1 = c2 = 0;
+ while (n < e.length) {
+ r = e.charCodeAt(n);
+ if (r < 128) {
+ t += String.fromCharCode(r);
+ n++
+ } else if (r > 191 && r < 224) {
+ c2 = e.charCodeAt(n + 1);
+ t += String.fromCharCode((r & 31) << 6 | c2 & 63);
+ n += 2
+ } else {
+ c2 = e.charCodeAt(n + 1);
+ c3 = e.charCodeAt(n + 2);
+ t += String.fromCharCode((r & 15) << 12 | (c2 & 63) << 6 | c3 & 63);
+ n += 3
+ }
+ }
+ return t
+ }
+}
+
+
+var downloadFileName = localStorage.getItem("downloadFileName");
+var filePreviewPath;
+let filePath;
+$(function() {
+ var urlParam=localStorage.getItem("contracturl");
+ console.log(urlParam,"urlParam");
+ setParam(urlParam);
+})
+function setParam(urlParam){
+ filePath = urlParam;
+ if(filePath.indexOf("http") != -1){
+ filePreviewPath = IMG_URL + filePath;
+ }else{
+ filePreviewPath = IMG_URL + filePath;
+ }
+ $("#iframe").attr("src", filePreviewPath);
+ //限制onclick事件只触发一次
+ $("#downloadBtn").one('click',function () {
+ var truePath;
+ if(filePath.indexOf("http") != -1){
+ truePath = filePath;
+ }else{
+ truePath = IMG_URL + filePath;
+ }
+ if(downloadFileName!==null && downloadFileName !== undefined){
+ download(truePath, downloadFileName);
+ localStorage.removeItem("downloadFileName");
+ }else{
+ download(truePath, "电子合同文档");
+ }
+
+
+ });
+}
+
+
+function setParamPro(urlParam){
+ filePath = urlParam;
+ if(filePath.indexOf("http") != -1){
+ filePreviewPath = filePath;
+ }else{
+ filePreviewPath = filePath;
+ }
+ $("#iframe").attr("src", filePreviewPath);
+ //限制onclick事件只触发一次
+ $("#downloadBtn").one('click',function () {
+ var truePath;
+ if(filePath.indexOf("http") != -1){
+ truePath = filePath;
+ }else{
+ truePath = filePath;
+ }
+ if(downloadFileName!==null && downloadFileName !== undefined){
+ download(truePath, downloadFileName);
+ localStorage.removeItem("downloadFileName");
+ }
+ });
+}
+
+
+function setParamPDFs(urlParam){
+ filePath = urlParam;
+ if(filePath.indexOf("http") != -1){
+ filePreviewPath = filePreviewPathAll + "/" + filePath;
+ }else{
+ filePreviewPath = filePreviewPathAll + "/" + filePath;
+ }
+ $("#iframe").attr("src", filePreviewPath);
+
+ var truePath;
+ if(filePath.indexOf("http") != -1){
+ truePath = filePath;
+ }else{
+ truePath = dataPath + "/" + filePath;
+ }
+ if(downloadFileName!==null && downloadFileName !== undefined){
+ download(truePath, downloadFileName);
+ localStorage.removeItem("downloadFileName");
+ }else{
+ download(truePath, "电子合同文档");
+ }
+}
+
diff --git a/hxy-web/js/wireManager/staff/staffAdd.js b/hxy-web/js/wireManager/staff/staffAdd.js
index 15dd54c..18a6e58 100644
--- a/hxy-web/js/wireManager/staff/staffAdd.js
+++ b/hxy-web/js/wireManager/staff/staffAdd.js
@@ -4,6 +4,7 @@ var trainFileNames = [];
var trainFilePaths = [];
var examFileNames = [];
var examFilePaths = [];
+var startWorkFiles = {};
var staffType = "";
var tree;
var transfer;
@@ -61,22 +62,29 @@ layui.use(['element','layer','transfer', 'form', 'upload','laydate','tree'], fun
,multiple: true //是否允许多文件上传，默认未false
,dataType: "json"
,exts: 'pdf'
+ ,accept: 'file'
,number: 1 //最大上传数量
,size: 1024 * 5 //最大文件大小，单位k
,bindAction: '#hideUpload1' //指向一个按钮触发上传
,choose: function(obj){
//将每次选择的文件追加到文件队列
var files = obj.pushFile();
+ startWorkFiles = obj.pushFile();
chosenum=1;
//预读本地文件，如果是多文件，则会遍历。(不支持ie8/9)
obj.preview(function(index, file, result){
var length = $('#demo1 img').length;
- if (length > 2) {
+ if (length > 1) {
delete files[index];//删除指定图片
$(this).remove();
- return layer.msg("附件为1-3张，请勿过多上传", {icon: 5});
+ return layer.msg("附件为1张，请勿过多上传", {icon: 5});
}
- $('#demo1').append('
');
+ if(file.name.indexOf(".pdf") !== -1||file.name.indexOf(".PDF") !== -1){
+ $('#demo1').append('
');
+ }else{
+ $('#demo1').append('');
+ }
+
$('#' + index).bind('dblclick', function () {//双击删除指定预上传图片
delete files[index];//删除指定图片
$(this).remove();
@@ -123,6 +131,26 @@ layui.use(['element','layer','transfer', 'form', 'upload','laydate','tree'], fun
//请求异常回调
}
});
+ var singleClick = false;
+ var singleClickTimer;
+
+ $('#myElement').on('click', function() {
+ singleClick = true;
+ singleClickTimer = setTimeout(function() {
+ singleClick = false;
+ }, 200);
+ });
+
+ $('#myElement').on('dblclick', function(e) {
+ clearTimeout(singleClickTimer);
+ if (singleClick) {
+ alert('Single Click');
+ singleClick = false;
+ } else {
+ alert('Double Click');
+ }
+ e.preventDefault(); // 阻止默认的双击行为（可能会导致滚动或者选中文本等）
+ });
// 渲染开始时间选择器
laydate.render({
elem: '#startTime',
@@ -248,7 +276,7 @@ layui.use(['element','layer','transfer', 'form', 'upload','laydate','tree'], fun
form.on('submit(formDemo)', function (data) {
filedata=data;
if($("#id").val()==''){
- if(chosenum==0){
+ if($.isEmptyObject(startWorkFiles)){
layer.msg("请上传附件！")
return;
}
@@ -266,7 +294,29 @@ layui.use(['element','layer','transfer', 'form', 'upload','laydate','tree'], fun
}
});
});
-
+function electronicContractView(url){
+ let height ='100%';
+ let width = '80%';
+ localStorage.setItem("contracturl", url);
+ let layerIndex = parent.layer.open({
+ id: 'layer-electronicContract',
+ title: ['详情', 'color:#3B70A1;background-color:#E8ECEB;font-size:20px'],
+ type: 2,
+ content: 'contractView.html',
+ area: [width, height],
+ maxmin: false,
+ shadeClose: false, //开启遮罩关闭
+ shade: 0.3, //显示遮罩
+ move: false,
+ resize: false,
+ success:function(layero,index){
+ $(window).resize(function () {
+ if (autoResizeWidth) autoResizeWidth(index);
+ if (autoResizeHeight) autoResizeHeight(index);
+ })
+ },
+ });
+}
function initProSelect(arr){
var yj_id=localStorage.getItem("oneselectyj");
@@ -600,6 +650,12 @@ function setData2(data) {
$("#fileName").val(data.fileName);
$("#filePath").val(data.filePath);
$("#pdfPath").val(data.pdfPath);
+ $('#demo1').empty();
+ if(data.filePath.indexOf(".pdf") !== -1||data.filePath.indexOf(".PDF") !== -1){
+ $('#demo1').append('');
+ }else{
+ $('#demo1').append('');
+ }
// getTaskSource("taskSourceId",data[0].taskSourceId);
// $("#taskSourceId").val(data[0].taskSourceId);
// 首先移除所有选项的 pass 类
diff --git a/hxy-web/js/wireManager/viewResult/patrolOutsideAdd.js b/hxy-web/js/wireManager/viewResult/patrolOutsideAdd.js
index 0ccd3e0..f176c0f 100644
--- a/hxy-web/js/wireManager/viewResult/patrolOutsideAdd.js
+++ b/hxy-web/js/wireManager/viewResult/patrolOutsideAdd.js
@@ -40,6 +40,9 @@ layui.use(['form', 'table', 'upload', 'laydate'], function () {
form.on('submit(formDemo)', function (data) {
console.log(data)
+ if($.isEmptyObject(startWorkFiles)){
+ layer.msg("请上传文件！")
+ }
checkGt(data.field.gtId);
// $("#hideUpload").trigger("click");
});
@@ -56,7 +59,7 @@ function checkGt(gtid){
dataType: 'json',
async:false,
data: {
- gtid:gtid,makeTime:$("#dataTime").val()
+ gtId:gtid,makeTime:$("#dataTime").val()
},
success: function (res) {
if(res.code==200){
@@ -188,7 +191,7 @@ function uploadFile(){
}else{
layer.msg('最多上传2张照片',{icon:2})
}
- addDelete(startWorkFiles);
+ addDelete(startWorkFiles,obj.pushFile(),index);
});
},
before: function (obj) {
@@ -259,13 +262,13 @@ function delPhoto(i,id) {
$("#preview" + i).css("display", "none");
}
}
-function addDelete(arr) {
+function addDelete(arr,pusharr,index) {
$('#demo').click(function (e) {
var target = $(e.target)
if (target.hasClass('handle') || target.hasClass('layui-icon')) {
var dataIdx = target.attr('data-idx')
var filePath = $('#' + dataIdx).children().children().next().attr('file')
- delete arr[dataIdx]; // 通过获取绑定在标签上的index，删除files对象中对应的key属性即可
+ delete pusharr[index]; // 通过获取绑定在标签上的index，删除files对象中对应的key属性即可
target.parents('.item').remove() // 页面文件标签也删除
}
});
diff --git a/hxy-web/js/wireManager/viewResult/specialPatrolAdd.js b/hxy-web/js/wireManager/viewResult/specialPatrolAdd.js
index f07aff5..1989e31 100644
--- a/hxy-web/js/wireManager/viewResult/specialPatrolAdd.js
+++ b/hxy-web/js/wireManager/viewResult/specialPatrolAdd.js
@@ -21,6 +21,9 @@ layui.use(['form', 'table', 'upload', 'laydate'], function () {
uploadFile();
form.on('submit(formDemo)', function (data) {
+ if($.isEmptyObject(startWorkFiles)){
+ layer.msg("请上传文件！")
+ }
$("#hideUpload").trigger("click");
});
});
@@ -98,7 +101,7 @@ function uploadFile(){
}else{
layer.msg('最多上传2张照片',{icon:2})
}
- addDelete(startWorkFiles);
+ addDelete(startWorkFiles,obj.pushFile(),index);
});
},
before: function (obj) {
@@ -213,13 +216,13 @@ function delPhoto(i,id) {
$("#preview" + i).css("display", "none");
}
}
-function addDelete(arr) {
+function addDelete(arr,pusharr,index) {
$('#demo').click(function (e) {
var target = $(e.target)
if (target.hasClass('handle') || target.hasClass('layui-icon')) {
var dataIdx = target.attr('data-idx')
var filePath = $('#' + dataIdx).children().children().next().attr('file')
- delete arr[dataIdx]; // 通过获取绑定在标签上的index，删除files对象中对应的key属性即可
+ delete pusharr[index]; // 通过获取绑定在标签上的index，删除files对象中对应的key属性即可
target.parents('.item').remove() // 页面文件标签也删除
}
});
diff --git a/hxy-web/js/wireManager/viewResult/uploadPhoto.js b/hxy-web/js/wireManager/viewResult/uploadPhoto.js
index f5fd4ca..2f8c435 100644
--- a/hxy-web/js/wireManager/viewResult/uploadPhoto.js
+++ b/hxy-web/js/wireManager/viewResult/uploadPhoto.js
@@ -23,7 +23,8 @@ layui.use(['form', 'table', 'upload'], function () {
uploadFile();
form.on('submit(formDemo)', function (data) {
- if(urls.length==0){
+ console.log(startWorkFiles,"startWorkFiles")
+ if($.isEmptyObject(startWorkFiles)){
layer.msg("请上传文件！")
}
$("#hideUpload").trigger("click");
@@ -48,7 +49,8 @@ function uploadFile(){
multiple: true, //是否允许多文件上传，默认未false
dataType: "json",
exts: 'jpg|png',
- //acceptMime: 'image/jpg,image/png,image/jpeg,file/pdf,file/xlsx',
+ // acceptMime: 'file',
+ accept: 'file',
auto: false, //是否自动上传 ，默认为true
number: 9, //最大上传数量
// size: 1024*5, //最大文件大小，单位k
@@ -79,7 +81,7 @@ function uploadFile(){
}else{
layer.msg('最多上传1张照片',{icon:2})
}
- addDelete(startWorkFiles);
+ addDelete(startWorkFiles,obj.pushFile(),index);
});
},
before: function (obj) {
@@ -158,13 +160,13 @@ function delPhoto(i,id) {
$("#preview" + i).css("display", "none");
}
}
-function addDelete(arr) {
+function addDelete(arr,pusharr,index) {
$('#demo').click(function (e) {
var target = $(e.target)
if (target.hasClass('handle') || target.hasClass('layui-icon')) {
var dataIdx = target.attr('data-idx')
var filePath = $('#' + dataIdx).children().children().next().attr('file')
- delete arr[dataIdx]; // 通过获取绑定在标签上的index，删除files对象中对应的key属性即可
+ delete pusharr[index]; // 通过获取绑定在标签上的index，删除files对象中对应的key属性即可
target.parents('.item').remove() // 页面文件标签也删除
}
});
diff --git a/hxy-web/js/wireManager/viewResult/uploadSpecialPhoto.js b/hxy-web/js/wireManager/viewResult/uploadSpecialPhoto.js
index e7deb3a..aee3bb3 100644
--- a/hxy-web/js/wireManager/viewResult/uploadSpecialPhoto.js
+++ b/hxy-web/js/wireManager/viewResult/uploadSpecialPhoto.js
@@ -23,7 +23,7 @@ layui.use(['form', 'table', 'upload'], function () {
uploadFile();
form.on('submit(formDemo)', function (data) {
- if(urls.length==0){
+ if($.isEmptyObject(startWorkFiles)){
layer.msg("请上传文件！")
}
$("#hideUpload").trigger("click");
@@ -79,7 +79,7 @@ function uploadFile(){
}else{
layer.msg('最多上传1张照片',{icon:2})
}
- addDelete(startWorkFiles);
+ addDelete(startWorkFiles,obj.pushFile(),index);
});
},
before: function (obj) {
@@ -158,13 +158,13 @@ function delPhoto(i,id) {
$("#preview" + i).css("display", "none");
}
}
-function addDelete(arr) {
+function addDelete(arr,pusharr,index) {
$('#demo').click(function (e) {
var target = $(e.target)
if (target.hasClass('handle') || target.hasClass('layui-icon')) {
var dataIdx = target.attr('data-idx')
var filePath = $('#' + dataIdx).children().children().next().attr('file')
- delete arr[dataIdx]; // 通过获取绑定在标签上的index，删除files对象中对应的key属性即可
+ delete pusharr[index];// 通过获取绑定在标签上的index，删除files对象中对应的key属性即可
target.parents('.item').remove() // 页面文件标签也删除
}
});
diff --git a/hxy-web/js/wireManager/viewResult/viewResult.js b/hxy-web/js/wireManager/viewResult/viewResult.js
index 5c761d1..05283af 100644
--- a/hxy-web/js/wireManager/viewResult/viewResult.js
+++ b/hxy-web/js/wireManager/viewResult/viewResult.js
@@ -53,8 +53,12 @@ layui.use(['form','layer','table','laydate'], function () {
detailsView(obj.data.id,obj.data.userId,obj.data.makeMonth);
break;
case 'uploadResult':
- console.log('上传结果',obj.data.id,obj.data.userId)
- updateView(obj.data.id,obj.data.userId,obj.data.makeMonth);
+ console.log('上传结果',obj.data.id,obj.data.userId)
+ if(obj.data.isUpdate==0){
+ updateView(obj.data.id,obj.data.userId,obj.data.makeMonth);
+ }else{
+ layer.msg("该月工资已生成。")
+ }
break;
}
});
diff --git a/hxy-web/js/wireManager/viewResult/viewResultDetails.js b/hxy-web/js/wireManager/viewResult/viewResultDetails.js
index ef3ddd9..44cfa9b 100644
--- a/hxy-web/js/wireManager/viewResult/viewResultDetails.js
+++ b/hxy-web/js/wireManager/viewResult/viewResultDetails.js
@@ -396,12 +396,13 @@ function getView(){
//页面赋值
function setData(){
var id=localStorage.getItem("resultUserId");
+ var makeMonth=localStorage.getItem("resultMakeMonth");
$.ajax({//id获取详情打开弹窗传值子页面
type: 'post',
url: PATH_URL + "/makeInfo/getUserDetail",
dataType: 'json',
data: {
- id: id
+ id: id,makeMonth:makeMonth
},
success: function (data) {
$("#username").text(data.data.userName);
diff --git a/hxy-web/js/wireManager/viewResult/viewResultUpdate.js b/hxy-web/js/wireManager/viewResult/viewResultUpdate.js
index 27a3f6b..d8ba1dd 100644
--- a/hxy-web/js/wireManager/viewResult/viewResultUpdate.js
+++ b/hxy-web/js/wireManager/viewResult/viewResultUpdate.js
@@ -32,9 +32,8 @@ layui.use(['form','layer','table','laydate','element'], function () {
});
$("#month").val(localStorage.getItem("resultMakeMonth"));
resultMonth=localStorage.getItem("resultMakeMonth")
- init(year,month)
setData()
-
+ init(year,month)
});
function firstDayStr(){
var today = new Date();
@@ -258,10 +257,14 @@ function getView(){
html +=`
+ 
+ `
+ }
+ html +=`
');
+ }else{
+ $('#demo1').append('');
+ }else{
+ $('#demo1').append('');
+ }
// getTaskSource("taskSourceId",data[0].taskSourceId);
// $("#taskSourceId").val(data[0].taskSourceId);
// 首先移除所有选项的 pass 类
diff --git a/hxy-web/js/wireManager/viewResult/patrolOutsideAdd.js b/hxy-web/js/wireManager/viewResult/patrolOutsideAdd.js
index 0ccd3e0..f176c0f 100644
--- a/hxy-web/js/wireManager/viewResult/patrolOutsideAdd.js
+++ b/hxy-web/js/wireManager/viewResult/patrolOutsideAdd.js
@@ -40,6 +40,9 @@ layui.use(['form', 'table', 'upload', 'laydate'], function () {
form.on('submit(formDemo)', function (data) {
console.log(data)
+ if($.isEmptyObject(startWorkFiles)){
+ layer.msg("请上传文件！")
+ }
checkGt(data.field.gtId);
// $("#hideUpload").trigger("click");
});
@@ -56,7 +59,7 @@ function checkGt(gtid){
dataType: 'json',
async:false,
data: {
- gtid:gtid,makeTime:$("#dataTime").val()
+ gtId:gtid,makeTime:$("#dataTime").val()
},
success: function (res) {
if(res.code==200){
@@ -188,7 +191,7 @@ function uploadFile(){
}else{
layer.msg('最多上传2张照片',{icon:2})
}
- addDelete(startWorkFiles);
+ addDelete(startWorkFiles,obj.pushFile(),index);
});
},
before: function (obj) {
@@ -259,13 +262,13 @@ function delPhoto(i,id) {
$("#preview" + i).css("display", "none");
}
}
-function addDelete(arr) {
+function addDelete(arr,pusharr,index) {
$('#demo').click(function (e) {
var target = $(e.target)
if (target.hasClass('handle') || target.hasClass('layui-icon')) {
var dataIdx = target.attr('data-idx')
var filePath = $('#' + dataIdx).children().children().next().attr('file')
- delete arr[dataIdx]; // 通过获取绑定在标签上的index，删除files对象中对应的key属性即可
+ delete pusharr[index]; // 通过获取绑定在标签上的index，删除files对象中对应的key属性即可
target.parents('.item').remove() // 页面文件标签也删除
}
});
diff --git a/hxy-web/js/wireManager/viewResult/specialPatrolAdd.js b/hxy-web/js/wireManager/viewResult/specialPatrolAdd.js
index f07aff5..1989e31 100644
--- a/hxy-web/js/wireManager/viewResult/specialPatrolAdd.js
+++ b/hxy-web/js/wireManager/viewResult/specialPatrolAdd.js
@@ -21,6 +21,9 @@ layui.use(['form', 'table', 'upload', 'laydate'], function () {
uploadFile();
form.on('submit(formDemo)', function (data) {
+ if($.isEmptyObject(startWorkFiles)){
+ layer.msg("请上传文件！")
+ }
$("#hideUpload").trigger("click");
});
});
@@ -98,7 +101,7 @@ function uploadFile(){
}else{
layer.msg('最多上传2张照片',{icon:2})
}
- addDelete(startWorkFiles);
+ addDelete(startWorkFiles,obj.pushFile(),index);
});
},
before: function (obj) {
@@ -213,13 +216,13 @@ function delPhoto(i,id) {
$("#preview" + i).css("display", "none");
}
}
-function addDelete(arr) {
+function addDelete(arr,pusharr,index) {
$('#demo').click(function (e) {
var target = $(e.target)
if (target.hasClass('handle') || target.hasClass('layui-icon')) {
var dataIdx = target.attr('data-idx')
var filePath = $('#' + dataIdx).children().children().next().attr('file')
- delete arr[dataIdx]; // 通过获取绑定在标签上的index，删除files对象中对应的key属性即可
+ delete pusharr[index]; // 通过获取绑定在标签上的index，删除files对象中对应的key属性即可
target.parents('.item').remove() // 页面文件标签也删除
}
});
diff --git a/hxy-web/js/wireManager/viewResult/uploadPhoto.js b/hxy-web/js/wireManager/viewResult/uploadPhoto.js
index f5fd4ca..2f8c435 100644
--- a/hxy-web/js/wireManager/viewResult/uploadPhoto.js
+++ b/hxy-web/js/wireManager/viewResult/uploadPhoto.js
@@ -23,7 +23,8 @@ layui.use(['form', 'table', 'upload'], function () {
uploadFile();
form.on('submit(formDemo)', function (data) {
- if(urls.length==0){
+ console.log(startWorkFiles,"startWorkFiles")
+ if($.isEmptyObject(startWorkFiles)){
layer.msg("请上传文件！")
}
$("#hideUpload").trigger("click");
@@ -48,7 +49,8 @@ function uploadFile(){
multiple: true, //是否允许多文件上传，默认未false
dataType: "json",
exts: 'jpg|png',
- //acceptMime: 'image/jpg,image/png,image/jpeg,file/pdf,file/xlsx',
+ // acceptMime: 'file',
+ accept: 'file',
auto: false, //是否自动上传 ，默认为true
number: 9, //最大上传数量
// size: 1024*5, //最大文件大小，单位k
@@ -79,7 +81,7 @@ function uploadFile(){
}else{
layer.msg('最多上传1张照片',{icon:2})
}
- addDelete(startWorkFiles);
+ addDelete(startWorkFiles,obj.pushFile(),index);
});
},
before: function (obj) {
@@ -158,13 +160,13 @@ function delPhoto(i,id) {
$("#preview" + i).css("display", "none");
}
}
-function addDelete(arr) {
+function addDelete(arr,pusharr,index) {
$('#demo').click(function (e) {
var target = $(e.target)
if (target.hasClass('handle') || target.hasClass('layui-icon')) {
var dataIdx = target.attr('data-idx')
var filePath = $('#' + dataIdx).children().children().next().attr('file')
- delete arr[dataIdx]; // 通过获取绑定在标签上的index，删除files对象中对应的key属性即可
+ delete pusharr[index]; // 通过获取绑定在标签上的index，删除files对象中对应的key属性即可
target.parents('.item').remove() // 页面文件标签也删除
}
});
diff --git a/hxy-web/js/wireManager/viewResult/uploadSpecialPhoto.js b/hxy-web/js/wireManager/viewResult/uploadSpecialPhoto.js
index e7deb3a..aee3bb3 100644
--- a/hxy-web/js/wireManager/viewResult/uploadSpecialPhoto.js
+++ b/hxy-web/js/wireManager/viewResult/uploadSpecialPhoto.js
@@ -23,7 +23,7 @@ layui.use(['form', 'table', 'upload'], function () {
uploadFile();
form.on('submit(formDemo)', function (data) {
- if(urls.length==0){
+ if($.isEmptyObject(startWorkFiles)){
layer.msg("请上传文件！")
}
$("#hideUpload").trigger("click");
@@ -79,7 +79,7 @@ function uploadFile(){
}else{
layer.msg('最多上传1张照片',{icon:2})
}
- addDelete(startWorkFiles);
+ addDelete(startWorkFiles,obj.pushFile(),index);
});
},
before: function (obj) {
@@ -158,13 +158,13 @@ function delPhoto(i,id) {
$("#preview" + i).css("display", "none");
}
}
-function addDelete(arr) {
+function addDelete(arr,pusharr,index) {
$('#demo').click(function (e) {
var target = $(e.target)
if (target.hasClass('handle') || target.hasClass('layui-icon')) {
var dataIdx = target.attr('data-idx')
var filePath = $('#' + dataIdx).children().children().next().attr('file')
- delete arr[dataIdx]; // 通过获取绑定在标签上的index，删除files对象中对应的key属性即可
+ delete pusharr[index];// 通过获取绑定在标签上的index，删除files对象中对应的key属性即可
target.parents('.item').remove() // 页面文件标签也删除
}
});
diff --git a/hxy-web/js/wireManager/viewResult/viewResult.js b/hxy-web/js/wireManager/viewResult/viewResult.js
index 5c761d1..05283af 100644
--- a/hxy-web/js/wireManager/viewResult/viewResult.js
+++ b/hxy-web/js/wireManager/viewResult/viewResult.js
@@ -53,8 +53,12 @@ layui.use(['form','layer','table','laydate'], function () {
detailsView(obj.data.id,obj.data.userId,obj.data.makeMonth);
break;
case 'uploadResult':
- console.log('上传结果',obj.data.id,obj.data.userId)
- updateView(obj.data.id,obj.data.userId,obj.data.makeMonth);
+ console.log('上传结果',obj.data.id,obj.data.userId)
+ if(obj.data.isUpdate==0){
+ updateView(obj.data.id,obj.data.userId,obj.data.makeMonth);
+ }else{
+ layer.msg("该月工资已生成。")
+ }
break;
}
});
diff --git a/hxy-web/js/wireManager/viewResult/viewResultDetails.js b/hxy-web/js/wireManager/viewResult/viewResultDetails.js
index ef3ddd9..44cfa9b 100644
--- a/hxy-web/js/wireManager/viewResult/viewResultDetails.js
+++ b/hxy-web/js/wireManager/viewResult/viewResultDetails.js
@@ -396,12 +396,13 @@ function getView(){
//页面赋值
function setData(){
var id=localStorage.getItem("resultUserId");
+ var makeMonth=localStorage.getItem("resultMakeMonth");
$.ajax({//id获取详情打开弹窗传值子页面
type: 'post',
url: PATH_URL + "/makeInfo/getUserDetail",
dataType: 'json',
data: {
- id: id
+ id: id,makeMonth:makeMonth
},
success: function (data) {
$("#username").text(data.data.userName);
diff --git a/hxy-web/js/wireManager/viewResult/viewResultUpdate.js b/hxy-web/js/wireManager/viewResult/viewResultUpdate.js
index 27a3f6b..d8ba1dd 100644
--- a/hxy-web/js/wireManager/viewResult/viewResultUpdate.js
+++ b/hxy-web/js/wireManager/viewResult/viewResultUpdate.js
@@ -32,9 +32,8 @@ layui.use(['form','layer','table','laydate','element'], function () {
});
$("#month").val(localStorage.getItem("resultMakeMonth"));
resultMonth=localStorage.getItem("resultMakeMonth")
- init(year,month)
setData()
-
+ init(year,month)
});
function firstDayStr(){
var today = new Date();
@@ -258,10 +257,14 @@ function getView(){
html +=``
}
html += `
- ${gtName}
-
-
-
+ ${gtName} `
+ if("1"==viewList1[i].state||"1"==viewList1[i].makeType){
+ html +=`
+
- ${gtName}
-
-
-
+
+ `
+ }
+ html +=``
var flag = false;
for (var j = 0; j < photoList1.length; j++) {
@@ -272,10 +275,16 @@ function getView(){
break;
}
}
+ var usernamed=$("#username").text();
if(!flag){
//照片不存在，显示上传照片按钮
- html += `
- `
+ html += ``
+ html += `
+
+ `
+ }
+ html +=`
- 上传图片
`
+ if("1"==viewList1[i].state){
+ html += ``
+ html += `上传图片
`
+ }else{
+ html += ``
+ html += `该杆塔不属于${usernamed}管辖
`
+ }
}
html += `
+ `
+ if("1"==viewList2[i].state||"1"==viewList2[i].makeType){
+ html +=`
+
+
+ `
+ }
+ html +=``
var flag = false;
for (var j = 0; j < photoList2.length; j++) {
@@ -347,10 +361,16 @@ function getView(){
break;
}
}
+ var usernamed=$("#username").text();
if(!flag){
//照片不存在，显示上传照片按钮
- html += `
- `
+ html += ``
+ html += `
- 上传图片
`
+ if("1"==viewList2[i].state){
+ html += ``
+ html += `上传图片
`
+ }else{
+ html += ``
+ html += `该杆塔不属于${usernamed}管辖
`
+ }
}
html += `