From a4122db3f1871e9f4e4bb622065d058210e0a1ab Mon Sep 17 00:00:00 2001
From: skjia <106962133@qq.com>
Date: Thu, 22 Aug 2024 17:08:53 +0800
Subject: [PATCH] jsk

---
 hxy-web/html/wireManager/staff/staffAdd.html  |  3 +++
 hxy-web/js/dataStatistics/header.js           |  2 +-
 hxy-web/js/dataStatistics/index.js            |  2 +-
 .../viewStatistics/viewStatisticsList.js      |  4 ++++
 .../dataStatistics/workVisa/workVisaList.js   |  4 ++++
 hxy-web/js/wireManager/staff/staffAdd.js      | 19 ++++++++-----------
 hxy-web/js/wireManager/staff/staffList.js     | 10 +++++-----
 .../js/wireManager/viewResult/viewResult.js   |  1 +
 8 files changed, 27 insertions(+), 18 deletions(-)

diff --git a/hxy-web/html/wireManager/staff/staffAdd.html b/hxy-web/html/wireManager/staff/staffAdd.html
index e76bc4b..7cc5f08 100644
--- a/hxy-web/html/wireManager/staff/staffAdd.html
+++ b/hxy-web/html/wireManager/staff/staffAdd.html
@@ -119,6 +119,9 @@
 				<input type="hidden" id="gtId" name="gtId">
 				<input type="hidden" id="proId" name="proId">
 				<input type="hidden" id="userType" name="userType" value="0">
+				<input type="hidden" id="fileName" name="fileName">
+				<input type="hidden" id="filePath" name="filePath">
+				<input type="hidden" id="pdfPath" name="pdfPath">
 				<div class="layui-form-item" style="margin-top: 1%;margin-left: 12%;">
 					<div class="layui-inline" style="width: 90%;" >
 						<span style="border: 3px solid #409EFF;width: 20px;height: 10px;margin-left: 5%"></span>人员基本信息
