Browse Source

禅道bug修改

liuzhen 6 years ago
parent
commit
e9dc8ab7c0

+ 3 - 0
CallCenterWeb.UI/OutboundMessage/xgPlan.html

21
 				<table class="form_table">
21
 				<table class="form_table">
22
 					<tr>
22
 					<tr>
23
 						<th>
23
 						<th>
24
+							<b class="text-red">*</b>
24
 							<span> 计划名称:</span>
25
 							<span> 计划名称:</span>
25
 						</th>
26
 						</th>
26
 						<td>
27
 						<td>
29
 					</tr>
30
 					</tr>
30
 					<tr>
31
 					<tr>
31
 						<th>
32
 						<th>
33
+							<b class="text-red">*</b>
32
 							<span>调查问卷:</span>
34
 							<span>调查问卷:</span>
33
 						</th>
35
 						</th>
34
 						<td>
36
 						<td>
38
 					</tr>
40
 					</tr>
39
 					<tr>
41
 					<tr>
40
 						<th>
42
 						<th>
43
+							<b class="text-red">*</b>
41
 							<span>说明备注:</span>
44
 							<span>说明备注:</span>
42
 						</th>
45
 						</th>
43
 						<td>
46
 						<td>

+ 2 - 2
CallCenterWeb.UI/Quality/zhibiaoguanli.html

42
         </div>
42
         </div>
43
         <div class="top clearfix">
43
         <div class="top clearfix">
44
             <div class="topCon">
44
             <div class="topCon">
45
-                &nbsp;&nbsp;&nbsp;&nbsp;关键字
46
-                <input type="text" id="Keys" placeholder="请输入关键字" /> &nbsp;&nbsp;&nbsp;&nbsp;
45
+                &nbsp;&nbsp;&nbsp;&nbsp;指标标题
46
+                <input type="text" id="Keys" placeholder="请输入指标标题" /> &nbsp;&nbsp;&nbsp;&nbsp;
47
                 <button class="btn sear">搜索</button>
47
                 <button class="btn sear">搜索</button>
48
             </div>
48
             </div>
49
         </div>
49
         </div>

+ 1 - 1
CallCenterWeb.UI/Questionnaire/QuestionSetting.html

189
 				<table id="tb1">
189
 				<table id="tb1">
190
 					<thead>
190
 					<thead>
191
 						<tr>
191
 						<tr>
192
-							<th data-field="checkbox" data-align="center" data-formatter="setCode"></th>
192
+							<th data-field="checkbox" data-align="center" data-formatter="setCode">编号</th>
193
 							<th data-align="center" data-field="F_Title">试卷名称</th>
193
 							<th data-align="center" data-field="F_Title">试卷名称</th>
194
 							<th data-align="center" data-field="F_PagerId" data-formatter="Code">操作</th>
194
 							<th data-align="center" data-field="F_PagerId" data-formatter="Code">操作</th>
195
 
195
 

+ 2 - 2
CallCenterWeb.UI/Questionnaire/QuestionsManagement.html

115
 				<table id="tb1">
115
 				<table id="tb1">
116
 					<thead>
116
 					<thead>
117
 						<tr>
117
 						<tr>
118
-							<th data-field="checkbox" data-align="center" data-formatter="setCode"></th>
118
+							<th data-field="checkbox" data-align="center" data-formatter="setCode">编号</th>
119
 							<th data-align="center" data-field="F_CategoryName">试题分类</th>
119
 							<th data-align="center" data-field="F_CategoryName">试题分类</th>
120
 						</tr>
120
 						</tr>
121
 					</thead>
121
 					</thead>
135
 				<table id="tbr">
135
 				<table id="tbr">
136
 					<thead>
136
 					<thead>
137
 						<tr>
137
 						<tr>
138
-							<th data-align="center" data-field="id" data-formatter="setCode"></th>
138
+							<th data-align="center" data-field="id" data-formatter="setCode">编号</th>
139
 							<th data-align="center" data-field="F_CategoryName">试题分类</th>
