From 6eac2b2a9459ee9b24cdee17d72ec084d3a51f36 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期一, 28 八月 2023 19:36:53 +0800
Subject: [PATCH] #
---
src/main/webapp/views/businessTrip/businessTrip.html | 14 +++++++-------
src/main/java/com/zy/crm/manager/service/impl/CstmrServiceImpl.java | 4 ++--
src/main/webapp/static/js/businessTrip/businessTrip.js | 2 +-
3 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/zy/crm/manager/service/impl/CstmrServiceImpl.java b/src/main/java/com/zy/crm/manager/service/impl/CstmrServiceImpl.java
index 0d3e3ea..c4725b8 100644
--- a/src/main/java/com/zy/crm/manager/service/impl/CstmrServiceImpl.java
+++ b/src/main/java/com/zy/crm/manager/service/impl/CstmrServiceImpl.java
@@ -36,9 +36,9 @@
private String getNextUuid(Long hostId) {
Cstmr cstmr = this.baseMapper.selectCstmrByNewestUuid(hostId);
if (cstmr == null) {
- return "0001";
+ return "00001";
}
- return zerofill(String.valueOf(Integer.parseInt(cstmr.getUuid()) + 1), 4);
+ return zerofill(String.valueOf(Integer.parseInt(cstmr.getUuid()) + 1), 5);
}
@Override
diff --git a/src/main/webapp/static/js/businessTrip/businessTrip.js b/src/main/webapp/static/js/businessTrip/businessTrip.js
index ac361ca..e9096f7 100644
--- a/src/main/webapp/static/js/businessTrip/businessTrip.js
+++ b/src/main/webapp/static/js/businessTrip/businessTrip.js
@@ -96,7 +96,7 @@
,{field: 'businessDuration$', align: 'center',title: '鍑哄樊鏃堕暱',hide: false}
,{field: 'businessTripDays$', align: 'center',title: '鍑哄樊澶╂暟',hide: false}
,{field: 'businessPeers', align: 'center',title: '鍚岃浜�',hide: false}
- ,{field: 'businessPeersId', align: 'center',title: '鍚岃浜篒D',hide: true}
+ ,{field: 'businessPeersId', align: 'center',title: '鏃堕棿鎴�',hide: true}
,{field: 'carNumber', align: 'center',title: '鑷┚绉佸杞﹁溅鐗屽彿',hide: false}
,{field: 'kilometers', align: 'center',title: '鑷┚绉佸杞﹁绋嬫槑缁嗗強鍏噷鏁�',hide: false}
,{field: 'userId$', align: 'center',title: '鐢宠浜�',hide: false}
diff --git a/src/main/webapp/views/businessTrip/businessTrip.html b/src/main/webapp/views/businessTrip/businessTrip.html
index 02bc883..b7596f2 100644
--- a/src/main/webapp/views/businessTrip/businessTrip.html
+++ b/src/main/webapp/views/businessTrip/businessTrip.html
@@ -49,12 +49,12 @@
</div>
</div>
<div class="layui-form-item">
- <div class="layui-inline">
- <label class="layui-form-label">缂栧彿:</label>
- <div class="layui-input-inline">
- <input class="layui-input" type="text" name="id" placeholder="缂栧彿" autocomplete="off">
- </div>
- </div>
+<!-- <div class="layui-inline">-->
+<!-- <label class="layui-form-label">缂栧彿:</label>-->
+<!-- <div class="layui-input-inline">-->
+<!-- <input class="layui-input" type="text" name="id" placeholder="缂栧彿" autocomplete="off">-->
+<!-- </div>-->
+<!-- </div>-->
<div class="layui-inline"> 
<button class="layui-btn icon-btn" lay-filter="search" lay-submit>
<i class="layui-icon"></i>鎼滅储
@@ -81,8 +81,8 @@
<script type="text/html" id="operate">
{{# if (d.settle == 1) { }}
<a class="layui-btn layui-btn-xs btn-edit" lay-event="approval">瀹℃壒</a>
- {{# } }}
<a class="layui-btn layui-btn-primary layui-btn-xs btn-edit" lay-event="edit">淇敼</a>
+ {{# } }}
<a class="layui-btn layui-btn-danger layui-btn-xs btn-edit" lay-event="del">鍒犻櫎</a>
</script>
--
Gitblit v1.9.1