Przeglądaj źródła

Merge branch 'master' of http://192.168.1.222:3000/mengjie/KFLTSWCallCenter_WEB

jinquanwu 6 lat temu
rodzic
commit
22f16b264e

+ 12 - 7
CallCenterWeb.UI/Script/Common/huayi.http.js

358
 	},
358
 	},
359
 	//电话号码截取前三位和后四位
359
 	//电话号码截取前三位和后四位
360
 	cutTel: function(val){
360
 	cutTel: function(val){
361
-		var str = '';
362
-		if(val){
363
-			var val1 = val.substring(0, 3);
364
-			var val2 = val.substr(-4);
365
-			str = val1 + '****' + val2;
366
-		}
367
-		return str;
361
+	    var str = '';
362
+	    var isShow = false;        // 是否截取号码
363
+	    if (val) {
364
+	        if (isShow) {
365
+	            var val1 = val.substring(0, 3);
366
+	            var val2 = val.substr(-4);
367
+	            str = val1 + '****' + val2;
368
+	        } else {
369
+	            str = val;
370
+	        }
371
+	    }
372
+	    return str;
368
 	}
373
 	}
369
 
374
 
370
 };
375
 };

+ 2 - 2
CallCenterWeb.UI/TelCall/Supply.html

53
 							<th data-field="state" data-checkbox="true"></th>
53
 							<th data-field="state" data-checkbox="true"></th>
54
 							<th data-field="id1" data-align="center">编号</th>
54
 							<th data-field="id1" data-align="center">编号</th>
55
 							<th data-field="ContentInfo" data-align="center">轮播内容</th>
55
 							<th data-field="ContentInfo" data-align="center">轮播内容</th>
56
-							<th data-field="StartDate" data-align="center">时间</th>
57
-							<th data-field="EndDate" data-align="center">时间</th>
56
+							<th data-field="StartDate" data-align="center">起始时间</th>
57
+							<th data-field="EndDate" data-align="center">截止时间</th>
58
 							<th data-field="CreateUser" data-align="center">创建人</th>
58
 							<th data-field="CreateUser" data-align="center">创建人</th>
59
 							<th data-field="CreateTime" data-align="center">创建时间</th>
59
 							<th data-field="CreateTime" data-align="center">创建时间</th>
60
 							<!-- <th data-field="WorkOrderID" data-class="workOprate workOprate1" data-formatter="formatterOprateLogs" data-align="center">操作工单</th> -->
60
 							<!-- <th data-field="WorkOrderID" data-class="workOprate workOprate1" data-formatter="formatterOprateLogs" data-align="center">操作工单</th> -->