Просмотр исходного кода

Revert "2.4.13"

This reverts commit f41c8f729f01ba5e3a644511fd01751408c56502.
miaofuhao лет назад: 3
Родитель
Сommit
27aacfebf1
2 измененных файлов с 14 добавлено и 25 удалено
  1. 6 6
      WebUI/CallCenterWeb.UI/CommonHtml/WorkDatil.html
  2. 8 19
      WebUI/CallCenterWeb.UI/CommonHtml/banli.html

+ 6 - 6
WebUI/CallCenterWeb.UI/CommonHtml/WorkDatil.html

550
                                 <td class="text-center" style="min-width:80px;">承办人</td>
550
                                 <td class="text-center" style="min-width:80px;">承办人</td>
551
                                 <td class="text-center" style="min-width:80px;">联系方式</td>
551
                                 <td class="text-center" style="min-width:80px;">联系方式</td>
552
                                 <td class="text-center" style="min-width:80px;">职务</td>
552
                                 <td class="text-center" style="min-width:80px;">职务</td>
553
-                                <!--<td class="text-center" style="min-width:80px;">处理结果</td>-->
553
+                                <td class="text-center" style="min-width:80px;">处理结果</td>
554
                                 <td class="text-center" style="min-width:80px;">单位</td>
554
                                 <td class="text-center" style="min-width:80px;">单位</td>
555
                                 <!-- <td class="text-center" style="min-width:80px;">类型</td> -->
555
                                 <!-- <td class="text-center" style="min-width:80px;">类型</td> -->
556
                                 <td class="text-center" style="min-width:80px;">办理结果</td>
556
                                 <td class="text-center" style="min-width:80px;">办理结果</td>
611
                                 <td class="text-center" style="min-width:80px;">承办人</td>
611
                                 <td class="text-center" style="min-width:80px;">承办人</td>
612
                                 <td class="text-center" style="min-width:80px;">联系方式</td>
612
                                 <td class="text-center" style="min-width:80px;">联系方式</td>
613
                                 <td class="text-center" style="min-width:80px;">职务</td>
613
                                 <td class="text-center" style="min-width:80px;">职务</td>
614
-                                <!--<td class="text-center" style="min-width:80px;">处理结果</td>-->
614
+                                <td class="text-center" style="min-width:80px;">处理结果</td>
615
                                 <td class="text-center" style="min-width:80px;">单位</td>
615
                                 <td class="text-center" style="min-width:80px;">单位</td>
616
                                 <!-- <td class="text-center" style="min-width:80px;">类型</td> -->
616
                                 <!-- <td class="text-center" style="min-width:80px;">类型</td> -->
617
                                 <td class="text-center" style="min-width:80px;">办理结果</td>
617
                                 <td class="text-center" style="min-width:80px;">办理结果</td>
1491
                                             '</td>' +
1491
                                             '</td>' +
1492
                                             '<td class="text-center">' + dutiesValue +
1492
                                             '<td class="text-center">' + dutiesValue +
1493
                                             '</td>' +
1493
                                             '</td>' +
1494
-//                                          '<td class="text-center">' + situationValue +
1495
-//                                          '</td>' +
1494
+                                            '<td class="text-center">' + situationValue +
1495
+                                            '</td>' +
1496
                                             '<td class="text-center">' + n.DeptName +
1496
                                             '<td class="text-center">' + n.DeptName +
1497
                                             '</td>' +
1497
                                             '</td>' +
1498
                                             '<td class="text-center">' + n.F_Result +
1498
                                             '<td class="text-center">' + n.F_Result +
1721
                                             '</td>' +
1721
                                             '</td>' +
1722
                                             '<td class="text-center">' + dutiesValue +
1722
                                             '<td class="text-center">' + dutiesValue +
1723
                                             '</td>' +
1723
                                             '</td>' +
1724
-//                                          '<td class="text-center">' + situationValue +
1725
-//                                          '</td>' +
1724
+                                            '<td class="text-center">' + situationValue +
1725
+                                            '</td>' +
1726
                                             '<td class="text-center">' + n.DeptName +
1726
                                             '<td class="text-center">' + n.DeptName +
1727
                                             '</td>' +
1727
                                             '</td>' +
1728
                                             '<td class="text-center">' + n.F_Result +
