记得上下班打卡 | git大法好,push需谨慎

Commit 331378a0 authored by sangchunxi's avatar sangchunxi

#1982 bug 修复,测试提交

parent 3261a9d3
...@@ -85,14 +85,16 @@ ...@@ -85,14 +85,16 @@
<script type="text/javascript"> <script type="text/javascript">
var smilePrefix = ctx + "smile/user"; var smilePrefix = ctx + "smile/user";
var orifix = ctx + "smile/organization"; var orifix = ctx + "smile/organization";
var penddingId = window.localStorage.getItem('penddingId'); // var penddingId = window.localStorage.getItem('penddingId');
let _uid = getUrlParms('id');
var detailObj = {} var detailObj = {}
$.ajax({ $.ajax({
type: 'post', type: 'post',
url: smilePrefix + "/getUserById", url: smilePrefix + "/getUserById",
data: { data: {
uid: penddingId uid: _uid
}, },
success: function (e) { success: function (e) {
var detailData = e.data; var detailData = e.data;
...@@ -125,9 +127,18 @@ ...@@ -125,9 +127,18 @@
if (detailData.type != 0) { if (detailData.type != 0) {
document.getElementById("btn-commit").style.visibility = "hidden"; document.getElementById("btn-commit").style.visibility = "hidden";
} }
console.log('e', e)
} }
}) })
function getUrlParms(name){
var reg = new RegExp("(^|&)"+ name +"=([^&]*)(&|$)");
var r = window.location.search.substr(1).match(reg);
if(r!=null)
return unescape(r[2]);
return null;
}
function closeModal() { function closeModal() {
layer.open({ layer.open({
type: 1, type: 1,
......
...@@ -42,6 +42,7 @@ ...@@ -42,6 +42,7 @@
$(function() { $(function() {
var options = { var options = {
detailUrl: "/local/smilePendingDetail/{id}",
url: smilePrefix + "/check/list", url: smilePrefix + "/check/list",
columns: [{ columns: [{
checkbox: true checkbox: true
...@@ -121,7 +122,7 @@ ...@@ -121,7 +122,7 @@
align: 'center', align: 'center',
formatter: function(value, row, index) { formatter: function(value, row, index) {
var actions = []; var actions = [];
actions.push('<a class="btn btn-success btn-xs ' + detailFlag + '" href="javascript:void(0)" onclick="toDetail(\'' + row.uid + '\')"><i class="fa fa-edit"></i>查看</a> '); actions.push('<a class="btn btn-success btn-xs ' + detailFlag + '" href="javascript:void(0)" onclick="goDetail(\'' + row.uid + '\')"><i class="fa fa-edit"></i>查看</a> ');
return actions.join(''); return actions.join('');
} }
}] }]
...@@ -130,9 +131,14 @@ ...@@ -130,9 +131,14 @@
}); });
/* 跳转详情 */ /* 跳转详情 */
function toDetail(id) { // function toDetail(id) {
window.localStorage.setItem('penddingId', id); // // console.log('toDetail-uuid', id)
var url = '/local/smilePendingDetail'; // window.localStorage.setItem('penddingId', id);
// var url = '/local/smilePendingDetail';
// $.modal.openTab("待审核详情", url);
// }
function goDetail (id) {
var url = '/local/smilePendingDetail?id=' + id;
$.modal.openTab("待审核详情", url); $.modal.openTab("待审核详情", url);
} }
</script> </script>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment