From ac7b42c5f9cda1bdcfb4e7cc44f7184be8eeab36 Mon Sep 17 00:00:00 2001 From: liangkun Date: Thu, 24 Nov 2022 11:03:01 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E9=95=BF=E9=98=B3=E6=AD=A3=E5=BC=8Fapi=20c?= =?UTF-8?q?onfig=E4=BD=BF=E7=94=A8ip+=E7=AB=AF=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Learun.Framework.Ultimate V7/LearunApp-2.2.0/config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/config.js b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/config.js index cfc1a87d9..f9381f03d 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/config.js +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/config.js @@ -22,7 +22,7 @@ export default { // ], "apiHost": [ // "http://cyzjzx.gnway.cc:31218/"//测试地址接口 - // "http://api.cyzjzx.com/"//正式地址接口 + // "http://219.139.155.38:8687/"//正式地址接口 "http://192.168.10.175:8088/" ], // "webHost":"http://cyzjzx.gnway.cc:30549/",//测试地址 From 0a2fcdb4b8fa4fe7242c9557bb13cfc111207c3f Mon Sep 17 00:00:00 2001 From: dyy <807692433@qq.com> Date: Thu, 24 Nov 2022 11:27:20 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91?= =?UTF-8?q?=E5=AE=9E=E8=AE=AD=E8=AE=BE=E5=A4=87=E7=AE=A1=E7=90=86=EF=BC=9A?= =?UTF-8?q?=E5=8A=A0=E5=AD=97=E6=AE=B5=E9=AA=8C=E8=AF=81=EF=BC=9B=E5=9B=BE?= =?UTF-8?q?=E4=B9=A6=E4=BF=A1=E6=81=AF=E7=AE=A1=E7=90=86=EF=BC=9A=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E6=97=B6=E9=97=B4=E6=98=BE=E7=A4=BA=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E3=80=81=E8=A1=A8=E5=8D=95=E5=AE=A1=E6=A0=B8=E6=A0=87=E5=BF=97?= =?UTF-8?q?=E4=B8=8B=E6=8B=89=E6=A1=86=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Views/BookInfo/Form.cshtml | 2 +- .../Views/BookInfo/Form.js | 2 ++ .../Views/BookInfo/Index.js | 16 ++++++++++++++-- .../Views/TrainEquipmentManage/Form.cshtml | 10 +++++----- 4 files changed, 22 insertions(+), 8 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/BookInfo/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/BookInfo/Form.cshtml index f0de48bfc..cffdfbf60 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/BookInfo/Form.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/BookInfo/Form.cshtml @@ -53,7 +53,7 @@
审核标志
- +
备注
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/BookInfo/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/BookInfo/Form.js index d1f954b1a..4670ce37f 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/BookInfo/Form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/BookInfo/Form.js @@ -17,6 +17,8 @@ var bootstrap = function ($, learun) { bind: function () { $("#BookType").lrDataSourceSelect({ code: 'BookClass', value: 'id', text: 'typename' }); $("#BookLocation").lrDataSourceSelect({ code: 'BookLocation', value: 'id', text: 'booklocation' }); + $('#CheckMark').lrDataItemSelect({ code: 'BookStatus' }); + }, initData: function () { if (!!keyValue) { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/BookInfo/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/BookInfo/Index.js index ca6d77fbc..6642b2723 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/BookInfo/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/BookInfo/Index.js @@ -91,8 +91,20 @@ var bootstrap = function ($, learun) { { label: "书籍作者", name: "Author", width: 100, align: "left" }, { label: "书籍出版社", name: "Publisher", width: 100, align: "left" }, { label: "书籍编号", name: "BookCode", width: 100, align: "left" }, - { label: "出版时间", name: "PublishTime", width: 100, align: "left" }, - { label: "入库时间", name: "AddTime", width: 100, align: "left" }, + { + label: "出版时间", name: "PublishTime", width: 100, align: "left", formatter: function (cellvalue) { + if (cellvalue != null && cellvalue!=undefined && cellvalue!="") { + return cellvalue.slice(0, 10); + } + } + }, + { + label: "入库时间", name: "AddTime", width: 100, align: "left", formatter: function (cellvalue) { + if (cellvalue != null && cellvalue != undefined && cellvalue != "") { + return cellvalue.slice(0, 10); + } + } + }, { label: "书籍价格", name: "Price", width: 100, align: "left" }, { label: "数量", name: "Amount", width: 100, align: "left" }, { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TrainEquipmentManage/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TrainEquipmentManage/Form.cshtml index 7e8bdcf76..a41c6d9fa 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TrainEquipmentManage/Form.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TrainEquipmentManage/Form.cshtml @@ -21,19 +21,19 @@
新增
- +
损耗
- +
现存
- +
-
设备金额
- +
设备金额*
+
@Html.AppendJsFile("/Areas/EducationalAdministration/Views/TrainEquipmentManage/Form.js") From 4ef7ec694aee1b7d06926fc0beb65ddabba2c29f Mon Sep 17 00:00:00 2001 From: dyy <807692433@qq.com> Date: Thu, 24 Nov 2022 14:43:44 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91?= =?UTF-8?q?=E5=B9=B4=E5=BA=A6=E8=80=83=E6=A0=B8=E7=AE=A1=E7=90=86=EF=BC=9A?= =?UTF-8?q?=E4=BF=AE=E6=94=B9gridtable=E7=9A=84id=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Views/PM_YearAssess/Index.cshtml | 2 +- .../Views/PM_YearAssess/Index.js | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_YearAssess/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_YearAssess/Index.cshtml index 7d41a9e7d..9319306d4 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_YearAssess/Index.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_YearAssess/Index.cshtml @@ -35,7 +35,7 @@ -
+
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_YearAssess/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_YearAssess/Index.js index 7defa5a51..2fc036723 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_YearAssess/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_YearAssess/Index.js @@ -56,7 +56,7 @@ var bootstrap = function ($, learun) { learun.alert.warning('已提交，不能再修改！'); return; } - var keyValue = $('#gridtable').jfGridValue('ID'); + var keyValue = $('#gridtableInPM_YearAssess').jfGridValue('ID'); if (learun.checkrow(keyValue)) { learun.layerForm({ id: 'formInPM_YearAssess', @@ -76,7 +76,7 @@ var bootstrap = function ($, learun) { learun.alert.warning('已提交，不能再修改！'); return; } - var keyValue = $('#gridtable').jfGridValue('ID'); + var keyValue = $('#gridtableInPM_YearAssess').jfGridValue('ID'); if (learun.checkrow(keyValue)) { learun.layerConfirm('是否确认删除该项！', function (res) { if (res) { @@ -114,7 +114,7 @@ var bootstrap = function ($, learun) { }, // 初始化列表 initGird: function () { - $('#gridtable').jfGrid({ + $('#gridtableInPM_YearAssess').jfGrid({ url: top.$.rootUrl + '/EducationalAdministration/PM_YearAssess/GetPageList', headData: [ { label: "考核时间", name: "AssessTime", width: 100, align: "left" }, @@ -138,7 +138,7 @@ var bootstrap = function ($, learun) { search: function (param) { param = param || {}; param.EmpId = empId; - $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); + $('#gridtableInPM_YearAssess').jfGridSet('reload', { queryJson: JSON.stringify(param) }); } }; refreshGirdData = function () {