yudao
/
admin-vue3
mirror of https://gitee.com/yudaocode/yudao-ui-admin-vue3.git
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

feat（wms）：增加 order_time 单据字段

wms
YunaiV 2026-05-13 23:31:03 +08:00
parent 8d06f87e0f
commit a7911bcbcf
22 changed files with 193 additions and 148 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/api/wms/order/check/detail/index.ts
View File

@ -18,6 +18,5 @@ export interface CheckOrderDetailVO {
differenceQuantity?: number
availableQuantity?: number
amount?: number
remark?: string
createTime?: Date
}

1
src/api/wms/order/check/index.ts
View File

@ -5,6 +5,7 @@ import { CheckOrderDetailVO } from './detail'
export interface CheckOrderVO {
id?: number
no?: string
orderTime?: string
status?: number
remark?: string
warehouseId?: number

1
src/api/wms/order/movement/detail/index.ts
View File

@ -16,6 +16,5 @@ export interface MovementOrderDetailVO {
quantity?: number
availableQuantity?: number
amount?: number
remark?: string
createTime?: Date
}

1
src/api/wms/order/movement/index.ts
View File

@ -5,6 +5,7 @@ import { MovementOrderDetailVO } from './detail'
export interface MovementOrderVO {
id?: number
no?: string
orderTime?: string
status?: number
remark?: string
sourceWarehouseId?: number

1
src/api/wms/order/receipt/detail/index.ts
View File

@ -13,6 +13,5 @@ export interface ReceiptOrderDetailVO {
warehouseName?: string
quantity?: number
amount?: number
remark?: string
createTime?: Date
}

1
src/api/wms/order/receipt/index.ts
View File

@ -6,6 +6,7 @@ export interface ReceiptOrderVO {
id?: number
no?: string
type?: number
orderTime?: string
status?: number
bizOrderNo?: string
merchantId?: number

1
src/api/wms/order/shipment/detail/index.ts
View File

@ -14,6 +14,5 @@ export interface ShipmentOrderDetailVO {
quantity?: number
availableQuantity?: number
amount?: number
remark?: string
createTime?: Date
}

1
src/api/wms/order/shipment/index.ts
View File

@ -6,6 +6,7 @@ export interface ShipmentOrderVO {
id?: number
no?: string
type?: number
orderTime?: string
status?: number
bizOrderNo?: string
merchantId?: number

5
src/views/wms/order/check/CheckOrderDetail.vue
View File

@ -5,6 +5,10 @@
<div class="mb-16px text-18px font-bold">单据信息</div>
<el-descriptions :column="2" border>
<el-descriptions-item label="盘库单号">{{ detailData.no || '-' }}</el-descriptions-item>
<el-descriptions-item label="仓库">{{ detailData.warehouseName || '-' }}</el-descriptions-item>
<el-descriptions-item label="单据日期">
{{ formatNullableDate(detailData.orderTime, 'YYYY-MM-DD') }}
</el-descriptions-item>
<el-descriptions-item label="单据状态">
<dict-tag
v-if="detailData.status !== undefined"
@ -13,7 +17,6 @@
/>
<span v-else>-</span>
</el-descriptions-item>
<el-descriptions-item label="仓库">{{ detailData.warehouseName || '-' }}</el-descriptions-item>
<el-descriptions-item label="盈亏数量">
{{ formatQuantity(detailData.totalQuantity) || '-' }}
</el-descriptions-item>

30
src/views/wms/order/check/CheckOrderForm.vue
View File

@ -14,12 +14,23 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="盈亏数量">
<el-form-item label="单据日期" prop="orderTime">
<el-date-picker
v-model="formData.orderTime"
class="!w-1/1"
placeholder="请选择单据日期"
type="date"
value-format="x"
/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="盈亏数量" prop="totalQuantity">
<el-input :model-value="formatQuantity(totalQuantity)" disabled />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="总金额">
<el-form-item label="总金额" prop="totalAmount">
<el-input-number
v-model="formData.totalAmount"
:controls="false"
@ -92,11 +103,6 @@
/>
</template>
</el-table-column>
<el-table-column label="备注" min-width="160">
<template #default="{ row }">
<el-input v-model="row.remark" maxlength="255" placeholder="请输入备注" />
</template>
</el-table-column>
<el-table-column align="center" label="操作" width="80">
<template #default="{ $index }">
<el-button link type="danger" @click="handleDeleteDetail($index)">删除</el-button>
@ -164,6 +170,7 @@ const originalFormData = ref('')
const formData = ref<CheckOrderVO>({
id: undefined,
no: undefined,
orderTime: undefined,
status: OrderStatusEnum.PREPARE,
warehouseId: undefined,
totalQuantity: 0,
@ -173,7 +180,10 @@ const formData = ref<CheckOrderVO>({
})
const formRules = reactive<FormRules>({
no: [{ required: true, message: '盘库单号不能为空', trigger: 'blur' }],
warehouseId: [{ required: true, message: '仓库不能为空', trigger: 'change' }]
orderTime: [{ required: true, message: '单据日期不能为空', trigger: 'change' }],
warehouseId: [{ required: true, message: '仓库不能为空', trigger: 'change' }],
totalQuantity: [{ required: true, message: '盈亏数量不能为空', trigger: 'change' }],
totalAmount: [{ required: true, message: '总金额不能为空', trigger: 'blur' }]
})
const formRef = ref()
const inventorySelectRef = ref()
@ -230,8 +240,7 @@ const buildDetail = (inventory: InventorySelectRow): CheckOrderDetailVO => ({
quantity: inventory.availableQuantity,
checkQuantity: inventory.availableQuantity,
availableQuantity: inventory.availableQuantity,
amount: inventory.amount,
remark: undefined
amount: inventory.amount
})
const handleAddDetail = () => inventorySelectRef.value?.open()
@ -348,6 +357,7 @@ const resetForm = () => {
formData.value = {
id: undefined,
no: generateOrderNo('PK'),
orderTime: undefined,
status: OrderStatusEnum.PREPARE,
warehouseId: undefined,
totalQuantity: 0,

14
src/views/wms/order/check/index.vue
View File

@ -18,14 +18,14 @@
<el-form-item label="仓库" prop="warehouseId">
<WarehouseSelect v-model="queryParams.warehouseId" class="!w-240px" />
</el-form-item>
<el-form-item label="单据日期" prop="orderDate">
<el-form-item label="单据日期" prop="orderTime">
<el-date-picker
v-model="queryParams.orderDate"
:shortcuts="defaultShortcuts"
v-model="queryParams.orderTime"
:default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
class="!w-240px"
end-placeholder="结束时间"
start-placeholder="开始时间"
type="datetimerange"
end-placeholder="结束日期"
start-placeholder="开始日期"
type="daterange"
value-format="YYYY-MM-DD HH:mm:ss"
/>
</el-form-item>
@ -307,7 +307,7 @@ const getDefaultQueryParams = () => ({
no: undefined as string | undefined,
status: undefined as number | undefined,
warehouseId: undefined as number | undefined,
orderDate: undefined as string[] | undefined,
orderTime: undefined as string[] | undefined,
totalQuantityMin: undefined as number | undefined,
totalQuantityMax: undefined as number | undefined,
totalAmountMin: undefined as number | undefined,

16
src/views/wms/order/movement/MovementOrderDetail.vue
View File

@ -5,6 +5,15 @@
<div class="mb-16px text-18px font-bold">单据信息</div>
<el-descriptions :column="2" border>
<el-descriptions-item label="移库单号">{{ detailData.no || '-' }}</el-descriptions-item>
<el-descriptions-item label="来源仓库">
{{ detailData.sourceWarehouseName || '-' }}
</el-descriptions-item>
<el-descriptions-item label="目标仓库">
{{ detailData.targetWarehouseName || '-' }}
</el-descriptions-item>
<el-descriptions-item label="单据日期">
{{ formatNullableDate(detailData.orderTime, 'YYYY-MM-DD') }}
</el-descriptions-item>
<el-descriptions-item label="单据状态">
<dict-tag
v-if="detailData.status !== undefined"
@ -13,12 +22,6 @@
/>
<span v-else>-</span>
</el-descriptions-item>
<el-descriptions-item label="来源仓库">
{{ detailData.sourceWarehouseName || '-' }}
</el-descriptions-item>
<el-descriptions-item label="目标仓库">
{{ detailData.targetWarehouseName || '-' }}
</el-descriptions-item>
<el-descriptions-item label="总数量">
{{ formatQuantity(detailData.totalQuantity) || '-' }}
</el-descriptions-item>
@ -62,7 +65,6 @@
<el-table-column align="right" label="金额(元)" prop="amount" width="140">
<template #default="{ row }">{{ formatPrice(row.amount) || '-' }}</template>
</el-table-column>
<el-table-column label="备注" min-width="160" prop="remark" />
</el-table>
</div>
</Dialog>

30
src/views/wms/order/movement/MovementOrderForm.vue
View File

@ -19,12 +19,23 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="总数量">
<el-form-item label="单据日期" prop="orderTime">
<el-date-picker
v-model="formData.orderTime"
class="!w-1/1"
placeholder="请选择单据日期"
type="date"
value-format="x"
/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="总数量" prop="totalQuantity">
<el-input :model-value="formatQuantity(totalQuantity)" disabled />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="总金额">
<el-form-item label="总金额" prop="totalAmount">
<el-input-number
v-model="formData.totalAmount"
:controls="false"
@ -94,11 +105,6 @@
/>
</template>
</el-table-column>
<el-table-column label="备注" min-width="160">
<template #default="{ row }">
<el-input v-model="row.remark" maxlength="255" placeholder="请输入备注" />
</template>
</el-table-column>
<el-table-column align="center" label="操作" width="80">
<template #default="{ $index }">
<el-button link type="danger" @click="handleDeleteDetail($index)">删除</el-button>
@ -166,6 +172,7 @@ const originalFormData = ref('')
const formData = ref<MovementOrderVO>({
id: undefined,
no: undefined,
orderTime: undefined,
status: OrderStatusEnum.PREPARE,
sourceWarehouseId: undefined,
targetWarehouseId: undefined,
@ -176,8 +183,11 @@ const formData = ref<MovementOrderVO>({
})
const formRules = reactive<FormRules>({
no: [{ required: true, message: '移库单号不能为空', trigger: 'blur' }],
orderTime: [{ required: true, message: '单据日期不能为空', trigger: 'change' }],
sourceWarehouseId: [{ required: true, message: '来源仓库不能为空', trigger: 'change' }],
targetWarehouseId: [{ required: true, message: '目标仓库不能为空', trigger: 'change' }]
targetWarehouseId: [{ required: true, message: '目标仓库不能为空', trigger: 'change' }],
totalQuantity: [{ required: true, message: '移库数量不能为空', trigger: 'change' }],
totalAmount: [{ required: true, message: '总金额不能为空', trigger: 'blur' }]
})
const formRef = ref()
const inventorySelectRef = ref()
@ -230,8 +240,7 @@ const buildDetail = (inventory: InventorySelectRow): MovementOrderDetailVO => ({
targetWarehouseId: formData.value.targetWarehouseId,
quantity: undefined,
availableQuantity: inventory.availableQuantity,
amount: undefined,
remark: undefined
amount: undefined
})
const handleAddDetail = () => inventorySelectRef.value?.open()
@ -374,6 +383,7 @@ const resetForm = () => {
formData.value = {
id: undefined,
no: generateOrderNo('YK'),
orderTime: undefined,
status: OrderStatusEnum.PREPARE,
sourceWarehouseId: undefined,
targetWarehouseId: undefined,

15
src/views/wms/order/movement/index.vue
View File

@ -21,14 +21,14 @@
<el-form-item label="目标仓库" prop="targetWarehouseId">
<WarehouseSelect v-model="queryParams.targetWarehouseId" class="!w-240px" />
</el-form-item>
<el-form-item label="单据日期" prop="orderDate">
<el-form-item label="单据日期" prop="orderTime">
<el-date-picker
v-model="queryParams.orderDate"
:shortcuts="defaultShortcuts"
v-model="queryParams.orderTime"
:default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
class="!w-240px"
end-placeholder="结束时间"
start-placeholder="开始时间"
type="datetimerange"
end-placeholder="结束日期"
start-placeholder="开始日期"
type="daterange"
value-format="YYYY-MM-DD HH:mm:ss"
/>
</el-form-item>
@ -175,7 +175,6 @@
<el-table-column align="right" label="金额(元)" width="120">
<template #default="{ row: detail }">{{ formatPrice(detail.amount) || '-' }}</template>
</el-table-column>
<el-table-column label="备注" min-width="160" prop="remark" />
</el-table>
</template>
</el-table-column>
@ -329,7 +328,7 @@ const getDefaultQueryParams = () => ({
status: undefined as number | undefined,
sourceWarehouseId: undefined as number | undefined,
targetWarehouseId: undefined as number | undefined,
orderDate: undefined as string[] | undefined,
orderTime: undefined as string[] | undefined,
totalQuantityMin: undefined as number | undefined,
totalQuantityMax: undefined as number | undefined,
totalAmountMin: undefined as number | undefined,

19
src/views/wms/order/receipt/ReceiptOrderDetail.vue
View File

@ -5,14 +5,6 @@
<div class="mb-16px text-18px font-bold">单据信息</div>
<el-descriptions :column="2" border>
<el-descriptions-item label="入库单号">{{ detailData.no || '-' }}</el-descriptions-item>
<el-descriptions-item label="单据状态">
<dict-tag
v-if="detailData.status !== undefined"
:type="DICT_TYPE.WMS_ORDER_STATUS"
:value="detailData.status"
/>
<span v-else>-</span>
</el-descriptions-item>
<el-descriptions-item label="入库类型">
<dict-tag
v-if="detailData.type !== undefined"
@ -24,6 +16,17 @@
<el-descriptions-item label="仓库">
{{ detailData.warehouseName || '-' }}
</el-descriptions-item>
<el-descriptions-item label="单据日期">
{{ formatNullableDate(detailData.orderTime, 'YYYY-MM-DD') }}
</el-descriptions-item>
<el-descriptions-item label="单据状态">
<dict-tag
v-if="detailData.status !== undefined"
:type="DICT_TYPE.WMS_ORDER_STATUS"
:value="detailData.status"
/>
<span v-else>-</span>
</el-descriptions-item>
<el-descriptions-item label="供应商">
{{ detailData.merchantName || '-' }}
</el-descriptions-item>

70
src/views/wms/order/receipt/ReceiptOrderForm.vue
View File

@ -26,6 +26,11 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="仓库" prop="warehouseId">
<WarehouseSelect v-model="formData.warehouseId" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="供应商" prop="merchantId">
<MerchantSelect
@ -41,28 +46,6 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="仓库" prop="warehouseId">
<WarehouseSelect v-model="formData.warehouseId" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="总数量">
<el-input :model-value="formatQuantity(totalQuantity)" disabled />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="总金额">
<el-input-number
v-model="formData.totalAmount"
:controls="false"
:min="0"
:precision="PRICE_PRECISION"
class="!w-1/1"
placeholder="请输入总金额"
/>
</el-form-item>
</el-col>
<el-col :span="16">
<el-form-item label="备注" prop="remark">
<el-input
v-model="formData.remark"
@ -73,6 +56,34 @@
/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="单据日期" prop="orderTime">
<el-date-picker
v-model="formData.orderTime"
class="!w-1/1"
placeholder="请选择单据日期"
type="date"
value-format="x"
/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="总数量" prop="totalQuantity">
<el-input :model-value="formatQuantity(totalQuantity)" disabled />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="总金额" prop="totalAmount">
<el-input-number
v-model="formData.totalAmount"
:controls="false"
:min="0"
:precision="PRICE_PRECISION"
class="!w-1/1"
placeholder="请输入总金额"
/>
</el-form-item>
</el-col>
</el-row>
<div class="mb-12px flex items-center justify-between">
@ -132,11 +143,6 @@
/>
</template>
</el-table-column>
<el-table-column label="备注" min-width="180">
<template #default="scope">
<el-input v-model="scope.row.remark" maxlength="255" placeholder="请输入备注" />
</template>
</el-table-column>
<el-table-column align="center" label="操作" width="80">
<template #default="scope">
<el-button link type="danger" @click="handleDeleteDetail(scope.$index)">删除</el-button>
@ -212,6 +218,7 @@ const formData = ref<ReceiptOrderVO>({
id: undefined,
no: undefined,
type: undefined,
orderTime: undefined,
status: OrderStatusEnum.PREPARE,
bizOrderNo: undefined,
merchantId: undefined,
@ -224,7 +231,10 @@ const formData = ref<ReceiptOrderVO>({
const formRules = reactive<FormRules>({
no: [{ required: true, message: '入库单号不能为空', trigger: 'blur' }],
type: [{ required: true, message: '入库类型不能为空', trigger: 'change' }],
warehouseId: [{ required: true, message: '仓库不能为空', trigger: 'change' }]
orderTime: [{ required: true, message: '单据日期不能为空', trigger: 'change' }],
warehouseId: [{ required: true, message: '仓库不能为空', trigger: 'change' }],
totalQuantity: [{ required: true, message: '入库数量不能为空', trigger: 'change' }],
totalAmount: [{ required: true, message: '总金额不能为空', trigger: 'blur' }]
})
const formRef = ref() // 表单 Ref
const skuSelectRef = ref() // 商品 SKU 选择弹窗 Ref
@ -277,8 +287,7 @@ const buildDetail = (sku: ItemSkuVO): ReceiptOrderDetailVO => ({
skuCode: sku.code,
skuName: sku.name,
quantity: undefined,
amount: undefined,
remark: undefined
amount: undefined
})
/** 添加商品 */
@ -429,6 +438,7 @@ const resetForm = () => {
id: undefined,
no: generateOrderNo('RK'),
type: undefined,
orderTime: undefined,
status: OrderStatusEnum.PREPARE,
bizOrderNo: undefined,
merchantId: undefined,

7
src/views/wms/order/receipt/ReceiptOrderPrint.vue
View File

@ -9,10 +9,11 @@
<div>
入库类型：{{ getDictLabel(DICT_TYPE.WMS_RECEIPT_ORDER_TYPE, printData.type) || '-' }}
</div>
<div>仓库：{{ printData.warehouseName || '-' }}</div>
<div>单据日期：{{ formatNullableDate(printData.orderTime, 'YYYY-MM-DD') }}</div>
<div>入库状态：{{ getDictLabel(DICT_TYPE.WMS_ORDER_STATUS, printData.status) || '-' }}</div>
<div>供应商：{{ printData.merchantName || '-' }}</div>
<div>业务单号：{{ printData.bizOrderNo || '-' }}</div>
<div>仓库：{{ printData.warehouseName || '-' }}</div>
<div>总数量：{{ formatQuantity(printData.totalQuantity) || '-' }}</div>
<div>总金额：{{ formatPrice(printData.totalAmount) || '-' }}</div>
<div>创建时间：{{ formatNullableDate(printData.createTime) }}</div>
@ -25,7 +26,6 @@
<th class="border border-solid border-#dcdfe6 bg-#f5f7fa p-8px text-left">规格信息</th>
<th class="border border-solid border-#dcdfe6 bg-#f5f7fa p-8px text-left">数量</th>
<th class="border border-solid border-#dcdfe6 bg-#f5f7fa p-8px text-left">金额(元)</th>
<th class="border border-solid border-#dcdfe6 bg-#f5f7fa p-8px text-left">备注</th>
</tr>
</thead>
<tbody>
@ -44,7 +44,6 @@
<td class="border border-solid border-#dcdfe6 p-8px text-right">
{{ formatPrice(detail.amount) || '-' }}
</td>
<td class="border border-solid border-#dcdfe6 p-8px">{{ detail.remark || '-' }}</td>
</tr>
<tr v-if="!printData.details?.length">
<td
@ -71,7 +70,7 @@ defineOptions({ name: 'WmsReceiptOrderPrint' })
const printData = ref<ReceiptOrderVO>({}) // 打印数据
const printButtonRef = ref<HTMLButtonElement>() // 打印按钮
const tableColumnCount = 5
const tableColumnCount = 4
const printObj = ref({
id: 'wmsReceiptOrderPrint',
popTitle: '&nbsp',

15
src/views/wms/order/receipt/index.vue
View File

@ -48,14 +48,14 @@
supplier
/>
</el-form-item>
<el-form-item label="单据日期" prop="orderDate">
<el-form-item label="单据日期" prop="orderTime">
<el-date-picker
v-model="queryParams.orderDate"
:shortcuts="defaultShortcuts"
v-model="queryParams.orderTime"
:default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
class="!w-240px"
end-placeholder="结束时间"
start-placeholder="开始时间"
type="datetimerange"
end-placeholder="结束日期"
start-placeholder="开始日期"
type="daterange"
value-format="YYYY-MM-DD HH:mm:ss"
/>
</el-form-item>
@ -247,7 +247,6 @@
{{ formatPrice(detailScope.row.amount) || '-' }}
</template>
</el-table-column>
<el-table-column label="备注" min-width="160" prop="remark" />
</el-table>
</template>
</el-table-column>
@ -458,7 +457,7 @@ const getDefaultQueryParams = () => ({
status: undefined as number | undefined,
warehouseId: undefined as number | undefined,
merchantId: undefined as number | undefined,
orderDate: undefined as string[] | undefined,
orderTime: undefined as string[] | undefined,
totalQuantityMin: undefined as number | undefined,
totalQuantityMax: undefined as number | undefined,
totalAmountMin: undefined as number | undefined,

19
src/views/wms/order/shipment/ShipmentOrderDetail.vue
View File

@ -5,14 +5,6 @@
<div class="mb-16px text-18px font-bold">单据信息</div>
<el-descriptions :column="2" border>
<el-descriptions-item label="出库单号">{{ detailData.no || '-' }}</el-descriptions-item>
<el-descriptions-item label="单据状态">
<dict-tag
v-if="detailData.status !== undefined"
:type="DICT_TYPE.WMS_ORDER_STATUS"
:value="detailData.status"
/>
<span v-else>-</span>
</el-descriptions-item>
<el-descriptions-item label="出库类型">
<dict-tag
v-if="detailData.type !== undefined"
@ -24,6 +16,17 @@
<el-descriptions-item label="仓库">
{{ detailData.warehouseName || '-' }}
</el-descriptions-item>
<el-descriptions-item label="单据日期">
{{ formatNullableDate(detailData.orderTime, 'YYYY-MM-DD') }}
</el-descriptions-item>
<el-descriptions-item label="单据状态">
<dict-tag
v-if="detailData.status !== undefined"
:type="DICT_TYPE.WMS_ORDER_STATUS"
:value="detailData.status"
/>
<span v-else>-</span>
</el-descriptions-item>
<el-descriptions-item label="客户">
{{ detailData.merchantName || '-' }}
</el-descriptions-item>

71
src/views/wms/order/shipment/ShipmentOrderForm.vue
View File

@ -26,6 +26,11 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="仓库" prop="warehouseId">
<WarehouseSelect v-model="formData.warehouseId" @change="handleWarehouseChange" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="客户" prop="merchantId">
<MerchantSelect
@ -41,28 +46,6 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="仓库" prop="warehouseId">
<WarehouseSelect v-model="formData.warehouseId" @change="handleWarehouseChange" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="总数量">
<el-input :model-value="formatQuantity(totalQuantity)" disabled />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="总金额">
<el-input-number
v-model="formData.totalAmount"
:controls="false"
:min="0"
:precision="PRICE_PRECISION"
class="!w-1/1"
placeholder="请输入总金额"
/>
</el-form-item>
</el-col>
<el-col :span="16">
<el-form-item label="备注" prop="remark">
<el-input
v-model="formData.remark"
@ -73,6 +56,34 @@
/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="单据日期" prop="orderTime">
<el-date-picker
v-model="formData.orderTime"
class="!w-1/1"
placeholder="请选择单据日期"
type="date"
value-format="x"
/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="总数量" prop="totalQuantity">
<el-input :model-value="formatQuantity(totalQuantity)" disabled />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="总金额" prop="totalAmount">
<el-input-number
v-model="formData.totalAmount"
:controls="false"
:min="0"
:precision="PRICE_PRECISION"
class="!w-1/1"
placeholder="请输入总金额"
/>
</el-form-item>
</el-col>
</el-row>
<div class="mb-12px flex items-center justify-between">
@ -137,11 +148,6 @@
/>
</template>
</el-table-column>
<el-table-column label="备注" min-width="180">
<template #default="scope">
<el-input v-model="scope.row.remark" maxlength="255" placeholder="请输入备注" />
</template>
</el-table-column>
<el-table-column align="center" label="操作" width="80">
<template #default="scope">
<el-button link type="danger" @click="handleDeleteDetail(scope.$index)">删除</el-button>
@ -197,7 +203,6 @@ import InventorySelect, {
} from '@/views/wms/inventory/components/InventorySelect.vue'
import MerchantSelect from '@/views/wms/md/merchant/components/MerchantSelect.vue'
import WarehouseSelect from '@/views/wms/md/warehouse/components/WarehouseSelect.vue'
import { formatNullableDate } from '@/utils/formatTime'
import { OrderStatusEnum, OrderUpdateStatusList } from '@/views/wms/utils/constants'
import {
formatQuantity,
@ -223,6 +228,7 @@ const formData = ref<ShipmentOrderVO>({
id: undefined,
no: undefined,
type: undefined,
orderTime: undefined,
status: OrderStatusEnum.PREPARE,
bizOrderNo: undefined,
merchantId: undefined,
@ -235,7 +241,10 @@ const formData = ref<ShipmentOrderVO>({
const formRules = reactive<FormRules>({
no: [{ required: true, message: '出库单号不能为空', trigger: 'blur' }],
type: [{ required: true, message: '出库类型不能为空', trigger: 'change' }],
warehouseId: [{ required: true, message: '仓库不能为空', trigger: 'change' }]
orderTime: [{ required: true, message: '单据日期不能为空', trigger: 'change' }],
warehouseId: [{ required: true, message: '仓库不能为空', trigger: 'change' }],
totalQuantity: [{ required: true, message: '出库数量不能为空', trigger: 'change' }],
totalAmount: [{ required: true, message: '总金额不能为空', trigger: 'blur' }]
})
const formRef = ref() // 表单 Ref
const inventorySelectRef = ref() // 库存选择弹窗 Ref
@ -291,8 +300,7 @@ const buildDetail = (inventory: InventorySelectRow): ShipmentOrderDetailVO => ({
warehouseName: inventory.warehouseName,
quantity: undefined,
availableQuantity: inventory.availableQuantity,
amount: undefined,
remark: undefined
amount: undefined
})
/** 添加商品 */
@ -454,6 +462,7 @@ const resetForm = () => {
id: undefined,
no: generateOrderNo('CK'),
type: undefined,
orderTime: undefined,
status: OrderStatusEnum.PREPARE,
bizOrderNo: undefined,
merchantId: undefined,

7
src/views/wms/order/shipment/ShipmentOrderPrint.vue
View File

@ -9,10 +9,11 @@
<div>
出库类型：{{ getDictLabel(DICT_TYPE.WMS_SHIPMENT_ORDER_TYPE, printData.type) || '-' }}
</div>
<div>仓库：{{ printData.warehouseName || '-' }}</div>
<div>单据日期：{{ formatNullableDate(printData.orderTime, 'YYYY-MM-DD') }}</div>
<div>出库状态：{{ getDictLabel(DICT_TYPE.WMS_ORDER_STATUS, printData.status) || '-' }}</div>
<div>客户：{{ printData.merchantName || '-' }}</div>
<div>业务单号：{{ printData.bizOrderNo || '-' }}</div>
<div>仓库：{{ printData.warehouseName || '-' }}</div>
<div>总数量：{{ formatQuantity(printData.totalQuantity) || '-' }}</div>
<div>总金额：{{ formatPrice(printData.totalAmount) || '-' }}</div>
<div>创建时间：{{ formatNullableDate(printData.createTime) }}</div>
@ -25,7 +26,6 @@
<th class="border border-solid border-#dcdfe6 bg-#f5f7fa p-8px text-left">规格信息</th>
<th class="border border-solid border-#dcdfe6 bg-#f5f7fa p-8px text-left">数量</th>
<th class="border border-solid border-#dcdfe6 bg-#f5f7fa p-8px text-left">金额(元)</th>
<th class="border border-solid border-#dcdfe6 bg-#f5f7fa p-8px text-left">备注</th>
</tr>
</thead>
<tbody>
@ -44,7 +44,6 @@
<td class="border border-solid border-#dcdfe6 p-8px text-right">
{{ formatPrice(detail.amount) || '-' }}
</td>
<td class="border border-solid border-#dcdfe6 p-8px">{{ detail.remark || '-' }}</td>
</tr>
<tr v-if="!printData.details?.length">
<td
@ -71,7 +70,7 @@ defineOptions({ name: 'WmsShipmentOrderPrint' })
const printData = ref<ShipmentOrderVO>({}) // 打印数据
const printButtonRef = ref<HTMLButtonElement>() // 打印按钮
const tableColumnCount = 5
const tableColumnCount = 4
const printObj = ref({
id: 'wmsShipmentOrderPrint',
popTitle: '&nbsp',

15
src/views/wms/order/shipment/index.vue
View File

@ -48,14 +48,14 @@
customer
/>
</el-form-item>
<el-form-item label="单据日期" prop="orderDate">
<el-form-item label="单据日期" prop="orderTime">
<el-date-picker
v-model="queryParams.orderDate"
:shortcuts="defaultShortcuts"
v-model="queryParams.orderTime"
:default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
class="!w-240px"
end-placeholder="结束时间"
start-placeholder="开始时间"
type="datetimerange"
end-placeholder="结束日期"
start-placeholder="开始日期"
type="daterange"
value-format="YYYY-MM-DD HH:mm:ss"
/>
</el-form-item>
@ -247,7 +247,6 @@
{{ formatPrice(detailScope.row.amount) || '-' }}
</template>
</el-table-column>
<el-table-column label="备注" min-width="160" prop="remark" />
</el-table>
</template>
</el-table-column>
@ -458,7 +457,7 @@ const getDefaultQueryParams = () => ({
status: undefined as number | undefined,
warehouseId: undefined as number | undefined,
merchantId: undefined as number | undefined,
orderDate: undefined as string[] | undefined,
orderTime: undefined as string[] | undefined,
totalQuantityMin: undefined as number | undefined,
totalQuantityMax: undefined as number | undefined,
totalAmountMin: undefined as number | undefined,