From ba08476e1ddeca6d7081fadf52710ce45c89d39d Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期二, 05 八月 2025 11:06:23 +0800
Subject: [PATCH] 补充报工新增语言，修改补片打印时，多个流程卡号在同一个补片单号下出现的问题，分架排序改为前端排序
---
north-glass-erp/northglass-erp/src/views/pp/processCard/AddProcessCard.vue | 73 ++++++++++++++----------------------
1 files changed, 28 insertions(+), 45 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 d32e8dd..2bad006 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
@@ -324,48 +324,31 @@
})
const gridEventsRight = {
toolbarButtonClick({code}) {
- const $grid = xGridLeft.value
+ const $grid = xGrid.value
if ($grid) {
switch (code) {
case 'sorting': {
- request.post(`/processCard/selectSortingCard/${orderId}/${productionId}/${flashback.value}/${optionVal.value}`, filterData.value).then((res) => {
- if (res.code == 200) {
- pageTotal.value = res.data.total
- maxProcseeId = res.data.maxFlowCard[0].process_id
- orderOtherMoney.value = res.data.orderOtherMoney
-
- //宸叉湁鐨勪笉娣诲姞
- const dynamicFields = orderOtherMoney.value.map(item => item.column)
- gridOptions.columns = gridOptions.columns.filter(col => !dynamicFields.includes(col.field))
-
- // 娣诲姞鏂扮殑鍔ㄦ�佸垪
- orderOtherMoney.value.forEach(item => {
- let column = {
- field: `${item.column}`,
- width: 100,
- title: item.alias,
- filters: [{data: ''}],
- slots: {filter: 'num1_filter'},
- filterMethod: filterChanged,
- sortable: true
- }
-
- gridOptions.columns.push(column)
-
- })
- produceList = res.data.data
- produceList.forEach(item => {
-
- item.shape = (item.shape == 2) ? t('order.alien') : t('order.universalShape');
- })
- xGrid.value.reloadData(produceList)
- gridOptions.loading = false
- } else {
- ElMessage.warning(res.msg)
- }
- })
- return;
-
+ const rightData = $grid.getTableData().fullData
+ let sortedRule = optionVal.value // "0 瀹介珮" 鎴� "1 楂樺"
+ let sortedData = []
+ if (sortedRule == 0) {
+ sortedData = rightData.sort((a, b) => {
+ if (a.width === b.width) {
+ return a.height - b.height
+ }
+ return a.width - b.width
+ })
+ } else if (sortedRule == 1) {
+ sortedData = rightData.sort((a, b) => {
+ if (a.height === b.height) {
+ return a.width - b.width
+ }
+ return a.height - b.height
+ })
+ }
+ // 鎺掑簭鍚庢洿鏂拌〃鏍兼暟鎹�
+ $grid.loadData(sortedData)
+ return
}
}
@@ -1167,12 +1150,12 @@
{{ t('processCard.sorting') }}
</el-button>
- <el-checkbox
- :model-value="flashback === 0"
- @change="onFlashbackChange"
- >
- {{ t('processCard.flashback') }}
- </el-checkbox>
+<!-- <el-checkbox-->
+<!-- :model-value="flashback === 0"-->
+<!-- @change="onFlashbackChange"-->
+<!-- >-->
+<!-- {{ t('processCard.flashback') }}-->
+<!-- </el-checkbox>-->
</template>
--
Gitblit v1.8.0