Kaynağa Gözat

Merge branch 'master' of http://192.168.1.222:3000/zhoufan/SQ12345_Web

liuzhen 6 yıl önce
ebeveyn
işleme
4471d9af00

+ 1 - 1
WebUI/CallCenterWeb.UI/Business/appealOrder.html

60
 					<thead>
60
 					<thead>
61
 						<tr>
61
 						<tr>
62
 							<th data-field="state" data-checkbox="true" data-align="center"></th>
62
 							<th data-field="state" data-checkbox="true" data-align="center"></th>
63
-							<th data-field="F_DeptIds" data-align="center">申诉部门</th>
63
+							<th data-field="NoticeDeptName" data-align="center">申诉部门</th>
64
 							<th data-field="F_NoticeInfo" data-align="center">通报批评内容</th>
64
 							<th data-field="F_NoticeInfo" data-align="center">通报批评内容</th>
65
 							<th data-field="F_Remark" data-align="center">申诉详情</th>
65
 							<th data-field="F_Remark" data-align="center">申诉详情</th>
66
 							<th data-field="F_CreateTime" data-align="center">申诉时间</th>
66
 							<th data-field="F_CreateTime" data-align="center">申诉时间</th>

+ 5 - 8
WebUI/CallCenterWeb.UI/CommonHtml/addAppealOrder.html

18
 				/*width: 196px;*/
18
 				/*width: 196px;*/
19
 				height: 35px;
19
 				height: 35px;
20
 				padding: 0;
20
 				padding: 0;
21
+				border-color: rgb(169, 169, 169);
21
 			}
22
 			}
22
 			ul li{
23
 			ul li{
23
 				list-style: none;
24
 				list-style: none;
25
 			.inpBox {
26
 			.inpBox {
26
 	            border: 1px solid #cccccc;
27
 	            border: 1px solid #cccccc;
27
 	    		height: 31px;
28
 	    		height: 31px;
28
-	            width: 77%;
29
+	            width: 75%;
29
 	            display: inline-block;
30
 	            display: inline-block;
30
 	            position: relative;
31
 	            position: relative;
31
 	            vertical-align: middle;
32
 	            vertical-align: middle;
129
 	        	display: none;
130
 	        	display: none;
130
 	        }
131
 	        }
131
 	        .other_reasons{
132
 	        .other_reasons{
132
-	        	width: 78%;
133
+	        	width: 75%;
133
 			}
134
 			}
134
 			.remark{
135
 			.remark{
135
-				width: 78%;
136
+				width: 75%;
136
 			}
137
 			}
137
-	        .other_contant{
138
-	        	width: 80%;
139
-	        	position: absolute;
140
-	        }
141
 		</style>
138
 		</style>
142
 	</head>
139
 	</head>
143
 	<body>
140
 	<body>
157
 						</li>
154
 						</li>
158
 						<li class="form-group">
155
 						<li class="form-group">
159
 							<label for="customer_layer" class="col-md-2" style="float: left;">通报原因:</label>
156
 							<label for="customer_layer" class="col-md-2" style="float: left;">通报原因:</label>
160
-							<div class="col-md-9" style="width: 80%; float: left; padding-left: 0;">
157
+							<div class="col-md-9" style="width: 75%; float: left; padding: 0;">
161
                                 <select name="" class="form-control orderType">
158
                                 <select name="" class="form-control orderType">
162
                                 	<option value="0">请选择通报原因</option>
159
                                 	<option value="0">请选择通报原因</option>
163
                                 </select>
160
                                 </select>

+ 1 - 1
WebUI/CallCenterWeb.UI/js/notification/appealOrder.js

66
     $('.add').click(function () {
66
     $('.add').click(function () {
67
         layer.open({
67
         layer.open({
68
             type: 2,
68
             type: 2,
69
-            title: '添加通报信息',
69
+            title: '添加申诉信息',
70
             maxmin: true, //开启最大化最小化按钮
70
             maxmin: true, //开启最大化最小化按钮
71
             area: ['40%', '50%'],
71
             area: ['40%', '50%'],
72
             content: '../CommonHtml/addAppealOrder.html'
72
             content: '../CommonHtml/addAppealOrder.html'