|
|
|
@ -8,6 +8,7 @@ import {printShipmentInnerLabel} from '../label/print_shipment_inner_label' |
|
|
|
import dayjs from 'dayjs' |
|
|
|
import {printShipmentBoxLabel} from '../label/print_shipment_box_label' |
|
|
|
import {printShipmentPackingBoxLabel} from '../label/print_shipment_packing_box_label' |
|
|
|
import {getShipmentRollDataByShipmentId} from '../../../api/shipment/roll' |
|
|
|
|
|
|
|
export default { |
|
|
|
name: "outWarehouse", |
|
|
|
@ -21,8 +22,11 @@ export default { |
|
|
|
height2: 300, |
|
|
|
loading: false, |
|
|
|
open: false, |
|
|
|
rollDetailVisible: false, |
|
|
|
rollDetailList:[], |
|
|
|
queryForm:{ |
|
|
|
shipmentId: "", |
|
|
|
status: "", |
|
|
|
startDate: "", |
|
|
|
endDate: "", |
|
|
|
}, |
|
|
|
@ -289,7 +293,10 @@ export default { |
|
|
|
} |
|
|
|
} |
|
|
|
}, |
|
|
|
handleRowClick(row){ |
|
|
|
handleRowClick(row,column){ |
|
|
|
// if (column && column.label === "操作"){ |
|
|
|
// return |
|
|
|
// } |
|
|
|
this.row = {...row}; |
|
|
|
}, |
|
|
|
getBoxDataList(){ |
|
|
|
@ -343,6 +350,18 @@ export default { |
|
|
|
}).catch((error)=>{ |
|
|
|
this.$message.error(error) |
|
|
|
}) |
|
|
|
}, |
|
|
|
handleQueryRoll(row){ |
|
|
|
getShipmentRollDataByShipmentId(row).then(({data})=>{ |
|
|
|
if (data && data.code === 0){ |
|
|
|
this.rollDetailVisible = true; |
|
|
|
this.rollDetailList = data.rows; |
|
|
|
}else { |
|
|
|
this.$message.warning(data.msg) |
|
|
|
} |
|
|
|
}).catch((error)=>{ |
|
|
|
this.$message.error(error) |
|
|
|
}) |
|
|
|
} |
|
|
|
}, |
|
|
|
watch:{ |
|
|
|
@ -355,7 +374,7 @@ export default { |
|
|
|
mounted () { |
|
|
|
this.$nextTick(() => { |
|
|
|
this.height = (window.innerHeight-120)/2; |
|
|
|
this.height2 = window.innerHeight-150-height; |
|
|
|
this.height2 = window.innerHeight-240- this.height; |
|
|
|
}) |
|
|
|
}, |
|
|
|
created () { |
|
|
|
@ -374,11 +393,16 @@ export default { |
|
|
|
<el-input v-model="queryForm.shipmentId"></el-input> |
|
|
|
</el-form-item> |
|
|
|
</el-col> |
|
|
|
<!-- <el-col :span="3">--> |
|
|
|
<!-- <el-form-item label="发货状态">--> |
|
|
|
<!-- <el-input v-model="queryForm.status"></el-input>--> |
|
|
|
<!-- </el-form-item>--> |
|
|
|
<!-- </el-col>--> |
|
|
|
<el-col :span="3"> |
|
|
|
<el-form-item label="发货状态"> |
|
|
|
<el-select v-model="queryForm.status"> |
|
|
|
<el-option label="全部" value=""></el-option> |
|
|
|
<el-option label="未装箱" value="未装箱"></el-option> |
|
|
|
<el-option label="装箱中" value="装箱中"></el-option> |
|
|
|
<el-option label="已出货" value="已出货"></el-option> |
|
|
|
</el-select> |
|
|
|
</el-form-item> |
|
|
|
</el-col> |
|
|
|
<el-col :span="7"> |
|
|
|
<el-row :gutter="10"> |
|
|
|
<el-col :span="11"> |
|
|
|
@ -420,10 +444,11 @@ export default { |
|
|
|
</el-form> |
|
|
|
</div> |
|
|
|
<el-table :data="dataList" v-loading="loading" border :height="height" @row-click="handleRowClick" :row-style="rowStyle"> |
|
|
|
<el-table-column align="center" label="操作" width="100"> |
|
|
|
<el-table-column align="center" header-align="center" label="操作" width="150"> |
|
|
|
<template slot-scope="scope"> |
|
|
|
<el-link v-if="scope.row.createDate" @click="handlePrint(scope.row)">装箱单标签</el-link> |
|
|
|
<el-link v-else @click="handleOutWarehouse(scope.row)">装箱出库</el-link> |
|
|
|
<el-link v-if="scope.row.createDate" @click="handlePrint(scope.row)">装箱单标签</el-link> |
|
|
|
<el-link v-else @click="handleOutWarehouse(scope.row)">装箱出库</el-link> |
|
|
|
<el-link @click="handleQueryRoll(scope.row)">卷明细</el-link> |
|
|
|
</template> |
|
|
|
</el-table-column> |
|
|
|
<el-table-column |
|
|
|
@ -491,6 +516,37 @@ export default { |
|
|
|
:height="300"></shipment-box> |
|
|
|
<el-footer style="height: 20px"></el-footer> |
|
|
|
</el-dialog> |
|
|
|
|
|
|
|
<el-dialog title="卷明细" :visible.sync="rollDetailVisible" width="1000px" v-drag :close-on-click-modal="false"> |
|
|
|
<el-form :model="row" label-position="top"> |
|
|
|
<el-row :gutter="10"> |
|
|
|
<el-col :span="4"> |
|
|
|
<el-form-item label="发货ID"> |
|
|
|
<el-input v-model="row.shipmentId" disabled></el-input> |
|
|
|
</el-form-item> |
|
|
|
</el-col> |
|
|
|
<el-col :span="4"> |
|
|
|
<el-form-item label="客户编码"> |
|
|
|
<el-input v-model="row.customerNo" disabled></el-input> |
|
|
|
</el-form-item> |
|
|
|
</el-col> |
|
|
|
<el-col :span="8"> |
|
|
|
<el-form-item label="客户名称"> |
|
|
|
<el-input v-model="row.customerName" disabled></el-input> |
|
|
|
</el-form-item> |
|
|
|
</el-col> |
|
|
|
</el-row> |
|
|
|
</el-form> |
|
|
|
<el-table :data="rollDetailList" border :height="300"> |
|
|
|
<el-table-column align="left" header-align="center" :min-width="120" label="工单号" prop="orderNo"></el-table-column> |
|
|
|
<el-table-column align="left" header-align="center" :min-width="120" label="卷号" prop="rollNo"></el-table-column> |
|
|
|
<el-table-column align="left" header-align="center" :min-width="120" label="箱号" prop="boxNoStr"></el-table-column> |
|
|
|
<el-table-column align="left" header-align="center" :min-width="120" label="物料编码" prop="partNo"></el-table-column> |
|
|
|
<el-table-column align="left" header-align="center" :min-width="180" label="物料描述" prop="partDesc"></el-table-column> |
|
|
|
<el-table-column align="right" header-align="center" :min-width="80" label="数量" prop="rollQty"></el-table-column> |
|
|
|
</el-table> |
|
|
|
<el-footer style="height: 20px"></el-footer> |
|
|
|
</el-dialog> |
|
|
|
</div> |
|
|
|
</template> |
|
|
|
|
|
|
|
|
