refactor(ui): 优化表格显示和对话框布局
- 修改发货单打印对话框宽度为固定值 - 订单列表显示供应商名称替代ID - 收货单和退货单显示订单编号替代ID - 调整发货单明细查询逻辑 - 退货单新增订单选择功能 - 发货单组件添加负责人信息输入 - 调整发货单打印样式和布局
This commit is contained in:
@@ -52,7 +52,7 @@
|
||||
</div>
|
||||
<el-table :data="orderList" border stripe highlight-current-row size="small" v-loading="orderLoading">
|
||||
<el-table-column prop="orderCode" label="订单编号" width="150" fixed="left" />
|
||||
<el-table-column prop="supplierId" label="供应商ID" />
|
||||
<el-table-column prop="supplierName" label="供应商" />
|
||||
<el-table-column prop="orderDate" label="下单日期" />
|
||||
<el-table-column prop="expectedArrival" label="期望到货" />
|
||||
<el-table-column prop="orderType" label="类型" />
|
||||
|
||||
@@ -20,9 +20,8 @@
|
||||
</div>
|
||||
</div>
|
||||
<el-table :data="list" border size="small" v-loading="loading">
|
||||
<el-table-column prop="receiptId" label="ID" width="80" />
|
||||
<el-table-column prop="orderId" label="订单ID" />
|
||||
<el-table-column prop="itemId" label="明细ID" />
|
||||
<el-table-column prop="orderCode" label="订单编号" />
|
||||
<el-table-column prop="itemId" label="明细编号" />
|
||||
<el-table-column prop="receivedQty" label="收货数量" />
|
||||
<el-table-column prop="qualityResult" label="质检结果">
|
||||
<template slot-scope="scope">
|
||||
|
||||
@@ -55,7 +55,7 @@
|
||||
<el-button type="primary" size="small" @click="openReturnItemDialog()">新增明细</el-button>
|
||||
</header>
|
||||
<div class="inline-filter">
|
||||
<el-input v-model="returnItemQuery.returnId" placeholder="退货单ID" size="small" clearable />
|
||||
<!-- <el-input v-model="returnItemQuery.returnId" placeholder="退货单ID" size="small" clearable /> -->
|
||||
<OrderSelect v-model="returnItemQuery.orderId" />
|
||||
<OrderDetailSelect v-model="returnItemQuery.itemId" :orderId="returnItemQuery.orderId" />
|
||||
<div class="filter-actions">
|
||||
@@ -64,9 +64,8 @@
|
||||
</div>
|
||||
</div>
|
||||
<el-table :data="returnItemList" border size="small" v-loading="returnItemLoading">
|
||||
<el-table-column prop="returnItemId" label="ID" width="80" />
|
||||
<el-table-column prop="returnId" label="退货单ID" />
|
||||
<el-table-column prop="itemId" label="订单明细ID" />
|
||||
<!-- <el-table-column prop="returnId" label="退货单ID" /> -->
|
||||
<el-table-column prop="itemId" label="订单明细编号" />
|
||||
<el-table-column prop="returnQty" label="数量" />
|
||||
<el-table-column label="问题照片">
|
||||
<template slot-scope="scope">
|
||||
@@ -120,15 +119,20 @@
|
||||
|
||||
<el-dialog :title="returnItemDialog.title" :visible.sync="returnItemDialog.visible" width="500px">
|
||||
<el-form :model="returnItemDialog.form" :rules="returnItemRules" ref="returnItemForm" label-width="120px" size="small">
|
||||
<el-form-item label="退货单ID" prop="returnId">
|
||||
<!-- <el-form-item label="退货单ID" prop="returnId">
|
||||
<el-input v-model="returnItemDialog.form.returnId" />
|
||||
</el-form-item> -->
|
||||
<!-- 先选择订单id,再选择订单明细id, -->
|
||||
<el-form-item label="选择订单" prop="orderId">
|
||||
<!-- <el-input v-model="returnItemDialog.form.orderId" /> -->
|
||||
<OrderSelect v-model="returnItemDialog.form.orderId" />
|
||||
</el-form-item>
|
||||
<el-form-item label="订单明细ID" prop="itemId">
|
||||
<el-form-item label="订单明细编号" prop="itemId">
|
||||
<!-- <el-input v-model="returnItemDialog.form.itemId" /> -->
|
||||
<OrderDetailSelect v-model="returnItemDialog.form.itemId" :orderId="returnItemDialog.form.orderId" />
|
||||
</el-form-item>
|
||||
<el-form-item label="退货数量" prop="returnQty">
|
||||
<el-input-number v-model="returnItemDialog.form.returnQty" :min="0" :precision="3" />
|
||||
<el-input-number size="mini" v-model="returnItemDialog.form.returnQty" :min="0" :precision="3" />
|
||||
</el-form-item>
|
||||
<el-form-item label="问题照片">
|
||||
<el-input v-model="returnItemDialog.form.photos" placeholder="多张以逗号分隔" />
|
||||
|
||||
Reference in New Issue
Block a user