瀏覽代碼

问题修改

liuyifan 6 年之前
父節點
當前提交
4125bf5e25

+ 9 - 0
CallCenterWeb.UI/.project

@@ -123,5 +123,14 @@
123 123
 				<arguments>1.0-name-matches-false-false-node_modules</arguments>
124 124
 			</matcher>
125 125
 		</filter>
126
+		<filter>
127
+			<id>1582853514861</id>
128
+			<name></name>
129
+			<type>26</type>
130
+			<matcher>
131
+				<id>org.eclipse.ui.ide.multiFilter</id>
132
+				<arguments>1.0-name-matches-false-false-node_modules</arguments>
133
+			</matcher>
134
+		</filter>
126 135
 	</filteredResources>
127 136
 </projectDescription>

+ 4 - 4
CallCenterWeb.UI/Message/MessageSend.html

@@ -48,11 +48,11 @@
48 48
                     <td>
49 49
                         <select name="" id="tiyet">
50 50
 							<option value="">--请选择--</option>
51
-							<option value="来院方式">来院方式</option>
51
+							<!--<option value="来院方式">来院方式</option>
52 52
 							<option value="预约挂号">预约挂号</option>
53 53
 							<option value="再次提醒">再次提醒</option>
54 54
 							<option value="医院相关介绍">医院相关介绍</option>
55
-							<option value="专家坐诊时间">专家坐诊时间</option>
55
+							<option value="专家坐诊时间">专家坐诊时间</option>-->
56 56
 						</select>
57 57
                     </td>
58 58
                 </tr>
@@ -249,10 +249,10 @@
249 249
         }
250 250
         //短信类型
251 251
         function GetDicValueList() {
252
-            $("#type").empty();
252
+//          $("#tiyet").empty();
253 253
             $.getJSON(huayi.config.callcenter_url + "Dictionary/GetDicValueList", { token: $.cookie("token"), Id: "DXLX" }, function (data) {
254 254
                 $(data.rows).each(function (i, n) {
255
-                    $("#type").append('<option value="' + n.F_DictionaryValueId + '">' + n.F_Name + '</option>');
255
+                    $("#tiyet").append('<option value="' + n.F_DictionaryValueId + '">' + n.F_Name + '</option>');
256 256
                 })
257 257
             })
258 258
         }

+ 9 - 13
CallCenterWeb.UI/Message/MessageType.html

@@ -34,11 +34,6 @@
34 34
                     <ul>
35 35
                         <li>短信类型:<select name="" id="Dximlx" style="padding: 4px;border-color: #e5e6e7;width:150px;">
36 36
 							<option value="">--请选择--</option>
37
-							<option value="来院方式">来院方式</option>
38
-							<option value="预约挂号">预约挂号</option>
39
-							<option value="再次提醒">再次提醒</option>
40
-							<option value="医院相关介绍">医院相关介绍</option>
41
-							<option value="专家坐诊时间">专家坐诊时间</option>
42 37
 						</select></li>
43 38
 						<li>
44 39
 						   关键字搜索: <input class="photo x-color" type="text" id="Mohouyt">
@@ -67,6 +62,7 @@
67 62
     <script>
68 63
         var token = $.cookie("token");
69 64
         initTable();
65
+        Type();
70 66
         var html = '<div >' +
71 67
             '<ul class="nav nav-tabs">' +
72 68
             '<li class="active">' +
@@ -149,14 +145,14 @@
149 145
                 area: ['35%', '45%'], //宽高
150 146
             });
151 147
         });
152
-		// //短信类型
153
-		// function Type() {
154
-		//     $.getJSON(huayi.config.callcenter_url + "Dictionary/GetDicValueList", { token: $.cookie("token"), Id: "DXLX" }, function (data) {
155
-		//         $(data.rows).each(function (i, n) {
156
-		//             $("#MessageType").append('<option value="' + n.F_DictionaryValueId + '">' + n.F_Name + '</option>');
157
-		//         })
158
-		//     })
159
-		// }
148
+		 //短信类型
149
+		 function Type() {
150
+		     $.getJSON(huayi.config.callcenter_url + "Dictionary/GetDicValueList", { token: $.cookie("token"), Id: "DXLX" }, function (data) {
151
+		         $(data.rows).each(function (i, n) {
152
+		             $("#Dximlx").append('<option value="' + n.F_DictionaryValueId + '">' + n.F_Name + '</option>');
153
+		         })
154
+		     })
155
+		 }
160 156
         //新增
161 157
         function addedit() {
162 158
             if (!$("#MessageType").val()) {

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

@@ -283,7 +283,7 @@
283 283
 	</head>
284 284
 
285 285
 	<body class="gray-bg">
286
-		<div class="daoHang clearfix">
286
+		<!--<div class="daoHang clearfix">
287 287
 			<div class="dhLeft">
288 288
 				<sapn><i class="syIcon"></i>位置:
289 289
 					<a href="javaScript:;" id="ReIndex">首页</a>&gt;
@@ -295,7 +295,7 @@
295 295
 			<div class="dhRight">
296 296
 				<a href="#" title="刷新"><i class="fa fa-refresh"></i></a>
297 297
 			</div>
298
-		</div>
298
+		</div>-->
299 299
 		<div class="wrapper wrapper-content animated fadeInRight">
300 300
 			<div class="row" style="margin-top: 20px;">
301 301
 				<!--左边-->

+ 8 - 8
CallCenterWeb.UI/index.html

@@ -1377,8 +1377,8 @@
1377 1377
 												<th data-field="F_Telephone" data-formatter="view" data-align="center">转接电话</th>
1378 1378
 												<!--<th data-field="CallState" data-formatter="GetCallState">呼叫状态</th>
1379 1379
 												<th data-field="DealType" data-formatter="formatterDealType" data-align="center">处理方式</th>-->
1380
-												<th data-field="F_Department" data-align="center">部门</th>		
1381
-												<th data-field="F_Section" data-align="center">科室</th>
1380
+												<th data-field="Department_Name" data-align="center">部门</th>		
1381
+												<th data-field="Section_Name" data-align="center">科室</th>
1382 1382
 												<th data-field="F_Title" data-align="center">转接时间</th>
1383 1383
 												<!--<th data-field="F_Physician">医师姓名</th>-->
1384 1384
 												<!--<th data-field="F_Physician">职称</th>-->
@@ -1435,8 +1435,8 @@
1435 1435
 												<th data-checkbox="true" data-align="center"></th>
1436 1436
 												<th data-field="id1" data-align="center">编号</th>
1437 1437
 												<th data-field="F_Telephone" data-formatter="view" data-align="center">电话</th>
1438
-												<th data-field="F_Department" data-align="center">部门</th>
1439
-												<th data-field="F_Section" data-align="center">科室</th>
1438
+												<th data-field="Department_Name" data-align="center">部门</th>
1439
+												<th data-field="Section_Name" data-align="center">科室</th>
1440 1440
 												<th data-field="F_Physician" data-align="center">医师姓名</th>
1441 1441
 												<th data-field="F_Title" data-align="center">职称</th>
1442 1442
 												<th data-field="ID" data-formatter="formatterOprateSF" data-align="center">操作</th>
@@ -1592,8 +1592,8 @@
1592 1592
 												<th data-field="F_Telephone" data-formatter="view" data-align="center">转接电话</th>
1593 1593
 												<!--<th data-field="CallState" data-formatter="GetCallState">呼叫状态</th>
1594 1594
 												<th data-field="DealType" data-formatter="formatterDealType" data-align="center">处理方式</th>-->
1595
-												<th data-field="F_Department" data-align="center">部门</th>		
1596
-												<th data-field="F_Section" data-align="center">科室</th>
1595
+												<th data-field="Department_Name" data-align="center">部门</th>		
1596
+												<th data-field="Section_Name" data-align="center">科室</th>
1597 1597
 												<th data-field="F_Type" data-align="center">转接时间</th>
1598 1598
 												<!--<th data-field="F_Physician">医师姓名</th>-->
1599 1599
 												<!--<th data-field="F_Physician">职称</th>-->
@@ -1648,8 +1648,8 @@
1648 1648
 												<th data-checkbox="true" data-align="center"></th>
1649 1649
 												<th data-field="ID" data-align="center">编号</th>
1650 1650
 												<!--<th data-field="F_Physician">医师</th>-->
1651
-												<th data-field="F_Department" data-align="center">部门</th>
1652
-												<th data-field="F_Section" data-align="center">科室</th>
1651
+												<th data-field="Department_Name" data-align="center">部门</th>
1652
+												<th data-field="Section_Name" data-align="center">科室</th>
1653 1653
 												<th data-field="F_Telephone" data-formatter="view" data-align="center">电话</th>
1654 1654
 												<th data-field="ID" data-formatter="formatterOprate" data-align="center">操作</th>
1655 1655