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

Commit 2f21b2f1 authored by Administrator's avatar Administrator 🎨

Merge branch 'pre' into 'master'

Pre

See merge request !139
parents 4e8b06a4 3506a483
...@@ -87,7 +87,7 @@ ...@@ -87,7 +87,7 @@
field: '', field: '',
title: '序号', title: '序号',
formatter: function (value, row, index) { formatter: function (value, row, index) {
return index + 1 return row.mid;
} }
}, },
{ {
......
...@@ -358,7 +358,7 @@ ...@@ -358,7 +358,7 @@
$("#searchIpt").val(data.targetTitle); $("#searchIpt").val(data.targetTitle);
$("#integralNum").val(data.score); $("#integralNum").val(data.score);
$("#inventory").val(data.generalTotal); $("#inventory").val(data.generalTotal);
showId = data.generalTotal; showId = data.targetId;
// $("#goodsDetail").val(data.details); // $("#goodsDetail").val(data.details);
$('#summernote').summernote('code', data.details) $('#summernote').summernote('code', data.details)
$('.summernote').eq(1).summernote('code', data.notice) $('.summernote').eq(1).summernote('code', data.notice)
...@@ -383,6 +383,9 @@ ...@@ -383,6 +383,9 @@
var simpleTypeData = data.simpleType.toString(); var simpleTypeData = data.simpleType.toString();
$("#labelSelectType").find("option[value=" + simpleTypeData + "]").attr("selected",true); $("#labelSelectType").find("option[value=" + simpleTypeData + "]").attr("selected",true);
} }
if (!showId) {
$('.labelSelect').hide();
}
} }
}) })
} }
...@@ -559,6 +562,7 @@ ...@@ -559,6 +562,7 @@
targetTitle: $('#searchIpt').val() || $("#searchIptMall").val(), // 目标物品标题 targetTitle: $('#searchIpt').val() || $("#searchIptMall").val(), // 目标物品标题
simpleType: $('#labelSelectType option:selected').val() simpleType: $('#labelSelectType option:selected').val()
} }
console.log(showId)
let type = 'post'; let type = 'post';
if (!itemId) { if (!itemId) {
delete data.itemId delete data.itemId
......
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