From 77e6370cf2476a7c32fdd88df94cff0b042abd43 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期四, 27 三月 2025 10:37:44 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override
---
north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue | 60 ++++++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 46 insertions(+), 14 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue b/north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue
index 635a91b..8ff5bae 100644
--- a/north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue
+++ b/north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue
@@ -18,6 +18,7 @@
import footSum from "@/hook/footSum"
import {useI18n} from "vue-i18n"
import {multiply,multiplyAuto,divideAuto} from '@/utils/decimal'
+import OrderNumberReportTransfer from "@/components/sd/order/OrderNumberReportTransfer.vue";
const { t } = useI18n()
let dialogTableVisible = ref(false)
@@ -25,6 +26,13 @@
let errorAreaVisible = ref(false)
let otherMoneyVisible = ref(false)
let sizeCheckVisible = ref(false)
+let dialogTransferVisible = ref(false)
+const transferData = ref({
+ oldOrderId:null,
+ newOrderNumber:null,
+ newOrderId:null,
+ oldOrderNumber:null,
+})
let orderIdVisible = ref(false)
const maxTableLen =ref(500)
const userStore = useUserInfoStore()
@@ -117,7 +125,8 @@
{ code: 'errorArea', name: t('basicData.errorSettlementArea'), prefixIcon: 'vxe-icon-chart-bar-x', visible: true, disabled: false },
{ code: 'otherMoney', name: t('basicData.otherAmounts'), prefixIcon: 'vxe-icon-chart-bar-x', visible: true, disabled: false },
{ code: 'sizeCheck', name: t('basicData.sizeReview'), prefixIcon: 'vxe-icon-eye-fill', visible: true, disabled: false },
- { code: 'updateOrderId', name: '淇敼璁㈠崟鍙�', prefixIcon: 'vxe-icon-eye-fill', visible: true, disabled: false }
+ { code: 'updateOrderId', name: t('searchOrder.updateOrderId'), prefixIcon: 'vxe-icon-eye-fill', visible: true, disabled: false },
+ { code: 'reportingTransfer', name: t('searchOrder.reportingTransfer'), prefixIcon: 'vxe-icon-send', visible: true, disabled: true }
]
]
}
@@ -749,12 +758,20 @@
})
}
-
-
-
}
computedMoney(result.cell)
gridOptions.menuConfig.body.options[0][5].disabled = false
+ break
+ }
+ case "reportingTransfer":{
+ const row = xGrid.value.getCurrentRecord()
+ if(row===null){
+ ElMessage.warning(t('components.pleaseClickToSelectARowFirst'))
+ return
+ }
+ transferData.value.oldOrderNumber = row.orderNumber
+ transferData.value.oldOrderId = titleUploadData.value.orderId
+ dialogTransferVisible.value = true
break
}
}
@@ -880,9 +897,10 @@
gridOptions.toolbarConfig.buttons[2].disabled = true
gridOptions.toolbarConfig.buttons[3].disabled = true
gridOptions.toolbarConfig.buttons[4].disabled = true
-
-
}
+ }
+ if(res.data.order.processingCard>0 && company.connectMes){
+ gridOptions.menuConfig.body.options[0][12].disabled = false
}
if(res.data.order.productionOrder !==0 ){
@@ -1089,17 +1107,17 @@
orderId:newOrderId.value,
random:Math.random()}})
}else if(res.data==="false1"){
- ElMessage.warning("杈撳叆璁㈠崟鍙蜂笉鑳藉ぇ浜庢渶澶ц鍗曞彿")
+ ElMessage.warning(t('order.msg.updateOrderIdErrorGtMaxId'))
}else if(res.data==="false2"){
- ElMessage.warning("杈撳叆璁㈠崟鍙峰凡瀛樺湪")
+ ElMessage.warning(t('order.msg.updateOrderIdErrorIsExist'))
}else if(res.data==="false3"){
- ElMessage.warning("杈撳叆璁㈠崟鍙风浉鍚�")
+ ElMessage.warning(t('order.msg.updateOrderIdErrorIsSame'))
}else if(res.data==="false4"){
- ElMessage.warning("杈撳叆璁㈠崟鍙烽暱搴︿笉绗�")
+ ElMessage.warning(t('order.msg.updateOrderIdErrorDiscrepancyInLength'))
}else if(res.data==="false5"){
- ElMessage.warning("璇疯緭鍏ユ暟瀛�")
+ ElMessage.warning(t('order.msg.updateOrderIdErrorInputNumber'))
}else if(res.data==="false6"){
- ElMessage.warning("涓嶈兘淇敼绗竴涓崟瀛�")
+ ElMessage.warning(t('order.msg.updateOrderIdErrorNotNo1'))
}
})
}
@@ -1142,8 +1160,7 @@
await ElMessageBox.confirm(
t('order.msg.differentSize'),
t('order.msg.warning'),
- {
- confirmButtonText: t('basicData.confirmButtonText'),
+ {confirmButtonText: t('basicData.confirmButtonText'),
cancelButtonText: t('basicData.cancelButtonText'),
type: 'warning',
}
@@ -1579,6 +1596,13 @@
await initOrder(1)
createCustomerVisible.value = false
}
+const orderNumberTransfer = () => {
+ router.push({
+ path:'/main/order/createOrder',
+ query:{
+ orderId:titleUploadData.value.orderId,
+ random:Math.random()}})
+}
</script>
@@ -1852,6 +1876,14 @@
<create-customer :getOrderPage="'order'" @getOrderFunction="createCustomerSuccess" />
</el-dialog>
+<!-- 璁㈠崟鎶ュ伐杞Щ-->
+ <el-dialog v-model="dialogTransferVisible"
+ :close-on-click-modal="false"
+ :title="$t('order.orderTransfer')"
+ destroy-on-close width="500">
+ <order-number-report-transfer :transferData="transferData" @orderNumberTransfer="orderNumberTransfer"/>
+ </el-dialog>
+
</div>
</template>
--
Gitblit v1.8.0