139
 							<th data-align="center" data-field="F_CategoryName">试题分类</th>
140
 							<th data-align="center" data-field="F_Type" data-formatter="Type">试题类型</th>
140
 							<th data-align="center" data-field="F_Type" data-formatter="Type">试题类型</th>
141
 							<th data-align="center" data-field="F_Title">试题标题</th>
141
 							<th data-align="center" data-field="F_Title">试题标题</th>

+ 5 - 1
CallCenterWeb.UI/SystemManager/js/jueSeQuanXian.js

259
 			$.each(ztree, function(i, n) {
259
 			$.each(ztree, function(i, n) {
260
 				app.push(n.id);
260
 				app.push(n.id);
261
 			});
261
 			});
262
-			pro(app, jsid);
262
+			if(app.length==0){
263
+				layer.msg('请选择权限!')
264
+			}else{
265
+				pro(app, jsid);
266
+			}
263
 		})
267
 		})
264
 		//左边表格
268
 		//左边表格
265
 		initTable(token, jsname);
269
 		initTable(token, jsname);

+ 7 - 3
CallCenterWeb.UI/SystemManager/js/shuJuZiDian.js

90
             sort: $('.addSort').val()
90
             sort: $('.addSort').val()
91
         },
91
         },
92
         success: function (data) {
92
         success: function (data) {
93
+        	$('.inps1').val('');
94
+	        $('.addzdz').val('');
95
+	        $('.addSort').val('');
93
             if (data.state.toLowerCase() == 'success') {
96
             if (data.state.toLowerCase() == 'success') {
94
                 layer.msg("添加成功!");
97
                 layer.msg("添加成功!");
95
                 table.bootstrapTable('refresh');
98
                 table.bootstrapTable('refresh');
96
-                $('.inps1').val('');
97
-                $('.addzdz').val('');
98
-                $('.addSort').val('');
99
+                
99
             }
100
             }
100
         }
101
         }
101
     });
102
     });
202
                 $('.inps4').val('');
203
                 $('.inps4').val('');
203
                 $('.chanzdz').val('');
204
                 $('.chanzdz').val('');
204
                 $('.changeCode').val('');
205
                 $('.changeCode').val('');
206
+                bs='';
205
             }
207
             }
206
         }
208
         }
207
     });
209
     });
278
 $('.addList_cun').click(function () {
280
 $('.addList_cun').click(function () {
279
     $('.zdlist_addModel').css('display', 'none');
281
     $('.zdlist_addModel').css('display', 'none');
280
     addList();
282
     addList();
283
+    bs='';
281
 });
284
 });
282
 function addList() {
285
 function addList() {
283
     $.ajax({
286
     $.ajax({
357
 $('.chanList_cun').click(function () {
360
 $('.chanList_cun').click(function () {
358
     $('.zdlist_chanModel').css('display', 'none');
361
     $('.zdlist_chanModel').css('display', 'none');
359
     tjc(token, rlag);
362
     tjc(token, rlag);
363
+    bs='';
360
 
364
 
361
 });
365
 });
362
 function tjc(token, rlag) {
366
 function tjc(token, rlag) {

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

132
 							type: 2,
132
 							type: 2,
133
 							content: "../TelCall/XgBlack.html?str=" + blackid,
133
 							content: "../TelCall/XgBlack.html?str=" + blackid,
134
 							title: '修改黑名单',
134
 							title: '修改黑名单',
135
-							area: ['55%', '80%'], //宽高
135
+							area: ['55%', '65%'], //宽高
136
 						});
136
 						});
137
 
137
 
138
 					}
138
 					}
144
 						type: 2,
144
 						type: 2,
145
 						content: "../TelCall/AddBlack.html?",
145
 						content: "../TelCall/AddBlack.html?",
146
 						title: '添加黑名单',
146
 						title: '添加黑名单',
147
-						area: ['55%', '80%'], //宽高
147
+						area: ['55%', '65%'], //宽高
148
 					});
