From e4fe69941b2dd4582ec0bd82c32b8dfbc30d85b5 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期四, 22 二月 2024 08:06:43 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/northglass-erp/src/views/sd/order/UpdateOrderCraft.vue | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/sd/order/UpdateOrderCraft.vue b/north-glass-erp/northglass-erp/src/views/sd/order/UpdateOrderCraft.vue
index e14057d..22a69ce 100644
--- a/north-glass-erp/northglass-erp/src/views/sd/order/UpdateOrderCraft.vue
+++ b/north-glass-erp/northglass-erp/src/views/sd/order/UpdateOrderCraft.vue
@@ -37,7 +37,7 @@
},//琛ㄥご鍙傛暟
columns:[
{title: '鎿嶄綔', width: 110, slots: { default: 'button_slot' },fixed:"left",},
- {field: 'orderDetail.orderNumber',width:120, title: '搴忓彿',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
+ {field: 'orderNumber',width:120, title: '搴忓彿',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
//{field: 'orderDetail.buildingNumber',width:120, title: '妤煎彿',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
{field: 'orderDetail.productName',width:120, title: '鎴愬搧鍚嶇О',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
{field: 'glassAddress',width:120, title: '鏍囪',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
@@ -56,13 +56,13 @@
{field: 'orderDetail.edgingType',width:120, title: '纾ㄨ竟绫诲瀷',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true}
],//琛ㄥご鎸夐挳
mergeCells: [
- { row: 0, col: 1, rowspan: 4, colspan: 1 },
+ /*{ row: 0, col: 1, rowspan: 4, colspan: 1 },
{ row: 0, col: 2, rowspan: 4, colspan: 1 },
{ row: 0, col: 4, rowspan: 4, colspan: 1 },
{ row: 0, col: 5, rowspan: 4, colspan: 1 },
{ row: 0, col: 6, rowspan: 4, colspan: 1 },
{ row: 0, col: 7, rowspan: 4, colspan: 1 },
- { row: 0, col: 8, rowspan: 4, colspan: 1 },
+ { row: 0, col: 8, rowspan: 4, colspan: 1 },*/
],
toolbarConfig: {
buttons: [
@@ -178,7 +178,8 @@
})
})
const reviewOrderCraft = (state) => {
- request.post(`/order/reviewProcessById/${titleUploadData.value.orderId}/${state}`).then(res =>{
+
+ request.post(`/order/reviewProcessById/${titleUploadData.value.orderId}/${state}`,xGrid.value.getRecordset().updateRecords).then(res =>{
if(res.code==200){
gridOptions.toolbarConfig.buttons[2].disabled = true
if(state==2){
--
Gitblit v1.8.0