From cda3622521308b21e10e5446c2060bf2fafd1e80 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期三, 06 九月 2023 12:36:36 +0800
Subject: [PATCH] #
---
src/main/webapp/views/planType/planType.html | 13 +++++++++++--
src/main/webapp/static/js/order/order.js | 2 +-
src/main/java/com/zy/crm/system/service/impl/UserServiceImpl.java | 3 +++
src/main/webapp/views/order/order.html | 4 ++--
4 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/crm/system/service/impl/UserServiceImpl.java b/src/main/java/com/zy/crm/system/service/impl/UserServiceImpl.java
index 5e12955..a70e65d 100644
--- a/src/main/java/com/zy/crm/system/service/impl/UserServiceImpl.java
+++ b/src/main/java/com/zy/crm/system/service/impl/UserServiceImpl.java
@@ -36,6 +36,9 @@
if (Cools.isEmpty(manager)) {
Dept dept = deptService.selectById(deptId);
Dept parent = deptService.selectById(dept.getParentId());
+ if (parent == null) {
+ throw new CoolException("淇濆瓨澶辫触锛屾湭鎵惧埌閮ㄩ棬缁勯暱");
+ }
manager = this.baseMapper.getDeptManager(hostId, parent.getId());
}
if (Cools.isEmpty(manager)) {
diff --git a/src/main/webapp/static/js/order/order.js b/src/main/webapp/static/js/order/order.js
index 13807a5..9c2b829 100644
--- a/src/main/webapp/static/js/order/order.js
+++ b/src/main/webapp/static/js/order/order.js
@@ -139,7 +139,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: '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: '娣诲姞鏃堕棿'}
diff --git a/src/main/webapp/views/order/order.html b/src/main/webapp/views/order/order.html
index 7ce4a39..ca2c67f 100644
--- a/src/main/webapp/views/order/order.html
+++ b/src/main/webapp/views/order/order.html
@@ -162,9 +162,9 @@
</div>
</div>
<div class="layui-form-item">
- <label class="layui-form-label">椤圭洰鎬婚噾棰�: </label>
+ <label class="layui-form-label">椤圭洰棰勭畻閲戦: </label>
<div class="layui-input-block">
- <input type="number" class="layui-input" name="money" placeholder="璇疯緭鍏ラ」鐩�婚噾棰�" autocomplete="off">
+ <input type="number" class="layui-input" name="money" placeholder="璇疯緭鍏ラ」鐩绠楅噾棰�" autocomplete="off">
</div>
</div>
<div class="layui-form-item">
diff --git a/src/main/webapp/views/planType/planType.html b/src/main/webapp/views/planType/planType.html
index 87cd3d9..f14742f 100644
--- a/src/main/webapp/views/planType/planType.html
+++ b/src/main/webapp/views/planType/planType.html
@@ -87,7 +87,16 @@
<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" required/>
+<!-- <input class="layui-input" name="name" placeholder="璇疯緭鍏ョ被鍨嬪悕绉�" lay-verType="tips" lay-verify="required" required/>-->
+ <select name="name" lay-verType="tips" lay-verify="required" required>
+ <option value="">璇烽�夋嫨绫诲瀷</option>
+ <option value="绔嬩綋搴擄紙璐ф灦锛�">绔嬩綋搴擄紙璐ф灦锛�</option>
+ <option value="绔嬩綋搴擄紙闆嗘垚锛�">绔嬩綋搴擄紙闆嗘垚锛�</option>
+ <option value="鍥涘悜绌挎搴�/涓ゅ悜绌挎搴�">鍥涘悜绌挎搴�/涓ゅ悜绌挎搴�</option>
+ <option value="闃佹ゼ璐ф灦/閽㈠钩鍙�">闃佹ゼ璐ф灦/閽㈠钩鍙�</option>
+ <option value="鍛ㄨ浆瀹瑰櫒">鍛ㄨ浆瀹瑰櫒</option>
+ <option value="骞冲簱">骞冲簱</option>
+ </select>
</div>
</div>
<div class="layui-form-item">
@@ -270,7 +279,7 @@
admin.open({
type: 1,
title: (mData ? '淇敼' : '娣诲姞') + '绫诲瀷',
- area: '500px',
+ area: '600px',
content: $('#editDialog').html(),
success: function (layero, dIndex) {
// 鍥炴樉琛ㄥ崟鏁版嵁
--
Gitblit v1.9.1