合同签订

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

@@ -56,6 +56,15 @@ namespace Learun.Application.Web.Areas.CustomFunction.Controllers
         {
             return View();
         }
+        /// <summary>
+        /// 表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult FormSign()
+        {
+            return View();
+        }
         
         #endregion
 

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/CustomFunction/Views/ContractInfo/FormSign.cshtml

@@ -0,0 +1,19 @@
+@{
+    ViewBag.Title = "合同审批管理";
+    Layout = "~/Views/Shared/_Form.cshtml";
+}
+<div class="lr-form-wrap" id="form">
+    <div class="col-xs-12 lr-form-item" data-table="ContractInfo">
+        <div class="lr-form-item-title">签订时间<font face="宋体">*</font></div>
+        <input id="SignTime" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd',onpicked: function () { $('#SignTime').trigger('change'); } })" isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="ContractInfo">
+        <div class="lr-form-item-title">签订人<font face="宋体">*</font></div>
+        <input id="SignUser" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="ContractInfo">
+        <div class="lr-form-item-title">签订对方<font face="宋体">*</font></div>
+        <input id="SignOtherParty" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/CustomFunction/Views/ContractInfo/FormSign.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/CustomFunction/Views/ContractInfo/FormSign.js

@@ -0,0 +1,50 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2021-08-02 16:47
+ * 描  述：合同审批管理
+ */
+var acceptClick;
+var keyValue = request('keyValue');
+var bootstrap = function ($, learun) {
+    "use strict";
+    var page = {
+        init: function () {
+            $('.lr-form-wrap').lrscroll();
+            page.bind();
+            page.initData();
+        },
+        bind: function () {
+        },
+        initData: function () {
+            if (!!keyValue) {
+                $.lrSetForm(top.$.rootUrl + '/CustomFunction/ContractInfo/GetFormData?keyValue=' + keyValue, function (data) {
+                    for (var id in data) {
+                        if (!!data[id].length && data[id].length > 0) {
+                            $('#' + id ).jfGridSet('refreshdata', data[id]);
+                        }
+                        else {
+                            $('[data-table="' + id + '"]').lrSetFormData(data[id]);
+                        }
+                    }
+                });
+            }
+        }
+    };
+    // 保存数据
+    acceptClick = function (callBack) {
+        if (!$('body').lrValidform()) {
+            return false;
+        }
+        var postData = {
+            strEntity: JSON.stringify($('body').lrGetFormData())
+        };
+        $.lrSaveForm(top.$.rootUrl + '/CustomFunction/ContractInfo/SaveForm?keyValue=' + keyValue, postData, function (res) {
+            // 保存成功后才回调
+            if (!!callBack) {
+                callBack();
+            }
+        });
+    };
+    page.init();
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/CustomFunction/Views/ContractInfo/IndexSign.js

@@ -21,31 +21,14 @@ var bootstrap = function ($, learun) {
             $('#lr_refresh').on('click', function () {
                 location.reload();
             });
-            // 新增
-            $('#lr_add').on('click', function () {
-                learun.layerForm({
-                    id: 'form',
-                    title: '新增',
-                    url: top.$.rootUrl + '/CustomFunction/ContractInfo/Form',
-                    width: 700,
-                    height: 500,
-                    callBack: function (id) {
-                        return top[id].acceptClick(refreshGirdData);
-                    }
-                });
-            });
             // 编辑
             $('#lr_edit').on('click', function () {
                 var keyValue = $('#gridtable').jfGridValue('Id');
                 if (learun.checkrow(keyValue)) {
-                    var Status = $('#gridtable').jfGridValue('Status');
-                    if (Status != '0') {
-                        return learun.warning.alert('选中项已提交，不可编辑！');
-                    }
                     learun.layerForm({
                         id: 'form',
                         title: '编辑',
-                        url: top.$.rootUrl + '/CustomFunction/ContractInfo/Form?keyValue=' + keyValue,
+                        url: top.$.rootUrl + '/CustomFunction/ContractInfo/FormSign?keyValue=' + keyValue,
                         width: 700,
                         height: 500,
                         callBack: function (id) {
@@ -66,49 +49,18 @@ var bootstrap = function ($, learun) {
                 headData: [
                     { label: "合同名称", name: "Name", width: 100, align: "left" },
                     { label: "合同编号", name: "EnCode", width: 100, align: "left" },
-                    { label: "合同开始时间", name: "StartTime", width: 100, align: "left" },
-                    { label: "合同结束时间", name: "EndTime", width: 100, align: "left" },
-                    { label: "合同标的", name: "Target", width: 100, align: "left" },
-                    {
-                        label: "合同类型", name: "Type", width: 100, align: "left",
-                        formatterAsync: function (callback, value, row, op, $cell) {
-                            learun.clientdata.getAsync('dataItem', {
-                                key: value,
-                                code: 'htlx',
-                                callback: function (_data) {
-                                    callback(_data.text);
-                                }
-                            });
-                        }
-                    },
                     { label: "合同金额", name: "Amount", width: 100, align: "left" },
                     { label: "对方单位名称", name: "OtherParty", width: 100, align: "left" },
                     { label: "对方单位联系人", name: "OtherPartyContacts", width: 100, align: "left" },
                     { label: "联系方式", name: "OtherPartyMobile", width: 100, align: "left" },
                     {
-                        label: "申报人", name: "CreateUserId", width: 100, align: "left",
-                        formatterAsync: function (callback, value, row, op, $cell) {
-                            learun.clientdata.getAsync('user', {
-                                key: value,
-                                callback: function (_data) {
-                                    callback(_data.name);
-                                }
-                            });
-                        }
-                    },
-                    { label: "申报时间", name: "CreateTime", width: 100, align: "left" },
-                    {
-                        label: "状态", name: "Status", width: 100, align: "left",
-                        formatter: function (cellvalue, row) {
-                            if (cellvalue == 0) {
-                                return "<span class=\"label label-default\">草稿</span>";
-                            } else if (cellvalue == 1) {
-                                return "<span class=\"label label-warning\">审批中</span>";
-                            } else if (cellvalue == 2) {
-                                return "<span class=\"label label-success\">审批通过</span>";
-                            }
+                        label: "签订时间", name: "SignTime", width: 100, align: "left",
+                        formatter: function (value) {
+                            return learun.formatDate(value, 'yyyy-MM-dd');
                         }
                     },
+                    { label: "签订人", name: "SignUser", width: 100, align: "left" },
+                    { label: "签订对方", name: "SignOtherParty", width: 100, align: "left" }
                 ],
                 mainId: 'Id',
                 isPage: true

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

@@ -958,6 +958,7 @@
     <Content Include="Areas\CustomFunction\Views\ArchiveUser\IndexTJ.js" />
     <Content Include="Areas\CustomFunction\Views\ArchiveUser\IndexYJ.js" />
     <Content Include="Areas\CustomFunction\Views\ArchiveUser\IndexData.js" />
+    <Content Include="Areas\CustomFunction\Views\ContractInfo\FormSign.js" />
     <Content Include="Areas\CustomFunction\Views\ContractInfo\IndexSign.js" />
     <Content Include="Areas\CustomFunction\Views\ContractInfo\IndexFile.js" />
     <Content Include="Areas\CustomFunction\Views\EstimateRetire\FormYT.js" />
@@ -7393,6 +7394,7 @@
     <Content Include="Areas\LR_NewWorkFlow\Views\Index.cshtml" />
     <Content Include="Areas\LR_NewWorkFlow\Views\NWFProcess\ApplyForIndex.cshtml" />
     <Content Include="Areas\CustomFunction\Views\ContractInfo\IndexSign.cshtml" />
+    <Content Include="Areas\CustomFunction\Views\ContractInfo\FormSign.cshtml" />
     <None Include="Properties\PublishProfiles\CustomProfile.pubxml" />
     <Content Include="Areas\PersonnelManagement\Views\MeetingManagement\IndexOfMyJoin.cshtml" />
     <Content Include="Areas\PersonnelManagement\Views\MeetingSignInRecord\IndexAttendance.cshtml" />

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/CustomFunction/ContractInfo/ContractInfoEntity.cs

@@ -89,6 +89,21 @@ namespace Learun.Application.TwoDevelopment.CustomFunction
         /// </summary>
         [Column("CREATEUSERNAME")]
         public string CreateUserName { get; set; }
+        /// <summary>
+        /// 签订时间
+        /// </summary>
+        [Column("SIGNTIME")]
+        public DateTime? SignTime { get; set; }
+        /// <summary>
+        /// 签订人
+        /// </summary>
+        [Column("SIGNUSER")]
+        public string SignUser { get; set; }
+        /// <summary>
+        /// 签订对方
+        /// </summary>
+        [Column("SIGNOTHERPARTY")]
+        public string SignOtherParty { get; set; }
         #endregion
 
         #region 扩展操作

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/CustomFunction/ContractInfo/ContractInfoService.cs

@@ -44,7 +44,7 @@ namespace Learun.Application.TwoDevelopment.CustomFunction
                 t.OtherPartyContacts,
                 t.OtherPartyMobile,
                 t.CreateUserId,
-                t.CreateTime,t.Status
+                t.CreateTime,t.Status,t.SignTime,t.SignUser,t.SignOtherParty
                 ");
                 strSql.Append("  FROM ContractInfo t ");
                 strSql.Append("  WHERE 1=1 ");
@@ -136,7 +136,7 @@ namespace Learun.Application.TwoDevelopment.CustomFunction
                 }
             }
         }
-        
+
         /// <summary>
         /// 
         /// </summary>