merge

kimi

2020-01-23 11317bf89e4d4194f84229c3d89a786b323c6be4

 src/views/list.vue

@@ -4,7 +4,7 @@

         <div class="btn-line">
            <el-button type="primary" @click="addProject">新建项目</el-button>
            <el-button type="primary" @click="editProject">编辑项目</el-button>
            <el-button type="primary" v-if="editShow" @click="editProject">编辑项目</el-button>
            <el-button type="primary" @click="onSubmit">查看详情</el-button>

         </div>
@@ -90,6 +90,7 @@
      },
      data() {
         return {
            editShow: true,
            rowData:undefined,
            loading_table: false,
            query: "",
@@ -100,6 +101,8 @@
            selected: undefined,
            labelPosition: "left",
            tableData: [],
            userId:"",
            assign:undefined,
            formInline: {
               user: '',
               region: ''
@@ -108,6 +111,8 @@
      },
      mounted() { //组件配置后，页面显示前。用于加载数据
         this.getData();
         this.userId = localStorage.getItem('userId');
         this.assign = localStorage.getItem('assign');
      },
      methods: {
         Cancel() {
@@ -115,6 +120,12 @@
         },
         tableChange(val) {
            this.selected = val;
            if (this.selected.userId == this.userId) {
               this.editShow = true;
            }else {
               this.editShow = false;
            }
				
         },
         handleCurrentChange(pageno) {
            this.pagenum = pageno;
@@ -131,10 +142,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 +179,7 @@
         },
         dateFormat_(row, colum, val ,index) {
            return this.$moment(val).format('YYYY-MM-DD');
			
         },
         status_(row, colum, val ,index) {
            if(val == "working") {