采购报账测试修复

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Controllers/Purchase_InfoController.cs

@@ -90,6 +90,19 @@ namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers
         }
         /// <summary>
         /// 获取表单数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetFormDetailData(string keyValue)
+        {
+            var Purchase_Info_DetailsData = purchase_InfoIBLL.GetPurchase_Info_DetailsList(keyValue);
+
+            return Success(Purchase_Info_DetailsData);
+        }
+        /// <summary>
+        /// 获取表单数据
         /// <summary>
         /// <returns></returns>
         [HttpGet]

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Controllers/Purchase_LogisticController.cs

@@ -90,6 +90,19 @@ namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers
         }
         /// <summary>
         /// 获取表单数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetFormDetailData(string keyValue)
+        {
+            var Purchase_Logistic_DetailsData = purchase_LogisticIBLL.GetPurchase_Logistic_DetailsList(keyValue);
+
+            return Success(Purchase_Logistic_DetailsData);
+        }
+        /// <summary>
+        /// 获取表单数据
         /// <summary>
         /// <returns></returns>
         [HttpGet]

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Controllers/Purchase_OtherController.cs

@@ -90,6 +90,19 @@ namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers
         }
         /// <summary>
         /// 获取表单数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetFormDetailData(string keyValue)
+        {
+            var Purchase_Other_DetailsData = purchase_OtherIBLL.GetPurchase_Other_DetailsList(keyValue);
+
+            return Success(Purchase_Other_DetailsData);
+        }
+        /// <summary>
+        /// 获取表单数据
         /// <summary>
         /// <returns></returns>
         [HttpGet]

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Controllers/Purchase_PrintController.cs

@@ -90,6 +90,19 @@ namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers
         }
         /// <summary>
         /// 获取表单数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetFormDetailData(string keyValue)
+        {
+            var Purchase_Print_DetailsData = purchase_PrintIBLL.GetPurchase_Print_DetailsList(keyValue);
+
+            return Success(Purchase_Print_DetailsData);
+        }
+        /// <summary>
+        /// 获取表单数据
         /// <summary>
         /// <returns></returns>
         [HttpGet]

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Controllers/Purchase_StudentController.cs

@@ -90,6 +90,19 @@ namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers
         }
         /// <summary>
         /// 获取表单数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetFormDetailData(string keyValue)
+        {
+            var Purchase_Student_DetailsData = purchase_StudentIBLL.GetPurchase_Student_DetailsList(keyValue);
+
+            return Success(Purchase_Student_DetailsData);
+        }
+        /// <summary>
+        /// 获取表单数据
         /// <summary>
         /// <returns></returns>
         [HttpGet]

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Controllers/Purchase_WorkController.cs

@@ -90,6 +90,19 @@ namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers
         }
         /// <summary>
         /// 获取表单数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetFormDetailData(string keyValue)
+        {
+            var Purchase_Work_DetailsData = purchase_WorkIBLL.GetPurchase_Work_DetailsList(keyValue);
+
+            return Success(Purchase_Work_DetailsData);
+        }
+        /// <summary>
+        /// 获取表单数据
         /// <summary>
         /// <returns></returns>
         [HttpGet]

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Edu/FormView.cshtml

@@ -24,6 +24,8 @@
 <div class="lr-form-wrap" id="form">
     <div class="col-xs-12 lr-form-item" data-table="Purchase_Edu" style="display:none">
         <input id="Status" type="text" readonly class="form-control" isvalid="yes" checkexpession="NotNull" />
+        <input id="ApplyStatus" type="text" readonly class="form-control" isvalid="yes" checkexpession="NotNull" />
+        <input id="CheckStatus" type="text" readonly class="form-control" isvalid="yes" checkexpession="NotNull" />
         <input id="CreateTime" type="text" readonly class="form-control" isvalid="yes" checkexpession="NotNull" />
         <input id="SubmitTime" type="text" readonly class="form-control" isvalid="yes" checkexpession="NotNull" />
     </div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Edu/Index.cshtml

@@ -19,7 +19,7 @@
                                 </div>
                                 <div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">审核状态</div>
-                                    <div id="checkstatus"></div>
+                                    <div id="CheckStatus"></div>
                                 </div>
                                 <div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">报账状态</div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Edu/Index.js

@@ -46,7 +46,7 @@ var bootstrap = function ($, learun) {
             $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
                 page.search(queryJson);
             }, 220, 400);
