Merge branch '塔里木分支' of http://123.57.209.16:3000/bjquanjiang/DigitalScholl into 塔里木分支

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

@@ -40,7 +40,7 @@
         <textarea id="ParentsOpinion" class="form-control" style="height:100px;"></textarea>
     </div>
     <div class="col-xs-12 lr-form-item" data-table="StuDisciplineManagement">
-        <div class="lr-form-item-title">学校意见</div>
+        <div class="lr-form-item-title">学院意见</div>
         <textarea id="SchoolOpinion" class="form-control" style="height:100px;"></textarea>
     </div>
 </div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuDisciplineManagement/FormView.cshtml

@@ -40,7 +40,7 @@
         <textarea id="ParentsOpinion" class="form-control" style="height:100px;" readonly="readonly"></textarea>
     </div>
     <div class="col-xs-12 lr-form-item" data-table="StuDisciplineManagement">
-        <div class="lr-form-item-title">学校意见</div>
+        <div class="lr-form-item-title">学院意见</div>
         <textarea id="SchoolOpinion" class="form-control" style="height:100px;"></textarea>
     </div>
 </div>

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

@@ -229,7 +229,7 @@ var bootstrap = function ($, learun) {
                     { label: "学生态度", name: "StudentAttitude", width: 100, align: "left" },
                     { label: "班主任意见", name: "TeacherOpinion", width: 100, align: "left" },
                     { label: "家长意见", name: "ParentsOpinion", width: 100, align: "left" },
-                    { label: "学校意见", name: "SchoolOpinion", width: 100, align: "left" },
+                    { label: "学院意见", name: "SchoolOpinion", width: 100, align: "left" },
                     {
                         label: "审核状态", name: "CheckStatus", width: 100, align: "left", formatter: function (cellvalue) {
                             return cellvalue == "1" ? "<span class=\"label label-warning\">审核中</span>" : cellvalue == "2" ? "<span class=\"label label-success\">审核通过</span>" : cellvalue == "3" ? "<span class=\"label label-danger\">审核未通过</span>" : "<span class=\"label label-default\">草稿</span>";

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

@@ -33,11 +33,11 @@
         <div id="GenderNo" isvalid="yes" checkexpession="NotNull"></div>
     </div>
     <div class="col-xs-6 lr-form-item" data-table="StuInfoFresh">
-        <div class="lr-form-item-title">生源地 </div>
+        <div class="lr-form-item-title">省份 </div>
         <div id="Province"></div>
     </div>
     <div class="col-xs-6 lr-form-item" data-table="StuInfoFresh">
-        <div class="lr-form-item-title">疆内 </div>
+        <div class="lr-form-item-title">地市 </div>
         <div id="City"></div>
     </div>
     <div class="col-xs-6 lr-form-item" data-table="StuInfoFresh">

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

@@ -280,7 +280,7 @@ var bootstrap = function ($, learun) {
                         }
                     },
                     {
-                        label: '生源地', name: 'Province', width: 100, align: "left",
+                        label: '省份', name: 'Province', width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('custmerData', {
                                 url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'DIC_PROVINCE',
@@ -293,7 +293,7 @@ var bootstrap = function ($, learun) {
                         }
                     },
                     {
-                        label: '疆内', name: 'City', width: 150, align: "left",
+                        label: '地市', name: 'City', width: 150, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('custmerData', {
                                 url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'DIC_CITY',

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TeacherCertificate/Form.cshtml

@@ -20,7 +20,7 @@
         <div id="TCTypeID"></div>
     </div>
     <div class="col-xs-12 lr-form-item" data-table="TeacherCertificate">
-        <div class="lr-form-item-title">签发机关</div>
+        <div class="lr-form-item-title">发证机关</div>
         <input id="TCVisaOffice" type="text" class="form-control" />
     </div>
     <div class="col-xs-12 lr-form-item" data-table="TeacherCertificate">

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TeacherCertificate/Index.js

@@ -171,7 +171,7 @@ var bootstrap = function ($, learun) {
                     },
                     { label: "证书名称", name: "TCType", width: 150, align: "left" },
                     { label: "证书编号", name: "TCCode", width: 150, align: "left" },
-                    { label: "签发机关", name: "TCVisaOffice", width: 150, align: "left" },
+                    { label: "发证机关", name: "TCVisaOffice", width: 150, align: "left" },
                     {
                         label: "资格种类", name: "TCTypeID", width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {