From 3041eb1b0b76b75b916939e77c7ae97a80fe5af3 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期五, 07 十一月 2025 10:24:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jshdasrs' into jshdasrs
---
src/main/webapp/static/js/order/order.js | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/src/main/webapp/static/js/order/order.js b/src/main/webapp/static/js/order/order.js
index 752301b..fc4197d 100644
--- a/src/main/webapp/static/js/order/order.js
+++ b/src/main/webapp/static/js/order/order.js
@@ -43,8 +43,9 @@
cols: [[
{type: 'numbers'},
{field: 'orderNo', title: '鍗曟嵁缂栧彿', templet: '#orderNoTpl'},
- {field: 'po', title: '鍗曟嵁缂栧彿', templet: '#orderNoTpl'},
+ {field: 'itemName', align: 'center', title: '瀹㈡埛po', minWidth: 160, width: 160},
{field: 'docType$', align: 'center', title: '绫诲瀷', minWidth: 160, width: 160},
+ {field: 'cstmrName', align: 'center', title: '璐т富', minWidth: 160, width: 160},
{align: 'center', title: '鏄庣粏', toolbar: '#tbLook', minWidth: 160, width: 160},
{field: 'createTime$', title: '鍒涘缓鏃堕棿', minWidth: 200, width: 200},
{field: 'settle$', align: 'center', title: '鐘舵��', templet: '#settleTpl', minWidth: 160, width: 160},
@@ -207,6 +208,8 @@
orderId: Number(data.field.id),
docType: Number(data.field.docType),
orderNo: data.field.orderNo,
+ standby1: data.field.standby1,
+ ownerId: Number(data.field.owner),
orderDetlList: nList
}),
contentType:'application/json;charset=UTF-8',
--
Gitblit v1.9.1