【修改】付款记账：改点击按钮提示；开具发票：多条件查询中发票类型、税率绑定mysql的值；

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/CustomFunction/Views/PaymentAccount/Index.js

@@ -58,6 +58,14 @@ var bootstrap = function ($, learun) {
                 var keyValue = $('#gridtable').jfGridValue('Id');
                 if (learun.checkrow(keyValue)) {
                     var CheckStatus = $('#gridtable').jfGridValue('CheckStatus');
+                    if (CheckStatus == 2) {
+                        learun.alert.warning("当前项目已审批通过！");
+                        return;
+                    }
+                    if (CheckStatus == 3) {
+                        learun.alert.warning("当前项目未审批通过！");
+                        return;
+                    }
                     if (CheckStatus != 0) {
                         learun.alert.warning("当前项目已提交，无法编辑！");
                         return;
@@ -88,6 +96,14 @@ var bootstrap = function ($, learun) {
                 var keyValue = $('#gridtable').jfGridValue('Id');
                 if (learun.checkrow(keyValue)) {
                     var CheckStatus = $('#gridtable').jfGridValue('CheckStatus');
+                    if (CheckStatus == 2) {
+                        learun.alert.warning("当前项目已审批通过！");
+                        return;
+                    }
+                    if (CheckStatus == 3) {
+                        learun.alert.warning("当前项目未审批通过！");
+                        return;
+                    }
                     if (CheckStatus != 0) {
                         learun.alert.warning("当前项目已提交，无法删除！");
                         return;
@@ -106,6 +122,14 @@ var bootstrap = function ($, learun) {
                 var keyValue = $('#gridtable').jfGridValue('Id');
                 if (learun.checkrow(keyValue)) {
                     var CheckStatus = $('#gridtable').jfGridValue('CheckStatus');
+                    if (CheckStatus == 2) {
+                        learun.alert.warning("当前项目已审批通过！");
+                        return;
+                    }
+                    if (CheckStatus == 3) {
+                        learun.alert.warning("当前项目未审批通过！");
+                        return;
+                    }
                     if (CheckStatus != 0) {
                         learun.alert.warning("当前项目已提交，请耐心等待审批！");
                         return;

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/DtInvoice/Index.js

@@ -23,8 +23,8 @@ var bootstrap = function ($, learun) {
             $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
                 page.search(queryJson);
             }, 220, 400);
-            $('#InvoiceType').lrDataItemSelect({ code: 'InvoiceType' });
-            $('#TaxRate').lrDataItemSelect({ code: 'TaxRate' });
+            $('#InvoiceType').lrselect({ data: [{ id: '0', text: '普票' }, { id: '1', text: '专票'}] });
+            $('#TaxRate').lrselect({ data: [{ id: '0', text: '3%' }, { id: '1', text: '6%' }, { id: '2', text: '13%' }, { id: '3', text: '其他' }] });
             // 刷新
             $('#lr_refresh').on('click', function () {
                 location.reload();