Merge branch 'luckysheet' of http://120.46.222.128:10021/elink-star/epmet-work-pc into luckysheet_xiaowang

# Conflicts:
#	src/views/modules/base/smartExcel/cpts/excel-summary.vue

src/views/modules/base/smartExcel/cpts/excel-summary.vue

@@ -14,8 +14,8 @@
             <h3 class="title">提报的文件</h3>
             <div class="flex-wrap flex">
                 <div class="item flex flex-y flex-center-deputy" v-for="(item, index) in list"  @click="handleClickShowView(item)" :key="index">
-                    <img :src="require(`@/assets/images/index/Excel.png`)" alt="" style="cursor:pointer ;">
-                    <div class="agencyName">{{ item.agencyName }}-{{item.userName}}</div>
+                    <img :src="require(`@/assets/images/index/Excel.png`)" alt="" style="cursor: pointer;">
+                    <div class="agencyName">{{ item.orgUserName }}</div>
                     <div :class="item.taskState === 'archived'?'green':item.taskState === 'submit'?'blue':item.taskState === 'rejected'?'black':'orange'">（{{ item.taskStateName }}）</div>
                 </div>
             </div>