From afc3897af8de95aae47ff7dce334a3617256748a Mon Sep 17 00:00:00 2001
From: huangxiaoqiang <huangxiaoqiang@hnkhzn.com>
Date: 星期二, 17 三月 2026 16:03:48 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/RuiShiGe/LingPaoCheShenKu
---
项目代码/WMS/WMSClient/src/views/widesea_wms/OrderInfo/Dt_AssemblyOrderInfo.vue | 47 ++++++++++++++++++++++++++++-------------------
1 files changed, 28 insertions(+), 19 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/views/widesea_wms/OrderInfo/Dt_AssemblyOrderInfo.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/views/widesea_wms/OrderInfo/Dt_AssemblyOrderInfo.vue"
index 1584219..b327f44 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/views/widesea_wms/OrderInfo/Dt_AssemblyOrderInfo.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/views/widesea_wms/OrderInfo/Dt_AssemblyOrderInfo.vue"
@@ -18,7 +18,7 @@
const table = ref({
key: 'id',
footer: "Foots",
- cnName: '娑傝宸ュ崟',
+ cnName: '鎬昏宸ュ崟',
name: 'Orderinfo/Dt_AssemblyOrderInfo',
url: "/Dt_AssemblyOrderInfo/",
sortName: "Id"
@@ -40,29 +40,38 @@
{ "title": "宸ュ崟鍙�", "field": "workOrderNo", "type": "text" },
{ "title": "璁㈠崟鍙�", "field": "vehicleOrderNo", "type": "text" },
{ "title": "pvi", "field": "pvi", "type": "text" },
+ { "title": "杞﹀瀷鐗瑰緛鍊�", "field": "vehicleCharacteristic", "type": "text" },
+ ],
+ [
+ { "title": "宸ュ巶", "field": "plantCode", "type": "text" },
+ { "title": "璁㈠崟绫诲瀷", "field": "orderType", "type": "select", dataKey: "OrderType", data: [] },
+ { "title": "宸ュ崟椤哄簭鍙�", "field": "sequenceNo", "type": "text" },
+ { "title": "鏁磋溅鐗╂枡鍙�", "field": "vehicleCode", "type": "text" },
+ ], [
+ { "title": "鐧借溅韬墿鏂欏彿", "field": "biwMaterial", "type": "text" },
+ { "title": "褰╄溅韬墿鏂欏彿", "field": "pbMaterial", "type": "string" },
],
]);
const columns = ref([{ field: 'Id', title: '涓婚敭', type: 'int', width: 110, hidden: true, readonly: true, require: true, align: 'left' },
- { field: 'plantCode', title: '宸ュ巶', type: 'string', width: 220, require: true, align: 'left', sort: true },
- { field: 'splitStrategy', title: '鐢熶骇妯″紡', type: 'string', width: 110, require: true, align: 'left' },
- { field: 'vehicleOrderNo', title: '璁㈠崟鍙�', type: 'string', width: 220, require: true, align: 'left' },
- { field: 'orderType', title: '璁㈠崟绫诲瀷', type: 'string', width: 110, require: true, align: 'left', bind: { key: "OutOrderType", data: [] } },
- { field: 'workOrderNo', title: '宸ュ崟鍙�', type: 'string', width: 220, require: true, align: 'left' },
- { field: 'pvi', title: 'pvi', type: 'string', width: 220, require: true, align: 'left' },
- { field: 'sequenceNo', title: '宸ュ崟椤哄簭鍙�', type: 'string', width: 220, require: true, align: 'left' },
- { field: 'vehicleCharacteristic', title: '杞﹀瀷鐗瑰緛鍊�', type: 'string', width: 150, require: true, align: 'left', sort: true },
+ { field: 'plantCode', title: '宸ュ巶', type: 'string', width: 60, require: true, align: 'left' },
+ //{ field: 'splitStrategy', title: '鐢熶骇妯″紡', type: 'string', width: 110, require: true, align: 'left' },
+ { field: 'vehicleOrderNo', title: '璁㈠崟鍙�', type: 'string', width: 90, require: true, align: 'left' },
+ { field: 'orderType', title: '璁㈠崟绫诲瀷', type: 'string', width: 110, require: true, align: 'left', bind: { key: "OrderType", data: [] } },
+ { field: 'workOrderNo', title: '宸ュ崟鍙�', type: 'string', width: 150, require: true, align: 'left' },
+ { field: 'pvi', title: 'pvi', type: 'string', width: 100, require: true, align: 'left' },
+ { field: 'sequenceNo', title: '宸ュ崟椤哄簭鍙�', type: 'string', width: 120, require: true, align: 'left', sort: true },
+ { field: 'vehicleCharacteristic', title: '杞﹀瀷鐗瑰緛鍊�', type: 'string', width: 90, require: true, align: 'left' },
{ field: 'vehicleCode', title: '鏁磋溅鐗╂枡鍙�', type: 'string', width: 110, require: true, align: 'left' },
- { field: 'biwMaterial', title: '鐧借溅韬墿鏂欏彿', type: 'string', width: 220, require: true, align: 'left', sort: true },
- { field: 'pbMaterial', title: '褰╄溅韬墿鏂欏彿', type: 'string', width: 220, require: true, align: 'left' },
- { field: 'workOrderSendStatus', title: '宸ュ崟涓嬪彂鐘舵��', type: 'string', width: 220, require: true, align: 'left' },
- { field: 'spare1', title: '澶囩敤1', type: 'string', width: 110, require: true, align: 'left' },
- { field: 'spare2', title: '澶囩敤2', type: 'string', width: 110, require: true, align: 'left' },
- { field: 'spare3', title: '澶囩敤3', type: 'string', width: 110, require: true, align: 'left' },
-
- { field: 'creater', title: '鍒涘缓浜�', type: 'string', sort: true, width: 110, align: 'left' },
+ { field: 'biwMaterial', title: '鐧借溅韬墿鏂欏彿', type: 'string', width: 100, require: true, align: 'left' },
+ { field: 'pbMaterial', title: '褰╄溅韬墿鏂欏彿', type: 'string', width: 100, require: true, align: 'left' },
+ { field: 'workOrderSendStatus', title: '宸ュ崟涓嬪彂鐘舵��', type: 'string', width: 90, require: true, align: 'left' },
+ //{ field: 'spare1', title: '澶囩敤1', type: 'string', width: 110, require: true, align: 'left' },
+ //{ field: 'spare2', title: '澶囩敤2', type: 'string', width: 110, require: true, align: 'left' },
+ //{ field: 'spare3', title: '澶囩敤3', type: 'string', width: 110, require: true, align: 'left' },
+ { field: 'creater', title: '鍒涘缓浜�', type: 'string', width: 90, align: 'left' },
{ field: 'createDate', title: '鍒涘缓鏃堕棿', type: 'datetime', sort: true, width: 150, align: 'left', sort: true },
- { field: 'modifier', title: '淇敼浜�', type: 'string', sort: true, width: 100, align: 'left' },
- { field: 'modifyDate', title: '淇敼鏃堕棿', type: 'datetime', sort: true, width: 150, align: 'left', sort: true },
+ //{ field: 'modifier', title: '淇敼浜�', type: 'string', sort: true, width: 100, align: 'left' },
+ //{ field: 'modifyDate', title: '淇敼鏃堕棿', type: 'datetime', sort: true, width: 150, align: 'left', sort: true },
]);
const detail = ref({
cnName: "鍑哄簱鏄庣粏璁㈠崟",
--
Gitblit v1.9.3