From 82a5de6d2ec80b45660149c84be28734032562f6 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期五, 11 十月 2024 15:21:53 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue | 81 +++++++++++++++++++++++++++++++++++++---
1 files changed, 74 insertions(+), 7 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 e35769a..ff0c9da 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
@@ -23,6 +23,7 @@
let errorAreaVisible = ref(false)
let otherMoneyVisible = ref(false)
let sizeCheckVisible = ref(false)
+let orderIdVisible = ref(false)
const maxTableLen =ref(500)
let errorArea = ref(0.4)
const userStore = useUserInfoStore()
@@ -34,6 +35,7 @@
const shapeList = ref([
{label:t('order.universalShape'),value:'1'}, {label:t('order.alien'),value:'2'}
])
+const newOrderId = ref([])
// 瀹氫箟琛ㄥご涓婁紶鏁版嵁
const titleUploadData = ref({
@@ -112,7 +114,8 @@
{ code: 'incrementalChecked', name: t('basicData.incrementalChecked'), prefixIcon: 'vxe-icon-copy', visible: true, disabled: false },
{ 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: '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 }
]
]
}
@@ -358,13 +361,14 @@
otherMoney:otherMoney.value,
orderIdType:company.orderIdType,
creator:userStore.user.userName,
- creatorId:userStore.user.userId
+ creatorId:userStore.user.userId,
+ newOrderId:newOrderId.value
}
const grossAreaList = $grid.getTableData().fullData.filter(
item=>item.grossArea === 0
)
const errorAreaList = $grid.getTableData().fullData.filter(
- item=>(item.width*item.height/1000000 < errorArea.value*1 && item.computeArea < errorArea.value*1)
+ item=>(item.width*item.height/1000000 < errorArea.value*1)
)
if(grossAreaList.length>0){
alert(t('order.msg.grossAreaIsNot0'))
@@ -445,7 +449,8 @@
ElMessage.error(t('basicData.msg.checkoutLose'))
return
}
-
+ titleUploadData.value.creatorId=userStore.user.userId
+ titleUploadData.value.creator=userStore.user.userName
let order ={
title:titleUploadData.value,
}
@@ -617,6 +622,10 @@
sizeCheckVisible.value=true
break
}
+ case 'updateOrderId' :{
+ orderIdVisible.value=true
+ break
+ }
case 'incrementalAll' :{
let result = toolbarButtonClickEvent()
if(result){
@@ -637,6 +646,9 @@
dataList.forEach((item,index) =>{
if(index>=result.start ){
let newStr = subStr1.replace(reg, number);
+ if(parseInt(newStr)>9){
+ newStr=parseInt(newStr)
+ }
setNestedValue(item,result.cell,subStr2+newStr)
number=number+1
}
@@ -667,6 +679,9 @@
dataList.forEach((item,index) =>{
if(index >= result.start && index <= result.end){
let newStr = subStr1.replace(reg, number);
+ if(parseInt(newStr)>9){
+ newStr=parseInt(newStr)
+ }
setNestedValue(item,result.cell,subStr2+newStr)
number=number+1
}
@@ -730,7 +745,7 @@
addListener(xGrid.value,gridOptions)
const str = route.query.orderId || history.state.orderId
if (typeof str === 'undefined' || str === null || str === '' || str === '\n' || str === '\r'){
-
+ gridOptions.menuConfig.body.options[0][11].disabled = true
gridOptions.loading = false
return
}
@@ -738,6 +753,7 @@
request.post(`/order/getOrderById/${str}`).then((res) => {
if(res.code==200){
titleUploadData.value = res.data.order
+ newOrderId.value=titleUploadData.value.orderId
if(history.state.orderId!=null){
titleUploadData.value.orderId=''
titleUploadData.value.id=null
@@ -756,6 +772,10 @@
if(history.state.type=='copy'){
xGrid.value.reloadData(orderDetails)
+ gridOptions.menuConfig.body.options[0][11].disabled = true
+ }
+ if(history.state.type=='copyTitle'){
+ gridOptions.menuConfig.body.options[0][11].disabled = true
}
gridOptions.loading = false
@@ -770,6 +790,7 @@
//宸ヨ壓瀹℃牳鍚庝繚瀛樻寜閽鐢�
if(res.data.order.processReview === 2){
gridOptions.toolbarConfig.buttons[4].disabled = true
+ gridOptions.menuConfig.body.options[0][11].disabled = true
}
@@ -785,6 +806,7 @@
gridOptions.toolbarConfig.buttons[2].code='reviews'
gridOptions.toolbarConfig.buttons[2].name=t('basicData.cancelReview')
gridOptions.toolbarConfig.buttons[3].disabled = false
+ gridOptions.menuConfig.body.options[0][11].disabled = true
const button = {'code': 'cancelOrder',
status: 'primary',
@@ -795,8 +817,11 @@
gridOptions.toolbarConfig.buttons[2].disabled = true
gridOptions.toolbarConfig.buttons[3].disabled = true
gridOptions.toolbarConfig.buttons[4].disabled = true
+
+
}
}
+
if(res.data.order.productionOrder !==0 ){
gridOptions.toolbarConfig.buttons[2].disabled = true
}
@@ -881,9 +906,9 @@
gridOptions.editRules[`otherColumns.${item.column}`] = [
{
validator ({ cellValue }) {
- const regex = /^(0(\.\d{1,2})?|([1-9]\d{0,4})(\.\d{1,2})?|99999(\.9{1,2})?)$/
+ const regex = /^(0(\.\d{1,3})?|([1-9]\d{0,4})(\.\d{1,3})?|99999(\.9{1,3})?)$/
if (cellValue && !regex.test(cellValue)) {
- return new Error(t('basicData.msg.range99999Dec2'))
+ return new Error(t('basicData.msg.range99999Dec3'))
}
}
}
@@ -981,8 +1006,40 @@
})
}
+//淇敼璁㈠崟鍙锋柟娉�
+const updateOrderId = () => {
+ let orderId ={
+ oldOrderId:titleUploadData.value.orderId,
+ newOrderId:newOrderId.value,
+ orderIdType:company.orderIdType,
+ creator:userStore.user.userName,
+ }
+ request.post(`/order/updateOrderId`,orderId).then((res) => {
+ if(res.code==200 && res.data==="true"){
+ ElMessage.success(t('basicData.msg.saveSuccess'))
+ router.push({path:'/main/order/createOrder',query:{
+ orderId:newOrderId.value,
+ random:Math.random()}})
+ }else if(res.data==="false1"){
+ ElMessage.warning("杈撳叆璁㈠崟鍙蜂笉鑳藉ぇ浜庢渶澶ц鍗曞彿")
+ }else if(res.data==="false2"){
+ ElMessage.warning("杈撳叆璁㈠崟鍙峰凡瀛樺湪")
+ }else if(res.data==="false3"){
+ ElMessage.warning("杈撳叆璁㈠崟鍙风浉鍚�")
+ }else if(res.data==="false4"){
+ ElMessage.warning("杈撳叆璁㈠崟鍙烽暱搴︿笉绗�")
+ }else if(res.data==="false5"){
+ ElMessage.warning("璇疯緭鍏ユ暟瀛�")
+ }else if(res.data==="false6"){
+ ElMessage.warning("涓嶈兘淇敼绗竴涓崟瀛�")
+ }
+ })
+}
+
//鏇存柊閲戦閲嶇疆
const updateMoney = () => {
+ titleUploadData.value.creatorId=userStore.user.userId
+ titleUploadData.value.creator=userStore.user.userName
const updateData = {
order: titleUploadData.value,
detail: xGrid.value.getTableData().fullData,
@@ -1524,6 +1581,16 @@
</el-col>
</el-row>
</el-dialog>
+ <el-dialog v-model="orderIdVisible" style="width: 300px;height:150px ">
+ <el-row>
+ <el-col :span="12">
+ <el-input v-model="newOrderId"/>
+ </el-col>
+ <el-col :span="6">
+ <el-button @click="updateOrderId">{{$t('basicData.confirmButtonText')}}</el-button>
+ </el-col>
+ </el-row>
+ </el-dialog>
<el-dialog v-model="otherMoneyVisible"
:title="$t('basicData.otherAmounts')"
:close-on-click-modal="false"
--
Gitblit v1.8.0