From f6af1863a4f68c1be2ec07cc6b5992f9e7464e52 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期三, 29 十一月 2023 14:28:27 +0800
Subject: [PATCH] #
---
src/main/webapp/views/priOnline2/priOnline.html | 20 ++--
src/main/java/com/zy/crm/manager/controller/DashboardController.java | 16 +++
src/main/webapp/static/js/priOnline2/priOnline.js | 36 +++++++--
src/main/webapp/views/plan/plan.html | 16 +--
src/main/java/com/zy/crm/manager/mapper/SmsCodeMapper.java | 3
src/main/webapp/views/priQuote/priQuote.html | 8 +-
src/main/resources/mapper/PlanMapper.xml | 2
src/main/webapp/static/js/priQuote/priQuote.js | 27 +++++-
src/main/java/com/zy/crm/manager/entity/SmsCode.java | 3
src/main/java/com/zy/crm/manager/controller/SmsCodeController.java | 11 ++
src/main/java/com/zy/crm/manager/service/impl/SmsCodeServiceImpl.java | 6
src/main/webapp/static/js/plan/plan.js | 42 ++++++++--
src/main/resources/mapper/SmsCodeMapper.xml | 4
13 files changed, 135 insertions(+), 59 deletions(-)
diff --git a/src/main/java/com/zy/crm/manager/controller/DashboardController.java b/src/main/java/com/zy/crm/manager/controller/DashboardController.java
index 461575d..910bff4 100644
--- a/src/main/java/com/zy/crm/manager/controller/DashboardController.java
+++ b/src/main/java/com/zy/crm/manager/controller/DashboardController.java
@@ -239,9 +239,23 @@
}else if (user.getRoleId()<3){
item="true2";
}
- }catch (Exception e){
+ }catch (Exception ignored){ }
+ return R.ok(item);
+ }
+ @RequestMapping("/dashboard/user/id/popup/auth")
+ public R popupUserId(String token) {
+ Long item = 0L;
+ if (Cools.isEmpty(token)){
+ return R.ok(item);
}
+ try{
+ User user = getUser(token);
+ if (Cools.isEmpty(user) || Cools.isEmpty(user.getId())){
+ return R.ok(item);
+ }
+ item = user.getId();
+ }catch (Exception ignored){ }
return R.ok(item);
}
diff --git a/src/main/java/com/zy/crm/manager/controller/SmsCodeController.java b/src/main/java/com/zy/crm/manager/controller/SmsCodeController.java
index dd699f7..929368b 100644
--- a/src/main/java/com/zy/crm/manager/controller/SmsCodeController.java
+++ b/src/main/java/com/zy/crm/manager/controller/SmsCodeController.java
@@ -168,10 +168,15 @@
}
}
- boolean sendSmsCode = smsCodeService.sendSmsCode(phone);
- if (!sendSmsCode) {
- return R.error();
+ try{
+ boolean sendSmsCode = smsCodeService.sendSmsCode(phone);
+ if (!sendSmsCode) {
+ return R.error("鍙戦�佸け璐ワ紝璇锋鏌ョ綉缁�!");
+ }
+ }catch (Exception e){
+ return R.error("鍙戦�佸け璐ワ紝璇锋鏌ョ綉缁滐紒");
}
+
return R.ok();
}
diff --git a/src/main/java/com/zy/crm/manager/entity/SmsCode.java b/src/main/java/com/zy/crm/manager/entity/SmsCode.java
index 90dce0e..353ddc4 100644
--- a/src/main/java/com/zy/crm/manager/entity/SmsCode.java
+++ b/src/main/java/com/zy/crm/manager/entity/SmsCode.java
@@ -79,7 +79,8 @@
* 鍙戦�佷汉
*/
@ApiModelProperty(value= "鍒嗙被")
- private Integer type;
+ @TableField("sms_type")
+ private Integer smsType;
public SmsCode() {}
diff --git a/src/main/java/com/zy/crm/manager/mapper/SmsCodeMapper.java b/src/main/java/com/zy/crm/manager/mapper/SmsCodeMapper.java
index 345786f..83d96b3 100644
--- a/src/main/java/com/zy/crm/manager/mapper/SmsCodeMapper.java
+++ b/src/main/java/com/zy/crm/manager/mapper/SmsCodeMapper.java
@@ -3,12 +3,13 @@
import com.zy.crm.manager.entity.SmsCode;
import com.baomidou.mybatisplus.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
@Mapper
@Repository
public interface SmsCodeMapper extends BaseMapper<SmsCode> {
- SmsCode selectByPhone(String phone,Integer type);
+ SmsCode selectByPhone(@Param("phone") String phone,@Param("smsType") Integer smsType);
}
diff --git a/src/main/java/com/zy/crm/manager/service/impl/SmsCodeServiceImpl.java b/src/main/java/com/zy/crm/manager/service/impl/SmsCodeServiceImpl.java
index 506bf2d..1ec0053 100644
--- a/src/main/java/com/zy/crm/manager/service/impl/SmsCodeServiceImpl.java
+++ b/src/main/java/com/zy/crm/manager/service/impl/SmsCodeServiceImpl.java
@@ -21,8 +21,8 @@
private ConfigService configService;
@Override
- public SmsCode selectByPhone(String phone,Integer type) {
- return this.baseMapper.selectByPhone(phone,type);
+ public SmsCode selectByPhone(String phone,Integer smsType) {
+ return this.baseMapper.selectByPhone(phone,smsType);
}
@Override
@@ -84,7 +84,7 @@
smsCode.setStatus(0);
smsCode.setCreateTime(new Date());
smsCode.setUserId(userId);
- smsCode.setType(param.id);
+ smsCode.setSmsType(param.id);
if (this.baseMapper.insert(smsCode) <= 0) {
return false;
}
diff --git a/src/main/resources/mapper/PlanMapper.xml b/src/main/resources/mapper/PlanMapper.xml
index 0a8ea01..bbdfb4c 100644
--- a/src/main/resources/mapper/PlanMapper.xml
+++ b/src/main/resources/mapper/PlanMapper.xml
@@ -118,7 +118,7 @@
<if test="director != null and director != ''">
or mp.director = #{director}
</if>
- ORDER BY mp.create_time DESC
+ ORDER BY mp.update_time DESC,mp.create_time DESC
</select>
</mapper>
diff --git a/src/main/resources/mapper/SmsCodeMapper.xml b/src/main/resources/mapper/SmsCodeMapper.xml
index 56c8f03..924a404 100644
--- a/src/main/resources/mapper/SmsCodeMapper.xml
+++ b/src/main/resources/mapper/SmsCodeMapper.xml
@@ -12,14 +12,14 @@
<result column="send_time" property="sendTime" />
<result column="use_time" property="useTime" />
<result column="user_id" property="userId" />
- <result column="type" property="type" />
+ <result column="sms_type" property="smsType" />
</resultMap>
<select id="selectByPhone" resultMap="BaseResultMap">
select top 1 * from sys_sms_code
where phone = #{phone}
- and type = #{type}
+ and sms_type = #{smsType}
order by create_time desc
</select>
diff --git a/src/main/webapp/static/js/plan/plan.js b/src/main/webapp/static/js/plan/plan.js
index cd665f2..68b86cd 100644
--- a/src/main/webapp/static/js/plan/plan.js
+++ b/src/main/webapp/static/js/plan/plan.js
@@ -3,6 +3,21 @@
var treeCond;
var admin;
var planNeedXmlSelData;
+let nowUserId2 = 0;
+fPlan();
+function fPlan() {
+ layui.jquery.ajax({
+ url: baseUrl + "/dashboard/user/id/popup/auth",
+ data:{token : localStorage.getItem('token')},
+ method: 'GET',
+ success: function (res) {
+ if (res.code === 200) {
+ nowUserId2 = res.data;
+ }
+ }
+ })
+}
+
layui.config({
base: baseUrl + "/static/layui/lay/modules/"
}).extend({
@@ -142,7 +157,7 @@
,{field: 'id', align: 'center',title: 'ID'}
// ,{field: 'hostId$', align: 'center',title: '鎵�灞炲晢鎴�'}
,{field: 'userId$', align: 'left',title: '涓氬姟鍛�',hide: false, width: 100, sort:true}
- ,{field: 'cstmrId', align: 'left',title: '涓氬姟鍛�',hide: true, width: 100, sort:true}
+ ,{field: 'cstmrId', align: 'left',title: 'cstmrId',hide: true}
, {
field: 'cstmrId$',
align: 'center',
@@ -152,7 +167,7 @@
width: 350,
hide: false, sort:true
}
- ,{field: 'planType$', align: 'left',title: '涓氬姟绫诲瀷', width: 150,hide: false, sort:true}
+ ,{field: 'planType$', align: 'left',title: '涓氬姟绫诲瀷', width: 130,hide: false, sort:true}
,{
field: 'name',
align: 'left',
@@ -171,7 +186,8 @@
templet:function(d){
return emptyShow(d.planNeed$)
},
- hide: false
+ hide: false,
+ width: 200
}
, {field: 'settleSize', align: 'center', title: '娴佺▼闀垮害', hide: true}
,{field: 'deptId$', align: 'left',title: '鎵�灞為儴闂�',hide: true}
@@ -181,13 +197,12 @@
field: 'orderId$',
align: 'left',
title: '璺熻釜椤圭洰',
- width: 220,
+ width: 120,
style: 'color: #1890ff;cursor:pointer',
event: 'orderMore',
hide: false,
sort:true
}
- ,{field: 'appleTime$', align: 'left',title: '鐢宠鏃ユ湡', hide: false, sort:true}
// ,{field: 'beItem$', align: 'center',title: '绔嬮」'}
// ,{field: 'planner', align: 'left',title: '瑙勫垝鍛�', templet:function(d){return emptyShow(d.planner)}}
// ,{field: 'finishTime$', align: 'center',title: '瀹屾垚鏃堕棿'}
@@ -201,16 +216,20 @@
,{field: 'settle$', align: 'center',title: '杩涘害', width: 150, sort:true}
// ,{field: 'settleMsg', align: 'center',title: '瀹℃牳杩涘害'}
// ,{field: 'comment', align: 'center',title: '璇勮'}
- ,{field: 'statusAll$', align: 'center',title: '鐘舵��', sort:true, sort:true}
- ,{field: 'createTime$', align: 'left',title: '娣诲姞鏃ユ湡', width: 160, hide: true, sort:true}
+ ,{field: 'statusAll$', align: 'center',title: '鐘舵��', hide:true, sort:true,width: 100}
+ ,{field: 'createTime$', align: 'left',title: '娣诲姞鏃ユ湡', hide: true, sort:true,width: 120}
,{field: 'updateBy$', align: 'left',title: '淇敼浜�', width: 100, sort:true}
- ,{field: 'updateTime$', align: 'left',title: '淇敼鏃堕棿', hide: true, sort:true}
+ ,{field: 'updateTime$', align: 'left',title: '鏇存柊鏃堕棿', hide: false, sort:true,width: 120}
,{field: 'memo', align: 'left',title: '娉ㄩ噴', hide: true, sort:true}
,{field: 'center', align: 'left',title: '鍏宠仈娴佺▼', toolbar: '#tbLook', minWidth: 160, hide: false}
- ,{field: 'assistantHostSign$', align: 'left',title: '涓诲壇鏍囪', hide: false}
+ ,{field: 'assistantHostSign$', align: 'left',title: '涓诲壇鏍囪', hide: false,width: 80}
,{field: 'assistantHostSign', align: 'left',title: '涓诲壇鏍囪', hide: true}
,{field: 'hostPlanId', align: 'left',title: '涓籌D', hide: true}
,{field: 'assistantPlanId', align: 'left',title: '鍓疘D', hide: true}
+ ,{field: 'appleTime$', align: 'left',title: '鐢宠鏃ユ湡', hide: false, sort:true,width: 120}
+ ,{field: 'nowUserId', title: 'nowUserId', hide: true, templet:function(){return nowUserId2}}
+ ,{field: 'userId',title: 'userId', hide: true}
+ ,{field: 'director',title: 'director', hide: true}
// ,{field: 'assistantPlanIdSignType', align: 'left',title: '闆嗘垚璐ф灦鏍囧織', hide: true}
,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width: 340}
]],
@@ -219,6 +238,9 @@
pageSize: 'limit'
},
parseData: function (res) {
+ res.data.records.forEach((item,index) => {
+ item.nowUserId = nowUserId2
+ })
return {
'code': res.code,
'msg': res.msg,
@@ -752,7 +774,7 @@
,{field: 'assistantHostSign', align: 'left',title: '涓诲壇鏍囪', hide: true}
,{field: 'hostPlanId', align: 'left',title: '涓籌D', hide: true}
,{field: 'assistantPlanId', align: 'left',title: '鍓疘D', hide: true}
- ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width: 340}
+ // ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width: 340}
]],
request: {
pageName: 'curr',
diff --git a/src/main/webapp/static/js/priOnline2/priOnline.js b/src/main/webapp/static/js/priOnline2/priOnline.js
index e654353..3b6f4fd 100644
--- a/src/main/webapp/static/js/priOnline2/priOnline.js
+++ b/src/main/webapp/static/js/priOnline2/priOnline.js
@@ -1,6 +1,20 @@
var pageCurr;
var admin;
var treeCond;
+let nowUserId2 = 0;
+fPriOnline();
+function fPriOnline() {
+ layui.jquery.ajax({
+ url: baseUrl + "/dashboard/user/id/popup/auth",
+ data:{token : localStorage.getItem('token')},
+ method: 'GET',
+ success: function (res) {
+ if (res.code === 200) {
+ nowUserId2 = res.data;
+ }
+ }
+ })
+}
layui.config({
base: baseUrl + "/static/layui/lay/modules/"
}).extend({
@@ -119,14 +133,17 @@
, {field: 'settleSize', align: 'center', title: '娴佺▼闀垮害', hide: true}
, {field: 'user$', align: 'center', title: '涓氬姟鍛�', hide: false}
, {field: 'deptId$', align: 'center', title: '閮ㄩ棬', hide: true}
- , {field: 'checkDataStatus$', align: 'center', title: '鎶ヤ环鏁版嵁', hide: false}
- , {field: 'createTime$', align: 'center', title: '鍒涘缓鏃堕棿', hide: true}
- , {field: 'updateUserId$', align: 'center', title: '鏇存柊浜哄憳', hide: false}
- , {field: 'updateTime$', align: 'center', title: '鏇存柊鏃堕棿', hide: false}
- ,{field: 'assistantHostSign$', align: 'left',title: '涓诲壇鏍囪', hide: false}
- ,{field: 'assistantHostSign', align: 'left',title: '涓诲壇鏍囪', hide: true}
- ,{field: 'hostPlanId', align: 'left',title: '涓籌D', hide: true}
- ,{field: 'assistantPlanId', align: 'left',title: '鍓疘D', hide: true}
+ , {field: 'checkDataStatus$', align: 'center', title: '鎶ヤ环鏁版嵁', hide: false,width: 80}
+ , {field: 'createTime$', align: 'center', title: '鍒涘缓鏃堕棿', hide: true,width: 120}
+ , {field: 'updateUserId$', align: 'center', title: '鏇存柊浜哄憳', hide: false,width: 80}
+ , {field: 'updateTime$', align: 'center', title: '鏇存柊鏃堕棿', hide: false,width: 120}
+ ,{field: 'assistantHostSign$', align: 'left',title: '涓诲壇鏍囪', hide: false,width: 80}
+ ,{field: 'assistantHostSign', align: 'left',title: '涓诲壇鏍囪', hide: true,width: 80}
+ ,{field: 'hostPlanId', align: 'left',title: '涓籌D', hide: true,width: 80}
+ ,{field: 'assistantPlanId', align: 'left',title: '鍓疘D', hide: true,width: 80}
+ ,{field: 'nowUserId', title: 'nowUserId', hide: true, templet:function(){return nowUserId2}}
+ ,{field: 'userId',title: 'userId', hide: true}
+ ,{field: 'memberId',title: 'memberId', hide: true}
, {fixed: 'right', title: '鎿嶄綔', align: 'center', toolbar: '#operate', width: 350}
]],
request: {
@@ -134,6 +151,9 @@
pageSize: 'limit'
},
parseData: function (res) {
+ res.data.records.forEach((item,index) => {
+ item.nowUserId = nowUserId2
+ })
return {
'code': res.code,
'msg': res.msg,
diff --git a/src/main/webapp/static/js/priQuote/priQuote.js b/src/main/webapp/static/js/priQuote/priQuote.js
index 7343138..50292da 100644
--- a/src/main/webapp/static/js/priQuote/priQuote.js
+++ b/src/main/webapp/static/js/priQuote/priQuote.js
@@ -1,5 +1,19 @@
var pageCurr;
var admin;
+let nowUserId2 = 0;
+fPriQuote();
+function fPriQuote() {
+ layui.jquery.ajax({
+ url: baseUrl + "/dashboard/user/id/popup/auth",
+ data:{token : localStorage.getItem('token')},
+ method: 'GET',
+ success: function (res) {
+ if (res.code === 200) {
+ nowUserId2 = res.data;
+ }
+ }
+ })
+}
layui.config({
base: baseUrl + "/static/layui/lay/modules/"
}).extend({
@@ -106,9 +120,9 @@
align: 'center',
title: '瑙勫垝鍗曞彿',
style: 'color: #1890ff;cursor:pointer',
- event: 'morePlan'}
+ event: 'morePlan',hide: false,width: 80}
,{field: 'itemId', align: 'center',title: '瑙勫垝鍗旾D', hide: true, sort:true}
- ,{field: 'planName$', align: 'center',title: '瑙勫垝鍗曞悕绉�',hide: false}
+ ,{field: 'planName$', align: 'center',title: '瑙勫垝鍗曞悕绉�',hide: false,width: 120}
,{
field: 'settle$',
align: 'center',
@@ -118,11 +132,14 @@
width: 150,
hide: false
}
- ,{field: 'createTime$', align: 'center',title: '鍒涘缓鏃堕棿',hide: false}
- ,{field: 'updateTime$', align: 'center',title: '鏇存柊鏃堕棿',hide: false}
+ ,{field: 'createTime$', align: 'center',title: '鍒涘缓鏃堕棿',hide: false,width: 120}
+ ,{field: 'updateTime$', align: 'center',title: '鏇存柊鏃堕棿',hide: false,width: 120}
// ,{field: 'memberId$', align: 'center',title: '涓氬姟鍛�',hide: false}
,{field: 'userId$', align: 'center',title: '涓氬姟鍛�',hide: true}
- ,{field: 'updateUserId$', align: 'center',title: '鏇存柊浜哄憳',hide: false}
+ ,{field: 'updateUserId$', align: 'center',title: '鏇存柊浜哄憳',hide: false,width: 80}
+ ,{field: 'nowUserId', title: 'nowUserId', hide: true, templet:function(){return nowUserId2}}
+ ,{field: 'userId',title: 'userId', hide: true}
+ ,{field: 'memberId',title: 'memberId', hide: true}
,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:280}
]],
request: {
diff --git a/src/main/webapp/views/plan/plan.html b/src/main/webapp/views/plan/plan.html
index 328d7b3..eec3a9d 100644
--- a/src/main/webapp/views/plan/plan.html
+++ b/src/main/webapp/views/plan/plan.html
@@ -143,25 +143,22 @@
</div>
<script type="text/html" id="operate">
- {{# if (d.settle == 1) { }}
+ {{# if ((((d.settle == 2 || d.settle == 3) && d.settleSize==4) || d.settle == 1) && d.nowUserId==d.director) { }}
<a class="layui-btn layui-btn-xs btn-edit" lay-event="approval">瀹℃壒</a>
{{# } }}
- {{# if ((d.settle == 2 || d.settle == 3) && d.settleSize==4) { }}
- <a class="layui-btn layui-btn-xs btn-edit" lay-event="approval">瀹℃壒</a>
- {{# } }}
- {{# if ((d.settle == 2 || d.settle == 3)&& d.settleSize==4) { }}
+ {{# if (((d.settle == 2 || d.settle == 3)&& d.settleSize==4) && d.nowUserId==d.director) { }}
<a class="layui-btn layui-btn-xs btn-edit" lay-event="approvalEnd">鍥為��瀹℃壒</a>
{{# } }}
- <a class="layui-btn layui-btn-primary layui-btn-xs btn-edit" lay-event="uploadLink">闄勪欢</a>
- {{# if (d.settle == 1) { }}
+ <a class="layui-btn layui-btn-primary layui-btn-xs btn-edit" lay-event="uploadLink">闄勪欢</a>
+ {{# if (d.settle == 1 && d.nowUserId==d.userId) { }}
<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.assistantHostSign == 0 && d.assistantPlanId==0)&& d.settleSize==4) { }}
+ {{# if ((d.assistantHostSign == 0 && d.assistantPlanId==0)&& d.settleSize==4 && d.nowUserId==d.userId ) { }}
<a class="layui-btn layui-btn-xs btn-edit" lay-event="assistantPlan">鍒涘缓璐ф灦瑙勫垝浠诲姟</a>
{{# } }}
-
</script>
+<!--<a class="layui-btn layui-btn-xs btn-edit" lay-event="assistantPlan">{{d.nowUserId}}+-+{{d.director}}+-+{{d.userId}}</a>-->
<script type="text/html" id="plannerListDialog">
<div class="layui-form admin-form">
@@ -175,7 +172,6 @@
</div>
</div>
</script>
-
<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
<script type="text/javascript" src="../../static/js/FileSaver.js"></script>
<script type="text/javascript" src="../../static/js/handlebars/handlebars-v4.5.3.js"></script>
diff --git a/src/main/webapp/views/priOnline2/priOnline.html b/src/main/webapp/views/priOnline2/priOnline.html
index 748f526..ba18e13 100644
--- a/src/main/webapp/views/priOnline2/priOnline.html
+++ b/src/main/webapp/views/priOnline2/priOnline.html
@@ -109,21 +109,21 @@
</div>
<script type="text/html" id="operate">
- {{# if ((d.settle == 0) || (d.settle == 1 && d.settleSize == 4)){ }}
- <a class="layui-btn layui-btn-xs btn-edit" lay-event="approval">鎻愪氦</a>
- <a class="layui-btn layui-btn-danger layui-btn-xs btn-edit" lay-event="del">鍒犻櫎</a>
+ {{# if (d.settle == 0 && d.nowUserId == d.memberId){ }}
+ <a class="layui-btn layui-btn-xs btn-edit" lay-event="approval">鎻愪氦</a>
+ <a class="layui-btn layui-btn-danger layui-btn-xs btn-edit" lay-event="del">鍒犻櫎</a>
{{# } }}
- {{# if ((d.settle == 1 && d.settleSize == 3) || (d.settle == 2 && d.settleSize == 4)){ }}
- <a class="layui-btn layui-btn-xs btn-edit" lay-event="approval">纭</a>
- {{# } }}
- {{# if (d.settle == 1 || (d.settle == 2 && d.settleSize == 4)){ }}
- <a class="layui-btn layui-btn-xs btn-edit" lay-event="approvalEnd">鍥為��瀹℃壒</a>
+ {{# if (d.settle == 1 && d.nowUserId == d.memberId){ }}
+ <a class="layui-btn layui-btn-xs btn-edit" lay-event="approval">纭</a>
+ <a class="layui-btn layui-btn-xs btn-edit" lay-event="approvalEnd">鍥為��瀹℃壒</a>
{{# } }}
<a class="layui-btn layui-btn-primary layui-btn-xs btn-edit" lay-event="uploadLink">闄勪欢</a>
<a class="layui-btn layui-btn-xs btn-edit" lay-event="check">鏍镐环</a>
- <a class="layui-btn layui-btn-primary layui-btn-xs btn-edit" lay-event="edit">缂栬緫</a>
+<!-- <a class="layui-btn layui-btn-primary layui-btn-xs btn-edit" lay-event="edit">缂栬緫</a>-->
<a class="layui-btn layui-btn-primary layui-btn-xs btn-edit" lay-event="upload">涓婁紶璇环</a>
- <a class="layui-btn layui-btn-primary layui-btn-xs btn-edit" lay-event="viewCheck">鏌ョ湅璇环</a>
+ {{# if (d.nowUserId == d.userId){ }}
+ <a class="layui-btn layui-btn-primary layui-btn-xs btn-edit" lay-event="viewCheck">鏌ョ湅璇环</a>
+ {{# } }}
</script>
<script type="text/html" id="plannerListDialog">
diff --git a/src/main/webapp/views/priQuote/priQuote.html b/src/main/webapp/views/priQuote/priQuote.html
index e31aaf4..a8ea86b 100644
--- a/src/main/webapp/views/priQuote/priQuote.html
+++ b/src/main/webapp/views/priQuote/priQuote.html
@@ -127,16 +127,16 @@
</script>
<script type="text/html" id="operate">
- {{# if (d.settle == 1 || d.settle == 2 || d.settle == 3) { }}
+ {{# if ((d.settle == 1 || d.settle == 2 || d.settle == 3) && d.nowUserId == d.memberId) { }}
<a class="layui-btn layui-btn-xs btn-edit" lay-event="approval">瀹℃壒</a>
{{# } }}
- {{# if (d.settle == 2 || d.settle == 3) { }}
+ {{# if ((d.settle == 2 || d.settle == 3) && d.nowUserId == d.memberId) { }}
<a class="layui-btn layui-btn-xs btn-edit" lay-event="refuse">鍥為��瀹℃壒</a>
{{# } }}
<a class="layui-btn layui-btn-primary layui-btn-xs btn-edit" lay-event="uploadLink">闄勪欢</a>
<a class="layui-btn layui-btn-xs btn-edit" lay-event="quote">鎶ヤ环</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>
+<!-- <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>
--
Gitblit v1.9.1