|
@@ -233,9 +233,9 @@
|
|
"data": "_id", width: "11%", render: function (val, a, row, pos) {
|
|
"data": "_id", width: "11%", render: function (val, a, row, pos) {
|
|
tmp = '<div>' +
|
|
tmp = '<div>' +
|
|
'<a class="btn btn-sm btn-primary" href="/front/user/task/list?grouptaskid=' + val + '&s_sourceinfo='+row.s_sourceinfo+'">查看</a> ' +
|
|
'<a class="btn btn-sm btn-primary" href="/front/user/task/list?grouptaskid=' + val + '&s_sourceinfo='+row.s_sourceinfo+'">查看</a> ' +
|
|
- '<a class="btn btn-sm btn-warning" onclick="retrieveTask(' + row + ')">收回</a> ' +
|
|
|
|
|
|
+ '<a class="btn btn-sm btn-warning" onclick="retrieveTask(\''+val+'\',\''+row.s_sourceinfo+'\',\''+row.s_status+'\',\''+row.s_groupid+'\')">收回</a> ' +
|
|
'<a class="btn btn-sm btn-info">质检</a> ' +
|
|
'<a class="btn btn-sm btn-info">质检</a> ' +
|
|
- '<a class="btn btn-sm btn-info" onclick="repulseTask(' + row + ')">打回</a> ' +
|
|
|
|
|
|
+ '<a class="btn btn-sm btn-info" onclick="repulseTask(\''+val+'\',\''+row.s_sourceinfo+'\',\''+row.s_status+'\',\''+row.s_groupid +'\')">打回</a> ' +
|
|
'<a class="btn btn-sm btn-default" onclick="closeTask(\'' + val + '\',\'' + row.s_status + '\')">关闭</a> ' +
|
|
'<a class="btn btn-sm btn-default" onclick="closeTask(\'' + val + '\',\'' + row.s_status + '\')">关闭</a> ' +
|
|
'</div>';
|
|
'</div>';
|
|
return tmp
|
|
return tmp
|
|
@@ -342,13 +342,12 @@
|
|
}
|
|
}
|
|
|
|
|
|
// 收回
|
|
// 收回
|
|
- function retrieveTask(row) {
|
|
|
|
- if (row.s_status === "未开始" || row.status === "进行中") {
|
|
|
|
|
|
+ function retrieveTask(id, sourceinfo, status, groupid) {
|
|
|
|
+ if (status === "未开始" || status === "进行中") {
|
|
$.ajax({
|
|
$.ajax({
|
|
url: "/front/project/task/retrieve",
|
|
url: "/front/project/task/retrieve",
|
|
type: 'POST',
|
|
type: 'POST',
|
|
- data: {"s_status": row.s_status, "id": row._id, "s_groupid": row.s_groupid, "s_sourceinfo": row.s_sourceinfo,
|
|
|
|
- "taskid": row._id},
|
|
|
|
|
|
+ data: {"s_groupid": groupid, "s_sourceinfo": sourceinfo, "taskid": id},
|
|
success: function (r) {
|
|
success: function (r) {
|
|
if (r.success) {
|
|
if (r.success) {
|
|
ttable.api().ajax.reload()
|
|
ttable.api().ajax.reload()
|
|
@@ -363,13 +362,12 @@
|
|
}
|
|
}
|
|
|
|
|
|
// 打回
|
|
// 打回
|
|
- function repulseTask(row) {
|
|
|
|
- if (row.s_status === "已完成") {
|
|
|
|
|
|
+ function repulseTask(id, sourceinfo, status, groupid) {
|
|
|
|
+ if (status === "已完成") {
|
|
$.ajax({
|
|
$.ajax({
|
|
url: "/front/project/task/repulse",
|
|
url: "/front/project/task/repulse",
|
|
type: 'POST',
|
|
type: 'POST',
|
|
- data: {"s_status": row.s_status, "id": row._id, "s_groupid": row.s_groupid, "s_sourceinfo": row.s_sourceinfo,
|
|
|
|
- "taskid": row._id},
|
|
|
|
|
|
+ data: {"s_groupid": groupid, "s_sourceinfo": sourceinfo, "taskid": id},
|
|
success: function (r) {
|
|
success: function (r) {
|
|
if (r.success) {
|
|
if (r.success) {
|
|
ttable.api().ajax.reload()
|
|
ttable.api().ajax.reload()
|