清障队添加字段

VisualInspection/qzd/js/task/new.js

@@ -1,6 +1,7 @@
 var cur_status;
 var cur_page;
 var is_save;
+var updateid = null;
 var user = $.zui.store.get("user")
 $("#fileupload").change(function() {
     UpladFile();
@@ -10,6 +11,7 @@ function initTaskPage() {
     initQueryParams();
     initTableRowBtn();
     queryTask();
+    getRecord();
 }
 
 function initQueryParams() {
@@ -87,7 +89,7 @@ function queryTask() {
         { width: 160, text: '出勤人员', type: 'string', flex: true, sort: 'down',colClass: 'text-center', field: 'userNames' },
         // {width: 120, text: '状态', type: 'string', flex: true, colClass: '',field: 'check_status_name'}
     ];
-    user.roles[0].id = 16;
+    user.roles[0].id = 1;
     if(user.roles[0].id == 1){
         var colFunc = { width: 160, text: '操作', type: 'string', flex: true, field: 'id',colClass: 'text-center' };
         colFunc.oper = $.zui.store.get("task_table_btn_1");
@@ -158,8 +160,24 @@ function checkUpdate(id){
         $('#addModal').modal('show');
         $("#type").val(redata.type);
         $("#carinfo").val(redata.car_info);
-        time = moment(redata.arrive_time).format("YYYY-MM-DD HH:mm:ss");
+        var time = moment(redata.arrive_time).format("YYYY-MM-DD HH:mm:ss");
+        $("#arrive_time").val(time);
+        time = moment(redata.received_time).format("YYYY-MM-DD HH:mm:ss");
+        $("#received_time").val(time);
+        time = moment(redata.start_time).format("YYYY-MM-DD HH:mm:ss");
         $("#startTime").val(time);
+        time = moment(redata.back_time).format("YYYY-MM-DD HH:mm:ss");
+        $("#back_time").val(time);
+        time = moment(redata.backfield_time).format("YYYY-MM-DD HH:mm:ss");
+        $("#backfield_time").val(time);
+        time = moment(redata.delivery_time).format("YYYY-MM-DD HH:mm:ss");
+        $("#delivery_time").val(time);
+        time = moment(redata.accept_time).format("YYYY-MM-DD HH:mm:ss");
+        $("#accept_time").val(time);
+        time = moment(redata.rescue_time).format("YYYY-MM-DD HH:mm:ss");
+        $("#rescue_time").val(time);
+        time = moment(redata.relief_time).format("YYYY-MM-DD HH:mm:ss");
+        $("#relief_time").val(time);
         $("#carUserinfo").val(redata.car_user_info);
         $("#dept").val(redata.dept);
         $("#carUserSatisfaction").val(redata.car_user_satisfaction);
@@ -191,4 +209,17 @@ function resert(){
         $(".ComboTreeItemChlid").find("input").prop('checked', false);
         $("#recordUser").val('');
         $("#addr").val('');
+}
+
+function getRecord(){
+    var data = {
+        // "startTime": new Date(getMomentTimeFormat(t.starttime)),
+        // "endTime":new Date(getMomentTimeFormat(t.endtime)),
+        "dept": $("#deptlist").val(),
+      // "check_status": cur_status
+      
+  };
+  post_common_service('q/record/getall/0/0', data, function(redata) {
+      console.log(redata);
+});
 }

VisualInspection/qzd/view/task/addtask.html

@@ -22,7 +22,7 @@
                     <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="start_time" class="form-control form-date" placeholder="公里" onchange="changestatus()">
+                                <input type="text" id="km" class="form-control form-date" placeholder="公里" onchange="changestatus()">
                             </div>
                     </div>
                 </div>
@@ -48,7 +48,7 @@
                 <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="startTime" class="form-control">
+                        <input type="text" style="width:100%;" id="received_time" class="form-control">
                         </div>
                 </div>
                 <div class="form-group col-xs-7">
@@ -95,13 +95,13 @@
                         <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="arriveTime" class="form-control">
+                                <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="backTime" class="form-control">
+                                <input type="text" style="width:100%;" id="accept_time" class="form-control">
                                 </div>
                         </div>
                     </div> 
@@ -109,13 +109,13 @@
                         <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="arriveTime" class="form-control">
+                                <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="backTime" class="form-control">
+                                <input type="text" style="width:100%;" id="arrive_time" class="form-control">
                                 </div>
                         </div>
                     </div> 
@@ -123,13 +123,13 @@
                         <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="arriveTime" class="form-control">
+                                <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="backTime" class="form-control">
+                                <input type="text" style="width:100%;" id="back_time" class="form-control">
                                 </div>
                         </div>
                     </div> 
@@ -137,13 +137,13 @@
                         <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="arriveTime" class="form-control">
+                                <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="backTime" class="form-control">
+                                <input type="text" style="width:100%;" id="backfield_time" class="form-control">
                                 </div>
                         </div>
                     </div> 
@@ -160,17 +160,40 @@
     var arrive = 30;
     var back = 60;
        laydate.render({
+        elem: '#received_time',
+        type: 'datetime',                                                                                              
+    });
+    laydate.render({
+        elem: '#delivery_time',
+        type: 'datetime',                                                                                              
+    });  
+    laydate.render({
+        elem: '#accept_time',
+        type: 'datetime',                                                                                              
+    });
+    laydate.render({
         elem: '#startTime',
         type: 'datetime',                                                                                              
     });
-
+    laydate.render({
+        elem: '#arrive_time',
+        type: 'datetime',                                                                                              
+    });
       laydate.render({
-        elem: '#arriveTime',
+        elem: '#rescue_time',
         type: 'datetime',                                                                                              
     });
 
       laydate.render({
-        elem: '#backTime',
+        elem: '#back_time',
+        type: 'datetime',                                                                                              
+    });
+    laydate.render({
+        elem: '#relief_time',
+        type: 'datetime',                                                                                              
+    });
+    laydate.render({
+        elem: '#backfield_time',
         type: 'datetime',                                                                                              
     });
 
@@ -234,13 +257,19 @@
        var data={
         'type' : $("#type").val(),
         'car_info' :  $("#carinfo").val(),
-        'received_time' :  new Date($("#startTime").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($("#arriveTime").val()),
-        'back_time' :  new Date($("#backTime").val()),
+        '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()

Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/bean/QzdRecord.java

@@ -40,5 +40,11 @@ public class QzdRecord implements Serializable {
     private Date startTime;//'开始时间'
     private Date endTime;//'结束时间'
     private Integer check_status;
+    private Date delivery_time;
+    private Date accept_time;
+    private Date rescue_time;
+    private Date relief_time;
+    private Date backfield_time;
+
 
 }

Visuallnspection_qzd/src/main/java/com/xintong/visualinspection/visuallnspection_qzd/mapper/master/RecordMapper.xml

@@ -30,10 +30,10 @@
             parameterType="com.xintong.visualinspection.bean.QzdRecord">
         INSERT INTO record_info
         (type,users,dept,addr,received_time,car_info,car_user_info,start_time,arrive_time,back_time,record_user,arrive_in_time,unimpeded_in_time,car_user_satisfaction,videos
-        ,pics,zxt_is_standard,is_explain,record_no_come,take_photo_upload,arrive_do_work,remarks)
+        ,pics,zxt_is_standard,is_explain,record_no_come,take_photo_upload,arrive_do_work,remarks,delivery_time,accept_time,rescue_time,relief_time,backfield_time)
         VALUES
         (#{type},#{users},#{dept},#{addr},#{received_time},#{car_info},#{car_user_info},#{start_time},#{arrive_time},#{back_time},#{record_user},#{arrive_in_time},#{unimpeded_in_time},#{car_user_satisfaction},#{videos}
-        ,#{pics},#{zxt_is_standard},#{is_explain},#{record_no_come},#{take_photo_upload},#{arrive_do_work},#{remarks}
+        ,#{pics},#{zxt_is_standard},#{is_explain},#{record_no_come},#{take_photo_upload},#{arrive_do_work},#{remarks},#{delivery_time},#{accept_time},#{rescue_time},#{relief_time},#{backfield_time}
         )
     </insert>
 
@@ -63,6 +63,11 @@
         <if test="take_photo_upload != null">take_photo_upload = #{take_photo_upload},</if>
         <if test="arrive_do_work != null">arrive_do_work = #{arrive_do_work},</if>
         <if test="remarks != null">remarks = #{remarks},</if>
+        <if test="delivery_time != null">delivery_time = #{delivery_time},</if>
+        <if test="accept_time != null">accept_time = #{accept_time},</if>
+        <if test="rescue_time != null">rescue_time = #{rescue_time},</if>
+        <if test="relief_time != null">relief_time = #{relief_time},</if>
+        <if test="backfield_time != null">backfield_time = #{backfield_time},</if>
         id=#{id}
         WHERE
         id = #{id}