Merge branch '黑龙江艺术高中职' of http://8.141.155.183:3000/bjquanjiang/DigitalScholl into 黑龙江艺术高中职

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTerm/PrintCourseStatistic.css

@@ -49,6 +49,7 @@ table {
     color: #464646;
     font-size: 14px;
     margin-bottom: 6px;
+    text-align:center;
 }
 
 .makeTime {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuSubsidize/Index.js

@@ -164,44 +164,44 @@ var bootstrap = function ($, learun) {
                         }
                     },
                     { label: "年级", name: "Grade", width: 100, align: "left" },
-                    {
-                        label: "学制", name: "EduSystem", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) {
-                            learun.clientdata.getAsync('dataItem', {
-                                key: value,
-                                code: 'EduSystem',
-                                callback: function (_data) {
-                                    callback(_data.text);
-                                }
-                            });
-                        }
-                    },
-                    {
-                        label: "学习形式", name: "StudyModality", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) {
-                            learun.clientdata.getAsync('dataItem', {
-                                key: value,
-                                code: 'StudyModality',
-                                callback: function (_data) {
-                                    callback(_data.text);
-                                }
-                            });
-                        }
-                    },
-                    {
-                        label: "开户银行", name: "DepositBank", width: 100, align: "center",
-                        formatterAsync: function (callback, value, row, op, $cell) {
-                            learun.clientdata.getAsync('dataItem', {
-                                key: value,
-                                code: 'DepositBank',
-                                callback: function (_data) {
-                                    callback(_data.text);
-                                }
-                            });
-                        }
-                    },
-                    { label: "银行卡号", name: "BankCard", width: 100, align: "left" },
-                    { label: "开户行位置", name: "BankLocation", width: 100, align: "left" },
-                    { label: "校内电话", name: "InSchoolTelephone", width: 100, align: "left" },
-                    { label: "QQ号码", name: "QQ", width: 100, align: "left" },
+                    //{
+                    //    label: "学制", name: "EduSystem", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) {
+                    //        learun.clientdata.getAsync('dataItem', {
+                    //            key: value,
+                    //            code: 'EduSystem',
+                    //            callback: function (_data) {
+                    //                callback(_data.text);
+                    //            }
+                    //        });
+                    //    }
+                    //},
+                    //{
+                    //    label: "学习形式", name: "StudyModality", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) {
+                    //        learun.clientdata.getAsync('dataItem', {
+                    //            key: value,
+                    //            code: 'StudyModality',
+                    //            callback: function (_data) {
+                    //                callback(_data.text);
+                    //            }
+                    //        });
+                    //    }
+                    //},
+                    //{
+                    //    label: "开户银行", name: "DepositBank", width: 100, align: "center",
+                    //    formatterAsync: function (callback, value, row, op, $cell) {
+                    //        learun.clientdata.getAsync('dataItem', {
+                    //            key: value,
+                    //            code: 'DepositBank',
+                    //            callback: function (_data) {
+                    //                callback(_data.text);
+                    //            }
+                    //        });
+                    //    }
+                    //},
+                    //{ label: "银行卡号", name: "BankCard", width: 100, align: "left" },
+                    //{ label: "开户行位置", name: "BankLocation", width: 100, align: "left" },
+                    //{ label: "校内电话", name: "InSchoolTelephone", width: 100, align: "left" },
+                    //{ label: "QQ号码", name: "QQ", width: 100, align: "left" },
                     { label: "资助名称", name: "Name", width: 100, align: "left"},
                     { label: "资助类型", name: "TypeId", width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op,$cell) {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/SW_Ask_Batch/Form.cshtml

@@ -26,10 +26,18 @@
         <div class="lr-form-item-title">评定结束时间<font face="宋体">*</font></div>
         <input id="BEndTime" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ minDate:'#F{$dp.$D(\'BStartTime\')}',dateFmt:'yyyy-MM-dd',onpicked: function () { $('#BEndTime').trigger('change'); } })" isvalid="yes" checkexpession="NotNull" />
     </div>