-            $('#checkstatus').lrselect({
+            $('#CheckStatus').lrselect({
                 data: [{ text: '待审核', value: '0' }, { text: '审核中', value: '1' }, { text: '已审核', value: '2' }],
                 text: 'text',
                 value: 'value',

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Edu_Apply/Index.cshtml

@@ -19,7 +19,7 @@
                                 </div>
                                 <div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">审核状态</div>
-                                    <div id="checkstatus"></div>
+                                    <div id="CheckStatus"></div>
                                 </div>
                                 <div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">收款人</div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Edu_Apply/Index.js

@@ -48,7 +48,7 @@ var bootstrap = function ($, learun) {
                 page.search(queryJson);
             }, 220, 400);
             $('#DepartmentId').lrDepartmentSelect();
-            $('#checkstatus').lrselect({
+            $('#CheckStatus').lrselect({
                 data: [{ text: '待审核', value: '0' }, { text: '审核中', value: '1' }, { text: '已审核', value: '2' }],
                 text: 'text',
                 value: 'value',                

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Info/FormView.cshtml

@@ -24,6 +24,8 @@
 <div class="lr-form-wrap" id="form">
     <div class="col-xs-12 lr-form-item" data-table="Purchase_Info" style="display:none">
         <input id="Status" type="text" readonly class="form-control" isvalid="yes" checkexpession="NotNull" />
+        <input id="ApplyStatus" type="text" readonly class="form-control" isvalid="yes" checkexpession="NotNull" />
+        <input id="CheckStatus" type="text" readonly class="form-control" isvalid="yes" checkexpession="NotNull" />
         <input id="CreateTime" type="text" readonly class="form-control" isvalid="yes" checkexpession="NotNull" />
         <input id="SubmitTime" type="text" readonly class="form-control" isvalid="yes" checkexpession="NotNull" />
     </div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Info/Index.cshtml

@@ -19,7 +19,7 @@
                                 </div>
                                 <div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">审核状态</div>
-                                    <div id="checkstatus"></div>
+                                    <div id="CheckStatus"></div>
                                 </div>
                                 <div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">报账状态</div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Info/Index.js

@@ -46,7 +46,7 @@ var bootstrap = function ($, learun) {
             $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
                 page.search(queryJson);
             }, 220, 400);
-            $('#checkstatus').lrselect({
+            $('#CheckStatus').lrselect({
                 data: [{ text: '待审核', value: '0' }, { text: '审核中', value: '1' }, { text: '已审核', value: '2' }],
                 text: 'text',
                 value: 'value',

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Info_Apply/Index.cshtml

@@ -19,7 +19,7 @@
                                 </div>
                                 <div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">审核状态</div>
-                                    <div id="checkstatus"></div>
+                                    <div id="CheckStatus"></div>
                                 </div>
                                 <div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">收款人</div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Info_Apply/Index.js

@@ -48,7 +48,7 @@ var bootstrap = function ($, learun) {
                 page.search(queryJson);
             }, 220, 400);
             $('#DepartmentId').lrDepartmentSelect();
-            $('#checkstatus').lrselect({
+            $('#CheckStatus').lrselect({
                 data: [{ text: '待审核', value: '0' }, { text: '审核中', value: '1' }, { text: '已审核', value: '2' }],
                 text: 'text',
                 value: 'value',

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Logistic/FormView.cshtml

@@ -24,6 +24,8 @@
 <div class="lr-form-wrap" id="form">
     <div class="col-xs-12 lr-form-item" data-table="Purchase_Logistic" style="display:none">
         <input id="Status" type="text" readonly class="form-control" isvalid="yes" checkexpession="NotNull" />
+        <input id="ApplyStatus" type="text" readonly class="form-control" isvalid="yes" checkexpession="NotNull" />
+        <input id="CheckStatus" type="text" readonly class="form-control" isvalid="yes" checkexpession="NotNull" />
         <input id="CreateTime" type="text" readonly class="form-control" isvalid="yes" checkexpession="NotNull" />
         <input id="SubmitTime" type="text" readonly class="form-control" isvalid="yes" checkexpession="NotNull" />
     </div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Logistic/Index.cshtml

@@ -19,7 +19,7 @@
                                 </div>
                                 <div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">审核状态</div>
-                                    <div id="checkstatus"></div>
+                                    <div id="CheckStatus"></div>
                                 </div>
                                 <div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">报账状态</div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Logistic/Index.js

@@ -46,7 +46,7 @@ var bootstrap = function ($, learun) {
             $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
                 page.search(queryJson);
             }, 220, 400);
-            $('#checkstatus').lrselect({
+            $('#CheckStatus').lrselect({
                 data: [{ text: '待审核', value: '0' }, { text: '审核中', value: '1' }, { text: '已审核', value: '2' }],
                 text: 'text',
                 value: 'value',

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Logistic_Apply/Index.cshtml

@@ -19,7 +19,7 @@
                                 </div>
                                 <div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">审核状态</div>
-                                    <div id="checkstatus"></div>
+                                    <div id="CheckStatus"></div>
                                 </div>
                                 <div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">收款人</div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Logistic_Apply/Index.js

@@ -48,7 +48,7 @@ var bootstrap = function ($, learun) {
                 page.search(queryJson);
             }, 220, 400);
             $('#DepartmentId').lrDepartmentSelect();
-            $('#checkstatus').lrselect({
+            $('#CheckStatus').lrselect({
                 data: [{ text: '待审核', value: '0' }, { text: '审核中', value: '1' }, { text: '已审核', value: '2' }],
                 text: 'text',
                 value: 'value',

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Other/FormView.cshtml

@@ -24,6 +24,8 @@
 <div class="lr-form-wrap" id="form">
     <div class="col-xs-12 lr-form-item" data-table="Purchase_Other" style="display:none">
         <input id="Status" type="text" readonly class="form-control" isvalid="yes" checkexpession="NotNull" />
+        <input id="ApplyStatus" type="text" readonly class="form-control" isvalid="yes" checkexpession="NotNull" />
+        <input id="CheckStatus" type="text" readonly class="form-control" isvalid="yes" checkexpession="NotNull" />
         <input id="CreateTime" type="text" readonly class="form-control" isvalid="yes" checkexpession="NotNull" />
         <input id="SubmitTime" type="text" readonly class="form-control" isvalid="yes" checkexpession="NotNull" />
     </div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Other_Apply/Index.cshtml

@@ -19,7 +19,7 @@
                                 </div>
                                 <div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">审核状态</div>
-                                    <div id="checkstatus"></div>
+                                    <div id="CheckStatus"></div>
                                 </div>
                                 <div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">收款人</div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Other_Apply/Index.js

@@ -48,7 +48,7 @@ var bootstrap = function ($, learun) {
                 page.search(queryJson);
             }, 220, 400);
             $('#DepartmentId').lrDepartmentSelect();
-            $('#checkstatus').lrselect({
+            $('#CheckStatus').lrselect({
                 data: [{ text: '待审核', value: '0' }, { text: '审核中', value: '1' }, { text: '已审核', value: '2' }],
                 text: 'text',
                 value: 'value',

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Print/FormView.cshtml

@@ -24,6 +24,8 @@
 <div class="lr-form-wrap" id="form">
     <div class="col-xs-12 lr-form-item" data-table="Purchase_Print" style="display:none">
         <input id="Status" type="text" readonly class="form-control" isvalid="yes" checkexpession="NotNull" />
+        <input id="ApplyStatus" type="text" readonly class="form-control" isvalid="yes" checkexpession="NotNull" />
+        <input id="CheckStatus" type="text" readonly class="form-control" isvalid="yes" checkexpession="NotNull" />
         <input id="CreateTime" type="text" readonly class="form-control" isvalid="yes" checkexpession="NotNull" />
         <input id="SubmitTime" type="text" readonly class="form-control" isvalid="yes" checkexpession="NotNull" />
     </div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Print/Index.cshtml

@@ -19,7 +19,7 @@
                                 </div>
                                 <div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">审核状态</div>
-                                    <div id="checkstatus"></div>
+                                    <div id="CheckStatus"></div>
                                 </div>
                                 <div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">报账状态</div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Print/Index.js

@@ -46,7 +46,7 @@ var bootstrap = function ($, learun) {
             $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
                 page.search(queryJson);
             }, 220, 400);
-            $('#checkstatus').lrselect({
+            $('#CheckStatus').lrselect({
                 data: [{ text: '待审核', value: '0' }, { text: '审核中', value: '1' }, { text: '已审核', value: '2' }],
                 text: 'text',
                 value: 'value',

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Print_Apply/Index.cshtml

@@ -19,7 +19,7 @@
                                 </div>
                                 <div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">审核状态</div>
-                                    <div id="checkstatus"></div>
+                                    <div id="CheckStatus"></div>
                                 </div>
                                 <div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">收款人</div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Print_Apply/Index.js

@@ -48,7 +48,7 @@ var bootstrap = function ($, learun) {
                 page.search(queryJson);
             }, 220, 400);
             $('#DepartmentId').lrDepartmentSelect();
-            $('#checkstatus').lrselect({
+            $('#CheckStatus').lrselect({
                 data: [{ text: '待审核', value: '0' }, { text: '审核中', value: '1' }, { text: '已审核', value: '2' }],
                 text: 'text',
                 value: 'value',

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Service/FormView.cshtml

@@ -24,6 +24,8 @@
 <div class="lr-form-wrap" id="form">
     <div class="col-xs-12 lr-form-item" data-table="Purchase_Service" style="display:none">
         <input id="Status" type="text" readonly class="form-control" isvalid="yes" checkexpession="NotNull" />
+        <input id="ApplyStatus" type="text" readonly class="form-control" isvalid="yes" checkexpession="NotNull" />
+        <input id="CheckStatus" type="text" readonly class="form-control" isvalid="yes" checkexpession="NotNull" />
         <input id="CreateTime" type="text" readonly class="form-control" isvalid="yes" checkexpession="NotNull" />
         <input id="SubmitTime" type="text" readonly class="form-control" isvalid="yes" checkexpession="NotNull" />
     </div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Service/Index.cshtml

@@ -19,7 +19,7 @@
                                 </div>
                                 <div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">审核状态</div>
-                                    <div id="checkstatus"></div>
+                                    <div id="CheckStatus"></div>
                                 </div>
                                 <div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">报账状态</div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Service/Index.js

@@ -46,7 +46,7 @@ var bootstrap = function ($, learun) {
             $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
                 page.search(queryJson);
             }, 220, 400);
-            $('#checkstatus').lrselect({
+            $('#CheckStatus').lrselect({
                 data: [{ text: '待审核', value: '0' }, { text: '审核中', value: '1' }, { text: '已审核', value: '2' }],
                 text: 'text',
                 value: 'value',

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Service_Apply/FindBack.js

@@ -101,11 +101,47 @@ var bootstrap = function ($, learun) {
                     $('#' + subContentId).jfGrid({
                         url: top.$.rootUrl + '/LogisticsManagement/Purchase_Service/GetFormDetailData?keyValue=' + rowItem.Id,
                         headData: [
-                            { label: "采购物品名称", name: "Name", width: 100, align: "left" },
-                            { label: "价格", name: "Price", width: 130, align: "left" },
-                            { label: "采购数量", name: "Quantity", width: 100, align: "left" },
-                            { label: "单位", name: "Unit", width: 150, align: "left" },
-                            { label: "用途", name: "UseTo", width: 150, align: "left" },
+                            {
+                                label: '劳务维修内容', name: 'ServiceContent', width: 150, align: 'left',
+                                edit: {
+                                    type: 'input'
+                                }
+                            },
+                            {
+                                label: '估值', name: 'Price', width: 100, align: 'left',
+                                edit: {
+                                    type: 'input',
+                                    init: function (data, $edit) {// 在点击单元格的时候触发，可以用来初始化输入控件，行数据和控件对象
+
+                                    },
+                                    change: function (data, num) {// 行数据和行号
+                                        if (!isNaN(data.Price)) {
+                                            computeamount();
+                                        } else {
+                                            learun.alert.warning("只能是数字");
+                                            data.Price = 0
+                                        }
+                                    }
+                                }
+                            },
+                            {
+                                label: '人数', name: 'Peoplecount', width: 100, align: 'left',
+                                edit: {
+                                    type: 'input',
+                                }
+                            },
+                            {
+                                label: '天数', name: 'Days', width: 100, align: 'left',
+                                edit: {
+                                    type: 'input'
+                                }
+                            },
+                            {
+                                label: '标准', name: 'Standar', width: 100, align: 'left',
+                                edit: {
+                                    type: 'input'
+                                }
+                            },
                         ],
                         mainId: 'LessonNo',
                         isPage: false,

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Service_Apply/Index.cshtml

@@ -19,7 +19,7 @@
                                 </div>
                                 <div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">审核状态</div>
-                                    <div id="checkstatus"></div>
+                                    <div id="CheckStatus"></div>
                                 </div>
                                 <div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">收款人</div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Service_Apply/Index.js

@@ -48,7 +48,7 @@ var bootstrap = function ($, learun) {
                 page.search(queryJson);
             }, 220, 400);
             $('#DepartmentId').lrDepartmentSelect();
-            $('#checkstatus').lrselect({
+            $('#CheckStatus').lrselect({
                 data: [{ text: '待审核', value: '0' }, { text: '审核中', value: '1' }, { text: '已审核', value: '2' }],
                 text: 'text',
                 value: 'value',                

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Student/FormView.cshtml

@@ -24,6 +24,8 @@
 <div class="lr-form-wrap" id="form">
     <div class="col-xs-12 lr-form-item" data-table="Purchase_Student" style="display:none">
         <input id="Status" type="text" readonly class="form-control" isvalid="yes" checkexpession="NotNull" />
+        <input id="ApplyStatus" type="text" readonly class="form-control" isvalid="yes" checkexpession="NotNull" />
+        <input id="CheckStatus" type="text" readonly class="form-control" isvalid="yes" checkexpession="NotNull" />
         <input id="CreateTime" type="text" readonly class="form-control" isvalid="yes" checkexpession="NotNull" />
         <input id="SubmitTime" type="text" readonly class="form-control" isvalid="yes" checkexpession="NotNull" />
     </div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Student/Index.cshtml

@@ -19,7 +19,7 @@
                                 </div>
                                 <div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">审核状态</div>
-                                    <div id="checkstatus"></div>
+                                    <div id="CheckStatus"></div>
                                 </div>
                                 <div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">报账状态</div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Student/Index.js

@@ -46,7 +46,7 @@ var bootstrap = function ($, learun) {
             $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
                 page.search(queryJson);
             }, 220, 400);
-            $('#checkstatus').lrselect({
+            $('#CheckStatus').lrselect({
                 data: [{ text: '待审核', value: '0' }, { text: '审核中', value: '1' }, { text: '已审核', value: '2' }],
                 text: 'text',
                 value: 'value',

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Student_Apply/Index.cshtml

@@ -19,7 +19,7 @@
                                 </div>
                                 <div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">审核状态</div>
-                                    <div id="checkstatus"></div>
+                                    <div id="CheckStatus"></div>
                                 </div>
                                 <div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">收款人</div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Student_Apply/Index.js

@@ -48,7 +48,7 @@ var bootstrap = function ($, learun) {
                 page.search(queryJson);
             }, 220, 400);
             $('#DepartmentId').lrDepartmentSelect();
-            $('#checkstatus').lrselect({
+            $('#CheckStatus').lrselect({
                 data: [{ text: '待审核', value: '0' }, { text: '审核中', value: '1' }, { text: '已审核', value: '2' }],
                 text: 'text',
                 value: 'value',

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Travel/FormView.cshtml

@@ -22,35 +22,36 @@
     }
 </style>
 <div class="lr-form-wrap" id="form">
-    <div class="col-xs-12 lr-form-item" data-table="Purchase_Travel" style="display:none">
-        <input id="Status" type="text" readonly class="form-control" isvalid="yes" checkexpession="NotNull" />
-        <input id="CreateTime" type="text" readonly class="form-control" isvalid="yes" checkexpession="NotNull" />
-        <input id="SubmitTime" type="text" readonly class="form-control" isvalid="yes" checkexpession="NotNull" />
+
+    <div class="col-xs-12 lr-form-item" data-table="Purchase_Travel">
+        <div class="lr-form-item-title">申请人<font face="宋体">*</font></div>
+        <input id="Status" type="text" readonly class="form-control" isvalid="yes" checkexpession="NotNull" style="display:none" />
+        <input id="ApplyStatus" type="text" readonly class="form-control" isvalid="yes" checkexpession="NotNull" style="display:none" />
+        <input id="CheckStatus" type="text" readonly class="form-control" isvalid="yes" checkexpession="NotNull" style="display:none" />
+        <input id="CreatorId" type="text" readonly class="form-control currentInfo lr-currentInfo-user" />
+        <input id="CreatorName" type="text" readonly class="form-control currentInfo lr-currentInfo-user" style="display:none" />
     </div>
     <div class="col-xs-12 lr-form-item" data-table="Purchase_Travel">
-        <div class="lr-form-item-title">部门<font face="宋体">*</font></div>
-        <input id="DepartmentId" type="text" class="form-control currentInfo lr-currentInfo-department" readonly isvalid="yes" checkexpession="NotNull" />
-        <input id="DepartmentName" type="text" class="form-control currentInfo lr-currentInfo-department" readonly isvalid="yes" checkexpession="NotNull" style="display:none" />
+        <div class="lr-form-item-title">随行人员<font face="宋体">*</font></div>
+        <input id="Follows" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" readonly/>
     </div>
     <div class="col-xs-12 lr-form-item" data-table="Purchase_Travel">
-        <div class="lr-form-item-title">申请人<font face="宋体">*</font></div>
-        <input id="CreatorId" type="text" readonly class="form-control currentInfo lr-currentInfo-user" readonly />
-        <input id="CreatorName" type="text" readonly class="form-control currentInfo lr-currentInfo-user" readonly style="display:none" />
+        <div class="lr-form-item-title">出差原因</div>
+        <input id="Reason" type="text" class="form-control" readonly/>
     </div>
     <div class="col-xs-12 lr-form-item" data-table="Purchase_Travel">
-        <div class="lr-form-item-title">总价格<font face="宋体">*</font></div>
-        <input id="TotalAmount" type="number" readonly class="form-control" isvalid="yes" checkexpession="NotNull" />
+        <div class="lr-form-item-title">开始时间</div>
+        @*<input id="Starttime" type="text" class="form-control" />*@
+        <input id="Starttime" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd',onpicked: function () { $('#Starttime').trigger('change'); } })" readonly disabled/>
     </div>
     <div class="col-xs-12 lr-form-item" data-table="Purchase_Travel">
-        <div class="lr-form-item-title">备注</div>
-        <input id="Remark" type="text" readonly class="form-control" />
+        <div class="lr-form-item-title">结束时间</div>
+        @*<input id="Endtime" type="text" class="form-control" />*@
+        <input id="Endtime" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd',onpicked: function () { $('#Endtime').trigger('change'); } })" readonly disabled/>
     </div>
     <div class="col-xs-12 lr-form-item" data-table="Purchase_Travel">
         <div class="lr-form-item-title">附件上传</div>
         <div id="FilePath"></div>
     </div>
-    <div class="col-xs-12 lr-form-item lr-form-item-grid">
-        <div id="Purchase_Travel_Details"></div>
-    </div>
 </div>
 @Html.AppendJsFile("/Areas/LogisticsManagement/Views/Purchase_Travel/FormView.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Travel/FormView.js

@@ -81,6 +81,7 @@ var bootstrap = function ($, learun) {
     // 设置表单数据
     setFormData = function (processId, param, callback) {
         if (!!processId) {
+            console.log(processId)
             $.lrSetForm(top.$.rootUrl + '/LogisticsManagement/Purchase_Travel/GetFormDataByProcessId?processId=' + processId, function (data) {
                 for (var id in data) {
                     if (!!data[id] && data[id].length > 0) {
@@ -116,7 +117,7 @@ var bootstrap = function ($, learun) {
         }
         var postData = {};
         postData.strEntity = JSON.stringify($('[data-table="Purchase_Travel"]').lrGetFormData());
-        postData.strPurchase_Travel_DetailsList = JSON.stringify($('#Purchase_Travel_Details').jfGridGet('rowdatas'));
+        //postData.strPurchase_Travel_DetailsList = JSON.stringify($('#Purchase_Travel_Details').jfGridGet('rowdatas'));
         //var postData = {
         //    strEntity: JSON.stringify(formData)
         //};

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Travel/Index.cshtml

@@ -19,7 +19,7 @@
                                 </div>
                                 <div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">审核状态</div>
-                                    <div id="checkstatus"></div>
+                                    <div id="CheckStatus"></div>
                                 </div>
                                 <div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">报账状态</div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Travel/Index.js

@@ -46,7 +46,7 @@ var bootstrap = function ($, learun) {
             $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
                 page.search(queryJson);
             }, 220, 400);
-            $('#checkstatus').lrselect({
+            $('#CheckStatus').lrselect({
                 data: [{ text: '待审核', value: '0' }, { text: '审核中', value: '1' }, { text: '已审核', value: '2' }],
                 text: 'text',
                 value: 'value',

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Travel_Apply/FindBack.js

@@ -58,20 +58,16 @@ var bootstrap = function ($, learun) {
             $('#gridtable').jfGrid({
                 url: top.$.rootUrl + '/LogisticsManagement/Purchase_Travel/GetPageList',
                 headData: [
-                    {
-                        label: "部门", name: "DepartmentId", width: 150, align: "left",
-                        formatter: function (cellvalue, row) {
-                            return row.DepartmentName;
-                        }
-                    },
                     {
                         label: "申请人", name: "CreatorId", width: 100, align: "left",
                         formatter: function (cellvalue, row) {
                             return row.CreatorName;
                         }
                     },
-                    { label: "总价格", name: "TotalAmount", width: 100, align: "left" },
-                    { label: "备注", name: "Remark", width: 100, align: "left" },                    
+                    { label: "随行人员", name: "Follows", width: 100, align: "left" },
+                    { label: "出差原因", name: "Reason", width: 100, align: "left" },
+                    { label: "开始时间", name: "Starttime", width: 100, align: "left" },
+                    { label: "结束时间", name: "Endtime", width: 100, align: "left" },          
                 ],
                 mainId: 'Id',
                 isPage: true,
@@ -96,26 +92,26 @@ var bootstrap = function ($, learun) {
                     }
                     console.log(list)
                 },
-                isSubGrid: true,
-                subGridExpanded: function (subContentId, rowItem) {
-                    $('#' + subContentId).jfGrid({
-                        url: top.$.rootUrl + '/LogisticsManagement/Purchase_Travel/GetFormDetailData?keyValue=' + rowItem.Id,
-                        headData: [
-                            { label: "采购物品名称", name: "Name", width: 100, align: "left" },
-                            { label: "价格", name: "Price", width: 130, align: "left" },
-                            { label: "采购数量", name: "Quantity", width: 100, align: "left" },
-                            { label: "单位", name: "Unit", width: 150, align: "left" },
-                            { label: "用途", name: "UseTo", width: 150, align: "left" },
-                        ],
-                        mainId: 'LessonNo',
-                        isPage: false,
-                        sidx: 'ReviewTime desc'
-                    });
-                    var param;
-                    param = param || {};
-                    param.StuNo = rowItem.StuNo;
-                    $('#' + subContentId).jfGridSet('reload', { queryJson: JSON.stringify(param) });
-                }
+                //isSubGrid: true,
+                //subGridExpanded: function (subContentId, rowItem) {
+                //    $('#' + subContentId).jfGrid({
+                //        url: top.$.rootUrl + '/LogisticsManagement/Purchase_Travel/GetFormDetailData?keyValue=' + rowItem.Id,
+                //        headData: [
+                //            { label: "采购物品名称", name: "Name", width: 100, align: "left" },
+                //            { label: "价格", name: "Price", width: 130, align: "left" },
+                //            { label: "采购数量", name: "Quantity", width: 100, align: "left" },
+                //            { label: "单位", name: "Unit", width: 150, align: "left" },
+                //            { label: "用途", name: "UseTo", width: 150, align: "left" },
+                //        ],
+                //        mainId: 'LessonNo',
+                //        isPage: false,
+                //        sidx: 'ReviewTime desc'
+                //    });
+                //    var param;
+                //    param = param || {};
+                //    param.StuNo = rowItem.StuNo;
+                //    $('#' + subContentId).jfGridSet('reload', { queryJson: JSON.stringify(param) });
+                //}
             });
         },
         search: function (param) {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Travel_Apply/Index.cshtml

@@ -19,7 +19,7 @@
                                 </div>
                                 <div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">审核状态</div>
-                                    <div id="checkstatus"></div>
+                                    <div id="CheckStatus"></div>
                                 </div>
                                 <div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">收款人</div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Travel_Apply/Index.js

@@ -48,7 +48,7 @@ var bootstrap = function ($, learun) {
                 page.search(queryJson);
             }, 220, 400);
             $('#DepartmentId').lrDepartmentSelect();
-            $('#checkstatus').lrselect({
+            $('#CheckStatus').lrselect({
                 data: [{ text: '待审核', value: '0' }, { text: '审核中', value: '1' }, { text: '已审核', value: '2' }],
                 text: 'text',
                 value: 'value',                

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Work/FormView.cshtml

@@ -24,6 +24,8 @@
 <div class="lr-form-wrap" id="form">
     <div class="col-xs-12 lr-form-item" data-table="Purchase_Work" style="display:none">
         <input id="Status" type="text" readonly class="form-control" isvalid="yes" checkexpession="NotNull" />
+        <input id="ApplyStatus" type="text" readonly class="form-control" isvalid="yes" checkexpession="NotNull" />
+        <input id="CheckStatus" type="text" readonly class="form-control" isvalid="yes" checkexpession="NotNull" />
         <input id="CreateTime" type="text" readonly class="form-control" isvalid="yes" checkexpession="NotNull" />
         <input id="SubmitTime" type="text" readonly class="form-control" isvalid="yes" checkexpession="NotNull" />
     </div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Work/Index.cshtml

@@ -19,7 +19,7 @@
                                 </div>
                                 <div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">审核状态</div>
-                                    <div id="checkstatus"></div>
+                                    <div id="CheckStatus"></div>
                                 </div>
                                 <div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">报账状态</div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Work/Index.js

@@ -46,7 +46,7 @@ var bootstrap = function ($, learun) {
             $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
                 page.search(queryJson);
             }, 220, 400);
-            $('#checkstatus').lrselect({
+            $('#CheckStatus').lrselect({
                 data: [{ text: '待审核', value: '0' }, { text: '审核中', value: '1' }, { text: '已审核', value: '2' }],
                 text: 'text',
                 value: 'value',

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Work_Apply/Index.cshtml

@@ -19,7 +19,7 @@
                                 </div>
                                 <div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">审核状态</div>
-                                    <div id="checkstatus"></div>
+                                    <div id="CheckStatus"></div>
                                 </div>
                                 <div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">收款人</div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Work_Apply/Index.js

@@ -48,7 +48,7 @@ var bootstrap = function ($, learun) {
                 page.search(queryJson);
             }, 220, 400);
             $('#DepartmentId').lrDepartmentSelect();
-            $('#checkstatus').lrselect({
+            $('#CheckStatus').lrselect({
                 data: [{ text: '待审核', value: '0' }, { text: '审核中', value: '1' }, { text: '已审核', value: '2' }],
                 text: 'text',
                 value: 'value',

Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/Purchase/PurchaseInfoApi.cs

@@ -28,6 +28,7 @@ namespace Learun.Application.WebApi
         {
             Get["/pagelist"] = GetPageList;
             Get["/form"] = GetForm;
+            Get["/formdetail"] = GetFormDetails;
             Post["/delete"] = DeleteForm;
             Post["/save"] = SaveForm;
             Post["/submit"] = Submit;
@@ -71,6 +72,19 @@ namespace Learun.Application.WebApi
             return Success(jsonData);
         }
 
+        /// <summary>
+        /// 获取表单数据
+        /// <summary>
+        /// <param name="_"></param>
+        /// <returns></returns>
+        public Response GetFormDetails(dynamic _)
+        {
+            string keyValue = this.GetReqData();
+
+            var Purchase_Info_DetailsData = PurchaseInfoIBLL.GetPurchase_Info_DetailsList(keyValue);
+
+            return Success(Purchase_Info_DetailsData);
+        }
         ///// <summary> 
         ///// 获取页面显示列表数据 
         ///// <summary> 

Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/Purchase/PurchaseLogisticApi.cs

@@ -28,6 +28,7 @@ namespace Learun.Application.WebApi
         {
             Get["/pagelist"] = GetPageList;
             Get["/form"] = GetForm;
+            Get["/formdetail"] = GetFormDetails;
             Post["/delete"] = DeleteForm;
             Post["/save"] = SaveForm;
             Post["/submit"] = Submit;
@@ -70,6 +71,19 @@ namespace Learun.Application.WebApi
             };
             return Success(jsonData);
         }
+        /// <summary>
+        /// 获取表单数据
+        /// <summary>
+        /// <param name="_"></param>
+        /// <returns></returns>
+        public Response GetFormDetails(dynamic _)
+        {
+            string keyValue = this.GetReqData();
+
+            var Purchase_Logistic_DetailsData = PurchaseLogisticIBLL.GetPurchase_Logistic_DetailsList(keyValue);
+
+            return Success(Purchase_Logistic_DetailsData);
+        }
 
         ///// <summary> 
         ///// 获取页面显示列表数据 

Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/Purchase/PurchaseOtherApi.cs

@@ -28,6 +28,7 @@ namespace Learun.Application.WebApi
         {
             Get["/pagelist"] = GetPageList;
             Get["/form"] = GetForm;
+            Get["/formdetail"] = GetFormDetails;
             Post["/delete"] = DeleteForm;
             Post["/save"] = SaveForm;
             Post["/submit"] = Submit;
@@ -71,6 +72,19 @@ namespace Learun.Application.WebApi
             return Success(jsonData);
         }
 
+        /// <summary>
+        /// 获取表单数据
+        /// <summary>
+        /// <param name="_"></param>
+        /// <returns></returns>
+        public Response GetFormDetails(dynamic _)
+        {
+            string keyValue = this.GetReqData();
+
+            var Purchase_Other_DetailsData = PurchaseOtherIBLL.GetPurchase_Other_DetailsList(keyValue);
+
+            return Success(Purchase_Other_DetailsData);
+        }
         ///// <summary> 
         ///// 获取页面显示列表数据 
         ///// <summary> 

Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/Purchase/PurchasePrintApi.cs

@@ -28,6 +28,7 @@ namespace Learun.Application.WebApi
         {
             Get["/pagelist"] = GetPageList;
             Get["/form"] = GetForm;
+            Get["/formdetail"] = GetFormDetails;
             Post["/delete"] = DeleteForm;
             Post["/save"] = SaveForm;
             Post["/submit"] = Submit;
@@ -70,6 +71,19 @@ namespace Learun.Application.WebApi
             };
             return Success(jsonData);
         }
+        /// <summary>
+        /// 获取表单数据
+        /// <summary>
+        /// <param name="_"></param>
+        /// <returns></returns>
+        public Response GetFormDetails(dynamic _)
+        {
+            string keyValue = this.GetReqData();
+
+            var Purchase_Print_DetailsData = PurchaseprintIBLL.GetPurchase_Print_DetailsList(keyValue);
+
+            return Success(Purchase_Print_DetailsData);
+        }
 
         ///// <summary> 
         ///// 获取页面显示列表数据 

Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/Purchase/PurchaseStudentApi.cs

@@ -28,6 +28,7 @@ namespace Learun.Application.WebApi
         {
             Get["/pagelist"] = GetPageList;
             Get["/form"] = GetForm;
+            Get["/formdetail"] = GetFormDetails;
             Post["/delete"] = DeleteForm;
             Post["/save"] = SaveForm;
             Post["/submit"] = Submit;
@@ -70,6 +71,19 @@ namespace Learun.Application.WebApi
             };
             return Success(jsonData);
         }
+        /// <summary>
+        /// 获取表单数据
+        /// <summary>
+        /// <param name="_"></param>
+        /// <returns></returns>
+        public Response GetFormDetails(dynamic _)
+        {
+            string keyValue = this.GetReqData();
+
+            var Purchase_Student_DetailsData = PurchaseStudentIBLL.GetPurchase_Student_DetailsList(keyValue);
+
+            return Success(Purchase_Student_DetailsData);
+        }
 
         ///// <summary> 
         ///// 获取页面显示列表数据 

Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/Purchase/PurchaseWorkApi.cs

@@ -28,6 +28,7 @@ namespace Learun.Application.WebApi
         {
             Get["/pagelist"] = GetPageList;
             Get["/form"] = GetForm;
+            Get["/formdetail"] = GetFormDetails;
             Post["/delete"] = DeleteForm;
             Post["/save"] = SaveForm;
             Post["/submit"] = Submit;
@@ -70,6 +71,19 @@ namespace Learun.Application.WebApi
             };
             return Success(jsonData);
         }
+        /// <summary>
+        /// 获取表单数据
+        /// <summary>
+        /// <param name="_"></param>
+        /// <returns></returns>
+        public Response GetFormDetails(dynamic _)
+        {
+            string keyValue = this.GetReqData();
+
+            var Purchase_Work_DetailsData = purchaseworkIBLL.GetPurchase_Work_DetailsList(keyValue);
+
+            return Success(Purchase_Work_DetailsData);
+        }
 
         ///// <summary> 
         ///// 获取页面显示列表数据