From 9bb538e6fe6b24ee23e1726219c25634b2507e74 Mon Sep 17 00:00:00 2001 From: LSH Date: 星期四, 14 九月 2023 15:28:23 +0800 Subject: [PATCH] # --- src/main/webapp/views/cstmr/cstmr_more.html | 12 ++++++ src/main/webapp/static/js/cstmr/cstmr.js | 2 + src/main/java/com/zy/crm/manager/controller/PlanController.java | 6 ++- src/main/webapp/static/js/plan/plan.js | 10 +++-- src/main/webapp/views/order/order_more.html | 12 ++++++ src/main/java/com/zy/crm/manager/controller/PlanTypeController.java | 1 src/main/webapp/static/js/order/order.js | 6 ++ src/main/webapp/views/plan/plan.html | 28 +++++++------- src/main/webapp/views/order/order.html | 2 9 files changed, 57 insertions(+), 22 deletions(-) diff --git a/src/main/java/com/zy/crm/manager/controller/PlanController.java b/src/main/java/com/zy/crm/manager/controller/PlanController.java index 178b6ef..41b28cf 100644 --- a/src/main/java/com/zy/crm/manager/controller/PlanController.java +++ b/src/main/java/com/zy/crm/manager/controller/PlanController.java @@ -124,15 +124,17 @@ if (planService.selectByUuid(hostId, plan.getUuid()) != null) { throw new CoolException("瑙勫垝鍗曞凡瀛樺湪"); } + Date now = new Date(); plan.setHostId(hostId); plan.setUuid(planService.getUuid(hostId)); // 瑙勫垝鍗曚唬鍙� plan.setDeptId(getDeptId()); // 鎵�灞為儴闂� plan.setUserId(getUserId()); // 鎵�灞炰汉鍛� + plan.setAppleTime(now); plan.setCreateBy(getUserId()); - plan.setCreateTime(new Date()); + plan.setCreateTime(now); plan.setUpdateBy(getUserId()); - plan.setUpdateTime(new Date()); + plan.setUpdateTime(now); plan.setStatus(1); plan.setForm(JSON.toJSONString(param)); // 鑷畾涔夎〃鍗曞唴瀹� diff --git a/src/main/java/com/zy/crm/manager/controller/PlanTypeController.java b/src/main/java/com/zy/crm/manager/controller/PlanTypeController.java index 38cd89c..08e12a8 100644 --- a/src/main/java/com/zy/crm/manager/controller/PlanTypeController.java +++ b/src/main/java/com/zy/crm/manager/controller/PlanTypeController.java @@ -37,6 +37,7 @@ .add("planType", planTypeService.selectById(String.valueOf(id))) .add("userId", getUserId()) .add("nickName", getUser().getNickname()) + .add("mobile",getUser().getMobile()) ); } diff --git a/src/main/webapp/static/js/cstmr/cstmr.js b/src/main/webapp/static/js/cstmr/cstmr.js index ab0c979..e15803f 100644 --- a/src/main/webapp/static/js/cstmr/cstmr.js +++ b/src/main/webapp/static/js/cstmr/cstmr.js @@ -148,6 +148,8 @@ ,{field: 'tel', align: 'left',title: '鐢佃瘽', templet:function(d){return emptyShow(d.tel)}} ,{field: 'remarks', align: 'left',title: '澶囨敞', templet:function(d){return emptyShow(d.remarks)}} ,{field: 'cstmrType$', align: 'left',title: '瀹㈡埛绫诲埆'} + ,{field: 'industry', align: 'left',title: '瀹㈡埛琛屼笟'} + ,{field: 'productCategory', align: 'left',title: '浜у搧绫诲埆'} ,{field: 'userId$', align: 'left',title: '娣诲姞浜哄憳'} ,{field: 'createTime$', align: 'left',title: '娣诲姞鏃堕棿'} ,{field: 'deptId$', align: 'left',title: '鎵�灞為儴闂�', hide: true} diff --git a/src/main/webapp/static/js/order/order.js b/src/main/webapp/static/js/order/order.js index c4ab073..45c75c3 100644 --- a/src/main/webapp/static/js/order/order.js +++ b/src/main/webapp/static/js/order/order.js @@ -147,7 +147,7 @@ ,{field: 'cstmrId$', align: 'left',title: '鐢叉柟鍗曚綅', style: 'color: #1890ff;cursor:pointer', event: 'cstmrMore', templet:function(d){return emptyShow(d.cstmrId$)}} ,{field: 'pcd$', align: 'left',title: '鎵�灞炲尯鍩�', templet:function(d){return emptyShow(d.pcd$)}} ,{field: 'addr', align: 'left',title: '椤圭洰鍦板潃', templet:function(d){return emptyShow(d.addr)}} - ,{field: 'money', align: 'right',title: '椤圭洰棰勭畻閲戦', templet:function(d){return emptyShow(d.money+"涓�")}} + ,{field: 'money', align: 'right',title: '椤圭洰棰勭畻閲戦(涓�)', templet:function(d){return emptyShow(d.money+"")}} ,{field: 'transactionRate', align: 'right',title: '椤圭洰棰勪及鎴愪氦鐜�', templet:function(d){return emptyShow(d.transactionRate+"%")}} ,{field: 'director$', align: 'left',title: '椤圭洰璐熻矗浜�', templet:function(d){return emptyShow(d.director$)}} ,{field: 'remarks', align: 'left',title: '澶囨敞', templet:function(d){return emptyShow(d.remarks)}} @@ -274,6 +274,10 @@ if (!mData){ companySel.setValue([{name: "娴欐睙涓壃绔嬪簱鎶�鏈湁闄愬叕鍙�", value: 4}]); } + if (method === 'update'){ + var statusNone = document.getElementById("statusNone"); + statusNone.style.display = "block"; + } if (mData) { $('#cascaderVal').val(mData.pcd); if (mData.cstmrId) { cstmrSel.setValue([{name: mData.cstmrId$, value: mData.cstmrId}]); } diff --git a/src/main/webapp/static/js/plan/plan.js b/src/main/webapp/static/js/plan/plan.js index ec26e83..02f119f 100644 --- a/src/main/webapp/static/js/plan/plan.js +++ b/src/main/webapp/static/js/plan/plan.js @@ -151,7 +151,7 @@ // ,{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} - ,{field: 'appleTime$', align: 'left',title: '鐢宠鏃ユ湡', hide: true} + ,{field: 'appleTime$', align: 'left',title: '鐢宠鏃ユ湡', hide: false} // ,{field: 'beItem$', align: 'center',title: '绔嬮」'} // ,{field: 'planner', align: 'left',title: '瑙勫垝鍛�', templet:function(d){return emptyShow(d.planner)}} // ,{field: 'finishTime$', align: 'center',title: '瀹屾垚鏃堕棿'} @@ -166,7 +166,7 @@ // ,{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: 'createTime$', align: 'left',title: '娣诲姞鏃ユ湡', width: 160, hide: true} ,{field: 'updateBy$', align: 'left',title: '淇敼浜�', width: 100} ,{field: 'updateTime$', align: 'left',title: '淇敼鏃堕棿', hide: true} ,{field: 'memo', align: 'left',title: '娉ㄩ噴', hide: true} @@ -323,7 +323,8 @@ ]) let planNeedSel = loadPlanNeedSel(); form.val('detail', { - planTypeName: planType.name + planTypeName: planType.name, + userXmlSelPhone: res0.data.mobile }); layDateRender(); form.on('submit(editSubmit)', function (data) { @@ -912,7 +913,8 @@ method: 'POST', success: function (res) { if (res.code === 200) { - cb(res.data) + // cb(res.data) + cb([]); } else { cb([]); layer.msg(res.msg, {icon: 2}); diff --git a/src/main/webapp/views/cstmr/cstmr_more.html b/src/main/webapp/views/cstmr/cstmr_more.html index c1c5e3c..8eaf4d1 100644 --- a/src/main/webapp/views/cstmr/cstmr_more.html +++ b/src/main/webapp/views/cstmr/cstmr_more.html @@ -131,6 +131,18 @@ <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="industry" 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="productCategory" class="layui-input" disabled /> + </div> + </div> <div class="layui-inline layui-col-md12"> <label class="layui-form-label">澶囨敞:</label> <div class="layui-input-block"> diff --git a/src/main/webapp/views/order/order.html b/src/main/webapp/views/order/order.html index d4da9e9..2817f56 100644 --- a/src/main/webapp/views/order/order.html +++ b/src/main/webapp/views/order/order.html @@ -164,7 +164,7 @@ </div> </div> </div> - <div class="layui-form-item"> + <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/> diff --git a/src/main/webapp/views/order/order_more.html b/src/main/webapp/views/order/order_more.html index b7274f9..1756f58 100644 --- a/src/main/webapp/views/order/order_more.html +++ b/src/main/webapp/views/order/order_more.html @@ -109,6 +109,18 @@ <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="money" 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="transactionRate" class="layui-input" disabled /> + </div> + </div> <fieldset class="layui-elem-field layui-field-title" style="margin-top: 20px;"> <legend style="font-size: 13px">鍏朵粬</legend> diff --git a/src/main/webapp/views/plan/plan.html b/src/main/webapp/views/plan/plan.html index e7eed6e..1a108a8 100644 --- a/src/main/webapp/views/plan/plan.html +++ b/src/main/webapp/views/plan/plan.html @@ -219,24 +219,17 @@ <input class="layui-input" name="userXmlSelPhone" autocomplete="off" placeholder="璇疯緭鍏ヤ笟鍔″憳鑱旂郴鏂瑰紡" lay-vertype="tips" lay-verify="required"> </div> </div> - <div class="layui-form-item"> - <label class="layui-form-label">鎵�闇�: </label> - <div class="layui-input-block"> - <div id="planNeedXmlSel" name="planNeedXmlSel"> - </div> - </div> - </div> </div> <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" autocomplete="off" name="appleTime" id="appleTime$" placeholder="璇疯緭鍏ョ敵璇锋棩鏈�" lay-vertype="tips" 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" autocomplete="off" name="appleTime" id="appleTime$" placeholder="璇疯緭鍏ョ敵璇锋棩鏈�" lay-vertype="tips" lay-verify="required">--> +<!-- </div>--> +<!-- </div>--> <div class="layui-form-item"> <label class="layui-form-label layui-form-required">瀹㈡埛鍚嶇О: </label> - <div class="layui-input-block"> + <div class="layui-input-block" > <div id="cstmrXmlSel" name="cstmrXmlSel"> </div> </div> @@ -257,6 +250,13 @@ </select> </div> </div> + <div class="layui-form-item"> + <label class="layui-form-label">鎵�闇�: </label> + <div class="layui-input-block"> + <div id="planNeedXmlSel" name="planNeedXmlSel"> + </div> + </div> + </div> </div> </div> -- Gitblit v1.9.1