巡视计划

hxy-web/html/wireManager/wagesReport/producePayroll.html

@@ -134,7 +134,7 @@
 				注意：生成工资清单后，此月份不可再更新巡视结果
 			</div>
 			<div id="month">
-				<input type="text" class="layui-input" autocomplete="off" id="wagesMonth" name="wagesMonth" placeholder="选择月份" >
+				<input type="text" class="layui-input" autocomplete="off" id="wagesMonth" name="wagesMonth" placeholder="选择月份" readonly >
 			</div>
 		</div>
         <div style="height: 74%;width: 98%;display: flex;flex-direction: column;margin: 0 auto;background-color: #FFFFFF;border-radius: 10px;padding: 10px;overflow: auto;"> 

hxy-web/html/wireManager/wagesReport/producePayrollDetails.html

@@ -159,7 +159,7 @@
 			
 			
 			<div id="month">
-				<input type="text" class="layui-input" autocomplete="off" id="wagesMonth" name="wagesMonth" placeholder="选择月份" >
+				<input type="text" class="layui-input" autocomplete="off" id="wagesMonth" name="wagesMonth" placeholder="选择月份" readonly >
 			</div>
 		</div>
         <div style="height: 83%;width: 98%;display: flex;flex-direction: column;margin: 0 auto;background-color: #FFFFFF;border-radius: 10px;padding: 10px;overflow: auto;"> 

hxy-web/html/wireManager/wagesReport/producePayrollUpdate.html

@@ -134,7 +134,7 @@
 				注意：生成工资清单后，此月份不可再更新巡视结果
 			</div>
 			<div id="month">
-				<input type="text" class="layui-input" autocomplete="off" id="wagesMonth" name="wagesMonth" placeholder="选择月份" >
+				<input type="text" class="layui-input" autocomplete="off" id="wagesMonth" name="wagesMonth" placeholder="选择月份" readonly >
 			</div>
 		</div>
         <div style="height: 74%;width: 98%;display: flex;flex-direction: column;margin: 0 auto;background-color: #FFFFFF;border-radius: 10px;padding: 10px;overflow: auto;"> 

hxy-web/js/wireManager/wagesReport/producePayroll.js

@@ -2,33 +2,7 @@ var yjId = $(window.parent.parent.document).find("input[id='taskSourceId']").att
 var pers = []
 var table,form,layer,laydate;
 var times = getCurrentDateTimeArr();
