From a660db06773007b1be690e0674829c00a57aeb7b Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期三, 24 十二月 2025 16:21:23 +0800
Subject: [PATCH] 订单首页流程卡新增楼层编号显示
---
north-glass-erp/northglass-erp/src/views/sd/order/SelectOrder.vue | 36 ++++++++++++++++++++++++++++--------
1 files changed, 28 insertions(+), 8 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/sd/order/SelectOrder.vue b/north-glass-erp/northglass-erp/src/views/sd/order/SelectOrder.vue
index b1eec60..b11c52f 100644
--- a/north-glass-erp/northglass-erp/src/views/sd/order/SelectOrder.vue
+++ b/north-glass-erp/northglass-erp/src/views/sd/order/SelectOrder.vue
@@ -21,6 +21,7 @@
import PrintSheet3 from "@/components/sd/order/PrintSheet3.vue"
import PrintSheet4 from "@/components/sd/order/PrintSheet4.vue"
import PrintSheet5 from "@/components/sd/order/PrintSheet5.vue"
+import OrderProcessCollect from "@/components/sd/order/OrderProcessCollect.vue";
const { t } = useI18n()
const orderInfo = useOrderInfoStore()
const userStore = useUserInfoStore()
@@ -90,10 +91,10 @@
name: t('order.processingOrder'),
children: [
// { code: 'sheet1', name: '妯増-鏅��' },
- { code: 'sheet2', name: t('order.sheet2') },
- { code: 'sheet4', name: t('order.sheet4') },
- { code: 'sheet3', name: t('order.sheet3') },
- { code: 'sheet5', name: t('order.sheet5')},
+ { code: 'sheet2', name: t('order.sheet2') },//鍔犲伐鍗曟í鐗�
+ { code: 'sheet4', name: t('order.sheet4') },//鍔犲伐鍗�-绔栫増
+ { code: 'sheet3', name: t('order.sheet3') },//鍙戣揣纭鍗�
+ { code: 'sheet5', name: t('order.sheet5')},//鍔犲伐鍗� 绔栫増鍗曠墖
]
},
@@ -376,7 +377,7 @@
}
ElMessageBox.confirm(
- '纭畾涓�閿��鍥炵浉搴旀祦绋�?',
+ t('searchOrder.msgList.BackSure'),
'Warning',
{
confirmButtonText: t('basicData.confirmButtonText'),
@@ -459,12 +460,18 @@
pageNum.value=1
orderList.value = deepClone(res.data.data)
xGrid.value.loadData(orderList.value)
- gridOptions.loading=false
+
orderInfo.searchOrderFilter.list = xGrid.value.getCheckedFilters()
orderInfo.searchOrderFilter.data = filterData.value
}else{
ElMessage.warning(res.msg)
}
+ }).catch(e => {
+ xGrid.value.clearFilter()
+ orderInfo.searchOrderFilter.data = {}
+ ElMessage.error(t('searchOrder.msgList.filterError'))
+ }).finally(()=>{
+ gridOptions.loading=false
})
}
@@ -670,7 +677,10 @@
size="small">
{{ $t('basicData.edit') }}
</el-button>
- <el-popconfirm @confirm="getTableRow(row,'delete')" :title="$t('searchOrder.deleteConfirm')">
+ <el-popconfirm
+ v-if="userStore.user.permissions.indexOf('selectOrder.edit') > -1"
+ @confirm="getTableRow(row,'delete')"
+ :title="$t('searchOrder.deleteConfirm')">
<template #reference>
<el-button link type="primary" size="small">{{ $t('basicData.delete') }}</el-button>
</template>
@@ -734,19 +744,29 @@
<el-tab-pane :label="$t('order.details')" name="1" >
<order-detail
v-if="tabsValue==='1'"
- :orderId="rowClickIndex===null?null:rowClickIndex.orderId"
+ :orderId="rowClickIndex===null?null:rowClickIndex.orderId"
+ :row="rowClickIndex===null?{}:rowClickIndex"
/>
</el-tab-pane>
<el-tab-pane :label="$t('order.workmanship')" name="2">
<order-craft-detail
v-if="tabsValue==='2'"
:orderId="rowClickIndex===null?null:rowClickIndex.orderId"
+ :row="rowClickIndex===null?{}:rowClickIndex"
/>
</el-tab-pane>
<el-tab-pane :label="$t('order.processCard')" name="3">
<order-process
v-if="tabsValue==='3'"
:orderId="rowClickIndex===null?null:rowClickIndex.orderId"
+ :row="rowClickIndex===null?{}:rowClickIndex"
+ />
+ </el-tab-pane>
+ <el-tab-pane :label="$t('order.processCardCollect')" name="4">
+ <order-process-collect
+ v-if="tabsValue==='4'"
+ :orderId="rowClickIndex===null?null:rowClickIndex.orderId"
+ :row="rowClickIndex===null?{}:rowClickIndex"
/>
</el-tab-pane>
</el-tabs>
--
Gitblit v1.8.0