+    <div class="col-xs-12 lr-form-item">
+        <div class="lr-form-item-title">评定学年<font face="宋体">*</font></div>
+        <div id="BAcademicYearNo" isvalid="yes" checkexpession="NotNull"></div>
+    </div>
+    <div class="col-xs-12 lr-form-item">
+        <div class="lr-form-item-title">评定学期<font face="宋体">*</font></div>
+        <div id="BSemester" isvalid="yes" checkexpession="NotNull"></div>
+    </div>
     <div class="col-xs-12 lr-form-item">
         <div class="lr-form-item-title">评定系<font face="宋体">*</font></div>
         <div id="BDept" isvalid="yes" checkexpession="NotNull"></div>
-        <input id="BDeptName" type="hidden"  />
+        <input id="BDeptName" type="hidden" />
     </div>
     <div class="col-xs-12 lr-form-item">
         <div class="lr-form-item-title">评定专业<font face="宋体">*</font></div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/SW_Ask_Batch/Form.js

@@ -16,6 +16,23 @@ var bootstrap = function ($, learun) {
         },
         bind: function () {
             $('#TParentId').lrDataItemSelect({ code: 'TParentType' });
+            $('#BAcademicYearNo').lrselect({
+                placeholder: "学年",
+                allowSearch: false,
+                url: top.$.rootUrl + '/EducationalAdministration/StuScore/GetAcademicYearNoData',
+                value: 'value',
+                text: 'text',
+                
+            });
+            //学期
+            $('#BSemester').lrselect({
+                placeholder: "学期",
+                allowSearch: false,
+                url: top.$.rootUrl + '/EducationalAdministration/StuScore/GetSemesterData',
+                value: 'value',
+                text: 'text',
+                
+            });
             $('#BDept').lrselect({
                 type: 'multiple',
                 url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdDeptInfo',

Learun.Framework.Ultimate V7/Learun.Application.Web/Views/UserCenter/Index.cshtml

@@ -92,7 +92,7 @@
                                     <div class="userSec1Box">
                                         <div class="userSec1L">
                                             <div class="userSec1Img">
-                                                <img id="headUrl" />
+                                                <img :src="this.headUrl" />
                                             </div>
                                             <div class="userSec1T">{{studentInfo.StuName}}</div>
                                         </div>
@@ -179,6 +179,9 @@
                                         $.get('/UserCenter/GetStudentInfo', function (ref) {
                                             this.studentInfo = ref.data.userInfo;
                                             this.baseInfo = ref.data.basicInfo;
+                                            this.headUrl = ref.data.userInfo.Photo;
+                                            console.log(ref.data.userInfo.Photo)
+                                            console.log(this.headUrl)
                                             //console.log(ref);
 
                                         }.bind(this), "json");
@@ -190,7 +193,7 @@
                                 },
                                 created() {
                                     this.getData();
-                                    this.getUrl();
+                                    //this.getUrl();
                                 },
                                 filters: {
                                     sex: function (value) {

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicService.cs

@@ -329,15 +329,15 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
             try
             {
                 var data = this.BaseRepository("CollegeMIS").FindEntity<StuInfoBasicEntity>(a => a.StuNo == enCode);
-                if (data != null && (data.Photo != null && data.Photo != ""))
-                {
-                    var url = this.BaseRepository().FindEntity<AnnexesFileEntity>(a => a.F_FolderId == data.Photo)?.F_FilePath;
-                    if (!string.IsNullOrEmpty(url))
-                    {
-                        url = "/" + url.Substring(url.IndexOf("Resource"));
-                        data.Photo = url;
-                    }
-                }
+                //if (data != null && (data.Photo != null && data.Photo != ""))
+                //{
+                //    var url = this.BaseRepository().FindEntity<AnnexesFileEntity>(a => a.F_FolderId == data.Photo)?.F_FilePath;
+                //    if (!string.IsNullOrEmpty(url))
+                //    {
+                //        url = "/" + url.Substring(url.IndexOf("Resource"));
+                //        data.Photo = url;
+                //    }
+                //}
                 return data;
             }
             catch (Exception ex)