feat(wms): 新增导出功能并优化发货单显示
- 在base.vue中新增导出按钮和按库区排序选项 - 添加exportCoilWithAll API接口用于批量导出 - 在waybill.vue中新增showNewExport属性控制导出按钮显示 - 优化发货单页面显示,增加订单编号和备注显示 - 新增delivery/canuse页面用于展示可用钢卷 - 修复发货单修改时订单编号显示问题
This commit is contained in:
@@ -43,13 +43,20 @@
|
||||
<el-table-column label="车牌" align="center" prop="licensePlate" width="100" />
|
||||
<el-table-column label="收货单位" align="center" prop="consigneeUnit" />
|
||||
<!-- <el-table-column label="发货单位" align="center" prop="senderUnit" /> -->
|
||||
<el-table-column label="订单编号" align="center" prop="orderNo" />
|
||||
<el-table-column label="订单编号" align="center" prop="orderNo">
|
||||
<template slot-scope="scope">
|
||||
<span v-if="scope.row.orderId">{{ scope.row.orderCode }}</span>
|
||||
<span v-else>{{ scope.row.principalPhone }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="发货时间" align="center" prop="deliveryTime" width="100">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ parseTime(scope.row.deliveryTime, '{y}-{m}-{d}') }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="负责人" align="center" prop="principal" width="60" />
|
||||
<el-table-column label="备注" align="center" prop="remark" width="100" show-overflow-tooltip/>
|
||||
|
||||
<!-- <el-table-column label="负责人电话" align="center" prop="principalPhone" width="100" /> -->
|
||||
<el-table-column label="完成状态" align="center" prop="status" width="120">
|
||||
<template slot-scope="scope">
|
||||
@@ -109,9 +116,12 @@
|
||||
<el-form-item label="负责人" prop="principal">
|
||||
<el-input v-model="form.principal" placeholder="请输入负责人" />
|
||||
</el-form-item>
|
||||
<!-- <el-form-item label="负责人电话" prop="principalPhone">
|
||||
<el-input v-model="form.principalPhone" placeholder="请输入负责人电话" />
|
||||
</el-form-item> -->
|
||||
<el-form-item label="订单编号" prop="principalPhone" v-if="!form.orderId">
|
||||
<el-input v-model="form.principalPhone" placeholder="请输入订单编号"/>
|
||||
</el-form-item>
|
||||
<el-form-item label="订单编号" prop="principalPhone" v-else title="当前发货单已绑定订单">
|
||||
<el-input v-model="form.orderCode" placeholder="请输入订单编号" readonly disabled/>
|
||||
</el-form-item>
|
||||
<el-form-item label="备注" prop="remark">
|
||||
<el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
|
||||
</el-form-item>
|
||||
@@ -338,7 +348,10 @@ export default {
|
||||
const waybillId = row.waybillId || this.ids
|
||||
getDeliveryWaybill(waybillId).then(response => {
|
||||
this.loading = false;
|
||||
this.form = response.data;
|
||||
this.form = {
|
||||
...response.data,
|
||||
orderCode: row.orderCode
|
||||
};
|
||||
this.open = true;
|
||||
this.title = "修改发货单";
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user