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.vue | 86 ++++++++++++++++++++++++-------------------
1 files changed, 48 insertions(+), 38 deletions(-)
diff --git "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WMS/src/views/inbound/inboundOrder.vue" "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WMS/src/views/inbound/inboundOrder.vue"
index df5b41c..68a1a2d 100644
--- "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WMS/src/views/inbound/inboundOrder.vue"
+++ "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WMS/src/views/inbound/inboundOrder.vue"
@@ -75,7 +75,7 @@
title: "搴撴埧鍙�",
field: "warehouse_no",
type: "select",
- dataKey: "warehouse",
+ dataKey: "warehouseNuber",
data: [],
required: true,
},
@@ -128,22 +128,22 @@
dataKey: "order_type",
data: [],
},
- {
- title: "琛ㄥご鐘舵��",
- field: "odrderStatus",
+ // {
+ // title: "琛ㄥご鐘舵��",
+ // field: "odrderStatus",
+ // type: "select",
+ // dataKey: "odrderStatus",
+ // data: [],
+ // },
+ {
+ title: "搴撴埧鍙�",
+ field: "warehouse_no",
type: "select",
- dataKey: "odrderStatus",
+ dataKey: "warehouseNuber",
data: [],
},
],
[
- {
- title: "搴撴埧鍙�",
- field: "warehouse_no",
- type: "select",
- dataKey: "warehouse",
- data: [],
- },
{
title: "鍏ュ簱璁拌处鏃堕棿",
field: "account_tiem",
@@ -199,7 +199,7 @@
type: "string",
width: 100,
align: "left",
- bind: { key: "warehouse", data: [] },
+ bind: { key: "warehouseNuber", data: [] },
},
{
field: "account_tiem",
@@ -216,13 +216,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: "鍒涘缓鏃堕棿",
@@ -230,13 +230,13 @@
width: 160,
align: "left",
},
- {
- field: "modifier",
- title: "淇敼浜�",
- type: "string",
- width: 100,
- align: "left",
- },
+ // {
+ // field: "modifier",
+ // title: "淇敼浜�",
+ // type: "string",
+ // width: 100,
+ // align: "left",
+ // },
{
field: "modifyDate",
title: "淇敼鏃堕棿",
@@ -274,9 +274,19 @@
type: "string",
width: 120,
align: "left",
- // bind: { key: "reservoirArea", data: [] }
- // edit:{type:'select',dataKey:'reservoirArea',data:[]}
- edit:{type:""}
+ bind: { key: "warehouseNuber", data: [] },
+ // edit:{type:'select',dataKey:'warehouseNuber',data:[]},
+ // edit:{type:""}
+ },
+ {
+ field: "goods_no",
+ title: "鐗╂枡鍚嶇О",
+ type: "string",
+ width: 150,
+ align: "left",
+ required: true,
+ // edit:{type:""},
+ bind: { key: "MaterielNames", data: [] },
},
{
field: "goods_no",
@@ -286,7 +296,7 @@
align: "left",
bind: { key: "medicineGoods", data: [] },
required: true,
- edit:{type:""}
+ // edit:{type:""}
},
{
@@ -296,16 +306,16 @@
width: 120,
align: "left",
required: true,
- edit:{type:"number"}
+ // edit:{type:"number"}
},
{
field: "order_Inqty",
- title: "鍏ュ簱瀹屾垚鏁伴噺",
+ title: "瀹屾垚鏁伴噺",
type: "decimal",
width: 120,
align: "left",
- edit:{type:"number"}
+ // edit:{type:"number"}
},
{
@@ -315,7 +325,7 @@
width: 120,
align: "left",
required: true,
- edit:{type:""}
+ // edit:{type:""}
},
{
@@ -324,7 +334,7 @@
type: "string",
width: 120,
align: "left",
- edit:{type:""}
+ // edit:{type:""}
},
{
@@ -334,7 +344,7 @@
width: 120,
align: "left",
// bind: { key: "orderDetailStatus", data: [] },
- edit:{type:""}
+ // edit:{type:""}
},
{
@@ -344,7 +354,7 @@
width: 120,
align: "left",
bind: { key: "syncStatus", data: [] },
- edit:{type:'select',dataKey:'syncStatus',data:[]}
+ // edit:{type:'select',dataKey:'syncStatus',data:[]}
},
{
field: "creater",
--
Gitblit v1.9.3