修改查看津补贴申报中项目月份的表现形式

app/common/api/TalentAllowanceApi.php

@@ -25,7 +25,7 @@ class TalentAllowanceApi {
             $where = array_merge($where, $_where);
         }
         $count = TaModel::where($where)->count();
-        $list = TaModel::where($where)->limit($offset, $limit)->order("year " . $order)->select()->toArray();
+        $list = TaModel::where($where)->limit($offset, $limit)->order("year {$order},createTime {$order}")->select()->toArray();
         $levelList = DictApi::selectByParentCode("talent_arrange");
         $talentTypeList = DictApi::selectByParentCode("enterprise_tag");
         $streetList = DictApi::selectByParentCode("street");

public/static/modular/gate/talentAllowance/common/talentAllowanceInfo_select.js

@@ -2,14 +2,14 @@
  * 初始化人才认定申报详情对话框
  */
 var TalentAllowanceInfoDlg = {
-    talentAllowanceData : {},
+    talentAllowanceData: {},
     validateFields: {
-        talentId: {validators: {notEmpty: {message: '申报对象不能为空' }}}
+        talentId: {validators: {notEmpty: {message: '申报对象不能为空'}}}
     }
 };
 
 //初始化附件类别表单
-TalentAllowanceInfoDlg.initFileTable = function (){
+TalentAllowanceInfoDlg.initFileTable = function () {
     TalentAllowanceInfoDlg.initContract();
     var queryData = {};
     queryData['project'] = CONFIG.project_jbt;
@@ -19,24 +19,24 @@ TalentAllowanceInfoDlg.initFileTable = function (){
         url: Feng.ctxPath + "/common/api/findCommonFileType",
         method: 'POST',
         contentType: "application/x-www-form-urlencoded; charset=UTF-8",
-        search: false,					// 是否显示表格搜索，此搜索是客户端搜索，不会进服务端
-        showRefresh: false,				// 是否显示刷新按钮
-        clickToSelect: true,			// 是否启用点击选中行
-        singleSelect: true,				// 设置True 将禁止多选
-        striped: true,  				// 是否显示行间隔色
+        search: false, // 是否显示表格搜索，此搜索是客户端搜索，不会进服务端
+        showRefresh: false, // 是否显示刷新按钮
+        clickToSelect: true, // 是否启用点击选中行
+        singleSelect: true, // 设置True 将禁止多选
+        striped: true, // 是否显示行间隔色
         escape: true,
-        pagination: false,   			// 设置为 true 会在表格底部显示分页条
+        pagination: false, // 设置为 true 会在表格底部显示分页条
         paginationHAlign: "left",
         paginationDetailHAlign: "right",
-        sidePagination: "server",   	// 设置在哪里进行分页，可选值为 'client' 或者 'server'
+        sidePagination: "server", // 设置在哪里进行分页，可选值为 'client' 或者 'server'
         showColumns: false,
-        detailView: true,               //是否显示父子表
+        detailView: true, //是否显示父子表
         pageList: [10, 30, 50],
         queryParams: function (params) {
-            return $.extend(queryData,params)
+            return $.extend(queryData, params)
         },
         rowStyle: function (row, index) {
-            return {classes:"info"};
+            return {classes: "info"};
         },
         columns: TalentAllowanceInfoDlg.initFileTypeColumn(),
         onPostBody: function () {
@@ -50,30 +50,30 @@ TalentAllowanceInfoDlg.initFileTable = function (){
         },
         onExpandRow: function (index, row, $detail) {
             var ajax = new $ax(Feng.ctxPath + "/common/api/listTalentFile", function (data) {
-                if(data==null||data.length==0){
+                if (data == null || data.length == 0) {
                     return;
                 }
                 var html = '<ul class="imgs"><li style="width: 80%;font-weight: bold;padding-top: 5px;">附件原名</li><li style="width: 10%;font-weight: bold;padding-top: 5px;">预览</li>';
-                for(var key in data){
+                for (var key in data) {
                     var sn = data[key].url.lastIndexOf(".");
-                    var suffix = data[key].url.substring(sn+1,data[key].url.length);
+                    var suffix = data[key].url.substring(sn + 1, data[key].url.length);
                     var imgStr = "";
-                    if(suffix=="pdf"||suffix=="PDF"){
-                        imgStr = "<button type='button'  onclick=\"Feng.showPdf('"+data[key].url+"','"+data[key].id+"','"+data[key].orignName+"')\" class=\"btn btn-xs btn-danger\"><i class=\"fa fa-file-pdf-o\" aria-hidden=\"true\"></i></button>";
-                    }else if(suffix == "xlsx" || suffix=="XLSX" || suffix == 'xls' || suffix == 'XLS'){
-                        imgStr = "<button type='button'  onclick=\"Feng.showExcel('"+data[key].url+"','"+data[key].id+"','"+data[key].orignName+"')\" class=\"btn btn-xs btn-danger\"><i class=\"fa fa-file-excel-o\" aria-hidden=\"true\"></i></button>";
-                    }else{
-                        imgStr = '<img class=\"imgUrl\"  src=\"'+data[key].url+'\" style=\"width:25px;height:25px;\">';
+                    if (suffix == "pdf" || suffix == "PDF") {
+                        imgStr = "<button type='button'  onclick=\"Feng.showPdf('" + data[key].url + "','" + data[key].id + "','" + data[key].orignName + "')\" class=\"btn btn-xs btn-danger\"><i class=\"fa fa-file-pdf-o\" aria-hidden=\"true\"></i></button>";
+                    } else if (suffix == "xlsx" || suffix == "XLSX" || suffix == 'xls' || suffix == 'XLS') {
+                        imgStr = "<button type='button'  onclick=\"Feng.showExcel('" + data[key].url + "','" + data[key].id + "','" + data[key].orignName + "')\" class=\"btn btn-xs btn-danger\"><i class=\"fa fa-file-excel-o\" aria-hidden=\"true\"></i></button>";
+                    } else {
+                        imgStr = '<img class=\"imgUrl\"  src=\"' + data[key].url + '\" style=\"width:25px;height:25px;\">';
                     }
-                    html = html + '<li style="display: none">'+data[key].id+'</li>\n'+
-                        '<li style="width: 80%;padding-top: 5px;">'+data[key].orignName+'</li>\n'+
-                        '<li style="width: 10%;">'+imgStr+'</li>\n';
+                    html = html + '<li style="display: none">' + data[key].id + '</li>\n' +
+                            '<li style="width: 80%;padding-top: 5px;">' + data[key].orignName + '</li>\n' +
+                            '<li style="width: 10%;">' + imgStr + '</li>\n';
 
                 }
                 html = html + '</ul>';
                 $detail.html(html);
                 $(".imgs").viewer({
-                    fullscreen:false
+                    fullscreen: false
                 });
             }, function (data) {
                 Feng.error("查询失败!" + data.responseJSON.message + "!");
@@ -114,10 +114,10 @@ TalentAllowanceInfoDlg.initCommonFileTable = function () {
             return {css: {"word-break": "break-word", "white-space": "inherit"}}
         },
         columns: [
-            {title: '附件原名', field: 'originalName', visible: true, align: 'center', valign: 'middle', 'class': 'uitd_showTip',  width: '70%', formatter: function (value, row, index) {
+            {title: '附件原名', field: 'originalName', visible: true, align: 'center', valign: 'middle', 'class': 'uitd_showTip', width: '70%', formatter: function (value, row, index) {
                     return value;
                 }},
-            {title: '预览', field: 'url', visible: true, align: 'center', valign: 'middle',width: "20%",
+            {title: '预览', field: 'url', visible: true, align: 'center', valign: 'middle', width: "20%",
                 formatter: function (value, row, index) {
                     var sn = value.lastIndexOf(".");
                     var suffix = value.substring(sn + 1, value.length);
@@ -153,26 +153,26 @@ TalentAllowanceInfoDlg.initCommonFileTable = function () {
 /**
  * 初始化工作单位及核查项目情况表
  */
-TalentAllowanceInfoDlg.initContract = function(){
-    $("#projectTable").bootstrapTable("destroy",{});
+TalentAllowanceInfoDlg.initContract = function () {
+    $("#projectTable").bootstrapTable("destroy", {});
     $("#projectTable").bootstrapTable({
         url: Feng.ctxPath + "/enterprise/talentAllowance/findAllowanceContractDetail",
         method: 'POST',
         contentType: "application/x-www-form-urlencoded; charset=UTF-8",
-        search: false,					// 是否显示表格搜索，此搜索是客户端搜索，不会进服务端
-        showRefresh: false,				// 是否显示刷新按钮
-        clickToSelect: true,			// 是否启用点击选中行
-        singleSelect: true,				// 设置True 将禁止多选
-        striped: true,  				// 是否显示行间隔色
+        search: false, // 是否显示表格搜索，此搜索是客户端搜索，不会进服务端
+        showRefresh: false, // 是否显示刷新按钮
+        clickToSelect: true, // 是否启用点击选中行
+        singleSelect: true, // 设置True 将禁止多选
+        striped: true, // 是否显示行间隔色
         escape: true,
-        pagination: false,   			// 设置为 true 会在表格底部显示分页条
+        pagination: false, // 设置为 true 会在表格底部显示分页条
         paginationHAlign: "left",
         paginationDetailHAlign: "right",
-        sidePagination: "server",   	// 设置在哪里进行分页，可选值为 'client' 或者 'server'
+        sidePagination: "server", // 设置在哪里进行分页，可选值为 'client' 或者 'server'
         showColumns: false,
-        detailView: true,//父子表
+        detailView: true, //父子表
         queryParams: function (params) {
-            return $.extend({"mainId":$("#id").val()},params)
+            return $.extend({"mainId": $("#id").val()}, params)
         },
         columns: TalentAllowanceInfoDlg.initContractColumns(),
         onPostBody: function () {
@@ -186,24 +186,24 @@ TalentAllowanceInfoDlg.initContract = function(){
         },
         onExpandRow: function (index, row, $detail) {
             var enterpriseId = row.enterpriseId;
-            var cur_table = $detail.html('<table id="'+enterpriseId+'" class="mytable-hover"></table>').find('table');
-            $(cur_table).bootstrapTable("destroy",{});
+            var cur_table = $detail.html('<table id="' + enterpriseId + '" class="mytable-hover"></table>').find('table');
+            $(cur_table).bootstrapTable("destroy", {});
             $(cur_table).bootstrapTable({
                 url: Feng.ctxPath + "/enterprise/talentAllowance/findAllowanceProject",
                 method: 'POST',
                 contentType: "application/x-www-form-urlencoded; charset=UTF-8",
-                search: false,					// 是否显示表格搜索，此搜索是客户端搜索，不会进服务端
-                showRefresh: false,				// 是否显示刷新按钮
-                clickToSelect: true,			// 是否启用点击选中行
-                singleSelect: true,				// 设置True 将禁止多选
+                search: false, // 是否显示表格搜索，此搜索是客户端搜索，不会进服务端
+                showRefresh: false, // 是否显示刷新按钮
+                clickToSelect: true, // 是否启用点击选中行
+                singleSelect: true, // 设置True 将禁止多选
                 escape: true,
-                pagination: false,   			// 设置为 true 会在表格底部显示分页条
+                pagination: false, // 设置为 true 会在表格底部显示分页条
                 paginationHAlign: "left",
                 paginationDetailHAlign: "right",
-                sidePagination: "server",   	// 设置在哪里进行分页，可选值为 'client' 或者 'server'
+                sidePagination: "server", // 设置在哪里进行分页，可选值为 'client' 或者 'server'
                 showColumns: false,
                 queryParams: function (params) {
-                    return $.extend({"mainId":$("#id").val(),"baseId":row.id},params)
+                    return $.extend({"mainId": $("#id").val(), "baseId": row.id}, params)
                 },
                 columns: TalentAllowanceInfoDlg.initProjectColumns(),
             });
@@ -214,40 +214,40 @@ TalentAllowanceInfoDlg.initContract = function(){
 
 
 //初始化工作单位表的列
-TalentAllowanceInfoDlg.initContractColumns = function(){
+TalentAllowanceInfoDlg.initContractColumns = function () {
     var type = $("#type").val();
-    if(type==1){
+    if (type == 1) {
         return [
-            {field: 'selectItem', checkbox:false,visible:false},
-            {title: '企业名称', field: 'enterpriseName', visible: true, align: 'center', valign: 'middle',width:"120px",'class': 'uitd_showTip'},
-            {title: '合同起始时间', field: 'startTime', visible: true, align: 'center', valign: 'middle',width:"120px",'class': 'uitd_showTip'},
-            {title: '合同截止时间', field: 'endTime', visible: true, align: 'center', valign: 'middle',width:"120px",'class': 'uitd_showTip'},
-            {title: '入职时间', field: 'entryTime', visible: true, align: 'center', valign: 'middle',width:"100px"},
-            {title: '离职时间', field: 'quitTime', visible: true, align: 'center', valign: 'middle',width:"100px"},
-            {title: '人才标签', field: 'talentTypeName', visible: true, align: 'center', valign: 'middle',width:"100px",'class': 'uitd_showTip'},
-            {title: '首次来晋行政介绍信时间', field: 'letterTime', visible: true, align: 'center', valign: 'middle',width:"120px"},
-            {title: '操作', field: 'id', visible: true, align: 'center', valign: 'middle',width:"120px",
-                formatter : function(value,row,index){
-                    return "<button type='button' onclick='TalentAllowanceInfoDlg.showLog(\""+row.id+"\")' style='margin-right: 10px' class='btn btn-xs btn-success'>" +
-                        "<i class=\"fa fa-book\"></i>日志" +
-                        "</button>";
+            {field: 'selectItem', checkbox: false, visible: false},
+            {title: '企业名称', field: 'enterpriseName', visible: true, align: 'center', valign: 'middle', width: "120px", 'class': 'uitd_showTip'},
+            {title: '合同起始时间', field: 'startTime', visible: true, align: 'center', valign: 'middle', width: "120px", 'class': 'uitd_showTip'},
+            {title: '合同截止时间', field: 'endTime', visible: true, align: 'center', valign: 'middle', width: "120px", 'class': 'uitd_showTip'},
+            {title: '入职时间', field: 'entryTime', visible: true, align: 'center', valign: 'middle', width: "100px"},
+            {title: '离职时间', field: 'quitTime', visible: true, align: 'center', valign: 'middle', width: "100px"},
+            {title: '人才标签', field: 'talentTypeName', visible: true, align: 'center', valign: 'middle', width: "100px", 'class': 'uitd_showTip'},
+            {title: '首次来晋行政介绍信时间', field: 'letterTime', visible: true, align: 'center', valign: 'middle', width: "120px"},
+            {title: '操作', field: 'id', visible: true, align: 'center', valign: 'middle', width: "120px",
+                formatter: function (value, row, index) {
+                    return "<button type='button' onclick='TalentAllowanceInfoDlg.showLog(\"" + row.id + "\")' style='margin-right: 10px' class='btn btn-xs btn-success'>" +
+                            "<i class=\"fa fa-book\"></i>日志" +
+                            "</button>";
                 }
             }
         ];
     }
-    if(type==2){
+    if (type == 2) {
         return [
-            {field: 'selectItem', checkbox:false,visible:false},
-            {title: '企业名称', field: 'enterpriseName', visible: true, align: 'center', valign: 'middle',width:"120px",'class': 'uitd_showTip'},
-            {title: '合同起始时间', field: 'startTime', visible: true, align: 'center', valign: 'middle',width:"120px"},
-            {title: '合同截止时间', field: 'endTime', visible: true, align: 'center', valign: 'middle',width:"120px",'class': 'uitd_showTip'},
-            {title: '入职时间', field: 'entryTime', visible: true, align: 'center', valign: 'middle',width:"100px"},
-            {title: '离职时间', field: 'quitTime', visible: true, align: 'center', valign: 'middle',width:"100px"},
-            {title: '操作', field: 'id', visible: true, align: 'center', valign: 'middle',width:"120px",
-                formatter : function(value,row,index){
-                    return "<button type='button' onclick='TalentAllowanceInfoDlg.showLog(\""+row.id+"\")' style='margin-right: 10px' class='btn btn-xs btn-success'>" +
-                        "<i class=\"fa fa-book\"></i>日志" +
-                        "</button>"
+            {field: 'selectItem', checkbox: false, visible: false},
+            {title: '企业名称', field: 'enterpriseName', visible: true, align: 'center', valign: 'middle', width: "120px", 'class': 'uitd_showTip'},
+            {title: '合同起始时间', field: 'startTime', visible: true, align: 'center', valign: 'middle', width: "120px"},
+            {title: '合同截止时间', field: 'endTime', visible: true, align: 'center', valign: 'middle', width: "120px", 'class': 'uitd_showTip'},
+            {title: '入职时间', field: 'entryTime', visible: true, align: 'center', valign: 'middle', width: "100px"},
+            {title: '离职时间', field: 'quitTime', visible: true, align: 'center', valign: 'middle', width: "100px"},
+            {title: '操作', field: 'id', visible: true, align: 'center', valign: 'middle', width: "120px",
+                formatter: function (value, row, index) {
+                    return "<button type='button' onclick='TalentAllowanceInfoDlg.showLog(\"" + row.id + "\")' style='margin-right: 10px' class='btn btn-xs btn-success'>" +
+                            "<i class=\"fa fa-book\"></i>日志" +
+                            "</button>"
                 }
             }
         ];
@@ -257,23 +257,35 @@ TalentAllowanceInfoDlg.initContractColumns = function(){
 //初始化项目表的列
 TalentAllowanceInfoDlg.initProjectColumns = function () {
     return [
-        {field: 'selectItem', checkbox:false,visible:false},
-        {title: '核查项目名称', field: 'projectName', visible: true, align: 'center', valign: 'middle',width:"15%",'class': 'uitd_showTip'},
-        {title: '详情', field: 'months', visible: true, align: 'center', valign: 'middle',width:"35%",
-            formatter : function(value,row,index){
-                if(value!=null && value!=''){
-                    return value;
-                }else if(row.days!=null && row.days!=''){
-                    return row.days + "天";
-                }else{
-                    return "";
+        {field: 'selectItem', checkbox: false, visible: false},
+        {title: '核查项目名称', field: 'projectName', visible: true, align: 'center', valign: 'middle', width: "15%", 'class': 'uitd_showTip'},
+        {title: '详情', field: 'months', visible: true, align: 'center', valign: 'middle', width: "45%", 'class': 'uitd_showTip',
+            formatter: function (value, row, index) {
+                var allowanceType = $("#allowanceType").val();
+                var tmp = [];
+                if (row.project == 4 && allowanceType == 2) {
+                    var dayArr = value ? value.split(",") : [];
+                    for (var d = 0; d < dayArr.length; d++) {
+                        var kv = dayArr[d].split("=");
+                        if (kv[0] && kv[1]) {
+                            tmp.push(kv[0] + "月（" + kv[1] + "天）");
+                        }
+                    }
+                } else {
+                    var monthArr = value ? value.split(",") : [];
+                    for (var d = 0; d < monthArr.length; d++) {
+                        if (monthArr[d]) {
+                            tmp.push(monthArr[d] + "月");
+                        }
+                    }
                 }
+                return tmp.join(",");
             }
         },
-        {title: '备注', field: 'description', visible: true, align: 'center', valign: 'middle',width:"35%",'class': 'uitd_showTip'},
-        {title: '操作', field: 'project', visible: true, align: 'center', valign: 'middle',width:"15%",
-            formatter : function(value,row,index){
-                return "<button type='button' onclick='TalentAllowanceInfoDlg.showLog(\""+row.id+"\")' style='margin-right: 10px' class='btn btn-xs btn-success'><i class=\"fa fa-book\"></i>日志</button>";
+        {title: '备注', field: 'description', visible: true, align: 'center', valign: 'middle', width: "25%", 'class': 'uitd_showTip'},
+        {title: '操作', field: 'project', visible: true, align: 'center', valign: 'middle', width: "15%",
+            formatter: function (value, row, index) {
+                return "<button type='button' onclick='TalentAllowanceInfoDlg.showLog(\"" + row.id + "\")' style='margin-right: 10px' class='btn btn-xs btn-success'><i class=\"fa fa-book\"></i>日志</button>";
             }
         }
     ];
@@ -284,28 +296,28 @@ TalentAllowanceInfoDlg.initProjectColumns = function () {
  */
 TalentAllowanceInfoDlg.initFileTypeColumn = function () {
     return [
-        {field: 'selectItem', checkbox:false,visible:false},
-        {title: '名称', field: 'name', visible: true, align: 'center', valign: 'middle',width:"30%",'class': 'uitd_showTip',
-            formatter : function(value,row,index){
-                if(row.must==1){
-                    return '<i class="fa fa-paste"></i><span style="font-weight:bold;color:red;font-size:14px;font-family:宋体"> * </span> '+ value;
-                }if(row.must==2){
-                    return '<i class="fa fa-paste"></i>'+value;
+        {field: 'selectItem', checkbox: false, visible: false},
+        {title: '名称', field: 'name', visible: true, align: 'center', valign: 'middle', width: "30%", 'class': 'uitd_showTip',
+            formatter: function (value, row, index) {
+                if (row.must == 1) {
+                    return '<i class="fa fa-paste"></i><span style="font-weight:bold;color:red;font-size:14px;font-family:宋体"> * </span> ' + value;
+                }
+                if (row.must == 2) {
+                    return '<i class="fa fa-paste"></i>' + value;
                 }
             }
         },
-        {title: '模板', field: 'templateUrl', visible: true, align: 'center', valign: 'middle',width:"8%",
-            formatter : function(value,row,index){
-                if(value==null||value==''||value=='null'){
+        {title: '模板', field: 'templateUrl', visible: true, align: 'center', valign: 'middle', width: "8%",
+            formatter: function (value, row, index) {
+                if (value == null || value == '' || value == 'null') {
                     return '无';
                 }
-                return "<button type='button' onclick=\"Feng.downloadFile('"+row.id+"',3)\" style='margin-right: 10px' class=\"btn btn-xs btn-primary\">" +
-                    "<i class=\"fa fa-download\"></i>下载" +
-                    "</button>";
+                return "<button type='button' onclick=\"Feng.downloadFile('" + row.id + "',3)\" style='margin-right: 10px' class=\"btn btn-xs btn-primary\">" +
+                        "<i class=\"fa fa-download\"></i>下载" +
+                        "</button>";
             }
         },
-        {title: '备注', field: 'description', visible: true, align: 'center', valign: 'middle',width:"52%",'class': 'uitd_showTip'},
-
+        {title: '备注', field: 'description', visible: true, align: 'center', valign: 'middle', width: "52%", 'class': 'uitd_showTip'},
     ]
 };
 
@@ -314,47 +326,47 @@ TalentAllowanceInfoDlg.initFileTypeColumn = function () {
 TalentAllowanceInfoDlg.showLog = function (id) {
     layer.open({
         type: 1,
-        title:"日志",
-        fixed:false,
-        content: '<table id="'+id+'"></table>',
+        title: "日志",
+        fixed: false,
+        content: '<table id="' + id + '"></table>',
         area: ['80%', '80%'],
         maxmin: true,
-        success :function (layero, index) {
-            $('#'+id).bootstrapTable({
+        success: function (layero, index) {
+            $('#' + id).bootstrapTable({
                 url: Feng.ctxPath + "/common/api/getJbtCheckLog",
                 method: 'POST',
                 contentType: "application/x-www-form-urlencoded; charset=UTF-8",
-                search: false,					// 是否显示表格搜索，此搜索是客户端搜索，不会进服务端
-                showRefresh: false,				// 是否显示刷新按钮
-                clickToSelect: true,			// 是否启用点击选中行
-                singleSelect: true,				// 设置True 将禁止多选
-                striped: true,  				// 是否显示行间隔色
-                pagination: false,   			// 设置为 true 会在表格底部显示分页条
+                search: false, // 是否显示表格搜索，此搜索是客户端搜索，不会进服务端
+                showRefresh: false, // 是否显示刷新按钮
+                clickToSelect: true, // 是否启用点击选中行
+                singleSelect: true, // 设置True 将禁止多选
+                striped: true, // 是否显示行间隔色
+                pagination: false, // 设置为 true 会在表格底部显示分页条
                 paginationHAlign: "left",
                 paginationDetailHAlign: "right",
-                sidePagination: "server",   	// 设置在哪里进行分页，可选值为 'client' 或者 'server'
+                sidePagination: "server", // 设置在哪里进行分页，可选值为 'client' 或者 'server'
                 showColumns: false,
                 queryParams: function (params) {
-                    return {"type":CONFIG.project_jbt,"mainId":$("#id").val(),"typeFileId":id,"active":1}
+                    return {"type": CONFIG.project_jbt, "mainId": $("#id").val(), "typeFileId": id, "active": 1}
                 },
                 columns:
-                    [
-                        {title: '步骤', field: 'stepName', visible: true, align: 'center', valign: 'middle',width:"10%",
-                            formatter : function (value,row,index) {
-                                return ""+value;
+                        [
+                            {title: '步骤', field: 'stepName', visible: true, align: 'center', valign: 'middle', width: "10%",
+                                formatter: function (value, row, index) {
+                                    return "" + value;
+                                }
+                            },
+                            {title: '操作人', field: 'createUser', visible: true, align: 'center', valign: 'middle', width: "15%"},
+                            {title: '操作时间', field: 'createTime', visible: true, align: 'center', valign: 'middle', width: "20%"},
+                            {title: '描述', field: 'description', visible: true, align: 'center', valign: 'middle', width: "45%",
+                                formatter: function (value, row, index) {
+                                    return '<span data-toggle="tooltip" title="' + value + '">"' + value + '"</span>';
+                                }
                             }
-                        },
-                        {title: '操作人', field: 'createUser', visible: true, align: 'center', valign: 'middle',width:"15%"},
-                        {title: '操作时间', field: 'createTime', visible: true, align: 'center', valign: 'middle',width:"20%"},
-                        {title: '描述', field: 'description', visible: true, align: 'center', valign: 'middle',width:"45%",
-                            formatter : function (value,row,index) {
-                                return '<span data-toggle="tooltip" title="'+ value +'">"'+value+'"</span>';
-                            }
-                        }
-                    ]
+                        ]
                 ,
                 onPostBody: function () {
-                    $('#'+id+"td.uitd_showTip").bind("mouseover", function () {
+                    $('#' + id + "td.uitd_showTip").bind("mouseover", function () {
                         var htm = $(this).html();
                         $(this).webuiPopover({title: '详情', content: htm, trigger: 'hover'}).webuiPopover('show');
                     });
@@ -365,50 +377,50 @@ TalentAllowanceInfoDlg.showLog = function (id) {
 }
 
 //回调
-TalentAllowanceInfoDlg.callBack = function (data){
+TalentAllowanceInfoDlg.callBack = function (data) {
     layer.close(data.obj);
     Feng.info(data.msg);
     if (data.code == 200) {
-        var ajax = new $ax(Feng.ctxPath + "/enterprise/talentAllowance/updateSuppleState", function(data){
-            if(data.code == 200){
+        var ajax = new $ax(Feng.ctxPath + "/enterprise/talentAllowance/updateSuppleState", function (data) {
+            if (data.code == 200) {
 
-            }else{
+            } else {
 
             }
-        },function(data){
+        }, function (data) {
             Feng.error("修改失败!" + data.responseJSON.message + "!");
         });
-        ajax.set("id",$("#id").val());
+        ajax.set("id", $("#id").val());
         ajax.start();
         $("#fileTable").bootstrapTable("refresh", {});
     }
 }
 
-TalentAllowanceInfoDlg.showAllLog = function(){
+TalentAllowanceInfoDlg.showAllLog = function () {
     var id = $("#id").val();
-    if(Feng.isNotEmptyStr(id)){
-        Feng.getCheckLog("logTable",{"type":CONFIG.project_jbt,"mainId":id,"typeFileId":"","active":1})
+    if (Feng.isNotEmptyStr(id)) {
+        Feng.getCheckLog("logTable", {"type": CONFIG.project_jbt, "mainId": id, "typeFileId": "", "active": 1})
     }
 }
 
-$(function() {
-    Feng.initValidatorTip("talentAllowanceForm",TalentAllowanceInfoDlg.validateFields);
+$(function () {
+    Feng.initValidatorTip("talentAllowanceForm", TalentAllowanceInfoDlg.validateFields);
     Feng.addAjaxSelect({
         "id": 'name',
         "displayCode": "id",
         "displayName": "name",
         "type": "GET",
-        "url": Feng.ctxPath + "/enterprise/talent/findTalentByEnterpriseInLibrary?type=1&year="+$("#year").val()
+        "url": Feng.ctxPath + "/enterprise/talent/findTalentByEnterpriseInLibrary?type=1&year=" + $("#year").val()
     });
-    if($("#type").val()==2){
-        $("#bankNumberSpan,#talentTypeSpan,#introductionModeSpan,#firstInJJTimeSpan").attr("style","display:none");
+    if ($("#type").val() == 2) {
+        $("#bankNumberSpan,#talentTypeSpan,#introductionModeSpan,#firstInJJTimeSpan").attr("style", "display:none");
     }
     if ($("#allowanceType").val() == 1) {
         //$("#wageDiv").css("display", "block");
     }
     //批量加载时间控件
-    $(".date").each(function(){
-        laydate.render({elem: "#"+$(this).attr("id"),type: 'date',trigger: 'click'});
+    $(".date").each(function () {
+        laydate.render({elem: "#" + $(this).attr("id"), type: 'date', trigger: 'click'});
     });
     $("select").each(function () {
         $(this).val($(this).attr("value"));