diff --git a/js/car_basic/child/supplier_band_user_form.js b/js/car_basic/child/supplier_band_user_form.js index 24aeb89..cf11559 100644 --- a/js/car_basic/child/supplier_band_user_form.js +++ b/js/car_basic/child/supplier_band_user_form.js @@ -146,18 +146,20 @@ function submitApply() { let dataList = checkbarNodes.filter(item => { return item.level != '1'; }) - if (dataList.length === 0) { + /* if (dataList.length === 0) { return layer.msg('未添加供应商用户', { icon: 7 }); + } */ + if(dataList.length > 0){ + $.each(dataList, function (index, item) { + idArr.push(item.nodeId); + nameArr.push(item.context); + }) } - $.each(dataList, function (index, item) { - idArr.push(item.nodeId); - nameArr.push(item.context); - }) console.error(idArr); let data = { id: objParam.id, - userId: idArr.join(','), - userName: nameArr.join(','), + userId: idArr.length > 0 ? idArr.join(',') : '', + userName: nameArr.length > 0 ? nameArr.join(',') : '', supId: objParam.id, }; console.error(data); diff --git a/js/car_basic/framework_contract_list.js b/js/car_basic/framework_contract_list.js index 48510eb..b442a0e 100644 --- a/js/car_basic/framework_contract_list.js +++ b/js/car_basic/framework_contract_list.js @@ -121,9 +121,9 @@ function initTable() { sort:true, templet: function (d) { if (d.status === '已生效') { - return "" + "生效中"; + return ""+d.status+""; } else { - return "" + "已失效"; + return ""+d.status+""; } } }, diff --git a/page/car_basic/framework_contract_list.html b/page/car_basic/framework_contract_list.html index c47e5e8..d7816ad 100644 --- a/page/car_basic/framework_contract_list.html +++ b/page/car_basic/framework_contract_list.html @@ -56,8 +56,8 @@