From e399048a22f9ff2037f075beedd1f5832a07af02 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期一, 14 十一月 2022 15:23:16 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/crm/manager/controller/CompanyController.java | 16 +++++
src/main/java/com/zy/crm/manager/entity/result/KeyValueVo.java | 7 ++
src/main/java/com/zy/crm/manager/controller/CstmrController.java | 19 ++++++
src/main/webapp/static/js/order/order.js | 63 ++++++++++++++++++++
src/main/java/com/zy/crm/manager/entity/Order.java | 8 +-
src/main/webapp/views/order/order.html | 67 ++++++++++-----------
6 files changed, 140 insertions(+), 40 deletions(-)
diff --git a/src/main/java/com/zy/crm/manager/controller/CompanyController.java b/src/main/java/com/zy/crm/manager/controller/CompanyController.java
index b455a12..0dd5fd2 100644
--- a/src/main/java/com/zy/crm/manager/controller/CompanyController.java
+++ b/src/main/java/com/zy/crm/manager/controller/CompanyController.java
@@ -11,6 +11,7 @@
import com.core.common.R;
import com.zy.crm.common.web.BaseController;
import com.zy.crm.manager.entity.Company;
+import com.zy.crm.manager.entity.result.KeyValueVo;
import com.zy.crm.manager.service.CompanyService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -129,4 +130,19 @@
return R.ok();
}
+ // xm-select
+ @RequestMapping("/company/all/get/kv")
+ @ManagerAuth
+ public R getDataKV(@RequestParam(required = false) String condition) {
+ Wrapper<Company> wrapper = new EntityWrapper<Company>()
+ .andNew().like("name", condition).or().like("uuid", condition)
+ .orderBy("create_time", false);
+ List<Company> items = companyService.selectPage(new Page<>(1, 30), wrapper).getRecords();
+ List<KeyValueVo> valueVos = new ArrayList<>();
+ for (Company item : items) {
+ valueVos.add(new KeyValueVo(item.getName(), item.getId()));
+ }
+ return R.ok().add(valueVos);
+ }
+
}
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 e4a7052..14bc5e0 100644
--- a/src/main/java/com/zy/crm/manager/controller/CstmrController.java
+++ b/src/main/java/com/zy/crm/manager/controller/CstmrController.java
@@ -14,6 +14,7 @@
import com.zy.crm.manager.entity.Cstmr;
import com.zy.crm.manager.entity.CstmrFoll;
import com.zy.crm.manager.entity.CstmrType;
+import com.zy.crm.manager.entity.result.KeyValueVo;
import com.zy.crm.manager.service.CstmrFollService;
import com.zy.crm.manager.service.CstmrService;
import com.zy.crm.manager.service.CstmrTypeService;
@@ -311,4 +312,22 @@
return R.ok("鍒犻櫎鎴愬姛");
}
+ // xm-select
+ @RequestMapping("/cstmr/all/get/kv")
+ @ManagerAuth
+ public R getCstmrDataKV(@RequestParam(required = false) String condition) {
+ Wrapper<Cstmr> wrapper = new EntityWrapper<Cstmr>()
+ .andNew().like("name", condition).or().like("uuid", condition)
+ .orderBy("create_time", false);
+ List<Cstmr> cstmrs = cstmrService.selectPage(new Page<>(1, 30), wrapper).getRecords();
+ List<KeyValueVo> valueVos = new ArrayList<>();
+ for (Cstmr cstmr : cstmrs) {
+ KeyValueVo vo = new KeyValueVo();
+ vo.setName(cstmr.getName() + "(" + cstmr.getUuid() + ")");
+ vo.setValue(cstmr.getId());
+ valueVos.add(vo);
+ }
+ return R.ok().add(valueVos);
+ }
+
}
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 4d54bce..c7c232a 100644
--- a/src/main/java/com/zy/crm/manager/entity/Order.java
+++ b/src/main/java/com/zy/crm/manager/entity/Order.java
@@ -66,9 +66,9 @@
private Long cstmrId;
/**
- * 瀹㈡埛浠ｅ彿
+ * 椤圭洰浠ｅ彿
*/
- @ApiModelProperty(value= "瀹㈡埛浠ｅ彿")
+ @ApiModelProperty(value= "椤圭洰浠ｅ彿")
private String uuid;
/**
@@ -78,9 +78,9 @@
private String name;
/**
- * 鎬婚噾棰�
+ * 椤圭洰鎬婚噾棰�
*/
- @ApiModelProperty(value= "鎬婚噾棰�")
+ @ApiModelProperty(value= "椤圭洰鎬婚噾棰�")
private Double money;
/**
diff --git a/src/main/java/com/zy/crm/manager/entity/result/KeyValueVo.java b/src/main/java/com/zy/crm/manager/entity/result/KeyValueVo.java
index 506ed79..fbb58f7 100644
--- a/src/main/java/com/zy/crm/manager/entity/result/KeyValueVo.java
+++ b/src/main/java/com/zy/crm/manager/entity/result/KeyValueVo.java
@@ -12,4 +12,11 @@
private Long value;
+ public KeyValueVo() {
+ }
+
+ public KeyValueVo(String name, Long value) {
+ this.name = name;
+ this.value = value;
+ }
}
diff --git a/src/main/webapp/static/js/order/order.js b/src/main/webapp/static/js/order/order.js
index 3b22b09..664e5c9 100644
--- a/src/main/webapp/static/js/order/order.js
+++ b/src/main/webapp/static/js/order/order.js
@@ -247,11 +247,15 @@
admin.open({
type: 1,
area: '1500px',
- title: (mData ? '淇敼' : '娣诲姞') + '璁㈠崟鐘舵��',
+ title: (mData ? '淇敼' : '娣诲姞') + '璺熻釜椤圭洰',
content: $('#editDialog').html(),
success: function (layero, dIndex) {
+ let cstmrSel = loadCstmrSel();
+ let companySel = loadCompanySel();
if (mData) {
$('#cascaderVal').val(mData.pcd);
+ cstmrSel.setValue({name: cstmrId$, value: cstmrId});
+ companySel.setValue({name: company$, value: company});
}
layDateRender(mData);
cascaderRender();
@@ -278,6 +282,7 @@
})
return false;
});
+
$(layero).children('.layui-layer-content').css('overflow', 'visible');
layui.form.render('select');
}
@@ -356,6 +361,62 @@
});
}
+ window.loadCstmrSel = function () {
+ return xmSelect.render({
+ el: '#cstmrXmlSel',
+ autoRow: true,
+ filterable: true,
+ remoteSearch: true,
+ radio: true,
+ remoteMethod: function (val, cb, show) {
+ $.ajax({
+ url: baseUrl + "/cstmr/all/get/kv",
+ headers: {'token': localStorage.getItem('token')},
+ data: {
+ condition: val
+ },
+ method: 'POST',
+ success: function (res) {
+ if (res.code === 200) {
+ cb(res.data)
+ } else {
+ cb([]);
+ layer.msg(res.msg, {icon: 2});
+ }
+ }
+ });
+ }
+ });
+ }
+
+ window.loadCompanySel = function () {
+ return xmSelect.render({
+ el: '#companyXmlSel',
+ autoRow: true,
+ filterable: true,
+ remoteSearch: true,
+ radio: true,
+ remoteMethod: function (val, cb, show) {
+ $.ajax({
+ url: baseUrl + "/company/all/get/kv",
+ headers: {'token': localStorage.getItem('token')},
+ data: {
+ condition: val
+ },
+ method: 'POST',
+ success: function (res) {
+ if (res.code === 200) {
+ cb(res.data)
+ } else {
+ cb([]);
+ layer.msg(res.msg, {icon: 2});
+ }
+ }
+ });
+ }
+ });
+ }
+
});
// 鍏抽棴鍔ㄤ綔
diff --git a/src/main/webapp/views/order/order.html b/src/main/webapp/views/order/order.html
index c874b90..519a9a7 100644
--- a/src/main/webapp/views/order/order.html
+++ b/src/main/webapp/views/order/order.html
@@ -45,6 +45,13 @@
position: relative;
margin-right: 5px;
}
+
+ #detail .layui-form-label {
+ width: 120px;
+ }
+ #detail .layui-input-block {
+ margin-left: 150px;
+ }
</style>
</head>
<body>
@@ -90,7 +97,7 @@
</div>
<div class="layui-card" style="margin-bottom: 0">
<div class="layui-card-body">
- 鐢叉柟璧勬枡锛氭暟鎹叧鑱旇鍗曪紝
+ 椤圭洰鍒楄〃锛�
<span class="text-danger">璇峰嬁闅忔剰鍒犻櫎銆�</span>
</div>
</div>
@@ -121,14 +128,9 @@
</div>
</div>
<div class="layui-form-item">
- <label class="layui-form-label layui-form-required">瀹㈡埛绫诲埆: </label>
- <div class="layui-input-block cool-auto-complete">
- <input class="layui-input" name="cstmrType" placeholder="璇疯緭鍏ュ鎴风被鍒�" lay-vertype="tips" lay-verify="required" style="display: none">
- <input id="cstmrType$" name="cstmrType$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇疯緭鍏ュ鎴风被鍒�" onfocus=this.blur()>
- <div class="cool-auto-complete-window">
- <input class="cool-auto-complete-window-input" data-key="cstmrTypeQueryBycstmrType" onkeyup="autoLoad(this.getAttribute('data-key'))">
- <select class="cool-auto-complete-window-select" data-key="cstmrTypeQueryBycstmrTypeSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
- </select>
+ <label class="layui-form-label">鎵�灞炲叕鍙�: </label>
+ <div class="layui-input-block">
+ <div id="companyXmlSel" name="companyXmlSel">
</div>
</div>
</div>
@@ -136,32 +138,6 @@
<label class="layui-form-label layui-form-required">鐪佸競鍖� : </label>
<div class="layui-input-block">
<input id="cascaderVal" name="pcd" placeholder="璇烽�夋嫨" class="layui-hide" lay-verify="required"/>
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label layui-form-required">椤圭洰鍦板潃: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="addr" placeholder="璇疯緭鍏ヨ缁嗗湴鍧�" autocomplete="off" lay-verify="required">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label layui-form-required">椤圭洰鎬婚噾棰�: </label>
- <div class="layui-input-block">
- <input type="number" class="layui-input" name="contacts" placeholder="璇疯緭鍏ラ」鐩�婚噾棰�" autocomplete="off" lay-verify="required">
- </div>
- </div>
- </div>
- <div class="layui-col-md6">
- <div class="layui-form-item">
- <label class="layui-form-label">瀹㈡埛鍏崇郴: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="rela" placeholder="璇疯緭鍏ュ鎴峰叧绯�" autocomplete="off">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label layui-form-required">鐢佃瘽: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="tel" placeholder="璇疯緭鍏ョ數璇�" autocomplete="off" lay-verify="required">
</div>
</div>
<div class="layui-form-item">
@@ -176,6 +152,27 @@
</div>
</div>
</div>
+ </div>
+ <div class="layui-col-md6">
+ <div class="layui-form-item">
+ <label class="layui-form-label">鐢叉柟鍗曚綅: </label>
+ <div class="layui-input-block">
+ <div id="cstmrXmlSel" name="cstmrXmlSel">
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">椤圭洰鎬婚噾棰�: </label>
+ <div class="layui-input-block">
+ <input type="number" class="layui-input" name="contacts" placeholder="璇疯緭鍏ラ」鐩�婚噾棰�" autocomplete="off" lay-verify="required">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">椤圭洰鍦板潃: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="addr" placeholder="璇疯緭鍏ヨ缁嗗湴鍧�" autocomplete="off" lay-verify="required">
+ </div>
+ </div>
<div class="layui-form-item">
<label class="layui-form-label">澶囨敞: </label>
<div class="layui-input-block">
--
Gitblit v1.9.1