From 5df5dba2a321098fd0fc7e18b71549f5c2312049 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期二, 27 八月 2024 17:19:13 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue | 773 +++++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 591 insertions(+), 182 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 5e2b1cb..8a27736 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
@@ -6,6 +6,7 @@
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 OrderOtherMoney from "@/components/sd/order/OrderOtherMoney.vue"
import OrderSizeCheck from "@/components/sd/order/OrderSizeCheck.vue"
@@ -14,6 +15,7 @@
import downLoadFile from "@/hook/downLoadFile"
import footSum from "@/hook/footSum"
import {useI18n} from "vue-i18n"
+import {multiply} from '@/utils/decimal'
const { t } = useI18n()
let dialogTableVisible = ref(false)
@@ -21,15 +23,16 @@
let errorAreaVisible = ref(false)
let otherMoneyVisible = ref(false)
let sizeCheckVisible = ref(false)
-const maxTableLen =ref(150)
+const maxTableLen =ref(500)
let errorArea = ref(0.4)
const userStore = useUserInfoStore()
+const company = companyInfo()
const router = useRouter()
const route = useRoute()
const xGrid = ref()
let cellArea = ref()
const shapeList = ref([
- {label:'鏅舰',value:'1'}, {label:'寮傚舰',value:'2'}
+ {label:t('order.universalShape'),value:'1'}, {label:t('order.alien'),value:'2'}
])
// 瀹氫箟琛ㄥご涓婁紶鏁版嵁
@@ -56,10 +59,10 @@
deliveryAddress:'',
otherMoney:'',
otherMoneyRemarks:'',
- processingNote:'',
+ processingNote:t('order.processingNote')+':',
createOrder:0,
- creatorId:userStore.user.userName,
- creator:userStore.user.userId,
+ creatorId:userStore.user.userId,
+ creator:userStore.user.userName,
})
//瀹氫箟鎺ユ敹鍔犺浇琛ㄥご涓嬫媺鏁版嵁
const titleSelectJson = ref({
@@ -87,13 +90,13 @@
stripe:true,//鏂戦┈绾�
rowConfig: {isCurrent: true, isHover: true,height: 30},//榧犳爣绉诲姩鎴栭�夋嫨楂樹寒
//virtualScroll: true, // 寮�鍚櫄鎷熸粴鍔ㄥ姛鑳�
- id: 'OrderList',
+ id: 'CreateOrder',
showFooter: true,//鏄剧ず鑴�
printConfig: {},
importConfig: {},
exportConfig: {},
- scrollY:{ enabled: true,gt:13 },//寮�鍚櫄鎷熸粴鍔�
- scrollX:{ enabled: true,gt:7 },//寮�鍚櫄鎷熸粴鍔�
+ scrollY:{ enabled: true,gt:0 },//寮�鍚櫄鎷熸粴鍔�
+ scrollX:{ enabled: true,gt:0 },//寮�鍚櫄鎷熸粴鍔�
showOverflow:true,
menuConfig: {
body: {
@@ -105,9 +108,11 @@
{ code: 'copyAll', name: t('basicData.sameAfterwards'), prefixIcon: 'vxe-icon-feedback', visible: true, disabled: false },
{ code: 'clearChecked', name: t('basicData.clearSelection'), prefixIcon: 'vxe-icon-indicator', visible: true, disabled: false },
{ code: 'computedMoney', name: t('basicData.calculateAmount'), prefixIcon: 'vxe-icon-chart-bar-x', visible: true, disabled: true },
- { code: 'errorArea', name: '璇樊缁撶畻闈㈢Н', prefixIcon: 'vxe-icon-chart-bar-x', visible: true, disabled: false },
- { code: 'otherMoney', name: '鍏朵粬閲戦', prefixIcon: 'vxe-icon-chart-bar-x', visible: true, disabled: false },
- { code: 'sizeCheck', name: '灏哄瀹℃牳', prefixIcon: 'vxe-icon-eye-fill', visible: true, disabled: true }
+ { code: 'incrementalAll', name: t('basicData.incrementalAll'), prefixIcon: 'vxe-icon-feedback', visible: true, disabled: false },
+ { 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 }
]
]
}
@@ -139,9 +144,9 @@
},//琛ㄥご鍙傛暟
columns:[
{type: 'seq',fixed:"left", title: t('basicData.Number'), width: 80 },
- // {field: 'buildingNumber',width:120, title: '妤煎彿',editRender: { name: 'input'},filters:[{ data: '' }],slots: { filter: 'num1_filter'}, sortable: true,filterMethod:filterChanged},
{field: 'productId',width:140, title: t('order.productId'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
{field: 'productName',width:300, title: t('order.product'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
+ {field: 'buildingNumber',width:120, title: t('order.buildingNumber'),editRender: { name: 'input'},filters:[{ data: '' }],slots: { filter: 'num1_filter'}, sortable: true,filterMethod:filterChanged},
{field: 'price',width:140, title: t('order.price'),editRender: { name: 'input'},filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
{field: 'grossAmount',width:160, title: t('order.grossAmount'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
{field: 'width',width:120, title: t('order.width') ,editRender: { name: 'input'},filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
@@ -185,32 +190,44 @@
}
}
],
- computeArea: [
+ quantity: [
{
validator ({ cellValue }) {
- const regex = /^(0(\.\d{1,2})?|([1-9]\d{0,4})(\.\d{1,2})?|99999(\.9{1,2})?)$/
- if (!regex.test(cellValue)) {
- return new Error(t('basicData.msg.range99999Dec2'))
+ const regex = /^[1-9]\d*$/
+ if ( !regex.test(cellValue) ) {
+ return new Error(t('basicData.msg.greater0') )
}
}
}
],
- quantity: [
- //type: 'number', min: 0, message: '璇疯緭鍏ュぇ浜庣瓑浜�0鐨勬暟鍊�' ,
+ computeArea: [
{
validator ({ cellValue }) {
- const regex = /^[1-9]\d*$/
+ const decValue = company.decValue*1
+ const regex =new RegExp(`^(0(\\.\\d{1,${decValue}})?|([1-9]\\d{0,4})(\\.\\d{1,${decValue}})?|99999(\\.9{1,${decValue}})?)$`)
if (!regex.test(cellValue)) {
- return new Error(t('basicData.msg.greater0'))
+ return new Error(t(`basicData.msg.range99999Dec${decValue}`))
}
- }}
+ }
+ }
+ ],
+ bendRadius:[
+ {
+ validator ({ cellValue }) {
+ const regex = /^(0(\.\d{1,2})?|([1-9]\d{0,5})(\.\d{1,2})?|999999(\.9{1,2})?)$/
+ if (cellValue && !regex.test(cellValue)) {
+ return new Error(t('basicData.msg.range999999Dec2'))
+ }
+ }
+ }
],
width:[
{
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,2})?|([1-9]\d{0,4})(\.\d{1,2})?|99999(\.9{1,2})?)$/
+ const regex = company.widHeiLength.regexp
if (!regex.test(cellValue)) {
- return new Error(t('basicData.msg.range99999Dec2'))
+ return new Error(t(company.widHeiLength.msg))
}
}
}
@@ -218,9 +235,9 @@
height:[
{
validator ({ cellValue }) {
- const regex = /^(0|[1-9][0-9]{0,4}([.][0-9]{1,2})?)$/
+ const regex = company.widHeiLength.regexp
if ( !regex.test(cellValue)) {
- return new Error(t('basicData.msg.range99999Dec2'))
+ return new Error(t(t(company.widHeiLength.msg)))
}
}
}
@@ -232,7 +249,8 @@
{'code': 'Craft', 'name': t('order.technology'),status: 'primary',disabled: true},
{'code': 'review', 'name': t('basicData.review'),status: 'primary',disabled: true},
{'code': 'updateMoney', 'name': t('order.amountReset'),status: 'primary',disabled: true},
- {'code': 'saveOrder', 'name': t('basicData.save'),status: 'primary',icon: 'vxe-icon-save',disabled: false}
+ {'code': 'saveOrder', 'name': t('basicData.save'),status: 'primary',icon: 'vxe-icon-save',disabled: false},
+
],
slots: {
tools: 'toolbar_buttons'
@@ -295,6 +313,106 @@
ElMessage.error( t('order.msg.tableLengthNot'))
return
}
+ computedMoney(null)
+ if(!gridOptions.menuConfig.body.options[0][5].disabled){
+ ElMessage.error(t('order.msg.amountReset'))
+ return
+ }
+
+ const project = titleUploadData.value.project
+ if(project === null || project === undefined || project === ''){
+ ElMessage.error(t('order.msg.projectCheck'))
+ return
+ }
+ const customer = titleUploadData.value.customerId
+ if(customer === null || customer === undefined || customer === ''){
+ ElMessage.error(t('order.msg.customerCheck'))
+ return
+ }
+ const salasMan = titleUploadData.value.salesman
+ if(salasMan === null || salasMan === undefined || salasMan === ''){
+ ElMessage.error(t('order.msg.salasManCheck'))
+ return
+ }
+ const calculateType = titleUploadData.value.calculateType
+ if(calculateType === null || calculateType === undefined || calculateType === ''){
+ ElMessage.error(t('order.msg.calculateTypeCheck'))
+ return
+ }
+
+ if ($grid) {
+ const errMap = await $grid.validate(true)
+ if (errMap) {
+ ElMessage.error(t('basicData.msg.checkoutLose'))
+ return
+ }
+
+ if($grid.getCheckedFilters().length!==0){
+ ElMessage.error(t('order.msg.pleaseCancelTheFilteringFirst'))
+ return
+ }
+ //xGrid.value.clearSort()
+ let order ={
+ title:titleUploadData.value,
+ detail:$grid.getTableData().visibleData,
+ otherMoney:otherMoney.value,
+ orderIdType:company.orderIdType,
+ creator:userStore.user.userName,
+ creatorId:userStore.user.userId
+ }
+ 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
+ )
+ if(grossAreaList.length>0){
+ alert(t('order.msg.grossAreaIsNot0'))
+ }
+ if(errorAreaList.length){
+ ElMessageBox.confirm(`${t('order.msg.calculationAreaPrompt1')}
+ ${errorAreaList.length}
+ ${t('order.msg.calculationAreaPrompt2')}
+ ${errorArea.value}
+ ${t('order.msg.calculationAreaPrompt3')}
+ ${errorArea.value}
+ ${t('order.msg.calculationAreaPrompt4')}`,
+ t('order.msg.warning'),
+ {
+ confirmButtonText: t('basicData.confirmButtonText'),
+ cancelButtonText: t('basicData.cancelButtonText'),
+ distinguishCancelAndClose: true,
+ type: 'warning',
+ }
+ ).then(()=>{
+ errorAreaComputed()
+ selectOrder(order)
+ }).catch((action)=>{
+ if(action === 'cancel'){
+ //閲嶇疆缁撶畻闈㈢Н
+ const dataList = xGrid.value.getTableData().fullData
+ dataList.forEach((item,index) =>{
+ item.computeArea = item.area
+ item.computeGrossArea = item.grossArea
+ })
+ computedMoney(null)
+ selectOrder(order)
+ }
+
+ })
+
+ }else {
+ selectOrder(order)
+ }
+
+
+
+
+
+ }
+ break
+ }
+ case 'saveOrderTitle': {
if(!gridOptions.menuConfig.body.options[0][5].disabled){
ElMessage.error(t('order.msg.amountReset'))
return
@@ -330,39 +448,12 @@
let order ={
title:titleUploadData.value,
- detail:$grid.getTableData().fullData,
- otherMoney:otherMoney.value
}
const errorAreaList = $grid.getTableData().fullData.filter(
item=>item.computeArea*1 < errorArea.value*1
)
- if(errorAreaList.length){
- ElMessageBox.confirm(
- `瀛樺湪
- ${errorAreaList.length}
- 鏉＄粨绠楀崟鐗囬潰绉皬浜�
- ${errorArea.value}鏄惁鎸夌収${errorArea.value}璁＄畻`,
- 'Warning',
- {
- confirmButtonText: '纭畾',
- cancelButtonText: '鍙栨秷',
- type: 'warning',
- }
- ).then(()=>{
- errorAreaComputed()
- saveOrder(order)
- }).catch(()=>{
- saveOrder(order)
- })
- }else {
- saveOrder(order)
- }
-
-
-
-
-
+ saveOrderTitle(order)
}
break
}
@@ -383,7 +474,23 @@
ElMessage.error(t('order.msg.tableLengthMax'))
return
}
- $grid.insertAt({}, $grid.getTableData.length || -1)
+ if ($grid.getCheckedFilters().length!==0){
+ ElMessage.error(t('order.msg.pleaseCancelTheFilteringFirst'))
+ return
+ }
+ let result = toolbarButtonClickEvent()
+ let lengths = 0
+ if (result!=null){
+ lengths=result.start
+ }
+ /*console.log($grid.getTableData().tableData)
+ console.log($grid.getTableData().fullData)*/
+ //$grid.insertAt({}, $grid.getTableData.length || -1)
+ if($grid.getTableData().fullData.length>lengths+1){
+ $grid.insertAt({}, lengths+1)
+ }else{
+ $grid.insertAt({}, -1)
+ }
break
}
case 'deleteRow':{
@@ -402,19 +509,42 @@
}
})
}
+ computedMoney(null)
break
}
case 'copyChecked' :{
let result = toolbarButtonClickEvent()
if(result){
const dataList = xGrid.value.getTableData().visibleData
- const val = dataList[result.start][result.cell]
- dataList.forEach((item,index) =>{
- if(index>=result.start && index<=result.end){
- item[result.cell] = val
- }
- })
+ if(result.cell=='productName'){
+ const val = dataList[result.start][result.cell]
+ const val1 = dataList[result.start]["productId"]
+ dataList.forEach((item,index) =>{
+ if(index>=result.start && index<=result.end){
+ item[result.cell] = val
+ item["productId"] = val1
+ }
+ })
+ }else if(result.cell=='productId'){
+ const val = dataList[result.start][result.cell]
+ const val1 = dataList[result.start]["productName"]
+ dataList.forEach((item,index) =>{
+ if(index>=result.start && index<=result.end){
+ item[result.cell] = val
+ item["productName"] = val1
+ }
+ })
+ }else{
+
+ const val = getNestedProperty(dataList[result.start],result.cell)
+ dataList.forEach((item,index) =>{
+ if(index>=result.start && index<=result.end){
+ setNestedValue(item,result.cell,val)
+ }
+ })
+ }
}
+ computedMoney(result.cell)
gridOptions.menuConfig.body.options[0][5].disabled=false
break
}
@@ -422,13 +552,37 @@
let result = toolbarButtonClickEvent()
if(result){
const dataList = xGrid.value.getTableData().visibleData
- const val = dataList[result.start][result.cell]
- dataList.forEach((item,index) =>{
- if(index>=result.start ){
- item[result.cell] = val
- }
- })
+ if(result.cell=='productName'){
+
+ const val = dataList[result.start][result.cell]
+ const val1 = dataList[result.start]["productId"]
+ dataList.forEach((item,index) =>{
+ if(index>=result.start ){
+ item[result.cell] = val
+ item["productId"] = val1
+ }
+ })
+ }else if(result.cell=='productId'){
+ const val = dataList[result.start][result.cell]
+ const val1 = dataList[result.start]["productName"]
+ dataList.forEach((item,index) =>{
+ if(index>=result.start ){
+ item[result.cell] = val
+ item["productName"] = val1
+ }
+ })
+ }else{
+ const val = getNestedProperty(dataList[result.start],result.cell)
+ dataList.forEach((item,index) =>{
+ if(index>=result.start ){
+ setNestedValue(item,result.cell,val)
+ }
+
+ })
+ }
+
}
+ computedMoney(result.cell)
gridOptions.menuConfig.body.options[0][5].disabled=false
break
}
@@ -442,21 +596,13 @@
}
})
}
+ computedMoney(result.cell)
gridOptions.menuConfig.body.options[0][5].disabled=false
break
}
case 'computedMoney' :{
- const dataList = xGrid.value.getTableData().fullData
- dataList.forEach((item,index) =>{
- item.area = area(item)
- item.grossArea = countArea(item)
- item.computeArea = item.area
- item.computeGrossArea = item.grossArea
- item.grossAmount=parseFloat((item.price * item.computeGrossArea).toFixed(2))
- })
- titleUploadData.value.money=countMoney(xGrid.value.getTableData().fullData).toString()
+ computedMoney(null)
- gridOptions.menuConfig.body.options[0][5].disabled=true
break
}
case 'errorArea' :{
@@ -469,6 +615,75 @@
}
case 'sizeCheck' :{
sizeCheckVisible.value=true
+ break
+ }
+ case 'incrementalAll' :{
+ let result = toolbarButtonClickEvent()
+ 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 ){
+ let newStr = subStr1.replace(reg, number);
+ setNestedValue(item,result.cell,subStr2+newStr)
+ number=number+1
+ }
+
+ })
+
+ }
+ computedMoney(result.cell)
+ gridOptions.menuConfig.body.options[0][5].disabled=false
+ break
+ }
+ case 'incrementalChecked' : {
+ let result = toolbarButtonClickEvent()
+ 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);
+ 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
+ }
+ })*/
+
+ }
+ computedMoney(result.cell)
+ gridOptions.menuConfig.body.options[0][5].disabled = false
break
}
}
@@ -489,28 +704,37 @@
}
}
//鑾峰彇瀛愰〉闈骇鍝佹柟娉�
-const getProductRow = (row) => {
+const getProductRow = (row,type) => {
if(row.state!=1){
ElMessage.warning(t('order.msg.productStateCheck'))
return
}
-
- rowIndex.productName = row.productName
+ if(type==1){
+ rowIndex.productName = row.productName
+ }else{
+ rowIndex.productName = row.productAbbreviation
+ }
rowIndex.productId = row.id
productVisible.value = false
}
+
//鍒濆鍖栧垽鏂槸鍚︽湁id浼犲叆
-onMounted(()=>{
+onMounted(async ()=>{
+ gridOptions.loading = true
+ await initOrder()
+
//鍚敤琛ㄦ牸鎷栧姩閫変腑
addListener(xGrid.value,gridOptions)
const str = route.query.orderId || history.state.orderId
if (typeof str === 'undefined' || str === null || str === '' || str === '\n' || str === '\r'){
+
+ gridOptions.loading = false
return
}
- gridOptions.loading = true
+
request.post(`/order/getOrderById/${str}`).then((res) => {
if(res.code==200){
titleUploadData.value = res.data.order
@@ -525,12 +749,22 @@
titleUploadData.value.delivery=null
titleUploadData.value.createTime=null
+ const orderDetails = res.data.orderDetails
+ orderDetails.forEach(item => {
+ item.otherColumns = JSON.parse(item.otherColumns)
+ })
+
if(history.state.type=='copy'){
- xGrid.value.reloadData(res.data.orderDetails)
+ xGrid.value.reloadData(orderDetails)
}
+
gridOptions.loading = false
return
}
+ const buttonTitle = {'code': 'saveOrderTitle',
+ status: 'primary',
+ 'name': t('order.saveHeader')}
+ gridOptions.toolbarConfig.buttons.push(buttonTitle)
//鍙栨秷宸ヨ壓鎸夐挳绂佺敤
gridOptions.toolbarConfig.buttons[1].disabled = false
//宸ヨ壓瀹℃牳鍚庝繚瀛樻寜閽鐢�
@@ -542,7 +776,7 @@
//宸ヨ壓瀹℃牳鍚庯紝璁㈠崟鏈鏍� 鍙栨秷瀹℃牳鎸夐挳绂佺敤鍜屽昂瀵稿鏍�
if(res.data.order.processReview === 2 && res.data.order.orderReview === 0){
gridOptions.toolbarConfig.buttons[2].disabled = false
- gridOptions.menuConfig.body.options[0][8].disabled =false
+ //gridOptions.menuConfig.body.options[0][8].disabled =false
}
//鎸夐挳瀹℃牳杩囧悗鍙樹负鍙嶅
@@ -556,6 +790,7 @@
status: 'primary',
'name': (res.data.order.orderReview>0?t('basicData.cancel'):t('basicData.restore'))}
gridOptions.toolbarConfig.buttons.push(button)
+
if(res.data.order.orderReview===-2){
gridOptions.toolbarConfig.buttons[2].disabled = true
gridOptions.toolbarConfig.buttons[3].disabled = true
@@ -565,11 +800,14 @@
if(res.data.order.productionOrder !==0 ){
gridOptions.toolbarConfig.buttons[2].disabled = true
}
+ if(res.data.order.warehousing !==0 ){
+ gridOptions.toolbarConfig.buttons[2].disabled = true
+ }
const orderDetails = res.data.orderDetails
orderDetails.forEach(item => {
item.otherColumns = JSON.parse(item.otherColumns)
})
- otherMoney.value =res.data.orderOtherMoneyList.filter(item => item.column.indexOf('M')>-1)
+ otherMoney.value =res.data.orderOtherMoneyList
//鍔犺浇鍓〃鏁版嵁
xGrid.value.reloadData(orderDetails)
gridOptions.loading = false
@@ -594,68 +832,146 @@
}
})
}
+const computedMoney = (cell) => {
+ const dataList = xGrid.value.getTableData().fullData
+ dataList.forEach((item,index) =>{
+ if(['width', 'height', 'quantity'].includes(cell)){
+ item.area = area(item)
+ item.grossArea = countArea(item)
+ item.computeArea = item.area
+ item.computeGrossArea = item.grossArea
+ }else if(cell==='computeArea'){
+ item.computeGrossArea = item.computeArea * item.quantity
+ }
+
+ if(titleUploadData.value.calculateType===3){
+ item.grossAmount=multiply(item.price,item.quantity)
+ }else{
+ item.grossAmount=multiply(item.price,item.computeGrossArea)
+ }
+
+ })
+ titleUploadData.value.money=countMoney(xGrid.value.getTableData().fullData).toString()
+
+ gridOptions.menuConfig.body.options[0][5].disabled=true
+
+}
//椤甸潰绗竴娆″姞杞芥墽琛�
-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',
+const initOrder = async ()=>{
+
+ 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(item.column.indexOf('M')>-1){
- gridOptions.editRules[`otherColumns.${item.column}`] = [
- {
- validator ({ cellValue }) {
- const regex = /^(0|[1-9][0-9]{0,4}([.][0-9]{1,2})?)$/
- if (cellValue && !regex.test(cellValue)) {
- return new Error(t('basicData.msg.range99999Dec2'))
+ //鍒ゆ柇 鍏朵粬鍒楁槸鍚︽槸鏁板瓧
+ if(item.column.indexOf('M')>-1){
+ 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})?)$/
+ if (cellValue && !regex.test(cellValue)) {
+ return new Error(t('basicData.msg.range99999Dec2'))
+ }
}
}
- }
- ]
- }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)
+
+ })
+
+ //杩涘叆椤甸潰涓嬫媺妗嗚缃粯璁ゅ��
+ titleUploadData.value.orderType = titleSelectJson.value.orderType[0].basicName
+ titleUploadData.value.orderClassify = titleSelectJson.value.orderClassify[0].basicName
+ titleUploadData.value.icon = titleSelectJson.value.icon[0].basicName
+ titleUploadData.value.packType = titleSelectJson.value.packType[0].basicName
+ 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))
+ titleUploadData.value.deliveryDate = today.getFullYear() +
+ '-' + ("0" + (today.getMonth() + 1)).slice(-2)
+ + '-' + ("0" + today.getDate()).slice(-2)
+ }else{
+ ElMessage.warning(res.msg)
+ }
+ })
+}
+
+//鏌ヨ閲嶅璁㈠崟鏂规硶
+const selectOrder = (order) => {
+ request.post(`/order/selectOrder`,order).then((res) => {
+ if(res.code==200){
+ let orderId=''
+ if(res.data.data.length>0){
+ for (let i=0;i<res.data.data.length;i++){
+ orderId+=res.data.data[i].orderId+'|'
+ }
}
-
- //columns.push(column)
- gridOptions.columns.push(column)
-
- })
-
- //杩涘叆椤甸潰涓嬫媺妗嗚缃粯璁ゅ��
- titleUploadData.value.orderType = titleSelectJson.value.orderType[0].basicName
- titleUploadData.value.orderClassify = titleSelectJson.value.orderClassify[0].basicName
- titleUploadData.value.icon = titleSelectJson.value.icon[0].basicName
- titleUploadData.value.packType = titleSelectJson.value.packType[0].basicName
- titleUploadData.value.alType = titleSelectJson.value.alType[0].basicName
- titleUploadData.value.calculateType = 2
- const today = new Date
- today.setTime(today.getTime() + (15 * 24 * 60 * 60 * 1000))
- titleUploadData.value.deliveryDate = today.getFullYear() +
- '-' + ("0" + (today.getMonth() + 1)).slice(-2)
- + '-' + ("0" + today.getDate()).slice(-2)
- }else{
- ElMessage.warning(res.msg)
- }
-})
+ if(orderId!=''){
+ ElMessageBox.confirm(`${t('order.msg.calculationAreaPrompt1')},
+ ${orderId+t('order.msg.calculationAreaPrompt5')}`,
+ t('order.msg.warning'),
+ {
+ confirmButtonText: t('basicData.confirmButtonText'),
+ cancelButtonText: t('basicData.cancelButtonText'),
+ type: 'warning',
+ }
+ ).then(()=>{
+ saveOrder(order)
+ }).catch(()=>{
+ })
+ }else{
+ saveOrder(order)
+ }
+ }
+ }).catch((err)=>{
+ ElMessage.error(t('basicData.msg.ServerConnectionError'))
+ router.push("/login")
+ })
+}
//淇濆瓨璁㈠崟鏂规硶
const saveOrder = (order) => {
request.post(`/order/saveOrder`,order).then((res) => {
+ if(res.code==200){
+ ElMessage.success(t('basicData.msg.saveSuccess'))
+ if(titleUploadData.value.orderId.trim()===""){
+ router.push({path:'/main/order/selectOrder'})
+ }else{
+ router.push({path:'/main/order/createOrder',query:{
+ orderId:titleUploadData.value.orderId,
+ random:Math.random()}})
+ }
+ }else {
+ ElMessage.error(res.msg)
+ }
+ })
+}
+
+//淇濆瓨璁㈠崟琛ㄥご鏂规硶
+const saveOrderTitle = (order) => {
+ request.post(`/order/saveOrderTitle`,order).then((res) => {
if(res.code==200){
ElMessage.success(t('basicData.msg.saveSuccess'))
router.push({path:'/main/order/selectOrder'})
@@ -665,11 +981,12 @@
})
}
-//鏇存柊閲戦
+//鏇存柊閲戦閲嶇疆
const updateMoney = () => {
const updateData = {
order: titleUploadData.value,
- detail: xGrid.value.getTableData().fullData
+ detail: xGrid.value.getTableData().fullData,
+ otherMoney:otherMoney.value
}
request.post(`/order/updateOrderMoney`,updateData).then(res => {
if (res.code == 200){
@@ -689,7 +1006,7 @@
// 瀹℃牳璁㈠崟
const reviewOrder = (state) => {
- request.post(`/order/reviewOrderById/${titleUploadData.value.orderId}/${state}`).then(res =>{
+ request.post(`/order/reviewOrderById/${titleUploadData.value.orderId}/${state}/${userStore.user.userId}/${userStore.user.userName}`).then(res =>{
if(res.code==200){
gridOptions.toolbarConfig.buttons[2].disabled = true
if(state==2){
@@ -708,9 +1025,6 @@
}
const gaveOrderSizeCheck = () => {
-
-
-
reviewOrder(2)
}
@@ -721,8 +1035,6 @@
titleUploadData.value.project = customer[0].project
titleUploadData.value.salesmanId = customer[0].salesmanId
titleUploadData.value.salesman = customer[0].salesman
-
- //titleSelectJson.value.customer
}
const changeSaleMan = () => {
@@ -732,19 +1044,20 @@
}
const area = (row) => {
-
- return parseFloat((row.width * row.height/1000000).toFixed(2))
+ return parseFloat((row.width * row.height/1000000).toFixed(company.decValue))
}
const countArea = (row) => {
- const area = parseFloat((row.width * row.height/1000000).toFixed(2))
+ const area = parseFloat((row.width * row.height/1000000).toFixed(company.decValue))
let areaSum = 0
+ // 鑾峰彇淇濈暀闈㈢Н,
+ const decValue = company.decValue
switch (titleUploadData.value.calculateType){
- case 1:{
- areaSum = parseFloat((area * row.quantity).toFixed(2))
+ case 2:{
+ areaSum = parseFloat((row.width * row.height * row.quantity/1000000).toFixed(decValue))
break
}
- case 2:{
- areaSum = parseFloat((row.width * row.height * row.quantity/1000000).toFixed(2))
+ default :{
+ areaSum = parseFloat((area * row.quantity).toFixed(decValue))
break
}
}
@@ -756,9 +1069,6 @@
list.forEach((item)=>{
countMoney += parseFloat(item.grossAmount)
})
- // otherMoney.value.forEach(item => {
- // countMoney+=item.quantity*item.price
- // })
return parseFloat((countMoney).toFixed(2))
}
//瀵煎叆鍔熻兘
@@ -772,6 +1082,7 @@
const data = event.target ? event.target.result : ''
const workbook = XLXS.read(data, { type: 'binary' })
let jsonData = XLXS.utils.sheet_to_json(workbook.Sheets.Sheet1).slice(1)
+
if(jsonData.length>maxTableLen.value){
ElMessage.error(`${t('order.msg.importMaxCheckFailFirst')}
${jsonData.length}
@@ -780,20 +1091,32 @@
return
}
jsonData.forEach((item,index) => {
+ for(let key in item){
+ if(key.indexOf('.')!==-1){
+ const value = item[key];
+ delete item[key]; // 鍒犻櫎鍘熸湁鐨勫睘鎬�
+ setNestedProperty(item, key, value);
+ }
+ }
+
if(item.computeArea === undefined){
item.computeArea = area(item)
+ }else{
+ item.computeGrossArea = item.computeArea * item.quantity
}
item.area = area(item)
item.grossArea = countArea(item)
+ const decValue = company.decValue
+
if(titleUploadData.value.calculateType===1){
- item.computeGrossArea = parseFloat((item.computeArea*item.quantity).toFixed(2))
+ item.computeGrossArea = parseFloat((item.computeArea*item.quantity).toFixed(decValue))
}else if(titleUploadData.value.calculateType===2){
item.computeGrossArea = item.grossArea
}
if(titleUploadData.value.calculateType===3){
- item.grossAmount=parseFloat((item.price * item.quantity).toFixed(2))
+ item.grossAmount=multiply(item.price , item.quantity)
}else{
- item.grossAmount=parseFloat((item.price * item.computeGrossArea).toFixed(2))
+ item.grossAmount=multiply(item.price * 1 , item.computeGrossArea)
}
})
@@ -809,6 +1132,19 @@
downLoadFile('/importTemplate.xlsx','importTemplate.xlsx')
}
+function setNestedProperty(obj, path, value) {
+ const keys = path.split('.');
+ const lastKey = keys.pop();
+ let cursor = obj;
+
+ keys.forEach(key => {
+ cursor = cursor[key] !== undefined ? cursor[key] : (cursor[key] = {});
+ });
+
+ cursor[lastKey] = value;
+}
+
+
//瀛楃涓茶浆object
function getNestedProperty(obj, path) {
@@ -819,19 +1155,38 @@
}, obj);
}
+function setNestedValue(obj, path, value) {
+ const keys = path.split('.');
+ const lastKey = keys.pop();
+ const lastObj = keys.reduce((obj, key) => obj[key], obj);
+ lastObj[lastKey] = value;
+}
+
+
//琛屽崟鍏冩牸淇敼淇敼瑙﹀彂姝や簨浠�
const editClosedEvent = ({ row, column }) => {
+
+
//鍒ゆ柇淇敼鐩稿簲鐨勬暟鍊间慨鏀归潰绉笌閲戦
if (['width', 'height', 'quantity', 'price'].includes(column.property)) {
- row.area = area(row)
- row.grossArea = countArea(row)
- row.computeArea = row.area
- row.computeGrossArea = row.grossArea
- row.grossAmount=parseFloat((row.price * row.computeGrossArea).toFixed(2))
+ if(titleUploadData.value?.orderReview!==2){
+ row.area = area(row)
+ row.grossArea = countArea(row)
+ row.computeArea = row.area
+ row.computeGrossArea = row.grossArea
+ }
+ if(titleUploadData.value.calculateType===3){
+ row.grossAmount=multiply(row.price ,row.quantity)
+ }else{
+ row.grossAmount=multiply(row.price , row.computeGrossArea)
+ }
+
}else if(column.property === 'computeArea'){
- row.computeGrossArea=parseFloat((row.computeArea*row.quantity).toFixed(2))
if(titleUploadData.value.calculateType!==3){
- row.grossAmount=parseFloat((row.price * row.computeGrossArea).toFixed(2))
+ if(titleUploadData.value?.orderReview!==2){
+ row.computeGrossArea = row.computeArea * row.quantity
+ }
+ row.grossAmount=multiply(row.price , row.computeGrossArea)
}
}
@@ -855,19 +1210,41 @@
}
+const cellStyle = ({ row, column }) => {
+ if(company.longSide!=null){
+ if (column.field === 'width') {
+ if (row.width > parseInt(company.longSide)) {
+ return {
+ backgroundColor: '#ec6969'
+ }
+ }
+ }
+ if (column.field === 'height') {
+ if (row.height > parseInt(company.longSide)) {
+ return {
+ backgroundColor: '#ec6969'
+ }
+ }
+ }
+ }
+
+};
+
//璇樊闈㈢Н璁＄畻鏂规硶
const errorAreaComputed = () => {
const regex = /^(0(\.\d{1,2})?|([1-9]\d{0,4})(\.\d{1,2})?|99999(\.9{1,2})?)$/
- if (!regex.test(errorArea.value)) {
+ if (!regex.test(errorArea.value.toString())) {
ElMessage.warning(t('basicData.msg.range99999Dec2'))
return
}
const fullData = xGrid.value.getTableData().fullData
if (!fullData.length){
- ElMessage.warning("琛ㄦ牸涓棤浜у搧鏁版嵁")
+ ElMessage.warning(t('basicData.msg.noProductDataInTheTable'))
}
fullData.forEach((item,index) => {
- if( !isNaN(item.computeArea*1) && item.computeArea != null && item.computeArea*1 < errorArea.value){
+ let trueArea = item.width*item.height/1000000
+ if( !isNaN(item.computeArea*1) && item.computeArea != null && trueArea < errorArea.value){
+
item.computeArea = errorArea.value
item.computeGrossArea = parseFloat((item.computeArea*item.quantity).toFixed(2))
item.grossAmount=parseFloat((item.price * item.computeGrossArea).toFixed(2))
@@ -876,6 +1253,7 @@
titleUploadData.value.money=countMoney(xGrid.value.getTableData().fullData).toString()
errorAreaVisible.value= false
}
+
@@ -897,14 +1275,13 @@
fullData.forEach((item) => {
if( !isNaN(item.computeArea*1) && item.computeArea != null ){
- item.grossArea = countArea(item)
- item.computeGrossArea = item.grossArea
if(titleUploadData.value.calculateType===3){
item.grossAmount=parseFloat((item.price * item.quantity).toFixed(2))
}else{
+ item.grossArea = countArea(item)
+ item.computeGrossArea = item.grossArea
item.grossAmount=parseFloat((item.price * item.computeGrossArea).toFixed(2))
}
-
}
})
titleUploadData.value.money=countMoney(fullData).toString()
@@ -919,16 +1296,40 @@
}
const length = xGrid.value.getTableData().fullData.length
if(length>maxTableLen.value){
- ElMessage.warning('琛ㄦ牸鏁版嵁瓒呰繃鏈�澶ч檺鍒�')
+ ElMessage.warning(t('basicData.msg.tableDataExceedsMaximumLimit'))
return
}
if(evnt.$event.keyCode === 13 ){
- const { rowIndex } = xGrid.value.getSelectedCell() || xGrid.value.getEditRecord()
+ const { rowIndex,row,column } = xGrid.value.getSelectedCell() || xGrid.value.getEditRecord()
+ let nextRowIndex = xGrid.value.getRowIndex(row) + 1;
+ if (nextRowIndex < xGrid.value.getTableData().fullData.length) {
+ xGrid.value.setCurrentRow(xGrid.value.getTableData().fullData[nextRowIndex]);
+ }
if(rowIndex === length-1){
xGrid.value.insertAt({}, xGrid.value.getTableData.length || -1)
}
}
+ if(evnt.$event.keyCode === 38 ){
+ const { rowIndex,row,column } = xGrid.value.getSelectedCell() || xGrid.value.getEditRecord()
+ let nextRowIndex = xGrid.value.getRowIndex(row) - 1;
+ if (nextRowIndex < xGrid.value.getTableData().fullData.length && nextRowIndex>=0) {
+ xGrid.value.setCurrentRow(xGrid.value.getTableData().fullData[nextRowIndex]);
+ }
+
+ }
+ if(evnt.$event.keyCode === 40 ){
+ const { rowIndex,row,column } = xGrid.value.getSelectedCell() || xGrid.value.getEditRecord()
+ let nextRowIndex = xGrid.value.getRowIndex(row) + 1;
+ if (nextRowIndex < xGrid.value.getTableData().fullData.length) {
+ xGrid.value.setCurrentRow(xGrid.value.getTableData().fullData[nextRowIndex]);
+ }
+
+ }
+}
+
+const inputFocus = ()=>{
+ xGrid.value.clearSelected()
}
</script>
@@ -977,7 +1378,7 @@
</el-col>
<el-col :span="2"><el-text>{{$t('order.icon')}}锛�</el-text></el-col>
<el-col :span="2">
- <el-select v-model="titleUploadData.icon" clearable placeholder=" " >
+ <el-select v-model="titleUploadData.icon" clearable placeholder=" " allow-create filterable default-first-option>
<el-option v-for="item in titleSelectJson['icon']"
:key="item.id"
:label="item.basicName"
@@ -986,7 +1387,7 @@
</el-col>
<el-col :span="2"><el-text>{{$t('order.packType')}}锛�</el-text></el-col>
<el-col :span="2">
- <el-select v-model="titleUploadData.packType" clearable placeholder=" " >
+ <el-select v-model="titleUploadData.packType" clearable placeholder=" " allow-create filterable >
<el-option v-for="item in titleSelectJson['packType']"
:key="item.id"
:label="item.basicName"
@@ -1004,6 +1405,8 @@
v-model="titleUploadData.deliveryDate"
type="date"
placeholder=""
+ format="YYYY/MM/DD"
+ value-format="YYYY-MM-DD"
/>
</el-col>
<el-col :span="2"><el-text>{{$t('order.batch')}}锛�</el-text></el-col>
@@ -1011,8 +1414,9 @@
<el-col :span="2"><el-text>{{$t('order.calculateType')}}锛�</el-text></el-col>
<el-col :span="2">
<el-select @change="changeCalculateType" v-model="titleUploadData.calculateType" placeholder=" " >
- <el-option :value="1" label="闈㈢Н閲戦锛堝崟鐗囷級"/>
- <el-option :value="2" label="闈㈢Н閲戦锛堟�婚潰绉級"/>
+ <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-select>
</el-col>
<el-col :span="2"><el-text>*{{$t('order.salesman')}}锛�</el-text></el-col>
@@ -1063,19 +1467,21 @@
</div>
<div class="order-detail">
<vxe-grid
- max-height="100%"
+ height="100%"
class="mytable-scrollbar"
ref="xGrid"
v-bind="gridOptions"
v-on="gridEvents"
@keydown="handleKeyDown"
@edit-closed="editClosedEvent"
+ :cell-style="cellStyle"
>
<template #num1_filter="{ column, $panel }">
<div>
<div v-for="(option, index) in column.filters" :key="index">
<input type="text"
v-model="option.data"
+ @focus="inputFocus"
@input="changeFilterEvent($event, option, $panel)"/>
</div>
</div>
@@ -1085,7 +1491,7 @@
<vxe-button @click="importEvent">{{$t('order.import')}}</vxe-button>
</template>
<template #default_shape="{ row }">
- <span>{{ row.shape=='1'?'鏅舰':row.shape=='2'?'寮傚舰':null }}</span>
+ <span>{{ row.shape=='1'? t('order.universalShape'):row.shape=='2'? t('order.alien'):null }}</span>
</template>
<template #shape_edit="{ row }">
<vxe-select v-model="row.shape" transfer :options="shapeList" placeholder=" "/>
@@ -1110,16 +1516,16 @@
<el-col :span="10">
<el-input
v-model="errorArea"
- :placeholder="'璇樊鍊�'"
+ :placeholder="$t('order.errorValue')"
/>
</el-col>
<el-col :span="6">
- <el-button @click="errorAreaComputed">纭</el-button>
+ <el-button @click="errorAreaComputed">{{$t('basicData.confirmButtonText')}}</el-button>
</el-col>
</el-row>
</el-dialog>
<el-dialog v-model="otherMoneyVisible"
- :title="'鍏朵粬閲戦'"
+ :title="$t('basicData.otherAmounts')"
:close-on-click-modal="false"
:close-on-press-escape="false"
:before-close="closeOtherMoneyDialog"
@@ -1134,13 +1540,15 @@
<el-dialog
id="sizeCheck"
v-model="sizeCheckVisible"
- :title="'灏哄鏍￠獙'"
+ :draggable="true"
+ :title="$t('basicData.sizeReview')"
:close-on-click-modal="false"
:close-on-press-escape="false"
style="width: 614px;height:445px "
>
<order-size-check
@getParent="gaveOrderSizeCheck"
+ :orderId="titleUploadData.orderId"
:OrderDetail="xGrid"/>
</el-dialog>
@@ -1175,6 +1583,7 @@
-moz-user-select: none;
-ms-user-select: none;
user-select: none;
+ transform: translateZ(0);
}
:deep(#product .el-dialog__body){
height: 90%;
--
Gitblit v1.8.0