From a925836fa0ec4d3e5362a289995c5cb3a3942ed7 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期四, 26 十二月 2024 11:30:43 +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 | 63 +++++++++++++++++++++++++------
1 files changed, 50 insertions(+), 13 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 326f9e9..365b9c2 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
@@ -43,6 +43,7 @@
},
columns: [
+ {type:'seq',fixed:"left",slots: { content:'content' },width: 50},
{field: 'order_number', title: '璁㈠簭', width: 70},
{field: 'child_width', width: 100, title: t('order.width'), filters: [{data: ''}], slots: {filter: 'num2_filter'}},
{
@@ -190,7 +191,6 @@
[
{code: 'setAmount', name: '璁剧疆缁熶竴纾ㄩ噺',},
{code: 'displayProcessCard', name: '鏄剧ず娴佺▼鍗�',},
- {code: 'hideProcessCard', name: '闅愯棌娴佺▼鍗�',},
{code: 'setShape', name: '璁剧疆鍥惧舰',},
{code: 'Export', name: '鏁版嵁瀵煎嚭', prefixIcon: 'vxe-icon-download', visible: true, disabled: false},
{code: 'safeDXF', name: '鍥惧舰鍙﹀瓨涓篋XF',},
@@ -209,6 +209,15 @@
},
})
+const processCardColumns = reactive([
+ { 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' }
+]);
+
// 鍙抽敭鑿滃崟
const operationConfigs = [
{
@@ -225,17 +234,9 @@
successMsg: '鎿嶄綔鎴愬姛锛�',
gridRef: xGrid,
requiresRow: false,
- showMessage: () => {
- ElMessage.info('姝ゅ姛鑳芥殏鏈畬鍠勶紝鏆傛椂鏃犳硶鎵ц鏄剧ず娴佺▼鍗℃搷浣溿��');
- }
- },
- {
- code: 'hideProcessCard',
- successMsg: '鎿嶄綔鎴愬姛锛�',
- gridRef: xGrid,
- requiresRow: false,
- showMessage: () => {
- ElMessage.info('姝ゅ姛鑳芥殏鏈畬鍠勶紝鏆傛椂鏃犳硶鎵ц闅愯棌娴佺▼鍗℃搷浣溿��');
+ displayProcess: () => {
+ getProcessCard();
+ processCardDialogVisible.value = true;
}
},
{
@@ -294,7 +295,11 @@
if (config.code === 'setAmount') {
config.openAmount();
ElMessage.success(config.successMsg);
- }else if (['displayProcessCard', 'hideProcessCard', 'setShape', 'safeDXF', 'exportOPTIMA'].includes(config.code)) {
+ } else if ( config.code === 'displayProcessCard' ) {
+ config.displayProcess();
+ ElMessage.success(config.successMsg);
+ }
+ else if (['setShape', 'safeDXF', 'exportOPTIMA'].includes(config.code)) {
config.showMessage();
}
}).catch(() => {
@@ -363,6 +368,21 @@
fetchData();
}
});
+
+// 娴佺▼鍗＄獥鍙�
+const processCardDialogVisible = ref(false);
+// 鐢ㄤ簬瀛樺偍娴佺▼鍗℃暟鎹�
+const processCardData = ref(null);
+//娴佺▼鍗�
+const getProcessCard = () => {
+ request.post(`/glassOptimize/getProcessCard/${projectNo.value}`).then((res) => {
+ if (Number(res.code) === 200) {
+ processCardData.value = res.data.data;
+ } else {
+ ElMessage.warning(res.msg);
+ }
+ });
+};
// 浠庡瓙缁勪欢SetAmount鑾峰彇纾ㄩ噺鍊硷紝骞舵洿鏂拌〃鏍兼暟鎹�
const Amount = (amountData) => {
@@ -514,6 +534,23 @@
</template>
</vxe-grid>
+ <!-- 娴佺▼鍗¤〃鏍� -->
+ <el-dialog
+ v-model="processCardDialogVisible"
+ title="娴佺▼鍗℃暟鎹�"
+ width="65%"
+ heigth="600px"
+ style="height: 500px;"
+ >
+ <vxe-grid
+ height="100%"
+ class="mytable - scrollbar"
+ :data="processCardData"
+ :columns="processCardColumns"
+ >
+ </vxe-grid>
+ </el-dialog>
+
</div>
</template>
--
Gitblit v1.8.0