Merge branch 'master' of http://highdatas.com:9000/r/~kimi/srs

kimi

2020-02-11 89ba01e8e0bec7fdadc5278c95850cfe68b9e62a

 src/views/list.vue

@@ -3,8 +3,9 @@
      <div align="left">

         <div class="btn-line">
            <el-button type="primary" @click="onSubmit">新建项目</el-button>
            <el-button type="primary" @click="onSubmit">查看详情</el-button>
            <el-button type="primary" @click="addProject">新建项目</el-button>
            <el-button type="primary" v-if="editShow" @click="editProject">编辑项目</el-button>
            <el-button type="primary" @click="showDetail">查看详情</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,21 +74,43 @@
      background :current-page="pagenum" :page-sizes="[15]" :page-size="pagesize" layout="total, sizes, prev, pager, next, jumper"
       :total="total">
      </el-pagination>
		
      <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,
        prodetail
      },
      data() {
         return {
            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: ''
@@ -98,10 +119,38 @@
      },
      mounted() { //组件配置后，页面显示前。用于加载数据
         this.getData();
         this.userId = localStorage.getItem('userId');
         this.assign = localStorage.getItem('assign');
      },
      methods: {
         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;
            if (this.selected.userId == this.userId) {
               this.editShow = true;
            }else {
               this.editShow = false;
            }
				
         },
         handleCurrentChange(pageno) {
            this.pagenum = pageno;
@@ -118,13 +167,16 @@
            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.delay = query.delay;
               params.finish = query.fiish;
               params.status = query.status;
               params.type = query.type;
            }
            this.$axios.get(url, {
@@ -152,6 +204,18 @@
         },
         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) {
@@ -160,6 +224,30 @@
               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;
            query_();
         },
         
      }
   }