minitiger 8 anos atrás
pai
commit
073988b5c7

+ 1 - 1
VisualInspection/css/main.css

@@ -10,7 +10,7 @@ footer p {
 .mum_left {
 .mum_left {
     background: #366ca5;
     background: #366ca5;
     padding-top: 15px;
     padding-top: 15px;
-    /* margin-top: 1px; */
+     margin-top: 1px; 
 }
 }
 
 
 .mum_right {
 .mum_right {

+ 1 - 0
VisualInspection/js/mytask/checked.js

@@ -10,6 +10,7 @@ function queryCheckedTask(){
         "checked_dept": $("#fsList").val(),
         "checked_dept": $("#fsList").val(),
         "checked_person":$("#feePersonList").val(),
         "checked_person":$("#feePersonList").val(),
         // "status_search_type":1,
         // "status_search_type":1,
+        "hasScore":$("#hasScoreList").val(),
         "check_status_arr":[4,5,6],
         "check_status_arr":[4,5,6],
         "position_id":$("#jobSelect").val()
         "position_id":$("#jobSelect").val()
     }
     }

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

@@ -41,8 +41,8 @@
                         </div>
                         </div>
                     </div>
                     </div>
                     <div id="appealResultDiv" class="form-group col-sm-3" style="display:none;">
                     <div id="appealResultDiv" class="form-group col-sm-3" style="display:none;">
-                        <label for="exampleInputAccount1" class="col-sm-5">申诉结果</label>
-                        <div class="col-sm-4">
+                        <label for="exampleInputAccount1" class="col-sm-4">申诉结果</label>
+                        <div class="col-sm-8">
                             <select class="form-control" id="appealResultSelect">
                             <select class="form-control" id="appealResultSelect">
                                 <option value="">全部</option>
                                 <option value="">全部</option>
                                 <option value="1">成功</option>
                                 <option value="1">成功</option>

+ 11 - 10
VisualInspection/view/mytask/checked.html

@@ -26,16 +26,7 @@
                         </select>
                         </select>
                     </div>
                     </div>
                 </div>
                 </div>
-                <div id="hasScoreDiv" style="display:none;" class="form-group col-sm-2">
-                    <label for="exampleInputAccount1" class="col-sm-5">扣分</label>
-                    <div class="col-sm-7">
-                        <select class="form-control" id="hasScoreList">
-                            <option value="" selected>全部</option>
-                            <option value="1">有</option>
-                            <option value="2">无</option>    
-                        </select>
-                    </div>
-                </div>
+                
                 <div class="col-sm-2">
                 <div class="col-sm-2">
                     <button class="btn btn-primary " type="button" onclick="queryCheckedTask()">查询</button>
                     <button class="btn btn-primary " type="button" onclick="queryCheckedTask()">查询</button>
                 </div>
                 </div>
@@ -48,6 +39,16 @@
                         </select>
                         </select>
                     </div>
                     </div>
                 </div>
                 </div>
+                <div id="hasScoreDiv" class="form-group col-sm-3">
+                    <label for="exampleInputAccount1" class="col-sm-4">扣分</label>
+                    <div class="col-sm-8">
+                        <select class="form-control" id="hasScoreList">
+                            <option value="" selected>全部</option>
+                            <option value="1">有</option>
+                            <option value="2">无</option>    
+                        </select>
+                    </div>
+                </div>
             </div>
             </div>
         </form>
         </form>
     </div>
     </div>