From 37a6ace3b51bc1d7bb562242c8a70b51ba3b6680 Mon Sep 17 00:00:00 2001
From: zhangyanpeng <bob.zhang@highdatas.com>
Date: 星期三, 18 三月 2020 13:23:09 +0800
Subject: [PATCH] 调整上传和时间限制
---
src/views/list.vue | 66 +++++++++++++++++++++++++++-----
1 files changed, 55 insertions(+), 11 deletions(-)
diff --git a/src/views/list.vue b/src/views/list.vue
index 3c89d4c..b7f0699 100644
--- a/src/views/list.vue
+++ b/src/views/list.vue
@@ -4,8 +4,8 @@
<div class="btn-line">
<el-button type="primary" @click="addProject">鏂板缓椤圭洰</el-button>
- <el-button type="primary" @click="editProject">缂栬緫椤圭洰</el-button>
- <el-button type="primary" @click="onSubmit">鏌ョ湅璇︽儏</el-button>
+ <el-button type="primary" v-if="editShow" @click="editProject">缂栬緫椤圭洰</el-button>
+ <el-button type="primary" @click="showDetail">鏌ョ湅璇︽儏</el-button>
</div>
@@ -75,31 +75,42 @@
:total="total">
</el-pagination>
- <el-dialog @close="Cancel" width="70%" top="50px" :visible.sync="dialog_1" append-to-body>
+ <el-dialog v-if="dialog_1" @close="Cancel" width="70%" top="50px" :visible.sync="dialog_1" append-to-body>
<newProject @closeNewProject="closeNewProject" v-bind:rowData="rowData" ref="newProject_"></newProject>
+ </el-dialog>
+ <el-dialog v-if="dialog_2" @close="Cancel2" width="70%" top="50px" :visible.sync="dialog_2" append-to-body>
+ <prodetail @closeNewProject="closeDetail" v-bind:rowData="detailData" ref="newProject2_"></prodetail>
</el-dialog>
</div>
</template>
<script>
import newProject from '../components/popup/newProject.vue'
+ import prodetail from '../components/popup/prodetail.vue'
export default {
components: {
- newProject
+ newProject,
+ prodetail
},
data() {
return {
- rowData:undefined,
+ editShow: true,
+
loading_table: false,
query: "",
+ rowData:undefined,
+ detailData:undefined,
dialog_1: false,
+ dialog_2: false,
pagenum: 1,
pagesize: 15,
total: 0,
selected: undefined,
labelPosition: "left",
tableData: [],
+ userId:"",
+ assign:undefined,
formInline: {
user: '',
region: ''
@@ -108,13 +119,39 @@
},
mounted() { //缁勪欢閰嶇疆鍚庯紝椤甸潰鏄剧ず鍓嶃�傜敤浜庡姞杞芥暟鎹�
this.getData();
+ this.userId = localStorage.getItem('userId');
+ this.assign = localStorage.getItem('assign');
},
methods: {
Cancel() {
- this.$refs.newProject_.Cancel();
+ this.dialog_1 = false;
+ this.query_();
+ },
+ Cancel2() {
+ this.dialog_2 = false;
+ this.closeDetail();
+ },
+ closeDetail() {
+ this.detailData = undefined;
+ },
+ showDetail() {
+ if(!this.selected){
+
+ this.$message({message:'璇烽�変腑涓�鏉℃湭鍚姩鐨勯」鐩�', type: 'warning'});
+ return;
+ }
+ this.dialog_2 = true;
},
tableChange(val) {
this.selected = val;
+ this.detailData = val;
+ // this.editShow = true;
+ if (this.selected.userId == this.userId) {
+ this.editShow = true;
+ }else {
+ this.editShow = false;
+ }
+
},
handleCurrentChange(pageno) {
this.pagenum = pageno;
@@ -131,10 +168,13 @@
this.loading_table = true;
let pageno = this.pagenum;
let url = "/api/scheme/page/" + pageno;
+
let params = {
pageSize: this.pagesize
};
-
+ if(this.assign) {
+ params.userId = this.userId;
+ }
if(query){
params.name = query.name;
params.status = query.status;
@@ -165,6 +205,7 @@
},
dateFormat_(row, colum, val ,index) {
return this.$moment(val).format('YYYY-MM-DD');
+
},
status_(row, colum, val ,index) {
if(val == "working") {
@@ -186,17 +227,19 @@
},
addProject() {
this.dialog_1 = true;
-
+ this.rowData = {};
},
editProject() {
- if(!this.selected || this.selected.status != "edit"){
+ if(!this.selected || this.selected.status == "finish"){
- this.$message({message:'璇烽�変腑涓�鏉℃湭鍚姩鐨勯」鐩�', type: 'warning'});
+ this.$message({message:'璇烽�変腑涓�鏉℃湭瀹屾垚鐨勯」鐩�', type: 'warning'});
}else {
this.rowData = {
id:this.selected.id,
desp:this.selected.desp,
name: this.selected.name,
+ beginDate: this.selected.beginDate,
+ endDate: this.selected.endDate,
objective:this.selected.reseachType,
items:[this.$moment(this.selected.startTime).format('YYYY-MM-DD'),this.$moment(this.selected.endTime).format('YYYY-MM-DD')]
}
@@ -205,7 +248,8 @@
},closeNewProject() {
- this.dialog_1 = false
+ this.dialog_1 = false;
+ query_();
},
}
--
Gitblit v1.8.0