From 69c3c53dab092e0fd618a84934f333030e769926 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期三, 11 十二月 2024 11:01:38 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/northglass-erp/src/components/pp/PrintProcess.vue | 1
north-glass-erp/northglass-erp/src/views/pp/glassOptimize/page/SetAmount.vue | 19 +++++++++
north-glass-erp/northglass-erp/src/views/pp/processCard/AddProcessCard.vue | 11 +++++
north-glass-erp/northglass-erp/src/views/pp/glassOptimize/page/ProjectDetail.vue | 35 +++++++++++++++++
north-glass-erp/northglass-erp/src/views/pp/report/ProductionSchedule.vue | 32 +++++++++------
5 files changed, 81 insertions(+), 17 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/components/pp/PrintProcess.vue b/north-glass-erp/northglass-erp/src/components/pp/PrintProcess.vue
index 52a9b0d..0a034d1 100644
--- a/north-glass-erp/northglass-erp/src/components/pp/PrintProcess.vue
+++ b/north-glass-erp/northglass-erp/src/components/pp/PrintProcess.vue
@@ -211,7 +211,6 @@
const AreaQuantitySummary = () => {
- console.log(produceList.value)
for (let i = 0; i < produceList.value.length; i++) {
// 閬嶅巻褰撳墠椤圭洰鐨� detail 鏁扮粍
for (let j = 0; j < produceList.value[i].detail.length; j++) {
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 b1c2e5e..9bb5e38 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
@@ -192,6 +192,39 @@
}
});
+// 浠庡瓙缁勪欢SetAmount鑾峰彇纾ㄩ噺鍊硷紝骞舵洿鏂拌〃鏍兼暟鎹�
+const Amount = (amountData) => {
+ nextTick(() => {
+ const data = gridOptions.data;
+ console.log('鎺ユ敹鍒扮殑amountData:', amountData);
+ console.log('琛ㄦ牸鍘熷鏁版嵁:', data);
+ if (data) {
+ try {
+ const updatedData = [];
+ for (let i = 0; i < data.length; i++) {
+ const item = data[i];
+ const updatedItem = {
+ ...item,
+ longGrind1: Number(amountData.quicksetTop),
+ longGrind2: Number(amountData.quicksetRight),
+ shortGrind1: Number(amountData.quicksetBottom),
+ shortGrind2: Number(amountData.quicksetLeft)
+ };
+ updatedData.push(updatedItem);
+ }
+ gridOptions.data = updatedData;
+ xGrid.value.loadData(updatedData);
+ } catch (error) {
+ console.error('鏇存柊琛ㄦ牸鏁版嵁鏃跺嚭閿�:', error);
+ // 杩欓噷鍙互鏍规嵁瀹為檯闇�姹傛坊鍔犱竴浜涘洖婊氭搷浣滄垨鑰呮彁绀虹敤鎴风殑閫昏緫锛屾瘮濡傛樉绀轰竴涓敊璇彁绀烘绛�
+ ElMessage.error('鏇存柊纾ㄩ噺鏁版嵁鏃跺嚭鐜伴敊璇紝璇锋鏌ヨ緭鍏ユ垨鑱旂郴绠＄悊鍛�');
+ }
+ } else {
+ console.warn('琛ㄦ牸鏁版嵁涓虹┖锛屾棤娉曟洿鏂扮（閲忓��');
+ }
+ });
+};
+
</script>
@@ -261,7 +294,7 @@
title="璁剧疆淇竟"
destroy-on-close
style="width: 35%;height:80%;margin-top: 3vh;">
- <set-trimming/>
+ <set-trimming />
</el-dialog>
<el-button id="button" type="primary">淇濆瓨</el-button>
diff --git a/north-glass-erp/northglass-erp/src/views/pp/glassOptimize/page/SetAmount.vue b/north-glass-erp/northglass-erp/src/views/pp/glassOptimize/page/SetAmount.vue
index aff1c3b..2a43f74 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/glassOptimize/page/SetAmount.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/glassOptimize/page/SetAmount.vue
@@ -1,5 +1,6 @@
<script setup>
import {ref} from "vue";
+import {defineEmits} from 'vue';
function setupComponent() {
// 鍚勪釜杈撳叆妗嗙粦瀹氱殑鍊硷紝鍒濆鍖栦负0
@@ -37,6 +38,22 @@
const check = ref(true)
+const emit = defineEmits(['set-amount']);
+const props = defineProps({
+ closeDialog: Function
+});
+
+const setAmount = () => {
+ const amountData = {
+ quicksetTop: quicksetTop.value,
+ quicksetRight: quicksetRight.value,
+ quicksetBottom: quicksetBottom.value,
+ quicksetLeft: quicksetLeft.value
+ };
+ emit('set-amount', amountData);
+ props.closeDialog(2);
+};
+
</script>
<template>
@@ -59,7 +76,7 @@
<el-input-number v-model="quicksetLeft" class="left" placeholder="0"
controls-position="right" :step="0.1" :min="0"></el-input-number>
</div>
- <el-button type="primary" style="float: right; margin: 184px 0 0 13px;">搴旂敤</el-button>
+ <el-button type="primary" style="float: right; margin: 184px 0 0 13px;" @click="setAmount">搴旂敤</el-button>
</div>
<div style="margin-top: -20px">
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 29d8866..5e32056 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
@@ -453,6 +453,9 @@
$gridLeft.clearCheckboxRow()
$grid.clearCheckboxRow()
}
+ if (checkedNum.value){
+ checkedNum.value =''
+ }
}
@@ -659,6 +662,9 @@
} catch (e) {
ElMessage.warning(e.message)
}
+ if (checkedNum.value){
+ checkedNum.value =''
+ }
}
//鍚戝乏杈硅〃鏍兼坊鍔犳暟鎹�
const addLeft = () => {
@@ -776,6 +782,9 @@
} catch (e) {
ElMessage.warning(e.message)
+ }
+ if (checkedNum.value){
+ checkedNum.value =''
}
}
@@ -921,7 +930,7 @@
<span><el-input v-model="quantit" style="width: 80px;"/></span>
<span><el-input v-model="weight" style="width: 80px;"/></span>
</div>
- <span>{{ $t('processCard.selectedQuantity') }}:<el-input v-model="checkedNum" clearable
+ <span>{{ $t('processCard.selectedQuantity') }}:<el-input id="checkedNum" v-model="checkedNum" clearable
type="number"></el-input></span><br>
<el-button style="width: 40px;" type="primary" @click="addRight"> 鈫�</el-button>
<br>
diff --git a/north-glass-erp/northglass-erp/src/views/pp/report/ProductionSchedule.vue b/north-glass-erp/northglass-erp/src/views/pp/report/ProductionSchedule.vue
index d0f0807..da678ad 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/report/ProductionSchedule.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/report/ProductionSchedule.vue
@@ -57,10 +57,15 @@
return
}
//gridOptions.columns = JSON.parse(JSON.stringify(columns))
- res.data.title.forEach(item =>{
- let column = {slots: { default: 'quantitySum' }, width: 90,title: item.process}
- gridOptions.columns.push(column)
- })
+ res.data.title.forEach((item, index) => {
+ let column = { slots: { default: 'quantitySum' }, width: 90, title: item.process };
+ const insertIndex = 5; // 璁剧疆鎻掑叆浣嶇疆鐨勭储寮�
+ gridOptions.columns = [
+ ...gridOptions.columns.slice(0, insertIndex + index), // 鍙栨彃鍏ヤ綅缃箣鍓嶇殑閮ㄥ垎
+ column,
+ ...gridOptions.columns.slice(insertIndex + index) // 鍙栨彃鍏ヤ綅缃箣鍚庣殑閮ㄥ垎
+ ];
+ });
res.data.data.forEach(item => {
item.reportWorkQuantity=JSON.parse(item.reportWorkQuantity)
item.reportWorkQuantityCount=JSON.parse(item.reportWorkQuantityCount)
@@ -124,19 +129,20 @@
},//琛ㄥご鍙傛暟
columns : [
{type:'expand',fixed:"left",slots: { content:'content' },width: 50},
- {field: 'order_number', width: 150, title: t('order.OrderNum'),filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod: filterChanged},
+ {field: 'technology_number',width: 100, title: t('processCard.technologyNumber'),filters: [{data: ''}],
+ slots: {filter: 'num1_filter'},
+ filterMethod: filterChanged},
+ {field: 'glass_child',width: 120, title: t('reportingWorks.glassChild')},
+ {field: 'glassNumber', width: 110,title: t('reportingWorks.glassNumber'),showOverflow:"ellipsis",filters: [{data: ''}],
+ slots: {filter: 'num1_filter'},
+ filterMethod: filterChanged},
+ {field: 'quantity', width: 90,title: t('order.quantity')},
+
+ {field: 'order_number', width: 150, title: t('order.OrderNum'),filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod: filterChanged},
//{field: 'shape',width: 130, title: t('order.shape') ,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod: filterChanged},
- {field: 'glassNumber', width: 110,title: t('reportingWorks.glassNumber'),showOverflow:"ellipsis",filters: [{data: ''}],
- slots: {filter: 'num1_filter'},
- filterMethod: filterChanged},
{field: 'product_name', width: 120,title: t('order.product'),filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod: filterChanged},
{field: 'child_width',width: 110, title: t('order.width')},
{field: 'child_height', width: 90,title: t('order.height'),showOverflow:"ellipsis"},
- {field: 'quantity', width: 90,title: t('order.quantity')},
- {field: 'technology_number',width: 100, title: t('processCard.technologyNumber'),filters: [{data: ''}],
- slots: {filter: 'num1_filter'},
- filterMethod: filterChanged},
- {field: 'glass_child',width: 120, title: t('reportingWorks.glassChild')},
{field: 'inventoryNum',width: 120, title: t('report.inventoryNum')},
{field: 'inventoryArea',width: 120, title: t('report.inventoryArea')},
// {field: 'shippedQuantity',width: 120, title: t('report.shippedQuantity')},
--
Gitblit v1.8.0