bugfix

VisualInspection/js/mytask/check.js

@@ -640,23 +640,23 @@ function showChangeUser() {
         changePersonLayer = showPopup4Common('更改人员', null, ['550px', '600px'], null, 'r', '确定');
         $("#user_container").empty();
         var userStr = "";
-        // for (var i in data) {
-        //     var name = data[i].truename;
-        //     if (data[i].workno) name = name + " " + data[i].workno.substr(data[i].workno.length - 3);
-        //     var pic = "../../images/body-bg.png";
-        //     if (data[i].pic) pic = base_image_server_url + data[i].pic;
-        //     str = '<div style="width:90px;float:left;margin:5px;">' +
-        //         '<a class="card" href="javascript:void(0)">' +
-        //         '<img src="' + pic + '" alt="" style="height:100px;width:90px;" onclick="showBigImg(\'' + pic + '\')">' +
-        //         '<div class="card-heading"><strong>' + name + '</strong></div>' +
-        //         '<div class="card-actions">' +
-        //         '<button type="button" class="btn btn-mini btn-danger" onclick="changePerson(\'' + data[i].id + '\')">选择</button>' +
-        //         '</div>' +
-        //         '</a>' +
-        //         '</div>';
-        //     userStr += str;
-        // }
-        // $("#user_container").html(userStr);
+        for (var i in data) {
+            var name = data[i].truename;
+            if (data[i].workno) name = name + " " + data[i].workno.substr(data[i].workno.length - 3);
+            var pic = "../../images/body-bg.png";
+            if (data[i].pic) pic = base_image_server_url + data[i].pic;
+            str = '<div style="width:90px;float:left;margin:5px;">' +
+                '<a class="card" href="javascript:void(0)">' +
+                '<img src="' + pic + '" alt="" style="height:100px;width:90px;" onclick="showBigImg(\'' + pic + '\')">' +
+                '<div class="card-heading"><strong>' + name + '</strong></div>' +
+                '<div class="card-actions">' +
+                '<button type="button" class="btn btn-mini btn-danger" onclick="changePerson(\'' + data[i].id + '\')">选择</button>' +
+                '</div>' +
+                '</a>' +
+                '</div>';
+            userStr += str;
+        }
+        $("#user_container").html(userStr);
         // console.log($("#user_container").html());
     })
 }

VisualInspection/js/util/const.js

@@ -66,5 +66,6 @@ var ROLE_ADMIN = "ROLE_ADMIN";
 var ROLE_ROAD_MANAGER = "ROLE_ROAD_MANAGER";
 var ROLE_FWQ_ADMIN = "ROLE_FWQ_ADMIN";
 var ROLE_FWQ = "ROLE_FWQ";
-var ROLE_QZD_ADMIN = "ROLE_WRECKER_MANAGER";
-var ROLE_QZD = "ROLE_WRECKER";
+var ROLE_WRECKER_MANAGER = "ROLE_WRECKER_MANAGER";
+var ROLE_WRECKER = "ROLE_WRECKER";
+var ROLE_WRECKER_NQ = "ROLE_WRECKER_NQ";

VisualInspection/qzd/js/appeal_management/appeal_checked.js

@@ -11,7 +11,7 @@ function queryCheckedAppealTask() {
     }
     var hide = false;
 
