Merge branch 'master' of http://139.196.39.194:9021/chenc/sen-yu-new-web

src/views/shipment-details/shipmentList.vue

@@ -693,7 +693,7 @@ export default {
     handleDelete(record) {
       console.log('点击删除项id:', record.id)
       this.$nextTick(() => {
-        deleteShipment({ id: record.id }).then(res => {
+        deleteShipment({ id: record.id,itemIds: record.itemIds }).then(res => {
           console.log('res:', res)
           this.getShipmentList() // 渲染 发运明细列表
           this.$message.success('删除成功')