From 1ec5d4cac10c700df9998da7b42d986ba6387028 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期二, 10 十月 2023 15:41:08 +0800
Subject: [PATCH] #优化
---
src/main/webapp/static/js/cstmr/cstmr.js | 4 +++-
src/main/webapp/static/js/reimburseOnline/reimburseOnline.js | 6 +++---
src/main/java/com/zy/crm/manager/entity/Plan.java | 1 +
3 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/crm/manager/entity/Plan.java b/src/main/java/com/zy/crm/manager/entity/Plan.java
index 6516775..4e02dbf 100644
--- a/src/main/java/com/zy/crm/manager/entity/Plan.java
+++ b/src/main/java/com/zy/crm/manager/entity/Plan.java
@@ -401,6 +401,7 @@
}
public String getPlanner$(){
+ if (this.planner==null) return "鏈垎閰�";
UserService service = SpringUtils.getBean(UserService.class);
User user = service.selectById(this.planner);
if (!Cools.isEmpty(user)){
diff --git a/src/main/webapp/static/js/cstmr/cstmr.js b/src/main/webapp/static/js/cstmr/cstmr.js
index 72a29d9..0537c31 100644
--- a/src/main/webapp/static/js/cstmr/cstmr.js
+++ b/src/main/webapp/static/js/cstmr/cstmr.js
@@ -433,8 +433,10 @@
});
},
on: function (data) {
+ console.log(data)
let arr = data.arr
- if (arr.length > 0) {
+ let change = data.change;
+ if (arr.length > 0 && change.length>0) {
let name = arr[0].name;
$.ajax({
url: baseUrl + "/cstmr/name/check/auth",
diff --git a/src/main/webapp/static/js/reimburseOnline/reimburseOnline.js b/src/main/webapp/static/js/reimburseOnline/reimburseOnline.js
index b0d1191..8ce8423 100644
--- a/src/main/webapp/static/js/reimburseOnline/reimburseOnline.js
+++ b/src/main/webapp/static/js/reimburseOnline/reimburseOnline.js
@@ -310,7 +310,7 @@
type: 1,
title: false,
area: '2100px',
- offset: [top2 + 'px', (left - 1730 + $a.outerWidth()) + 'px'],
+ offset: [top2 + 'px', (left - 1430 + $a.outerWidth()) + 'px'],
shade: .01,
shadeClose: true,
fixed: false,
@@ -327,7 +327,7 @@
cellMinWidth: 100,
cols: [[
// {type: 'numbers'},
- {field: 'occupation', title: '浜嬬敱', width: 100},
+ {field: 'occupation', title: '浜嬬敱', width: 200},
// {field: 'expenseType', title: '璐圭敤绫诲瀷', width: 100},
{field: 'expenseType$', title: '璐圭敤绫诲瀷', width: 100},
{field: 'taxRate', title: '绋庣巼', width: 60},
@@ -347,7 +347,7 @@
{field: 'deptId', title: '鍒楁敮閮ㄩ棬', width: 120},
{field: 'updateTime', title: '鏇存柊鏃ユ湡', width: 100},
// {field: 'updateUserId', title: '鏇存柊浜哄憳ID', width: 160},
- {field: 'updateUserName', title: '鏇存柊浜哄憳鍚嶅瓧'},
+ {field: 'updateUserName', title: '鏇存柊浜哄憳鍚嶅瓧', width: 80},
// {field: 'creationTime', title: '鍒涘缓鏃ユ湡', width: 160}
]],
request: {
--
Gitblit v1.9.1