148
 					});
149
 				});
149
 				});
150
 
150
 

+ 80 - 3
CallCenterWeb.UI/WorkOrder/WorkOrderDispose.html

154
 				border-right: 1px solid #DDDDDD;
154
 				border-right: 1px solid #DDDDDD;
155
 				border-bottom: 1px solid #DDDDDD;
155
 				border-bottom: 1px solid #DDDDDD;
156
 			}
156
 			}
157
+			.t-shade-ly {
158
+				position: fixed;
159
+				top: 0;
160
+				left: 0;
161
+				width: 100%;
162
+				height: 100%;
163
+				background: rgba(0, 0, 0, 0.48);
164
+				z-index: 10004;
165
+				display: none;
166
+			}
167
+			
168
+			.shade_k_ly {
169
+				z-index: 10005;
170
+				width: 40%;
171
+				height: 130px;
172
+				margin: 10% auto;
173
+				background-color: #fff;
174
+				box-shadow: 1px 1px 50px rgba(0, 0, 0, .3);
175
+				border-radius: 5px;
176
+			}
177
+			
178
+			.shade_title_ly {
179
+				padding: 0 80px 0 20px;
180
+				height: 42px;
181
+				line-height: 42px;
182
+				border-bottom: 1px solid #eee;
183
+				font-size: 16px;
184
+				color: #FFFFFF;
185
+				overflow: hidden;
186
+				background-color: rgb(26, 179, 148);
187
+				border-radius: 2px 2px 0 0;
188
+				position: relative;
189
+			}
190
+			.setwin {
191
+				position: absolute;
192
+				right: 15px;
193
+				top: 5px;
194
+				font-size: 20px;
195
+				line-height: initial;
196
+			}
197
+			
198
+			.setwin a {
199
+				font-size: 20px;
200
+				color: #fff;
201
+			}
202
+			
203
+			.shade_content {
204
+				overflow-y: auto;
205
+				position: relative;
206
+				padding-bottom: 50px;
207
+				padding: 10px;
208
+			}
209
+			.cx {
210
+			    display: block;
211
+			}
212
+			._table1 > tbody > tr > th {
213
+				text-align: center;
214
+			}
215
+			._table1>thead>tr>th{
216
+				text-align: center;
217
+			}
157
 		</style>
218
 		</style>
158
 	</head>
219
 	</head>
159
 	<body class="gray-bg">
220
 	<body class="gray-bg">
245
 							<th data-field="F_Typeof" data-align="center">工单类型</th>
306
 							<th data-field="F_Typeof" data-align="center">工单类型</th>
246
 							<th data-field="F_Definition" data-align="center">营业厅名称</th>
307
 							<th data-field="F_Definition" data-align="center">营业厅名称</th>
247
 							<th data-field="F_Dealing" data-align="center">处理人</th>
308
 							<th data-field="F_Dealing" data-align="center">处理人</th>
248
-							<th data-field="" data-align="center">录音</th>
309
+							<th data-field="FilePath" data-align="center" data-formatter="setCode">录音</th>
249
 							<th data-field="F_WorkOrderId" data-formatter="Dispose" data-align="center">操作</th>
310
 							<th data-field="F_WorkOrderId" data-formatter="Dispose" data-align="center">操作</th>
250
 						</tr>
311
 						</tr>
251
 					</thead>
312
 					</thead>
266
 							<th data-field="F_Typeof" data-align="center">工单类型</th>
327
 							<th data-field="F_Typeof" data-align="center">工单类型</th>
267
 							<!--<th data-field="F_Definition" data-align="center">营业厅名称</th>-->
328
 							<!--<th data-field="F_Definition" data-align="center">营业厅名称</th>-->
268
 							<!--<th data-field="F_Dealing" data-align="center">处理人</th>-->
329
 							<!--<th data-field="F_Dealing" data-align="center">处理人</th>-->
