From 5346354c8b6685d4c111041a8c5a4d61dae13050 Mon Sep 17 00:00:00 2001
From: zhangyanpeng <bob.zhang@highdatas.com>
Date: 星期四, 28 五月 2020 10:31:46 +0800
Subject: [PATCH] 添加任务总揽菜单

---
 src/components/finance/actualPayment.vue |   39 ++++++++++++++++++++++++++++++---------
 1 files changed, 30 insertions(+), 9 deletions(-)

diff --git a/src/components/finance/actualPayment.vue b/src/components/finance/actualPayment.vue
index 4d476ea..177ad41 100644
--- a/src/components/finance/actualPayment.vue
+++ b/src/components/finance/actualPayment.vue
@@ -10,12 +10,18 @@
 					<el-input v-model="formInline.name" placeholder="椤圭洰鍚嶇О"></el-input>
 				</el-form-item>
 				
-				<el-form-item label="鐮旂┒鐩殑">
-					<el-select v-model="formInline.type" placeholder="鐮旂┒鐩殑">
-						<el-option label="骞查鎬х郴缁熻瘎浠�" value="骞查鎬х郴缁熻瘎浠�"></el-option>
+				<el-form-item label="鐮旂┒绫诲瀷鍒嗙被" label-width="100px">
+					<el-select v-model="formInline.type" placeholder="鐮旂┒绫诲瀷鍒嗙被">
+						<el-option
+							v-for="(item,k) in options_type"
+							:key="k"
+							:label="item"
+							:value="item"
+						></el-option>
+						<!-- <el-option label="骞查鎬х郴缁熻瘎浠�" value="骞查鎬х郴缁熻瘎浠�"></el-option>
 						<el-option label="璇婃柇鎬х郴缁熻瘎浠�" value="璇婃柇鎬х郴缁熻瘎浠�"></el-option>
 						<el-option label="棰勫悗鎬х郴缁熻瘎浠�" value="棰勫悗鎬х郴缁熻瘎浠�"></el-option>
-						<el-option label="鐩稿叧鎬х郴缁熻瘎浠�" value="鐩稿叧鎬х郴缁熻瘎浠�"></el-option>
+						<el-option label="鐩稿叧鎬х郴缁熻瘎浠�" value="鐩稿叧鎬х郴缁熻瘎浠�"></el-option> -->
 					</el-select>
 				</el-form-item>
 				
@@ -50,7 +56,7 @@
 			</el-table-column>
 			<el-table-column prop="status" label="褰撳墠鐘舵��" width="100" align="center" :formatter="status_">
 			</el-table-column>
-			<el-table-column prop="reseachType" label="鐮旂┒绫诲瀷" width="130">
+			<el-table-column prop="type" label="鐮旂┒绫诲瀷鍒嗙被" show-overflow-tooltip width="130">
 			</el-table-column>
 			<el-table-column prop="totalCnt" label="鏈嶅姟椤圭洰鏁�" width="100" align="center">
 			</el-table-column>
@@ -62,7 +68,7 @@
 			</el-table-column>
 			<el-table-column prop="endTime" label="缁撴潫鏃堕棿" width="100" align="center" :formatter="dateFormat_" >
 			</el-table-column>
-			<el-table-column prop="desp" label="椤圭洰鎻忚堪" show-overflow-tooltip></el-table-column>
+			<el-table-column prop="desc" label="椤圭洰鎻忚堪" show-overflow-tooltip></el-table-column>
 		</el-table>
 		<div style="text-align: right; background-color: #fff;">
 			<el-pagination 
@@ -100,6 +106,18 @@
 				pdfUrl: "",
 				currentPage: 1,
 				pageCount: 0,
+				options_type:[
+					"Health technology assessment (HTA)",
+					"Clinical practice guideline (CPG)",
+					"Evidence mapping",
+					"Overview of review",
+					"Scoping review",
+					"Rapid review",
+					"Systematic review",
+					"Rapid review",
+					"Randomised controlled trial (RCT)",
+					"Other"
+				],
 				
 				loading_table: false,
 				query: "",
@@ -125,8 +143,11 @@
 		},
 		mounted() { //缁勪欢閰嶇疆鍚庯紝椤甸潰鏄剧ず鍓嶃�傜敤浜庡姞杞芥暟鎹�
 			this.getData();
-			this.userId = localStorage.getItem('userId');
-			this.assign = localStorage.getItem('assign');
+			//this.userId = localStorage.getItem('userId');
+			//this.assign = localStorage.getItem('assign');
+			
+			this.userId = this.$cookies.get('userId');
+			this.assign = this.$cookies.get('assign');
 		},
 		methods: {
 			Cancel2() {
@@ -178,7 +199,7 @@
 					pageSize: this.pagesize,
 					isRun: true
 				};
-				if(this.assign) {
+				if(this.assign == "true") {
 					params.userId = this.userId;
 				}
 				if(query){

--
Gitblit v1.8.0