commit

src/pages/localTool/standCalendar/index.vue

@@ -8,12 +8,12 @@
             <div class="date-picker" style="display: inline">
               <span class="item">
 		            <el-select v-model="formData.year" @change="handleDate">
-                  <el-option v-for="item in year" :value="item">{{ item }}</el-option>
+                  <el-option v-for="(item, index) in year" :value="item" :key="index">{{ item }}</el-option>
                 </el-select>
               </span>
               <span class="item">
 		            <el-select v-model="formData.month" @change="handleDate">
-			             <el-option v-for="item in month" :value="item">{{ item }}</el-option>
+			             <el-option v-for="(item, index) in month" :value="item" :key="index">{{ item }}</el-option>
                 </el-select>
 	           </span>
             </div>
@@ -56,7 +56,7 @@
             </div>
             <div style="text-align: center;font-weight: bold;color: #99999a">暂无会议</div>
           </span>
-          <el-card class="card_info" v-else v-for="item in todayData" :value="item">
+          <el-card class="card_info" v-else v-for="(item, index) in todayData" :value="item" :key="index">
             <span v-for="res in item.attend" :key="res.fillPeopleId">
                <el-tag v-if="userId === res.fillPeopleId" type="success" size="mini">会议</el-tag>
               <el-tag v-else type="warning" size="mini">会议</el-tag>

src/pages/localTool/standardRecognition/index.vue

@@ -106,7 +106,7 @@
                 <el-dropdown trigger="click" @command="handleCommand">
                   <i class="iconfont">&#xe61e;</i>
                   <el-dropdown-menu slot="dropdown">
-                    <el-dropdown-item :command="[scope.row, '获取文件']" v-btn-permission="'018cb58e72025fc43a9bfe1bde00c14a'"
+                    <el-dropdown-item v-if="scope.row.resultContent !== '转换中'" :command="[scope.row, '获取文件']" v-btn-permission="'018cb58e72025fc43a9bfe1bde00c14a'"
                       >获取文件</el-dropdown-item
                     >
                     <el-dropdown-item :command="[scope.row, '编辑']" v-btn-permission="'14bdb937d168478e65b139214e982a8c'"