Merge branch '娄底高职分支' of http://123.57.209.16:3000/bjquanjiang/DigitalScholl into 娄底高职分支

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfo/Inventory.cshtml

@@ -88,7 +88,7 @@
         <div id="tablediv">
             <table class="table">
                 <tr>
-                    <th colspan="8" style="text-align:center">西昌民族幼专入库清单</th>
+                    <th colspan="8" style="text-align:center">娄底幼儿师范高等专科学校入库清单</th>
                 </tr>
                 <tr>
                     <td colspan="4">入库日期</td>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoApply/Inventory.cshtml

@@ -88,7 +88,7 @@
         <div id="tablediv">
             <table class="table">
                 <tr>
-                    <th colspan="8" style="text-align:center">西昌民族幼专入库清单</th>
+                    <th colspan="8" style="text-align:center">娄底幼儿师范高等专科学校入库清单</th>
                 </tr>
                 <tr>
                     <td colspan="4">入库日期</td>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsOutApply/Inventory.cshtml

@@ -88,7 +88,7 @@
         <div id="tablediv">
             <table class="table">
                 <tr>
-                    <th colspan="8" style="text-align: center">西昌民族幼专出库清单</th>
+                    <th colspan="8" style="text-align: center">娄底幼儿师范高等专科学校出库清单</th>
                 </tr>
                 <tr>
                     <td>部门</td>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_Receive/Inventory.cshtml

@@ -88,7 +88,7 @@
         <div class="tablediv">
             <table class="table">
                 <tr>
-                    <th colspan="8" style="text-align: center">西昌民族幼专出库清单</th>
+                    <th colspan="8" style="text-align: center">娄底幼儿师范高等专科学校出库清单</th>
                 </tr>
                 <tr>
                     <td>部门</td>

Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Utility/ListContentIndex.js

@@ -24,6 +24,14 @@ var bootstrap = function ($, learun) {
                 $.lrSetForm(top.$.rootUrl + '/LR_OAModule/Notice/GetEntity?keyValue=' + id, function (data) {
                     $("#F_FullHead").text(data.F_FullHead);
                     $("#F_CreateDate").text(data.F_CreateDate);
+                    learun.clientdata.getAsync('custmerData', {
+                        url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'classdata',
+                        key: data.F_SourceName,
+                        keyId: 'id',
+                        callback: function (_data) {
+                            $("#F_CreateUserName").text(_data['name'] || data.F_SourceName);
+                        }
+                    });
                     $("#F_CreateUserName").text(data.F_CreateUserName);
                     $("#F_Category").text(data.F_Category);
                     //$("#F_NewsContent").html($('<div></div>').html(data.F_NewsContent));

Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/EmpInfo/list.vue

@@ -164,7 +164,6 @@ export default {
           this.id
         );
         this.id=result.EmpInfo.EmpId;
-        console.log(result);
         this.origin = await this.formatFormData(result);
       }
       this.current = this.COPY(this.origin);

Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/home.vue

@@ -572,7 +572,6 @@ export default {
 
     // 点击通知公告的标题
     async noticeClick(item) {
-		console.log(item);
 		if(item.f_category!==undefined){
 			this.NAV_TO("/pages/home/notice", item, true);
 		}else{

Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/home/notice.vue

@@ -5,6 +5,7 @@
 	  <iframe v-if="ready&&contentType == 2" style="width: 100%;height: calc(100vh - 150px);" :src="CONFIG('webHost')+'/Utility/ListContentView?keyValue='+keyValue" frameborder="0"></iframe>
     </view>
     <view class="padding-sm text-grey notice-info">
+		 <view class="text-right">信息来源： {{ f_sourcename }}</view>
       <view class="text-right">本页内容发布于 {{ time }}</view>
       <view class="text-right">{{ date }}</view>
     </view>
@@ -20,6 +21,8 @@ export default {
       ready: false,
       content: '',
       time: '',
+	  classdata:new Array(),
+	  f_sourcename:'',
       date: '',
 	  contentType:'',
 	  keyValue:'',
@@ -40,10 +43,18 @@ export default {
 	  }else{
 		  this.contentType = 1
 	  }
-	  console.log(noticeItem)
       this.content = this.CONVERT_HTML(noticeItem.f_content)
       this.time = moment(noticeItem.f_time).format('HH : mm')
       this.date = moment(noticeItem.f_time).format('YYYY年 M月 D日')
+	  this.FETCH_DATASOURCE('classdata').then(data => {
+	  	this.classdata = data.data.map(t => ({
+	  		text: t.name,
+	  		value: t.id
+	  	}));
+		const obj=this.classdata.find(t=>t.value==noticeItem.f_sourcename);
+		this.f_sourcename=obj?obj.text:'';
+	  })
+	 
       this.SET_TITLE(noticeItem.f_title)
 
       this.ready = true