From 6e03e5e57d2e46d84410c02b8033f46cb2978895 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期一, 07 十一月 2022 15:02:02 +0800
Subject: [PATCH] #
---
src/main/webapp/views/cstmr/cstmr_more.html | 171 ++++++++----------------------------------
src/main/java/com/zy/crm/manager/controller/CstmrController.java | 1
src/main/java/com/zy/crm/manager/entity/Cstmr.java | 30 +++++++
3 files changed, 64 insertions(+), 138 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 c931a92..5c60c43 100644
--- a/src/main/java/com/zy/crm/manager/controller/CstmrController.java
+++ b/src/main/java/com/zy/crm/manager/controller/CstmrController.java
@@ -25,7 +25,6 @@
import org.apache.poi.ss.usermodel.Workbook;
import org.apache.poi.xssf.usermodel.XSSFWorkbook;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
diff --git a/src/main/java/com/zy/crm/manager/entity/Cstmr.java b/src/main/java/com/zy/crm/manager/entity/Cstmr.java
index e4b515a..34a226a 100644
--- a/src/main/java/com/zy/crm/manager/entity/Cstmr.java
+++ b/src/main/java/com/zy/crm/manager/entity/Cstmr.java
@@ -8,9 +8,11 @@
import com.core.common.SpringUtils;
import com.zy.crm.manager.service.CstmrTypeService;
import com.zy.crm.system.entity.Dept;
+import com.zy.crm.system.entity.Dic;
import com.zy.crm.system.entity.Host;
import com.zy.crm.system.entity.User;
import com.zy.crm.system.service.DeptService;
+import com.zy.crm.system.service.DicService;
import com.zy.crm.system.service.HostService;
import com.zy.crm.system.service.UserService;
import io.swagger.annotations.ApiModelProperty;
@@ -392,6 +394,34 @@
return s;
}
+ public String getPcd$() {
+ StringBuilder sb = new StringBuilder();
+ DicService service = SpringUtils.getBean(DicService.class);
+ if (!Cools.isEmpty(province)) {
+ Dic provinceDic = service.selectById(province);
+ if (!Cools.isEmpty(provinceDic)) {
+ sb.append(provinceDic.getName()).append(",");
+ }
+ }
+ if (!Cools.isEmpty(city)) {
+ Dic cityDic = service.selectById(city);
+ if (!Cools.isEmpty(cityDic)) {
+ sb.append(cityDic.getName()).append(",");
+ }
+ }
+ if (!Cools.isEmpty(district)) {
+ Dic districtDic = service.selectById(district);
+ if (!Cools.isEmpty(districtDic)) {
+ sb.append(districtDic.getName()).append(",");
+ }
+ }
+ String s = sb.toString();
+ if (s.endsWith(",")) {
+ s = s.substring(0, s.length() - 1);
+ }
+ return s;
+ }
+
public void setPcd(String pcd) {
this.pcd = pcd;
if (!Cools.isEmpty(pcd)) {
diff --git a/src/main/webapp/views/cstmr/cstmr_more.html b/src/main/webapp/views/cstmr/cstmr_more.html
index 595665d..4ac5f9e 100644
--- a/src/main/webapp/views/cstmr/cstmr_more.html
+++ b/src/main/webapp/views/cstmr/cstmr_more.html
@@ -1,5 +1,4 @@
<meta name="viewport" content="initial-scale=1.0, user-scalable=no">
-<link rel="stylesheet" href="../../static/css/jquery.upload.css" media="all"/>
<style>
#formAdvForm {
background-color: #f3f3f3;
@@ -37,39 +36,6 @@
margin-top: 5px !important;
margin-bottom: 5px !important;
background: #c8d1dabd;
- }
- .issue-label {
- display: inline-block;
- float: left;
- font-size: 16px;
- font-weight: bolder;
- height: 40px;
- line-height: 40px;
- text-align: center;
- white-space: nowrap;
- vertical-align: baseline;
- border-radius: .25em;
- }
- .online-info {
- display: inline-block;
- float: left;
- font-weight: bold;
- text-shadow: 0 1px 0 rgb(0 0 0 / 20%);
- padding: .3em 1em;
- font-size: 85%;
- height: 30px;
- line-height: 30px;
- color: #fff;
- text-align: center;
- white-space: nowrap;
- vertical-align: baseline;
- border-radius: .25em;
- }
- .online-success {
- background-color: #5cb85c;
- }
- .online-fail {
- background-color: #d9534f;
}
.card-body-item {
@@ -156,27 +122,27 @@
</div>
</div>
<div class="layui-inline layui-col-md6">
- <label class="layui-form-label">鍖哄垎:</label>
- <div class="layui-input-block">
- <input name="type" 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="remarks" 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="pcd" class="layui-input" disabled />
+ <input name="pcd$" 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="contacts" 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="type$" 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="remarks" class="layui-input" disabled />
</div>
</div>
@@ -192,13 +158,13 @@
<div class="layui-inline layui-col-md6">
<label class="layui-form-label">淇敼浜哄憳:</label>
<div class="layui-input-block">
- <input name="createTime$" class="layui-input" disabled/>
+ <input name="updateBy$" 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="updateBy$" class="layui-input icon-date" autocomplete="off" disabled/>
+ <input name="createTime$" class="layui-input icon-date" autocomplete="off" disabled/>
</div>
</div>
<div class="layui-inline layui-col-md6">
@@ -212,7 +178,18 @@
</div>
</div>
</div>
- <div class="layui-col-md3">
+ <div class="layui-col-md3" style="width: 24%;margin-left: 1%">
+ <div class="layui-card">
+ <div class="layui-card-header">
+ <span>璺熻繘浜�</span>
+ <span 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="originTable" lay-filter="originTable"></table>
+ </div>
+ </div>
</div>
</div>
</div>
@@ -223,21 +200,19 @@
</div>
</form>
-<script type="text/javascript" src="../../static/js/upload/jquery.upload.js" charset="utf-8"></script>
<script>
- var issueId = top.cstmrByMore;
+ var cstmrId = top.cstmrByMore;
$('.layui-layer-close').hide();
layui.config({
base: baseUrl + "/static/layui/lay/modules/"
}).extend({
notice: 'notice/notice',
- }).use(['form', 'table', 'laydate', 'notice', 'Player'], function () {
+ }).use(['form', 'table', 'laydate', 'notice'], function () {
var $ = layui.jquery;
var form = layui.form;
var table = layui.table;
var laydate = layui.laydate;
var notice = layui.notice;
- var Player = layui.Player;
form.render('select');
@@ -245,26 +220,17 @@
function init(){
notice.msg('姝ｅ湪杞藉叆鏁版嵁......', {icon: 4, position: "topRight"});
$.ajax({
- url: baseUrl + "/issue/" + issueId + "/auth",
+ url: baseUrl + "/cstmr/" + cstmrId + "/auth",
headers: {'token': localStorage.getItem('token')},
method: 'GET',
success: function (res) {
notice.destroy();
if (res.code === 200) {
- let issue = res.data;
- top.issueByDetl = null;
- // 缂栫爜
- $('.issue-label').text(issue.uuid);
+ let cstmr = res.data;
+ console.log(cstmr)
+ top.cstmrByMore = null;
// 璁惧鏄庣粏
- form.val('formAdvForm', issue);
- // 鍥剧墖
- initImgs(issue.id, issue.imgArr);
- // 瑙嗛
- if (!isEmpty(issue.videoArr) && issue.videoArr.length > 0) {
- initVideo(issue.videoArr);
- }
- $('.online-info').attr("class", issue.online?"online-info online-success":"online-info online-fail");
- $('.online-info').text(issue.settle$);
+ form.val('formAdvForm', cstmr);
layDateRender();
} else if (res.code === 403) {
top.location.href = baseUrl + "/";
@@ -273,75 +239,6 @@
}
}
})
- }
-
-
- /* 娓叉煋鍥剧墖 */
- function initImgs(sensorId, imgArr) {
- if (imgArr == null) {
- imgArr = [];
- }
- // https://gitee.com/gouguoyin/ajax-image-upload?_from=gitee_search#http://www.gouguoyin.cn/ajax-image-upload
- $(".image-box").ajaxImageUpload({
- fileInput : 'file',
- postUrl : baseUrl + '/issue/upload.action', //涓婁紶鐨勬湇鍔″櫒鍦板潃
- width : 180,
- height : 180,
- imageUrl: imgArr,
- postData : { issueId: issueId },
- maxNum: 5, //鍏佽涓婁紶鍥剧墖鏁伴噺
- allowZoom : true, //鍏佽鏀惧ぇ
- maxSize : 3, //鍏佽涓婁紶鍥剧墖鐨勬渶澶у昂瀵革紝鍗曚綅M
- appendMethod : 'after',
- before : function () {
- // layer.msg('涓婁紶鍓嶅洖璋冨嚱鏁�2');
- },
- success : function(json){
- },
- complete : function () {
- layer.msg('涓婁紶鎴愬姛', {icon: 1});
- },
- delete : function (src) {
- $.ajax({
- url: baseUrl + "/issue/remove.action",
- headers: {'token': localStorage.getItem('token')},
- method: 'POST',
- data: {
- issueId: issueId,
- src: src
- },
- // async: false,
- success: function (res) {
- if (res.code === 200) {
- layer.msg(res.msg, {icon: 1})
- } else if (res.code === 403) {
- top.location.href = baseUrl + "/";
- } else {
- layer.msg(res.msg, {icon: 2})
- }
- }
- })
- },
- error : function (e) {
- layer.msg(e.msg + '(' + e.code + ')', {icon: 2});
- }
- });
- }
-
- /* 娓叉煋瑙嗛 */
- function initVideo(videoSrc) {
- new Player({
- id: 'issueVideo',
- url: videoSrc[0], // 瑙嗛鍦板潃
- // poster: 'https://imgcache.qq.com/open_proj/proj_qcloud_v2/gateway/solution/general-video/css/img/scene/1.png', // 灏侀潰
- fluid: true, // 瀹藉害100%
- playbackRate: [0.5, 1, 1.5, 2], // 寮�鍚�嶉�熸挱鏀�
- pip: false, // 寮�鍚敾涓敾
- lang: 'zh-cn',
- success: function () {
- }
- });
- $('#issueVideo').css("width", "30%").css("padding-top", "20%");
}
/* 娓叉煋laydate */
--
Gitblit v1.9.1