From 95909e9515f99f7aa9ead0c6e31456457363273e Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期四, 06 三月 2025 17:34:57 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/HuaiAn
---
代码管理/WMS/WIDESEA_WMSClient/src/views/inbound/mesPPBackInboundOrder.vue | 246 +++++++++++++++++++++++++-----------------------
1 files changed, 129 insertions(+), 117 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/inbound/mesPPBackInboundOrder.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/inbound/mesPPBackInboundOrder.vue"
index f375a69..6824fd9 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/inbound/mesPPBackInboundOrder.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/inbound/mesPPBackInboundOrder.vue"
@@ -202,125 +202,137 @@
]);
const detail = ref({
cnName: "鍏ュ簱鍗曟槑缁�",
- table: "InboundOrderDetail",
+ table: "MesPPBackInboundOrderDetail",
columns: [
{
- field: "id",
- title: "Id",
- type: "int",
- width: 90,
- hidden: true,
- readonly: true,
- require: true,
- align: "left",
- },
- {
- field: "orderId",
- title: "鍏ュ簱鍗曚富閿�",
- type: "string",
- width: 90,
- align: "left",
- hidden: true,
- },
- {
- field: "materielCode",
- title: "鐗╂枡缂栧彿",
- type: "select",
- width: 150,
- align: "left",
- edit: { type: "" },
- required: true,
- },
- {
- field: "materielName",
- title: "鐗╂枡鍚嶇О",
- type: "string",
- width: 100,
- align: "left",
- },
- {
- field: "materielSpec",
- title: "鐗╂枡瑙勬牸",
- type: "select",
- type: "string",
- width: 100,
- align: "left",
- },
- {
- field: "batchNo",
- title: "鎵规鍙�",
- type: "decimal",
- width: 90,
- align: "left",
- edit: { type: "" },
- required: true,
- },
- {
- field: "orderQuantity",
- title: "鍗曟嵁鏁伴噺",
- type: "decimal",
- width: 90,
- align: "left",
- edit: { type: "number" },
- required: true,
- },
- {
- field: "receiptQuantity",
- title: "缁勭洏鏁伴噺",
- type: "int",
- width: 120,
- align: "left",
- },
- {
- field: "overInQuantity",
- title: "涓婃灦鏁伴噺",
- type: "string",
- width: 200,
- align: "left",
- },
- {
- field: "orderDetailStatus",
- title: "璁㈠崟鏄庣粏鐘舵��",
- type: "string",
- width: 180,
- align: "left",
- bind: { key: "orderDetailStatusEnum", data: [] },
- },
- {
- field: "creater",
- title: "鍒涘缓浜�",
- type: "string",
- width: 90,
- align: "left",
- },
- {
- field: "createDate",
- title: "鍒涘缓鏃堕棿",
- type: "datetime",
- width: 160,
- align: "left",
- },
- {
- field: "modifier",
- title: "淇敼浜�",
- type: "string",
- width: 100,
- align: "left",
- },
- {
- field: "modifyDate",
- title: "淇敼鏃堕棿",
- type: "datetime",
- width: 160,
- align: "left",
- },
- {
- field: "remark",
- title: "澶囨敞",
- type: "string",
- width: 100,
- align: "left",
- },
+ field: "id",
+ title: "Id",
+ type: "int",
+ width: 90,
+ hidden: true,
+ readonly: true,
+ require: true,
+ align: "left",
+ },
+ {
+ field: "orderId",
+ title: "鍏ュ簱鍗曚富閿�",
+ type: "string",
+ width: 90,
+ align: "left",
+ },
+ {
+ field: "materielCode",
+ title: "鐗╂枡缂栧彿",
+ type: "string",
+ width: 150,
+ align: "left",
+ },
+ {
+ field: "materielName",
+ title: "鐗╂枡鍚嶇О",
+ type: "string",
+ width: 150,
+ align: "left",
+ },
+ {
+ field: "materialLot",
+ title: "鎵规鍙�",
+ type: "string",
+ width: 90,
+ align: "left",
+ },
+ {
+ field: "orderQuantity",
+ title: "鍗曟嵁鏁伴噺",
+ type: "string",
+ width: 90,
+ align: "left",
+ },
+ {
+ field: "receiptQuantity",
+ title: "缁勭洏鏁伴噺",
+ type: "int",
+ width: 120,
+ align: "left",
+ },
+ {
+ field: "overInQuantity",
+ title: "涓婃灦鏁伴噺",
+ type: "string",
+ width: 120,
+ align: "left",
+ },
+ {
+ field: "orderDetailStatus",
+ title: "璁㈠崟鏄庣粏鐘舵��",
+ type: "string",
+ width: 120,
+ align: "left",
+ },
+ {
+ field: "cutedWidth",
+ title: "瑁佸垏瀹�",
+ type: "string",
+ width: 100,
+ align: "left",
+ },
+ {
+ field: "unit",
+ title: "鍗曚綅",
+ type: "string",
+ width: 50,
+ align: "left",
+ },
+ {
+ field: "productionDate",
+ title: "鐢熶骇鏃ユ湡",
+ type: "string",
+ width: 120,
+ align: "left",
+ },
+ {
+ field: "effectiveDate",
+ title: "鏈夋晥鏃ユ湡",
+ type: "string",
+ width: 120,
+ align: "left",
+ },
+ {
+ field: "creater",
+ title: "鍒涘缓浜�",
+ type: "string",
+ width: 90,
+ align: "left",
+ },
+ {
+ field: "createDate",
+ title: "鍒涘缓鏃堕棿",
+ type: "datetime",
+ width: 160,
+ align: "left",
+ },
+ {
+ field: "modifier",
+ title: "淇敼浜�",
+ type: "string",
+ width: 100,
+ align: "left",
+ },
+ {
+ field: "modifyDate",
+ title: "淇敼鏃堕棿",
+ type: "datetime",
+ width: 160,
+ align: "left",
+ },
+ {
+ field: "remark",
+ title: "澶囨敞",
+ type: "string",
+ width: 100,
+ align: "left",
+ },
],
sortName: "id",
key: "id",
--
Gitblit v1.9.3