2 Commits e03524a033 ... e530b6d865

Tác giả SHA1 Thông báo Ngày
  minitiger e530b6d865 Merge branch 'master' of http://git_xt.jsxt.jsjtyxt.com/wenhongquan/VisualInspection 8 năm trước cách đây
  minitiger 50ceae0441 修改其他稽查被稽查人不能修改的bug 8 năm trước cách đây

+ 2 - 3
VisualInspection/js/other_check/other_check.js

@@ -128,7 +128,6 @@ var al_data = [];
             layer.msg('请选择扣分值');
             return;
         }
-        
         data = {
             "id":check_id,
             "dept_id":dept_id,
@@ -221,9 +220,9 @@ function queryTable(){
                     {width: 120, text: '附件', type: 'imagedd',flex: false,colClass: '',field:'file_ids'},
                     {width: 50, text: '扣分描述', flex: false,colClass: '',field:'remark'},
                     {width: 50, text: '检查类型', flex: false,hide: hide,field:'wrecker_check_type_name'}
-                ] ;
+                ];
     if(roleContains("JICHA") || hasRole("ROLE_ADMIN")){
-        cols.push({width: 50, text: '操作',  flex: false,hide: hide,field:'id',oper:[
+        cols.push({width: 50, text: '操作',  flex: false,field:'id',oper:[
             {func:'updateCheckTeam',text:'修改',icon_class:'icon-edit'},{func:'deleteCheckTeam',text:'删除',icon_class:'icon-remove-circle'}
         ]});
     }

+ 3 - 3
VisualInspection/view/mytask/apply_task.html

@@ -4,7 +4,7 @@
         <form class="form-horizontal">
             <div class="form-group">
                 <label for="exampleInputAccount1" class="col-sm-1">稽查日期</label>
-                <div class="col-sm-1" style="padding:0;width:80px">
+                <div class="col-sm-1" style="padding:0;">
                     <input type="text" id="start_time" class="form-control form-date" placeholder="开始时间">
                 </div>
                 <div class="col-sm-1" style="padding:0;margin-left:2px">
@@ -23,14 +23,14 @@
                     </div>
                 </div>
                 <div class="form-group col-sm-3" style="text-align:center">
-                    <div class="col-sm-6">
+                    <div class="col-sm-4">
                         <div class="checkbox">
                             <label>
                               <input type="checkbox" id="check_ss" > 申诉任务
                             </label>
                         </div>
                     </div>
-                    <div class="col-sm-6">
+                    <div class="col-sm-4">
                         <div class="checkbox">
                             <label>
                               <input type="checkbox" id="check_zc"  checked=true> 正常任务

+ 1 - 0
VisualInspection_server/src/main/java/com/xintong/visualinspection/mapper/master/CheckOtherMapper.xml

@@ -38,6 +38,7 @@
         other_check
         SET
         <if test="dept_id != null">dept_id = #{dept_id}</if>
+        <if test="user_id != null">,user_id = #{user_id}</if>
         <if test="check_person_id != null">,check_person_id = #{check_person_id}</if>
         <if test="check_type != null">,check_type = #{check_type}</if>
         <if test="check_type != null">,check_type = #{check_type}</if>