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 放到【仓库】后面

pull/878/head
YunaiV 2026-05-14 00:02:03 +08:00
parent a7911bcbcf
commit 44808eb3f4
6 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -16,9 +16,6 @@
<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"
@ -27,6 +24,9 @@
/>
<span v-else>-</span>
</el-descriptions-item>
<el-descriptions-item label="单据日期">
{{ formatNullableDate(detailData.orderTime, 'YYYY-MM-DD') }}
</el-descriptions-item>
<el-descriptions-item label="供应商">
{{ detailData.merchantName || '-' }}
</el-descriptions-item>

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

@ -31,6 +31,17 @@
<WarehouseSelect v-model="formData.warehouseId" />
</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="merchantId">
<MerchantSelect
@ -56,17 +67,6 @@
/>
</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 />

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

@ -10,8 +10,8 @@
入库类型：{{ 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>单据日期：{{ formatNullableDate(printData.orderTime, 'YYYY-MM-DD') }}</div>
<div>供应商：{{ printData.merchantName || '-' }}</div>
<div>业务单号：{{ printData.bizOrderNo || '-' }}</div>
<div>总数量：{{ formatQuantity(printData.totalQuantity) || '-' }}</div>

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

@ -16,9 +16,6 @@
<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"
@ -27,6 +24,9 @@
/>
<span v-else>-</span>
</el-descriptions-item>
<el-descriptions-item label="单据日期">
{{ formatNullableDate(detailData.orderTime, 'YYYY-MM-DD') }}
</el-descriptions-item>
<el-descriptions-item label="客户">
{{ detailData.merchantName || '-' }}
</el-descriptions-item>

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

@ -31,6 +31,17 @@
<WarehouseSelect v-model="formData.warehouseId" @change="handleWarehouseChange" />
</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="merchantId">
<MerchantSelect
@ -56,17 +67,6 @@
/>
</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 />

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

@ -10,8 +10,8 @@
出库类型：{{ 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>单据日期：{{ formatNullableDate(printData.orderTime, 'YYYY-MM-DD') }}</div>
<div>客户：{{ printData.merchantName || '-' }}</div>
<div>业务单号：{{ printData.bizOrderNo || '-' }}</div>
<div>总数量：{{ formatQuantity(printData.totalQuantity) || '-' }}</div>