From 768e16999a8ce4bb500490ee76c659aa61ea1783 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期二, 25 三月 2025 10:08:13 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/northglass-erp/src/views/pp/glassOptimize/page/ProjectDetail.vue | 45 +++++++++++++++++++++++++++++++++++++++------
1 files changed, 39 insertions(+), 6 deletions(-)
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..97cb04b 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
@@ -1,5 +1,5 @@
<script setup>
-import {nextTick, onMounted, reactive, ref, watch} from "vue";
+import {nextTick, onMounted, reactive, ref, watch,onBeforeUnmount } from "vue";
import {useI18n} from "vue-i18n";
import {Folder, Plus, Setting, Operation,} from "@element-plus/icons-vue";
import OptimizeCompute from "@/views/pp/glassOptimize/page/OptimizeCompute.vue";
@@ -121,6 +121,14 @@
sortable: true
},
{
+ field: 'price',
+ width: 150,
+ title: t('鍗曚环'),
+ filters: [{data: ''}],
+ slots: {filter: 'num1_filter'},
+ sortable: true
+ },
+ {
field: 'remark',
width: 150,
title: t('basicData.remarks'),
@@ -187,6 +195,15 @@
},
],//琛ㄥご鍙傛暟
data: null,//琛ㄦ牸鏁版嵁
+ toolbarConfig: {
+ buttons: [
+ ],
+ import: false,
+ // export: true,
+ // print: true,
+ zoom: true,
+ custom: true
+ },
//鍙抽敭鑿滃崟
menuConfig: {
body: {
@@ -205,14 +222,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 = [
@@ -351,6 +378,9 @@
//宸ョ▼鍙�
const projectNo = ref(route.params.projectNo);
const projectName = ref('');
+onBeforeUnmount(() => {
+ localStorage.setItem('projectNo', projectNo.value);
+});
const fetchData = () => {
request.post(`/glassOptimize/projectInfo/${projectNo.value}`).then((res) => {
@@ -448,7 +478,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 +519,6 @@
<optimize-compute/>
</el-dialog>
</div>
-
</div>
<!-- 琛ㄦ牸瀹瑰櫒 -->
@@ -532,7 +561,7 @@
height="100%"
class="right-table"
:data="processCardData"
- :columns="processCardColumns"
+ v-bind="processCardColumns"
v-if="showProcessCardTable"
:header-cell-style="{'height': '51.9px'}"
>
@@ -558,6 +587,10 @@
width: 40%;
}
+:deep(.vxe-toolbar){
+ height: 40px;
+}
+
#header {
height: 50px;
display: flex;
--
Gitblit v1.8.0