minitiger %!s(int64=8) %!d(string=hai) anos
pai
achega
0fbdbe71c3

+ 16 - 3
VisualInspection/js/mytask/check.js

@@ -76,6 +76,19 @@ function initCheckAppealBtns(){
         $("#appeal_time").html($.checkTask.appeal.appeal_time);
         $("#appeal_reason").html($.checkTask.appeal.appeal_reason);
         $("#appeal_file_list").html(genAppeaFiles($.checkTask.appeal.file_src));
+
+        layer.open({
+            type: 1,
+            title: "申诉详情",
+            closeBtn: 1,
+            shade: false,
+            shadeClose: true,
+            offset:'rb',
+            content: $('#appeal_div'), //捕获的元素,注意:最好该指定的元素要存放在body最外层,否则可能被其它的相对元素所影响
+            yes: function(index){
+                layer.close(index);
+            }
+        });
     }else{
         $("#appeal_div").hide();
         $("#btn_appeal_task").hide();
@@ -231,7 +244,7 @@ function showChangeUser() {
     };
    
     post_common_service("/user/getUserList/", param, function (data) {
-        changePersonLayer = showPopup4Common('更改人员', null, ['500px','500px'],null,'r');
+        changePersonLayer = showPopup4Common('更改人员', null, ['550px','600px'],null,'r');
         $("#user_container").empty();
         var userStr = "";
         for (var i in data) {
@@ -239,9 +252,9 @@ function showChangeUser() {
             if (data[i].workno) name = name+" "+data[i].workno.substr(data[i].workno.length-3);
             var pic = "../../images/body-bg.png";
             if (data[i].pic) pic = base_image_server_url+data[i].pic;
-            str = '<div style="width:100px;float:left;margin:5px;">'
+            str = '<div style="width:90px;float:left;margin:5px;">'
                 + '<a class="card" href="javascript:void(0)" onclick="changePerson(\'' + data[i].id + '\')">'
-                + '<img src="' + pic + '" alt="" style="height:100px;width:100px;">'
+                + '<img src="' + pic + '" alt="" style="height:100px;width:90px;">'
                 + '<div class="card-heading"><strong>' + name + '</strong></div>'
                 + '</a>'
                 + '</div>';

+ 1 - 1
VisualInspection/view/appeal_management/appeal_list.html

@@ -11,7 +11,7 @@
                     <div class="col-sm-2">
                         <input type="text" id="end_time" class="form-control form-date" placeholder="截止时间">
                     </div>
-                    <label for="exampleInputAccount1" class="col-sm-1">稽查部门</label>
+                    <label for="exampleInputAccount1" class="col-sm-1">考核部门</label>
                     <div class="col-sm-2">
                         <select class="form-control" id="fsList">
                             <option value="">全部</option>

+ 1 - 1
VisualInspection/view/mytask/changePerson.html

@@ -1,5 +1,5 @@
 <div class="container-fluid ">
-        <div class="cards" id="user_container" style="height:400px;overflow:auto;">
+        <div class="cards" id="user_container" style="overflow:auto;">
              <div style="width:200px;">
                 <a class="card" href="###">
                     <img src="../../image/img4.jpg" alt="">

+ 16 - 16
VisualInspection/view/mytask/check.html

@@ -77,22 +77,7 @@
             <div id="score_datatable" style="height:350px;" data-checkable="true" data-sortable="true"></div>
             <div class="row">
                 <div id="dashboard" class="dashboard dashboard-draggable" data-height="300">
-                    <div class="row" id="appeal_div" style="padding:10px;">
-                        <h3>申诉基本信息</h3>
-                        <div>
-                            <table style="width:100%;">
-                                <tr>
-                                    <td width="20%">申诉时间:<label id="appeal_time"></label></td>
-                                    <td width="20%">申诉原因:<label id="appeal_reason"></label></td>
-                                </tr>
-                                <tr>
-                                    <td width="20%">附件:
-                                        <div class="file-list" id="appeal_file_list"></div>
-                                    </td>
-                                </tr>
-                            </table>
-                        </div>
-                    </div>
+                    
                     <div class="row" class="col-sm-11" style="margin:5px;">
                         <button class="btn btn-primary" type="button" onclick="clearAllImg()" style="margin-right:10px;">清空</button>
                         <button class="btn btn-danger" type="button" onclick="showScore()" style="margin-right:10px;">评分</button>
@@ -133,6 +118,21 @@
         </div>
     </div>
 </div>
+<div id="appeal_div" style="padding:10px;display:none;">
+    <div>
+        <table style="width:100%;">
+            <tr>
+                <td width="50%">申诉时间:<label id="appeal_time"></label></td>
+                <td width="50%">申诉原因:<label id="appeal_reason"></label></td>
+            </tr>
+            <tr>
+                <td width="50%" colspan="2">附件:
+                    <div class="file-list" id="appeal_file_list"></div>
+                </td>
+            </tr>
+        </table>
+    </div>
+</div>
 <div id="form-div" style="display:none;text-align:center;">
     <link rel="import" href="/view/mytask/changePerson.html?__inline">
 </div>