diff --git a/hxy-web/js/dataStatistics/header.js b/hxy-web/js/dataStatistics/header.js
index 8908500..84db7a4 100644
--- a/hxy-web/js/dataStatistics/header.js
+++ b/hxy-web/js/dataStatistics/header.js
@@ -25,7 +25,7 @@ function init(){
 				
 				for (let i = 0; i < resultObj.length; i++) {
 					if(i==0){
-						localStorage.getItem("selectSubCom",resultObj[i].id);
+						localStorage.setItem("selectSubCom",resultObj[i].id);
 					}
 					html += `<option value="${resultObj[i].id}" style="color: #757575 !important;font-weight: 400 !important;">${resultObj[i].name}</option>`;
 				}
diff --git a/hxy-web/js/dataStatistics/index.js b/hxy-web/js/dataStatistics/index.js
index 648d977..2f68db9 100644
--- a/hxy-web/js/dataStatistics/index.js
+++ b/hxy-web/js/dataStatistics/index.js
@@ -20,7 +20,7 @@ function setData(yjId){
 	}
 	localStorage.setItem("selectyj",yjId);
 	var subComId = $(window.parent.document).find("select[id='subComId']").val(); 
-	
+	localStorage.getItem("selectSubCom",subComId);
 	$.ajax({
 	    type: 'post',
 	    url: PATH_URL + '/lineProjectHomePage/getDataOverview',
diff --git a/hxy-web/js/dataStatistics/viewStatistics/viewStatisticsList.js b/hxy-web/js/dataStatistics/viewStatistics/viewStatisticsList.js
index 024052e..69ff8f4 100644
--- a/hxy-web/js/dataStatistics/viewStatistics/viewStatisticsList.js
+++ b/hxy-web/js/dataStatistics/viewStatistics/viewStatisticsList.js
@@ -175,6 +175,10 @@ function init(){
     elem: '#table',
     url: PATH_URL + "/makeInfo/getListTabs",
     page: true,
+	where:{
+		yjId:localStorage.getItem("selectyj"),
+		subId:localStorage.getItem("selectSubCom")
+	},
 	method:'post',
 	border: true,
 	// data: tableData,
diff --git a/hxy-web/js/dataStatistics/workVisa/workVisaList.js b/hxy-web/js/dataStatistics/workVisa/workVisaList.js
index ec81f61..6ac0fb5 100644
--- a/hxy-web/js/dataStatistics/workVisa/workVisaList.js
+++ b/hxy-web/js/dataStatistics/workVisa/workVisaList.js
@@ -82,6 +82,10 @@ function init(){
   table.render({
     elem: '#table',
     url: PATH_URL + "/workvisa/getListTab",
+	where:{
+		yjId:localStorage.getItem("selectyj"),
+		subId:localStorage.getItem("selectSubCom")
+	},
     page: true,
 	method:'post',
     skin: 'line', // 表格样式
diff --git a/hxy-web/js/wireManager/staff/staffAdd.js b/hxy-web/js/wireManager/staff/staffAdd.js
index bff4a55..03c9333 100644
--- a/hxy-web/js/wireManager/staff/staffAdd.js
+++ b/hxy-web/js/wireManager/staff/staffAdd.js
@@ -89,6 +89,9 @@ layui.use(['element','layer','transfer', 'form', 'upload','laydate','tree'], fun
             console.log(res,"upload");
 			purl=purl+res.data.url+",";
 			pname=pname+res.data.name+",";
+			$("#fileName").val(res.data.name);
+			$("#filePath").val(res.data.url);
+			$("#pdfPath").val(res.data.url);
         },
 		allDone: function (data) {
 			var userType=$("#userType").val();
@@ -263,14 +266,6 @@ function initProSelect(arr){
         },
         dataType:"json",
         success:function(res){
-   //          $("#proName").unbind();
-   //          $("#proName option:gt(0)").remove();
-   //          var html="";
-   //          for(var i=0;i<res.data.length;i++){
-   //              html+="<option value='"+res.data[i].id+"'>"+ res.data[i].title +"</option>";
-   //          }
-   //          $("#proName").append(html);
-			// formSelects.value('proName', [2]); 
 			var data=[];
 			for(var i=0;i<res.data.length;i++){
 				var obj={};
@@ -499,7 +494,6 @@ function addData(formData) {
                layer.close(loadingMsg); // 关闭提示层
                if(data.code == 200){
                    layer.msg("新增成功");
-				     $("#hideUpload1").trigger("click");
                    reloading();
                }else{
                    layer.alert(data.msg);
@@ -530,8 +524,8 @@ function updateData(formData) {
             success: function (data) {
                 layer.close(loadingMsg); // 关闭提示层
                 if(data.code == 200){
-                    layer.msg("修改成功");
-                    // reloading();
+                    // layer.msg("修改成功");
+                    reloading();
                 }else{
                     layer.alert(data.msg);
                 }
@@ -591,6 +585,9 @@ function setData2(data) {
 	$("#bankCard").val(data.bankCard);
 	$("#unionpayNum").val(data.unionpayNum);
 	$("#bankBranch").val(data.bankBranch);
+	$("#fileName").val(data.fileName);
+	$("#filePath").val(data.filePath);
+	$("#pdfPath").val(data.pdfPath);
     // getTaskSource("taskSourceId",data[0].taskSourceId);
     // $("#taskSourceId").val(data[0].taskSourceId);
     // 首先移除所有选项的 pass 类
diff --git a/hxy-web/js/wireManager/staff/staffList.js b/hxy-web/js/wireManager/staff/staffList.js
index 6d2c226..87e02e1 100644
--- a/hxy-web/js/wireManager/staff/staffList.js
+++ b/hxy-web/js/wireManager/staff/staffList.js
@@ -6,13 +6,13 @@ var yjId="";
 layui.use(['form','layer','table'], function () {
     table = layui.table;
     form = layui.form;
-	yjId=localStorage.getItem("selectyj");
+	yjId=localStorage.getItem("oneselectyj");
 	
 	$("#yjId").val(yjId);
     // 触发submit提交 按钮点击或者表单被执行提交时触发
     form.on('submit(query)', function (data) {
         console.log("搜索")
-		yjId=localStorage.getItem("selectyj");
+		yjId=localStorage.getItem("oneselectyj");
 		$("#yjId").val(yjId);
 		data.field.yjId=yjId;
             // 对表格进行重载。id 即 table表格的id
@@ -25,7 +25,7 @@ layui.use(['form','layer','table'], function () {
     });
     form.on('submit(reset)', function () {
         console.log("重置")
-		yjId=localStorage.getItem("selectyj");
+		yjId=localStorage.getItem("oneselectyj");
 		$("#yjId").val(yjId);
         $('#userName').val('');
         $('#proName').val('');
@@ -67,7 +67,7 @@ layui.use(['form','layer','table'], function () {
  */
 function init(){
       // 渲染表格
-	  yjId=localStorage.getItem("selectyj");
+	  yjId=localStorage.getItem("oneselectyj");
   let obj = {
 	  userName:'',
 	  proName:'',
@@ -335,7 +335,7 @@ function exportData() {
 	var proName = $("#proName").val();
 	var userState = $("#userState").val();
 	var contractState = $("#contractState").val();
-	yjId=localStorage.getItem("selectyj");
+	yjId=localStorage.getItem("oneselectyj");
     window.location.href = PATH_URL + `/personbase/exportUserData?token=` + token
         + "&userName=" + userName
 		+ "&proName=" + proName
diff --git a/hxy-web/js/wireManager/viewResult/viewResult.js b/hxy-web/js/wireManager/viewResult/viewResult.js
index fc15419..7c8aa5c 100644
--- a/hxy-web/js/wireManager/viewResult/viewResult.js
+++ b/hxy-web/js/wireManager/viewResult/viewResult.js
@@ -63,6 +63,7 @@ layui.use(['form','layer','table','laydate'], function () {
  * 初始化数据
  */
 function init(){
+	yjId=localStorage.getItem("oneselectyj");
 	let obj = {
 	    userName:'',
 	    yjName:'',