From 9b170ef6438012f5679fc1ab352b408c13bf6f1d Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期四, 07 九月 2023 16:57:05 +0800
Subject: [PATCH] #
---
src/main/webapp/views/cstmr/cstmr_more.html | 48 ++++++------
src/main/java/com/zy/crm/manager/controller/CstmrController.java | 8 ++
src/main/webapp/static/js/cstmr/cstmr.js | 38 +++++++++
src/main/webapp/views/cstmr/cstmr.html | 22 +++--
src/main/java/com/zy/crm/manager/utils/CompanySearchUtils.java | 74 ++++++++++++++++++
5 files changed, 158 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 fc04cf6..eea9d9d 100644
--- a/src/main/java/com/zy/crm/manager/controller/CstmrController.java
+++ b/src/main/java/com/zy/crm/manager/controller/CstmrController.java
@@ -19,6 +19,7 @@
import com.zy.crm.manager.service.CstmrFollService;
import com.zy.crm.manager.service.CstmrService;
import com.zy.crm.manager.service.CstmrTypeService;
+import com.zy.crm.manager.utils.CompanySearchUtils;
import com.zy.crm.system.entity.Dept;
import com.zy.crm.system.entity.Dic;
import com.zy.crm.system.entity.Role;
@@ -173,6 +174,13 @@
return R.ok(result);
}
+ @RequestMapping(value = "/cstmrSearch/auth")
+ @ManagerAuth
+ public R cstmrSearch(String condition) {
+ List<Map<String, Object>> search = CompanySearchUtils.search(condition, 1);
+ return R.ok(search);
+ }
+
@RequestMapping(value = "/cstmr/check/column/auth")
@ManagerAuth
public R query(@RequestBody JSONObject param) {
diff --git a/src/main/java/com/zy/crm/manager/utils/CompanySearchUtils.java b/src/main/java/com/zy/crm/manager/utils/CompanySearchUtils.java
new file mode 100644
index 0000000..b9623e2
--- /dev/null
+++ b/src/main/java/com/zy/crm/manager/utils/CompanySearchUtils.java
@@ -0,0 +1,74 @@
+package com.zy.crm.manager.utils;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.core.common.Cools;
+import com.core.common.R;
+import com.core.exception.CoolException;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 绗笁鏂笰PI鎺ュ彛鎼滅储浼佷笟淇℃伅
+ */
+public class CompanySearchUtils {
+
+ /**
+ * 瀵瑰鏆撮湶鎼滅储鎺ュ彛
+ * @param company 浼佷笟鍚�(妯＄硦)
+ * @param api 璋冪敤鐨勭涓夋柟鎺ュ彛
+ */
+ public static List<Map<String, Object>> search(String company, Integer api) {
+ List<Map<String, Object>> list = new ArrayList<>();
+ switch (api) {
+ case 1:
+ list.addAll(aliyun_1(company));
+ break;
+ }
+ return list;
+ }
+
+ /**
+ * 闃块噷浜戝競鍦篈PI
+ */
+ private static List<Map<String, Object>> aliyun_1(String company) {
+ ArrayList<Map<String, Object>> list = new ArrayList<>();
+ try {
+ HashMap<String, Object> headers = new HashMap<>();
+ HashMap<String, Object> param = new HashMap<>();
+
+ headers.put("Authorization", "APPCODE d4675b210cec469aa3b9dad2e5ffe51a");
+
+ param.put("com", company);
+ param.put("method", "浼佷笟鍚嶇О");
+ param.put("page", "1");
+
+ String response = new HttpHandler.Builder()
+ .setUri("https://orgs.market.alicloudapi.com")
+ .setPath("/searchCompany")
+ .setHeaders(headers)
+ .setParams(param)
+ .build()
+ .doPost();
+ JSONObject jsonObject = JSON.parseObject(response);
+ if (Integer.parseInt(jsonObject.get("error_code").toString()) == 0) {
+ JSONObject result = JSON.parseObject(jsonObject.get("result").toString());
+ List<JSONObject> data = JSON.parseArray(result.get("data").toString(), JSONObject.class);
+ for (JSONObject object : data) {
+ HashMap<String, Object> map = new HashMap<>();
+ map.put("value", object.get("creditCode"));
+ map.put("name", object.get("companyName"));
+ list.add(map);
+ }
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ return list;
+ }
+
+}
diff --git a/src/main/webapp/static/js/cstmr/cstmr.js b/src/main/webapp/static/js/cstmr/cstmr.js
index 88f1123..d2c567b 100644
--- a/src/main/webapp/static/js/cstmr/cstmr.js
+++ b/src/main/webapp/static/js/cstmr/cstmr.js
@@ -265,6 +265,11 @@
title: (mData ? '淇敼' : '娣诲姞') + '鐢叉柟鍗曚綅',
content: $('#editDialog').html(),
success: function (layero, dIndex) {
+ let loadNameXml = loadNameXmlSel()
+ if (mData) {
+ $('#cascaderVal').val(mData.pcd);
+ if (mData.name) { loadNameXml.setValue([{name: mData.name, value: mData.name}]); }
+ }
form.verify({
name: function(value, item){
var min = item.getAttribute('lay-min');
@@ -280,6 +285,11 @@
cascaderRender();
form.val('detail', mData);
form.on('submit(editSubmit)', function (data) {
+ data.field.name = loadNameXml.getValue()[0] ? loadNameXml.getValue()[0].name : null;
+ if (!data.field.name) {
+ layer.msg("瀹㈡埛鍚嶇О涓嶈兘涓虹┖", {icon: 2});
+ return false;
+ }
var loadIndex = layer.load(2);
$.ajax({
url: baseUrl+"/cstmr/"+(mData?'update':'add')+"/auth",
@@ -378,6 +388,34 @@
});
}
+ window.loadNameXmlSel = function () {
+ return xmSelect.render({
+ el: '#nameXmlSel',
+ autoRow: true,
+ filterable: true,
+ remoteSearch: true,
+ radio: true,
+ remoteMethod: function (val, cb, show) {
+ $.ajax({
+ url: baseUrl + "/cstmrSearch/auth",
+ 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/cstmr/cstmr.html b/src/main/webapp/views/cstmr/cstmr.html
index d038db4..83b5464 100644
--- a/src/main/webapp/views/cstmr/cstmr.html
+++ b/src/main/webapp/views/cstmr/cstmr.html
@@ -80,7 +80,6 @@
<option value="addr" >璇︾粏鍦板潃</option>
<option value="tel" >鐢佃瘽</option>
<option value="remarks" >澶囨敞</option>
- <option value="rela" >瀹㈡埛鍏崇郴</option>
<option value="simple" >瀹㈡埛绠�绉�</option>
<option value="director" >璐熻矗浜�</option>
<option value="contacts" >瀹㈡埛鑱旂郴浜�</option>
@@ -135,10 +134,17 @@
<input name="id" type="hidden">
<div class="layui-row">
<div class="layui-col-md6">
+<!-- <div class="layui-form-item">-->
+<!-- <label class="layui-form-label layui-form-required">瀹㈡埛鍚嶇О: </label>-->
+<!-- <div class="layui-input-block">-->
+<!-- <input class="layui-input" name="name" placeholder="璇疯緭鍏ュ鎴峰悕绉�" lay-vertype="tips" lay-verify="required|name" lay-min="8" 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="name" placeholder="璇疯緭鍏ュ鎴峰悕绉�" lay-vertype="tips" lay-verify="required|name" lay-min="8" autocomplete="off">
+ <div id="nameXmlSel" name="nameXmlSel">
+ </div>
</div>
</div>
<!-- <div class="layui-form-item">-->
@@ -201,12 +207,12 @@
</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">瀹㈡埛鍏崇郴: </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">
diff --git a/src/main/webapp/views/cstmr/cstmr_more.html b/src/main/webapp/views/cstmr/cstmr_more.html
index 08e4c2a..c1c5e3c 100644
--- a/src/main/webapp/views/cstmr/cstmr_more.html
+++ b/src/main/webapp/views/cstmr/cstmr_more.html
@@ -52,7 +52,7 @@
<div class="layui-card-body">
<div class="card-body-item">
<div class="header-sub">
- 鐢佃瘽
+ 瀹㈡埛鐢佃瘽
</div>
<div class="header-desc" id="form-tel">
@@ -61,7 +61,7 @@
<div class="card-body-item" style="width: 400px">
<div class="header-sub">
- 璇︾粏鍦板潃
+ 瀹㈡埛璇︾粏鍦板潃
</div>
<div class="header-desc" id="form-addr">
@@ -80,7 +80,7 @@
</div>
<div class="layui-row">
<!-- 鍩烘湰淇℃伅 -->
- <div class="layui-col-md9">
+ <div class="layui-col-md12">
<div class="layui-card">
<div class="layui-card-header">
鍩烘湰淇℃伅
@@ -107,12 +107,12 @@
<input name="cstmrType$" class="layui-input" disabled />
</div>
</div>
- <div class="layui-inline layui-col-md6">
- <label class="layui-form-label">瀹㈡埛鍏崇郴:</label>
- <div class="layui-input-block">
- <input name="rela" class="layui-input" disabled/>
- </div>
- </div>
+<!-- <div class="layui-inline layui-col-md6">-->
+<!-- <label class="layui-form-label">瀹㈡埛鍏崇郴:</label>-->
+<!-- <div class="layui-input-block">-->
+<!-- <input name="rela" class="layui-input" disabled/>-->
+<!-- </div>-->
+<!-- </div>-->
<div class="layui-inline layui-col-md6">
<label class="layui-form-label">鐪佸競鍖�:</label>
<div class="layui-input-block">
@@ -131,7 +131,7 @@
<input name="type$" class="layui-input" disabled />
</div>
</div>
- <div class="layui-inline layui-col-md6">
+ <div class="layui-inline layui-col-md12">
<label class="layui-form-label">澶囨敞:</label>
<div class="layui-input-block">
<input name="remarks" class="layui-input" disabled />
@@ -170,20 +170,20 @@
</div>
</div>
</div>
- <!-- 璺熻繘浜� -->
- <div class="layui-col-md3" style="width: 24%;margin-left: 1%">
- <div class="layui-card">
- <div class="layui-card-header">
- <span>璺熻繘浜�</span>
- <span lay-filter="followerAdd" lay-submit style="float: right;cursor: pointer;">
- <i class="layui-icon" style="font-size: 20px;color: #1890ff;"></i>
- </span>
- </div>
- <div class="layui-card-body">
- <table id="followersTable" lay-filter="followersTable"></table>
- </div>
- </div>
- </div>
+<!-- <!– 璺熻繘浜� –>-->
+<!-- <div class="layui-col-md3" style="width: 24%;margin-left: 1%">-->
+<!-- <div class="layui-card">-->
+<!-- <div class="layui-card-header">-->
+<!-- <span>璺熻繘浜�</span>-->
+<!-- <span lay-filter="followerAdd" lay-submit style="float: right;cursor: pointer;">-->
+<!-- <i class="layui-icon" style="font-size: 20px;color: #1890ff;"></i>-->
+<!-- </span>-->
+<!-- </div>-->
+<!-- <div class="layui-card-body">-->
+<!-- <table id="followersTable" lay-filter="followersTable"></table>-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- </div>-->
</div>
</div>
--
Gitblit v1.9.1