liuyifan 4 年 前
コミット
952007b9c4

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

@@ -738,7 +738,7 @@
738 738
         function bj(str) {
739 739
             layer.open({
740 740
                 type: 2,
741
-                content: "../CommonHtml/AddAppealDCL.html?wid=" + str, //iframe的url,no代表不显示滚动条
741
+                content: "../CommonHtml/AddAppealDCL.html?wid=" + str + "&workType=jb", //iframe的url,no代表不显示滚动条
742 742
                 title: "编辑工单",
743 743
                 area: ["95%", "95%"], //宽高
744 744
             });

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

@@ -688,7 +688,7 @@
688 688
         function bj(str) {
689 689
             layer.open({
690 690
                 type: 2,
691
-                content: "../CommonHtml/AddAppealDCL.html?wid=" + str, //iframe的url,no代表不显示滚动条
691
+                content: "../CommonHtml/AddAppealDCL.html?wid=" + str + "&workType=jb", //iframe的url,no代表不显示滚动条
692 692
                 title: '编辑工单',
693 693
                 area: ['96%', '85%'], //宽高
694 694
             });

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

@@ -744,7 +744,7 @@
744 744
         function bj(str) {
745 745
             layer.open({
746 746
                 type: 2,
747
-                content: "../CommonHtml/AddAppealDCL.html?wid=" + str, //iframe的url,no代表不显示滚动条
747
+                content: "../CommonHtml/AddAppealDCL.html?wid=" + str + "&workType=jb", //iframe的url,no代表不显示滚动条
748 748
                 title: "编辑工单",
749 749
                 area: ["95%", "95%"], //宽高
750 750
             });

+ 13 - 11
WebUI/CallCenterWeb.UI/CommonHtml/AddAppealDCL.html

@@ -160,7 +160,7 @@
160 160
                     <tr>
161 161
                         <td colspan="8" style="text-align: center">
162 162
                             <!-- <div class="btn_box"> -->
163
-                            <!-- <button class="btns BC">保存</button> -->
163
+                            <button class="btns BC">保存</button>
164 164
                             <button class="btns JB">审核通过</button>
165 165
                             <button class="btns thBtn">回退</button>
166 166
                             <!--<button class="btns SavedSubmit">保存并提交</button>-->
@@ -227,7 +227,7 @@
227 227
             });
228 228
 
229 229
             // 管理员、中心话务员可编辑工单内容 
230
-            if(roleCode === "GLY") {
230
+            if (roleCode === "GLY") {
231 231
                 $("#content").removeAttr("readonly")
232 232
             } else if (roleCode === "ZXHWY") {
233 233
                 $(".workcontent-wrapper").hide()
@@ -244,6 +244,7 @@
244 244
             });
245 245
             $(".BC").click(function () {
246 246
                 submit = 0;
247
+                workType = ""
247 248
                 Add();
248 249
             });
249 250
             $(".JB").click(function () {
@@ -485,7 +486,7 @@
485 486
                                 title: "重办工单",
486 487
                                 area: ["95%", "95%"], //宽高
487 488
                             });
488
-                        } else {
489
+                        } else if (workType === "jb") {
489 490
                             layer.open({
490 491
                                 type: 2,
491 492
                                 content: "../CommonHtml/jiaoban.html?wid=" + wid + "&jbSelect=" +
@@ -495,15 +496,16 @@
495 496
                                 title: "工单交办",
496 497
                                 area: ["95%", "95%"], //宽高
497 498
                             });
499
+                        } else {
500
+                            var index = parent.layer.getFrameIndex(
501
+                                window.name
502
+                            ); //先得到当前iframe层的索引
503
+                            parent.layer.close(index); //再执行关闭
504
+                            parent
505
+                                .$("#orderlist")
506
+                                .bootstrapTable("refresh");
507
+                            parent.layer.msg(data.message);
498 508
                         }
499
-                        // var index = parent.layer.getFrameIndex(
500
-                        //     window.name
501
-                        // ); //先得到当前iframe层的索引
502
-                        // parent.layer.close(index); //再执行关闭
503
-                        // parent
504
-                        //     .$("#orderlist")
505
-                        //     .bootstrapTable("refresh");
506
-                        // parent.layer.msg(data.message);
507 509
                         $(".fileBox").html("");
508 510
                     }
509 511
                 },

+ 1 - 1
WebUI/CallCenterWeb.UI/MultimediaWorkOrder/LeaderDCLMedia.html

