From 3860427fdbed34022ae8df034c3d94cd13c03293 Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期五, 24 十月 2025 16:39:09 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/ZhiHuiQiCe/FangCangZhiNeng
---
新建文件夹/WMS/src/views/outbound/outboundOrder_Hty.vue | 42 +++++++++++++++++++++---------------------
1 files changed, 21 insertions(+), 21 deletions(-)
diff --git "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WMS/src/views/outbound/outboundOrder_Hty.vue" "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WMS/src/views/outbound/outboundOrder_Hty.vue"
index b17616a..4ca2948 100644
--- "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WMS/src/views/outbound/outboundOrder_Hty.vue"
+++ "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WMS/src/views/outbound/outboundOrder_Hty.vue"
@@ -22,12 +22,12 @@
export default defineComponent({
setup() {
const table = ref({
- key: 'historyId',
+ key: 'id',
footer: "Foots",
cnName: '鍘嗗彶鍑哄簱鍗�',
name: 'DeliveryOrderHty',
url: "/DeliveryOrderHty/",
- sortName: "historyId"
+ sortName: "id"
});
const editFormFields = ref({});
const editFormOptions = ref([]);
@@ -66,7 +66,7 @@
]);
const columns = ref([
{
- field: 'historyId',
+ field: 'id',
title: '鍘嗗彶璁板綍涓婚敭',
type: 'int',
width: 120,
@@ -76,7 +76,7 @@
align: 'left'
},
{
- field: 'id',
+ field: 'sourceId',
title: '鍘熶富閿�',
type: 'int',
width: 100,
@@ -117,7 +117,7 @@
},
{
field: 'warehouse_no',
- title: '搴撳尯',
+ title: '搴撳彂鍙�',
type: 'string',
width: 100,
align: 'left',
@@ -132,7 +132,7 @@
},
{
field: 'outStatus',
- title: '鐘舵��',
+ title: '澶存爣鐘舵��',
type: 'string',
width: 120,
align: 'left',
@@ -174,7 +174,7 @@
table: "DtDeliveryOrderDetailHty",
columns: [
{
- field: 'historyId',
+ field: 'id',
title: '鍘嗗彶璁板綍涓婚敭',
type: 'int',
width: 120,
@@ -184,29 +184,29 @@
align: 'left'
},
{
- field: 'id',
+ field: 'sourceId',
title: '鍘熶富閿�',
type: 'int',
width: 100,
align: 'left'
},
- {
- field: 'deliveryOrderId',
- title: '鍏宠仈鍑哄簱鍗旾D',
- type: 'int',
- width: 120,
- require: true,
- align: 'left',
- sort: true,
- hidden: true
- },
+ // {
+ // field: 'deliveryOrderId',
+ // title: '鍏宠仈鍑哄簱鍗旾D',
+ // type: 'int',
+ // width: 120,
+ // require: true,
+ // align: 'left',
+ // sort: true,
+ // hidden: true
+ // },
{
field: 'reservoirarea',
title: '搴撳尯',
type: 'string',
width: 120,
align: 'left',
- bind: { key: "reservoirArea", data: [] }
+ bind: { key: "warehouseNuber", data: [] }
},
{
field: 'goods_no',
@@ -287,8 +287,8 @@
sort: true
}
],
- sortName: "historyId",
- key: "historyId"
+ sortName: "id",
+ key: "id"
});
return {
table,
--
Gitblit v1.9.3