删除、年份

src/views/COUNSELINGMESSAGE/index.vue

@@ -59,11 +59,11 @@
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button v-if="scope.row.status == 5" size="mini" type="text"  @click="handleDownOrUp(scope.row)">下架</el-button>
-          <el-button v-if="scope.row.status == 0 || scope.row.status == 2" size="mini" type="text" @click="handleCommit(scope.row)">提交审核</el-button>
+          <el-button v-if="scope.row.status == 0 || scope.row.status == 2 ||scope.row.status ==null" size="mini" type="text" @click="handleCommit(scope.row)">提交审核</el-button>
           <el-button v-if="scope.row.status == 3" size="mini" type="text"  @click="handleDownOrUp(scope.row)">上报</el-button>
           <el-button v-if="scope.row.status == 6 || scope.row.status == 4" size="mini" type="text" @click="handleDownOrUp(scope.row)">发布</el-button>
-          <el-button v-if="scope.row.status == 0 || scope.row.status == 2 || scope.row.status == 3 || scope.row.status == 4 || scope.row.status == 6" size="mini" type="text" @click="handleUpdate(scope.row)">修改</el-button>
-          <el-button v-if="scope.row.status != 5 && scope.row.status != 2 && scope.row.status != 4" size="mini" type="text" @click="handleDelete(scope.row)">删除</el-button>
+          <el-button v-if="scope.row.status == 0 || scope.row.status == 2 || scope.row.status == 3 ||  scope.row.status == 6 ||scope.row.status ==null && scope.row.status != 4" size="mini" type="text" @click="handleUpdate(scope.row)">修改</el-button>
+          <el-button v-if="scope.row.status != 5 && scope.row.status == 2 && scope.row.status != 4 || scope.row.status == 0  ||  scope.row.status == 6" size="mini" type="text" @click="handleDelete(scope.row)">删除</el-button>
         </template>
       </el-table-column>
     </el-table>

src/views/RANK/index.vue

@@ -7,9 +7,15 @@
         </el-select>
       </el-form-item>
       <el-form-item label="年份" prop="type" label-width="110">
-        <el-select v-model="queryParams.year" placeholder="请选择年份" clearable filterable class="se">
+        <!-- <el-select v-model="queryParams.year" placeholder="请选择年份" clearable filterable class="se">
           <el-option v-for="item in nearYearList" :key="item" :label="item" :value="item" />
-        </el-select>
+        </el-select> -->
+        <el-date-picker
+          v-model="queryParams.year"
+          type="year"
+          value-format="yyyy"
+          placeholder="选择年">
+        </el-date-picker>
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@@ -77,17 +83,17 @@
       </el-table-column>
       <el-table-column label="全国进出口值排名" align="center" prop="ranking">
         <template slot-scope="scope">
-          {{scope.row.ranking == 0 ?'-':scope.row.ranking}}
+          {{scope.row.ranking == 0 || scope.row.ranking==null?'-':scope.row.ranking}}
         </template>
       </el-table-column>
       <el-table-column label="中西部绩效排名" align="center" prop="midwestRanking">
         <template slot-scope="scope">
-          {{scope.row.midwestRanking==0?'-':scope.row.midwestRanking}}
+          {{scope.row.midwestRanking==0 || scope.row.midwestRanking==null?'-':scope.row.midwestRanking}}
         </template>
       </el-table-column>
       <el-table-column label="全国绩效排名" align="center" prop="nationalPerformanceRanking">
         <template slot-scope="scope">
-          {{scope.row.nationalPerformanceRanking==0?'-':scope.row.nationalPerformanceRanking}}
+          {{scope.row.nationalPerformanceRanking==0|| scope.row.nationalPerformanceRanking==null?'-':scope.row.nationalPerformanceRanking}}
         </template>
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
@@ -239,6 +245,7 @@ export default {
     /** 查询广西保税区排名列表 */
     getList() {
       this.loading = true;
+      console.log(this.queryParams);
       listRANK(this.queryParams).then(response => {
         this.RANKList = response.rows;
         this.total = response.total;