From 33dbc6a161554f3a897f9e9273feb4f2c1b47381 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期一, 15 十二月 2025 17:04:27 +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 | 542 +++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 451 insertions(+), 91 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 6e213e4..64c5d54 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
@@ -2,7 +2,7 @@
import {nextTick, onMounted, reactive, ref, watch} from "vue"
import {useRouter,useRoute} from "vue-router"
import * as XLXS from "xlsx"
-import {ElMessage, ElMessageBox} from "element-plus"
+import {Action, ElMessage, ElMessageBox} from "element-plus"
import request from "@/utils/request"
import deepClone from "@/utils/deepClone"
import useUserInfoStore from '@/stores/userInfo'
@@ -12,12 +12,16 @@
import CreateCustomer from "@/views/sd/customer/CreateCustomer.vue"
import OrderOtherMoney from "@/components/sd/order/OrderOtherMoney.vue"
import OrderSizeCheck from "@/components/sd/order/OrderSizeCheck.vue"
+import UpdateAlienEditor from "@/components/sd/order/UpdateAlienEditor.vue"
import {changeFilterEvent,filterChanged} from "@/hook"
import {addListener,toolbarButtonClickEvent} from "@/hook/mouseMove"
import downLoadFile from "@/hook/downLoadFile"
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"
+import UploadPicture from "@/components/sd/order/UploadPicture.vue"
+import ProcessAttribute from "@/components/sd/order/ProcessAttribute.vue"
const { t } = useI18n()
let dialogTableVisible = ref(false)
@@ -25,6 +29,17 @@
let errorAreaVisible = ref(false)
let otherMoneyVisible = ref(false)
let sizeCheckVisible = ref(false)
+let dialogTransferVisible = ref(false)
+let uploadPictureVisible = ref(false)
+let alienEditorVisible = ref(false)
+let fileUploadVisible = ref(false)
+let processAttributeVisible = ref(false)
+const transferData = ref({
+ oldOrderId:null,
+ newOrderNumber:null,
+ newOrderId:null,
+ oldOrderNumber:null,
+})
let orderIdVisible = ref(false)
const maxTableLen =ref(500)
const userStore = useUserInfoStore()
@@ -37,7 +52,10 @@
const shapeList = ref([
{label:t('order.universalShape'),value:'1'}, {label:t('order.alien'),value:'2'}
])
+
const newOrderId = ref([])
+
+const orderTypeState = ref(0)
// 瀹氫箟琛ㄥご涓婁紶鏁版嵁
const titleUploadData = ref({
@@ -77,7 +95,8 @@
orderClassify:[],
packType:[],
customer:[],
- saleMan:[]
+ saleMan:[],
+ edgingType:[]
})
let filterData = ref({})
let rowIndex = ref(null)
@@ -99,8 +118,8 @@
printConfig: {},
importConfig: {},
exportConfig: {},
- scrollY:{ enabled: true,gt:0 },//寮�鍚櫄鎷熸粴鍔�
- scrollX:{ enabled: true,gt:0 },//寮�鍚櫄鎷熸粴鍔�
+ virtualXConfig:{ enabled: true,gt:0 },//寮�鍚櫄鎷熸粴鍔�
+ virtualYConfig:{ enabled: true,gt:0 },//寮�鍚櫄鎷熸粴鍔�
showOverflow:true,
menuConfig: {
body: {
@@ -117,7 +136,10 @@
{ 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 },
+ { code: 'uploadPicture', name: t('order.graphic'),prefixIcon: 'vxe-icon-picture-fill', visible: true, },
+ { code: 'fileUpload', name: t('order.fileUpload'),prefixIcon: 'vxe-icon-picture-fill', visible: true, }
]
]
}
@@ -168,14 +190,26 @@
filters:[{ data: '' }],
slots: { filter: 'num1_filter',edit:'shape_edit',default:'default_shape' }, sortable: true,filterMethod:filterChanged},
{field: 'bendRadius',width:160, title: t('order.bendRadius'),editRender: { name: 'input'},filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
- {field: 'edgingType',width:160, title: t('order.edgingType'),editRender: { name: 'input'},filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
+ {field: 'edgingType',width:160, title: t('order.edgingType'),filters:[{ data: '' }],
+ slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
+ {
+ field: 'processAttribute',
+ width: 160,
+ title: t('craft.processAttribute'),
+ filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged
+ },
{field: 'processingNote',width:200, title: t('order.processingNote'),editRender: { name: 'input'},filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
+ {field: 'fileName',width:200, title: t('order.drawingNo'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
{field: 'remarks',width:140, title: t('basicData.remarks'),editRender: { name: 'input'},filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
],
//琛ㄥ崟楠岃瘉
editRules: {
+ edgingType: [
+ { required: company.edgingType},
+ { min: 0, max: 255, message: t('basicData.msg.max255') }
+ ],
buildingNumber: [
{ required: false},
{ min: 0, max: 255, message: t('basicData.msg.max255') }
@@ -295,6 +329,7 @@
break
}
case 'updateMoney': {
+ $grid.clearEdit()
updateMoney()
break
}
@@ -315,6 +350,7 @@
break
}
case 'saveOrder': {
+ xGrid.value.clearEdit()
if ($grid.getTableData().tableData.length === 0){
ElMessage.error( t('order.msg.tableLengthNot'))
return
@@ -364,11 +400,30 @@
orderIdType:company.orderIdType,
creator:userStore.user.userName,
creatorId:userStore.user.userId,
- newOrderId:newOrderId.value
+ newOrderId:newOrderId.value,
+ position:company.position,
+ orderIdTypeLetter:company.orderIdTypeLetter,
+ orderIdTypeMantissa:company.orderIdTypeMantissa
}
const grossAreaList = $grid.getTableData().fullData.filter(
item=>item.grossArea === 0
)
+ //鍒ゆ柇瀹介珮鐩镐箻涓庡瓧娈电粨绠楅潰绉槸鍚︾浉鍚�
+
+ for (const i in $grid.getTableData().fullData) {
+ const item = $grid.getTableData().fullData[i]
+ const grossArea = multiplyAuto(countArea(item),1,2)
+ const itemGrossArea = multiplyAuto(item.grossArea,1,2)
+ if(itemGrossArea!== grossArea ){
+ ElMessage.warning(`${t('order.OrderNum')}
+ ${Number(i)+1}${t('order.area')}: ${grossArea} != ${itemGrossArea}`)
+ return
+ }
+ }
+
+
+
+
const errorAreaList = $grid.getTableData().fullData.filter(
item=>(item.width*item.height/1000000 < errorArea.value*1)
)
@@ -536,6 +591,24 @@
item["productName"] = val1
}
})
+ }else if(result.cell=='processAttribute'){
+ const val = dataList[result.start][result.cell]
+ const val1 = dataList[result.start]["edgingType"]
+ dataList.forEach((item,index) =>{
+ if(index>=result.start && index<=result.end){
+ item[result.cell] = val
+ item["edgingType"] = val1
+ }
+ })
+ }else if(result.cell=='edgingType'){
+ const val = dataList[result.start][result.cell]
+ const val1 = dataList[result.start]["processAttribute"]
+ dataList.forEach((item,index) =>{
+ if(index>=result.start && index<=result.end){
+ item[result.cell] = val
+ item["processAttribute"] = val1
+ }
+ })
}else{
const val = getNestedProperty(dataList[result.start],result.cell)
@@ -548,6 +621,7 @@
}
computedMoney(result.cell)
gridOptions.menuConfig.body.options[0][5].disabled=false
+ xGrid.value.updateFooter()
break
}
case 'copyAll' :{
@@ -573,6 +647,24 @@
item["productName"] = val1
}
})
+ }else if(result.cell=='processAttribute'){
+ const val = dataList[result.start][result.cell]
+ const val1 = dataList[result.start]["edgingType"]
+ dataList.forEach((item,index) =>{
+ if(index>=result.start ){
+ item[result.cell] = val
+ item["edgingType"] = val1
+ }
+ })
+ }else if(result.cell=='edgingType'){
+ const val = dataList[result.start][result.cell]
+ const val1 = dataList[result.start]["processAttribute"]
+ dataList.forEach((item,index) =>{
+ if(index>=result.start ){
+ item[result.cell] = val
+ item["processAttribute"] = val1
+ }
+ })
}else{
const val = getNestedProperty(dataList[result.start],result.cell)
dataList.forEach((item,index) =>{
@@ -586,20 +678,39 @@
}
computedMoney(result.cell)
gridOptions.menuConfig.body.options[0][5].disabled=false
+ xGrid.value.updateFooter()
break
}
case 'clearChecked' :{
let result = toolbarButtonClickEvent()
if(result){
const dataList = xGrid.value.getTableData().visibleData
- dataList.forEach((item,index) =>{
- if(index>=result.start && index<=result.end){
- item[result.cell] = ''
- }
- })
+ if(result.cell=='processAttribute'){
+ dataList.forEach((item,index) =>{
+ if(index>=result.start && index<=result.end){
+ item[result.cell] = ''
+ item['edgingType'] = ''
+ }
+ })
+ }else if(result.cell=='edgingType'){
+ dataList.forEach((item,index) =>{
+ if(index>=result.start && index<=result.end){
+ item[result.cell] = ''
+ item['processAttribute'] = ''
+ }
+ })
+ }else{
+ dataList.forEach((item,index) =>{
+ if(index>=result.start && index<=result.end){
+ item[result.cell] = ''
+ }
+ })
+ }
+
}
computedMoney(result.cell)
gridOptions.menuConfig.body.options[0][5].disabled=false
+
break
}
case 'computedMoney' :{
@@ -628,33 +739,67 @@
if(result){
const dataList = xGrid.value.getTableData().visibleData
const val = getNestedProperty(dataList[result.start],result.cell)+""
+ if(!/\d$/.test(val)){
+ const matches = val.match(/\D/g);
+ const b= val.lastIndexOf(matches[matches.length-1])
- const numbersArr = []
- const regex = /\d+/g
- let match
- while ((match = regex.exec(val))) {
- numbersArr.push({ number: match[0], index: match.index });
- }
- let numbers=numbersArr[numbersArr.length-1]
- var subStr1 = val.substring(numbers.index);
- var subStr2 = val.substring(0, numbers.index);
- let number = parseInt(subStr1)
- var reg =new RegExp(number,"g")
- 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
+ const numbersArr = []
+ const regex = /\d+/g
+ let match
+ while ((match = regex.exec(val))) {
+ numbersArr.push({ number: match[0], index: match.index });
}
+ let numbers=numbersArr[numbersArr.length-1]
+ var subStr1 = val.substring(numbers.index);
+ const matche = subStr1.match(/(\d+)([^0-9]|$)/);
+ const a= val.lastIndexOf(matche[2])
+ var subStr2 = val.substring(0, numbers.index);
+ var subStr3 = val.substring(a,b+1);
+ let number = parseInt(subStr1)
+ var reg =new RegExp(number,"g")
+ dataList.forEach((item,index) =>{
+ if(index>=result.start ){
+ let newStr = subStr1.replace(reg, number);
+ if(parseInt(newStr)>9){
+ newStr=parseInt(newStr)
+ if(!/\d$/.test(val)){
+ newStr=newStr+subStr3
+ }
+ }
+ setNestedValue(item,result.cell,subStr2+newStr)
+ number=number+1
+ }
- })
+ })
+ }else{
+ const numbersArr = []
+ const regex = /\d+/g
+ let match
+ while ((match = regex.exec(val))) {
+ numbersArr.push({ number: match[0], index: match.index });
+ }
+ let numbers=numbersArr[numbersArr.length-1]
+ var subStr1 = val.substring(numbers.index);
+ var subStr2 = val.substring(0, numbers.index);
+ let number = parseInt(subStr1)
+ var reg =new RegExp(number,"g")
+ 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
+ }
+
+ })
+ }
}
computedMoney(result.cell)
gridOptions.menuConfig.body.options[0][5].disabled=false
+ xGrid.value.updateFooter()
break
}
case 'incrementalChecked' : {
@@ -662,50 +807,110 @@
if (result) {
const dataList = xGrid.value.getTableData().visibleData
const val = getNestedProperty(dataList[result.start], result.cell)+""
- const numbersArr = []
- const regex = /\d+/g
- let match
- while ((match = regex.exec(val))) {
- numbersArr.push({ number: match[0], index: match.index });
- }
- let numbers=numbersArr[numbersArr.length-1]
- var subStr1 = val.substring(numbers.index);
- var subStr2 = val.substring(0, numbers.index);
- let number = parseInt(subStr1)
- var reg =new RegExp(number,"g")
- dataList.forEach((item,index) =>{
- if(index >= result.start && index <= result.end){
- let newStr = subStr1.replace(reg, number);
- if(parseInt(newStr)>9){
- newStr=parseInt(newStr)
+ if(!/\d$/.test(val)){
+ const matches = val.match(/\D/g);
+ const b= val.lastIndexOf(matches[matches.length-1])
+
+ const numbersArr = []
+ const regex = /\d+/g
+ let match
+ while ((match = regex.exec(val))) {
+ numbersArr.push({ number: match[0], index: match.index });
+ }
+ let numbers=numbersArr[numbersArr.length-1]
+ var subStr1 = val.substring(numbers.index);
+ const matche = subStr1.match(/(\d+)([^0-9]|$)/);
+ const a= val.lastIndexOf(matche[2])
+ var subStr2 = val.substring(0, numbers.index);
+ var subStr3 = val.substring(a,b+1);
+ let number = parseInt(subStr1)
+ var reg =new RegExp(number,"g")
+ dataList.forEach((item,index) =>{
+ if(index >= result.start && index <= result.end){
+ let newStr = subStr1.replace(reg, number);
+ if(parseInt(newStr)>9){
+ newStr=parseInt(newStr)
+ newStr=newStr+subStr3
+ }
+ setNestedValue(item,result.cell,subStr2+newStr)
+ number=number+1
}
- setNestedValue(item,result.cell,subStr2+newStr)
- number=number+1
- }
- })
- /*let numbers = parseInt(val.match(/(\d+)$/))
- const string=val.replace(/\d+$/, '')
- dataList.forEach((item, index) => {
- if (index >= result.start && index <= result.end) {
- setNestedValue(item, result.cell, string + numbers)
- numbers = numbers + 1
+ })
+ }else{
+ const numbersArr = []
+ const regex = /\d+/g
+ let match
+ while ((match = regex.exec(val))) {
+ numbersArr.push({ number: match[0], index: match.index });
}
- })*/
+ let numbers=numbersArr[numbersArr.length-1]
+ var subStr1 = val.substring(numbers.index);
+ var subStr2 = val.substring(0, numbers.index);
+ let number = parseInt(subStr1)
+ var reg =new RegExp(number,"g")
+ 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
+ }
+ })
+ }
}
computedMoney(result.cell)
gridOptions.menuConfig.body.options[0][5].disabled = false
+ xGrid.value.updateFooter()
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
+ }
+ case 'uploadPicture':{
+ const row = xGrid.value.getCurrentRecord()
+ if(row===null){
+ ElMessage.warning(t('components.pleaseClickToSelectARowFirst'))
+ return
+ }
+ rowIndex=row
+ alienEditorVisible.value=true
+ break
+ }
+ case 'fileUpload':{
+ const row = xGrid.value.getCurrentRecord()
+ if(row===null){
+ ElMessage.warning(t('components.pleaseClickToSelectARowFirst'))
+ return
+ }
+ rowIndex=row
+ fileUploadVisible.value=true
+ break
+ }
+
}
}
},
cellDblclick (params) {//琛ㄦ牸鍐呭鍙屽嚮鎵撳紑浜у搧鐣岄潰
const { row,column } = params
- if(column.field==='productName' || column.field==='productId'){
+ if (column.field === 'processAttribute'||column.field === 'edgingType') {
+ rowIndex = row
+ processAttributeVisible.value = true
+ } else if (column.field === 'productName' || column.field === 'productId') {
+ // 淇濈暀鍘熶骇鍝侀�夋嫨閫昏緫
productVisible.value = true
- rowIndex=row
+ rowIndex = row
}
},
@@ -738,6 +943,11 @@
gridOptions.loading = true
await initOrder(0)
+ //寮傚舰瀵煎叆
+ if(!company.alienFunction){
+ gridOptions.menuConfig.body.options[0][13].disabled=true
+ }
+
//鍚敤琛ㄦ牸鎷栧姩閫変腑
addListener(xGrid.value,gridOptions)
let productData = route.query.produceList
@@ -760,14 +970,17 @@
newOrderId.value=titleUploadData.value.orderId
if(history.state.orderId!=null){
titleUploadData.value.orderId=''
- titleUploadData.value.id=null
- titleUploadData.value.processReview=null
- titleUploadData.value.orderReview=null
- titleUploadData.value.productionOrder=null
- titleUploadData.value.processingCard=null
- titleUploadData.value.warehousing=null
- titleUploadData.value.delivery=null
- titleUploadData.value.createTime=null
+ titleUploadData.value['id']=null
+ titleUploadData.value['processReview']=null
+ titleUploadData.value['orderReview']=null
+ titleUploadData.value['productionOrder']=null
+ titleUploadData.value['processingCard']=null
+ titleUploadData.value['warehousing']=null
+ titleUploadData.value['delivery']=null
+ titleUploadData.value['createTime']=null
+ titleUploadData.value['verifierId'] = null
+ titleUploadData.value['verifier'] = null
+
const orderDetails = res.data.orderDetails
orderDetails.forEach(item => {
@@ -777,9 +990,11 @@
if(history.state.type=='copy'){
xGrid.value.reloadData(orderDetails)
gridOptions.menuConfig.body.options[0][11].disabled = true
+ titleUploadData.value['version'] = null
}
if(history.state.type=='copyTitle'){
gridOptions.menuConfig.body.options[0][11].disabled = true
+ titleUploadData.value['version'] = null
}
gridOptions.loading = false
@@ -804,6 +1019,11 @@
//gridOptions.menuConfig.body.options[0][8].disabled =false
}
+ //涓嬪崟鍚庡伐鑹哄鏍镐箣鍓嶅彲浠ュ彸閿笂浼燿wg鏂囦欢
+ if(res.data.order.createOrder === 2 && res.data.order.processReview === 0){
+ orderTypeState.value=1
+ }
+
//鎸夐挳瀹℃牳杩囧悗鍙樹负鍙嶅
if(Math.abs(res.data.order.orderReview) === 2){
gridOptions.toolbarConfig.buttons[2].disabled = false
@@ -821,9 +1041,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 ){
@@ -835,6 +1056,12 @@
const orderDetails = res.data.orderDetails
orderDetails.forEach(item => {
item.otherColumns = JSON.parse(item.otherColumns)
+ if(res.data.orderFile!=null){
+ res.data.orderFile.forEach(items=>{
+ if(items.order_number==item.orderNumber)
+ item.fileData=items.file_data
+ })
+ }
})
otherMoney.value =res.data.orderOtherMoneyList
//鍔犺浇鍓〃鏁版嵁
@@ -875,6 +1102,8 @@
if(titleUploadData.value.calculateType===3){
item.grossAmount=multiply(item.price,item.quantity)
+ }else if(titleUploadData.value.calculateType===4){
+ item.grossAmount=parseFloat(divideAuto(item.width * item.height* item.quantity*item.price,1000000,company.decValue))
}else{
item.grossAmount=multiply(item.price,item.computeGrossArea)
}
@@ -930,6 +1159,7 @@
})
}
+
//杩涘叆椤甸潰涓嬫媺妗嗚缃粯璁ゅ��
titleUploadData.value.orderType = titleSelectJson.value.orderType[0].basicName
titleUploadData.value.orderClassify = titleSelectJson.value.orderClassify[0].basicName
@@ -938,7 +1168,7 @@
titleUploadData.value.alType = titleSelectJson.value.alType[0].basicName
titleUploadData.value.calculateType = company.calculateType
const today = new Date
- today.setTime(today.getTime() + (7 * 24 * 60 * 60 * 1000))
+ today.setTime(today.getTime() + (company.deliveryDate * 24 * 60 * 60 * 1000))
titleUploadData.value.deliveryDate = today.getFullYear() +
'-' + ("0" + (today.getMonth() + 1)).slice(-2)
+ '-' + ("0" + today.getDate()).slice(-2)
@@ -996,6 +1226,17 @@
}else {
ElMessage.error(res.msg)
}
+ }).catch(()=>{
+ if(titleUploadData.value.orderId.trim()!==""){
+ ElMessageBox.alert(t('order.msg.updateOrderError'), 'Title', {
+ confirmButtonText: 'OK',
+ callback: (action: Action) => {
+ router.push({path:'/main/order/createOrder',query:{
+ orderId:titleUploadData.value.orderId,
+ random:Math.random()}})
+ },
+ })
+ }
})
}
@@ -1028,17 +1269,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'))
}
})
}
@@ -1081,8 +1322,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',
}
@@ -1128,7 +1368,7 @@
return
}
titleUploadData.value.project = item.project
- titleUploadData.value.salesmanId = item.salesmanId
+ titleUploadData.value.salesmanId = parseInt(item.salesmanId)
titleUploadData.value.salesman = item.salesman
titleUploadData.value.contacts = item.contacts
titleUploadData.value.contactNumber = item.contactNumber
@@ -1149,7 +1389,7 @@
const changeSaleMan = () => {
const changedSaleManId = titleUploadData.value.salesmanId
const SaleMan = titleSelectJson.value.saleMan.filter(item => item.id === changedSaleManId)
- titleUploadData.value.salesman = SaleMan[0].basicName
+ titleUploadData.value.salesman = SaleMan[0]['basicName']
}
const area = (row) => {
@@ -1161,7 +1401,11 @@
// 鑾峰彇淇濈暀闈㈢Н,
const decValue = company.decValue
switch (titleUploadData.value.calculateType){
- case 2:{
+ case 2 :{
+ areaSum = parseFloat(divideAuto(row.width * row.height* row.quantity,1000000,company.decValue))
+ break
+ }
+ case 4:{
areaSum = parseFloat(divideAuto(row.width * row.height* row.quantity,1000000,company.decValue))
break
}
@@ -1224,6 +1468,8 @@
}
if(titleUploadData.value.calculateType===3){
item.grossAmount=multiply(item.price , item.quantity)
+ }else if(titleUploadData.value.calculateType===4){
+ item.grossAmount=parseFloat(divideAuto(item.width * item.height* item.quantity*item.price,1000000,company.decValue))
}else{
item.grossAmount=multiply(item.price * 1 , item.computeGrossArea)
}
@@ -1285,6 +1531,8 @@
}
if(titleUploadData.value.calculateType===3){
row.grossAmount=multiply(row.price ,row.quantity)
+ }else if(titleUploadData.value.calculateType===4){
+ row.grossAmount=parseFloat(divideAuto(row.width * row.height* row.quantity*row.price,1000000,company.decValue))
}else{
row.grossAmount=multiply(row.price , row.computeGrossArea)
}
@@ -1314,6 +1562,7 @@
// }
// }
titleUploadData.value.money=countMoney(xGrid.value.getTableData().fullData).toString()
+ xGrid.value.updateFooter()
}
@@ -1373,6 +1622,15 @@
titleUploadData.value.money=countMoney(xGrid.value.getTableData().fullData).toString()
}
}
+
+//鍏抽棴寮傚舰缂栬緫鐣岄潰
+const refAlienEditor = ref()
+const closeAlienEditorDialog = async (done) => {
+ const flag = await refAlienEditor.value.validate()
+ if(flag){
+ done()
+ }
+}
//鏀瑰彉璁＄畻鏂瑰紡
const changeCalculateType = ()=>{
const fullData = xGrid.value.getTableData().fullData
@@ -1384,10 +1642,24 @@
if( !isNaN(item.computeArea*1) && item.computeArea != null ){
if(titleUploadData.value.calculateType===3){
item.grossAmount=parseFloat(multiply(item.price , item.quantity))
+ }else if(titleUploadData.value.calculateType===4){
+ if(titleUploadData.value?.orderReview!==2){
+ item.grossArea = countArea(item)
+ item.computeGrossArea = item.grossArea
+ item.grossAmount=parseFloat(divideAuto(item.width * item.height* item.quantity*item.price,1000000,company.decValue))
+ }else{
+ item.grossAmount=parseFloat(divideAuto(item.width * item.height* item.quantity*item.price,1000000,company.decValue))
+ }
+
}else{
- item.grossArea = countArea(item)
- item.computeGrossArea = item.grossArea
- item.grossAmount=parseFloat(multiply(item.price , item.computeGrossArea))
+ if(titleUploadData.value?.orderReview!==2){
+ item.grossArea = countArea(item)
+ item.computeGrossArea = item.grossArea
+ item.grossAmount=parseFloat(multiply(item.price , item.computeGrossArea))
+ }else{
+ item.grossAmount=parseFloat(multiply(item.price , item.computeGrossArea))
+ }
+
}
}
})
@@ -1408,7 +1680,7 @@
}
if(evnt.$event.keyCode === 13 ){
const { rowIndex,row,column } = xGrid.value.getSelectedCell() || xGrid.value.getEditRecord()
- let nextRowIndex = xGrid.value.getRowIndex(row) + 1
+ let nextRowIndex = xGrid.value.getVTRowIndex(row) + 1
switch (column.field){
@@ -1424,8 +1696,8 @@
xGrid.value.clearEdit()
let rowNext = row
delete rowNext._X_ROW_KEY
- xGrid.value.insertAt(rowNext, xGrid.value.getTableData.length || -1)
- //xGrid.value.insertAt({}, xGrid.value.getTableData.length || -1)
+ //xGrid.value.insertAt(rowNext, xGrid.value.getTableData.length || -1)
+ xGrid.value.insertAt({}, xGrid.value.getTableData.length || -1)
}
const nextRow = xGrid.value.getTableData().fullData[nextRowIndex]
xGrid.value.setCurrentRow(nextRow)
@@ -1495,6 +1767,43 @@
const createCustomerSuccess = async () => {
await initOrder(1)
createCustomerVisible.value = false
+}
+const orderNumberTransfer = () => {
+ router.push({
+ path:'/main/order/createOrder',
+ query:{
+ orderId:titleUploadData.value.orderId,
+ random:Math.random()}})
+}
+
+//鍥剧墖涓婁紶鍚嶇О
+const getUploadPicture = async (name, fileData,fileJson) => {
+ const row = xGrid.value.getCurrentRecord()
+ row.fileName = name
+ row.fileData = fileData
+ row.fileJson = fileJson
+ row.shape=2
+ ElMessage.success(t('basicData.msg.saveSuccess'))
+ alienEditorVisible.value=false
+
+}
+
+const fileToBase64 = (file) => {
+ return new Promise((resolve, reject) => {
+ const reader = new FileReader();
+ reader.onload = () => resolve(reader.result);
+ reader.onerror = reject;
+ reader.readAsDataURL(file);
+ });
+};
+
+
+
+
+const getEdgingProcess = (value,edgingType) => {
+ rowIndex.processAttribute=JSON.stringify(value)
+ rowIndex.edgingType=edgingType
+ processAttributeVisible.value = false
}
</script>
@@ -1598,6 +1907,7 @@
<el-option :value="1" :label="t('order.areaAmountPerPiece')"/>
<el-option :value="2" :label="t('order.areaAmountAge')"/>
<el-option :value="3" :label="t('order.quantityMount')"/>
+ <el-option :value="4" :label="t('order.allAmount')"/>
</el-select>
</el-col>
<el-col :span="2"><el-text>*{{$t('order.salesman')}}锛�</el-text></el-col>
@@ -1614,7 +1924,7 @@
:value="item.id"/>
</el-select>
</el-col>
- <el-col :span="2"><el-text>{{$t('order.alType')}}</el-text></el-col>
+ <el-col :span="2"><el-text style="white-space: nowrap;">{{$t('order.alType')}}</el-text></el-col>
<el-col :span="2">
<el-select v-model="titleUploadData.alType" clearable placeholder=" " >
<el-option v-for="item in titleSelectJson['alType']"
@@ -1680,6 +1990,7 @@
</template>
+
</vxe-grid>
</div>
<el-dialog v-model="dialogTableVisible" :draggable="true" :title="$t('order.processingNote')" style="width: 60%;height:75% ">
@@ -1693,7 +2004,6 @@
class="product1"
v-model="productVisible"
@closed="closeProductDialog"
- :destroy-on-close="true"
style="width: 80%;height:75%; ">
<template #header >
<div class="my-header">
@@ -1742,6 +2052,19 @@
:otherMoney="otherMoney"
style="width: 100%;height: 100%" />
</el-dialog>
+<!--寮傚舰瀵煎叆-->
+ <el-dialog v-model="alienEditorVisible"
+ :title="$t('')"
+ :close-on-click-modal="false"
+ :close-on-press-escape="false"
+ destroy-on-close
+ style="width: 1114px;height:600px ">
+ <update-alien-editor
+ ref="refAlienEditor"
+ :rowIndex="rowIndex"
+ @getUploadPicture="getUploadPicture"
+ style="width: 100%;height: 100%" />
+ </el-dialog>
<!-- 灏哄瀹℃牳绐楀彛-->
<el-dialog
@@ -1767,6 +2090,38 @@
style="width: 700px;height:445px;text-align: left "
>
<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>
+
+ <el-dialog id="loadDWG"
+ v-model="fileUploadVisible"
+ :close-on-click-modal="false"
+ destroy-on-close width="800px">
+ <upload-picture
+ :rowIndex="rowIndex"
+ :orderId="titleUploadData.orderId"
+ :state="orderTypeState"
+ />
+ </el-dialog>
+
+
+ <el-dialog
+ v-model="processAttributeVisible"
+ :close-on-click-modal="false"
+ :close-on-press-escape="false"
+ destroy-on-close
+ style="width: 1114px;height:650px ">
+ <process-attribute :rowIndex="rowIndex"
+ :edging-type-list="titleSelectJson"
+ @getEdgingProcess="getEdgingProcess"
+ />
</el-dialog>
@@ -1817,4 +2172,9 @@
/*flex-direction : row;
justify-content: space-between;*/
}
+
+ :deep(#loadDWG .el-dialog__body){
+ height: 70vh;
+ overflow-y: auto;
+ }
</style>
\ No newline at end of file
--
Gitblit v1.8.0