Ver Fonte

修改收费站车道排班不能保存的问题

minitiger há 9 anos atrás
pai
commit
9382df1acf

+ 4 - 4
VisualInspection/js/config.js

@@ -1,6 +1,6 @@
-// var base_ui_url = "http://192.168.68.126:8081/";
-// var base_server_url = "http://192.168.68.126:8089/";
+var base_ui_url = "http://192.168.68.126:8081/";
+var base_server_url = "http://192.168.68.126:8089/";
 var base_image_server_url = "http://192.168.68.126:8080/";
 
-var base_ui_url = "http://localhost:8080/";
-var base_server_url = "http://localhost:8089/";
+// var base_ui_url = "http://localhost:8081/";
+// var base_server_url = "http://localhost:8089/";

+ 12 - 7
VisualInspection/js/teamClass/charge_team_schedule.js

@@ -1,6 +1,11 @@
   
-   $(document).ready(function() {
+//    $(document).ready(function() {
 
+//         initChargeTeamSchedule()
+
+//    })
+
+   function initChargeTeamSchedule(){
          $("#main_content_title").html("收费人员排班")
 
         // 用户的dept_id
@@ -159,9 +164,11 @@
             for(var j=1;j<4;j++){
                 var cache = $(".tr-"+j).data("cache");
 
-                for(var i=0;i<lans;i++){
-                    var obj = { "work_date":work_date,"dept_id":cache.dept_id,"user_id": $(".tr-"+j+" td select").eq(i).val() , "class_type":j,"team_id":cache.team_id,"start_time":work_date, "end_time":work_date,"lane":i+1 };
-                    dutyList.push(obj);
+                if(cache) {
+                    for(var i=0;i<lans;i++){
+                        var obj = { "work_date":work_date,"dept_id":cache.dept_id,"user_id": $(".tr-"+j+" td select").eq(i).val() , "class_type":j,"team_id":cache.team_id,"start_time":work_date, "end_time":work_date,"lane":i+1 };
+                        dutyList.push(obj);
+                    }
                 }
 
             }
@@ -394,9 +401,7 @@
                 }
             },function(error){})
         }