269
-							<th data-field="" data-align="center">录音</th>
330
+							<th data-field="FilePath" data-align="center" data-formatter="setCode">录音</th>
270
 							<th data-field="F_WorkOrderId" data-formatter="Dispose" data-align="center">操作</th>
331
 							<th data-field="F_WorkOrderId" data-formatter="Dispose" data-align="center">操作</th>
271
 						</tr>
332
 						</tr>
272
 					</thead>
333
 					</thead>
273
 				</table>
334
 				</table>
274
 			</div>
335
 			</div>
336
+			<!--录音-->
337
+			<div class="t-shade-ly">
338
+		        <div class="shade_k_ly">
339
+		            <div class="shade_title_ly">
340
+		                <span>录音播放与下载<srong class="cknum"></srong></span>
341
+		                <span class="setwin"><a>x</a></span>
342
+		            </div>
343
+		            <div class="shade_content">
344
+		                <div class="Ly_box audiojs">
345
+		                </div>
346
+		                <div class="boxCon LY_box">
347
+		
348
+		                </div>
349
+		            </div>
350
+		        </div>
351
+		    </div>
275
 			<!--查看详情-->
352
 			<!--查看详情-->
276
 			<div class="ckxq  Hidens">
353
 			<div class="ckxq  Hidens">
277
 				<ul class="clearfix ckxq_ul">
354
 				<ul class="clearfix ckxq_ul">
384
 					<span>处理工单<srong class="cknum"></srong></span>
461
 					<span>处理工单<srong class="cknum"></srong></span>
385
 					<span class="setwin"><a>x</a></span>
462
 					<span class="setwin"><a>x</a></span>
386
 				</div>
463
 				</div>
387
-				<div class="shade_content">
464
+				<div class="shade_content" >
388
 					<div class="dgxx_table size-13">
465
 					<div class="dgxx_table size-13">
389
 						<table class="_table1 table table-bordered" border="0" cellspacing="0" cellpadding="0" style="width: 100%;">
466
 						<table class="_table1 table table-bordered" border="0" cellspacing="0" cellpadding="0" style="width: 100%;">
390
 							<thead>
467
 							<thead>

+ 73 - 2
CallCenterWeb.UI/WorkOrder/WorkOrderParty.html

178
 			.RemoveC a{
178
 			.RemoveC a{
179
 				margin-bottom: 0;
179
 				margin-bottom: 0;
180
 			}
180
 			}
181
+			.t-shade-ly {
182
+				position: fixed;
183
+				top: 0;
184
+				left: 0;
185
+				width: 100%;
186
+				height: 100%;
187
+				background: rgba(0, 0, 0, 0.48);
188
+				z-index: 10004;
189
+				display: none;
190
+			}
191
+			
192
+			.shade_k_ly {
193
+				z-index: 10005;
194
+				width: 40%;
195
+				height: 130px;
196
+				margin: 10% auto;
197
+				background-color: #fff;
198
+				box-shadow: 1px 1px 50px rgba(0, 0, 0, .3);
199
+				border-radius: 5px;
200
+			}
201
+			
202
+			.shade_title_ly {
203
+				padding: 0 80px 0 20px;
204
+				height: 42px;
205
+				line-height: 42px;
206
+				border-bottom: 1px solid #eee;
207
+				font-size: 16px;
208
+				color: #FFFFFF;
209
+				overflow: hidden;
210
+				background-color: rgb(26, 179, 148);
211
+				border-radius: 2px 2px 0 0;
212
+				position: relative;
213
+			}
214
+			.setwin {
215
+				position: absolute;
216
+				right: 15px;
217
+				top: 5px;
218
+				font-size: 20px;
219
+				line-height: initial;
220
+			}
221
+			
222
+			.setwin a {
223
+				font-size: 20px;
224
+				color: #fff;
225
+			}
226
+			
227
+			.shade_content {
228
+				overflow-y: auto;
229
+				position: relative;
230
+				padding-bottom: 50px;
231
+				padding: 10px;
232
+			}
233
+			.cx {
234
+			    display: block;
235
+			}
181
 		</style>
