Merge remote-tracking branch 'origin/dev' into dev

src/views/ecw/box/indexSea.vue

@@ -123,7 +123,7 @@
               <el-dropdown-item command="sea">{{$t('操作-海运')}}</el-dropdown-item>
               <el-dropdown-item command="error">{{$t('异常登记')}}</el-dropdown-item>
               <el-dropdown-item command="cost">{{$t('费用登记')}}</el-dropdown-item>
-              <el-dropdown-item command="delete">{{$t('删除')}}</el-dropdown-item>
+              <!-- <el-dropdown-item command="delete">{{$t('删除')}}</el-dropdown-item> -->
               <el-dropdown-item :disabled="scope.row.ldStatus<46" command="editLadingBill">{{$t('编辑提货单')}}</el-dropdown-item>
             </el-dropdown-menu>
           </el-dropdown>

src/views/ecw/box/query.vue

@@ -9,7 +9,7 @@
             <el-button size="small" @click="handleCommand('router')">{{$t('操作')}}</el-button>
             <el-button type="primary" size="small" @click="handleCommand('error')">{{$t('异常登记')}}</el-button>
             <el-button type="primary" size="small" @click="handleCommand('cost')">{{$t('费用登记')}}</el-button>
-            <el-button type="danger" size="small" @click="handleCommand('delete')">{{$t('删除')}}</el-button>
+            <!-- <el-button type="danger" size="small" @click="handleCommand('delete')">{{$t('删除')}}</el-button> -->
           </div>
         </div>
         <el-card style="margin-top: 15px">