津补贴++

app/admin/view/talent_allowance/info.html

@@ -356,7 +356,7 @@
                                         <input type='hidden' id="fileTypeId" name="fileTypeId" >
                                         <input type='hidden' id="index" name="index" >
                                         <input type="hidden" name="backName" value="TalentAllowanceInfoDlg.callBack">
-                                        <input type="type" name="type" value="8">
+                                        <input type="type" name="type" value="2">
                                     </form>
                                 </div>
                             </div>                            

app/common/controller/Api.php

@@ -935,6 +935,9 @@ class Api extends BaseController {
                     if ($user_id == $talent_info["enterpriseId"])
                         return true;
                 }
+                if ($this->user["usertype"] == 1) {
+                    return true;
+                }
                 break;
             case ProjectState::EDUCATION:
                 if ($this->user["usertype"] == 3) {
@@ -1209,6 +1212,26 @@ class Api extends BaseController {
         return json($fileTypes);
     }
 
+    public function findContractFileType() {
+        $type = $this->request["type"];
+        $where[] = ["name", "like", "%工作%"];
+        $where[] = ["project", "=", 1];
+        $where[] = ["active", "=", 1];
+        $where[] = ["isConditionFile", "<>", 1];
+        $where[] = ["delete", "=", 0];
+        $where[] = ["type", "=", $type];
+        $rows = Db::table("new_common_filetype")->where($where)->order("must asc")->order("sn asc")->select()->toArray();
+        return json(["rows" => $rows]);
+    }
+
+    public function contractView() {
+        $id = $this->request["id"];
+        $talentInfo = \app\common\api\VerifyApi::getTalentInfoById($id);
+        $type = $talentInfo["enterpriseType"];
+
+        return view("", ["id" => $talentInfo["id"], "type" => $type]);
+    }
+
     public function getEnterpriseData() {
         
     }

app/common/view/api/contract_view.html

@@ -0,0 +1,180 @@
+{extend name="layout/content"}
+{block name="content"}
+
+<style type="text/css">
+    .spacing {
+        margin-bottom: 10px;
+        padding-right:4px;
+        padding-left: 4px;
+    }
+    #talentInfoForm label {
+        font-size: xx-small;
+    }
+    .has-feedback .form-control {
+        padding-right: 5px;
+    }
+    #projectForm ul li{
+        width:16%;
+        padding-top: 10px;
+    }
+    #jjAttendanceForm ul li{
+        width:16%;
+        padding-top: 10px;
+    }
+    #field ul li{
+        width:33%;
+        padding-top: 5px;
+    }
+    ul li{
+        list-style: none;
+        display:inline-block;
+    }
+    .imgs li {
+        float: left;
+        border: 1px solid #d8d1d1;
+        text-align: center;
+        height: 30px;
+    }
+    .showImgs li {
+        float: left;
+        border: 1px solid #d8d1d1;
+        text-align: center;
+        height: 30px;
+    }
+    .project-detail li{width:30px;text-align:center;line-height:20px;color:#fff;margin:0 2px;}
+    .project-detail li.gray{background:#d8d1d1;}
+    .project-detail li.green{background:#1cc09f;}
+</style>
+<div id="showBigPic">
+    <input type="hidden" id="id" value="{$id}"/>
+    <input type="hidden" id="type" value="{$type}"/>
+    <div class="panel panel-default">
+        <div class="panel-heading" onclick="$(this).next().toggle()">
+            <h3 class="panel-title">
+                工作合同相关附件
+            </h3>
+        </div>
+        <div class="panel-body" >
+            <table id="fileTable" class="table-condensed" style="font-size: 10px;table-layout: fixed!important;" data-mobile-responsive="true" data-click-to-select="true">
+                <thead>
+                    <tr>
+                        <th data-field="selectItem" data-checkbox="true"></th>
+                    </tr>
+                </thead>
+            </table>
+        </div>
+    </div>     
+</div>
+<script type="text/javascript">
+    var __initialize = function () {
+        initFileTable();
+        function initFileTable() {
+            var queryData = {};
+            queryData['type'] = $("#type").val();
+            $("#fileTable").bootstrapTable({
+                url: Feng.ctxPath + "/common/api/findContractFileType",
+                method: 'POST',
+                contentType: "application/x-www-form-urlencoded; charset=UTF-8",
+                search: false, // 是否显示表格搜索，此搜索是客户端搜索，不会进服务端
+                showRefresh: false, // 是否显示刷新按钮
+                clickToSelect: true, // 是否启用点击选中行
+                singleSelect: true, // 设置True 将禁止多选
+                striped: true, // 是否显示行间隔色
+                escape: true,
+                pagination: false, // 设置为 true 会在表格底部显示分页条
+                paginationHAlign: "left",
+                paginationDetailHAlign: "right",
+                sidePagination: "server", // 设置在哪里进行分页，可选值为 'client' 或者 'server'
+                showColumns: false,
+                detailView: true, //是否显示父子表
+                pageList: [10, 30, 50],
+                queryParams: function (params) {
+                    return $.extend(queryData, params)
+                },
+                rowStyle: function (row, index) {
+                    return {classes: "info"};
+                },
+                columns: initFileTypeColumn(),
+                onPostBody: function () {
+                    $("td.uitd_showTip").bind("mouseover", function () {
+                        var htm = $(this).html();
+                        $(this).webuiPopover({title: '详情', content: htm, trigger: 'hover'}).webuiPopover('show');
+                    });
+                },
+                onLoadSuccess: function (data) {
+                    $("#fileTable").bootstrapTable('expandAllRows');
+                },
+                onExpandRow: function (index, row, $detail) {
+                    var ajax = new $ax(Feng.ctxPath + "/common/api/listTalentFile", function (data) {
+                        if (data == null || data.length == 0) {
+                            return;
+                        }
+                        var html = '<ul class="imgs"><li style="width: 70%;font-weight: bold;padding-top: 5px;">附件原名</li><li style="width: 10%;font-weight: bold;padding-top: 5px;">预览</li><li style="width: 20%;font-weight: bold;padding-top: 5px;">操作</li>';
+                        for (var key in data) {
+                            var sn = data[key].url.lastIndexOf(".");
+                            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;\">';
+                            }
+                            html = html + '<li style="display: none">' + data[key].id + '</li>\n' +
+                                    '<li style="width: 70%;padding-top: 5px;">' + data[key].orignName + '</li>\n' +
+                                    '<li style="width: 10%;">' + imgStr + '</li>\n' +
+                                    "<li style='width: 20%;padding-top: 2px;'><button type='button' onclick=\"Feng.downloadFile('" + data[key].id + "',1)\" style=\'margin-left: 5px\' class=\"btn btn-xs btn-success\"><i class=\"fa fa-download\" aria-hidden=\"true\"></i>下载</button></li>";
+                        }
+                        html = html + '</ul>';
+                        $detail.html(html);
+                        $(".imgs").viewer({
+                            // toolbar:false,
+                            fullscreen: false
+                        });
+                    }, function (data) {
+                        Feng.error("查询失败!" + data.responseJSON.message + "!");
+                    });
+                    var queryData = {};
+                    queryData["mainId"] = $("#id").val();
+                    queryData["fileTypeId"] = row.id;
+                    ajax.set(queryData);
+                    ajax.start();
+                }
+            });
+        }
+
+        /**
+         * 初始化附件类别表的列
+         */
+        function initFileTypeColumn() {
+            var title = [];
+            title = [
+                {field: 'selectItem', checkbox: false, visible: false},
+                {title: '名称', field: 'name', visible: true, align: 'center', valign: 'middle', width: "52%", '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') {
+                            return '无';
+                        }
+                        return "<button type='button' onclick=\"Feng.downloadFile('" + value + "',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: "40%", 'class': 'uitd_showTip'},
+            ]
+            return title;
+        }
+    }();
+</script>
+{/block}

public/static/js/common/Feng.js

@@ -8,9 +8,9 @@ var Feng = {
     confirm: function (tip, ensure) {//询问框
         parent.layer.confirm(tip, {
             btn: ['确定', '取消']
-        }, function (index,layero) {
+        }, function (index, layero) {
             var btn = layero.find(".layui-layer-btn0");
-            btn.css("pointer-events","none")
+            btn.css("pointer-events", "none")
             ensure();
             parent.layer.close(index);
         }, function (index) {
@@ -148,14 +148,14 @@ var Feng = {
                 validating: 'glyphicon glyphicon-refresh'
             },
             container: 'tooltip',
-            group:'.rowGroup',
-            fields:fields,
+            group: '.rowGroup',
+            fields: fields,
             live: 'enabled',
             message: '该字段不能为空'
-        }).on('error.field.bv', function(e, data) {
+        }).on('error.field.bv', function (e, data) {
             var $parent = data.element.parents('.form-group-sm'),
-                $icon   = $parent.find('.form-control-feedback[data-bv-icon-for="' + data.field + '"]'),
-                title   = $icon.data('bs.tooltip').getTitle();
+                    $icon = $parent.find('.form-control-feedback[data-bv-icon-for="' + data.field + '"]'),
+                    title = $icon.data('bs.tooltip').getTitle();
             $icon.tooltip('destroy').tooltip({
                 html: true,
                 placement: 'right',
@@ -214,43 +214,45 @@ var Feng = {
             parent.$('.J_menuTab').removeClass('active');
             parent.$('.J_menuTabs .page-tabs-content').append(tabLink);
 
-            var iframeContent = '<iframe class="J_iframe" name="iframe' + Feng.randomNum(100,999) + '" width="100%" height="100%" src="' + dataUrl + '" frameborder="0" data-id="' + dataUrl + '" seamless></iframe>';
+            var iframeContent = '<iframe class="J_iframe" name="iframe' + Feng.randomNum(100, 999) + '" width="100%" height="100%" src="' + dataUrl + '" frameborder="0" data-id="' + dataUrl + '" seamless></iframe>';
             parent.$('.J_mainContent').find('iframe.J_iframe').hide().parents('.J_mainContent').append(iframeContent);
             parent.MyCrontab.scrollToTab($('.J_menuTab.active'));
         }
     },
-    endWith: function(str, val){
-    	if (str==null || val==null) {
-    		return false;
-    	}
-    	if (str.length < val.length) {
-    		return false;
-    	}
+    endWith: function (str, val) {
+        if (str == null || val == null) {
+            return false;
+        }
+        if (str.length < val.length) {
+            return false;
+        }
         var temp = str.substring(str.length - val.length);
-        if(temp == val){
-        	return true;
-        }else{
-        	return false;
+        if (temp == val) {
+            return true;
+        } else {
+            return false;
+        }
+    },
+    setUrlParam: function (url, jsonObj) {
+        for (var temp in jsonObj) {
+            var key = temp;
+            var value = jsonObj[temp];
+            if (value != null && value != '') {
+                if (url.indexOf("?") != -1) {
+                    url = url + "&" + key + "=" + encodeURI(encodeURI(value));
+                } else {
+                    url = url + "?" + key + "=" + encodeURI(encodeURI(value));
+                }
+            }
         }
+        return url
     },
-    setUrlParam: function(url, jsonObj){
-    	for(var temp in jsonObj){
-    		var key = temp;
-    		var value = jsonObj[temp];
-    		if (value!=null && value!='') {
-    			if (url.indexOf("?")!=-1) {
-    				url = url + "&" + key + "=" + encodeURI(encodeURI(value));
-    			} else {
-    				url = url + "?" + key + "=" + encodeURI(encodeURI(value));
-    			}
-    		}
-    	}
-    	return url
-    },
-    getUrlValue : function(name){
-        var reg = new RegExp("(^|&)"+ name +"=([^&]*)(&|$)");
+    getUrlValue: function (name) {
+        var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)");
         var r = window.location.search.substr(1).match(reg);
-        if(r!=null)return  decodeURI(r[2]); return null;
+        if (r != null)
+            return  decodeURI(r[2]);
+        return null;
     },
     addAjaxSelect: function (val) {
         var id = val.id;                                                            //下拉框对象的id
@@ -261,45 +263,45 @@ var Feng = {
         var bindData = val.bindData;
         var type = val.type;                                                        //请求方式 GET 或者 POST， 默认POST
         var async = val.async;                                                      //同步方式 {异步--falae, 同步--true}, 默认为同步
-        if (async == null){
+        if (async == null) {
             async = false;
         }
-        if (type==null){
+        if (type == null) {
             type == "POST";
         }
-        var select = typeof id !="undefined"?$("#"+id):$(obj);
+        var select = typeof id != "undefined" ? $("#" + id) : $(obj);
         select.empty();
-        var ajax = new $ax(url, function(data){
+        var ajax = new $ax(url, function (data) {
             var length = data.length;
             var html = "<option value=''>---请选择---</option>";
-            for(var i=0; i<length; i++){
-                if (length == 1){
-                    if(typeof bindData !="undefined" && bindData){
-                        html = html+  "<option value=\""+data[i][displayCode]+"\" data-"+bindData+"=\""+data[i][bindData]+"\">"+data[i][displayName]+"</option>";
-                    }else{
-                        html = html+  "<option value=\""+data[i][displayCode]+"\">"+data[i][displayName]+"</option>";
+            for (var i = 0; i < length; i++) {
+                if (length == 1) {
+                    if (typeof bindData != "undefined" && bindData) {
+                        html = html + "<option value=\"" + data[i][displayCode] + "\" data-" + bindData + "=\"" + data[i][bindData] + "\">" + data[i][displayName] + "</option>";
+                    } else {
+                        html = html + "<option value=\"" + data[i][displayCode] + "\">" + data[i][displayName] + "</option>";
                     }
-                }else{
-                    if(typeof bindData !="undefined" && bindData){
-                	if(data[i][displayCode]==select.attr("defval")){
-                        html += "<option selected='selected' value=\""+data[i][displayCode]+"\" data-"+bindData+"=\""+data[i][bindData]+"\">"+data[i][displayName]+"</option>";
-                	}else{
-                		html += "<option value=\""+data[i][displayCode]+"\" data-"+bindData+"=\""+data[i][bindData]+"\">"+data[i][displayName]+"</option>";
-                	}
-                    }else{
-                	if(data[i][displayCode]==select.attr("defval")){
-                        html += "<option selected='selected' value=\""+data[i][displayCode]+"\">"+data[i][displayName]+"</option>";
-                	}else{
-                		html += "<option value=\""+data[i][displayCode]+"\">"+data[i][displayName]+"</option>";
-                	}
+                } else {
+                    if (typeof bindData != "undefined" && bindData) {
+                        if (data[i][displayCode] == select.attr("defval")) {
+                            html += "<option selected='selected' value=\"" + data[i][displayCode] + "\" data-" + bindData + "=\"" + data[i][bindData] + "\">" + data[i][displayName] + "</option>";
+                        } else {
+                            html += "<option value=\"" + data[i][displayCode] + "\" data-" + bindData + "=\"" + data[i][bindData] + "\">" + data[i][displayName] + "</option>";
+                        }
+                    } else {
+                        if (data[i][displayCode] == select.attr("defval")) {
+                            html += "<option selected='selected' value=\"" + data[i][displayCode] + "\">" + data[i][displayName] + "</option>";
+                        } else {
+                            html += "<option value=\"" + data[i][displayCode] + "\">" + data[i][displayName] + "</option>";
+                        }
                     }
                 }
             }
             select.append(html);
-            if (length == 1){                                                       //如果只有一个选项，需要触发select的onchange方法
-            	select.change();
+            if (length == 1) {                                                       //如果只有一个选项，需要触发select的onchange方法
+                select.change();
             }
-        },function(data){
+        }, function (data) {
             Feng.error("操作失败!");
         });
         ajax.async = async;
@@ -307,82 +309,93 @@ var Feng = {
         ajax.set({});
         ajax.start();
     },
-    acceptImg:function (){
+    acceptImg: function () {
         return {
-            title : 'Images',
-            extensions : 'gif,jpg,jpeg,bmp,png',
-            mimeTypes : 'image/gif,image/jpg,image/jpeg,image/bmp,image/png'
+            title: 'Images',
+            extensions: 'gif,jpg,jpeg,bmp,png',
+            mimeTypes: 'image/gif,image/jpg,image/jpeg,image/bmp,image/png'
         };
     },
-    acceptWord:function (){
+    acceptWord: function () {
         return  {
             title: 'word',
             extensions: 'rar,zip,doc,xls,docx,xlsx,pdf',
             mimeTypes: '.rar,.zip,.doc,.xls,.docx,.xlsx,.pdf'
         };
     },
-    acceptWord_Img:function (){
+    acceptWord_Img: function () {
         return  {
             title: 'word_img',
             extensions: 'doc,xls,docx,xlsx,pdf,gif,jpg,jpeg,bmp,png',
             mimeTypes: '.doc,.xls,.docx,.xlsx,.pdf,image/gif,image/jpg,image/jpeg,image/bmp,image/png'
         };
     },
-    resetSelect: function(id){
-        var options = $("#"+id).children();
-        if (options.length > 1){
-            $("#"+id).val("");
+    resetSelect: function (id) {
+        var options = $("#" + id).children();
+        if (options.length > 1) {
+            $("#" + id).val("");
         }
     },
-    dictFormatter: function(code,type){
-    	var result = "";
-        var ajax = new $ax(Feng.ctxPath + "/dict/findDetailByCode/"+type+"/"+code, function(data){
-        	result=data.name;
-        },function(data){
+    dictFormatter: function (code, type) {
+        var result = "";
+        var ajax = new $ax(Feng.ctxPath + "/dict/findDetailByCode/" + type + "/" + code, function (data) {
+            result = data.name;
+        }, function (data) {
             Feng.error("操作失败!");
         });
         ajax.start();
         return result;
     },
-    showImg: function(context) {                                        //传一个<img>对像
-    	var pic = $(context);
-    	var src = pic.attr("src");
+    showImg: function (context) {                                        //传一个<img>对像
+        var pic = $(context);
+        var src = pic.attr("src");
         var prev = pic.parent().prev();
         var _title = prev.text();
         var sn = _title.lastIndexOf(".");
         var suffix = _title.substring(sn + 1, _title.length).toLowerCase();
         var title = "图片预览";
-        var allowedPicTypes = ["jpg","jpeg","gif","png"];
-        if(allowedPicTypes.indexOf(suffix) > -1){
+        var allowedPicTypes = ["jpg", "jpeg", "gif", "png"];
+        if (allowedPicTypes.indexOf(suffix) > -1) {
             title = _title;
         }
         layer.open({
-            type:2,
-            title:title,
-            fixed:false,
+            type: 2,
+            title: title,
+            fixed: false,
             area: ['80%', '80%'],
-            content:"/common/api/imgViewer?picShow="+encodeURIComponent(src),
-            maxmin:true,
-            shade:0
+            content: "/common/api/imgViewer?picShow=" + encodeURIComponent(src),
+            maxmin: true,
+            shade: 0
         })
-    	/*var sbp = window.top.$("#showBigPic");
-    	sbp.empty();
-    	sbp.append("<img id=\"_pic0001\" src=\""+src+"\" style=\"width:1px; height:1px; margin:0px;padding:0px;\"/>");
-    	window.top.$("#_pic0001").viewer({
-            toolbar:true,
-            fullscreen:false
-        });
-        window.top.$("#_pic0001").click();*/
-	},
-    findChildDictBatch : function (data) {
+        /*var sbp = window.top.$("#showBigPic");
+         sbp.empty();
+         sbp.append("<img id=\"_pic0001\" src=\""+src+"\" style=\"width:1px; height:1px; margin:0px;padding:0px;\"/>");
+         window.top.$("#_pic0001").viewer({
+         toolbar:true,
+         fullscreen:false
+         });
+         window.top.$("#_pic0001").click();*/
+    },
+    showContract: function (talentId) {
+        layer.open({
+            type: 2,
+            title: "查看合同文件",
+            fixed: false,
+            area: ['80%', '80%'],
+            content: "/common/api/contractView?id=" + talentId,
+            maxmin: true,
+            shade: 0
+        })
+    },
+    findChildDictBatch: function (data) {
         var ajax = new $ax(Feng.ctxPath + "/common/tool/findChildDictBatch", function (res) {
             var data = res.obj;
-            for(var i in data){
+            for (var i in data) {
                 var html = "<option value=''>---请选择---</option>";
-                for(var j in data[i]){
-                    html =  html + '<option value="'+data[i][j].code+'">'+data[i][j].name+'</option>';
+                for (var j in data[i]) {
+                    html = html + '<option value="' + data[i][j].code + '">' + data[i][j].name + '</option>';
                 }
-                $("#"+i).empty().append(html);
+                $("#" + i).empty().append(html);
             }
         }, function (data) {
             Feng.error("初始化失败!" + data.responseJSON.message + "!");
@@ -391,34 +404,34 @@ var Feng = {
         ajax.setcontentType('application/json;charset=utf-8');
         ajax.start();
     },
-    checkMobilePhoneNum: function(num) {
-    	var telReg=/^[1][3,4,5,6,7,8,9][0-9]{9}$/;
-    	if (!telReg.test(num)) {
-    		return false;
-    	} else {
-    		return true;
-    	}
-	},
-    getCheckLog : function (id,data) {
+    checkMobilePhoneNum: function (num) {
+        var telReg = /^[1][3,4,5,6,7,8,9][0-9]{9}$/;
+        if (!telReg.test(num)) {
+            return false;
+        } else {
+            return true;
+        }
+    },
+    getCheckLog: function (id, data) {
         //初始化日志
-        $('#'+id).bootstrapTable({
+        $('#' + id).bootstrapTable({
             url: Feng.ctxPath + "/common/api/getCheckLog",
             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 data;
             },
-            rowStyle : function(row,index){
+            rowStyle: function (row, index) {
                 return {
                     css: {
                         "word-break": "break-word",
@@ -427,25 +440,25 @@ var Feng = {
                 }
             },
             columns:
-                [
-                    {title: '步骤', field: 'stepName', visible: true, align: 'center', valign: 'middle',width:"10%",'class':'uitd_showTip',
-                        formatter : function (value,row,index) {
-                            return ""+value;
-                        }
-                    },
-                    {title: '审核状态', field: 'stateName', visible: true, align: 'center', valign: 'middle',width:"10%",'class':'uitd_showTip'},
-                    {title: '状态变更', field: 'stateChange', visible: true, align: 'center', valign: 'middle',width:"20%",'class':'uitd_showTip'},
-                    {title: '审核意见/备注', field: 'description', visible: true, align: 'center', valign: 'middle',width:"30%",'class':'uitd_showTip',
-                        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%",'class':'uitd_showTip'},
-                    {title: '操作时间', field: 'createTime', visible: true, align: 'center', valign: 'middle',width:"15%",'class':'uitd_showTip'},
-                ]
+                    [
+                        {title: '步骤', field: 'stepName', visible: true, align: 'center', valign: 'middle', width: "10%", 'class': 'uitd_showTip',
+                            formatter: function (value, row, index) {
+                                return "" + value;
+                            }
+                        },
+                        {title: '审核状态', field: 'stateName', visible: true, align: 'center', valign: 'middle', width: "10%", 'class': 'uitd_showTip'},
+                        {title: '状态变更', field: 'stateChange', visible: true, align: 'center', valign: 'middle', width: "20%", 'class': 'uitd_showTip'},
+                        {title: '审核意见/备注', field: 'description', visible: true, align: 'center', valign: 'middle', width: "30%", 'class': 'uitd_showTip',
+                            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%", 'class': 'uitd_showTip'},
+                        {title: '操作时间', field: 'createTime', visible: true, align: 'center', valign: 'middle', width: "15%", 'class': 'uitd_showTip'},
+                    ]
             ,
             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');
                 });
@@ -453,37 +466,37 @@ var Feng = {
         });
 
     },
-    getCheckLogModel : function (id,type,fileType) {
+    getCheckLogModel: function (id, type, fileType) {
         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) {
+            success: function (layero, index) {
                 //初始化日志
-                $('#'+id).bootstrapTable({
+                $('#' + id).bootstrapTable({
                     url: Feng.ctxPath + "/common/api/getCheckLog",
                     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) {
-                        if(Feng.isEmptyStr(fileType)){
+                        if (Feng.isEmptyStr(fileType)) {
                             fileType = "";
                         }
-                        return {"type":type,"mainId":id,"typeFileId":fileType,"active":1};
+                        return {"type": type, "mainId": id, "typeFileId": fileType, "active": 1};
                     },
-                    rowStyle : function(row,index){
+                    rowStyle: function (row, index) {
                         return {
                             css: {
                                 "word-break": "break-word",
@@ -492,25 +505,25 @@ var Feng = {
                         }
                     },
                     columns:
-                        [
-                            {title: '步骤', field: 'stepName', visible: true, align: 'center', valign: 'middle',width:"10%",'class':'uitd_showTip',
-                                formatter : function (value,row,index) {
-                                    return ""+value;
-                                }
-                            },
-                            {title: '审核状态', field: 'stateName', visible: true, align: 'center', valign: 'middle',width:"10%",'class':'uitd_showTip'},
-                            {title: '状态变更', field: 'stateChange', visible: true, align: 'center', valign: 'middle',width:"20%",'class':'uitd_showTip'},
-                            {title: '审核意见/备注', field: 'description', visible: true, align: 'center', valign: 'middle',width:"30%",'class':'uitd_showTip',
-                                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%",'class':'uitd_showTip'},
-                            {title: '操作时间', field: 'createTime', visible: true, align: 'center', valign: 'middle',width:"15%",'class':'uitd_showTip'},
-                        ]
+                            [
+                                {title: '步骤', field: 'stepName', visible: true, align: 'center', valign: 'middle', width: "10%", 'class': 'uitd_showTip',
+                                    formatter: function (value, row, index) {
+                                        return "" + value;
+                                    }
+                                },
+                                {title: '审核状态', field: 'stateName', visible: true, align: 'center', valign: 'middle', width: "10%", 'class': 'uitd_showTip'},
+                                {title: '状态变更', field: 'stateChange', visible: true, align: 'center', valign: 'middle', width: "20%", 'class': 'uitd_showTip'},
+                                {title: '审核意见/备注', field: 'description', visible: true, align: 'center', valign: 'middle', width: "30%", 'class': 'uitd_showTip',
+                                    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%", 'class': 'uitd_showTip'},
+                                {title: '操作时间', field: 'createTime', visible: true, align: 'center', valign: 'middle', width: "15%", 'class': 'uitd_showTip'},
+                            ]
                     ,
                     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');
                         });
@@ -519,7 +532,7 @@ var Feng = {
             }
         });
     },
-    pdfReader:function(url,filename){
+    pdfReader: function (url, filename) {
         filename = typeof filename == "undefined" ? "临时文件" : filename;
         var index = layer.open({
             type: 2,
@@ -531,17 +544,17 @@ var Feng = {
         });
         return index;
     },
-    showPdf : function(url,id,title){
-        if(Feng.isEmptyStr(id)){
+    showPdf: function (url, id, title) {
+        if (Feng.isEmptyStr(id)) {
             id = "id";
         }
-        if(Feng.isEmptyStr(title)){
+        if (Feng.isEmptyStr(title)) {
             title = "预览";
         }
         let origin = window.location.origin;
         //let full_url = "https://fileview.jinjianghc.com/onlinePreview?url=" + encodeURIComponent(Base64.encode(url));
         var index = layer.open({
-            id:id,
+            id: id,
             type: 2,
             shade: 0,
             title: title,
@@ -552,18 +565,18 @@ var Feng = {
         });
         // layer.full(index);
     },
-    showExcel:function(url,id,title){
+    showExcel: function (url, id, title) {
         window.location.href = url;
     },
-    showFile:function(url,id,title){
-        if(Feng.isEmptyStr(id)){
+    showFile: function (url, id, title) {
+        if (Feng.isEmptyStr(id)) {
             id = "id";
         }
-        if(Feng.isEmptyStr(title)){
+        if (Feng.isEmptyStr(title)) {
             title = "预览";
         }
         var index = layer.open({
-            id:id,
+            id: id,
             type: 2,
             shade: 0,
             title: title,
@@ -573,103 +586,103 @@ var Feng = {
             content: url,
         });
     },
-    isEmptyStr:function(str) {
-        if(str == null || str == ''){
+    isEmptyStr: function (str) {
+        if (str == null || str == '') {
             return true;
-        }else{
+        } else {
             return false;
         }
     },
-    isNotEmptyStr:function (str) {
-        if(str!=null && str != ''){
+    isNotEmptyStr: function (str) {
+        if (str != null && str != '') {
             return true;
-        }else{
+        } else {
             return false;
         }
     },
-    checkAll:function (id) {
-        $("#"+id+" input").each(function () {
+    checkAll: function (id) {
+        $("#" + id + " input").each(function () {
             this.checked = true;
         })
     },
-    unCheckAll :function(id) {
-        $("#"+id+" input").each(function () {
-            if(this.checked){
+    unCheckAll: function (id) {
+        $("#" + id + " input").each(function () {
+            if (this.checked) {
                 this.checked = false;
-            }else{
+            } else {
                 this.checked = true;
             }
         })
     },
-    showMiniFileModal:function (project,type,id,source,talent_condition,checkState) {
+    showMiniFileModal: function (project, type, id, source, talent_condition, checkState) {
         layer.open({
             type: 2,
             title: "附件",
             shade: 0,
-            resize:true,
-            maxmin:true,
+            resize: true,
+            maxmin: true,
             // moveOut:true,
-            id:"file",
+            id: "file",
             area: ['800px', '500px'],
             offset: 'rb', //右下角弹出content:
             shift: 2,
-            content: Feng.ctxPath +  "/common/api/gotoFileShow",
+            content: Feng.ctxPath + "/common/api/gotoFileShow",
             zIndex: layer.zIndex,
-            success:function (layero,index) {
+            success: function (layero, index) {
                 layer.setTop(layero);
                 //按钮【按钮一】的回调
                 var iframeWin = window[layero.find('iframe')[0]['name']];
-                iframeWin.getFile(project,type,id,source,talent_condition,checkState);
+                iframeWin.getFile(project, type, id, source, talent_condition, checkState);
             }
         });
     },
-    getCheckBoxValues:function (str) {              //获取checkbox值
+    getCheckBoxValues: function (str) {              //获取checkbox值
         var val = "";
-        $("#"+str+" input[name='"+str+"']").each(function () {
+        $("#" + str + " input[name='" + str + "']").each(function () {
             if (this.checked) {
                 val = val + $(this).val() + ",";
             }
         });
-        return val.substring(0,val.length-1);
+        return val.substring(0, val.length - 1);
     },
-    initDate:function () {
+    initDate: function () {
         $(".date").removeAttr('lay-key');
-        $(".date").each(function(){
+        $(".date").each(function () {
             laydate.render({
                 elem: this
-                ,type: 'date'
-                ,trigger: 'click'
+                , type: 'date'
+                , trigger: 'click'
             });
         });
     },
-    downloadFile:function (id,type) {
-        window.location.href = Feng.ctxPath + "/common/api/downloadFile?id=" + id + "&type="+type;
+    downloadFile: function (id, type) {
+        window.location.href = Feng.ctxPath + "/common/api/downloadFile?id=" + id + "&type=" + type;
     },
-    bankChange:function (val,target){
-        var bank = $("#"+val).val();
-        if($.trim(bank)=='中国工商银行'){
-            $("#"+target).val('102391050013');
-        }else {
-            $("#"+target).val('');
+    bankChange: function (val, target) {
+        var bank = $("#" + val).val();
+        if ($.trim(bank) == '中国工商银行') {
+            $("#" + target).val('102391050013');
+        } else {
+            $("#" + target).val('');
         }
     },
-    chkFileInvalid:function(file,maxImageSize,maxFileSize,fileType,msg){
+    chkFileInvalid: function (file, maxImageSize, maxFileSize, fileType, msg) {
         var size = 0;
-        if(typeof fileType != "undefined" && fileType != null){
-            if(fileType.indexOf(file.type)<0){
-                msg = typeof msg !="undefined"?msg:"不支持的文件类型";
+        if (typeof fileType != "undefined" && fileType != null) {
+            if (fileType.indexOf(file.type) < 0) {
+                msg = typeof msg != "undefined" ? msg : "不支持的文件类型";
                 Feng.error(msg)
                 return false;
             }
         }
-        switch(file.type){
+        switch (file.type) {
             case "image/jpeg":
             case "image/gif":
             case "image/png":
             case "image/jpg":
                 size = maxImageSize * 1024 * 1024;//图片限制最大5M
-                if(file.size > size){
-                    Feng.error("图片大小不能超过"+maxImageSize+"MB!");
+                if (file.size > size) {
+                    Feng.error("图片大小不能超过" + maxImageSize + "MB!");
                     return false;
                 }
                 break;
@@ -682,8 +695,8 @@ var Feng = {
             case "application/x-rar-compressed":
             case "application/x-7z-compressed":
                 size = maxFileSize * 1024 * 1024;//其它允许文件类型限制最大均为10M
-                if(file.size > size){
-                    Feng.error("文件大小不能超过"+maxFileSize+"MB!");
+                if (file.size > size) {
+                    Feng.error("文件大小不能超过" + maxFileSize + "MB!");
                     return false;
                 }
                 break;
@@ -693,9 +706,9 @@ var Feng = {
         }
         return true;
     },
-    isImg:function(type){        
+    isImg: function (type) {
         var imgtypes = ["image/jpeg", "image/gif", "image/png", "image/jpg"];
-        if(imgtypes.indexOf(type) > -1){
+        if (imgtypes.indexOf(type) > -1) {
             return true;
         }
         return false;

public/static/modular/talentAllowance/talentAllowanceInfo_info.js

@@ -860,6 +860,10 @@ $(function () {
     if ($("#type").val() == 2) {
         $("#bankNumberSpan,#talentTypeSpan,#introductionModeSpan,#firstInJJTimeSpan").attr("style", "display:none");
     }
+    /*if ($("#type").val() == 6 && $("#process").val() == 1) {
+     $(":input").prop("disabled", false);
+     $(":input").prop("readonly", false);
+     }*/
     $("select").each(function () {
         +
                 $(this).val($(this).attr("value"));

public/static/modular/talentAllowance/talentAllowanceInfo_info_supple.js

@@ -43,11 +43,9 @@ TalentAllowanceInfoDlg.initContractColumns = function () {
             {title: '操作', field: 'id', visible: true, align: 'center', valign: 'middle', width: "150px",
                 formatter: function (value, row, index) {
                     var html = "";
-                    if (process == 1 && companyCode == CONFIG.COM_RSJ) {
-                        html = html + "<button type='button' onclick='TalentAllowanceInfoDlg.showEditContractModel(\"" + value + "\")' style='margin-right: 10px' class='btn btn-xs btn-info'>" +
-                                "<i class=\"fa fa-edit\"></i>修改" +
-                                "</button>";
-                    }
+                    html = html + "<button type='button' onclick='Feng.showContract(" + $("#talentId").val() + ")' style='margin-right: 10px' class='btn btn-xs btn-info'>" +
+                            "<i class=\"fa fa-edit\"></i>查看" +
+                            "</button>";
                     html = html + "<button type='button' onclick='TalentAllowanceInfoDlg.showLog(\"" + value + "\")' style='margin-right: 10px' class='btn btn-xs btn-success'>" +
                             "<i class=\"fa fa-book\"></i>日志" +
                             "</button>";
@@ -66,11 +64,9 @@ TalentAllowanceInfoDlg.initContractColumns = function () {
             {title: '操作', field: 'id', visible: true, align: 'center', valign: 'middle', width: "150px",
                 formatter: function (value, row, index) {
                     var html = "";
-                    if (process == 1) {
-                        html = html + "<button type='button' onclick='TalentAllowanceInfoDlg.showEditContractModel(\"" + value + "\")' style='margin-right: 10px' class='btn btn-xs btn-info'>" +
-                                "<i class=\"fa fa-edit\"></i>修改" +
-                                "</button>";
-                    }
+                    html = html + "<button type='button' onclick='Feng.showContract(" + $("#talentId").val() + ")' style='margin-right: 10px' class='btn btn-xs btn-info'>" +
+                            "<i class=\"fa fa-edit\"></i>查看" +
+                            "</button>";
                     html = html + "<button type='button' onclick='TalentAllowanceInfoDlg.showLog(\"" + value + "\")' style='margin-right: 10px' class='btn btn-xs btn-success'>" +
                             "<i class=\"fa fa-book\"></i>日志" +
                             "</button>";
@@ -130,6 +126,11 @@ TalentAllowanceInfoDlg.initProjectColumns = function (enterpriseId) {
                                     "</button>";
                         }
                     }
+                    if ($("#type").val() == 6 && $("#process").val() == 1) {
+                        html = html + "<button type='button' data-value='" + row.description + "' onclick=\"TalentAllowanceInfoDlg.showEditProjectModal('" + row.project + "','" + row.id + "','" + enterpriseId + "','" + row.months + "','" + row.days + "',this)\" style='margin-left: 5px;'  class=\"btn btn-xs btn-danger\">" +
+                                "<i class=\"fa fa-edit\"></i>修改" +
+                                "</button>";
+                    }
                     if ((companyCode == CONFIG.COM_SWJ || companyCode == CONFIG.COM_RSJ) && value == 2) {
                         html = html + "<button type='button' data-value='" + row.description + "' onclick=\"TalentAllowanceInfoDlg.showEditProjectModal('" + row.project + "','" + row.id + "','" + enterpriseId + "','" + row.months + "','" + row.days + "',this)\" style='margin-left: 5px;'  class=\"btn btn-xs btn-danger\">" +
                                 "<i class=\"fa fa-edit\"></i>修改" +
@@ -207,7 +208,8 @@ TalentAllowanceInfoDlg.showFileTable = function (project) {
  * 初始化附件类别表的列
  */
 TalentAllowanceInfoDlg.initFileTypeColumn = function () {
-    return [
+    var title = [];
+    title = [
         {field: 'selectItem', checkbox: false, visible: false},
         {title: '名称', field: 'name', visible: true, align: 'center', valign: 'middle', width: "52%", 'class': 'uitd_showTip',
             formatter: function (value, row, index) {
@@ -231,7 +233,62 @@ TalentAllowanceInfoDlg.initFileTypeColumn = function () {
         },
         {title: '备注', field: 'description', visible: true, align: 'center', valign: 'middle', width: "40%", 'class': 'uitd_showTip'},
     ]
+    if ($("#type").val() == 6 && $("#process").val() == 1) {
+        title.push({title: '操作', field: 'id', visible: true, align: 'center', valign: 'middle', width: "10%",
+            formatter: function (value, row, index) {
+                var files = $("#files").val();
+                var checkState = $("#checkState").val();
+                var type = $("#type").val();
+                return "<button type='button' onclick=\"TalentAllowanceInfoDlg.checkFile(this,'" + value + "','" + null + "')\" style='margin-right: 10px' class=\"btn btn-xs btn-info\">" +
+                        "<i class=\"fa fa-upload\"></i>添加" +
+                        "</button>";
+            }
+        })
+    }
+    return title;
 };
+//选择附件并显示附件名
+TalentAllowanceInfoDlg.checkFile = function (content, fileTypeId, fileId) {
+    $("#upload_file ").unbind("change");
+    $("#upload_file ").change(function () {
+        TalentAllowanceInfoDlg.upload(fileTypeId, fileId);
+    });
+    $('#upload_file').val("");
+    $('#upload_file').click()
+}
+//上传附件
+TalentAllowanceInfoDlg.upload = function (fileTypeId, fileId) {
+    var id = $("#id").val();
+    if (fileId != null && fileId != 'null') {
+        $("#fileId").val(fileId)
+    } else {
+        $("#fileId").val("");
+    }
+    $("#mainId").val(id);
+    $("#fileTypeId").val(fileTypeId);
+    var index = layer.load(0, {shade: false, time: 0});
+    $("#index").val(index);
+    $("#uploadForm").submit();
+}
+//删除附件
+TalentAllowanceInfoDlg.deleteFile = function (id) {
+    var operation = function () {
+        var ajax = new $ax(Feng.ctxPath + "/common/api/deleteFile", function (data) {
+            if (data.code = 200) {
+                Feng.success(data.msg);
+                $("#fileTable").bootstrapTable("refresh", {});
+            } else {
+                Feng.error(data.msg);
+            }
+        }, function (data) {
+            Feng.error("删除失败!" + data.responseJSON.message + "!");
+        });
+        ajax.set("id", id);
+        ajax.set("type", CONFIG.project_jbt);
+        ajax.start();
+    }
+    Feng.confirm("删除后无法恢复，确认删除吗?", operation);
+}
 
 TalentAllowanceInfoDlg.initArrangeColumn = function () {
     return [
@@ -351,7 +408,7 @@ TalentAllowanceInfoDlg.initFileTable = function () {
                 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><li style="width: 10%;font-weight: bold;padding-top: 5px;">操作</li>';
+                var html = '<ul class="imgs"><li style="width: 70%;font-weight: bold;padding-top: 5px;">附件原名</li><li style="width: 10%;font-weight: bold;padding-top: 5px;">预览</li><li style="width: 20%;font-weight: bold;padding-top: 5px;">操作</li>';
                 for (var key in data) {
                     var sn = data[key].url.lastIndexOf(".");
                     var suffix = data[key].url.substring(sn + 1, data[key].url.length);
@@ -364,9 +421,15 @@ TalentAllowanceInfoDlg.initFileTable = function () {
                         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: 70%;padding-top: 5px;">' + data[key].orignName + '</li>\n' +
                             '<li style="width: 10%;">' + imgStr + '</li>\n' +
-                            "<li style='width: 10%;padding-top: 2px;'><button type='button' onclick=\"Feng.downloadFile('" + data[key].id + "',1)\" class=\"btn btn-xs btn-success\"><i class=\"fa fa-download\" aria-hidden=\"true\"></i>下载</button></li>";
+                            "<li style='width: 20%;padding-top: 2px;'>\n" + ($("#type").val() == 6 && $("#process").val() == 1 ? "<button type=\'button\' onclick=\"TalentAllowanceInfoDlg.checkFile(this,'" + row.id + "','" + data[key].id + "')\" style=\'margin-left: 5px\' class=\"btn btn-xs btn-success\">" +
+                                    "<i class=\"fa fa-paste\"></i>修改" +
+                                    "</button>" +
+                                    "<button type='button' onclick=\"TalentAllowanceInfoDlg.deleteFile('" + data[key].id + "','" + row.fState + "')\" style=\'margin-left: 5px\' class=\"btn btn-xs btn-danger\">" +
+                                    "<i class=\"fa fa-times\"></i>删除" +
+                                    "</button>" : "") +
+                            "<button type='button' onclick=\"Feng.downloadFile('" + data[key].id + "',1)\" style=\'margin-left: 5px\' class=\"btn btn-xs btn-success\"><i class=\"fa fa-download\" aria-hidden=\"true\"></i>下载</button></li>";
                 }
                 html = html + '</ul>';
                 $detail.html(html);