From 5b8bf171b9afda52fa366a72e54eedbd9e6d4d17 Mon Sep 17 00:00:00 2001
From: yanjinhui <3306209981@qq.com>
Date: 星期六, 01 十一月 2025 19:54:25 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/ZhiHuiQiCe/FangCangZhiNeng
---
新建文件夹/WMS/src/views/inbound/inboundOrder_Hty.vue | 91 +++++++++++++++++++++++++--------------------
1 files changed, 50 insertions(+), 41 deletions(-)
diff --git "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WMS/src/views/inbound/inboundOrder_Hty.vue" "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WMS/src/views/inbound/inboundOrder_Hty.vue"
index 849112b..3f2d401 100644
--- "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WMS/src/views/inbound/inboundOrder_Hty.vue"
+++ "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WMS/src/views/inbound/inboundOrder_Hty.vue"
@@ -22,12 +22,12 @@
export default defineComponent({
setup() {
const table = ref({
- key: 'historyId',
+ key: 'id',
footer: "Foots",
cnName: '鍘嗗彶鍏ュ簱鍗�',
name: 'CabinOrderHty',
url: "/CabinOrderHty/",
- sortName: "historyId"
+ sortName: "id"
});
const editFormFields = ref({});
const editFormOptions = ref([]);
@@ -49,24 +49,22 @@
field: "order_type",
type: "select",
dataKey: "order_type",
- data: [],
+ data: []
},
],
[
{
- title: "琛ㄥご鐘舵��",
- field: "odrderStatus",
+ title: "搴撴埧鍙�",
+ field: "warehouse_no",
type: "select",
- dataKey: "odrderStatus",
- data: [],
- },
- { title: "渚涘簲鍟嗗悕绉�", field: "supplier_name", type: "like" },
- { title: "鍏ュ簱璁拌处鏃堕棿", field: "account_tiem", type: "datetime" },
+ dataKey: "warehouseNuber",
+ data: []
+ },
],
]);
const columns = ref([
{
- field: 'historyId',
+ field: 'id',
title: '鍘嗗彶璁板綍涓婚敭',
type: 'int',
width: 120,
@@ -76,7 +74,7 @@
align: 'left'
},
{
- field: 'id',
+ field: 'sourceId',
title: '鍘熶富閿�',
type: 'int',
width: 100,
@@ -96,6 +94,7 @@
type: 'string',
width: 120,
align: 'left',
+ // bind: { Key: "order_type", data: [] }
bind: { key: "order_type", data: [] }
},
{
@@ -118,7 +117,7 @@
type: 'string',
width: 100,
align: 'left',
- bind: { key: "warehouse", data: [] }
+ bind: { key: "warehouseNuber", data: [] },
},
{
field: 'account_tiem',
@@ -135,13 +134,13 @@
align: 'left',
bind: { key: "odrderStatus", data: [] }
},
- {
- field: 'creater',
- title: '鍒涘缓浜�',
- type: 'string',
- width: 90,
- align: 'left'
- },
+ // {
+ // field: 'creater',
+ // title: '鍒涘缓浜�',
+ // type: 'string',
+ // width: 90,
+ // align: 'left'
+ // },
{
field: 'createDate',
title: '鍒涘缓鏃堕棿',
@@ -150,21 +149,21 @@
align: 'left',
sort: true
},
- {
- field: 'modifier',
- title: '淇敼浜�',
- type: 'string',
- width: 100,
- align: 'left'
- },
- {
- field: 'modifyDate',
- title: '淇敼鏃堕棿',
- type: 'datetime',
- width: 160,
- align: 'left',
- sort: true
- }
+ // {
+ // field: 'modifier',
+ // title: '淇敼浜�',
+ // type: 'string',
+ // width: 100,
+ // align: 'left'
+ // },
+ // {
+ // field: 'modifyDate',
+ // title: '淇敼鏃堕棿',
+ // type: 'datetime',
+ // width: 160,
+ // align: 'left',
+ // sort: true
+ // }
]);
const detail = ref({
cnName: "鍘嗗彶鍏ュ簱鍗曟槑缁�",
@@ -172,7 +171,7 @@
url: "/CabinOrderDetailHty/",
columns: [
{
- field: 'historyId',
+ field: 'id',
title: '鍘嗗彶璁板綍涓婚敭',
type: 'int',
width: 120,
@@ -182,7 +181,7 @@
align: 'left'
},
{
- field: 'id',
+ field: 'sourceId',
title: '鍘熶富閿�',
type: 'int',
width: 100,
@@ -194,7 +193,17 @@
type: 'string',
width: 120,
align: 'left',
- bind: { key: "reservoirArea", data: [] }
+ bind: { key: "warehouseNuber", data: [] }
+ },
+ {
+ field: "goods_no",
+ title: "鐗╂枡鍚嶇О",
+ type: "string",
+ width: 150,
+ align: "left",
+ required: true,
+ edit:{type:""},
+ bind: { key: "MaterielNames", data: [] },
},
{
field: 'goods_no',
@@ -213,7 +222,7 @@
},
{
field: 'order_Inqty',
- title: '鍏ュ簱瀹屾垚鏁伴噺',
+ title: '瀹屾垚鏁伴噺',
type: 'decimal',
width: 120,
align: 'left'
@@ -279,8 +288,8 @@
sort: true
}
],
- sortName: "historyId",
- key: "historyId"
+ sortName: "id",
+ key: "id"
});
return {
table,
--
Gitblit v1.9.3