From acaf8ca38cd32bc474bb46b593db2a8d75b9bfdd Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期六, 12 十月 2024 08:26:23 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/northglass-erp/src/views/pp/workOrder/AddWorkOrder.vue | 40 ++++++++++++++++++++++------------------
1 files changed, 22 insertions(+), 18 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/pp/workOrder/AddWorkOrder.vue b/north-glass-erp/northglass-erp/src/views/pp/workOrder/AddWorkOrder.vue
index 5f094d7..b4e1514 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/workOrder/AddWorkOrder.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/workOrder/AddWorkOrder.vue
@@ -26,10 +26,6 @@
router.push({path: '/main/workOrder/addWorkOrder', query: {id: row.id}})
break
}
- case 'delete': {
- alert('鎴戞帴鏀跺埌瀛愮粍浠朵紶閫佺殑鍒犻櫎淇℃伅')
- break
- }
}
}
@@ -71,19 +67,23 @@
const {currentRoute} = useRouter()
const route = currentRoute.value
-let id = route.query.orderId
+onMounted(() => {
+ let id = route.query.orderId
-request.post(`/workOrder/addWork/${id}`, filterData.value).then((res) => {
+ request.post(`/workOrder/addWork/${id}`, filterData.value).then((res) => {
- if (res.code == 200) {
- pageTotal.value = res.data.total
- produceList = produceList.value.concat(deepClone(res.data.data))
- xGrid.value.reloadData(produceList)
- gridOptions.loading = false
- } else {
- ElMessage.warning(res.msg)
- }
+ if (res.code == 200) {
+ pageTotal.value = res.data.total
+ produceList = produceList.value.concat(deepClone(res.data.data))
+ xGrid.value.reloadData(produceList)
+ gridOptions.loading = false
+ } else {
+ ElMessage.warning(res.msg)
+ }
+ })
})
+
+
/*浣跨敤绛涢�夛紝鍚庣鑾峰彇鏁版嵁*/
@@ -143,7 +143,7 @@
align: 'center',//鏂囧瓧灞呬腑
stripe: true,//鏂戦┈绾�
rowConfig: {isCurrent: true, isHover: true, height: 30},//榧犳爣绉诲姩鎴栭�夋嫨楂樹寒
- id: 'demo_1',
+ id: 'addWorkOrder',
showFooter: true,//鏄剧ず鑴�
printConfig: {},
importConfig: {},
@@ -216,6 +216,10 @@
const $table = xGrid.value
if ($table) {
const selectRecords = $table.getCheckboxRecords()
+ if(selectRecords.length!=$table.getTableData().fullData.length){
+ ElMessage.warning(t('workOrder.msg'))
+ return;
+ }
let workOrderData = ref({
orderdetail: selectRecords,
@@ -225,7 +229,7 @@
request.post("/workOrder/addOrderWork", workOrderData.value).then((res) => {
if (res.code == 200 && res.data===true) {
ElMessage.success(t('basicData.msg.saveSuccess'))
- router.push({path: '/main/workOrder/addWorkOrder', query: {orderId:id,random:Math.random()}})
+ router.push({path: '/main/workOrder/addWorkOrder', query: {orderId:route.query.orderId,random:Math.random()}})
} else {
ElMessage.warning(res.msg)
}
@@ -270,8 +274,8 @@
<!--宸﹁竟鍥哄畾鏄剧ず鐨勬彃妲�-->
<template #button_slot="{ row }">
- <el-button @click="getTableRow(row,'edit')" link type="primary" size="small">杞伐鍗�</el-button>
- <el-button @click="getTableRow(row,'delete')" link type="primary" size="small">鍒犻櫎</el-button>
+ <el-button @click="getTableRow(row,'edit')" link type="primary" size="small">{{ $t('workOrder.transferOrder') }}</el-button>
+ <el-button @click="getTableRow(row,'delete')" link type="primary" size="small">{{ $t('basicData.delete') }}</el-button>
</template>
<template #num1_filter="{ column, $panel }">
--
Gitblit v1.8.0