【修改】成本发票、收款记账、资金台账、付款记账、：修改合同下拉框数据；

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/CustomFunction/Controllers/ContractStandingBookController.cs

@@ -102,6 +102,20 @@ namespace Learun.Application.Web.Areas.CustomFunction.Controllers
             };
             return Success(jsonData);
         }
+
+        /// <summary>
+        /// 获取页面显示列表数据【MySQL】
+        /// </summary>
+        /// <param name="pagination">分页参数</param>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetList2(string queryJson)
+        {
+            var data = contractStandingBookIBLL.GetList2(queryJson);
+            return Success(data);
+        }
         /// <summary>
         /// 获取表单数据
         /// </summary>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/CustomFunction/Views/BudgetApply/Form.js

@@ -18,7 +18,12 @@ var bootstrap = function ($, learun) {
             $('#CreateTime').val(learun.formatDate(new Date(), 'yyyy-MM-dd hh:mm:ss'));
             $('#CreateUserId')[0].lrvalue = learun.clientdata.get(['userinfo']).userId;
             $('#CreateUserId').val(learun.clientdata.get(['userinfo']).realName);
-            $('#ContractId').lrDataSourceSelect({ code: 'ContractInfo', value: 'id', text: 'name' });
+            $('#ContractId').lrselect({
+                allowSearch: true,
+                url: top.$.rootUrl + '/CustomFunction/ContractStandingBook/GetList2',
+                value: "id",
+                text: "contract_name",
+            });
         },
         initData: function () {
             if (!!keyValue) {

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

@@ -159,11 +159,11 @@ var bootstrap = function ($, learun) {
                         label: "合同名称", name: "ContractId", width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('custmerData', {
-                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'ContractInfo',
+                                url: '/CustomFunction/ContractStandingBook/GetList2',
                                 key: value,
                                 keyId: 'id',
                                 callback: function (_data) {
-                                    callback(_data['name']);
+                                    callback(_data['contract_name']);
                                 }
                             });
                         }

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/CustomFunction/Views/BudgetApply/PayForm.js

@@ -16,7 +16,12 @@ var bootstrap = function ($, learun) {
         },
         bind: function () {
             $('#PayStatus').lrDataItemSelect({ code: 'PaymentAccountPayStatus' });
-            $('#ContractId').lrDataSourceSelect({ code: 'ContractInfo', value: 'id', text: 'name' });
+            $('#ContractId').lrselect({
+                allowSearch: true,
+                url: top.$.rootUrl + '/CustomFunction/ContractStandingBook/GetList2',
+                value: "id",
+                text: "contract_name",
+            });
         },
         initData: function () {
             if (!!keyValue) {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/CustomFunction/Views/ContractStandingBook/Form.js

@@ -15,7 +15,12 @@ var bootstrap = function ($, learun) {
             page.initData();
         },
         bind: function () {
-            $('#ContractId').lrDataSourceSelect({ code: 'ContractInfo',value: 'id',text: 'name' });
+            $('#ContractId').lrselect({
+                allowSearch: true,
+                url: top.$.rootUrl + '/CustomFunction/ContractStandingBook/GetList2',
+                value: "id",
+                text: "contract_name",
+            });
         },
         initData: function () {
             if (!!keyValue) {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/CustomFunction/Views/ContractStandingBook/IndexZJ.js

@@ -16,7 +16,12 @@ var bootstrap = function ($, learun) {
             $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
                 page.search(queryJson);
             }, 250, 500);
-            $('#ContractId').lrDataSourceSelect({ code: 'ContractInfo',value: 'id',text: 'name' });
+            $('#ContractId').lrselect({
+                allowSearch: true,
+                url: top.$.rootUrl + '/CustomFunction/ContractStandingBook/GetList2',
+                value: "id",
+                text: "contract_name",
+            });
             // 刷新
             $('#lr_refresh').on('click', function () {
                 location.reload();
@@ -75,14 +80,14 @@ var bootstrap = function ($, learun) {
                 headData: [
                     { label: "合同名称", name: "ContractId", width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op,$cell) {
-                             learun.clientdata.getAsync('custmerData', {
-                                 url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'ContractInfo',
-                                 key: value,
-                                 keyId: 'id',
-                                 callback: function (_data) {
-                                     callback(_data['name']);
-                                 }
-                             });
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/CustomFunction/ContractStandingBook/GetList2',
+                                key: value,
+                                keyId: 'id',
+                                callback: function (_data) {
+                                    callback(_data['contract_name']);
+                                }
+                            });
                         }
                     },
                     { label: "项目已支付金额", name: "PayAmount", width: 100, align: "left"},

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/CustomFunction/Views/CostInvoice/Form.js

@@ -16,7 +16,13 @@ var bootstrap = function ($, learun) {
         },
         bind: function () {
             $('#Url').lrUploader();
-            $('#ContractId').lrDataSourceSelect({ code: 'ContractInfo', value: 'id', text: 'name' });
+            //$('#ContractId').lrDataSourceSelect({ code: 'ContractInfo', value: 'id', text: 'name' });
+            $('#ContractId').lrselect({
+                allowSearch: true,
+                url: top.$.rootUrl + '/CustomFunction/ContractStandingBook/GetList2',
+                value: "id",
+                text: "contract_name",
+            });
         },
         initData: function () {
             if (!!keyValue) {

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

@@ -121,11 +121,11 @@ var bootstrap = function ($, learun) {
                         label: "合同名称", name: "ContractId", width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('custmerData', {
-                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'ContractInfo',
+                                url: '/CustomFunction/ContractStandingBook/GetList2',
                                 key: value,
                                 keyId: 'id',
                                 callback: function (_data) {
-                                    callback(_data['name']);
+                                    callback(_data['contract_name']);
                                 }
                             });
                         }

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

@@ -43,7 +43,12 @@ var bootstrap = function ($, learun) {
             page.initData();
         },
         bind: function () {
-            $('#ContractId').lrDataSourceSelect({ code: 'ContractInfo', value: 'id', text: 'name' });
+            $('#ContractId').lrselect({
+                allowSearch: true,
+                url: top.$.rootUrl + '/CustomFunction/ContractStandingBook/GetList2',
+                value: "id",
+                text: "contract_name",
+            });
             
         },
         initData: function () {

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

@@ -16,10 +16,6 @@
                                     <div class="lr-form-item-title">对方单位</div>
                                     <input id="UnitName" type="text" class="form-control" />
                                 </div>
-                                <div class="col-xs-12 lr-form-item">
-                                    <div class="lr-form-item-title">合同名称</div>
-                                    <input id="ContractName" type="text" class="form-control" />
-                                </div>
                                 <div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">付款状态</div>
                                     <div id="PayStatus"></div>

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

@@ -198,11 +198,11 @@ var bootstrap = function ($, learun) {
                         label: "合同名称", name: "ContractId", width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('custmerData', {
-                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'ContractInfo',
+                                url: '/CustomFunction/ContractStandingBook/GetList2',
                                 key: value,
                                 keyId: 'id',
                                 callback: function (_data) {
-                                    callback(_data['name']);
+                                    callback(_data['contract_name']);
                                 }
                             });
                         }

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

@@ -44,7 +44,12 @@ var bootstrap = function ($, learun) {
         bind: function () {
             $('#Files').lrUploader();
             $('#PayStatus').lrDataItemSelect({ code: 'PaymentAccountPayStatus' });
-            $('#ContractId').lrDataSourceSelect({ code: 'ContractInfo', value: 'id', text: 'name' });
+            $('#ContractId').lrselect({
+                allowSearch: true,
+                url: top.$.rootUrl + '/CustomFunction/ContractStandingBook/GetList2',
+                value: "id",
+                text: "contract_name",
+            });
         },
         initData: function () {
             if (!!keyValue) {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FD_BudgetBasics/AdjustIndex.js

@@ -55,7 +55,15 @@ var bootstrap = function ($, learun) {
             $('#lr_edit').on('click', function () {
                 var keyValue = $('#gridtable').jfGridValue('BId');
                 var status = $('#gridtable').jfGridValue('BStatus');
-                if (status != 2) {
+                if (status == 5) {
+                    learun.alert.warning("当前项目已调整！");
+                    return;
+                }
+                if (status == 4) {
+                    learun.alert.warning("当前项目调整进行中！");
+                    return;
+                }
+                if (status < 2) {
                     learun.alert.warning("当前项目未审批通过，不可调整！");
                     return;
                 }
@@ -82,10 +90,22 @@ var bootstrap = function ($, learun) {
                 var keyValue = $('#gridtable').jfGridValue('BId');
                 if (learun.checkrow(keyValue)) {
                     var status = $('#gridtable').jfGridValue('BStatus');
+                    if (status == 5) {
+                        learun.alert.warning("当前项目已调整！");
+                        return;
+                    }
+                    if (status == 4) {
+                        learun.alert.warning("当前项目调整进行中！");
+                        return;
+                    }
                     if (status == 2) {
                         learun.alert.warning("当前项目未调整！");
                         return;
                     }
+                    if (status < 2) {
+                        learun.alert.warning("当前项目未审批通过，不可调整！");
+                        return;
+                    }
                     if (status != 3) {
                         learun.alert.warning("当前项目已提交，请耐心等待审批！");
                         return;
@@ -108,6 +128,18 @@ var bootstrap = function ($, learun) {
                         learun.alert.warning("当前项目已调整！");
                         return;
                     }
+                    if (status == 3) {
+                        learun.alert.warning("当前项目未提交！");
+                        return;
+                    }
+                    if (status == 2) {
+                        learun.alert.warning("当前项目未调整！");
+                        return;
+                    }
+                    if (status < 2) {
+                        learun.alert.warning("当前项目未审批通过，不可调整！");
+                        return;
+                    }
                     if (status != 4) {
                         learun.alert.warning("当前项目未提交！");
                         return;

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/CustomFunction/ContractStandingBook/ContractStandingBookBLL.cs

@@ -68,6 +68,31 @@ namespace Learun.Application.TwoDevelopment.CustomFunction
             }
         }
 
+        /// <summary>
+        /// 获取页面显示列表数据【MySQL】
+        /// </summary>
+        /// <param name="pagination">查询参数</param>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        public IEnumerable<ContractStandingBookEntity> GetList2(string queryJson)
+        {
+            try
+            {
+                return contractStandingBookService.GetList2(queryJson);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
         /// <summary>
         /// 获取ContractStandingBook表实体数据
         /// </summary>

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/CustomFunction/ContractStandingBook/ContractStandingBookIBLL.cs

@@ -29,6 +29,14 @@ namespace Learun.Application.TwoDevelopment.CustomFunction
         /// <param name="queryJson">查询参数</param>
         /// <returns></returns>
         IEnumerable<ContractStandingBookEntity> GetPageList2(Pagination pagination, string queryJson);
+
+        /// <summary>
+        /// 获取页面显示列表数据【MySQL】
+        /// </summary>
+        /// <param name="pagination">查询参数</param>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        IEnumerable<ContractStandingBookEntity> GetList2(string queryJson);
         /// <summary>
         /// 获取ContractStandingBook表实体数据
         /// </summary>

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/CustomFunction/ContractStandingBook/ContractStandingBookService.cs

@@ -135,6 +135,38 @@ namespace Learun.Application.TwoDevelopment.CustomFunction
             }
         }
 
+        /// <summary>
+        /// 获取页面显示列表数据【MySQL】
+        /// </summary>
+        /// <param name="pagination">查询参数</param>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        public IEnumerable<ContractStandingBookEntity> GetList2(string queryJson)
+        {
+            try
+            {
+                var strSql = new StringBuilder();
+                strSql.Append("SELECT t.* ");
+                strSql.Append("  FROM sw_contract_management t ");
+                strSql.Append("  WHERE 1=1 ");
+                var queryParam = queryJson.ToJObject();
+                // 虚拟参数
+                var dp = new DynamicParameters(new { });
+                return this.BaseRepository("waydbString").FindList<ContractStandingBookEntity>(strSql.ToString());
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
         /// <summary>
         /// 获取ContractStandingBook表实体数据
         /// </summary>