Merge branch '长阳分支中职' of http://123.57.209.16:3000/bjquanjiang/DigitalScholl into 长阳分支中职

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/BookInfo/Form.cshtml

@@ -53,7 +53,7 @@
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Book_info">
         <div class="lr-form-item-title">审核标志</div>
-        <input id="CheckMark" type="text" class="form-control" />
+        <div id="CheckMark"></div>
     </div>
     <div class="col-xs-12 lr-form-item" data-table="Book_info">
         <div class="lr-form-item-title">备注</div>

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) {

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" },
                     {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_YearAssess/Index.cshtml

@@ -35,7 +35,7 @@
                     </div>
                 </div>
             </div>
-            <div class="lr-layout-body" id="gridtable"></div>
+            <div class="lr-layout-body" id="gridtableInPM_YearAssess"></div>
         </div>
     </div>
 </div>

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 () {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TrainEquipmentManage/Form.cshtml

@@ -21,19 +21,19 @@
     </div>
     <div class="col-xs-12 lr-form-item"  data-table="TrainEquipmentManage" >
         <div class="lr-form-item-title">新增</div>
-        <input id="AddNum" type="text" class="form-control"  />
+        <input id="AddNum" type="number" class="form-control"  />
     </div>
     <div class="col-xs-12 lr-form-item"  data-table="TrainEquipmentManage" >
         <div class="lr-form-item-title">损耗</div>
-        <input id="LossNum" type="text" class="form-control"  />
+        <input id="LossNum" type="number" class="form-control"  />
     </div>
     <div class="col-xs-12 lr-form-item"  data-table="TrainEquipmentManage" >
         <div class="lr-form-item-title">现存</div>
-        <input id="ExistNum" type="text" class="form-control"  />
+        <input id="ExistNum" type="number" class="form-control"  />
     </div>
     <div class="col-xs-12 lr-form-item"  data-table="TrainEquipmentManage" >
-        <div class="lr-form-item-title">设备金额</div>
-        <input id="EquipmentMoney" type="text" class="form-control"  />
+        <div class="lr-form-item-title">设备金额<font face="宋体">*</font></div>
+        <input id="EquipmentMoney" type="number" class="form-control"  isvalid="yes" checkexpession="PositiveFloatintZero"  />
     </div>
 </div>
 @Html.AppendJsFile("/Areas/EducationalAdministration/Views/TrainEquipmentManage/Form.js")

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/",//测试地址