表格名称修改

src/views/GARDENTRADEDATA/index.vue

@@ -111,7 +111,7 @@
           {{scope.row.gardenWaterElectric}}
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column fixed="right" label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
             size="mini"

src/views/GATHER/index.vue

@@ -87,7 +87,7 @@
           {{ scope.row.year }}
         </template>
       </el-table-column>
-      <el-table-column label="月份" align="center" prop="month">
+      <el-table-column label="海关部分贸易" align="center" prop="month">
         <template slot-scope="scope">
           {{ '01-' + scope.row.month }}
         </template>
@@ -98,14 +98,14 @@
           <span v-if="scope.row.collStatus == 1">已采集</span>
         </template>
       </el-table-column>
-      <el-table-column label="上报状态" align="center" prop="reportStatus">
+      <el-table-column label="海关进出口总值导入" align="center" prop="reportStatus">
         <template slot-scope="scope">
           <span v-if="scope.row.reportStatus == 0">未上报</span>
           <span v-if="scope.row.reportStatus == 1">已上报</span>
         </template>
       </el-table-column>
       <el-table-column label="上报人" align="center" prop="reportName" width="110" />
-      <el-table-column label="上报时间" align="center" prop="createTime" width="100" />
+      <el-table-column label="上报时间" align="center" prop="reportTime" width="100" />
 
       <el-table-column label="审核状态" align="center" prop="approveStatus">
         <template slot-scope="scope">
@@ -127,11 +127,11 @@
           <el-button style="margin: 0 2px" v-if="scope.row.collStatus == 0" size="mini" type="text" @click="handleUpdate(scope.row)">录入</el-button>
           <template v-if="scope.row.reportStatus == 0 && scope.row.collStatus == 1">
             <el-popconfirm title="确定上报吗？" @confirm="handleReport(scope.row)">
-              <el-button style="margin: 0 2px" size="mini" slot="reference" type="text">上报</el-button>
+              <el-button style="margin: 0 2px" size="mini" slot="reference" type="text"  v-hasPermi="['gather:GATHER:report']">上报</el-button>
             </el-popconfirm>
           </template>
           <el-popconfirm title="确定提交吗？" @confirm="handleApprove(scope.row)">
-            <el-button style="margin: 0 2px" v-if="scope.row.approveStatus == 0 && scope.row.collStatus == 1" size="mini" type="text" slot="reference">提交审核</el-button>
+            <el-button style="margin: 0 2px" v-if="scope.row.approveStatus == 0 && scope.row.collStatus == 1" size="mini" v-hasPermi="['gather:GATHER:approve']" type="text" slot="reference">审核</el-button>
           </el-popconfirm>
           <el-button style="margin: 0 2px" v-if="scope.row.collStatus == 1" size="mini" type="text" @click="handleDetail(scope.row, 0)">查看</el-button>
 

src/views/JOINTCONFERENCE/index.vue

@@ -8,7 +8,7 @@
       v-show="showSearch"
       label-width="68px"
     >
-      <el-form-item label="会议日期" prop="status"> </el-form-item>
+      <!-- <el-form-item label="会议日期" prop="status"> </el-form-item> -->
 
       <el-form-item label="会议状态" prop="status">
         <el-select

src/views/RANK/index.vue

@@ -63,7 +63,7 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="RANKList" @selection-change="handleSelectionChange">
+    <el-table :data="RANKList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="保税区" align="center" prop="deptName">
         <template slot-scope="scope">
@@ -124,7 +124,8 @@
         <el-form-item prop="year" label-width="100px" label="年份">
           <el-select v-model="form.year" filterable default-first-option clearable placeholder="请选择年份">
             <el-option
-              v-for="item in nearYearList"
+              v-for="(item,i) in nearYearList"
+              :key="i"
               :label="item"
               :value="item">
             </el-option>

src/views/TOTEXP/index.vue

@@ -63,7 +63,7 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="TOTEXPList" @selection-change="handleSelectionChange">
+    <el-table  :data="TOTEXPList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
 <!--      <el-table-column label="主键" align="center" prop="id">-->
 <!--        <template slot-scope="scope">-->
@@ -139,7 +139,8 @@
         <el-form-item prop="year" label-width="100px" label="年份">
           <el-select v-model="form.year" filterable default-first-option clearable placeholder="请选择年份">
             <el-option
-              v-for="item in nearYearList"
+              v-for="(item,index) in nearYearList"
+              :key="index"
               :label="item"
               :value="item">
             </el-option>