From 5bdba4f712b203db5acdd981922a5bc1706b29ff Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期一, 11 九月 2023 19:15:43 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/crm/manager/service/impl/PlanServiceImpl.java | 4 ++--
src/main/webapp/static/js/priQuoteBudget/priQuoteBudget.js | 4 ++--
src/main/webapp/static/js/priQuote/priQuote.js | 4 ++--
src/main/java/com/zy/crm/manager/service/impl/OrderServiceImpl.java | 4 ++--
src/main/webapp/static/js/priOnline2/priOnline.js | 2 +-
src/main/webapp/static/js/priSales/priSales.js | 4 ++--
6 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/zy/crm/manager/service/impl/OrderServiceImpl.java b/src/main/java/com/zy/crm/manager/service/impl/OrderServiceImpl.java
index a14e7aa..addf494 100644
--- a/src/main/java/com/zy/crm/manager/service/impl/OrderServiceImpl.java
+++ b/src/main/java/com/zy/crm/manager/service/impl/OrderServiceImpl.java
@@ -43,9 +43,9 @@
private String getNextUuid(Long hostId) {
Order order = this.baseMapper.selectOrderByNewestUuid(hostId);
if (order == null) {
- return "0001";
+ return "00001";
}
- return zerofill(String.valueOf(Integer.parseInt(order.getUuid()) + 1), 4);
+ return zerofill(String.valueOf(Integer.parseInt(order.getUuid()) + 1), 5);
}
public static String zerofill(String msg, Integer count){
diff --git a/src/main/java/com/zy/crm/manager/service/impl/PlanServiceImpl.java b/src/main/java/com/zy/crm/manager/service/impl/PlanServiceImpl.java
index 935174d..7ea271d 100644
--- a/src/main/java/com/zy/crm/manager/service/impl/PlanServiceImpl.java
+++ b/src/main/java/com/zy/crm/manager/service/impl/PlanServiceImpl.java
@@ -68,9 +68,9 @@
private String getNextUuid(Long hostId) {
Plan plan = this.baseMapper.selectPlanByNewestUuid(hostId);
if (plan == null) {
- return "0001";
+ return "00001";
}
- return zerofill(String.valueOf(Integer.parseInt(plan.getUuid()) + 1), 4);
+ return zerofill(String.valueOf(Integer.parseInt(plan.getUuid()) + 1), 5);
}
public static String zerofill(String msg, Integer count){
diff --git a/src/main/webapp/static/js/priOnline2/priOnline.js b/src/main/webapp/static/js/priOnline2/priOnline.js
index eabc2e3..fc4627b 100644
--- a/src/main/webapp/static/js/priOnline2/priOnline.js
+++ b/src/main/webapp/static/js/priOnline2/priOnline.js
@@ -84,7 +84,7 @@
cols: [[
{type: 'checkbox', fixed: 'left'}
,{field: 'id', title: 'ID', sort: true,align: 'center', fixed: 'left', width: 80,hide: true}
- ,{field: 'templateName', align: 'center',title: '鏍镐环鍚�',hide: false}
+ ,{field: 'templateName', align: 'center',title: '瀹㈡埛鍚嶇О',hide: false}
,{field: 'orderNum', align: 'center',title: '鏍镐环鍗曞彿'}
,{field: 'planId$', align: 'center',title: '瑙勫垝鍗曞彿'}
,{field: 'createTime$', align: 'center',title: '鍒涘缓鏃堕棿'}
diff --git a/src/main/webapp/static/js/priQuote/priQuote.js b/src/main/webapp/static/js/priQuote/priQuote.js
index b8b6563..17c2903 100644
--- a/src/main/webapp/static/js/priQuote/priQuote.js
+++ b/src/main/webapp/static/js/priQuote/priQuote.js
@@ -89,9 +89,9 @@
cols: [[
{type: 'checkbox', fixed: 'left'}
,{field: 'id', title: 'ID', sort: true,align: 'center', fixed: 'left', width: 80}
- ,{field: 'templateName', align: 'center',title: '妯℃澘鍚�', width: 220, style: 'color: #1890ff;cursor:pointer', event: 'more',hide: false}
- ,{field: 'orderNum', align: 'center',title: '鎶ヤ环棰勭畻鍗曞彿',hide: false}
+ ,{field: 'templateName', align: 'center',title: '瀹㈡埛鍚嶇О', width: 220,hide: false}
,{field: 'inOrderNum', align: 'center',title: '鎶ヤ环缂栧彿',hide: false}
+ ,{field: 'orderNum', align: 'center',title: '鎶ヤ环棰勭畻鍗曞彿', style: 'color: #1890ff;cursor:pointer', event: 'more',hide: false}
,{field: 'planId$', align: 'center',title: '瑙勫垝鍗曞彿',hide: false}
,{field: 'planName$', align: 'center',title: '瑙勫垝鍗曞悕绉�',hide: false}
,{field: 'settle$', align: 'center',title: '杩涘害', width: 150,hide: false}
diff --git a/src/main/webapp/static/js/priQuoteBudget/priQuoteBudget.js b/src/main/webapp/static/js/priQuoteBudget/priQuoteBudget.js
index f4b2b90..dbb3c83 100644
--- a/src/main/webapp/static/js/priQuoteBudget/priQuoteBudget.js
+++ b/src/main/webapp/static/js/priQuoteBudget/priQuoteBudget.js
@@ -83,9 +83,9 @@
cols: [[
{type: 'checkbox', fixed: 'left'}
,{field: 'id', title: 'ID', sort: true,align: 'center', fixed: 'left', width: 80}
- ,{field: 'templateName', align: 'center',title: '妯℃澘鍚�'}
- ,{field: 'orderNum', align: 'center',title: '浜у搧璐圭敤鏄庣粏鍗曞彿'}
+ ,{field: 'templateName', align: 'center',title: '瀹㈡埛鍚嶇О'}
,{field: 'inOrderNum', align: 'center',title: '棰勭畻缂栧彿'}
+ ,{field: 'orderNum', align: 'center',title: '浜у搧璐圭敤鏄庣粏鍗曞彿'}
,{field: 'planId$', align: 'center',title: '瑙勫垝鍗曞彿'}
,{field: 'createTime$', align: 'center',title: '鍒涘缓鏃堕棿'}
,{field: 'updateTime$', align: 'center',title: '鏇存柊鏃堕棿'}
diff --git a/src/main/webapp/static/js/priSales/priSales.js b/src/main/webapp/static/js/priSales/priSales.js
index 4201b0c..c15348b 100644
--- a/src/main/webapp/static/js/priSales/priSales.js
+++ b/src/main/webapp/static/js/priSales/priSales.js
@@ -83,9 +83,9 @@
cols: [[
{type: 'checkbox', fixed: 'left'}
,{field: 'id', title: 'ID', sort: true,align: 'center', fixed: 'left', width: 80}
- ,{field: 'templateName', align: 'center',title: '妯℃澘鍚�'}
- ,{field: 'orderNum', align: 'center',title: '鏍镐环璁㈠崟鍙�'}
+ ,{field: 'templateName', align: 'center',title: '瀹㈡埛鍚嶇О'}
,{field: 'inOrderNum', align: 'center',title: '鏄庣粏缂栧彿'}
+ ,{field: 'orderNum', align: 'center',title: '鏍镐环鍗曞彿'}
,{field: 'planId$', align: 'center',title: '椤圭洰鍚�'}
,{field: 'createTime$', align: 'center',title: '鍒涘缓鏃堕棿'}
,{field: 'updateTime$', align: 'center',title: '鏇存柊鏃堕棿'}
--
Gitblit v1.9.1