定责导出修改

web/YTSoft.BaseCallCenter.MVCWeb/Content/js/WorkOrder/workorderalllist.js

@@ -1,4 +1,5 @@
-layui.use('laydate', function () {
+var urlExcel;
+layui.use('laydate', function () {
   var laydate = layui.laydate;
   //日期时间范围
   laydate.render({
@@ -356,12 +357,20 @@ layui.use(['table', 'jquery'], function () {
 
   //导出到excel
   $('#ExToExcel').on('click', function () {
-    console.log($("#F_HASTENCOUNTS").val())
+    urlExcel = "/Order/ExToExcel"
+    ExToExcel()
+  })
+  //导出到excel
+  $('#ExToExcelDZ').on('click', function () {
+    alert($("#F_HASTENCOUNTS").val())
     if ($("#F_HASTENCOUNTS").val() == "1") {
-      var url = "/Order/ExToExcelDZ"
+      urlExcel = "/Order/ExToExcelDZ"
+      ExToExcel()
     } else {
-      var url = "/Order/ExToExcel"
+      layer.msg('请选择已定责类型')
     }
+  })
+  function ExToExcel () {
     var img = $("#progressImgage");
     var mask = $("#maskOfProgressImage");
     var dataModel = {
@@ -380,7 +389,7 @@ layui.use(['table', 'jquery'], function () {
     }
     var para = JSON.stringify(dataModel);
     $.ajaxLoading({
-      url: url,
+      url: urlExcel,
       type: "post",
       async: true,
       contentType: "application/json;charset=utf-8",
@@ -429,9 +438,8 @@ layui.use(['table', 'jquery'], function () {
         layer.msg(errorThrown);
       }
     });
-  })
-
 
+  }
 
 
   //.监听当前 select，动态改变子项

web/YTSoft.BaseCallCenter.MVCWeb/Views/Order/WorkOrderAllList.cshtml

@@ -70,9 +70,15 @@
               </button>
 
 
-              <button class="layui-btn layui-btn-normal layui-btn-normal" id="ExToExcel">
-                <i class="fa fa-file-excel-o">导出数据</i>
-              </button>
+              @if (Model.OrderType == 1 && Model.OrderType != null)
+              {
+                <button class="layui-btn layui-btn-normal layui-btn-normal ExToExcel" id="ExToExcel">
+                  <i class="fa fa-file-excel-o">导出数据</i>
+                </button>
+                <button class="layui-btn layui-btn-normal layui-btn-normal ExToExcel" id="ExToExcelDZ">
+                  <i class="fa fa-file-excel-o">定责数据导出</i>
+                </button>
+              }
             </div>
           </div>
         </div>
@@ -312,8 +318,8 @@
 <script type="text/html" id="barDemo">
     @if (Model.OrderType == 2)
   {
-          <a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="edit">编辑</a>
-          <a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="reset">撤回</a>
+            <a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="edit">编辑</a>
+            <a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="reset">撤回</a>
   }
 
     <a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="view">查看详情</a>

web/YTSoft.BaseCallCenter.MVCWeb/Views/Order/WorkOrderMyListDZ1.cshtml

@@ -166,7 +166,7 @@
                 <th lay-data="{field:'F_HOUSING', align: 'center', width:90}">业务类型</th>
                 <th lay-data="{field:'F_HASTENCOUNTS', align: 'center', width:90}">已定责次数</th>
                 <th lay-data="{field:'F_ADSLACCOUNT', align: 'center', width:110}">业务明细</th>
-                <th lay-data="{ width:160, align:'right', toolbar: '#barDemo'}">操作</th>
+                <th lay-data="{ width:180, align:'right', toolbar: '#barDemo'}">操作</th>
 
               </tr>
             </thead>

web/YTSoft.BaseCallCenter.MVCWeb/Views/WorkOrder/WorkOrderAllList.cshtml

@@ -71,7 +71,7 @@
 
               @if (Model.OrderType == 1 && Model.OrderType != null)
               {
-                <button class="layui-btn layui-btn-normal layui-btn-normal" id="ExToExcel">
+                <button class="layui-btn layui-btn-normal layui-btn-normal ExToExcel" id="ExToExcel">
                   <i class="fa fa-file-excel-o">导出数据</i>
                 </button>
               }
@@ -306,8 +306,8 @@
 <script type="text/html" id="barDemo">
     @if (Model.OrderType == 2)
   {
-                          <a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="edit">编辑</a>
-                          <a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="reset">撤回</a>
+                                <a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="edit">编辑</a>
+                                <a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="reset">撤回</a>
   }
 
     <a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="view">查看详情</a>