Merge branch 'hi-ucs-dev' of http://124.222.94.39:3000/wuhongjian/hi-ucs into hi-ucs-dev

back/src/views/modules/abilityStatistics/index.vue

@@ -191,7 +191,7 @@
 		</template>
   </el-table-column>
           </el-table>
-          <div class="block">
+          <!-- <div class="block">
             <el-pagination
               @current-change="handleCurrentChange"
               layout="total, prev, pager, next, jumper"
@@ -200,7 +200,7 @@
               :current-page="currentPage"
             >
             </el-pagination>
-          </div>
+          </div> -->
         </div>
       </el-card>
     </div>
@@ -528,7 +528,7 @@ export default {
     detailClick(row){
       this.detailParamss={}
       let applyNumber=row.applyNumber
-      if (this.departmentId === 3) { //能力上架
+      if (this.departmentId == 3) { //能力上架
         this.detailType='能力上架'
        let params = {
          processInstanceId: applyNumber,

front/src/views/capacityOnTheShelf/Application.vue

@@ -300,6 +300,7 @@
     '应用名称',
     '应用描述',
     '应用类型',
+    '应用状态',
   ])
   const notFilled = ref([])
   getUser().then((res) => {