1728
                                             '<td class="text-center">' + n.F_Result +

+ 8 - 19
WebUI/CallCenterWeb.UI/CommonHtml/banli.html

59
                 </td>
59
                 </td>
60
             </tr>
60
             </tr>
61
             <tr>
61
             <tr>
62
-                <th class="Importent">理结果:</th>
62
+                <th class="Importent">理结果:</th>
63
                 <td colspan="5">
63
                 <td colspan="5">
64
-                    <textarea data-adaptheight id="situation" onkeyup="OnFocusFun(this)" name="" rows="6" cols=""></textarea>
65
-                    <textarea data-adaptheight id="result"  hidden="hidden" name="" rows="6" cols=""></textarea>                  
64
+                    <textarea data-adaptheight id="situation" name="" rows="6" cols=""></textarea>
66
                 </td>
65
                 </td>
67
             </tr>
66
             </tr>
68
             <tr>
67
             <tr>
139
                     </span>
138
                     </span>
140
                 </td>
139
                 </td>
141
             </tr>
140
             </tr>
142
-            <tr style="display: none;">
141
+            <tr>
143
                 <td>
142
                 <td>
144
                     <button class="btns handleBtn">查看办理结果</button>
143
                     <button class="btns handleBtn">查看办理结果</button>
145
                 </td>
144
                 </td>
225
                         layer.msg("联系方式不能为空");
224
                         layer.msg("联系方式不能为空");
226
                     } else if ($("#duties").val() == "") {
225
                     } else if ($("#duties").val() == "") {
227
                         layer.msg("职务不能为空");
226
                         layer.msg("职务不能为空");
228
-                    } 
229
-//                  else if ($("#result").val() == "") {
230
-//                      layer.msg("请生成办理结果");
231
-//                  }
232
-                    else {
227
+                    } else if ($("#result").val() == "") {
228
+                        layer.msg("请生成办理结果");
229
+                    } else {
233
                         State = 1;
230
                         State = 1;
234
-                        $("#situation").val(stripscript($("#situation").val()));
235
-                        $("#result").val($("#situation").val().replace(simpleDetailStrStart, ''))
236
                         JA();
231
                         JA();
237
                     }
232
                     }
238
                 } else if ($('#isProResultRadio input[name="isDisposeResult"]:checked').val() == "2") {
233
                 } else if ($('#isProResultRadio input[name="isDisposeResult"]:checked').val() == "2") {
339
                 $("#result").val(simpleDetailStr);
334
                 $("#result").val(simpleDetailStr);
340
             });
335
             });
341
         });
336
         });
342
-        //得到焦点时触发事件 
343
-        function OnFocusFun(element) {
344
-            (element.value.indexOf(simpleDetailStrStart) === 0) || (element.value = simpleDetailStrStart);
345
-        }
346
         //交办
337
         //交办
347
         function JA() {
338
         function JA() {
348
             $.post(
339
             $.post(
354
                     AuditUser: $("#auditUser").val(), //审核领导
345
                     AuditUser: $("#auditUser").val(), //审核领导
355
                     post: $("#auditUserDuties").val(), //审核领导职务
346
                     post: $("#auditUserDuties").val(), //审核领导职务
356
                     auditContact: $("#auditContact").val(), //审核领导联系方式
347
                     auditContact: $("#auditContact").val(), //审核领导联系方式
357
-                    situation: $("#situation").val().replace(simpleDetailStrStart, ''), //处理情况
358
-//                  result: $("#result").val(), //办理结果
359
-                    result: $("#situation").val(), //办理结果
348
+                    situation: $("#situation").val(), //处理情况
349
+                    result: $("#result").val(), //办理结果
360
                     isproresult: $(
350
                     isproresult: $(
361
                         '#isProResultRadio input[name="isDisposeResult"]:checked'
351
                         '#isProResultRadio input[name="isDisposeResult"]:checked'
362
                     ).val(), //处理结果
352
                     ).val(), //处理结果
608
                         // ")反映" +
598
                         // ")反映" +
609
                         // data.F_ComTitle +
599
                         // data.F_ComTitle +
610
                         // "问题,";
600
                         // "问题,";
611
-                        $("#situation").val(simpleDetailStrStart);
612
                     }
601
                     }
613
                 }
602
                 }
614
             );
603
             );