Răsfoiți Sursa

申诉列表

DESKTOP-C0VON0P\wuxinglong 9 ani în urmă
părinte
comite
da5bdaebc8

+ 2 - 19
VisualInspection/js/appeal_management/appeal_list.js

@@ -12,9 +12,9 @@ $(document).ready(function(){
                         {width: 80, text: '考核人员',  flex: false, colClass: '',field:'appeal_man'},
                         {width: 80, text: '考核部门',  flex: false, colClass: '',sort: 'down',field:'appeal_dept'},
                         {width: 80, text: '稽查人员', type: 'string', flex: false, colClass: '',field:'verify_person'},
-                        {width: 80, text: '稽查时间段', type: 'date', flex: false, colClass: '',field:'start_time'},
+                        {width: 120, text: '稽查时间段', type: 'date',date_type:'yyyy-MM-dd',custom:' 00:00-24:00', flex: false, colClass: '',field:'start_time'},
                         {width: 80, text: '状态', type: 'string', flex: false, colClass: '',field:'check_status'},
-                        {width: 80, text: '上次稽查时间', type: 'date', flex: false, colClass: '',field:'start_time'},
+                        {width: 120, text: '上次稽查时间', type: 'date',date_type:'yyyy-MM-dd hh:mm', flex: false, colClass: '',field:'start_time'},
                         {width: 100, text: '操作',  flex: false, colClass: '',field:'id',field_other:'task_id',oper:[
                             {func:'seeCheckAudit',text:'查看稽查结果',col_class:''},{func:'distributionAgain',text:'在分配',col_class:''}
                         ]},
@@ -37,20 +37,3 @@ function distributionAgain(id,task_id){
     alert("task_id:"+task_id+"---id:"+id)
 }
 
-
-alert(timeStamp2String('1494259200000','yyyy/MM/dd hh:mm:ss'))
-/**
- * @Func 将长整形时间 转换制定格式
- * @param time 长整形数值
- * @returns {String}
- * @Exp timeStamp2String("1464058102000","MM/dd hh:mm")
- */
-function timeStamp2String(time,format){
-	if(time == "" || time == null)
-		return ;
-	if(format==undefined || format == "")
-		format = "yyyy/MM/dd hh:mm:ss";
-    var datetime = new Date();
-    datetime.setTime(time);
-    return datetime.Format(format);
-};

+ 11 - 2
VisualInspection/js/lib/mytable.js

@@ -98,7 +98,9 @@
                 var row = {checked: false, data:null};
                 var dArr=[];
                 for(var i=0;i<cols.length;i++){
-                    if(cols[i].oper!=null) {
+                    if(cols[i].func!=null){
+                        dArr.push(cols[i].func(obj[cols[i].field]));
+                    }else if(cols[i].oper!=null) {
                         var oper = cols[i].oper;
                         var operStr="";
                         for(var j=0;j<oper.length;j++){
@@ -106,11 +108,18 @@
                         }
                         dArr.push(operStr);
                     }else{
-                        if(obj[cols[i].field])
+                        if(cols[i].type == "date"){
+                            if(cols[i].custom){
+                                dArr.push(timeStamp2String(obj[cols[i].field],cols[i].date_type) + cols[i].custom);
+                            }else{
+                                dArr.push(timeStamp2String(obj[cols[i].field],cols[i].date_type));
+                            }
+                        }else if(obj[cols[i].field])
                             dArr.push(obj[cols[i].field]);
                         else 
                             dArr.push('');
                     }
+                    
                 }
                 row.data=dArr;
                 return row;

+ 3 - 1
VisualInspection/js/term_management/charge_terms_m.js

@@ -12,7 +12,9 @@
         var cols = [
                         {width: 30, text: '序号', flex: false, colClass: 'text-center',field:'num'},
                         {width: 160, text: '班组名称', flex: false,colClass: '',field:'name'},
-                        {width: 80, text: '所属人员分类',  flex: false, colClass: '',field:'type'},
+                        {width: 80, text: '所属人员分类',  flex: false, colClass: '',field:'type',func:function(){
+                            
+                        }},
                         {width: 80, text: '班长', type: 'date', flex: false, sort: 'down',field:'monitor'},
                         {width: 80, text: '副班长', type: 'string', flex: false, colClass: '',field:'sub_monitor'},
                         {width: 80, text: '人员',  flex: false, colClass: '',field:'user_ids'},