MSI\liwei hace 7 años
padre
commit
e1c38e778b
Se han modificado 2 ficheros con 11 adiciones y 22 borrados
  1. 5 16
      VisualInspection/qzd/js/task/new.js
  2. 6 6
      VisualInspection/qzd/view/task/addtask.html

+ 5 - 16
VisualInspection/qzd/js/task/new.js

@@ -109,32 +109,21 @@ function queryTask() {
         setMonitor();
          cols = [
             { width: 80, text: '序号', type: 'number', flex: true, colClass: 'text-center', field: 'num' },
-          //  { width: 80, text: '清障队', type: 'string', flex: true, colClass: 'text-center', sort: 'down', field: 'deptName' },
             { width: 80, text: '桩号', type: 'string', flex: true, colClass: 'text-center', sort: 'down', field: 'addr' },
-           // { width: 80, text: '客户信息', type: 'string', flex: true, sort: 'down', colClass: 'text-center', field: 'car_user_info' },
+           // { width: 120, text: '接警时间', type: 'string', flex: true, sort: 'down', colClass: 'text-center', field: 'received_time' },
             { width: 120, text: '接警时间', type: 'string', flex: true, sort: 'down', colClass: 'text-center', field: 'received_time' },
-            // { width: 160, text: '最后时间', type: 'string', flex: true, sort: 'down', colClass: 'text-center', field: 'last_time' },
             { width: 120, text: '出勤人员', type: 'string', flex: true, sort: 'down', colClass: 'text-center', field: 'userNames' },
-            // {width: 120, text: '状态', type: 'string', flex: true, colClass: '',field: 'check_status_name'}
+            { width: 160, text: '正副班长', type: 'monitor', flex: true, field: 'id', colClass: 'text-center' },
+            { width: 160, text: '视频上传', type: 'imagebutton', flex: true, field: 'videos', colClass: 'text-center'},
+            { width: 160, text: '图片上传', type: 'imagebutton', flex: true, field: 'pics', colClass: 'text-center' },
         ];
-        var colFunc3 = { width: 160, text: '正副班长', type: 'monitor', flex: true, field: 'id', colClass: 'text-center' };
-       // var colFunc5 = { width: 160, text: '正副班长', type: 'monitor', flex: true, field: 'id', colClass: 'text-center' };
-        //var colFunc3 = { width: 160, text: '视频上传', type: 'imagebutton', flex: true, field: 'videos', colClass: 'text-center' };
-       // var colFunc4 = { width: 160, text: '是否按时到达', type: 'arrive', flex: true, field: 'id', colClass: 'text-center' };
-        var colFunc1 = { width: 160, text: '视频上传', type: 'imagebutton', flex: true, field: 'videos', colClass: 'text-center' };
-        var colFunc2 = { width: 160, text: '图片上传', type: 'imagebutton', flex: true, field: 'pics', colClass: 'text-center' };
         var colFunc = { width: 40, text: '操作', type: 'string', flex: true, field: 'id', colClass: 'text-center' };
         colFunc.oper = $.zui.store.get("task_table_btn_2");
-        cols.push(colFunc3);
-        cols.push(colFunc1);
-        cols.push(colFunc2);
-       // cols.push(colFunc3);
-        //cols.push(colFunc5);
         cols.push(colFunc);
         $("#isCompleteDiv").hide();
         $("#isComplete").val(1);
         data.isComplete = 1;
-        data.isApply = 0;
+        //data.isApply = 0;
     }
     //只有下发才显示复选框
     var checkable = false;

+ 6 - 6
VisualInspection/qzd/view/task/addtask.html

@@ -111,7 +111,7 @@
             <input type="text" style="width:100%;" id="back_time" class="form-control" autocomplete="off">
         </div>
     </div>
-    <div class="form-group col-xs-7">
+    <!-- <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">
             <select class="form-control" id="isApply">
@@ -119,7 +119,7 @@
                 <option value="1">是</option>
         </select>
         </div>
-    </div>
+    </div> -->
 </div>
 <!-- <div class="form-group" style="margin:0px;">
     <div class="form-group col-xs-5">
@@ -285,7 +285,7 @@ function setRecordUserID(usersid) {
 
         var data = {
             "isComplete":1,
-            "isApply":$("#isApply").val()
+            // "isApply":$("#isApply").val()
         }  
         // if($("#backfield_time").val() != null && $("#backfield_time").val() !=''){
         //         data.backfield_time =moment($("#backfield_time").val()).format("YYYY-MM-DD HH:mm:ss");
@@ -338,9 +338,9 @@ function setRecordUserID(usersid) {
             data.unimpeded_in_time  = 1;
         }
         }
-        if($("#isApply").val() == 1){
-            data.isComplete = 1;
-        }
+        // if($("#isApply").val() == 1){
+        //     data.isComplete = 1;
+        // }
         // if($("#startTime").val() != null && $("#startTime").val() !=''){
         //         data.start_time =moment($("#startTime").val()).format("YYYY-MM-DD HH:mm:ss");
         // }else{