From 7b6b97e96af70ea41b86aa7f1e9a134fbef9c8fb Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期三, 23 八月 2023 18:41:57 +0800
Subject: [PATCH] #优化
---
src/main/webapp/views/reimburseOnline/reimburseOnline.html | 2
src/main/webapp/static/js/reimburseOnline/reimburseOnline.js | 96 -----------------------------------------------
src/main/java/com/zy/crm/manager/controller/ReimburseOnlineController.java | 5 --
3 files changed, 3 insertions(+), 100 deletions(-)
diff --git a/src/main/java/com/zy/crm/manager/controller/ReimburseOnlineController.java b/src/main/java/com/zy/crm/manager/controller/ReimburseOnlineController.java
index e8f4b5c..336ced3 100644
--- a/src/main/java/com/zy/crm/manager/controller/ReimburseOnlineController.java
+++ b/src/main/java/com/zy/crm/manager/controller/ReimburseOnlineController.java
@@ -559,14 +559,10 @@
for (SettleDto dto : list) {
if (dto.getStep().equals(settle)){
dto.setCurr(Boolean.FALSE);
- break;
}else if (dto.getStep().equals(settle+1)){
dto.setCurr(Boolean.TRUE);
dto.setMsg("鎶ヤ环娴佺▼鑺傜偣"+process+"纭浜�:"+planLeader.getNickname() + "瀹℃壒閫氳繃");
dto.setTime(DateUtils.convert(now));
- break;
- }else {
- break;
}
}
reimburseOnline.setSettleMsg(JSON.toJSONString(list));
@@ -579,6 +575,7 @@
settle=settle+2;
}else {
settle++;
+ reimburseOnline.setStatus(1);
}
ProcessPermissions processPermissions2 = processPermissionsService.selectOne(new EntityWrapper<ProcessPermissions>().eq("process_memo", 3).eq("process", settle+"-"+split[1]));//3锛氭姤閿�娴佺▼
reimburseOnline.setMemberId(processPermissions2.getUserId());
diff --git a/src/main/webapp/static/js/reimburseOnline/reimburseOnline.js b/src/main/webapp/static/js/reimburseOnline/reimburseOnline.js
index 5da477a..88ea097 100644
--- a/src/main/webapp/static/js/reimburseOnline/reimburseOnline.js
+++ b/src/main/webapp/static/js/reimburseOnline/reimburseOnline.js
@@ -300,100 +300,6 @@
case "edit":
showEditForm(data);
break;
- case "upload":
- $.ajax({
- type:"get",
- url: baseUrl+"/reimburseOnline/viewCheck/" + data.id + "/auth",
- dataType:"json",
- headers: {'token': localStorage.getItem('token')},
- success:function(res) {
- if (res.code == 200) {
- layer.confirm('褰撳墠宸插瓨鍦ㄦ暟鎹紝缁х画涓婁紶灏嗕細瑕嗙洊鏃ф暟鎹紝鏄惁涓婁紶锛�', function(){
- $("#uploadQuote").click()
- });
- }else{
- $("#uploadQuote").click()
- }
- }
- });
-
- $("#uploadQuote").on("change",(evt) => {
- var files = evt.target.files;
- if(files==null || files.length==0){
- alert("No files wait for import");
- return;
- }
-
- let name = files[0].name;
- let suffixArr = name.split("."), suffix = suffixArr[suffixArr.length-1];
- if(suffix!="xlsx"){
- alert("Currently only supports the import of xlsx files");
- return;
- }
- LuckyExcel.transformExcelToLucky(files[0], function(exportJson, luckysheetfile){
- if(exportJson.sheets==null || exportJson.sheets.length==0){
- alert("Failed to read the content of the excel file, currently does not support xls files!");
- return;
- }
-
- let formData = new FormData($("#uploadFile")[0]);
- formData.append("id", data.id);
- formData.append("checkData", zip(exportJson.sheets));
- $.ajax({
- url: baseUrl+"/reimburseOnline/uploadCheck/auth",
- headers: {'token': localStorage.getItem('token')},
- data: formData,
- // data: JSON.stringify({
- // id: data.id,
- // checkData: zip(exportJson.sheets)
- // }),
- // dataType: "json",
- method: 'POST',
- cache: false,
- processData: false,
- contentType: false,
- // contentType:'application/json;charset=UTF-8',
- success: function (res) {
- if (res.code == 200) {
- layer.msg('涓婁紶鎴愬姛',{time:1000},() => {
- parent.location.reload()
- })
- }else{
- layer.msg(res.msg,{time:1000},() => {
- parent.location.reload()
- })
- }
- }
- })
- });
- })
- break;
- case "viewCheck":
- //鏌ョ湅璇环
- $.ajax({
- type:"get",
- url: baseUrl+"/reimburseOnline/viewCheck/" + data.id + "/auth",
- dataType:"json",
- headers: {'token': localStorage.getItem('token')},
- success:function(res) {
- if (res.code == 200) {
- layer.open({
- type: 2,
- title: '鏌ョ湅璇环',
- maxmin: true,
- area: [top.detailWidth, top.detailHeight],
- shadeClose: false,
- content: 'reimburseOnline_check.html?id=' + data.id,
- success: function(layero, index){
- // layer.iframeAuto(index);layer.style(index, {top: (($(window).height()-layer.getChildFrame('#data-detail', index).height())/3)+"px"});
- }
- });
- }else{
- layer.msg(res.msg,{time:1000})
- }
- }
- });
- break;
case "look":
var $a = $(obj.tr).find('a[lay-event="look"]');
var offset = $a.offset();
@@ -784,7 +690,7 @@
// });
// }
- //鏇存柊form
+ // 鏇存柊form
function showEditForm(mData) {
admin.open({
type: 1,
diff --git a/src/main/webapp/views/reimburseOnline/reimburseOnline.html b/src/main/webapp/views/reimburseOnline/reimburseOnline.html
index a4be66c..fcf5559 100644
--- a/src/main/webapp/views/reimburseOnline/reimburseOnline.html
+++ b/src/main/webapp/views/reimburseOnline/reimburseOnline.html
@@ -82,7 +82,7 @@
<script type="text/html" id="operate">
- {{# if (d.settle == 1 || d.settle == 2 || d.settle == 3 || d.settle == 4 || d.settle == 5 || d.settle == 6) { }}
+ {{# if (d.settle == 1 || d.settle == 2 || d.settle == 3 || d.settle == 4 || d.settle == 5) { }}
<a class="layui-btn layui-btn-xs btn-edit" lay-event="approval2">瀹℃壒</a>
{{# } }}
{{# if (d.settle == 0) { }}
--
Gitblit v1.9.1