|
@@ -558,8 +558,7 @@ TalentTypeChangeInfoDlg.initFileTable = function () {
|
|
var checkState = $("#checkState").val();
|
|
var checkState = $("#checkState").val();
|
|
for (var key in data) {
|
|
for (var key in data) {
|
|
var btn = "";
|
|
var btn = "";
|
|
- console.log(checkState,row.isConditionFile,files,row.id,files.indexOf(row.id))
|
|
|
|
- if (checkState != 10 || (checkState == 10 && ((row.isConditionFile == 0 && files.indexOf(row.id) != -1) || (row.isConditionFile == 1 && (files.indexOf(row.id) != -1 || fields.indexOf("newIdentifyCondition")))))) {
|
|
|
|
|
|
+ if (checkState != 10 || (checkState == 10 && ((row.isConditionFile == 0 && files.indexOf(row.id.toString()) != -1) || (row.isConditionFile == 1 && (files.indexOf(row.id.toString()) != -1 || fields.indexOf("newIdentifyCondition")))))) {
|
|
btn = "<button type=\'button\' onclick=\"TalentTypeChangeInfoDlg.checkFile(this,'" + row.fState + "','" + row.id + "','" + data[key].id + "')\" style=\'margin-right: 10px\' class=\"btn btn-xs btn-info\">" +
|
|
btn = "<button type=\'button\' onclick=\"TalentTypeChangeInfoDlg.checkFile(this,'" + row.fState + "','" + row.id + "','" + data[key].id + "')\" style=\'margin-right: 10px\' class=\"btn btn-xs btn-info\">" +
|
|
"<i class=\"fa fa-paste\"></i>修改" +
|
|
"<i class=\"fa fa-paste\"></i>修改" +
|
|
"</button>" +
|
|
"</button>" +
|
|
@@ -751,7 +750,7 @@ TalentTypeChangeInfoDlg.initFileTypeColumn = function () {
|
|
var files = $("#files").val().split(",");
|
|
var files = $("#files").val().split(",");
|
|
var fields = $("#fields").val().split(",");
|
|
var fields = $("#fields").val().split(",");
|
|
var html = "";
|
|
var html = "";
|
|
- if (checkState != 10 || (checkState == 10 && ((row.isConditionFile == 0 && files.indexOf(value) != -1) || (row.isConditionFile == 1 && (files.indexOf(value) != -1 || fields.indexOf("newIdentifyCondition")))))) {
|
|
|
|
|
|
+ if (checkState != 10 || (checkState == 10 && ((row.isConditionFile == 0 && files.indexOf(value.toString()) != -1) || (row.isConditionFile == 1 && (files.indexOf(value.toString()) != -1 || fields.indexOf("newIdentifyCondition")))))) {
|
|
html = "<button type='button' onclick=\"TalentTypeChangeInfoDlg.checkFile(this,'" + row.fState + "','" + value + "','" + null + "')\" style='margin-right: 10px' class=\"btn btn-xs btn-info\">" +
|
|
html = "<button type='button' onclick=\"TalentTypeChangeInfoDlg.checkFile(this,'" + row.fState + "','" + value + "','" + null + "')\" style='margin-right: 10px' class=\"btn btn-xs btn-info\">" +
|
|
"<i class=\"fa fa-upload\"></i>上传" +
|
|
"<i class=\"fa fa-upload\"></i>上传" +
|
|
"</button>";
|
|
"</button>";
|