236
 		</style>
182
 
237
 
183
 	</head>
238
 	</head>
269
 							<th data-field="F_Typeof" data-align="center">工单类型</th>
324
 							<th data-field="F_Typeof" data-align="center">工单类型</th>
270
 							<th data-field="F_Definition" data-align="center">营业厅名称</th>
325
 							<th data-field="F_Definition" data-align="center">营业厅名称</th>
271
 							<th data-field="F_Dealing" data-align="center">处理人</th>
326
 							<th data-field="F_Dealing" data-align="center">处理人</th>
272
-							<th data-field="" data-align="center">录音</th>
327
+							<th data-field="FilePath" data-align="center" data-formatter="setCode">录音</th>
273
 							<th data-field="F_WorkOrderId" data-formatter="Appoint" data-align="center">操作</th>
328
 							<th data-field="F_WorkOrderId" data-formatter="Appoint" data-align="center">操作</th>
274
 						</tr>
329
 						</tr>
275
 					</thead>
330
 					</thead>
289
 							<th data-field="F_Typeof" data-align="center">工单类型</th>
344
 							<th data-field="F_Typeof" data-align="center">工单类型</th>
290
 							<!--<th data-field="F_Definition" data-align="center">营业厅名称</th>-->
345
 							<!--<th data-field="F_Definition" data-align="center">营业厅名称</th>-->
291
 							<!--<th data-field="F_Dealing" data-align="center">处理人</th>-->
346
 							<!--<th data-field="F_Dealing" data-align="center">处理人</th>-->
292
-							<th data-field="" data-align="center">录音</th>
347
+							<th data-field="FilePath" data-align="center" data-formatter="setCode">录音</th>
293
 							<th data-field="F_WorkOrderId" data-formatter="Appoint" data-align="center">操作</th>
348
 							<th data-field="F_WorkOrderId" data-formatter="Appoint" data-align="center">操作</th>
294
 						</tr>
349
 						</tr>
295
 					</thead>
350
 					</thead>
296
 				</table>
351
 				</table>
297
 			</div>
352
 			</div>
353
+			<!--录音-->
354
+			<div class="t-shade-ly">
355
+		        <div class="shade_k_ly">
356
+		            <div class="shade_title_ly">
357
+		                <span>录音播放与下载<srong class="cknum"></srong></span>
358
+		                <span class="setwin"><a>x</a></span>
359
+		            </div>
360
+		            <div class="shade_content">
361
+		                <div class="Ly_box audiojs">
362
+		                </div>
363
+		                <div class="boxCon LY_box">
364
+		
365
+		                </div>
366
+		            </div>
367
+		        </div>
368
+		    </div>
298
 			<!--查看详情-->
369
 			<!--查看详情-->
299
 			<div class="ckxq  Hidens">
370
 			<div class="ckxq  Hidens">
300
 				<ul class="clearfix ckxq_ul">
371
 				<ul class="clearfix ckxq_ul">

+ 4 - 4
CallCenterWeb.UI/businessHall/js/keHuManger.js

40
             type: 2,
40
             type: 2,
41
             title: '修改营业厅信息',
41
             title: '修改营业厅信息',
42
             maxmin: true, //开启最大化最小化按钮
42
             maxmin: true, //开启最大化最小化按钮
43
-            area: ['30%', '50%'],
43
+            area: ['30%', '40%'],
44
             //              content: 'addCustomerFile.html'
44
             //              content: 'addCustomerFile.html'
45
             content: 'addCustomerFile.html?ids=' + did
45
             content: 'addCustomerFile.html?ids=' + did
46
         });
46
         });
120
                 pagesize: params.pageSize,
120
                 pagesize: params.pageSize,
121
                 type:1,//0客户档案,1营业厅
121
                 type:1,//0客户档案,1营业厅
122
                 token: token,
122
                 token: token,