@@ -734,7 +734,7 @@
734 734
         function bj(str) {
735 735
             layer.open({
736 736
                 type: 2,
737
-                content: "../CommonHtml/AddAppealDCL.html?wid=" + str, //iframe的url,no代表不显示滚动条
737
+                content: "../CommonHtml/AddAppealDCL.html?wid=" + str + "&workType=jb", //iframe的url,no代表不显示滚动条
738 738
                 title: "编辑工单",
739 739
                 area: ["95%", "95%"], //宽高
740 740
             });

+ 1 - 1
WebUI/CallCenterWeb.UI/MultimediaWorkOrder/ReturnReviewedTransferredMedia.html

@@ -689,7 +689,7 @@
689 689
         function bj(str) {
690 690
             layer.open({
691 691
                 type: 2,
692
-                content: "../CommonHtml/AddAppealDCL.html?wid=" + str, //iframe的url,no代表不显示滚动条
692
+                content: "../CommonHtml/AddAppealDCL.html?wid=" + str + "&workType=jb", //iframe的url,no代表不显示滚动条
693 693
                 title: '编辑工单',
694 694
                 area: ['96%', '85%'], //宽高
695 695
             });

+ 1 - 1
WebUI/CallCenterWeb.UI/MultimediaWorkOrder/WorkDSZBMedia.html

@@ -741,7 +741,7 @@
741 741
         function bj(str) {
742 742
             layer.open({
743 743
                 type: 2,
744
-                content: "../CommonHtml/AddAppealDCL.html?wid=" + str, //iframe的url,no代表不显示滚动条
744
+                content: "../CommonHtml/AddAppealDCL.html?wid=" + str + + "&workType=jb", //iframe的url,no代表不显示滚动条
745 745
                 title: "编辑工单",
746 746
                 area: ["95%", "95%"], //宽高
747 747
             });

+ 4 - 3
WebUI/CallCenterWeb.UI/SystemManager/buMenEdit.html

@@ -225,15 +225,16 @@
225 225
 
226 226
 			function bind() {
227 227
 				$.getJSON(huayi.config.callcenter_url + "Department/GetDeptList", {
228
-					"token": $.cookie("token")
228
+					"token": $.cookie("token"),
229
+                    iscbdw: 2,
229 230
 				}, function(result) {
230 231
 					if(result.state.toLowerCase() == "success") {
231 232
 						tree = $.fn.zTree.init($("#treeDemo"), setting, result.data);
232
-						// tree.addNodes(null, 0, {
233
+						
234
+					}// tree.addNodes(null, 0, {
233 235
 						// 	"F_DeptId": 0,
234 236
 						// 	"F_DeptName": "无父级单位"
235 237
 						// });
236
-					}
237 238
 				})
238 239
 			}
239 240
 			//关键字

+ 4 - 1
WebUI/CallCenterWeb.UI/SystemManager/js/buMenManger.js

@@ -79,7 +79,10 @@ $(document).ready(function () {
79 79
 })
80 80
 
81 81
 function bind() {
82
-    $.getJSON(huayi.config.callcenter_url + "Department/GetDeptList", { "token": $.cookie("token") }, function (result) {
82
+    $.getJSON(huayi.config.callcenter_url + "Department/GetDeptList", { 
83
+        "token": $.cookie("token"),
84
+        iscbdw: 2,
85
+    }, function (result) {
83 86
         if (result.state.toLowerCase() == "success") {
84 87
             tree = $.fn.zTree.init($("#treeDemo"), setting, result.data);
85 88
         }

+ 2 - 2
WebUI/CallCenterWeb.UI/YeWu/ZX.html

@@ -170,7 +170,7 @@
170 170
                 url: huayi.config.callcenter_url + 'WorkOrderReport/GetUserAccountAssessment',
171 171
                 type: 'get',
172 172
                 data: {
173
-                    start: $("#startTimes").val(),
173
+                    start: $("#starttime").val(),
174 174
                     end: $("#endtime").val(),
175 175
                     token: $.cookie("token")
176 176
                 },
@@ -189,7 +189,7 @@
189 189
 
190 190
 
191 191
         function dcexcel(obj) {
192
-            var start = $("#startTimes").val()
192
+            var start = $("#starttime").val()
193 193
             var end = $("#endtime").val()
194 194
             var url = huayi.config.callcenter_url + "WorkOrderReport/GetUserAccountAssessment?token=" + $.cookie(
195 195
                 "token");