Merge branch 'master' of http://bore.pub:10439/r/ERP_override

chenlu

2024-08-27 5df5dba2a321098fd0fc7e18b71549f5c2312049

 north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue

@@ -15,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)
@@ -22,7 +23,7 @@
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()
@@ -58,7 +59,7 @@
  deliveryAddress:'',
  otherMoney:'',
  otherMoneyRemarks:'',
  processingNote:'',
  processingNote:t('order.processingNote')+':',
  createOrder:0,
  creatorId:userStore.user.userId,
  creator:userStore.user.userName,
@@ -89,7 +90,7 @@
  stripe:true,//斑马纹
  rowConfig: {isCurrent: true, isHover: true,height: 30},//鼠标移动或选择高亮
  //virtualScroll: true, // 开启虚拟滚动功能
  id: 'OrderList',
  id: 'CreateOrder',
  showFooter: true,//显示脚
  printConfig: {},
  importConfig: {},
@@ -107,6 +108,8 @@
          { 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 }
@@ -187,32 +190,33 @@
        }
      }
    ],
    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,4})(\.\d{1,2})?|99999(\.9{1,2})?)$/
          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.range99999Dec2'))
            return new Error(t('basicData.msg.range999999Dec2'))
          }
        }
      }
@@ -309,7 +313,7 @@
            ElMessage.error( t('order.msg.tableLengthNot'))
            return
          }
          computedMoney()
          computedMoney(null)
          if(!gridOptions.menuConfig.body.options[0][5].disabled){
            ElMessage.error(t('order.msg.amountReset'))
            return
@@ -342,19 +346,29 @@
              ElMessage.error(t('basicData.msg.checkoutLose'))
              return
            }
            if($grid.getTableData().tableData.length!=$grid.getTableData().fullData.length){
              ElMessage.error("请先取消筛选")

            if($grid.getCheckedFilters().length!==0){
              ElMessage.error(t('order.msg.pleaseCancelTheFilteringFirst'))
              return
            }
            //xGrid.value.clearSort()
            let order ={
              title:titleUploadData.value,
              detail:$grid.getTableData().tableData,
              otherMoney:otherMoney.value
              detail:$grid.getTableData().visibleData,
              otherMoney:otherMoney.value,
              orderIdType:company.orderIdType,
              creator:userStore.user.userName,
              creatorId:userStore.user.userId
            }
            const errorAreaList = $grid.getTableData().fullData.filter(
                item=>item.computeArea*1 < errorArea.value*1
            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}
@@ -375,6 +389,13 @@
                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)
                }

@@ -453,8 +474,8 @@
            ElMessage.error(t('order.msg.tableLengthMax'))
            return
          }
          if ($grid.getTableData().tableData.length != $grid.getTableData().fullData.length){
            ElMessage.error("请先取消筛选")
          if ($grid.getCheckedFilters().length!==0){
            ElMessage.error(t('order.msg.pleaseCancelTheFilteringFirst'))
            return
          }
          let result = toolbarButtonClickEvent()
@@ -488,6 +509,7 @@
              }
            })
          }
          computedMoney(null)
          break
        }
        case 'copyChecked' :{
@@ -522,6 +544,7 @@
              })
            }
          }
          computedMoney(result.cell)
          gridOptions.menuConfig.body.options[0][5].disabled=false
          break
        }
@@ -554,10 +577,12 @@
                if(index>=result.start ){
                  setNestedValue(item,result.cell,val)
                }

              })
            }

          }
          computedMoney(result.cell)
          gridOptions.menuConfig.body.options[0][5].disabled=false
          break
        }
@@ -571,11 +596,12 @@
              }
            })
          }
          computedMoney(result.cell)
          gridOptions.menuConfig.body.options[0][5].disabled=false
          break
        }
        case 'computedMoney' :{
          computedMoney()
          computedMoney(null)

          break
        }
@@ -589,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
        }
      }
@@ -627,14 +722,19 @@


//初始化判断是否有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
@@ -661,6 +761,10 @@
        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
      //工艺审核后保存按钮禁用
@@ -686,10 +790,7 @@
          status: 'primary',
          'name': (res.data.order.orderReview>0?t('basicData.cancel'):t('basicData.restore'))}
        gridOptions.toolbarConfig.buttons.push(button)
        const buttonTitle = {'code': 'saveOrderTitle',
          status: 'primary',
          'name': t('order.saveHeader')}
        gridOptions.toolbarConfig.buttons.push(buttonTitle)

        if(res.data.order.orderReview===-2){
          gridOptions.toolbarConfig.buttons[2].disabled = true
          gridOptions.toolbarConfig.buttons[3].disabled = true
@@ -699,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
@@ -728,14 +832,24 @@
    }
  })
}
const computedMoney = () => {
const computedMoney = (cell) => {
  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))
    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()

@@ -744,71 +858,79 @@
}



//页面第一次加载执行
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)
        //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() + (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)
  }
})
      //进入页面下拉框设置默认值
      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){
      if(res.data.data>0){
        ElMessageBox.confirm(`${t('order.msg.calculationAreaPrompt1')}
                  ${t('order.msg.calculationAreaPrompt5')}`,
      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'),
@@ -834,7 +956,13 @@
  request.post(`/order/saveOrder`,order).then((res) => {
    if(res.code==200){
      ElMessage.success(t('basicData.msg.saveSuccess'))
      router.push({path:'/main/order/selectOrder'})
      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)
    }
@@ -907,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 = () => {
@@ -918,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
    }
  }
@@ -942,9 +1069,6 @@
  list.forEach((item)=>{
    countMoney += parseFloat(item.grossAmount)
  })
  // otherMoney.value.forEach(item => {
  //   countMoney+=item.quantity*item.price
  // })
  return parseFloat((countMoney).toFixed(2))
}
//导入功能
@@ -975,21 +1099,24 @@
        }
      }


      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)
      }

    })
@@ -1035,19 +1162,31 @@
  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)
     }

   }
@@ -1071,10 +1210,30 @@

}

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
  }
@@ -1083,7 +1242,9 @@
    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))
@@ -1092,6 +1253,7 @@
  titleUploadData.value.money=countMoney(xGrid.value.getTableData().fullData).toString()
  errorAreaVisible.value= false
}




@@ -1113,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()
@@ -1140,11 +1301,28 @@
  }
  if(evnt.$event.keyCode === 13 ){
    const { rowIndex,row,column } = xGrid.value.getSelectedCell() || xGrid.value.getEditRecord()
    // if(xGrid.value.getEditRecord()===null){
    //   xGrid.value.setEditCell(row,column)
    // }
    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]);
    }

  }
@@ -1200,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=" " allow-create  filterable>
          <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"
@@ -1238,6 +1416,7 @@
          <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>
@@ -1295,6 +1474,7 @@
          v-on="gridEvents"
          @keydown="handleKeyDown"
          @edit-closed="editClosedEvent"
          :cell-style="cellStyle"
      >
        <template #num1_filter="{ column, $panel }">
          <div>
@@ -1360,6 +1540,7 @@
    <el-dialog
        id="sizeCheck"
        v-model="sizeCheckVisible"
        :draggable="true"
       :title="$t('basicData.sizeReview')"
       :close-on-click-modal="false"
       :close-on-press-escape="false"