From 7fee45e68785dfba91f803772a4aef9017a2a811 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期四, 03 八月 2023 16:36:10 +0800
Subject: [PATCH] #界面完善
---
src/main/java/com/zy/crm/manager/controller/PriOnlineController.java | 1 +
src/main/webapp/static/js/cstmr/cstmr.js | 2 +-
src/main/webapp/views/cstmr/cstmr.html | 6 ++++++
src/main/webapp/static/js/priOnline/priOnline.js | 6 +++---
src/main/webapp/static/js/plan/plan.js | 15 ++++++++++-----
src/main/webapp/views/plan/plan.html | 5 ++++-
src/main/webapp/views/priSales/priSales.html | 2 +-
src/main/java/com/zy/crm/manager/entity/PriSales.java | 10 ++++++++++
src/main/webapp/views/priOnline/priOnline.html | 2 +-
9 files changed, 37 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/zy/crm/manager/controller/PriOnlineController.java b/src/main/java/com/zy/crm/manager/controller/PriOnlineController.java
index a4e190b..37dfe12 100644
--- a/src/main/java/com/zy/crm/manager/controller/PriOnlineController.java
+++ b/src/main/java/com/zy/crm/manager/controller/PriOnlineController.java
@@ -171,6 +171,7 @@
priOnline.setUpdateUserId(getUserId());
//鐘舵�侊紝鏈畬鎴�
priOnline.setStatus(0);
+ priOnline.setDeptId(getDeptId());
//涓氬姟鍛�
// Item item = itemService.selectById(priOnline.getItemId());
Order order = orderService.selectById(priOnline.getItemId());
diff --git a/src/main/java/com/zy/crm/manager/entity/PriSales.java b/src/main/java/com/zy/crm/manager/entity/PriSales.java
index d279bf6..26adc70 100644
--- a/src/main/java/com/zy/crm/manager/entity/PriSales.java
+++ b/src/main/java/com/zy/crm/manager/entity/PriSales.java
@@ -7,6 +7,7 @@
import com.core.common.SpringUtils;
import com.zy.crm.manager.service.ItemService;
+import com.zy.crm.manager.service.OrderService;
import com.zy.crm.system.entity.User;
import com.zy.crm.system.service.UserService;
import org.springframework.format.annotation.DateTimeFormat;
@@ -110,6 +111,15 @@
return null;
}
+ public String getOrderId$() {
+ OrderService orderService = SpringUtils.getBean(OrderService.class);
+ Order order = orderService.selectById(this.itemId);
+ if (!Cools.isEmpty(order)){
+ return String.valueOf(order.getName());
+ }
+ return null;
+ }
+
public String getUpdateTime$(){
if (Cools.isEmpty(this.updateTime)){
return "";
diff --git a/src/main/webapp/static/js/cstmr/cstmr.js b/src/main/webapp/static/js/cstmr/cstmr.js
index d6e3d1d..88f1123 100644
--- a/src/main/webapp/static/js/cstmr/cstmr.js
+++ b/src/main/webapp/static/js/cstmr/cstmr.js
@@ -142,6 +142,7 @@
// ,{field: 'id', align: 'center',title: 'ID'}
// ,{field: 'hostId$', align: 'center',title: '鎵�灞炲晢鎴�'}
,{field: 'name', align: 'left',title: '瀹㈡埛鍚嶇О', style: 'color: #1890ff;cursor:pointer', event: 'more', width: 350}
+ ,{field: 'simple', align: 'left',title: '瀹㈡埛绠�绉�', hide: false}
,{field: 'uuid', align: 'left',title: '瀹㈡埛浠ｅ彿'}
,{field: 'addr', align: 'left',title: '璇︾粏鍦板潃', templet:function(d){return emptyShow(d.addr)}}
,{field: 'tel', align: 'left',title: '鐢佃瘽', templet:function(d){return emptyShow(d.tel)}}
@@ -150,7 +151,6 @@
,{field: 'userId$', align: 'left',title: '娣诲姞浜哄憳'}
,{field: 'createTime$', align: 'left',title: '娣诲姞鏃堕棿'}
,{field: 'deptId$', align: 'left',title: '鎵�灞為儴闂�', hide: true}
- ,{field: 'simple', align: 'left',title: '瀹㈡埛绠�绉�', hide: true}
,{field: 'rela', align: 'left',title: '瀹㈡埛鍏崇郴', hide: true}
,{field: 'contacts', align: 'left',title: '瀹㈡埛鑱旂郴浜�', hide: true}
,{field: 'director$', align: 'left',title: '璐熻矗浜�', hide: true}
diff --git a/src/main/webapp/static/js/plan/plan.js b/src/main/webapp/static/js/plan/plan.js
index ae1fe6b..3484bf8 100644
--- a/src/main/webapp/static/js/plan/plan.js
+++ b/src/main/webapp/static/js/plan/plan.js
@@ -141,13 +141,13 @@
{type: 'checkbox'}
// ,{field: 'id', align: 'center',title: 'ID'}
// ,{field: 'hostId$', align: 'center',title: '鎵�灞炲晢鎴�'}
- ,{field: 'userId$', align: 'left',title: '涓氬姟鍛�',hide: false}
+ ,{field: 'userId$', align: 'left',title: '涓氬姟鍛�',hide: false, width: 100}
,{field: 'planType$', align: 'left',title: '涓氬姟绫诲瀷', width: 150,hide: false}
,{field: 'name', align: 'left',title: '鍞墠瑙勫垝鐢宠鍗曞悕绉�', width: 220, style: 'color: #1890ff;cursor:pointer', event: 'more',hide: false}
,{field: 'uuid', align: 'left',title: '瑙勫垝鍗曞彿', width: 100,hide: false}
,{field: 'planNeed$', align: 'left',title: '鎵�闇�', templet:function(d){return emptyShow(d.planNeed$)},hide: false}
,{field: 'deptId$', align: 'left',title: '鎵�灞為儴闂�',hide: true}
- ,{field: 'planner$', align: 'left',title: '瑙勫垝鍛�',hide: false}
+ ,{field: 'planner$', align: 'left',title: '瑙勫垝鍛�',hide: false, width: 100}
// ,{field: 'nowHeadman$', align: 'left',title: '瑙勫垝缁勯暱',hide: true}
,{field: 'orderId$', align: 'left',title: '璺熻釜椤圭洰', width: 220, style: 'color: #1890ff;cursor:pointer', event: 'orderMore',hide: false}
// ,{field: 'cstmrId$', align: 'left',title: '鐢叉柟鍗曚綅', width: 220, style: 'color: #1890ff;cursor:pointer', event: 'cstmrMore',hide: true}
@@ -162,16 +162,16 @@
// ,{field: 'planBonus', align: 'center',title: '瑙勬牸濂栭噾'}
// ,{field: 'planLeaderBonus', align: 'center',title: '瑙勬牸缁勯暱濂栭噾'}
// ,{field: 'files', align: 'center',title: '闄勪欢'}
- ,{field: 'settle$', align: 'center',title: '杩涘害'}
+ ,{field: 'settle$', align: 'center',title: '杩涘害', width: 150}
// ,{field: 'settleMsg', align: 'center',title: '瀹℃牳杩涘害'}
// ,{field: 'comment', align: 'center',title: '璇勮'}
// ,{field: 'status$', align: 'center',title: '鐘舵��'}
,{field: 'createTime$', align: 'left',title: '娣诲姞鏃ユ湡', width: 160, hide: false}
- ,{field: 'updateBy$', align: 'left',title: '淇敼浜�'}
+ ,{field: 'updateBy$', align: 'left',title: '淇敼浜�', width: 100}
,{field: 'updateTime$', align: 'left',title: '淇敼鏃堕棿', hide: true}
,{field: 'memo', align: 'left',title: '娉ㄩ噴', hide: true}
- ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width: 180}
+ ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width: 280}
]],
request: {
pageName: 'curr',
@@ -586,6 +586,11 @@
// 鐐瑰嚮涓嬭浇鎸夐挳鏃惰Е鍙戞枃浠朵笅杞�
$('#data-btn-file3').on('click', 'a', function() {
+ // var downloadUrl = $(this).attr('href');
+ // console.log(downloadUrl)
+ // console.log(baseUrl)
+ // window.open("/\//"+downloadUrl);
+ // return false;
var downloadUrl = $(this).attr('href');
console.log(downloadUrl)
// 鍙戣捣 AJAX 璇锋眰锛岃幏鍙栨枃浠�
diff --git a/src/main/webapp/static/js/priOnline/priOnline.js b/src/main/webapp/static/js/priOnline/priOnline.js
index 09d0a0c..98d99ba 100644
--- a/src/main/webapp/static/js/priOnline/priOnline.js
+++ b/src/main/webapp/static/js/priOnline/priOnline.js
@@ -83,9 +83,9 @@
cellMinWidth: 150,
cols: [[
{type: 'checkbox', fixed: 'left'}
- ,{field: 'id', title: 'ID', sort: true,align: 'center', fixed: 'left', width: 80}
- ,{field: 'templateName', align: 'center',title: '妯℃澘鍚�'}
- ,{field: 'orderNum', align: 'center',title: '璁㈠崟鍙�'}
+ ,{field: 'id', title: 'ID', sort: true,align: 'center', fixed: 'left', width: 80,hide: true}
+ ,{field: 'templateName', align: 'center',title: '鏍镐环鍚�',hide: false}
+ ,{field: 'orderNum', align: 'center',title: '鏍镐环鍗曞彿'}
,{field: 'orderId$', align: 'center',title: '椤圭洰鍚�'}
,{field: 'createTime$', align: 'center',title: '鍒涘缓鏃堕棿'}
,{field: 'updateTime$', align: 'center',title: '鏇存柊鏃堕棿'}
diff --git a/src/main/webapp/views/cstmr/cstmr.html b/src/main/webapp/views/cstmr/cstmr.html
index 1bdba69..ea52dea 100644
--- a/src/main/webapp/views/cstmr/cstmr.html
+++ b/src/main/webapp/views/cstmr/cstmr.html
@@ -142,6 +142,12 @@
</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="simple" placeholder="璇疯緭鍏ュ鎴风畝绉�" lay-vertype="tips" lay-verify="required|simple" autocomplete="off">
+ </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">
diff --git a/src/main/webapp/views/plan/plan.html b/src/main/webapp/views/plan/plan.html
index 4c6a687..dbd6e09 100644
--- a/src/main/webapp/views/plan/plan.html
+++ b/src/main/webapp/views/plan/plan.html
@@ -138,7 +138,10 @@
{{# } }}
<a class="layui-btn layui-btn-primary layui-btn-xs btn-edit" lay-event="uploadLink">闄勪欢</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>
+ {{# if (d.settle == 1 || d.settle == 2 || d.settle == 3) { }}
+ <a class="layui-btn layui-btn-danger layui-btn-xs btn-edit" lay-event="del">鍒犻櫎</a>
+ {{# } }}
+
</script>
<scrpt type="text/html" id="plannerListDialog">
diff --git a/src/main/webapp/views/priOnline/priOnline.html b/src/main/webapp/views/priOnline/priOnline.html
index bef3762..cbface0 100644
--- a/src/main/webapp/views/priOnline/priOnline.html
+++ b/src/main/webapp/views/priOnline/priOnline.html
@@ -108,7 +108,7 @@
</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 cool-auto-complete">
<input class="layui-input" name="priId" placeholder="璇疯緭鍏ユā鏉垮悕" style="display: none" lay-verify="required">
<input id="priId$" name="priId$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇疯緭鍏ユā鏉垮悕" onfocus=this.blur()>
diff --git a/src/main/webapp/views/priSales/priSales.html b/src/main/webapp/views/priSales/priSales.html
index abfef1d..2350401 100644
--- a/src/main/webapp/views/priSales/priSales.html
+++ b/src/main/webapp/views/priSales/priSales.html
@@ -74,7 +74,7 @@
<div class="layui-form-item">
<label class="layui-form-label">椤圭洰鍚�: </label>
<div class="layui-input-block">
- <input class="layui-input" id="itemName" disabled placeholder="璇疯緭鍏ラ」鐩悕" autocomplete="off" lay-verify="required">
+ <input class="layui-input" id="orderId$" disabled placeholder="璇疯緭鍏ラ」鐩悕" autocomplete="off" lay-verify="required">
</div>
</div>
--
Gitblit v1.9.1