From f1685906d4653941cd69bc17f835d88488f64bf6 Mon Sep 17 00:00:00 2001
From: lb01 <Vimicro@lb>
Date: Fri, 2 Dec 2022 17:04:37 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=8F=E8=B4=B9=E5=AE=A1=E6=8A=A5=E5=BC=80?=
 =?UTF-8?q?=E6=94=AF=E5=AE=A1=E6=A0=B8=EF=BC=88=E6=9A=82=E6=9C=AA=E5=8A=A0?=
 =?UTF-8?q?=E5=AD=90=E8=A1=A8=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../LearunApp-2.2.0/pages.json                |  7 ++
 .../Audit_Expenditures/single.vue             | 71 ++++++++++++++-----
 2 files changed, 60 insertions(+), 18 deletions(-)

diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages.json b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages.json
index 795007fdf..50095daed 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages.json	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages.json	
@@ -1012,6 +1012,13 @@
 				"navigationBarTitleText": "通知公告"
 			}
 		},
+		//经费开支审核
+		{
+			"path": "pages/AssetManagementSystem/Audit_Expenditures/single",
+			"style": {
+				"navigationBarTitleText": "经费开支审核"
+			}
+		},
 		//会议工作管理
 		{
 			"path": "pages/PersonnelManagement/MeetingManagement/list",
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/AssetManagementSystem/Audit_Expenditures/single.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/AssetManagementSystem/Audit_Expenditures/single.vue
index 597b68ea7..25d002468 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/AssetManagementSystem/Audit_Expenditures/single.vue	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/AssetManagementSystem/Audit_Expenditures/single.vue	
@@ -3,27 +3,24 @@
     <!-- 顶部页签 -->
     <l-nav v-model="tab" :items="['表单信息', '流程信息']" type="flex" class="solid-bottom" />
 	<view v-if="ready && tab == 0">
-	  <l-input v-model="formData.F_FullHead" title="公告标题" disabled></l-input>
-	  <l-select v-model="formData.IsSend" :range="[{value:'1',text:'是'},{value:'0',text:'否'}]" title="下发官网" disabled></l-select>
-	  <l-input v-model="formData.F_Category" title="公告类别" disabled></l-input>
-	  <l-input v-model="formData.F_ReleaseTime" title="发布时间" disabled></l-input>
-	  <l-input v-model="formData.F_SourceName" title="信息来源" disabled></l-input>
-	  <l-input v-model="formData.F_SourceAddress" title="来源地址" disabled></l-input> 
-	  <l-input v-model="formData.F_SendDeptId" title="接收部门" disabled></l-input>
-	  <l-input v-model="formData.F_SendPostId" title="接受岗位" disabled></l-input>
-	  <l-select v-model="formData.F_IsSendFX" :range="[{value:true,text:'是'},{value:false,text:'否'}]" title="下发飞星" disabled></l-select>
-	  <l-upload-file
+	  <!-- <l-input v-model="formData.FundsApply.ApplyUser"  title="填报人" disabled></l-input> -->
+	  <l-select v-model="formData.FundsApply.ApplyUser" :range="dataSource.ApplyUser" title="填报人" disabled></l-select>
+	  <l-select v-model="formData.FundsApply.ApplyDept" :range="dataSource.ApplyDept" title="申报部门" disabled></l-select>
+	  <l-input v-model="formData.FundsApply.ApplyTime" title="时间" disabled></l-input>
+	  <!-- <l-select v-model="formData.FundsApply.IsFixedAssets" :range="dataSource.IsFixedAssets"  title="固定资产" disabled></l-select> -->
+	  <l-input :value="IsFixedAssetsitem(formData.FundsApply.IsFixedAssets)" title="固定资产" disabled></l-input>
+	  <l-textarea v-model="formData.FundsApply.Remark" title="备注" readonly/>
+	  <l-input v-model="formData.FundsApply.SumAmount" title="总金额" disabled></l-input>
+	  <l-input v-model="formData.FundsApply.UpperAmount" title="人民币大写" disabled></l-input>
+	  <!-- <l-select v-model="formData.F_IsSendFX" :range="[{value:true,text:'是'},{value:false,text:'否'}]" title="下发飞星" disabled></l-select> -->
+	  <!-- <l-upload-file
 	    :value="fileList"
 	    :readonly="true"
 	    title="标题图片"
-	  />
+	  /> -->
 	    <!-- :number="9" -->
 	    <!-- @input="setValue('MeetingManagement.Files', $event)" -->
-	  <l-input title="公告内容" disabled style="border-bottom: none;"></l-input>
-	  <view class="padding text-lg" style="background-color: #fff;">
-		  <!-- <u-parse v-if="ready" :imageProp="{ domain: apiRoot }" :content="content"></u-parse> -->
-		  <iframe v-if="ready" style="width: 100%;height: 50vh;" :src="CONFIG('webHost')+'/Utility/ListContentView?keyValue='+formData.F_NewsId" frameborder="0"></iframe>
-	  </view>
+	  <!-- <l-input title="公告内容" disabled style="border-bottom: none;"></l-input> -->
 	  <l-workflow-action
 	    @audit="audit"
 	    @action="action"
@@ -63,6 +60,13 @@ export default {
       time: '',
       date: '',
 	  fileList:[],
+	  
+	  // 数据源
+	  dataSource: {
+		ApplyDept: [],
+		ApplyUser: [],
+		IsFixedAssets: []
+	  },
     }
   },
 