-layui.use(['form','layer','table', 'laydate'], function () {
-    table = layui.table;
-    form = layui.form;
-	layer = layui.layer;
-	laydate = layui.laydate;
 
-	// 渲染时间选择器
-	laydate.render({
-	    elem: '#wagesMonth',
-	    type: 'month',
-	    format: 'yyyy-MM',
-	    fullPanel: true,
-		value: times[0] + "-" + times[1]
-	});
-
-	//取消按钮点击
-	$("#closeBt").click(() => {
-		var index = parent.layer.getFrameIndex(window.name); //先得到当前 iframe层的索引
-		parent.layer.close(index); //再执行关闭
-	})
-	//保存按钮点击
-	$("#submitBt").click(() => {
-		save();
-	})
-	
-    init();
-});
 
 //查询
 function queryClick(){
@@ -58,11 +32,43 @@ function resetClick(){
 
 //页面赋值
 function setData(yjId,yjName,gsName){
+	localStorage.setItem("sx","")
+	layui.use(['form','layer','table', 'laydate'], function () {
+	    table = layui.table;
+	    form = layui.form;
+		layer = layui.layer;
+		laydate = layui.laydate;
+		
+		// 渲染时间选择器
+		laydate.render({
+		    elem: '#wagesMonth',
+		    type: 'month',
+		    format: 'yyyy-MM',
+		    fullPanel: true,
+			value: times[0] + "-" + times[1],
+			done: function (value, date) {//时间回调
+			    queryClick()
+			}
+		});
+	
+		//取消按钮点击
+		$("#closeBt").click(() => {
+			var index = parent.layer.getFrameIndex(window.name); //先得到当前 iframe层的索引
+			parent.layer.close(index); //再执行关闭
+		})
+		//保存按钮点击
+		$("#submitBt").click(() => {
+			save();
+		})
+		
+	    init();
+		
+		
 		$.ajax({
 		    type: 'POST',
 		    url: PATH_URL + '/wages/getWagesNum',
 		    contentType: "application/json; charset=utf-8",
-	    data: JSON.stringify({"userName": '', "proName": ''}),
+		    data: JSON.stringify({"yjId":yjId,"wagesMonth":$('#wagesMonth').val(),"userName": '', "proName": ''}),
 		    success: function (data) {
 				if(data.code == '200'){
 					$("#inspectionStation").text(yjName);
@@ -73,6 +79,7 @@ function setData(yjId,yjName,gsName){
 				
 		    }
 		})
+	});
 }
     
 /**
@@ -99,7 +106,7 @@ function init(){
             type: 'numbers'
         },
         {field:'userName', title: '姓 名',align: 'center',},
-        {field:'idCard', title: '身份证号',align: 'center',},
+        {field:'idNumber', title: '身份证号',align: 'center',},
         {field:'proName', title: '管辖线路名称',align: 'center',},
         {field:'phone', title: '手机号',align: 'center',},
         {field:'bank', title: '开户行',align: 'center',},
@@ -337,6 +344,7 @@ function save(){
 	    success: function (data) {
 	        layer.close(loadingMsg); // 关闭提示层
 	        if(data.code == 200){
+				localStorage.setItem("sx","1")
 	            parent.layer.msg("添加成功", { icon: 1 });
 	            var index = parent.layer.getFrameIndex(window.name); //先得到当前 iframe层的索引
 	            parent.layer.close(index); //再执行关闭

hxy-web/js/wireManager/wagesReport/producePayrollDetails.js

@@ -8,13 +8,13 @@ layui.use(['form','layer','table', 'laydate'], function () {
 	layer = layui.layer;
 	laydate = layui.laydate;
 	// 渲染时间选择器
-	laydate.render({
+	// laydate.render({
-	    elem: '#wagesMonth',
+	//     elem: '#wagesMonth',
-	    type: 'month',
+	//     type: 'month',
-	    format: 'yyyy-MM',
+	//     format: 'yyyy-MM',
-	    fullPanel: true,
+	//     fullPanel: true,
-		value: times[0] + "-" + times[1]
+	// 	value: times[0] + "-" + times[1]
-	});
+	// });
 
 	//取消按钮点击
 	$("#closeBt").click(() => {

hxy-web/js/wireManager/wagesReport/producePayrollUpdate.js

@@ -9,13 +9,13 @@ layui.use(['form','layer','table','laydate'], function () {
 	laydate = layui.laydate;
 	
 	// 渲染时间选择器
-	laydate.render({
+	// laydate.render({
-	    elem: '#wagesMonth',
+	//     elem: '#wagesMonth',
-	    type: 'month',
+	//     type: 'month',
-	    format: 'yyyy-MM',
+	//     format: 'yyyy-MM',
-	    fullPanel: true,
+	//     fullPanel: true,
-		value: times[0] + "-" + times[1]
+	// 	value: times[0] + "-" + times[1]
-	});
+	// });
 	
 	//取消按钮点击
 	$("#closeBt").click(() => {
@@ -58,12 +58,13 @@ function resetClick(){
 
 //页面赋值
 function setData(yjId,yjName,gsName,wagesMonth){
+	localStorage.setItem("sx","")
 	$("#wagesMonth").val(wagesMonth);
 	$.ajax({
 	    type: 'POST',
 	    url: PATH_URL + '/wages/getWagesNum',
 	    contentType: "application/json; charset=utf-8",
-	    data: JSON.stringify({"userName": '', "proName": ''}),
+	    data: JSON.stringify({"yjId":yjId,"wagesMonth":wagesMonth,"userName": '', "proName": ''}),
 	    success: function (data) {
 			if(data.code == '200'){
 				$("#inspectionStation").text(yjName);
@@ -275,6 +276,9 @@ function updateWages(){
 	let loadingMsg = layer.msg('数据上传中,请稍候...', {icon: 16, scrollbar: false, time: 0, shade: [0.8, '#393D49']});
 	// form请求地址
 	let formUrl = PATH_URL + "/wages/updateWages";
+	
+
+	
 	$.ajax({
 	    type: 'POST',
 	    contentType: "application/json; charset=utf-8",
@@ -283,6 +287,7 @@ function updateWages(){
 	    success: function (data) {
 	        layer.close(loadingMsg); // 关闭提示层
 	        if(data.code == 200){
+				localStorage.setItem("sx","1")
 	            parent.layer.msg("修改成功", { icon: 1 });
 	            var index = parent.layer.getFrameIndex(window.name); //先得到当前 iframe层的索引
 	            parent.layer.close(index); //再执行关闭

hxy-web/js/wireManager/wagesReport/wagesReportList.js

@@ -44,8 +44,10 @@ function queryClick(){
 
 	table.reload('layui_table', {
 		// //设定异步数据接口的额外参数
-	    page:{curr : 1}
+		page: {
-	    ,where:{
+			curr: 1
+		},
+		where: {
 			yjName: yjName,
 			startWagesMonth: startWagesMonth,
 			endWagesMonth: endWagesMonth,
@@ -53,6 +55,7 @@ function queryClick(){
 		}
 	})
 }
+
 function resetClick() {
 	var yjId = $(window.parent.document).find("input[id='taskSourceId']").attr("stationId");
 	$("#yjName").val('');
@@ -61,8 +64,10 @@ function resetClick(){
 	// 对表格进行重载。id 即 table表格的id
 	table.reload('layui_table', {
 		// //设定异步数据接口的额外参数
-	    page:{curr : 1}
+		page: {
-	    ,where: {
+			curr: 1
+		},
+		where: {
 			yjName: '',
 			startWagesMonth: '',
 			endWagesMonth: '',
@@ -87,29 +92,68 @@ function init(){
 		page: true, //开启分页
 		method: 'post',
 		skin: 'line', // 表格样式
-    cols: [[
+		cols: [
-        {
+			[{
 					title: '序号',
 					field: 'zizeng',
 					align: 'center',
 					type: 'numbers'
 				},
-        {field:'fgsName', title: '分公司',align: 'center',},
+				{
-        {field:'yjName', title: '运检站',align: 'center',},
+					field: 'fgsName',
-        {field:'wagesMonth', title: '月份',align: 'center',},
+					title: '分公司',
-        {field:'peopleNum', title: '人数',align: 'center',},
+					align: 'center',
-        {field:'xsNum', title: '巡视运检站（基*次）',align: 'center',},
+				},
-        {field:'txNum', title: '特巡天数（人*天）',align: 'center',width:170},
+				{
-        {field:'phonePrice', title: '通讯费',align: 'center',width:170},
+					field: 'yjName',
-        {field:'reward', title: '奖惩',align: 'center', },
+					title: '运检站',
-		{field:'wages', title: '实发金额',align: 'center', },
+					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',
+				},
 				{
 					title: '操作',
 					toolbar: '#opeator-bar',
 					align: 'center',
 					width: 200
 				}
-    ]],
+			]
+		],
 		done: function(res, curr, count) {
 			//checkPermission();
 		}
@@ -140,8 +184,11 @@ function add() {
 
 		},
 		end: function() {
+			var sx = localStorage.getItem("sx")
+			if (sx == "1") {
 				queryClick();
 			}
+		}
 	});
 }
 
@@ -201,6 +248,13 @@ function updateView(id) {
 			//getTaskSource()为子页面的方法
 			myIframe.setData(yjId, yjName, gsName, wagesMonth);
 		},
+		end: function() {
+			var sx = localStorage.getItem("sx")
+			if (sx == "1") {
+				queryClick();
+			}
+
+		}
 	});
 }
 
@@ -215,14 +269,21 @@ function delView(yjId, wagesMonth) {
 			type: 'post',
 			url: PATH_URL + '/wages/delWagesId',
 			contentType: "application/json; charset=utf-8",
-			data: JSON.stringify({'yjId': yjId, 'wagesMonth': wagesMonth}),
+			data: JSON.stringify({
+				'yjId': yjId,
+				'wagesMonth': wagesMonth
+			}),
 			success: function(data) {
 				layer.close(index);
 				if (data.code == 200) {
-					parent.layer.msg('删除成功', {icon: 1});
+					parent.layer.msg('删除成功', {
+						icon: 1
+					});
 					queryClick();
 				} else {
-					layer.msg("删除失败", {icon: 2}, function () {
+					layer.msg("删除失败", {
+						icon: 2
+					}, function() {
 						// example.ajax.reload(); // 刷新页面
 					});
 				}
@@ -247,10 +308,8 @@ function importData(){
 			var json = {'proIds': proId}
 			myIframe.setParams(json)*/
 		},
-        yes: function (index, layero) {
+		yes: function(index, layero) {},
-        },
+		end: function() {}
-        end: function () {
-        }
 	});
 }
 
@@ -268,10 +327,14 @@ function importDataThread(formData, idx) {
 		success: function(data) {
 			layer.close(idx);
 			if (data.code == 200) {
-                layer.alert(data.data, {icon: 1});
+				layer.alert(data.data, {
+					icon: 1
+				});
 				// example.ajax.reload(); // 刷新页面
 			} else {
-                layer.alert(data.msg, {icon: 2});
+				layer.alert(data.msg, {
+					icon: 2
+				});
 			}
 
 		},
@@ -288,7 +351,7 @@ function exportData() {
 	var yjName = $("#yjName").val();
 	var wagesMonth = $("#wagesMonth").val();
 
-    window.location.href = PATH_URL + `/wages/exportWagesEscalationData?token=` + token
+	window.location.href = PATH_URL + `/wages/exportWagesEscalationData?token=` + token +
-        + "&yjName=" + yjName
+		"&yjName=" + yjName +
-		+ "&wagesMonth=" + wagesMonth
+		"&wagesMonth=" + wagesMonth
 }