123
-                name: $('.contact_name').val(), //联系人
124
-                tel: $('.phone').val(), //电话
125
-                definition:$(".business_hall").val(),//客户类型
123
+                name: $('.contact_name').val().trim(), //联系人
124
+                tel: $('.phone').val().trim(), //电话
125
+                definition:$(".business_hall").val().trim(),//客户类型
126
                 starttime:$('#greetingTimes').val() && $('#greetingTimes').val().split(' ~ ')[0],//开始时间
126
                 starttime:$('#greetingTimes').val() && $('#greetingTimes').val().split(' ~ ')[0],//开始时间
127
 	            endtime:$('#greetingTimes').val() && $('#greetingTimes').val().split(' ~ ')[1],//结束时间
127
 	            endtime:$('#greetingTimes').val() && $('#greetingTimes').val().split(' ~ ')[1],//结束时间
128
                 //logindate: $('.loginTime').val() //登录时间
128
                 //logindate: $('.loginTime').val() //登录时间

+ 6 - 0
CallCenterWeb.UI/js/Questions/QuestionSetting.js

27
 	//Finish(keys);
27
 	//Finish(keys);
28
 	IndexCategoryGe();
28
 	IndexCategoryGe();
29
 });
29
 });
30
+//回车搜索
31
+$('#KeyWords').on('keypress',function(e){
32
+	if(e.keyCode==13){
33
+		IndexCategoryGe();
34
+	}
35
+})
30
 //*删除*/
36
 //*删除*/
31
 $(".inpBox").hover(function(event) {
37
 $(".inpBox").hover(function(event) {
32
 	$(this).children(".de_icon").show();
38
 	$(this).children(".de_icon").show();

+ 42 - 1
CallCenterWeb.UI/js/WorkOrder/WorkOrder.js

47
 		initTable();
47
 		initTable();
48
 		initTables();
48
 		initTables();
49
 	})
49
 	})
50
+	//回车搜索
51
+	$('#cityName').on('keypress',function(e){
52
+		if(e.keyCode==13){
53
+			stype = 1;
54
+			initTable();
55
+			initTables();
56
+		}
57
+	})
58
+	$('#keyWord').on('keypress',function(e){
59
+		if(e.keyCode==13){
60
+			stype = 1;
61
+			initTable();
62
+			initTables();
63
+		}
64
+	})
65
+	$('#orderNum').on('keypress',function(e){
66
+		if(e.keyCode==13){
67
+			stype = 1;
68
+			initTable();
69
+			initTables();
70
+		}
71
+	})
50
 	$('.plasechoce').click(function() {
72
 	$('.plasechoce').click(function() {
51
 		$(this).parent().siblings('input').val('');
73
 		$(this).parent().siblings('input').val('');
52
 	})
74
 	})
66
 		$(".t-shade").removeClass("cx");
88
 		$(".t-shade").removeClass("cx");
67
 		$(".gjsu").removeClass("cx");
89
 		$(".gjsu").removeClass("cx");
68
 		$(".cbgd").removeClass("cx");
90
 		$(".cbgd").removeClass("cx");
91
+		$(".t-shade-ly").removeClass("cx");
69
 	})
92
 	})
70
 	//详情
93
 	//详情
71
 	$(".ckxq ul li").click(function() {
94
 	$(".ckxq ul li").click(function() {
698
 	}
721
 	}
699
 	
722
 	
700
 }
723
 }
