Merge branch '西昌分支' of http://8.141.155.183:3000/bjquanjiang/DigitalScholl into 西昌分支

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Controllers/FinaChargeStuYearController.cs

@@ -14,6 +14,7 @@ using Learun.Application.TwoDevelopment.EducationalAdministration;
 using Learun.Util.Operat;
 using Newtonsoft.Json;
 using ThoughtWorks.QRCode.Codec;
+using System.Threading.Tasks;
 
 namespace Learun.Application.Web.Areas.ReceiveSendFeeManagement.Controllers
 {
@@ -205,6 +206,17 @@ namespace Learun.Application.Web.Areas.ReceiveSendFeeManagement.Controllers
         {
             finaChargeStuYearIBLL.DeleteEntity(keyValue);
             return Success("删除成功！");
+        }     
+        
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult SetUnInvoiceHandleByFSYID(string keyValue)
+        {
+            //触发开具发票任务
+            //通过调用digitalschoolapi的接口实现任务触发
+            string excelInvoice = Config.GetValue("ExcelInvoiceTwo");
+            Task.Run(() => HttpMethods.Post(excelInvoice+ "?FSYID="+keyValue));
+            return Success("操作成功！");
         }
         /// <summary>
         /// 保存实体数据（新增、修改）

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FinaChargeStuYear/Index.cshtml

@@ -51,9 +51,10 @@
                     <div class=" btn-group btn-group-sm">
                         <a id="lr_refresh" class="btn btn-default"><i class="fa fa-refresh"></i></a>
                     </div>
-                    <div class=" btn-group btn-group-sm" learun-authorize="yes">
+                    <div class=" btn-group btn-group-sm">
                         <a id="lr_add" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;生成缴费信息</a>
                         <a id="lr_detail" class="btn btn-default"><i class="fa fa-reorder"></i>&nbsp; 查看明细</a>
+                        <a id="lr_viewinvoice" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;补开发票</a>
                     </div>
                 </div>
             </div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FinaChargeStuYear/Index.js

@@ -63,6 +63,35 @@ var bootstrap = function ($, learun) {
                     }
                 });
             });
+            //补开发票
+            $('#lr_viewinvoice').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('FSYId');
+                var selectedRow = $('#gridtable').jfGridGet('rowdata');
+                if (learun.checkrow(keyValue)) {
+                    if (selectedRow.PayFeeStatus == "1") {
+                        //查询发票链接
+                        learun.httpAsyncGet(
+                            top.$.rootUrl + '/ReceiveSendFeeManagement/FinaChargeStuYear/GetInvoiceRecord?keyValue=' + keyValue, function (res) {
+                                if (!!res.data && res.data.length > 0) {
+                                    learun.alert.warning("当前学生已开具发票，请登录学生端查看！");
+                                    return;
+                                } else {
+                                    //开票
+                                    learun.layerConfirm('是否确认补开发票？', function (res) {
+                                        if (res) {
+                                            learun.postForm(top.$.rootUrl + '/ReceiveSendFeeManagement/FinaChargeStuYear/SetUnInvoiceHandleByFSYID', { keyValue: keyValue }, function () {
+                                                refreshGirdData();
+                                            });
+                                        }
+                                    });
+                                }
+                            });
+                    } else {
+                        learun.alert.warning("当前学生尚未全额缴费，请缴费成功后再试！");
+                        return;
+                    }
+                }
+            });
         },
         // 初始化列表
         initGird: function () {

Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj

@@ -46,6 +46,7 @@
     <WarningLevel>4</WarningLevel>
     <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
     <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+    <PlatformTarget>AnyCPU</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>

Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/system.config

@@ -179,6 +179,7 @@
   <add key="Ports" value="192.168.50.127:8007"/>
   <!--触发excel开票任务的url-->
   <add key="ExcelInvoice" value="http://localhost:60037/api/PayFeeResult/SetUnInvoiceHandle"/>
+  <add key="ExcelInvoiceTwo" value="http://localhost:60037/api/PayFeeResultTwo/SetUnInvoiceHandleByFSYID"/>
   <!--工资导入EXCEL列忽略项-->
 	<add key="GzColumn" value="发放年份,发放月份,职员代码,发放次数"/>
 </appSettings>