-
-   })
-
+   }
    // 根据class_type 获取班次名称
    function getTeamName(class_type){
        if(class_type == 1){

+ 18 - 0
VisualInspection/view/appeal_management/appealDetail.html

@@ -0,0 +1,18 @@
+<div class="container-fluid ">
+    <form class="form-horizontal" style="margin-top:10px;">
+        <input type="hidden" class="form-control" id="apply_id" disabled="disabled" placeholder="">
+       
+        <div class="form-group">
+            <label class="col-md-4 col-sm-2">申诉原因</label>
+            <div class="col-md-6 col-sm-10">
+                <input type="text" class="form-control" id="appeal_reason" placeholder="">
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-md-4 col-sm-2">申诉附件</label>
+            <div class="col-md-6 col-sm-10">
+                <input type="text" class="form-control" id="appeal_file" placeholder="">
+            </div>
+        </div>
+    </form>
+</div>

+ 23 - 0
VisualInspection/view/appeal_management/appealEdit.html

@@ -0,0 +1,23 @@
+<div class="container-fluid ">
+    <form class="form-horizontal" style="margin-top:10px;">
+        <input type="hidden" class="form-control" id="appeal_id" disabled="disabled" placeholder="">
+        <div class="form-group">
+            <label for="exampleInputAccount1" class="col-md-4 col-sm-2">申诉人</label>
+            <div class="col-md-6 col-sm-10">
+                <input type="text" class="form-control" id="appeal_man" disabled="disabled" placeholder="">
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-md-4 col-sm-2">申诉原因</label>
+            <div class="col-md-6 col-sm-10">
+                <input type="text" class="form-control" id="appeal_reason" placeholder="">
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-md-4 col-sm-2">申诉附件</label>
+            <div class="col-md-6 col-sm-10">
+                <input type="text" class="form-control" id="appeal_file" placeholder="">
+            </div>
+        </div>
+    </form>
+</div>

+ 1 - 0
VisualInspection/view/common/commoncsslink.html

@@ -6,3 +6,4 @@
 <link rel="stylesheet" type="text/css" href="/css/common/foot.css">
 <link rel="stylesheet" type="text/css" href="/js/lib/kkpager_green.css">
 <link rel="stylesheet" type="text/css" href="/js/lib/slide/rangeslider.css">
+<link rel="stylesheet" type="text/css" href="/node_modules/zui/dist/lib/calendar/zui.calendar.css">  

+ 1 - 0
VisualInspection/view/common/commonscriptlink.html

@@ -4,6 +4,7 @@
 <script src="/node_modules/zui/dist/js/zui.min.js"></script>
 <script src="/node_modules/zui/dist/lib/datetimepicker/datetimepicker.min.js"></script>
 <script src="/node_modules/zui/dist/lib/datatable/zui.datatable.min.js"></script>
+<script src="/node_modules/zui/dist/lib/calendar/zui.calendar.js"></script>
 <!--<script src="/node_modules/zui/dist/lib/mytable/mytable.js"></script>  -->
 <script src="/js/lib/mytable.js"></script>
 <script src="/node_modules/moment/min/moment.min.js"></script>

+ 2 - 1
VisualInspection/view/main.html

@@ -8,7 +8,8 @@
     <link rel="stylesheet" type="text/css" href="/css/main.css">
     <link rel="import" href="/view/common/commonscriptlink.html?__inline">
     <script src="/js/mytask/unchecked.js"></script>
-    <script src="/js/mytask/check.js"></script>
+    <script src="/js/mytask/check.js"></script>   
+    <script src="/js/teamClass/charge_team_schedule.js"></script>
     <!--<link rel="stylesheet" type="text/css" href="/css/user/userManager.css?__inline">
 <script type="text/javascript" src="/node_modules/zui/dist/lib/dashboard/zui.dashboard.min.js?__inline"></script>
 <link rel="stylesheet" type="text/css" href="/node_modules/zui/dist/lib/dashboard/zui.dashboard.min.css">

+ 10 - 0
VisualInspection/view/mytask/taskDetail.html

@@ -30,6 +30,9 @@
         <div class="btn-group">
             <button type="button" class="btn btn-warning" onclick="submitCheck()">提交</button>
         </div>
+        <div class="btn-group">
+            <button type="button" class="btn btn-warning" onclick="showAppeal()">申诉</button>
+        </div>
     </div>
 </div>
 <div id="form-div" style="display:none;text-align:center;height:300px;padding:5px;">
@@ -38,6 +41,9 @@
         </div>
     </div> 
 </div>
+<div id="appealDetail-div" style="display:none;text-align:center;">
+    <link rel="import" href="/view/appeal_management/appealDetail.html?__inline">   
+</div> 
 <style>
     .line{
         text-align:center;font-size:20px;height:10px;margin:15px 0px;width:100%;background:#516784;overflow:hidden;
@@ -183,4 +189,8 @@
         });
         
     }
+
+    function showAppeal(){
+        appealLayer = showPopup4Common('申诉',null,'600px','#appealDetail-div');
+    }
     </script>

+ 7 - 2
VisualInspection/view/term_management/charge_stuff_schedule.html

@@ -116,9 +116,9 @@
 
 
 
-<link rel="stylesheet" type="text/css" href="/node_modules/zui/dist/lib/calendar/zui.calendar.css">   
+<!--<link rel="stylesheet" type="text/css" href="/node_modules/zui/dist/lib/calendar/zui.calendar.css">   
 <script src="/node_modules/zui/dist/lib/calendar/zui.calendar.js"></script>
-<script src="/js/teamClass/charge_team_schedule.js"></script>
+<script src="/js/teamClass/charge_team_schedule.js"></script>-->
 
 <style type="text/css" >
     span.time{
@@ -128,3 +128,8 @@
         text-align: center ;
     }
 </style>
+<script>
+    $(document).ready(function() {
+        initChargeTeamSchedule();
+   })
+</script>

+ 1 - 0
VisualInspection/view/term_management/check_stuff_schedule.html

@@ -82,3 +82,4 @@
         text-align: center ;
     }
 </style>
+