From d6904ec94cc77bb8c51401d71417c2502af37acf Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期二, 31 十二月 2024 13:18:53 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override
---
north-glass-erp/northglass-erp/src/views/pp/glassOptimize/page/ComputeCard.vue | 6 +++
north-glass-erp/northglass-erp/src/views/pp/glassOptimize/ProjectMange.vue | 24 +++++++----
north-glass-erp/northglass-erp/src/views/pp/glassOptimize/page/ProjectDetail.vue | 32 +++++++++++++--
north-glass-erp/northglass-erp/src/views/pp/glassOptimize/page/ComputeDetail.vue | 6 +++
4 files changed, 54 insertions(+), 14 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/pp/glassOptimize/ProjectMange.vue b/north-glass-erp/northglass-erp/src/views/pp/glassOptimize/ProjectMange.vue
index 75885f7..59d4476 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/glassOptimize/ProjectMange.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/glassOptimize/ProjectMange.vue
@@ -74,6 +74,15 @@
{field: 'modifyTime', width: 100, title: '淇敼鏃堕棿',},
],//琛ㄥご鍙傛暟
data: null,//琛ㄦ牸鏁版嵁
+ toolbarConfig: {
+ buttons: [
+ ],
+ import: false,
+ // export: true,
+ // print: true,
+ zoom: true,
+ custom: true
+ },
//鍙抽敭鑿滃崟閫夐」
menuConfig: {
body: {
@@ -98,13 +107,6 @@
]
},
},
- toolbarConfig: {
- buttons: [],
- slots: {
- buttons: "toolbar_buttons"
- },
- },
-
})
// 瀹氫箟鎿嶄綔閰嶇疆瀵硅薄鏁扮粍锛岄泦涓鐞嗕笉鍚屾搷浣滈�夐」瀵瑰簲鐨勫弬鏁�
const operationConfigs = [
@@ -635,10 +637,10 @@
<template>
<div id="mange">
- <div id="select">
+ <div id="select" style="">
<span>浼樺寲鏃ユ湡</span>
<el-date-picker
- style="margin-left:10px; margin-top: -5px; "
+ style="margin-left:10px; margin-top: -10px; "
v-model="orderInfo.workOrderDate"
:default-time="defaultTime"
:start-placeholder="$t('basicData.startDate')"
@@ -721,6 +723,10 @@
height: 85%;
}
+:deep(.vxe-button.type--button.is--circle) {
+ margin-top: -20px;
+}
+
#last {
margin-top: 10px;
}
diff --git a/north-glass-erp/northglass-erp/src/views/pp/glassOptimize/page/ComputeCard.vue b/north-glass-erp/northglass-erp/src/views/pp/glassOptimize/page/ComputeCard.vue
index bd1e3e3..f1a9272 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/glassOptimize/page/ComputeCard.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/glassOptimize/page/ComputeCard.vue
@@ -65,6 +65,8 @@
slots:{
buttons: "toolbar_buttons"
},
+ zoom: true,
+ custom: true
},
})
@@ -145,5 +147,9 @@
</template>
<style scoped>
+:deep(.vxe-tools--operate){
+ height: 20px;
+ margin-top: -20px;
+}
</style>
\ No newline at end of file
diff --git a/north-glass-erp/northglass-erp/src/views/pp/glassOptimize/page/ComputeDetail.vue b/north-glass-erp/northglass-erp/src/views/pp/glassOptimize/page/ComputeDetail.vue
index 1784a56..59ef9ec 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/glassOptimize/page/ComputeDetail.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/glassOptimize/page/ComputeDetail.vue
@@ -57,6 +57,8 @@
slots:{
buttons: "toolbar_buttons"
},
+ zoom: true,
+ custom: true
},
})
@@ -124,4 +126,8 @@
<style scoped>
+:deep(.vxe-tools--operate){
+ height: 20px;
+ margin-top: -20px;
+}
</style>
\ No newline at end of file
diff --git a/north-glass-erp/northglass-erp/src/views/pp/glassOptimize/page/ProjectDetail.vue b/north-glass-erp/northglass-erp/src/views/pp/glassOptimize/page/ProjectDetail.vue
index 327792e..6d82f3c 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/glassOptimize/page/ProjectDetail.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/glassOptimize/page/ProjectDetail.vue
@@ -187,6 +187,15 @@
},
],//琛ㄥご鍙傛暟
data: null,//琛ㄦ牸鏁版嵁
+ toolbarConfig: {
+ buttons: [
+ ],
+ import: false,
+ // export: true,
+ // print: true,
+ zoom: true,
+ custom: true
+ },
//鍙抽敭鑿滃崟
menuConfig: {
body: {
@@ -205,14 +214,24 @@
},
},
})
-const processCardColumns = reactive([
+const processCardColumns = reactive({
+ columns:[
{field: 'process_id', title: '娴佺▼鍗�', width: 200, align: 'center'},
{field: 'project', title: '椤圭洰鍚�', width: 150, align: 'center'},
{field: 'order_number', title: '璁㈠簭', width: 100, align: 'center'},
{field: 'sizes', title: '灏哄', width: 200, align: 'center'},
{field: 'layer', title: '灞�', width: 100, align: 'center'},
{field: 'quantity', title: '鏁伴噺', width: 100, align: 'center'}
-]);
+],
+ toolbarConfig: {
+ buttons: [
+ ],
+ import: false,
+ // export: true,
+ // print: true,
+
+ },
+});
// 鍙抽敭鑿滃崟
const operationConfigs = [
@@ -448,7 +467,7 @@
<template>
<div style="width: 100%;height: 85%;">
<!-- 澶撮儴 -->
- <div id="header" style="background-color: white">
+ <div id="header" >
<!--宸ョ▼鏂囦欢鑿滃崟-->
<el-dropdown @command="handleCommand">
<el-button type="primary" :icon="Folder" style="margin-top: 8px; margin-left: 5px">
@@ -489,7 +508,6 @@
<optimize-compute/>
</el-dialog>
</div>
-
</div>
<!-- 琛ㄦ牸瀹瑰櫒 -->
@@ -532,7 +550,7 @@
height="100%"
class="right-table"
:data="processCardData"
- :columns="processCardColumns"
+ v-bind="processCardColumns"
v-if="showProcessCardTable"
:header-cell-style="{'height': '51.9px'}"
>
@@ -558,6 +576,10 @@
width: 40%;
}
+:deep(.vxe-toolbar){
+ height: 40px;
+}
+
#header {
height: 50px;
display: flex;
--
Gitblit v1.8.0