From e92ae6610410a25826093330bbf42296e746c51d Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期五, 10 一月 2025 23:56:47 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/HuaiAn
---
代码管理/WMS/WIDESEA_WMSClient/src/views/outbound/mesOutboundOrder.vue | 132 ++++++++++++++++----------------------------
1 files changed, 48 insertions(+), 84 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/outbound/mesOutboundOrder.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/outbound/mesOutboundOrder.vue"
index deec775..bf25d44 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/outbound/mesOutboundOrder.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/outbound/mesOutboundOrder.vue"
@@ -27,73 +27,21 @@
sortName: "id",
});
const editFormFields = ref({
- deviceCode: "",
- deviceName: "",
- deviceType: "",
- deviceStatus: "",
- deviceIp: "",
- devicePort: "",
- devicePlcType: "",
- deviceRemark: "",
});
const editFormOptions = ref([
[
- {
- title: "璁惧缂栧彿",
- required: true,
- field: "deviceCode",
- type: "string",
- },
- {
- title: "璁惧鍚嶇О",
- required: true,
- field: "deviceName",
- type: "string",
- },
- {
- title: "璁惧绫诲瀷",
- required: true,
- field: "deviceType",
- type: "string",
- },
- {
- title: "璁惧鐘舵��",
- required: true,
- field: "deviceStatus",
- type: "string",
- },
- ],
- [
- { title: "璁惧IP", required: true, field: "deviceIp", type: "string" },
- {
- title: "璁惧绔彛",
- required: true,
- field: "devicePort",
- type: "string",
- },
- {
- title: "PLC绫诲瀷",
- required: true,
- field: "devicePlcType",
- type: "string",
- },
- {
- title: "澶囨敞",
- field: "deviceRemark",
- type: "string",
- },
],
]);
const searchFormFields = ref({
- deviceCode: "",
- deviceType: "",
- deviceStatus: "",
+ orderNo: "",
+ materialCode: "",
+ batchNo: "",
});
const searchFormOptions = ref([
[
- { title: "璁惧缂栧彿", field: "deviceCode" },
- { title: "璁惧绫诲瀷", field: "deviceType" },
- { title: "璁惧鐘舵��", field: "deviceStatus" },
+ { title: "鍗曟嵁缂栧彿", field: "orderNo", type:"like" },
+ { title: "鐗╂枡缂栧彿", field: "materialCode" ,type:"like"},
+ { title: "鎵规鍙�", field: "batchNo" ,type:"like"},
],
]);
const columns = ref([
@@ -107,23 +55,23 @@
align: "left",
},
{
- field: "orderId",
- title: "鍑哄簱鍗曚富閿�",
+ field: "warehouseId",
+ title: "鎵�灞炰粨搴�",
type: "string",
- width: 90,
+ width: 80,
align: "left",
- hidden: true,
+ bind: { key: "warehouses", data: [] },
},
{
- field: "materielCode",
- title: "鐗╂枡缂栧彿",
+ field: "orderNo",
+ title: "鍗曟嵁缂栧彿",
type: "string",
width: 150,
align: "left",
},
{
- field: "materielName",
- title: "鐗╂枡鍚嶇О",
+ field: "taskNo",
+ title: "浠诲姟鍗曞彿",
type: "string",
width: 150,
align: "left",
@@ -136,64 +84,80 @@
align: "left",
},
{
- field: "orderQuantity",
+ field: "OrderStatus",
title: "鍗曟嵁鏁伴噺",
type: "string",
width: 90,
align: "left",
+ bind: { key: "orderDetailStatusEnum", data: [] }
},
{
- field: "lockQuantity",
- title: "閿佸畾鏁伴噺",
- type: "int",
+ field: "createType",
+ title: "鍒涘缓鏂瑰紡",
+ type: "string",
width: 120,
align: "left",
+ bind: { key: "createType", data: [] },
},
{
- field: "overOutQuantity",
- title: "宸插嚭鏁伴噺",
+ field: "materialCode",
+ title: "鐗╂枡缂栧彿",
type: "string",
width: 200,
align: "left",
},
{
- field: "orderDetailStatus",
- title: "璁㈠崟鏄庣粏鐘舵��",
+ field: "materialName",
+ title: "鐗╂枡鍚嶇О",
type: "string",
width: 180,
align: "left",
},
{
- field: "creater",
- title: "鍒涘缓浜�",
+ field: "unit",
+ title: "鍗曚綅",
type: "string",
width: 90,
align: "left",
},
{
- field: "createDate",
- title: "鍒涘缓鏃堕棿",
+ field: "orderQuantity",
+ title: "鍗曟嵁鏁伴噺",
type: "datetime",
width: 160,
align: "left",
},
{
- field: "modifier",
- title: "淇敼浜�",
+ field: "lockQuantity",
+ title: "閿佸畾鏁伴噺",
type: "string",
width: 100,
align: "left",
},
{
- field: "modifyDate",
- title: "淇敼鏃堕棿",
+ field: "overOutQuantity",
+ title: "宸插嚭鏁伴噺",
type: "datetime",
width: 160,
align: "left",
},
{
- field: "remark",
- title: "澶囨敞",
+ field: "line",
+ title: "绾夸綋",
+ type: "string",
+ width: 100,
+ align: "left",
+ },
+ {
+ field: "targetAddressCode",
+ title: "绾胯竟浠撳湴鍧�鐮�",
+ type: "string",
+ width: 100,
+ align: "left",
+ },
+ {
+ field: "width",
+ title: "瑁佸垏瀹�",
type: "string",
width: 100,
align: "left",
--
Gitblit v1.9.3