From b3f2b1a71acf17438dd83401ad3c46b802be17bc Mon Sep 17 00:00:00 2001
From: zhangyanpeng <bob.zhang@highdatas.com>
Date: 星期三, 22 一月 2020 16:21:59 +0800
Subject: [PATCH] Merge branch 'master' of http://highdatas.com:9000/r/~kimi/srs
---
src/views/list.vue | 79 +++++++++++++++++++++++++++++++--------
1 files changed, 63 insertions(+), 16 deletions(-)
diff --git a/src/views/list.vue b/src/views/list.vue
index 7b98994..3c89d4c 100644
--- a/src/views/list.vue
+++ b/src/views/list.vue
@@ -3,7 +3,8 @@
<div align="left">
<div class="btn-line">
- <el-button type="primary" @click="onSubmit">鏂板缓椤圭洰</el-button>
+ <el-button type="primary" @click="addProject">鏂板缓椤圭洰</el-button>
+ <el-button type="primary" @click="editProject">缂栬緫椤圭洰</el-button>
<el-button type="primary" @click="onSubmit">鏌ョ湅璇︽儏</el-button>
</div>
@@ -22,16 +23,13 @@
</el-select>
</el-form-item>
- <el-form-item label="鏄惁寤舵湡">
- <el-select v-model="formInline.delay" placeholder="鏄惁寤舵湡">
- <el-option label="宸插欢鏈�" value="true"></el-option>
- <el-option label="鏈欢鏈�" value="false"></el-option>
- </el-select>
- </el-form-item>
- <el-form-item label="鏄惁缁撴潫">
- <el-select v-model="formInline.finish" placeholder="鏄惁缁撴潫">
- <el-option label="宸茬粨鏉�" value="true"></el-option>
- <el-option label="鏈粨鏉�" value="false"></el-option>
+
+ <el-form-item label="椤圭洰鐘舵��">
+ <el-select v-model="formInline.status" placeholder="椤圭洰鐘舵��">
+ <el-option label="鏈紑濮�" value="edit"></el-option>
+ <el-option label="杩涜涓�" value="working"></el-option>
+ <el-option label="宸插欢鏈�" value="delay"></el-option>
+ <el-option label="宸茬粨鏉�" value="finish"></el-option>
</el-select>
</el-form-item>
<el-form-item >
@@ -49,9 +47,11 @@
@current-change="tableChange"
v-loading="loading_table"
align="center"
- max-height="300"
+ max-height="280"
:data="tableData" style="width: 100%; " :row-class-name="tableRowClassName">
<el-table-column prop="name" label="椤圭洰鍚嶇О" >
+ </el-table-column>
+ <el-table-column prop="status" label="褰撳墠鐘舵��" :formatter="status_">
</el-table-column>
<el-table-column prop="reseachType" label="鐮旂┒绫诲瀷" >
</el-table-column>
@@ -65,8 +65,7 @@
</el-table-column>
<el-table-column prop="endTime" label="缁撴潫鏃堕棿" :formatter="dateFormat_" >
</el-table-column>
- <el-table-column prop="finish" label="鏄惁缁撴潫" :formatter="finishFotmat" >
- </el-table-column>
+
<el-table-column prop="desp" label="椤圭洰鎻忚堪">
</el-table-column>
</el-table>
@@ -75,15 +74,26 @@
background :current-page="pagenum" :page-sizes="[15]" :page-size="pagesize" layout="total, sizes, prev, pager, next, jumper"
:total="total">
</el-pagination>
+
+ <el-dialog @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>
</div>
</template>
<script>
+ import newProject from '../components/popup/newProject.vue'
export default {
+
+ components: {
+ newProject
+ },
data() {
return {
+ rowData:undefined,
loading_table: false,
query: "",
+ dialog_1: false,
pagenum: 1,
pagesize: 15,
total: 0,
@@ -100,6 +110,9 @@
this.getData();
},
methods: {
+ Cancel() {
+ this.$refs.newProject_.Cancel();
+ },
tableChange(val) {
this.selected = val;
},
@@ -121,10 +134,10 @@
let params = {
pageSize: this.pagesize
};
+
if(query){
params.name = query.name;
- params.delay = query.delay;
- params.finish = query.fiish;
+ params.status = query.status;
params.type = query.type;
}
this.$axios.get(url, {
@@ -153,6 +166,17 @@
dateFormat_(row, colum, val ,index) {
return this.$moment(val).format('YYYY-MM-DD');
},
+ status_(row, colum, val ,index) {
+ if(val == "working") {
+ return "杩涜涓�";
+ }else if(val == "edit") {
+ return "鏈紑濮�";
+ }else if(val == "delay") {
+ return "宸插欢鏈�";
+ }else if(val == "finish") {
+ return "宸茬粨鏉�";
+ }
+ },
finishFotmat(row, colum, val ,index) {
if(val) {
return "宸茬粨鏉�";
@@ -160,6 +184,29 @@
return "杩涜涓�";
}
},
+ addProject() {
+ this.dialog_1 = true;
+
+ },
+ editProject() {
+ if(!this.selected || this.selected.status != "edit"){
+
+ this.$message({message:'璇烽�変腑涓�鏉℃湭鍚姩鐨勯」鐩�', type: 'warning'});
+ }else {
+ this.rowData = {
+ id:this.selected.id,
+ desp:this.selected.desp,
+ name: this.selected.name,
+ objective:this.selected.reseachType,
+ items:[this.$moment(this.selected.startTime).format('YYYY-MM-DD'),this.$moment(this.selected.endTime).format('YYYY-MM-DD')]
+ }
+ this.dialog_1 = true;
+ }
+
+
+ },closeNewProject() {
+ this.dialog_1 = false
+ },
}
}
--
Gitblit v1.8.0