From 51d36e410d855fb782b6cd678038cb167a25ea11 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期一, 16 十月 2023 13:42:59 +0800
Subject: [PATCH] #心得体会
---
src/main/resources/mapper/OrderMapper.xml | 1
src/main/webapp/views/businessTrip/businessTrip.html | 4 +
src/main/webapp/views/businessTrip/businessTripOther.html | 5 +
src/main/webapp/static/js/order/order.js | 8 +-
src/main/webapp/views/followUp/followUp.html | 14 ++--
src/main/webapp/views/home/dashboard.html | 63 ++++++++++++++++++++-
src/main/java/com/zy/crm/manager/entity/Order.java | 6 ++
src/main/webapp/static/js/followUp/followUp.js | 21 +++---
src/main/java/com/zy/crm/manager/controller/OrderController.java | 20 ++++++
src/main/webapp/views/order/order.html | 26 ++++++--
10 files changed, 135 insertions(+), 33 deletions(-)
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 1d09de6..e599f10 100644
--- a/src/main/java/com/zy/crm/manager/controller/OrderController.java
+++ b/src/main/java/com/zy/crm/manager/controller/OrderController.java
@@ -43,6 +43,8 @@
private PriOnline2Service priOnline2Service;
@Autowired
private PriQuoteService priQuoteService;
+ @Autowired
+ private FollowUpService followUpService;
@RequestMapping(value = "/order/{id}/auth")
@ManagerAuth
@@ -110,7 +112,25 @@
}
Date now = new Date();
+ if (order.getStatus()!=0){
+ if (Cools.isEmpty(order.getMemoExperience())){
+ return R.error("璇疯緭鍏ュ績寰椾綋浼�");
+ }else {
+ FollowUp followUp = new FollowUp();
+ followUp.setWorkMsg(order.getMemoExperience());
+ followUp.setOrderId(order.getId());
+ followUp.setUserId(getUserId());
+ followUp.setCreateBy(getUserId());
+ followUp.setUpdateBy(getUserId());
+ followUp.setDirector(getUserId());
+ followUp.setDeptId(getDeptId());
+ followUp.setCreateTime(now);
+ followUp.setUpdateTime(now);
+ followUpService.insert(followUp);
+ }
+ }
+ order.setMemoExperience(null);
order.setUpdateBy(getUserId());
order.setUpdateTime(now);
Order orderOld = orderService.selectById(order.getId());
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 c0814e0..33fe0a3 100644
--- a/src/main/java/com/zy/crm/manager/entity/Order.java
+++ b/src/main/java/com/zy/crm/manager/entity/Order.java
@@ -184,6 +184,12 @@
*/
@ApiModelProperty(value= "娉ㄩ噴")
private String memo;
+ /**
+ * 娉ㄩ噴
+ */
+ @ApiModelProperty(value= "蹇冨緱浣撲細")
+ @TableField("memo_experience")
+ private String memoExperience;
/**
* 棰勮鎴愪氦鐜�
diff --git a/src/main/resources/mapper/OrderMapper.xml b/src/main/resources/mapper/OrderMapper.xml
index 6cf3b53..718d54e 100644
--- a/src/main/resources/mapper/OrderMapper.xml
+++ b/src/main/resources/mapper/OrderMapper.xml
@@ -29,6 +29,7 @@
<result column="memo" property="memo" />
<result column="transaction_rate" property="transactionRate" />
<result column="order_product_type_id" property="orderProductTypeId" />
+ <result column="memo_experience" property="memoExperience" />
</resultMap>
diff --git a/src/main/webapp/static/js/followUp/followUp.js b/src/main/webapp/static/js/followUp/followUp.js
index ed1440f..9b729ee 100644
--- a/src/main/webapp/static/js/followUp/followUp.js
+++ b/src/main/webapp/static/js/followUp/followUp.js
@@ -21,22 +21,23 @@
cellMinWidth: 50,
height: 'full-120',
cols: [[
- {type: 'checkbox'}
- ,{field: 'id', align: 'center',title: 'ID',hide:true}
- ,{field: 'userId$', align: 'center',title: '鍒涘缓浜�'}
+ // {type: 'checkbox'},
+ {field: 'id', align: 'center',title: 'ID',hide:true}
+ ,{field: 'orderId', align: 'center',title: '椤圭洰鍙�',hide:false}
+ ,{field: 'userId$', align: 'center',title: '涓氬姟鍛�',hide: false}
,{field: 'deptId$', align: 'center',title: '鎵�灞為儴闂�',hide:true}
,{field: 'hostId', align: 'center',title: 'hostId',hide:true}
- ,{field: 'orderId$', align: 'center',title: '椤圭洰鍙�'}
+ ,{field: 'orderId$', align: 'center',title: '椤圭洰',hide:false}
,{field: 'director$', align: 'center',title: '璐熻矗浜�',hide:true}
- ,{field: 'workMsg', align: 'center',title: '浠诲姟鎻忚堪'}
- ,{field: 'memo', align: 'center',title: '澶囨敞'}
+ ,{field: 'workMsg', align: 'center',title: '蹇冨緱浣撲細',hide: false}
,{field: 'comment', align: 'center',title: '璇勮',hide:true}
,{field: 'createBy$', align: 'center',title: '鍒涘缓浜哄憳',hide:true}
- ,{field: 'updateBy$', align: 'center',title: '鏇存柊浜哄憳'}
- ,{field: 'createTime$', align: 'center',title: '鍒涘缓鏃堕棿',hide:true}
- ,{field: 'updateTime$', align: 'center',title: '鏇存柊鏃堕棿'}
+ ,{field: 'updateBy$', align: 'center',title: '鏇存柊浜哄憳',hide:true}
+ ,{field: 'createTime$', align: 'center',title: '鍒涘缓鏃堕棿',hide:false}
+ ,{field: 'updateTime$', align: 'center',title: '鏇存柊鏃堕棿',hide:true}
+ ,{field: 'memo', align: 'center',title: '澶囨敞',hide:true}
- ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:120}
+ // ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:180}
]],
request: {
pageName: 'curr',
diff --git a/src/main/webapp/static/js/order/order.js b/src/main/webapp/static/js/order/order.js
index 2d3e0e7..db88a80 100644
--- a/src/main/webapp/static/js/order/order.js
+++ b/src/main/webapp/static/js/order/order.js
@@ -142,6 +142,7 @@
where: where,
cols: [[
{type: 'checkbox'},
+ {field: 'id', align: 'left',title: '椤圭洰鍙�',hide: false},
{
field: 'name',
align: 'left',
@@ -150,7 +151,7 @@
event: 'more',
width: 300
},
- {field: 'uuid', align: 'left',title: '椤圭洰浠ｅ彿'},
+ {field: 'uuid', align: 'left',title: '椤圭洰浠ｅ彿',hide: false},
{
field: 'cstmrId$',
align: 'left',
@@ -195,14 +196,15 @@
},
{field: 'director$', align: 'left',title: '椤圭洰璐熻矗浜�', templet:function(d){return emptyShow(d.director$)}},
{field: 'remarks', align: 'left',title: '澶囨敞', templet:function(d){return emptyShow(d.remarks)}},
- {field: 'createTime$', align: 'left',title: '娣诲姞鏃堕棿'},
+ {field: 'createTime$', align: 'left',title: '娣诲姞鏃堕棿', hide: false},
{field: 'company$', align: 'left',title: '鎵�灞炲叕鍙�', hide: false},
{field: 'orderProductTypeId$', align: 'left',title: '浜у搧绫诲瀷', hide: false},
{field: 'province', align: 'left',title: '鐪�', hide: true},
{field: 'city', align: 'left',title: '甯�', hide: true},
{field: 'district', align: 'left',title: '鍘�', hide: true},
{field: 'town', align: 'left',title: '闀�', hide: true},
- {field: 'status$', align: 'left',title: '鐘舵��'},
+ {field: 'status$', align: 'left',title: '鐘舵��', hide: false},
+ {field: 'status', align: 'left',title: '鐘舵��', hide: true},
{field: 'files', align: 'left',title: '闄勪欢', hide: true},
{field: 'updateBy$', align: 'left',title: '淇敼浜哄憳', hide: true},
{field: 'updateTime$', align: 'left',title: '淇敼鏃堕棿', hide: true},
diff --git a/src/main/webapp/views/businessTrip/businessTrip.html b/src/main/webapp/views/businessTrip/businessTrip.html
index 8e3dd9c..a67f638 100644
--- a/src/main/webapp/views/businessTrip/businessTrip.html
+++ b/src/main/webapp/views/businessTrip/businessTrip.html
@@ -83,8 +83,10 @@
<a class="layui-btn layui-btn-xs btn-edit" lay-event="approval">瀹℃壒</a>
<a class="layui-btn layui-btn-primary layui-btn-xs btn-edit" lay-event="edit">淇敼</a>
{{# } }}
+ {{# if (d.settle == 2) { }}
+ <a class="layui-btn icon-btn layui-btn-sm" lay-event="addBlank">鐢宠鎶ラ攢</a>
+ {{# } }}
<a class="layui-btn layui-btn-danger layui-btn-xs btn-edit" lay-event="del">鍒犻櫎</a>
- <a class="layui-btn icon-btn layui-btn-sm" lay-event="addBlank">鐢宠鎶ラ攢</a>
</script>
<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
diff --git a/src/main/webapp/views/businessTrip/businessTripOther.html b/src/main/webapp/views/businessTrip/businessTripOther.html
index 4210d78..c7902eb 100644
--- a/src/main/webapp/views/businessTrip/businessTripOther.html
+++ b/src/main/webapp/views/businessTrip/businessTripOther.html
@@ -83,8 +83,11 @@
<a class="layui-btn layui-btn-xs btn-edit" lay-event="approval">瀹℃壒</a>
<a class="layui-btn layui-btn-primary layui-btn-xs btn-edit" lay-event="edit">淇敼</a>
{{# } }}
+
+ {{# if (d.settle == 2) { }}
+ <a class="layui-btn icon-btn layui-btn-sm" lay-event="addBlank">鐢宠鎶ラ攢</a>
+ {{# } }}
<a class="layui-btn layui-btn-danger layui-btn-xs btn-edit" lay-event="del">鍒犻櫎</a>
- <a class="layui-btn icon-btn layui-btn-sm" lay-event="addBlank">鐢宠鎶ラ攢</a>
</script>
<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
diff --git a/src/main/webapp/views/followUp/followUp.html b/src/main/webapp/views/followUp/followUp.html
index 8ced7cb..fe6d199 100644
--- a/src/main/webapp/views/followUp/followUp.html
+++ b/src/main/webapp/views/followUp/followUp.html
@@ -18,9 +18,9 @@
<div class="layui-form toolbar" id="search-box">
<div class="layui-form-item">
<div class="layui-inline">
- <label class="layui-form-label">缂栧彿:</label>
+ <label class="layui-form-label">椤圭洰鍙�:</label>
<div class="layui-input-inline">
- <input class="layui-input" type="text" name="id" placeholder="缂栧彿" autocomplete="off">
+ <input class="layui-input" type="text" name="order_id" placeholder="椤圭洰鍙�" autocomplete="off">
</div>
</div>
<div class="layui-inline"> 
@@ -40,15 +40,15 @@
<script type="text/html" id="toolbar">
<div class="layui-btn-container">
- <button class="layui-btn layui-btn-sm" id="btn-add" lay-event="addData">鏂板</button>
- <button class="layui-btn layui-btn-sm layui-btn-danger" id="btn-delete" lay-event="deleteData">鍒犻櫎</button>
- <button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData" style="float: right">瀵煎嚭</button>
+<!-- <button class="layui-btn layui-btn-sm" id="btn-add" lay-event="addData">鏂板</button>-->
+<!-- <button class="layui-btn layui-btn-sm layui-btn-danger" id="btn-delete" lay-event="deleteData">鍒犻櫎</button>-->
+<!-- <button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData" style="float: right">瀵煎嚭</button>-->
</div>
</script>
<script type="text/html" id="operate">
- <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>
+<!-- <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>-->
</script>
<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
diff --git a/src/main/webapp/views/home/dashboard.html b/src/main/webapp/views/home/dashboard.html
index a950f28..14cfdcf 100644
--- a/src/main/webapp/views/home/dashboard.html
+++ b/src/main/webapp/views/home/dashboard.html
@@ -74,7 +74,8 @@
<div class="layui-col-xs12 layui-col-sm6 layui-col-lg2 text-center">
<div class="numberInfoSubTitle testColorBlack">鍑哄樊瀹℃壒</div>
<div class="numberInfoValue">
- <a href="#" id="openBusinessTripPendingTasks" style="color: #1E9FFF"><span id="businessTripPendingTaskCount">2333</span><em class="numberInfoSuffix">涓�</em></a>
+<!-- <a href="#" id="openBusinessTripPendingTasks" style="color: #1E9FFF"><span id="businessTripPendingTaskCount">2333</span><em class="numberInfoSuffix">涓�</em></a>-->
+ <span id="businessTripPendingTaskCount">2333</span><em class="numberInfoSuffix">涓�</em>
</div>
</div>
<div class="layui-col-xs12 layui-col-sm6 layui-col-lg2 text-center">
@@ -84,9 +85,10 @@
</div>
</div>
<div class="layui-col-xs12 layui-col-sm6 layui-col-lg2 text-center">
- <div class="numberInfoSubTitle testColorBlack">寰呮帴鏀舵牳浠蜂换鍔�</div>
+ <div class="numberInfoSubTitle testColorBlack">鍙帴鏀舵牳浠蜂换鍔�</div>
<div class="numberInfoValue">
- <a href="#" id="openPlanPriOnlinePendingTasks" style="color: #1E9FFF"><span id="planPriOnlinePendingTaskCount">888</span><em class="numberInfoSuffix">涓�</em></a>
+<!-- <a href="#" id="openPlanPriOnlinePendingTasks" style="color: #1E9FFF"><span id="planPriOnlinePendingTaskCount">888</span><em class="numberInfoSuffix">涓�</em></a>-->
+ <span id="planPriOnlinePendingTaskCount">888</span><em class="numberInfoSuffix">涓�</em>
</div>
</div>
</div>
@@ -551,6 +553,61 @@
}
});
});
+ $("#openPlanPendingTasks").on("click", () => {
+ layer.open({
+ type: 2,
+ title: '瑙勫垝鐢宠鍗�',
+ maxmin: true,
+ area: [top.detailWidth, top.detailHeight],
+ shadeClose: true,
+ content: '../plan/plan.html?status=4',
+ success: function(layero, index){
+
+ }
+ });
+ });
+
+ $("#openPriOnlinePendingTasks").on("click", () => {
+ layer.open({
+ type: 2,
+ title: '鏍镐环浠诲姟',
+ maxmin: true,
+ area: [top.detailWidth, top.detailHeight],
+ shadeClose: true,
+ content: '../priOnline2/priOnline.html?status=4',
+ success: function(layero, index){
+
+ }
+ });
+ });
+
+ $("#openPriQuotePendingTasks").on("click", () => {
+ layer.open({
+ type: 2,
+ title: '鎶ヤ环浠诲姟',
+ maxmin: true,
+ area: [top.detailWidth, top.detailHeight],
+ shadeClose: true,
+ content: '../priQuote/priQuote.html?status=4',
+ success: function(layero, index){
+
+ }
+ });
+ });
+
+ $("#openReimburseOnlinePendingTasks").on("click", () => {
+ layer.open({
+ type: 2,
+ title: '鎶ラ攢浠诲姟',
+ maxmin: true,
+ area: [top.detailWidth, top.detailHeight],
+ shadeClose: true,
+ content: '../reimburseOnline/reimburseOnline.html?status=4',
+ success: function(layero, index){
+
+ }
+ });
+ });
$("#openCompanyPost").on("click", () => {
layer.open({
diff --git a/src/main/webapp/views/order/order.html b/src/main/webapp/views/order/order.html
index a8f943f..75c7762 100644
--- a/src/main/webapp/views/order/order.html
+++ b/src/main/webapp/views/order/order.html
@@ -104,8 +104,12 @@
</div>
<script type="text/html" id="operate">
- <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.status == 0) { }}
+ <a class="layui-btn layui-btn-primary layui-btn-xs btn-edit" lay-event="edit">淇敼</a>
+ {{# } }}
+ {{# if (d.status != 1) { }}
+ <a class="layui-btn layui-btn-danger layui-btn-xs btn-edit" lay-event="del">鍒犻櫎</a>
+ {{# } }}
<a class="layui-btn icon-btn layui-btn-sm" lay-event="business">鍑哄樊</a>
</script>
@@ -178,12 +182,10 @@
</div>
</div>
</div>
- <div class="layui-form-item" style="display: none;" id="statusNone">
- <label class="layui-form-label layui-form-required">椤圭洰鐘舵�� : </label>
- <div class="layui-input-block" >
- <input type="radio" name="status" value="0" title="璺熻釜涓�" checked/>
- <input type="radio" name="status" value="1" title="瀹屾垚"/>
- <input type="radio" name="status" value="2" title="鍏抽棴"/>
+ <div class="layui-form-item">
+ <label class="layui-form-label">蹇冨緱浣撲細: </label>
+ <div class="layui-input-block">
+ <textarea class="layui-textarea" name="memoExperience" placeholder="璇疯緭鍏ュ績寰椾綋浼�" maxlength="1024" autocomplete="off"></textarea>
</div>
</div>
</div>
@@ -229,6 +231,14 @@
<textarea class="layui-textarea" name="remarks" placeholder="璇疯緭鍏ュ娉�" maxlength="1024" autocomplete="off"></textarea>
</div>
</div>
+ <div class="layui-form-item" style="display: none;" id="statusNone">
+ <label class="layui-form-label layui-form-required">椤圭洰鐘舵�� : </label>
+ <div class="layui-input-block" >
+ <input type="radio" name="status" value="0" title="璺熻釜涓�" checked/>
+ <input type="radio" name="status" value="1" title="瀹屾垚"/>
+ <input type="radio" name="status" value="2" title="鍏抽棴"/>
+ </div>
+ </div>
</div>
</div>
<hr class="layui-bg-gray">
--
Gitblit v1.9.1