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 | 995 ++++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 865 insertions(+), 130 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 2b482a9..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
@@ -2,25 +2,38 @@
import {onMounted, reactive, ref, watch} from "vue"
import {useRouter,useRoute} from "vue-router"
import * as XLXS from "xlsx"
-import {ElMessage} from "element-plus"
+import {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 OrderOtherMoney from "@/components/sd/order/OrderOtherMoney.vue"
+import OrderSizeCheck from "@/components/sd/order/OrderSizeCheck.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} from '@/utils/decimal'
const { t } = useI18n()
let dialogTableVisible = ref(false)
let productVisible = ref(false)
+let errorAreaVisible = ref(false)
+let otherMoneyVisible = ref(false)
+let sizeCheckVisible = ref(false)
+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(['鏅舰','寮傚舰'])
+const shapeList = ref([
+ {label:t('order.universalShape'),value:'1'}, {label:t('order.alien'),value:'2'}
+])
// 瀹氫箟琛ㄥご涓婁紶鏁版嵁
const titleUploadData = ref({
@@ -46,13 +59,14 @@
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({
+ orderOtherMoney:[],
orderType:[],
alType:[],
icon:[],
@@ -64,30 +78,41 @@
let filterData = ref({})
let rowIndex = ref(null)
let rowClickIndex = ref(null)
+let otherMoney = ref(null)
const gridOptions = reactive({
+ loading:false,
+ showHeaderOverflow: false,
+ showFooterOverflow: false,
border: "full",//琛ㄦ牸鍔犺竟妗�
keepSource: true,//淇濇寔婧愭暟鎹�
align: 'center',//鏂囧瓧灞呬腑
stripe:true,//鏂戦┈绾�
rowConfig: {isCurrent: true, isHover: true,height: 30},//榧犳爣绉诲姩鎴栭�夋嫨楂樹寒
- id: 'OrderList',
+ //virtualScroll: true, // 寮�鍚櫄鎷熸粴鍔ㄥ姛鑳�
+ id: 'CreateOrder',
showFooter: true,//鏄剧ず鑴�
printConfig: {},
importConfig: {},
exportConfig: {},
- scrollY:{ enabled: true },//寮�鍚櫄鎷熸粴鍔�
+ scrollY:{ enabled: true,gt:0 },//寮�鍚櫄鎷熸粴鍔�
+ scrollX:{ enabled: true,gt:0 },//寮�鍚櫄鎷熸粴鍔�
showOverflow:true,
menuConfig: {
body: {
options: [
[
{ code: 'addRow', name: t('basicData.add'), prefixIcon: 'vxe-icon-square-plus', visible: true, disabled: false },
- { code: 'deleteRow', name: t('basicData.delete'), prefixIcon: 'vxe-icon-delete', visible: true, disabled: true },
+ { code: 'deleteRow', name: t('basicData.delete'), prefixIcon: 'vxe-icon-delete', visible: true, disabled: false },
{ code: 'copyChecked', name: t('basicData.selectSame'), prefixIcon: 'vxe-icon-copy', visible: true, disabled: false },
{ 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: '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 }
]
]
}
@@ -102,21 +127,31 @@
customConfig: {
storage: true
},
+ mouseConfig:{selected: true},//榧犳爣閫変腑
+ keyboardConfig:{
+ isArrow: true,
+ isDel: true,
+ isEnter: true,
+ isTab: true,
+ isEdit: true,
+ isChecked: true
+ },
editConfig: {
- trigger: 'click',
+ trigger: 'dblclick',
mode: 'cell',
- showStatus: true
+ showStatus: true,
+ showIcon:false
},//琛ㄥご鍙傛暟
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: 'quantity',width:140, title: t('order.quantity'),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},
{field: 'height',width:140, title: t('order.height'),editRender: { name: 'input'},filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
+ {field: 'quantity',width:140, title: t('order.quantity'),editRender: { name: 'input'},filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
{field: 'area',width:150, title: t('order.trueArea'),filters:[{ data: '' }],slots: { filter: 'num1_filter'}, sortable: true,filterMethod:filterChanged},
{field: 'grossArea',width:160, title: t('order.trueGrossArea'),filters:[{ data: '' }],slots: { filter: 'num1_filter'}, sortable: true,filterMethod:filterChanged},
{field: 'computeArea',width:180, title: t('order.computeArea'),editRender: { name: 'input'},filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
@@ -125,11 +160,12 @@
title: t('order.shape'),
editRender: { name: 'input'},
filters:[{ data: '' }],
- slots: { filter: 'num1_filter',edit:'shape_edit' }, sortable: true,filterMethod:filterChanged},
+ 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: 'processingNote',width:200, title: t('order.processingNote'),editRender: { name: 'input'},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}
+ {field: 'remarks',width:140, title: t('basicData.remarks'),editRender: { name: 'input'},filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
+
],
//琛ㄥ崟楠岃瘉
@@ -154,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))
}
}
}
@@ -187,13 +235,13 @@
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)))
}
}
}
- ]
+ ],
},
toolbarConfig: {
buttons: [
@@ -201,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'
@@ -220,9 +269,10 @@
if (columnIndex === 0) {
return t('basicData.total')+':'
}
- // if (props.tableProp.footList.includes(column.field)) {
- // return sumNum(data, column.field)
- // }
+ const List = ["quantity",'grossAmount','grossArea','computeGrossArea']
+ if (List.includes(column.field)) {
+ return footSum(data, column.field)
+ }
return ''
})
]
@@ -263,6 +313,7 @@
ElMessage.error( t('order.msg.tableLengthNot'))
return
}
+ computedMoney(null)
if(!gridOptions.menuConfig.body.options[0][5].disabled){
ElMessage.error(t('order.msg.amountReset'))
return
@@ -295,17 +346,121 @@
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().tableData
+ detail:$grid.getTableData().visibleData,
+ otherMoney:otherMoney.value,
+ orderIdType:company.orderIdType,
+ creator:userStore.user.userName,
+ creatorId:userStore.user.userId
}
- saveOrder(order)
+ 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
+ }
+
+ 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
+ }
+
+ let order ={
+ title:titleUploadData.value,
+ }
+ const errorAreaList = $grid.getTableData().fullData.filter(
+ item=>item.computeArea*1 < errorArea.value*1
+ )
+
+ saveOrderTitle(order)
}
break
}
}
}
- },//鍙抽敭鎸夐挳浜嬩欢
+ },
+ //鍙抽敭鎸夐挳浜嬩欢
menuClick ({ menu, row, column }) {
const $grid = xGrid.value
if ($grid) {
@@ -315,32 +470,81 @@
break
}
case 'addRow': {
- if ($grid.getTableData().tableData.length >=240){
+ if ($grid.getTableData().tableData.length >=maxTableLen.value){
ElMessage.error(t('order.msg.tableLengthMax'))
return
}
- $grid.insert({})
+ 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':{
+ // $grid.remove(rowClickIndex.value)
+ // rowClickIndex.value = null
+ // gridOptions.menuConfig.body.options[0][1].disabled=true
+ // gridOptions.menuConfig.body.options[0][5].disabled=false
- $grid.remove(rowClickIndex.value)
- rowClickIndex.value = null
- gridOptions.menuConfig.body.options[0][1].disabled=true
- gridOptions.menuConfig.body.options[0][5].disabled=false
- 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
+ $grid.remove(item)
}
})
}
+ computedMoney(null)
+ break
+ }
+ case 'copyChecked' :{
+ let result = toolbarButtonClickEvent()
+ if(result){
+ const dataList = xGrid.value.getTableData().visibleData
+ 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
}
@@ -348,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
}
@@ -368,59 +596,145 @@
}
})
}
+ 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' :{
+ errorAreaVisible.value=true
+ break
+ }
+ case 'otherMoney' :{
+ otherMoneyVisible.value=true
+ break
+ }
+ 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
}
}
}
},
cellDblclick (params) {//琛ㄦ牸鍐呭鍙屽嚮鎵撳紑浜у搧鐣岄潰
- const { row } = params
- productVisible.value = true
- rowIndex=row
+ const { row,column } = params
+ if(column.field==='productName' || column.field==='productId'){
+ productVisible.value = true
+ rowIndex=row
+ }
+
},
cellClick({ row }){
- rowClickIndex.value = row
+ //rowClickIndex.value = row
//鍙抽敭鑿滃崟鍒犻櫎鍚敤
- gridOptions.menuConfig.body.options[0][1].disabled=false
+ //gridOptions.menuConfig.body.options[0][1].disabled=false
}
}
//鑾峰彇瀛愰〉闈骇鍝佹柟娉�
-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
}
+
request.post(`/order/getOrderById/${str}`).then((res) => {
if(res.code==200){
titleUploadData.value = res.data.order
@@ -435,21 +749,34 @@
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
//宸ヨ壓瀹℃牳鍚庝繚瀛樻寜閽鐢�
if(res.data.order.processReview === 2){
gridOptions.toolbarConfig.buttons[4].disabled = true
+
}
- //鍙栨秷瀹℃牳鎸夐挳绂佺敤
+ //宸ヨ壓瀹℃牳鍚庯紝璁㈠崟鏈鏍� 鍙栨秷瀹℃牳鎸夐挳绂佺敤鍜屽昂瀵稿鏍�
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
}
//鎸夐挳瀹℃牳杩囧悗鍙樹负鍙嶅
@@ -458,10 +785,12 @@
gridOptions.toolbarConfig.buttons[2].code='reviews'
gridOptions.toolbarConfig.buttons[2].name=t('basicData.cancelReview')
gridOptions.toolbarConfig.buttons[3].disabled = false
+
const button = {'code': 'cancelOrder',
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
@@ -470,54 +799,179 @@
}
if(res.data.order.productionOrder !==0 ){
gridOptions.toolbarConfig.buttons[2].disabled = true
-
}
-
- //鍔犺浇鍓〃鏁版嵁
- xGrid.value.reloadData(res.data.orderDetails)
+ 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
+ //鍔犺浇鍓〃鏁版嵁
+ xGrid.value.reloadData(orderDetails)
+ gridOptions.loading = false
}else{
ElMessage.error(res.msg)
}
})
})
+//浣滃簾璁㈠崟
const cancelOrder = () => {
request.post(`/order/cancelOrder/${titleUploadData.value.orderId}`).then((res) =>{
if (res.code== 200){
ElMessage.success(t('order.msg.updateOrderState'))
- router.push({path:'/main/order/createOrder',query:{orderId:titleUploadData.value.orderId,random:Math.random()}})
+ router.push({
+ path:'/main/order/createOrder',
+ query:{
+ orderId:titleUploadData.value.orderId,
+ random:Math.random()}})
}else{
ElMessage.error(res.msg)
}
})
}
+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) => {
+const initOrder = async ()=>{
- if(res.code==200){
- titleSelectJson.value=deepClone(res.data)
- //杩涘叆椤甸潰涓嬫媺妗嗚缃粯璁ゅ��
- 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=1
- 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)
- }
-})
+ 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(\.\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') }
+ ]
+ }
+
+ //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+'|'
+ }
+ }
+ 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'})
@@ -527,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){
@@ -551,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){
@@ -569,11 +1024,17 @@
})
}
+const gaveOrderSizeCheck = () => {
+ reviewOrder(2)
+}
+
const changeCustomer = () => {
const changedCustomerId = titleUploadData.value.customerId
const customer = titleSelectJson.value.customer.filter(item => item.id === changedCustomerId)
titleUploadData.value.customerName = customer[0].customerName
- //titleSelectJson.value.customer
+ titleUploadData.value.project = customer[0].project
+ titleUploadData.value.salesmanId = customer[0].salesmanId
+ titleUploadData.value.salesman = customer[0].salesman
}
const changeSaleMan = () => {
@@ -583,11 +1044,24 @@
}
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))
- return parseFloat((area * row.quantity).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 2:{
+ areaSum = parseFloat((row.width * row.height * row.quantity/1000000).toFixed(decValue))
+ break
+ }
+ default :{
+ areaSum = parseFloat((area * row.quantity).toFixed(decValue))
+ break
+ }
+ }
+ return areaSum
}
//璁＄畻閲戦挶
const countMoney = (list) => {
@@ -608,7 +1082,8 @@
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>240){
+
+ if(jsonData.length>maxTableLen.value){
ElMessage.error(`${t('order.msg.importMaxCheckFailFirst')}
${jsonData.length}
${t('order.msg.importMaxCheckFailMid')}
@@ -616,13 +1091,34 @@
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)
- item.computeGrossArea = parseFloat((item.computeArea*item.quantity).toFixed(2))
- item.grossAmount=parseFloat((item.price * item.computeGrossArea).toFixed(2))
+ const decValue = company.decValue
+
+ if(titleUploadData.value.calculateType===1){
+ 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=multiply(item.price , item.quantity)
+ }else{
+ item.grossAmount=multiply(item.price * 1 , item.computeGrossArea)
+ }
+
})
//璧嬪�艰〃澶存暟鎹�
titleUploadData.value.money=countMoney(jsonData).toString()
@@ -636,24 +1132,205 @@
downLoadFile('/importTemplate.xlsx','importTemplate.xlsx')
}
-//琛屽崟鍏冩牸淇敼淇敼瑙﹀彂姝や簨浠�
-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))
- }else if(column.property === 'computeArea'){
- row.computeGrossArea=parseFloat((row.computeArea*row.quantity).toFixed(2))
- row.grossAmount=parseFloat((row.price * row.computeGrossArea).toFixed(2))
- }
+function setNestedProperty(obj, path, value) {
+ const keys = path.split('.');
+ const lastKey = keys.pop();
+ let cursor = obj;
- titleUploadData.value.money=countMoney(xGrid.value.getTableData().fullData).toString()
+ keys.forEach(key => {
+ cursor = cursor[key] !== undefined ? cursor[key] : (cursor[key] = {});
+ });
+
+ cursor[lastKey] = value;
}
+//瀛楃涓茶浆object
+
+function getNestedProperty(obj, path) {
+ return path.split('.').reduce(function(o, p) {
+ if(o && o.hasOwnProperty(p)) {
+ return o[p];
+ }
+ }, 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)) {
+ 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'){
+ if(titleUploadData.value.calculateType!==3){
+ if(titleUploadData.value?.orderReview!==2){
+ row.computeGrossArea = row.computeArea * row.quantity
+ }
+ row.grossAmount=multiply(row.price , row.computeGrossArea)
+ }
+
+ }
+ // else if(column.property.indexOf('otherColumns.M')>-1){
+ // let quantity = 0
+ // xGrid.value.getTableData().fullData.forEach(item => {
+ // let orderQuantity = isNaN(item.quantity) ? 0 : item.quantity
+ // let value = isNaN((getNestedProperty(item,column.property)*1)) ? 0 : (getNestedProperty(item,column.property)*1)
+ // quantity += orderQuantity*value
+ // })
+ // if(!isNaN(quantity)){
+ // otherMoney.value.forEach(item => {
+ // if(item.column===column.property.split('.')[1]){
+ // item.quantity = quantity
+ // }
+ // })
+ // }
+ // }
+ titleUploadData.value.money=countMoney(xGrid.value.getTableData().fullData).toString()
+
+
+}
+
+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.toString())) {
+ ElMessage.warning(t('basicData.msg.range99999Dec2'))
+ return
+ }
+ const fullData = xGrid.value.getTableData().fullData
+ if (!fullData.length){
+ ElMessage.warning(t('basicData.msg.noProductDataInTheTable'))
+ }
+ fullData.forEach((item,index) => {
+ 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))
+ }
+ })
+ titleUploadData.value.money=countMoney(xGrid.value.getTableData().fullData).toString()
+ errorAreaVisible.value= false
+}
+
+
+
+
+//鍏抽棴鍏朵粬閲戦鐣岄潰
+const refOtherMoney = ref()
+const closeOtherMoneyDialog = async (done) => {
+ const flag = await refOtherMoney.value.validate()
+ if(flag){
+ done()
+ titleUploadData.value.money=countMoney(xGrid.value.getTableData().fullData).toString()
+ }
+}
+//鏀瑰彉璁＄畻鏂瑰紡
+const changeCalculateType = ()=>{
+ const fullData = xGrid.value.getTableData().fullData
+ if(fullData.length===0){
+ return
+ }
+ fullData.forEach((item) => {
+
+ if( !isNaN(item.computeArea*1) && item.computeArea != null ){
+ 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()
+
+}
+
+//琛ㄦ牸鍥炶溅锛屽湪琛ㄦ牸鏈�鍚庝竴琛屾坊鍔犱竴琛岀┖鏁版嵁
+const handleKeyDown = (evnt) =>{
+ //鍒ゆ柇琛ㄧず鏄惁涓虹瓫閫夌姸鎬�
+ if(xGrid.value.isFilter()){
+ return
+ }
+ const length = xGrid.value.getTableData().fullData.length
+ if(length>maxTableLen.value){
+ ElMessage.warning(t('basicData.msg.tableDataExceedsMaximumLimit'))
+ return
+ }
+ if(evnt.$event.keyCode === 13 ){
+ 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>
@@ -701,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"
@@ -710,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"
@@ -728,14 +1405,18 @@
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>
<el-col :span="2"><el-input v-model="titleUploadData.batch"/></el-col>
<el-col :span="2"><el-text>{{$t('order.calculateType')}}锛�</el-text></el-col>
<el-col :span="2">
- <el-select v-model="titleUploadData.calculateType" clearable placeholder=" " >
- <el-option :value="1" label="闈㈢Н閲戦锛堝崟鐗囷級"/>
+ <el-select @change="changeCalculateType" v-model="titleUploadData.calculateType" placeholder=" " >
+ <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>
@@ -765,7 +1446,7 @@
<el-row>
<el-col :span="2"><el-text>{{$t('order.money')}}锛�</el-text></el-col>
<el-col :span="2"><el-text >{{titleUploadData.money}}</el-text></el-col>
- <el-col :span="2"><el-text>{{$t('order.customers')}}锛�</el-text></el-col>
+ <el-col :span="2"><el-text>{{$t('order.contractId')}}锛�</el-text></el-col>
<el-col :span="2"><el-input v-model="titleUploadData.contractId"/></el-col>
<el-col :span="2"><el-text>{{$t('order.customerBatch')}}:</el-text></el-col>
<el-col :span="2"><el-input v-model="titleUploadData.customerBatch"/></el-col>
@@ -786,18 +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>
@@ -806,10 +1490,11 @@
<vxe-button @click="importTemplate">{{$t('order.template')}}</vxe-button>
<vxe-button @click="importEvent">{{$t('order.import')}}</vxe-button>
</template>
+ <template #default_shape="{ row }">
+ <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>
- <vxe-option v-for="item in shapeList" :key="item" :value="item" :label="item" />
- </vxe-select>
+ <vxe-select v-model="row.shape" transfer :options="shapeList" placeholder=" "/>
</template>
@@ -822,10 +1507,50 @@
:autosize="{ minRows: 2, maxRows: 20 }"
/>
</el-dialog>
- <el-dialog v-model="productVisible" style="width: 80%;height:75% ">
+ <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>
+<!--璇樊缁撶畻-->
+ <el-dialog v-model="errorAreaVisible" style="width: 300px;height:150px ">
+ <el-row>
+ <el-col :span="10">
+ <el-input
+ v-model="errorArea"
+ :placeholder="$t('order.errorValue')"
+ />
+ </el-col>
+ <el-col :span="6">
+ <el-button @click="errorAreaComputed">{{$t('basicData.confirmButtonText')}}</el-button>
+ </el-col>
+ </el-row>
+ </el-dialog>
+ <el-dialog v-model="otherMoneyVisible"
+ :title="$t('basicData.otherAmounts')"
+ :close-on-click-modal="false"
+ :close-on-press-escape="false"
+ :before-close="closeOtherMoneyDialog"
+ style="width: 614px;height:445px ">
+ <order-other-money
+ ref="refOtherMoney"
+ :otherMoney="otherMoney"
+ style="width: 100%;height: 100%" />
+ </el-dialog>
+<!-- 灏哄瀹℃牳绐楀彛-->
+ <el-dialog
+ id="sizeCheck"
+ v-model="sizeCheckVisible"
+ :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>
</div>
</template>
@@ -858,6 +1583,16 @@
-moz-user-select: none;
-ms-user-select: none;
user-select: none;
+ transform: translateZ(0);
+ }
+ :deep(#product .el-dialog__body){
+ height: 90%;
+ width: 100%;
+ }
+
+ :deep(#sizeCheck .el-dialog__body){
+ height: 90%;
+ width: 100%;
}
</style>
\ No newline at end of file
--
Gitblit v1.8.0