From e2f151957b38d3c02c26be4343b6916d65e800b7 Mon Sep 17 00:00:00 2001 From: hutongqing <hutongqing@hnkhzn.com> Date: 星期四, 09 一月 2025 13:52:51 +0800 Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/HuaiAn --- 代码管理/WMS/WIDESEA_WMSClient/src/views/inbound/purchaseOrder.vue | 48 +++++++++++++++++------------------------------- 1 files changed, 17 insertions(+), 31 deletions(-) diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/inbound/purchaseOrder.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/inbound/purchaseOrder.vue" index a6eeafc..b4a0e42 100644 --- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/inbound/purchaseOrder.vue" +++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/inbound/purchaseOrder.vue" @@ -21,10 +21,10 @@ const table = ref({ key: "id", footer: "Foots", - cnName: "鍏ュ簱鍗�", + cnName: "閲囪喘鍗�", name: "purchaseOrder", url: "/PurchaseOrder/", - sortName: "CreateDate", + sortName: "id", }); const editFormFields = ref({ // orderType: "", @@ -60,44 +60,28 @@ // ], ]); const searchFormFields = ref({ - inboundOrderNo: "", - upperOrderNo: "", - orderType: "", - orderStatus: "", - createType: "", - creater: "", - createDate: "", + purchaseOrderNo: "", + purchaseOrderType: "", + purchaseOrderStatus: "", }); const searchFormOptions = ref([ [ - { title: "鍗曟嵁缂栧彿", field: "inboundOrderNo", type: "like" }, - { title: "涓婃父鍗曟嵁缂栧彿", field: "upperOrderNo", type: "like" }, + { title: "閲囪喘鍗曞彿", field: "purchaseOrderNo", type: "like" }, { title: "鍗曟嵁绫诲瀷", - field: "orderType", + field: "purchaseOrderType", type: "select", - dataKey: "inOrderType", + dataKey: "purchaseType", data: [], }, { title: "鍗曟嵁鐘舵��", - field: "orderStatus", + field: "purchaseOrderStatus", type: "select", - dataKey: "inboundState", + dataKey: "purchaseOrderStatus", data: [], }, - ], - [ - { - title: "鍒涘缓鏂瑰紡", - field: "createType", - type: "select", - dataKey: "createType", - data: [], - }, - { title: "鍒涘缓鑰�", field: "creater", type: "like" }, - { title: "鍒涘缓鏃堕棿", field: "createDate", type: "datetime" }, - ], + ] ]); const columns = ref([ { @@ -114,7 +98,7 @@ field: "purchaseOrderNo", title: "閲囪喘鍗曞彿", type: "string", - width: 120, + width: 150, align: "left", link: true, }, @@ -124,12 +108,13 @@ type: "string", width: 150, align: "left", + bind: { key: "purchaseType", data: [] }, }, { field: "supplierCode", title: "渚涘簲鍟嗙紪鍙�", type: "string", - width: 150, + width: 120, align: "left", }, { @@ -145,12 +130,13 @@ type: "string", width: 90, align: "left", + bind: { key: "purchaseOrderStatus", data: [] }, }, { field: "orderDate", title: "涓嬪崟鏃ユ湡", type: "string", - width: 90, + width: 160, align: "left", }, { @@ -190,7 +176,7 @@ }, ]); const detail = ref({ - cnName: "鍏ュ簱鍗曟槑缁�", + cnName: "閲囪喘鍗曟槑缁�", table: "InboundOrderDetail", columns: [ { -- Gitblit v1.9.3