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

CallCenterWeb.UI/Script/Common/huayi.http.js

@@ -358,13 +358,18 @@ helper.filter = {
 	},
 	//电话号码截取前三位和后四位
 	cutTel: function(val){
-		var str = '';
-		if(val){
-			var val1 = val.substring(0, 3);
-			var val2 = val.substr(-4);
-			str = val1 + '****' + val2;
-		}
-		return str;
+	    var str = '';
+	    var isShow = false;        // 是否截取号码
+	    if (val) {
+	        if (isShow) {
+	            var val1 = val.substring(0, 3);
+	            var val2 = val.substr(-4);
+	            str = val1 + '****' + val2;
+	        } else {
+	            str = val;
+	        }
+	    }
+	    return str;
 	}
 
 };

CallCenterWeb.UI/TelCall/Supply.html

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