@@ -73,6 +77,29 @@ export default {
   methods: {
     async init(type) {
 	  if(type){this.type = type}
+	  
+	  
+	  await Promise.all([
+	  	this.FETCH_DATASOURCE('classdata').then(result => {
+	  		this.dataSource.ApplyDept = result.data.map(t => ({
+	  			text: t.name,
+	  			value: t.id
+	  		}));
+	  	}),
+	  	this.FETCH_DATASOURCE('teacheruserdata').then(result => {
+	  		this.dataSource.ApplyUser = result.data.map(t => ({
+	  			text: t.f_realname,
+	  			value: t.f_userid
+	  		}));
+	  	}),
+		this.dataSource.IsFixedAssets = Object.values(this.GET_GLOBAL('dataDictionary').YesOrNoInt).map(t => ({
+			value: t.value,
+			text: t.text
+		}))
+		
+	  ])
+	  
+	  console.log(this.dataSource.IsFixedAssets)
       this.LOADING('加载中…')
       const noticeItem = this.GET_PARAM()
 	  this.processList = noticeItem.logList
@@ -83,6 +110,7 @@ export default {
 	  this.processId = this.currentTask.F_Id
 	  this.formValue = noticeItem.formValue
 	  this.scheme = noticeItem.scheme
+	  console.log(this.processList[0].F_ProcessId)
 	  await this.getFormData(this.processList[0].F_ProcessId)
 	  this.HIDE_LOADING();
 	  
@@ -95,9 +123,9 @@ export default {
     },
 	// 获取表单数据
 	getFormData(ProgressId){
-		return this.HTTP_GET("learun/news/shList",{ProgressId},"加载数据时出错").then(async res=>{
+		return this.HTTP_GET("learun/adms/FundsApply/shList",{ProgressId},"加载数据时出错").then(async res=>{
 			if(res){
-				res.F_SourceName =  res.F_SourceName&&this.GET_GLOBAL('department')[res.F_SourceName]? this.GET_GLOBAL('department')[res.F_SourceName].name : res.F_SourceName
+				// res.F_SourceName =  res.F_SourceName&&this.GET_GLOBAL('department')[res.F_SourceName]? this.GET_GLOBAL('department')[res.F_SourceName].name : res.F_SourceName
 				this.formData = res
 				let fileList = await this.getFileListById(res.F_NewsImage)
 				if(fileList&&fileList.length){
@@ -217,6 +245,13 @@ export default {
 	      break
 	  }
 	},
+	IsFixedAssetsitem(data){
+		if(data == 0){
+			return '否'
+		}else{
+			return '是'
+		}
+	}
   }
 }
 </script>