From 0a9160ff7f91d63b5d55a5abee8efe93b68d78dd Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期三, 22 十一月 2023 15:18:05 +0800
Subject: [PATCH] #
---
src/main/webapp/static/js/cstmr/cstmr.js | 4 +-
src/main/java/com/zy/crm/manager/entity/CstmrFoll.java | 6 +-
src/main/java/com/zy/crm/manager/entity/Order.java | 6 +-
src/main/webapp/views/contract/contract.html | 2
src/main/webapp/views/order/order.html | 2
src/main/webapp/views/cstmr/cstmr_more.html | 2
src/main/webapp/static/js/cstmr/cstmr2.js | 6 +-
src/main/java/com/zy/crm/manager/controller/CstmrController.java | 16 ++++----
src/main/java/com/zy/crm/manager/controller/PriOnline2Controller.java | 2
src/main/webapp/views/cstmr/cstmr.html | 2 +
src/main/java/com/zy/crm/manager/controller/PlanController.java | 2
src/main/webapp/views/order/order_more.html | 2
src/main/webapp/static/js/order/order.js | 4 +-
src/main/java/com/zy/crm/manager/entity/Plan.java | 4 +-
src/main/webapp/views/cstmr/cstmr2.html | 2
src/main/java/com/zy/crm/manager/controller/OrderController.java | 2
src/main/webapp/static/js/item/item.js | 2
17 files changed, 34 insertions(+), 32 deletions(-)
diff --git a/src/main/java/com/zy/crm/manager/controller/CstmrController.java b/src/main/java/com/zy/crm/manager/controller/CstmrController.java
index 0b6e198..6112615 100644
--- a/src/main/java/com/zy/crm/manager/controller/CstmrController.java
+++ b/src/main/java/com/zy/crm/manager/controller/CstmrController.java
@@ -198,7 +198,7 @@
}
@RequestMapping(value = "/cstmr/add/auth")
- @ManagerAuth(memo = "娣诲姞鐢叉柟鍗曚綅淇℃伅鍏捣")
+ @ManagerAuth(memo = "娣诲姞瀹㈡埛淇℃伅鍏捣")
public R add(Cstmr cstmr) {
if (getUser().getRoleId()!=1){
if (!getUser().getNickname().equals("闄堢嚂")){
@@ -232,7 +232,7 @@
}
@RequestMapping(value = "/cstmr/add2/auth")
- @ManagerAuth(memo = "娣诲姞鐢叉柟鍗曚綅淇℃伅鍏捣")
+ @ManagerAuth(memo = "娣诲姞瀹㈡埛淇℃伅鍏捣")
public R add22(Cstmr cstmr) {
Long hostId = getHostId();
if (cstmrService.selectByUuid(hostId, cstmr.getUuid()) != null) {
@@ -261,11 +261,11 @@
}
@RequestMapping(value = "/cstmr2/add/auth")
- @ManagerAuth(memo = "鎺ュ彇鐢叉柟鍗曚綅")
+ @ManagerAuth(memo = "鎺ュ彇瀹㈡埛淇℃伅")
public R add2(Cstmr cstmr) {
Cstmr cstmr1 = cstmrService.selectByName(getHostId(),cstmr.getName());
if (Cools.isEmpty(cstmr1) || cstmr1.getDirector()!=null){
- return R.error("浣犳棤娉曟帴鍙栨鐢叉柟鍗曚綅!");
+ return R.error("浣犳棤娉曟帴鍙栨瀹㈡埛淇℃伅!");
}
cstmr1.setDirector(getUserId());
cstmr1.setDeptId(getDeptId()); // 鎵�灞為儴闂�
@@ -277,7 +277,7 @@
}
@RequestMapping(value = "/cstmr/update/auth")
- @ManagerAuth(memo = "鏇存柊鐢叉柟鍗曚綅")
+ @ManagerAuth(memo = "鏇存柊瀹㈡埛淇℃伅")
public R update(Cstmr cstmr){
if (Cools.isEmpty(cstmr) || null==cstmr.getId()){
return R.error();
@@ -294,7 +294,7 @@
}
@RequestMapping(value = "/cstmr/delete/auth")
- @ManagerAuth(memo = "鍒犻櫎鐢叉柟鍗曚綅")
+ @ManagerAuth(memo = "鍒犻櫎瀹㈡埛淇℃伅")
public R delete(@RequestParam(value="ids[]") Long[] ids){
for (Long id : ids){
int order = orderService.selectCount(new EntityWrapper<Order>().eq("cstmr_id", id));
@@ -307,7 +307,7 @@
}
@RequestMapping(value = "/cstmr/delete/one/{id}")
- @ManagerAuth(memo = "鍒犻櫎鐢叉柟鍗曚綅")
+ @ManagerAuth(memo = "鍒犻櫎瀹㈡埛淇℃伅")
public R deleteOne(@PathVariable Long id) {
int cstmr_id = orderService.selectCount(new EntityWrapper<Order>().eq("cstmr_id", id));
if (cstmr_id!=0){
@@ -357,7 +357,7 @@
* excel瀵煎叆
*/
@PostMapping(value = "/cstmr/excel/import/auth")
- @ManagerAuth(memo = "鐢叉柟鍗曚綅Excel瀵煎叆")
+ @ManagerAuth(memo = "瀹㈡埛淇℃伅Excel瀵煎叆")
// @Transactional
public R cstmrExcelImport(MultipartFile file) throws IOException {
InputStream inStream = file.getInputStream();
diff --git a/src/main/java/com/zy/crm/manager/controller/OrderController.java b/src/main/java/com/zy/crm/manager/controller/OrderController.java
index ce30429..7c316c2 100644
--- a/src/main/java/com/zy/crm/manager/controller/OrderController.java
+++ b/src/main/java/com/zy/crm/manager/controller/OrderController.java
@@ -387,7 +387,7 @@
* excel瀵煎叆
*/
@PostMapping(value = "/order/excel/import/auth")
- @ManagerAuth(memo = "鐢叉柟鍗曚綅Excel瀵煎叆")
+ @ManagerAuth(memo = "瀹㈡埛淇℃伅Excel瀵煎叆")
// @Transactional
public R orderExcelImport(MultipartFile file) throws IOException {
InputStream inStream = file.getInputStream();
diff --git a/src/main/java/com/zy/crm/manager/controller/PlanController.java b/src/main/java/com/zy/crm/manager/controller/PlanController.java
index 3865da3..d961d10 100644
--- a/src/main/java/com/zy/crm/manager/controller/PlanController.java
+++ b/src/main/java/com/zy/crm/manager/controller/PlanController.java
@@ -905,7 +905,7 @@
* excel瀵煎叆
*/
@PostMapping(value = "/plan/excel/import/auth")
- @ManagerAuth(memo = "鐢叉柟鍗曚綅Excel瀵煎叆")
+ @ManagerAuth(memo = "瀹㈡埛淇℃伅Excel瀵煎叆")
// @Transactional
public R planExcelImport(MultipartFile file) throws IOException {
InputStream inStream = file.getInputStream();
diff --git a/src/main/java/com/zy/crm/manager/controller/PriOnline2Controller.java b/src/main/java/com/zy/crm/manager/controller/PriOnline2Controller.java
index 66985c7..f7ba377 100644
--- a/src/main/java/com/zy/crm/manager/controller/PriOnline2Controller.java
+++ b/src/main/java/com/zy/crm/manager/controller/PriOnline2Controller.java
@@ -274,7 +274,7 @@
priOnline2.setMemberId(getUserId());
Cstmr cstmr = cstmrService.selectById(plan.getCstmrId());
- priOnline2.setTemplateName(cstmr.getName()); //鐢叉柟鍗曚綅鍚嶇О
+ priOnline2.setTemplateName(cstmr.getName()); //瀹㈡埛淇℃伅鍚嶇О
priOnline2.setSettle(0);
diff --git a/src/main/java/com/zy/crm/manager/entity/CstmrFoll.java b/src/main/java/com/zy/crm/manager/entity/CstmrFoll.java
index 82586c0..92e5722 100644
--- a/src/main/java/com/zy/crm/manager/entity/CstmrFoll.java
+++ b/src/main/java/com/zy/crm/manager/entity/CstmrFoll.java
@@ -29,9 +29,9 @@
private Long id;
/**
- * 鐢叉柟鍗曚綅
+ * 瀹㈡埛淇℃伅
*/
- @ApiModelProperty(value= "鐢叉柟鍗曚綅")
+ @ApiModelProperty(value= "瀹㈡埛淇℃伅")
@TableField("cstmr_id")
private Long cstmrId;
@@ -50,7 +50,7 @@
}
// CstmrFoll cstmrFoll = new CstmrFoll(
-// null, // 鐢叉柟鍗曚綅[闈炵┖]
+// null, // 瀹㈡埛淇℃伅[闈炵┖]
// null // 璺熻繘浜篬闈炵┖]
// );
diff --git a/src/main/java/com/zy/crm/manager/entity/Order.java b/src/main/java/com/zy/crm/manager/entity/Order.java
index 33fe0a3..bfaed43 100644
--- a/src/main/java/com/zy/crm/manager/entity/Order.java
+++ b/src/main/java/com/zy/crm/manager/entity/Order.java
@@ -60,9 +60,9 @@
private Long userId;
/**
- * 鐢叉柟鍗曚綅
+ * 瀹㈡埛淇℃伅
*/
- @ApiModelProperty(value= "鐢叉柟鍗曚綅")
+ @ApiModelProperty(value= "瀹㈡埛淇℃伅")
@TableField("cstmr_id")
private Long cstmrId;
@@ -240,7 +240,7 @@
// null, // 鎵�灞炲晢鎴�
// null, // 鎵�灞為儴闂�
// null, // 鎵�灞炰汉鍛�
-// null, // 鐢叉柟鍗曚綅
+// null, // 瀹㈡埛淇℃伅
// null, // 瀹㈡埛浠ｅ彿[闈炵┖]
// null, // 瀹㈡埛鍚嶇О[闈炵┖]
// null, // 鎬婚噾棰�
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 069b34f..4f1a728 100644
--- a/src/main/java/com/zy/crm/manager/entity/Plan.java
+++ b/src/main/java/com/zy/crm/manager/entity/Plan.java
@@ -73,9 +73,9 @@
private Long orderId;
/**
- * 鐢叉柟鍗曚綅
+ * 瀹㈡埛淇℃伅
*/
- @ApiModelProperty(value = "鐢叉柟鍗曚綅")
+ @ApiModelProperty(value = "瀹㈡埛淇℃伅")
@TableField("cstmr_id")
private Long cstmrId;
diff --git a/src/main/webapp/static/js/cstmr/cstmr.js b/src/main/webapp/static/js/cstmr/cstmr.js
index 8813cab..a9d8902 100644
--- a/src/main/webapp/static/js/cstmr/cstmr.js
+++ b/src/main/webapp/static/js/cstmr/cstmr.js
@@ -59,7 +59,7 @@
case 1:
// 妯℃澘涓嬭浇
layer.load(1, {shade: [0.1,'#fff']});
- location.href = baseUrl + "/mould/鐢叉柟鍗曚綅瀵煎叆妯℃澘.xls";
+ location.href = baseUrl + "/mould/瀹㈡埛淇℃伅瀵煎叆妯℃澘.xls";
layer.closeAll('loading');
break
case 2:
@@ -264,7 +264,7 @@
admin.open({
type: 1,
area: '1500px',
- title: (mData ? '淇敼' : '娣诲姞') + '鐢叉柟鍗曚綅',
+ title: (mData ? '淇敼' : '娣诲姞') + '瀹㈡埛淇℃伅',
content: $('#editDialog').html(),
success: function (layero, dIndex) {
let loadNameXml = loadNameXmlSel()
diff --git a/src/main/webapp/static/js/cstmr/cstmr2.js b/src/main/webapp/static/js/cstmr/cstmr2.js
index 2916008..b116de5 100644
--- a/src/main/webapp/static/js/cstmr/cstmr2.js
+++ b/src/main/webapp/static/js/cstmr/cstmr2.js
@@ -59,7 +59,7 @@
case 1:
// 妯℃澘涓嬭浇
layer.load(1, {shade: [0.1,'#fff']});
- location.href = baseUrl + "/mould/鐢叉柟鍗曚綅瀵煎叆妯℃澘.xls";
+ location.href = baseUrl + "/mould/瀹㈡埛淇℃伅瀵煎叆妯℃澘.xls";
layer.closeAll('loading');
break
case 2:
@@ -286,7 +286,7 @@
admin.open({
type: 1,
area: '1500px',
- title: (mData ? '淇敼' : '娣诲姞') + '鐢叉柟鍗曚綅',
+ title: (mData ? '淇敼' : '娣诲姞') + '瀹㈡埛淇℃伅',
content: $('#editDialog').html(),
success: function (layero, dIndex) {
let loadNameXml = loadNameXmlSel()
@@ -362,7 +362,7 @@
admin.open({
type: 1,
area: '1500px',
- title: (mData ? '淇敼' : '娣诲姞') + '鐢叉柟鍗曚綅',
+ title: (mData ? '淇敼' : '娣诲姞') + '瀹㈡埛淇℃伅',
content: $('#editDialog2').html(),
success: function (layero, dIndex) {
let loadNameXml = loadNameXmlSel2()
diff --git a/src/main/webapp/static/js/item/item.js b/src/main/webapp/static/js/item/item.js
index a9174b8..b49918a 100644
--- a/src/main/webapp/static/js/item/item.js
+++ b/src/main/webapp/static/js/item/item.js
@@ -56,7 +56,7 @@
case 1:
// 妯℃澘涓嬭浇
layer.load(1, {shade: [0.1,'#fff']});
- location.href = baseUrl + "/mould/鐢叉柟鍗曚綅瀵煎叆妯℃澘.xls";
+ location.href = baseUrl + "/mould/瀹㈡埛淇℃伅瀵煎叆妯℃澘.xls";
layer.closeAll('loading');
break
case 2:
diff --git a/src/main/webapp/static/js/order/order.js b/src/main/webapp/static/js/order/order.js
index f7c27a0..03d616a 100644
--- a/src/main/webapp/static/js/order/order.js
+++ b/src/main/webapp/static/js/order/order.js
@@ -155,7 +155,7 @@
{
field: 'cstmrId$',
align: 'left',
- title: '鐢叉柟鍗曚綅',
+ title: '瀹㈡埛淇℃伅',
style: 'color: #1890ff;cursor:pointer',
event: 'cstmrMore',
templet:function(d){
@@ -513,7 +513,7 @@
return false;
}
if (!data.field.cstmrId) {
- layer.msg("鐢叉柟鍗曚綅涓嶈兘涓虹┖", {icon: 2});
+ layer.msg("瀹㈡埛淇℃伅涓嶈兘涓虹┖", {icon: 2});
return false;
}
if (!data.field.transactionRate) {
diff --git a/src/main/webapp/views/contract/contract.html b/src/main/webapp/views/contract/contract.html
index e9fcf8c..f24ecf2 100644
--- a/src/main/webapp/views/contract/contract.html
+++ b/src/main/webapp/views/contract/contract.html
@@ -124,7 +124,7 @@
<!-- </div>-->
<!-- </div>-->
<div class="layui-form-item">
- <label class="layui-form-label layui-form-required">鐢叉柟鍗曚綅: </label>
+ <label class="layui-form-label layui-form-required">瀹㈡埛淇℃伅: </label>
<div class="layui-input-block">
<div id="nameXmlSel" name="nameXmlSel">
</div>
diff --git a/src/main/webapp/views/cstmr/cstmr.html b/src/main/webapp/views/cstmr/cstmr.html
index 015cd38..9f38b63 100644
--- a/src/main/webapp/views/cstmr/cstmr.html
+++ b/src/main/webapp/views/cstmr/cstmr.html
@@ -189,6 +189,8 @@
<option value="闃佹ゼ璐ф灦/閽㈠钩鍙�">闃佹ゼ璐ф灦/閽㈠钩鍙�</option>
<option value="鍛ㄨ浆瀹瑰櫒">鍛ㄨ浆瀹瑰櫒</option>
<option value="骞冲簱">骞冲簱</option>
+ <option value="澧炶ˉ">澧炶ˉ</option>
+ <option value="鍏跺畠">鍏跺畠</option>
</select>
</div>
</div>
diff --git a/src/main/webapp/views/cstmr/cstmr2.html b/src/main/webapp/views/cstmr/cstmr2.html
index f094832..a33048f 100644
--- a/src/main/webapp/views/cstmr/cstmr2.html
+++ b/src/main/webapp/views/cstmr/cstmr2.html
@@ -137,7 +137,7 @@
<div class="layui-row">
<div class="layui-col-md6">
<div class="layui-form-item">
- <label class="layui-form-label layui-form-required">鐢叉柟鍗曚綅: </label>
+ <label class="layui-form-label layui-form-required">瀹㈡埛淇℃伅: </label>
<div class="layui-input-block">
<div id="nameXmlSel" name="nameXmlSel">
</div>
diff --git a/src/main/webapp/views/cstmr/cstmr_more.html b/src/main/webapp/views/cstmr/cstmr_more.html
index 8eaf4d1..dd30a17 100644
--- a/src/main/webapp/views/cstmr/cstmr_more.html
+++ b/src/main/webapp/views/cstmr/cstmr_more.html
@@ -46,7 +46,7 @@
<div>
<i class="layui-icon" style="font-size: 20px;color: #1890ff;font-weight: bold"></i>
<span id="form-name" style="margin: 0 6px;font-size: 18px;font-weight: bold;letter-spacing: 1px"></span>
- <span style="opacity: .5;font-size: small;margin-left: 5px">鐢叉柟鍗曚綅</span>
+ <span style="opacity: .5;font-size: small;margin-left: 5px">瀹㈡埛淇℃伅</span>
</div>
</div>
<div class="layui-card-body">
diff --git a/src/main/webapp/views/order/order.html b/src/main/webapp/views/order/order.html
index 75c7762..0b9a0c9 100644
--- a/src/main/webapp/views/order/order.html
+++ b/src/main/webapp/views/order/order.html
@@ -191,7 +191,7 @@
</div>
<div class="layui-col-md6">
<div class="layui-form-item">
- <label class="layui-form-label layui-form-required">鐢叉柟鍗曚綅: </label>
+ <label class="layui-form-label layui-form-required">瀹㈡埛淇℃伅: </label>
<div class="layui-input-block">
<div id="cstmrXmlSel" name="cstmrXmlSel">
</div>
diff --git a/src/main/webapp/views/order/order_more.html b/src/main/webapp/views/order/order_more.html
index 1756f58..cbfb7f6 100644
--- a/src/main/webapp/views/order/order_more.html
+++ b/src/main/webapp/views/order/order_more.html
@@ -68,7 +68,7 @@
</div>
</div>
<div class="layui-inline layui-col-md6">
- <label class="layui-form-label">鐢叉柟鍗曚綅:</label>
+ <label class="layui-form-label">瀹㈡埛淇℃伅:</label>
<div class="layui-input-block">
<input name="cstmrId$" class="layui-input" disabled />
</div>
--
Gitblit v1.9.1