-    if (hasRole(ROLE_QZD_ADMIN) || hasRole(ROLE_QZD) || hasRole(ROLE_JICHA) || roleContains('QZD')) {
+    if (hasRole(ROLE_WRECKER_MANAGER) || hasRole(ROLE_WRECKER) || hasRole(ROLE_JICHA) || roleContains('ROLE_WRECKER')) {
         hide = true;
     }
     var cols = [

VisualInspection/qzd/js/appeal_management/appeal_list.js

@@ -28,14 +28,14 @@ function initQueryParams() {
     if (roleContains("WRECKER")) {
         checked_dept = getCurrentUser().organid;
     }
-        if(checked_dept){
-           var optStr = '<option value="' + checked_dept + '" selected="selected">' + getCurrentUser().organname + '</option>';
-           $("#fsList").html('');
-           $("#fsList").html(optStr);
-           $("#fsList").attr('disabled', 'disabled')
-        }else{
-            setWreckerGroupAllSelect("#fsList"); 
-        }
+    if (checked_dept) {
+        var optStr = '<option value="' + checked_dept + '" selected="selected">' + getCurrentUser().organname + '</option>';
+        $("#fsList").html('');
+        $("#fsList").html(optStr);
+        $("#fsList").attr('disabled', 'disabled')
+    } else {
+        setWreckerGroupAllSelect("#fsList");
+    }
 
     //获取页面参数
     var page_params = $.zui.store.get("page_params");
@@ -76,7 +76,7 @@ function queryAppeal() {
         "appeal_result": $("#appealResultSelect").val()
     }
     var hide = false;
-    if (hasRole(ROLE_QZD_ADMIN) || hasRole(ROLE_QZD) || hasRole(ROLE_JICHA) || roleContains('QZD')) {
+    if (hasRole(ROLE_WRECKER_MANAGER) || hasRole(ROLE_WRECKER) || hasRole(ROLE_JICHA) || roleContains('ROLE_WRECKER')) {
         hide = true;
     }
 
@@ -147,7 +147,7 @@ function queryUnAssignedTable() {
         "checked_dept": $("#dept_select").val(),
     }
     var hide = false;
-    if (hasRole(ROLE_QZD_ADMIN) || hasRole(ROLE_QZD)) {
+    if (hasRole(ROLE_WRECKER_MANAGER) || hasRole(ROLE_WRECKER)) {
         hide = true;
     }
     var cols = [

VisualInspection/qzd/js/appeal_management/appeal_submited.js

@@ -10,7 +10,7 @@ function querySubmitedAppealTask() {
         "check_status_end": 14
     }
     var hide = false;
-    if (hasRole(ROLE_QZD_ADMIN) || hasRole(ROLE_QZD) || hasRole(ROLE_JICHA) || roleContains('QZD')) {
+    if (hasRole(ROLE_WRECKER_MANAGER) || hasRole(ROLE_WRECKER) || hasRole(ROLE_JICHA) || roleContains('ROLE_WRECKER')) {
         hide = true;
     }
     var cols = [

VisualInspection/qzd/js/other_check/other_check.js

@@ -46,7 +46,7 @@ function init() {
     setRoadManagerSelect("#first", road_manager, true);
     // 设置服务区
     var checked_dept = null;
-    if (roleContains("QZD")) {
+    if (roleContains("ROLE_WRECKER")) {
         checked_dept = getCurrentUser().organid;
     }
     //  setSASelect("#fsList", checked_dept);

VisualInspection/qzd/js/record/record.js

@@ -7,7 +7,7 @@ $(document).ready(function() {
     $("#start_time").val(getCurrentTimeFormat());
 
     var checked_dept = null;
-    if (roleContains("QZD")) {
+    if (roleContains("ROLE_WRECKER")) {
         checked_dept = getCurrentUser().organid;
     }
     setSASelectValueNoAll_name(getOrganList(null), "#fsList", checked_dept, "请选择清障队");

VisualInspection/qzd/js/task/add.js

@@ -10,7 +10,7 @@ $(document).ready(function() {
     });
     $("#month_date").val(getCurrentTimeFormat());
     var checked_dept = null;
-    if (roleContains("QZD")) {
+    if (roleContains("ROLE_WRECKER")) {
         checked_dept = getCurrentUser().organid;
     }
     setWreckerGroupSelect("#qzd", checked_dept);

VisualInspection/qzd/js/task/apply_task.js

@@ -52,7 +52,7 @@ function queryUnexaminedTask() {
 
 
     var hide = false;
-    if (hasRole(ROLE_QZD_ADMIN) || hasRole(ROLE_QZD) || hasRole(ROLE_JICHA) || roleContains('QZD')) {
+    if (hasRole(ROLE_WRECKER_MANAGER) || hasRole(ROLE_WRECKER) || hasRole(ROLE_JICHA) || roleContains('ROLE_WRECKER')) {
         hide = true;
     }
     var cols = [

VisualInspection/qzd/js/task/checked.js

@@ -11,7 +11,7 @@ function queryCheckedTask() {
         "check_status_arr": [4, 5, 6]
     };
     var hide = false;
-    if (hasRole(ROLE_QZD_ADMIN) || hasRole(ROLE_QZD) || hasRole(ROLE_JICHA) || roleContains('QZD')) {
+    if (hasRole(ROLE_WRECKER_MANAGER) || hasRole(ROLE_WRECKER) || hasRole(ROLE_JICHA) || roleContains('ROLE_WRECKER')) {
         hide = true;
     }
     var cols = [

VisualInspection/qzd/js/task/new.js

@@ -31,15 +31,15 @@ function initQueryParams() {
     if (roleContains("WRECKER")) {
         checked_dept = getCurrentUser().organid;
     }
-        if(checked_dept){
-           var optStr = '<option value="' + checked_dept + '" selected="selected">' + getCurrentUser().organname + '</option>';
-           $("#deptlist").html('');
-           $("#deptlist").html(optStr);
-           $("#deptlist").attr('disabled', 'disabled')
-        }else{
-            setWreckerGroupAllSelect("#deptlist"); 
-        }
-        setWreckerGroupSelect("#dept", checked_dept);
+    if (checked_dept) {
+        var optStr = '<option value="' + checked_dept + '" selected="selected">' + getCurrentUser().organname + '</option>';
+        $("#deptlist").html('');
+        $("#deptlist").html(optStr);
+        $("#deptlist").attr('disabled', 'disabled')
+    } else {
+        setWreckerGroupAllSelect("#deptlist");
+    }
+    setWreckerGroupSelect("#dept", checked_dept);
 
 
     if (hasRole(ROLE_JICHA_ADMIN) && cur_status == 4) {
@@ -83,7 +83,7 @@ function queryTask() {
         // "check_status": cur_status
     };
     var hide = false;
-    if (hasRole(ROLE_QZD_ADMIN) || hasRole(ROLE_QZD) || hasRole(ROLE_JICHA) || roleContains('QZD')) {
+    if (hasRole(ROLE_WRECKER_MANAGER) || hasRole(ROLE_WRECKER) || hasRole(ROLE_JICHA) || roleContains('ROLE_WRECKER')) {
         hide = true;
     }
     var cols = [

VisualInspection/qzd/js/task/task_list.js

@@ -61,14 +61,14 @@ function initQueryParams() {
     if (roleContains("WRECKER")) {
         checked_dept = getCurrentUser().organid;
     }
-        if(checked_dept){
-           var optStr = '<option value="' + checked_dept + '" selected="selected">' + getCurrentUser().organname + '</option>';
-           $("#qzd").html('');
-           $("#qzd").html(optStr);
-           $("#qzd").attr('disabled', 'disabled')
-        }else{
-            setWreckerGroupAllSelect("#qzd"); 
-        }
+    if (checked_dept) {
+        var optStr = '<option value="' + checked_dept + '" selected="selected">' + getCurrentUser().organname + '</option>';
+        $("#qzd").html('');
+        $("#qzd").html(optStr);
+        $("#qzd").attr('disabled', 'disabled')
+    } else {
+        setWreckerGroupAllSelect("#qzd");
+    }
 
 
     if (hasRole(ROLE_JICHA_ADMIN) && cur_status == 4) {
@@ -112,7 +112,7 @@ function queryTask() {
     };
     console.log(data);
     var hide = false;
-    if (hasRole(ROLE_QZD_ADMIN) || hasRole(ROLE_QZD) || hasRole(ROLE_JICHA) || roleContains('QZD')) {
+    if (hasRole(ROLE_WRECKER_MANAGER) || hasRole(ROLE_WRECKER) || hasRole(ROLE_JICHA) || roleContains('ROLE_WRECKER')) {
         hide = true;
     }
     var cols = [

VisualInspection/qzd/view/record/record_list.html

@@ -28,7 +28,7 @@
                     <button class="btn btn-info2 col-sm-1" style="width:80px;" type="button" onclick="queryTask()" style="">查询</button>
                 </div>
                 <div class="form-group col-sm-2" style="float: right">
-                    <button id="saveButton" class="btn btn-info2 col-sm-1" style="height:40px;width:90px;display: none" type="button" onclick="addTask()">新增</button>
+                    <button id="saveButton" class="btn btn-info2 col-sm-1" style="width:90px;display: none" type="button" onclick="addTask()">新增</button>
                 </div>
             </div>
         </form>
@@ -44,7 +44,7 @@
 </script>
 
 <div class="modal fade" id="addModal" style="height: 800px">
-    <div class="modal-dialog">
+    <div class="modal-dialog" style="width:800px">
         <div class="modal-content">
             <div class="modal-header">
                 <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">×</span><span class="sr-only">关闭</span></button>
@@ -58,4 +58,4 @@
             </div>
         </div>
     </div>
-</div>
+</div>

VisualInspection/qzd/view/task/addtask.html

@@ -167,39 +167,48 @@
     laydate.render({
         elem: '#received_time',
         type: 'datetime',
+        format: 'yyyy-MM-dd HH:mm'
     });
     laydate.render({
         elem: '#delivery_time',
         type: 'datetime',
+        format: 'yyyy-MM-dd HH:mm'
     });
     laydate.render({
         elem: '#accept_time',
         type: 'datetime',
+        format: 'yyyy-MM-dd HH:mm'
     });
     laydate.render({
         elem: '#startTime',
         type: 'datetime',
+        format: 'yyyy-MM-dd HH:mm'
     });
     laydate.render({
         elem: '#arrive_time',
         type: 'datetime',
+        format: 'yyyy-MM-dd HH:mm'
     });
     laydate.render({
         elem: '#rescue_time',
         type: 'datetime',
+        format: 'yyyy-MM-dd HH:mm'
     });
 
     laydate.render({
         elem: '#back_time',
         type: 'datetime',
+        format: 'yyyy-MM-dd HH:mm'
     });
     laydate.render({
         elem: '#relief_time',
         type: 'datetime',
+        format: 'yyyy-MM-dd HH:mm'
     });
     laydate.render({
         elem: '#backfield_time',
         type: 'datetime',
+        format: 'yyyy-MM-dd HH:mm'
     });
 
     setRecordUser();

VisualInspection/qzd/view/task/new.html

@@ -28,7 +28,7 @@
                     <button class="btn btn-info2 col-sm-1" style="width:80px;" type="button" onclick="queryTask()" style="">查询</button>
                 </div>
                 <div class="form-group col-sm-2" style="float: right">
-                    <button class="btn btn-info2 col-sm-1" style="height:40px;width:90px;" type="button" onclick="addTask()">新增</button>
+                    <button class="btn btn-info2 col-sm-1" style="width:90px;" type="button" onclick="addTask()">新增</button>
                 </div>
             </div>
         </form>

VisualInspection/qzd/view/task/taskDetail.html

@@ -143,19 +143,19 @@
         $.zui.store.set("task_detail_btn_" + ROLE_JICHA_ADMIN + "_6", ["#backConfirmBtn"]);
         $.zui.store.set("task_detail_btn_" + ROLE_JICHA_ADMIN + "_14", ["#backAppealBtn"]);
         $.zui.store.set("task_detail_btn_" + ROLE_JICHA_ADMIN + "_11", ["#assignBtn"]);
-        $.zui.store.set("task_detail_btn_" + ROLE_QZD_ADMIN + "_5", ["#confirmBtn", "#appealBtn"]);
-        $.zui.store.set("task_detail_btn_" + ROLE_QZD_ADMIN + "_15", ["#confirmAppealBtn"]);
+        $.zui.store.set("task_detail_btn_" + ROLE_WRECKER_MANAGER + "_5", ["#confirmBtn", "#appealBtn"]);
+        $.zui.store.set("task_detail_btn_" + ROLE_WRECKER_MANAGER + "_15", ["#confirmAppealBtn"]);
     }
 
     function checkAuth() {
         initBtns();
         showBtn(ROLE_JICHA, $.checkTask.check_status);
         showBtn(ROLE_JICHA_ADMIN, $.checkTask.check_status);
-        showBtn(ROLE_QZD_ADMIN, $.checkTask.check_status);
+        showBtn(ROLE_WRECKER_MANAGER, $.checkTask.check_status);
     }
 
     function showBtn(role, status) {
-     //   console.log(getCurrentUser());
+        //   console.log(getCurrentUser());
         if (hasRole(role)) {
             var btnArr = $.zui.store.get("task_detail_btn_" + role + "_" + status);
             if (btnArr) {