bugfix

VisualInspection/js/util/util.js

@@ -572,7 +572,7 @@ function roleContains(role) {
 
 function setCheckmanSelect(div, selectId, notHaveUserId, callback) {
     post_common_service("/user/getAllCheckman", null, function(data) {
-        console.error(data)
+        // console.error(data)
         var optStr = '';
         for (var i in data) {
             if (data[i].id == notHaveUserId) continue;

VisualInspection/qzd/view/task/addtask.html

@@ -1,232 +1,232 @@
 <div>
-<form class="form-horizontal" style="margin-top:10px;">
+    <form class="form-horizontal" style="margin-top:10px;">
         <div class="form-group" style="margin:0px;width: 100%">
-                <div class="form-group col-xs-4">
-                    <label for="exampleInputAccount1" class="col-xs-4" style="text-align: left;padding-right:0">时间:</label>
-                    <div class="col-xs-8">
-                            <select class="form-control" id="fsList">
+            <div class="form-group col-xs-4">
+                <label for="exampleInputAccount1" class="col-xs-4" style="text-align: left;padding-right:0">时间:</label>
+                <div class="col-xs-8">
+                    <select class="form-control" id="fsList">
                                 <option>白天</option>
                                 <option>夜间</option>
                             </select>
-                        </div>
-                    </div>
-                    <div class="form-group col-xs-4">
-                    <label for="exampleInputAccount1" class="col-xs-4" style="text-align: left;padding-right:0">天气:</label>
-                    <div class="col-xs-8">
-                            <select class="form-control" id="fsList">
+                </div>
+            </div>
+            <div class="form-group col-xs-4">
+                <label for="exampleInputAccount1" class="col-xs-4" style="text-align: left;padding-right:0">天气:</label>
+                <div class="col-xs-8">
+                    <select class="form-control" id="fsList">
                                 <option>晴天</option>
                                 <option>恶劣天气</option>
                             </select>
-                        </div>
-                    </div>
-                    <div class="form-group col-xs-4">
-                        <label for="exampleInputAccount1" class="col-xs-4" style="text-align: left;padding-right:0">里程数:</label>
-                        <div class="col-xs-8">
-                                <input type="text" id="km" class="form-control form-date" placeholder="公里" onchange="changestatus()">
-                            </div>
-                    </div>
                 </div>
-        </div>  
-        <div class="form-group" style="margin:0px;vertical-align: middle">
-            <div class="form-group col-xs-5">
-                <label for="exampleInputAccount1" class="col-xs-4" style="text-align: left;padding:0">清障情况：</label>
+            </div>
+            <div class="form-group col-xs-4">
+                <label for="exampleInputAccount1" class="col-xs-4" style="text-align: left;padding-right:0">里程数:</label>
                 <div class="col-xs-8">
-                        <select class="form-control" id="type">
+                    <input type="text" id="km" class="form-control form-date" placeholder="公里" onchange="changestatus()">
+                </div>
+            </div>
+        </div>
+</div>
+<div class="form-group" style="margin:0px;vertical-align: middle">
+    <div class="form-group col-xs-5">
+        <label for="exampleInputAccount1" class="col-xs-4" style="text-align: left;padding:0">清障情况：</label>
+        <div class="col-xs-8">
+            <select class="form-control" id="type">
                             <option value="1">抛锚</option>
                             <option value="2">事故</option>
                         </select>
-                    </div>
-            </div>
-            <div class="form-group col-xs-7">
-                <label for="exampleInputAccount1" class="col-xs-4">车牌号：</label>
-                <div class="col-xs-8">
-                        <input type="text" id="carinfo" class="form-control form-date" placeholder="">
-                    </div>
-            </div>
-        </div>  
-        <div class="form-group">
-                <div class="form-group col-xs-5">
-                    <label for="exampleInputAccount1" class="col-xs-4" style="text-align: left;padding: 0px">接警时间：</label>
-                    <div class="col-xs-8">
-                        <input type="text" style="width:100%;" id="received_time" class="form-control">
-                        </div>
-                </div>
-                <div class="form-group col-xs-7">
-                    <label for="exampleInputAccount1" class="col-xs-4">客户信息：</label>
-                    <div class="col-xs-8">
-                            <input type="text" id="carUserinfo" class="form-control form-date" placeholder="">
-                        </div>
-                </div>
-            </div> 
-            <div class="form-group" style="margin:0px;">
-                    <div class="form-group col-xs-5">
-                        <label for="exampleInputAccount1" class="col-xs-4" style="text-align: left;padding-right:0">清障队：</label>
-                        <div class="col-xs-8">
-                                <select class="form-control" id="dept" onchange="setRecordUser()">
+        </div>
+    </div>
+    <div class="form-group col-xs-7">
+        <label for="exampleInputAccount1" class="col-xs-4">车牌号：</label>
+        <div class="col-xs-8">
+            <input type="text" id="carinfo" class="form-control form-date" placeholder="">
+        </div>
+    </div>
+</div>
+<div class="form-group">
+    <div class="form-group col-xs-5">
+        <label for="exampleInputAccount1" class="col-xs-4" style="text-align: left;padding: 0px">接警时间：</label>
+        <div class="col-xs-8">
+            <input type="text" style="width:100%;" id="received_time" class="form-control">
+        </div>
+    </div>
+    <div class="form-group col-xs-7">
+        <label for="exampleInputAccount1" class="col-xs-4">客户信息：</label>
+        <div class="col-xs-8">
+            <input type="text" id="carUserinfo" class="form-control form-date" placeholder="">
+        </div>
+    </div>
+</div>
+<div class="form-group" style="margin:0px;">
+    <div class="form-group col-xs-5">
+        <label for="exampleInputAccount1" class="col-xs-4" style="text-align: left;padding-right:0">清障队：</label>
+        <div class="col-xs-8">
+            <select class="form-control" id="dept" onchange="setRecordUser()">
                                 </select>
-                            </div>
-                    </div>
-                    <div class="form-group col-xs-7">
-                            <label for="" class="col-xs-4">是否满意：</label>
-                            <div class="col-xs-6">
-                                    <select class="form-control" id="carUserSatisfaction">
+        </div>
+    </div>
+    <div class="form-group col-xs-7">
+        <label for="" class="col-xs-4">是否满意：</label>
+        <div class="col-xs-6">
+            <select class="form-control" id="carUserSatisfaction">
                                             <option value="1">非常满意</option>
                                             <option value="2">满意</option>
                                             <option value="3">不满意</option>
                                     </select>
-                                </div>
-                    </div>
-                </div> 
-                <div class="form-group" style="margin:0px;">
-                        <div class="form-group col-xs-5">
-                            <label for="exampleInputAccount1" class="col-xs-4" style="text-align: left;padding:0">出勤人员：</label>
-                            <div class="col-xs-8">
-                                    <input type="text" id="recordUser" class="form-control" placeholder="请选择出勤人员" autocomplete="off">
-                                </div>
-                        </div>
-                        <div class="form-group col-xs-7">
-                                <label for="" class="col-xs-4">桩号：</label>
-                                <div class="col-xs-6">
-                                    <input type="text" style="width:100%;" id="addr" class="form-control">
-                                    </div>
-                        </div>
-                    </div> 
-                <div class="form-group" style="margin:0px;">
-                        <div class="form-group col-xs-5">
-                            <label for="exampleInputAccount1" class="col-xs-4" style="text-align: left;padding:0">送达时间：</label>
-                            <div class="col-xs-8">
-                                <input type="text" style="width:100%;" id="delivery_time" class="form-control">
-                                </div>
-                        </div>
-                        <div class="form-group col-xs-7">
-                            <label for="exampleInputAccount1" class="col-xs-4" style="text-align: left;padding-right:0">接受时间：</label>
-                            <div class="col-xs-6">
-                                <input type="text" style="width:100%;" id="accept_time" class="form-control">
-                                </div>
-                        </div>
-                    </div> 
-                    <div class="form-group" style="margin:0px;">
-                        <div class="form-group col-xs-5">
-                            <label for="exampleInputAccount1" class="col-xs-4" style="text-align: left;padding:0">出发时间：</label>
-                            <div class="col-xs-8">
-                                <input type="text" style="width:100%;" id="startTime" class="form-control" autocomplete="off">
-                                </div>
-                        </div>
-                        <div class="form-group col-xs-7">
-                            <label for="exampleInputAccount1" class="col-xs-4" style="text-align: left;padding-right:0">到达时间：</label>
-                            <div class="col-xs-6">
-                                <input type="text" style="width:100%;" id="arrive_time" class="form-control">
-                                </div>
-                        </div>
-                    </div> 
-                    <div class="form-group" style="margin:0px;">
-                        <div class="form-group col-xs-5">
-                            <label for="exampleInputAccount1" class="col-xs-4" style="text-align: left;padding:0">施救时间：</label>
-                            <div class="col-xs-8">
-                                <input type="text" style="width:100%;" id="rescue_time" class="form-control">
-                                </div>
-                        </div>
-                        <div class="form-group col-xs-7">
-                            <label for="exampleInputAccount1" class="col-xs-4" style="text-align: left;padding-right:0">离场时间：</label>
-                            <div class="col-xs-6">
-                                <input type="text" style="width:100%;" id="back_time" class="form-control">
-                                </div>
-                        </div>
-                    </div> 
-                    <div class="form-group" style="margin:0px;">
-                        <div class="form-group col-xs-5">
-                            <label for="exampleInputAccount1" class="col-xs-4" style="text-align: left;padding:0">解脱时间：</label>
-                            <div class="col-xs-8">
-                                <input type="text" style="width:100%;" id="relief_time" class="form-control">
-                                </div>
-                        </div>
-                        <div class="form-group col-xs-7">
-                            <label for="exampleInputAccount1" class="col-xs-4" style="text-align: left;padding-right:0">回场时间：</label>
-                            <div class="col-xs-6">
-                                <input type="text" style="width:100%;" id="backfield_time" class="form-control">
-                                </div>
-                        </div>
-                    </div> 
-                <div class="form-group" style="margin:0px;">
-                    </div> 
-                <div class="form-group" style="margin-top:50px;float: right;margin-right: 40px">
-                        <button class="btn btn-info2 col-xs-1" style="height:40px;width:90px;" type="button" onclick="save()" >保存</button>
-                    </div> 
-             
-    </form>
+        </div>
+    </div>
+</div>
+<div class="form-group" style="margin:0px;">
+    <div class="form-group col-xs-5">
+        <label for="exampleInputAccount1" class="col-xs-4" style="text-align: left;padding:0">出勤人员：</label>
+        <div class="col-xs-8">
+            <input type="text" id="recordUser" class="form-control" placeholder="请选择出勤人员" autocomplete="off">
+        </div>
+    </div>
+    <div class="form-group col-xs-7">
+        <label for="" class="col-xs-4">桩号：</label>
+        <div class="col-xs-6">
+            <input type="text" style="width:100%;" id="addr" class="form-control">
+        </div>
+    </div>
+</div>
+<div class="form-group" style="margin:0px;">
+    <div class="form-group col-xs-5">
+        <label for="exampleInputAccount1" class="col-xs-4" style="text-align: left;padding:0">送达时间：</label>
+        <div class="col-xs-8">
+            <input type="text" style="width:100%;" id="delivery_time" class="form-control">
+        </div>
+    </div>
+    <div class="form-group col-xs-7">
+        <label for="exampleInputAccount1" class="col-xs-4" style="text-align: left;padding-right:0">接受时间：</label>
+        <div class="col-xs-6">
+            <input type="text" style="width:100%;" id="accept_time" class="form-control">
+        </div>
+    </div>
+</div>
+<div class="form-group" style="margin:0px;">
+    <div class="form-group col-xs-5">
+        <label for="exampleInputAccount1" class="col-xs-4" style="text-align: left;padding:0">出发时间：</label>
+        <div class="col-xs-8">
+            <input type="text" style="width:100%;" id="startTime" class="form-control" autocomplete="off">
+        </div>
+    </div>
+    <div class="form-group col-xs-7">
+        <label for="exampleInputAccount1" class="col-xs-4" style="text-align: left;padding-right:0">到达时间：</label>
+        <div class="col-xs-6">
+            <input type="text" style="width:100%;" id="arrive_time" class="form-control">
+        </div>
+    </div>
+</div>
+<div class="form-group" style="margin:0px;">
+    <div class="form-group col-xs-5">
+        <label for="exampleInputAccount1" class="col-xs-4" style="text-align: left;padding:0">施救时间：</label>
+        <div class="col-xs-8">
+            <input type="text" style="width:100%;" id="rescue_time" class="form-control">
+        </div>
+    </div>
+    <div class="form-group col-xs-7">
+        <label for="exampleInputAccount1" class="col-xs-4" style="text-align: left;padding-right:0">离场时间：</label>
+        <div class="col-xs-6">
+            <input type="text" style="width:100%;" id="back_time" class="form-control">
+        </div>
+    </div>
+</div>
+<div class="form-group" style="margin:0px;">
+    <div class="form-group col-xs-5">
+        <label for="exampleInputAccount1" class="col-xs-4" style="text-align: left;padding:0">解脱时间：</label>
+        <div class="col-xs-8">
+            <input type="text" style="width:100%;" id="relief_time" class="form-control">
+        </div>
+    </div>
+    <div class="form-group col-xs-7">
+        <label for="exampleInputAccount1" class="col-xs-4" style="text-align: left;padding-right:0">回场时间：</label>
+        <div class="col-xs-6">
+            <input type="text" style="width:100%;" id="backfield_time" class="form-control">
+        </div>
+    </div>
 </div>
-    <script>
+<div class="form-group" style="margin:0px;">
+</div>
+<div class="form-group" style="margin-top:50px;float: right;margin-right: 40px">
+    <button class="btn btn-info2 col-xs-1" style="height:40px;width:90px;" type="button" onclick="save()">保存</button>
+</div>
+
+</form>
+</div>
+<script>
     var selectRecord;
     var arrive = 30;
     var back = 60;
-       laydate.render({
+    laydate.render({
         elem: '#received_time',
-        type: 'datetime',                                                                                              
+        type: 'datetime',
     });
     laydate.render({
         elem: '#delivery_time',
-        type: 'datetime',                                                                                              
-    });  
+        type: 'datetime',
+    });
     laydate.render({
         elem: '#accept_time',
-        type: 'datetime',                                                                                              
+        type: 'datetime',
     });
     laydate.render({
         elem: '#startTime',
-        type: 'datetime',                                                                                              
+        type: 'datetime',
     });
     laydate.render({
         elem: '#arrive_time',
-        type: 'datetime',                                                                                              
+        type: 'datetime',
     });
-      laydate.render({
+    laydate.render({
         elem: '#rescue_time',
-        type: 'datetime',                                                                                              
+        type: 'datetime',
     });
 
-      laydate.render({
+    laydate.render({
         elem: '#back_time',
-        type: 'datetime',                                                                                              
+        type: 'datetime',
     });
     laydate.render({
         elem: '#relief_time',
-        type: 'datetime',                                                                                              
+        type: 'datetime',
     });
     laydate.render({
         elem: '#backfield_time',
-        type: 'datetime',                                                                                              
+        type: 'datetime',
     });
 
     setRecordUser();
 
-    function changestatus(){
+    function changestatus() {
         // $("#status").html("到达");
-           
+
     }
 
-    function setRecordUser(){
+    function setRecordUser() {
         var dept = $("#dept").val();
         var userData = {
             "organid": dept
         }
-      UserGetList(userData, function(data) {
-          console.log(data);
-        for (var index in data) {
-                    var p = data[index];
-                    p.title = p.truename;
-                }
-                if (selectRecord != null) {
-        $("#recordUser").val("");
-         selectRecord.unbind();
-         selectRecord.options = {
+        UserGetList(userData, function(data) {
+            console.log(data);
+            for (var index in data) {
+                var p = data[index];
+                p.title = p.truename;
+            }
+            if (selectRecord != null) {
+                $("#recordUser").val("");
+                selectRecord.unbind();
+                selectRecord.options = {
                     source: data,
                     isMultiple: true
                 };
-        selectRecord.closeDropDownMenu();
-        selectRecord.init();
-        $(".ComboTreeItemChlid").find("input").prop('checked', false);
-    }else{   
-        selectRecord = $('#recordUser').comboTree({
+                selectRecord.closeDropDownMenu();
+                selectRecord.init();
+                $(".ComboTreeItemChlid").find("input").prop('checked', false);
+            } else {
+                selectRecord = $('#recordUser').comboTree({
                     source: data,
                     isMultiple: true
                 });
@@ -234,57 +234,56 @@
         });
     }
 
-    function save(){
-       var arriveIntime;
-       var unimpededInTime;
-       var arriveHour = new Date($("#arriveTime").val()) - new Date($("#startTime").val());
-       var umipededHour = new Date($("#backTime").val()) - new Date($("#arriveTime").val());
-       if(arriveHour/100/60 > arrive){
-             arriveIntime = 0;
-       }else{
-             arriveIntime = 1;
-       }
-       if(umipededHour/100/60 > back){
+    function save() {
+        var arriveIntime;
+        var unimpededInTime;
+        var arriveHour = new Date($("#arriveTime").val()) - new Date($("#startTime").val());
+        var umipededHour = new Date($("#backTime").val()) - new Date($("#arriveTime").val());
+        if (arriveHour / 100 / 60 > arrive) {
+            arriveIntime = 0;
+        } else {
+            arriveIntime = 1;
+        }
+        if (umipededHour / 100 / 60 > back) {
             unimpededInTime = 0;
-       }else{
+        } else {
             unimpededInTime = 1;
-       }
-       var userids = new Array();
-       userids = selectRecord.getSelectedItemsId();
-       console.log(userids);
-       var userid = userids.join(',');
-    
-       var data={
-        'type' : $("#type").val(),
-        'car_info' :  $("#carinfo").val(),
-        'received_time' :  new Date($("#received_time").val()),
-        'car_user_info' :  $("#carUserinfo").val(),
-        'dept' :  $("#dept").val(),
-        'car_user_satisfaction' :  $("#carUserSatisfaction").val(),
-        'users' :  userid,
-        'arrive_time' :  new Date($("#arrive_time").val()),
-        'back_time' :  new Date($("#back_time").val()),
-        'delivery_time' :  new Date($("#delivery_time").val()),
-        'accept_time' :  new Date($("#accept_time").val()),
-        'rescue_time' :  new Date($("#rescue_time").val()),
-        'relief_time' :  new Date($("#relief_time").val()),
-        'backfield_time' :  new Date($("#backfield_time").val()),
-        'start_time' :  new Date($("#startTime").val()),
-        'arrive_in_time' : arriveIntime,
-        'unimpeded_in_time' : unimpededInTime,
-        'addr': $("#addr").val()
-    }
-    if(is_save == 0){
-        post_common_service('q/record/add', data, function(redata) {
-               window.parent.location.reload();
-        });
-    }else{
-        data.id = is_save.split("_")[1];
-        console.log(data);
-        post_common_service('q/record/update', data, function(redata) {
-               window.parent.location.reload();
-        });
-    }
-}
-    </script>
+        }
+        var userids = new Array();
+        userids = selectRecord.getSelectedItemsId();
+        console.log(userids);
+        var userid = userids.join(',');
 
+        var data = {
+            'type': $("#type").val(),
+            'car_info': $("#carinfo").val(),
+            'received_time': moment($("#received_time").val()).format("YYYY-MM-DD HH:mm:ss"),
+            'car_user_info': $("#carUserinfo").val(),
+            'dept': $("#dept").val(),
+            'car_user_satisfaction': $("#carUserSatisfaction").val(),
+            'users': userid,
+            'arrive_time': moment($("#arrive_time").val()).format("YYYY-MM-DD HH:mm:ss"),
+            'back_time': moment($("#back_time").val()).format("YYYY-MM-DD HH:mm:ss"),
+            'delivery_time': moment($("#delivery_time").val()).format("YYYY-MM-DD HH:mm:ss"),
+            'accept_time': moment($("#accept_time").val()).format("YYYY-MM-DD HH:mm:ss"),
+            'rescue_time': moment($("#rescue_time").val()).format("YYYY-MM-DD HH:mm:ss"),
+            'relief_time': moment($("#relief_time").val()).format("YYYY-MM-DD HH:mm:ss"),
+            'backfield_time': moment($("#backfield_time").val()).format("YYYY-MM-DD HH:mm:ss"),
+            'start_time': moment($("#startTime").val()).format("YYYY-MM-DD HH:mm:ss"),
+            'arrive_in_time': arriveIntime,
+            'unimpeded_in_time': unimpededInTime,
+            'addr': $("#addr").val()
+        }
+        if (is_save == 0) {
+            post_common_service('q/record/add', data, function(redata) {
+                window.parent.location.reload();
+            });
+        } else {
+            data.id = is_save.split("_")[1];
+            console.log(data);
+            post_common_service('q/record/update', data, function(redata) {
+                window.parent.location.reload();
+            });
+        }
+    }
+</script>