liux
/
nx_dx_one_manager
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

第二次修改

This commit is contained in:
liux 2024-03-22 13:24:44 +08:00
parent 9bfe41c1db
commit 3017284d08
9 changed files with 9 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/bonus/nxdt/energy/newcheck/service/impl/New_SubCheckManageServiceImpl.java
View File

@ -1342,6 +1342,8 @@ public class New_SubCheckManageServiceImpl implements New_SubCheckManageService
} }
//写一个SQL 查询出下一级别审核人 //写一个SQL 查询出下一级别审核人
}else{
checkManageDao.updateProcessType(o.getChildId(),"0");
} }
String phone = Objects.requireNonNull(UserUtil.getLoginUser()).getPhone(); String phone = Objects.requireNonNull(UserUtil.getLoginUser()).getPhone();
String orgId = Objects.requireNonNull(UserUtil.getLoginUser()).getOrgId(); String orgId = Objects.requireNonNull(UserUtil.getLoginUser()).getOrgId();

1
src/main/resources/static/js/newCheck/datumCheckForm4_new.js
View File

@ -38,7 +38,6 @@ layui.use(['form','upload'], function(){
obj.files = obj.pushFile(); obj.files = obj.pushFile();
console.log("files="+JSON.stringify(obj.files)) console.log("files="+JSON.stringify(obj.files))
obj.preview(function (index, file, result) { obj.preview(function (index, file, result) {
//debugger;
demo12Num = $("#demo12").children().length; demo12Num = $("#demo12").children().length;
// if(demo12Num>=10){ // if(demo12Num>=10){
// layer.alert("最多只能上传10个文件！") // layer.alert("最多只能上传10个文件！")

12
src/main/resources/static/js/newCheck/datumPublic_new.js
View File

@ -768,17 +768,17 @@ function isDefaultProcess(processType) {
function getTypeImgConsPerson(str){ function getTypeImgConsPerson(str){
if(str.toLowerCase().indexOf("xlsx") >0 || str.toLowerCase().indexOf("xls") >0){ if(str.toLowerCase().indexOf("xlsx") >0 || str.toLowerCase().indexOf("xls") >0){
return "../../../img/login/filetype/excel.png"; return "../../img/login/filetype/excel.png";
}else if(str.toLowerCase().indexOf("pdf") >0){ }else if(str.toLowerCase().indexOf("pdf") >0){
return "../../../img/login/filetype/pdf.png"; return "../../img/login/filetype/pdf.png";
}else if(str.toLowerCase().indexOf("ppt") >0){ }else if(str.toLowerCase().indexOf("ppt") >0){
return "../../../img/login/filetype/ppt.png"; return "../../img/login/filetype/ppt.png";
}else if(str.toLowerCase().indexOf("txt") >0){ }else if(str.toLowerCase().indexOf("txt") >0){
return "../../../img/login/filetype/txt.png"; return "../../img/login/filetype/txt.png";
}else if(str.toLowerCase().indexOf("vsdx") >0){ }else if(str.toLowerCase().indexOf("vsdx") >0){
return "../../../img/login/filetype/visio.png"; return "../../img/login/filetype/visio.png";
}else if(str.toLowerCase().indexOf("doc") >0 || str.toLowerCase().indexOf("docx") >0){ }else if(str.toLowerCase().indexOf("doc") >0 || str.toLowerCase().indexOf("docx") >0){
return "../../../img/login/filetype/word.png"; return "../../img/login/filetype/word.png";
}else{ }else{
return ""; return "";
} }

2
src/main/resources/static/js/newWork/constrator/material/reviseMessage.js
View File

@ -715,7 +715,6 @@ function fileUpload(i,addFileBtn,uploadBtn,addImgDiv,requestUrl,fileId,typeId){
choose: function (obj) { choose: function (obj) {
$.each(fileMap, function (idx, item) { $.each(fileMap, function (idx, item) {
//console.log("idxidxidxidxidx="+idx); //console.log("idxidxidxidxidx="+idx);
// debugger;
if (!isEmpty(item)) { if (!isEmpty(item)) {
if (i === item.idx) { if (i === item.idx) {
//重置文件上传状态 //重置文件上传状态
@ -1025,7 +1024,6 @@ function addFourFileContent(typeName,fileName,i,fileId,id,requestUrl,filePath) {
function tempStorage(idx) { function tempStorage(idx) {
debugger;
var status = uploadFileByFileId(idx); var status = uploadFileByFileId(idx);
if(status !=0 && status !="-1"){ if(status !=0 && status !="-1"){
$("#jmpClick").attr("href",status); $("#jmpClick").attr("href",status);

3
src/main/resources/static/js/newWork/constrator/material/uploadMessage.js
View File

@ -843,7 +843,6 @@ function addFourFileContent(typeName,fileName,i,fileId,id,requestUrl,filePath) {
}; };
function tempStorage(idx) { function tempStorage(idx) {
debugger;
var status = uploadFileByFileId(idx); var status = uploadFileByFileId(idx);
if(status !=0 && status !="-1"){ if(status !=0 && status !="-1"){
$("#jmpClick").attr("href",status); $("#jmpClick").attr("href",status);
@ -1470,7 +1469,6 @@ function deleteFiles(idx,index,btIndex,addImgDiv,dataFrom,type,fileName,addFileB
console.log("fileItem333="+JSON.stringify(fileItem)) console.log("fileItem333="+JSON.stringify(fileItem))
var nums = $("#" + addImgDiv).children().length; var nums = $("#" + addImgDiv).children().length;
var parentId = $("#" + addImgDiv).parent().attr('id'); var parentId = $("#" + addImgDiv).parent().attr('id');
debugger;
changeDivHeightByIdAndLine(parentId,nums,8,2); changeDivHeightByIdAndLine(parentId,nums,8,2);
changeDivHeightByIdAndLine(outsideDiv,nums,8,2); changeDivHeightByIdAndLine(outsideDiv,nums,8,2);
// //
@ -1551,7 +1549,6 @@ function deleteFiles(idx,index,btIndex,addImgDiv,dataFrom,type,fileName,addFileB
} }
var nums = $("#" + addImgDiv).children().length; var nums = $("#" + addImgDiv).children().length;
var parentId = $("#" + addImgDiv).parent().attr('id'); var parentId = $("#" + addImgDiv).parent().attr('id');
debugger;
changeDivHeightByIdAndLine(parentId,nums,8,2); changeDivHeightByIdAndLine(parentId,nums,8,2);
changeDivHeightByIdAndLine(outsideDiv,nums,8,2); changeDivHeightByIdAndLine(outsideDiv,nums,8,2);
}) })

1
src/main/resources/static/js/work/auditDatum/datumCheckForm4.js
View File

@ -38,7 +38,6 @@ layui.use(['form','upload'], function(){
obj.files = obj.pushFile(); obj.files = obj.pushFile();
console.log("files="+JSON.stringify(obj.files)) console.log("files="+JSON.stringify(obj.files))
obj.preview(function (index, file, result) { obj.preview(function (index, file, result) {
//debugger;
demo12Num = $("#demo12").children().length; demo12Num = $("#demo12").children().length;
// if(demo12Num>=10){ // if(demo12Num>=10){
// layer.alert("最多只能上传10个文件！") // layer.alert("最多只能上传10个文件！")

5
src/main/resources/static/js/work/auditDatum/datumPublic.js
View File

@ -125,7 +125,6 @@ function historyshow(){
function nextStep(num){ function nextStep(num){
//debugger;
if(pageNow === pageMax){ if(pageNow === pageMax){
upData(num,1); upData(num,1);
}else{ }else{
@ -174,7 +173,6 @@ function upData(num,buttonType){
newDataMsg:newDataMsg, newDataMsg:newDataMsg,
returnId:uuid2(32,16) returnId:uuid2(32,16)
}; };
//debugger;
var valueParam ={ var valueParam ={
consId: checkData.contractorId, consId: checkData.contractorId,
proId: checkData.proId, proId: checkData.proId,
@ -313,7 +311,6 @@ function upData(num,buttonType){
if (data.code == 200) { if (data.code == 200) {
if(isHaveImage){ if(isHaveImage){
debugger;
$("#hideUpload2").trigger("click"); $("#hideUpload2").trigger("click");
$("#hideUpload4").trigger("click"); $("#hideUpload4").trigger("click");
$("#hideUpload6").trigger("click"); $("#hideUpload6").trigger("click");
@ -339,7 +336,6 @@ function upData(num,buttonType){
} }
} else { } else {
debugger;
layer.msg("后端异常"+data.msg); layer.msg("后端异常"+data.msg);
} }
}, },
@ -404,7 +400,6 @@ function upData(num,buttonType){
dataType: "json",// 服务器返回数据类型 dataType: "json",// 服务器返回数据类型
success: function (data) { success: function (data) {
if (data.code == 200) { if (data.code == 200) {
debugger;
if(isHaveImage){ if(isHaveImage){
$("#hideUpload12").trigger("click"); $("#hideUpload12").trigger("click");
$("#hideUpload21").trigger("click"); $("#hideUpload21").trigger("click");

1
src/main/resources/static/js/work/contractorPersonManage/CbsLeaseForm.js
View File

@ -177,7 +177,6 @@ function getUploadFileTypeByProId(){
var resMsg = data.resMsg; var resMsg = data.resMsg;
console.log("data="+JSON.stringify(data)) console.log("data="+JSON.stringify(data))
if(resMsg == "数据获取成功"){ if(resMsg == "数据获取成功"){
//debugger;
var obj = data.obj.obj; var obj = data.obj.obj;
for(var i=0;i<obj.length;i++){ for(var i=0;i<obj.length;i++){
var html =''; var html ='';

1
src/main/resources/static/js/work/newSub/personAdd.js
View File

@ -554,6 +554,7 @@ function fileUpload(test,hideUpload,demo){
if(hideUploadNum == 0){ if(hideUploadNum == 0){
reloading(); reloading();
parent.layer.alert('新增成功',{icon: 1}); parent.layer.alert('新增成功',{icon: 1});
parent.location.reload();
} }
} }
,error: function (e) { ,error: function (e) {