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 | 716 ++++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 585 insertions(+), 131 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 5d82427..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
@@ -1,21 +1,27 @@
<script lang="ts" setup>
-import {onMounted, reactive, ref, watch} from "vue"
+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'
import companyInfo from "@/stores/sd/companyInfo"
import SelectProduct from "@/views/sd/product/SelectProduct.vue"
+import CreateProduct from "@/views/sd/product/CreateProduct.vue"
+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)
@@ -23,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()
@@ -35,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({
@@ -75,7 +95,8 @@
orderClassify:[],
packType:[],
customer:[],
- saleMan:[]
+ saleMan:[],
+ edgingType:[]
})
let filterData = ref({})
let rowIndex = ref(null)
@@ -97,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: {
@@ -115,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, }
]
]
}
@@ -143,7 +167,7 @@
trigger: 'dblclick',
mode: 'cell',
showStatus: true,
- showIcon:false
+ showIcon:false,
},//琛ㄥご鍙傛暟
columns:[
{type: 'seq',fixed:"left", title: t('basicData.Number'), width: 80 },
@@ -166,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') }
@@ -293,6 +329,7 @@
break
}
case 'updateMoney': {
+ $grid.clearEdit()
updateMoney()
break
}
@@ -313,6 +350,7 @@
break
}
case 'saveOrder': {
+ xGrid.value.clearEdit()
if ($grid.getTableData().tableData.length === 0){
ElMessage.error( t('order.msg.tableLengthNot'))
return
@@ -362,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)
)
@@ -534,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)
@@ -546,6 +621,7 @@
}
computedMoney(result.cell)
gridOptions.menuConfig.body.options[0][5].disabled=false
+ xGrid.value.updateFooter()
break
}
case 'copyAll' :{
@@ -571,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) =>{
@@ -584,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' :{
@@ -626,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' : {
@@ -660,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
}
},
@@ -734,7 +941,12 @@
//鍒濆鍖栧垽鏂槸鍚︽湁id浼犲叆
onMounted(async ()=>{
gridOptions.loading = true
- await initOrder()
+ await initOrder(0)
+
+ //寮傚舰瀵煎叆
+ if(!company.alienFunction){
+ gridOptions.menuConfig.body.options[0][13].disabled=true
+ }
//鍚敤琛ㄦ牸鎷栧姩閫変腑
addListener(xGrid.value,gridOptions)
@@ -753,17 +965,22 @@
request.post(`/order/getOrderById/${str}`).then((res) => {
if(res.code==200){
titleUploadData.value = res.data.order
+ const customer = titleSelectJson.value.customer.filter(item => item.id === titleUploadData.value.customerId)
+ projects.value = customer[0].projectList
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 => {
@@ -773,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
@@ -800,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
@@ -817,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 ){
@@ -831,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
//鍔犺浇鍓〃鏁版嵁
@@ -871,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)
}
@@ -884,46 +1117,48 @@
//椤甸潰绗竴娆″姞杞芥墽琛�
-const initOrder = async ()=>{
+const initOrder = async (val)=>{
await request.get(`/basicData/orderBasicData`).then((res) => {
if(res.code==200){
titleSelectJson.value=deepClone(res.data)
- //鍏朵粬閲戦
- otherMoney.value = titleSelectJson.value.orderOtherMoney[0]
- //let columns = []
- otherMoney.value.forEach(item => {
- let column = {
- field: `otherColumns.${item.column}`,
- width:100,
- title: item.alias,
- editRender: {
- name: 'input',
+ if(val===0){
+ //鍏朵粬閲戦
+ otherMoney.value = titleSelectJson.value.orderOtherMoney[0]
+ //let columns = []
+ otherMoney.value.forEach(item => {
+ let column = {
+ field: `otherColumns.${item.column}`,
+ width:100,
+ title: item.alias,
+ editRender: {
+ name: 'input',
+ }
}
- }
- //鍒ゆ柇 鍏朵粬鍒楁槸鍚︽槸鏁板瓧
- if(item.column.indexOf('M')>-1){
- gridOptions.editRules[`otherColumns.${item.column}`] = [
- {
- validator ({ cellValue }) {
- 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.range99999Dec3'))
+ //鍒ゆ柇 鍏朵粬鍒楁槸鍚︽槸鏁板瓧
+ if(item.column.indexOf('M')>-1){
+ gridOptions.editRules[`otherColumns.${item.column}`] = [
+ {
+ validator ({ cellValue }) {
+ 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.range99999Dec3'))
+ }
}
}
- }
- ]
- }else{
- gridOptions.editRules[`otherColumns.${item.column}`] = [
- { required: false},
- { min: 0, max: 255, message: t('basicData.msg.max255') }
- ]
- }
+ ]
+ }else{
+ gridOptions.editRules[`otherColumns.${item.column}`] = [
+ { required: false},
+ { min: 0, max: 255, message: t('basicData.msg.max255') }
+ ]
+ }
- //columns.push(column)
- gridOptions.columns.push(column)
+ //columns.push(column)
+ gridOptions.columns.push(column)
- })
+ })
+ }
//杩涘叆椤甸潰涓嬫媺妗嗚缃粯璁ゅ��
titleUploadData.value.orderType = titleSelectJson.value.orderType[0].basicName
@@ -933,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)
@@ -991,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()}})
+ },
+ })
+ }
})
}
@@ -999,7 +1245,9 @@
request.post(`/order/saveOrderTitle`,order).then((res) => {
if(res.code==200){
ElMessage.success(t('basicData.msg.saveSuccess'))
- router.push({path:'/main/order/selectOrder'})
+ router.push({path:'/main/order/createOrder',query:{
+ orderId:titleUploadData.value.orderId,
+ random:Math.random()}})
}else {
ElMessage.error(res.msg)
}
@@ -1021,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'))
}
})
}
@@ -1074,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',
}
@@ -1113,6 +1360,20 @@
reviewOrder(2)
}
+let projects = ref([])
+
+const changeProject = (item) => {
+ if(typeof item === 'string'){
+ titleUploadData.value.project = item
+ return
+ }
+ titleUploadData.value.project = item.project
+ titleUploadData.value.salesmanId = parseInt(item.salesmanId)
+ titleUploadData.value.salesman = item.salesman
+ titleUploadData.value.contacts = item.contacts
+ titleUploadData.value.contactNumber = item.contactNumber
+}
+
const changeCustomer = () => {
const changedCustomerId = titleUploadData.value.customerId
const customer = titleSelectJson.value.customer.filter(item => item.id === changedCustomerId)
@@ -1120,12 +1381,15 @@
titleUploadData.value.project = customer[0].project
titleUploadData.value.salesmanId = customer[0].salesmanId
titleUploadData.value.salesman = customer[0].salesman
+ titleUploadData.value.contacts = customer[0].contacts
+ titleUploadData.value.contactNumber = customer[0].contactNumber
+ projects.value = customer[0].projectList
}
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) => {
@@ -1137,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
}
@@ -1200,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)
}
@@ -1251,7 +1521,6 @@
//琛屽崟鍏冩牸淇敼淇敼瑙﹀彂姝や簨浠�
const editClosedEvent = ({ row, column }) => {
-
//鍒ゆ柇淇敼鐩稿簲鐨勬暟鍊间慨鏀归潰绉笌閲戦
if (['width', 'height', 'quantity', 'price'].includes(column.property)) {
if(titleUploadData.value?.orderReview!==2){
@@ -1262,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)
}
@@ -1291,7 +1562,7 @@
// }
// }
titleUploadData.value.money=countMoney(xGrid.value.getTableData().fullData).toString()
-
+ xGrid.value.updateFooter()
}
@@ -1351,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
@@ -1362,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))
+ }
+
}
}
})
@@ -1374,7 +1668,7 @@
}
//琛ㄦ牸鍥炶溅锛屽湪琛ㄦ牸鏈�鍚庝竴琛屾坊鍔犱竴琛岀┖鏁版嵁
-const handleKeyDown = (evnt) =>{
+const handleKeyDown =async (evnt) =>{
//鍒ゆ柇琛ㄧず鏄惁涓虹瓫閫夌姸鎬�
if(xGrid.value.isFilter()){
return
@@ -1386,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){
@@ -1398,6 +1692,11 @@
break;
case 'quantity':
if(nextRowIndex === length){
+ await editClosedEvent({row,column})
+ 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)
}
const nextRow = xGrid.value.getTableData().fullData[nextRowIndex]
@@ -1449,6 +1748,64 @@
xGrid.value.clearSelected()
}
+//鍒囨崲浜у搧鐣岄潰
+const productFlag = ref(true)
+const changeProduct = (val)=>{
+ productFlag.value = val
+}
+const closeProductDialog = ()=>{
+ productFlag.value = true
+}
+//鏀瑰彉浜у搧椤甸潰鍒囨崲
+const changePage = () => {
+ productFlag.value = true
+}
+// 鍒涘缓瀹㈡埛鏄剧ず
+let createCustomerVisible = ref(false)
+
+//鍒涘缓瀹㈡埛鎴愬姛杩斿洖鏂规硶
+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>
<template>
@@ -1456,7 +1813,18 @@
<div class="order-primary" style="background-color: white">
<el-row>
<el-col :span="2"><el-text>*{{$t('order.project')}}锛�</el-text></el-col>
- <el-col :span="2"><el-input v-model.trim="titleUploadData.project"/></el-col>
+ <el-col :span="2">
+<!-- <el-input v-model.trim="titleUploadData.project"/>-->
+ <el-select v-model.trim="titleUploadData.project"
+ @change="changeProject"
+ clearable placeholder=" " allow-create filterable >
+ <el-option v-for="item in projects"
+ :label="item.project"
+ :value="item"/>
+ </el-select>
+
+
+ </el-col>
<el-col :span="2"><el-text>*{{$t('order.customers')}}锛�</el-text></el-col>
<el-col :span="2">
<el-select v-model="titleUploadData.customerId"
@@ -1469,6 +1837,11 @@
:label="item.id+' '+item.customerName"
:value="item.id"
/>
+ <template #footer>
+ <el-button @click="createCustomerVisible=true" text bg size="small" >
+ {{$t('basicData.create')}}
+ </el-button>
+ </template>
</el-select>
</el-col>
<el-col :span="2"><el-text>*{{$t('order.orderType')}}锛�</el-text></el-col>
@@ -1534,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>
@@ -1550,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']"
@@ -1616,17 +1990,32 @@
</template>
+
</vxe-grid>
</div>
- <el-dialog v-model="dialogTableVisible" :title="$t('order.processingNote')" style="width: 60%;height:75% ">
+ <el-dialog v-model="dialogTableVisible" :draggable="true" :title="$t('order.processingNote')" style="width: 60%;height:75% ">
<el-input
v-model="titleUploadData.processingNote"
type="textarea"
:autosize="{ minRows: 2, maxRows: 20 }"
/>
</el-dialog>
- <el-dialog id="product" v-model="productVisible" style="width: 80%;height:75% ">
- <select-product :rowIndex="rowIndex" @getProductRow="getProductRow" style="width: 100%;height: 100%" />
+ <el-dialog id="product"
+ class="product1"
+ v-model="productVisible"
+ @closed="closeProductDialog"
+ style="width: 80%;height:75%; ">
+ <template #header >
+ <div class="my-header">
+ <el-button @click="changeProduct(true)">{{$t('basicData.search')}}</el-button>
+ <el-button @click="changeProduct(false)">{{$t('basicData.create')}}</el-button>
+ </div>
+ </template>
+ <select-product v-if="productFlag" :rowIndex="rowIndex" @getProductRow="getProductRow" style="width: 100%;height: 100%" />
+ <create-product v-else
+ :productFlag="productFlag"
+ @changePage="changePage"
+ style="text-align: left;background-color: #D5EAFF;"/>
</el-dialog>
<!--璇樊缁撶畻-->
<el-dialog v-model="errorAreaVisible" style="width: 300px;height:150px ">
@@ -1663,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
@@ -1678,7 +2080,50 @@
@getParent="gaveOrderSizeCheck"
:orderId="titleUploadData.orderId"
:OrderDetail="xGrid"/>
+<!-- <create-customer/>-->
</el-dialog>
+ <!-- 瀹㈡埛鍒涘缓绐楀彛-->
+ <el-dialog
+ id="createCustomer"
+ :title="$t('customer.page.createCustomer')"
+ v-model="createCustomerVisible"
+ 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>
+
</div>
</template>
@@ -1692,7 +2137,7 @@
.el-col{
border: #181818 1px solid;
}
- :deep(.el-input__wrapper) {
+ :deep(.order-primary .el-input__wrapper) {
box-shadow: 0 0 0 0 var(--el-input-border-color, var(--el-border-color)) inset;
cursor: default;
border: none !important;
@@ -1718,9 +2163,18 @@
width: 100%;
}
- :deep(#sizeCheck .el-dialog__body){
+ :deep(#sizeCheck .el-dialog__body,#createCustomer .el-dialog__body){
height: 90%;
width: 100%;
}
+ .my-header {
+ display: flex;
+ /*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