From fcf705e1f9a369cab61e60d72048c36a0e1ee793 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期四, 07 三月 2024 13:48:26 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/northglass-erp/src/views/pp/processCard/AddProcessCard.vue | 55 ++++++++++++++++++++++++++++++-------------------------
1 files changed, 30 insertions(+), 25 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/pp/processCard/AddProcessCard.vue b/north-glass-erp/northglass-erp/src/views/pp/processCard/AddProcessCard.vue
index 0317b1d..a23c822 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/processCard/AddProcessCard.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/processCard/AddProcessCard.vue
@@ -167,12 +167,12 @@
{type: 'checkbox', fixed: "left", title: '閫夋嫨'},
{field: 'orderNumber', title: '璁㈠簭', filters: [{data: ''}], slots: {filter: 'num1_filter'},filterMethod:filterChanged},
{field: 'shape', title: '褰㈢姸', showOverflow: "ellipsis", filters: [{data: ''}], slots: {filter: 'num1_filter'},filterMethod:filterChanged},
- {field: 'width', title: '瀹�', sortable: true, filters: [{data: ''}], slots: {filter: 'num1_filter'},filterMethod:filterChanged},
- {field: 'height', title: '楂�', sortable: true, filters: [{data: ''}], slots: {filter: 'num1_filter'},filterMethod:filterChanged},
- {field: 'baiscQuantity', title: '寰呭垎鏁伴噺', showOverflow: "ellipsis"},
- {field: 'computeGrossArea', title: '寰呭垎闈㈢Н'},
- {field: 'totalThickness', title: '鎬诲帤搴�'},
- {field: 'thickness', title: '鐜荤拑鍘氬害'},
+ {field: 'width', title: '瀹�', sortable: true, filters: [{data: ''}], slots: {filter: 'num1_filter'},filterMethod:filterChanged,width:'60px'},
+ {field: 'height', title: '楂�', sortable: true, filters: [{data: ''}], slots: {filter: 'num1_filter'},filterMethod:filterChanged,width:'60px'},
+ {field: 'baiscQuantity', title: '寰呭垎鏁伴噺', showOverflow: "ellipsis",width:'60px'},
+ {field: 'computeGrossArea', title: '寰呭垎闈㈢Н',width:'60px'},
+ {field: 'totalThickness', title: '鎬诲帤搴�',width:'80px'},
+ {field: 'thickness', title: '鐜荤拑鍘氬害',width:'60px'},
{field: 'weight', title: '閲嶉噺'}
],//琛ㄥご鎸夐挳
@@ -475,12 +475,11 @@
if (res.code == 200) {
ElMessage.success("淇濆瓨鎴愬姛")
//router.push('/main/processCard/SplittingDetails?orderId=${orderId}')
- router.push({path: '/main/processCard/SplittingDetails', query: {orderId: orderId}})
+ router.push({path: '/main/processCard/AddProcessCard', query: {orderId: orderId,productionId:productionId,random:Math.random()}})
//location.reload();
} else {
ElMessage.warning(res.msg)
- router.push("/login")
}
})
@@ -497,10 +496,10 @@
</script>
<template>
- <div>
+ <div style="width: 100%;height: 100%">
- <div class="common-layout" style="height: 100%">
- <div class="header">
+ <div class="common-layout" style="width: 100%;height: 100%">
+ <div class="header" style="height: 5%;width: 100%">
<el-button
style="float: left"
@@ -517,8 +516,8 @@
</div>
</div>
- <el-container height="600px">
- <el-aside width="44%" >
+ <el-container style="height: 100%;width: 100%">
+ <el-aside style="width: 44%;height: 100%" >
<vxe-grid
max-height="100%"
class="mytable-scrollbar"
@@ -560,22 +559,27 @@
</el-aside>
- <el-main width="12%" style="">
- <span>閫変腑鏁伴噺:<el-input type="number" v-model="checkedNum"></el-input></span><br>
- <el-button type="primary" @click="addRight"> 鈫�</el-button>
- <br>
- <br>
- <el-button type="primary" @click="addLeft"> 鈫�</el-button>
- <br>
- <br>
- <el-button @click="createProcessCard" type="primary">寤虹珛娴佺▼鍗�</el-button>
- </el-main>
+ <div width="12%">
+ <el-main style="">
+ <span>閫変腑鏁伴噺:<el-input type="number" v-model="checkedNum"></el-input></span><br>
+ <el-button type="primary" @click="addRight"> 鈫�</el-button>
+ <br>
+ <br>
+ <el-button type="primary" @click="addLeft"> 鈫�</el-button>
+ <br>
+ <br>
+ <el-button @click="createProcessCard" type="primary">寤虹珛娴佺▼鍗�</el-button>
+ </el-main>
+ </div>
+
<!-- 鍙充晶-->
- <el-aside width="45%" height="500px" style="">
+ <div style="height: 100%;width: 100%">
+
+ <el-aside style="width: 100%;height: 100%">
<vxe-grid
- max-height="97%"
+ max-height="100%"
class="mytable-scrollbar"
ref="xGrid"
v-bind="gridOptions"
@@ -605,6 +609,7 @@
</template>
</vxe-grid>
</el-aside>
+ </div>
</el-container>
</div>
</div>
--
Gitblit v1.8.0