Merge branch 'master' into zengjun

resources/views/inventory/stockInventory/inventoryMission.blade.php

@@ -9,9 +9,10 @@
     @endcomponent
     <div id="list" class="d-none container-fluid" >
         <div class="mt-3">
-
             <span class="mt-3" >
+                @can('库存管理-盘点-完结')
                 <span><button class="btn btn-sm btn-outline-info" v-if="inventory.status==='复盘中' &&!listMode" @click="完结盘点任务(inventory.id,inventory.owner.name,inventory.type)">完结</button></span>
+                @endcan
 
                 @can('库存管理-盘点-查看')
                     <button class="btn btn-sm" @click="listMode?listMode=false:listMode=true" :class="listMode?'btn-dark':'btn-outline-dark'" v-if="!listMode">切换为列表</button>