701
-
724
+//音频
725
+function setCode(val) {
726
+	if(val) {
727
+		return '<div class="imgs" style="cursor: pointer;margin-left:10px">' +
728
+			'<img src="../img/vice.png" alt="" onclick= LY(this) item="' + val + '" />' +
729
+			'</div>';
730
+	} else {
731
+		return '';
732
+	}
733
+}
734
+//录音
735
+function LY(val) {
736
+	var path = $(val).attr("item");
737
+	$(".t-shade-ly").addClass("cx");
738
+	$(".gjss").removeClass("cx");
739
+	$(".xqlb").addClass("cx");
740
+	$(".Ly_box").empty();
741
+	$('<audio style="width: 100%;"class=" " src="' + path + '" loop="loop" controls="controls" ></audio>').appendTo(".Ly_box");
742
+}
702
 function btnRemove(str, row) {
743
 function btnRemove(str, row) {
703
 	var type = $('#orderSource').val(); //工单来源
744
 	var type = $('#orderSource').val(); //工单来源
704
 	var typeclass = $('#typeclassId').val(); //工单类型
745
 	var typeclass = $('#typeclassId').val(); //工单类型

+ 1 - 1
CallCenterWeb.UI/keHuManager/ContactPersonManger.html

18
 				<sapn><i class="syIcon"></i>位置:
18
 				<sapn><i class="syIcon"></i>位置:
19
 					<a href="javaScript:;" id="ReIndex">首页</a>&gt;
19
 					<a href="javaScript:;" id="ReIndex">首页</a>&gt;
20
 					<a href="javaScript:;">客户管理</a>&gt;
20
 					<a href="javaScript:;">客户管理</a>&gt;
21
-					<a href="" class="nowPosition">客户档案管理</a>
21
+					<a href="" class="nowPosition">客户档案列表</a>
22
 				</sapn>
22
 				</sapn>
23
 			</div>
23
 			</div>
24
 			<div class="dhRight">
24
 			<div class="dhRight">

+ 1 - 1
CallCenterWeb.UI/keHuManager/addCustomerFile.html

97
 							</div>
97
 							</div>
98
 						</li>
98
 						</li>
99
 						<li class="form-group">
99
 						<li class="form-group">
100
-							<label for="customer_layer" class="col-md-2" style="float: left;"><i style="color: #FF0000">*&nbsp;</i>客户类型:</label>
100
+							<label for="customer_layer" class="col-md-2" style="float: left;"><i style="color: #FF0000">&nbsp;&nbsp;</i>客户类型:</label>
101
 							<div class="col-md-9">
101
 							<div class="col-md-9">
102
                                 <select name="" class="form-control orderType">
102
                                 <select name="" class="form-control orderType">
103
                                 	<option value="0">请选择客户类型</option>
103
                                 	<option value="0">请选择客户类型</option>

+ 3 - 3
CallCenterWeb.UI/keHuManager/js/keHuManger.js

40
             type: 2,
40
             type: 2,
41
             title: '修改客户信息',
41
             title: '修改客户信息',
42
             maxmin: true, //开启最大化最小化按钮
42
             maxmin: true, //开启最大化最小化按钮
43
-            area: ['30%', '50%'],
43
+            area: ['30%', '40%'],
44
             //              content: 'addCustomerFile.html'
44
             //              content: 'addCustomerFile.html'
45
             content: 'addCustomerFile.html?ids=' + did
45
             content: 'addCustomerFile.html?ids=' + did
46
         });
46
         });
120
                 pagesize: params.pageSize,
120
                 pagesize: params.pageSize,
121
                 type:0,//0客户档案,1营业厅
121
                 type:0,//0客户档案,1营业厅
122
                 token: token,
122
                 token: token,
123
-                name: $('.contact_name').val(), //联系人
124
-                tel: $('.phone').val(), //电话
123
+                name: $('.contact_name').val().trim(), //联系人
124
+                tel: $('.phone').val().trim(), //电话
125
                 customertype:customertype,//客户类型
125
                 customertype:customertype,//客户类型
126
                 starttime:$('#greetingTimes').val() && $('#greetingTimes').val().split(' ~ ')[0],//开始时间
126
                 starttime:$('#greetingTimes').val() && $('#greetingTimes').val().split(' ~ ')[0],//开始时间
127
 	            endtime:$('#greetingTimes').val() && $('#greetingTimes').val().split(' ~ ')[1],//结束时间
127
 	            endtime:$('#greetingTimes').val() && $('#greetingTimes').val().split(' ~ ')[1],//结束时间

