From caf567becb6378f848b3b930821a4b38cb7564a5 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期二, 10 九月 2024 12:43:20 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/northglass-erp/src/views/pp/processCard/SelectProcessCard.vue | 50 ++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 44 insertions(+), 6 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectProcessCard.vue b/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectProcessCard.vue
index 57c47ad..f3bc749 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectProcessCard.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectProcessCard.vue
@@ -257,7 +257,7 @@
columns: [
{type: 'expand', fixed: "left", slots: {content: 'content'}, width: 50},
{type: 'checkbox', fixed: "left", title: t('basicData.check'), width: 80},
- {title: t('basicData.operate'), width: 100, slots: {default: 'button_slot'}, fixed: "left"},
+ {title: t('basicData.operate'), width: 90, slots: {default: 'button_slot'}, fixed: "left"},
{type: 'seq', fixed: "left", title: t('basicData.Number'), width: 50},
{field: 'orderId', title: t('order.orderId'), filters: [{data: ''}], slots: {filter: 'num1_filter'}, width: 110},
{field: 'order.customerName', title: t('processCard.customerName'), filters: [{data: ''}], slots: {filter: 'num1_filter'}, width: 110},
@@ -294,6 +294,7 @@
toolbarConfig: {
buttons: [
{code: 'update', name: t('processCard.composing'), status: 'primary'},
+ {code: 'delete', name: t('basicData.delete'), status: 'primary'},
],
import: false,
// export: true,
@@ -356,6 +357,43 @@
} else {
ElMessage.warning(t('basicData.msg.saveFail'))
+
+ }
+ })
+
+ }
+ return;
+
+ }
+ case 'delete': {
+ const $table = xGrid.value
+ if ($table) {
+ const selectRecords = $table.getCheckboxRecords()
+ if (selectRecords.length == 0) {
+ ElMessage.warning(t('processCard.pleaseCheckTheRequiredData'))
+ return;
+ }
+ //绠�鍖栧嬀閫夌殑鍊�
+ const extractedData = selectRecords.map(item => ({
+ orderId: item.orderId,
+ processId: item.processId
+ }));
+ let composingData = ref({
+ composing: extractedData,
+ userId: user.user.userId,
+ userName:user.user.userName
+ })
+ //澶氶�夊垹闄ゆ祦绋嬪崱
+ request.post("/processCard/checkboxDelete", composingData.value).then((res) => {
+ if (res.code == 200 && res.data === true) {
+ ElMessage.success(t('basicData.msg.deleteSuccess'))
+ router.push({
+ path: '/main/processCard/SelectProcessCard',
+ query: {random: Math.random()}
+ })
+ } else {
+
+ ElMessage.warning(t('basicData.msg.deleteFail'))
}
})
@@ -447,11 +485,11 @@
<!-- <el-button v-else-if="row.layoutStatus=='涓嶅彲鎺掔増'" @click="getTableRow(row,'setType')" link type="primary" size="small">{{$t('processCard.composingOk')}}</el-button>-->
<!-- <el-button v-else-if="row.layoutStatus=='宸叉帓鐗�'" disabled @click="getTableRow(row,'setType')" link type="primary" size="small">{{$t('processCard.typesetter')}}</el-button>-->
<!-- <el-button @click="getTableRow(row,'delete')" link type="primary" size="small">{{$t('basicData.delete')}}</el-button>-->
- <el-popconfirm :title="$t('searchOrder.deleteConfirm')" @confirm="getTableRow(row,'delete')">
- <template #reference>
- <el-button link size="small" type="primary">{{ $t('basicData.delete') }}</el-button>
- </template>
- </el-popconfirm>
+<!-- <el-popconfirm :title="$t('searchOrder.deleteConfirm')" @confirm="getTableRow(row,'delete')">-->
+<!-- <template #reference>-->
+<!-- <el-button link size="small" type="primary">{{ $t('basicData.delete') }}</el-button>-->
+<!-- </template>-->
+<!-- </el-popconfirm>-->
</template>
<template #num1_filter="{ column, $panel }">
--
Gitblit v1.8.0