+ 3 - 2
CallCenterWeb.UI/zhiShiKu/js/zhiShiKuManger.js

159
 $('.addCun').click(function() {
159
 $('.addCun').click(function() {
160
 	console.log(addPid);
160
 	console.log(addPid);
161
 	if($('.inps1').val() == "" || $('.addTitle').val() == "") {
161
 	if($('.inps1').val() == "" || $('.addTitle').val() == "") {
162
-		layer.confirm('所添加内容不允许为空!', {
162
+		layer.confirm('所添加分类与标题不允许为空!', {
163
 			btn: ['确定']
163
 			btn: ['确定']
164
 		});
164
 		});
165
 		return;
165
 		return;
448
 
448
 
449
 function setCode(val, row, index) {
449
 function setCode(val, row, index) {
450
 	var page = table.bootstrapTable("getPageCode");
450
 	var page = table.bootstrapTable("getPageCode");
451
-	return page.pageSize * (page.pageNumber - 1) + index + 1;
451
+//	return page.pageSize * (page.pageNumber - 1) + index + 1;
452
+	return index + 1;
452
 }
453
 }
453
 
454
 
454
 //点击标题 内容查看详情
455
 //点击标题 内容查看详情

+ 1 - 1
CallCenterWeb.UI/zhiShiKu/zhiShiKuChaXun.html

80
 			</div>
80
 			</div>
81
 			<div class="toolBar clearfix">
81
 			<div class="toolBar clearfix">
82
 				<div class="toolRight">
82
 				<div class="toolRight">
83
-					<span>关键字:<input type="text" class="searCon" placeholder="请输入关键字" /></span>
83
+					<span>搜索内容:<input type="text" class="searCon" placeholder="请输入搜索内容" /></span>
84
 					<button class="btns searchGo">搜索</button>
84
 					<button class="btns searchGo">搜索</button>
85
 				</div>
85
 				</div>
86
 
86
 

+ 2 - 2
CallCenterWeb.UI/zhiShiKu/zhiShiKuFenLei.html

45
 					<p class="btr addBtr" title="关闭">X</p>
45
 					<p class="btr addBtr" title="关闭">X</p>
46
 				</div>
46
 				</div>
47
 				<div class="boxCon">
47
 				<div class="boxCon">
48
-					<div>所属分类:
48
+					<div><i style="color: #FF0000">*&nbsp;</i>所属分类:
49
 						<div class="inpBox">
49
 						<div class="inpBox">
50
 							<input type="text" class="inps inps1" />
50
 							<input type="text" class="inps inps1" />
51
 							<i class="xl xl_one"></i>
51
 							<i class="xl xl_one"></i>
56
 							</div>
56
 							</div>
57
 						</div>
57
 						</div>
58
 					</div>
58
 					</div>
59
-					<div>分类名称:<input class="inps inps2" type="text" /></div>
59
+					<div><i style="color: #FF0000">*&nbsp;</i>分类名称:<input class="inps inps2" type="text" /></div>
60
 					<div>排列序号:<input class="inps inps3" type="text" /></div>
60
 					<div>排列序号:<input class="inps inps3" type="text" /></div>
61
 					<div><button class="btns addCun">保存</button></div>
61
 					<div><button class="btns addCun">保存</button></div>
62
 				</div>
62
 				</div>

+ 1 - 1
CallCenterWeb.UI/zhiShiKu/zhiShiKuManger.html

143
 					<button class="btns del">删除</button>
143
 					<button class="btns del">删除</button>
144
 				</div>
144
 				</div>
145
 				<div class="toolRight">
145
 				<div class="toolRight">
146
-					<span>关键字:<input type="text" class="searCon" placeholder="请输入关键字" /></span>
146
+					<span>搜索内容:<input type="text" class="searCon" placeholder="请输入搜索内容" /></span>
147
 					<button class="btns searchGo">搜索</button>
147
 					<button class="btns searchGo">搜索</button>
148
 				</div>
148
 				</div>
149
 
149