添加尺寸审核重新进入保留之前输入

guoyuji

2024-06-21 ea952b446a6fca053c27178bccf1c2af6f25f30b

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

@@ -2,15 +2,18 @@
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"
const { t } = useI18n()

@@ -18,13 +21,18 @@
let productVisible = ref(false)
let errorAreaVisible = ref(false)
let otherMoneyVisible = ref(false)
let errorArea = ref(null)
let sizeCheckVisible = ref(false)
const maxTableLen =ref(150)
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({
@@ -52,8 +60,8 @@
  otherMoneyRemarks:'',
  processingNote:'',
  createOrder:0,
  creatorId:userStore.user.userName,
  creator:userStore.user.userId,
  creatorId:userStore.user.userId,
  creator:userStore.user.userName,
})
//定义接收加载表头下拉数据
const titleSelectJson = ref({
@@ -72,30 +80,36 @@
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},//鼠标移动或选择高亮
  //virtualScroll: true, // 开启虚拟滚动功能
  id: 'OrderList',
  showFooter: true,//显示脚
  printConfig: {},
  importConfig: {},
  exportConfig: {},
  scrollY:{ enabled: true },//开启虚拟滚动
  scrollY:{ enabled: true,gt:13 },//开启虚拟滚动
  scrollX:{ enabled: true,gt:7 },//开启虚拟滚动
  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: '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: '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: true }
        ]
      ]
    }
@@ -110,22 +124,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,
    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.floorNumber'),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},
@@ -134,7 +157,7 @@
      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},
@@ -184,12 +207,23 @@
          }
        }}
    ],
    width:[
    bendRadius:[
      {
        validator ({ cellValue }) {
          const regex = /^(0(\.\d{1,2})?|([1-9]\d{0,4})(\.\d{1,2})?|99999(\.9{1,2})?)$/
          if (!regex.test(cellValue)) {
          if (cellValue && !regex.test(cellValue)) {
            return new Error(t('basicData.msg.range99999Dec2'))
          }
        }
      }
    ],
    width:[
      {
        validator ({ cellValue }) {
          //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(company.widHeiLength.msg))
          }
        }
      }
@@ -197,13 +231,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: [
@@ -211,7 +245,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'
@@ -230,9 +265,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 ''
      })
    ]
@@ -305,12 +341,98 @@
              ElMessage.error(t('basicData.msg.checkoutLose'))
              return
            }
            if($grid.getTableData().tableData.length!=$grid.getTableData().fullData.length){
              ElMessage.error("请先取消筛选")
              return
            }
            let order ={
              title:titleUploadData.value,
              detail:$grid.getTableData().tableData,
              otherMoney:otherMoney.value
            }
            saveOrder(order)
            const errorAreaList = $grid.getTableData().fullData.filter(
                item=>item.computeArea*1 < errorArea.value*1
            )
            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'),
                type: 'warning',
              }
              ).then(()=>{
                errorAreaComputed()
                selectOrder(order)
              }).catch(()=>{
                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
        }
@@ -327,31 +449,78 @@
          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.getTableData().tableData.length != $grid.getTableData().fullData.length){
            ElMessage.error("请先取消筛选")
            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)
              }
            })
          }
          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)
                }
              })
            }
          }
          gridOptions.menuConfig.body.options[0][5].disabled=false
          break
@@ -360,12 +529,34 @@
          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)
                }
              })
            }

          }
          gridOptions.menuConfig.body.options[0][5].disabled=false
          break
@@ -405,18 +596,25 @@
          otherMoneyVisible.value=true
          break
        }
        case 'sizeCheck' :{
          sizeCheckVisible.value=true
          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
  }
}
//获取子页面产品方法
@@ -441,6 +639,7 @@
  if (typeof str === 'undefined' || str === null || str === '' || str === '\n' || str === '\r'){
    return
  }
  gridOptions.loading = true
  request.post(`/order/getOrderById/${str}`).then((res) => {
    if(res.code==200){
      titleUploadData.value = res.data.order
@@ -455,9 +654,16 @@
        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
      }
      //取消工艺按钮禁用
@@ -466,10 +672,12 @@
      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
      }

      //按钮审核过后变为反审
@@ -478,10 +686,15 @@
        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)
        const buttonTitle = {'code': 'saveOrderTitle',
          status: 'primary',
          'name': (res.data.order.orderReview>0?'保存表头':'保存表头')}
        gridOptions.toolbarConfig.buttons.push(buttonTitle)
        if(res.data.order.orderReview===-2){
          gridOptions.toolbarConfig.buttons[2].disabled = true
          gridOptions.toolbarConfig.buttons[3].disabled = true
@@ -495,20 +708,26 @@
      orderDetails.forEach(item => {
        item.otherColumns = JSON.parse(item.otherColumns)
      })

      //加载副表数据
      otherMoney.value =res.data.orderOtherMoneyList.filter(item => item.column.indexOf('M')>-1)
          //加载副表数据
      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)
    }
@@ -524,9 +743,36 @@
    otherMoney.value = titleSelectJson.value.orderOtherMoney[0]
    //let columns = []
    otherMoney.value.forEach(item => {
      let column = {field: `otherColumns.${item.column}`,width:50,  title: item.alias,editRender: { name: 'input'}}
      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'))
              }
            }
          }
        ]
      }else{
        gridOptions.editRules[`otherColumns.${item.column}`] = [
          { required: false},
          { min: 0, max: 255, message: t('basicData.msg.max255') }
        ]
      }

      //columns.push(column)
      gridOptions.columns.push(column)

    })

    //进入页面下拉框设置默认值
@@ -535,7 +781,7 @@
    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
    titleUploadData.value.calculateType = 2
    const today = new Date
    today.setTime(today.getTime() + (15 * 24 * 60 * 60 * 1000))
    titleUploadData.value.deliveryDate = today.getFullYear() +
@@ -546,9 +792,48 @@
  }
})

//查询重复订单方法
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')}`,
            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'))
      router.push({path:'/main/order/selectOrder'})
    }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'})
@@ -582,7 +867,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){
@@ -600,10 +885,21 @@
  })
}

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
  titleUploadData.value.project = customer[0].project
  titleUploadData.value.salesmanId = customer[0].salesmanId
  titleUploadData.value.salesman = customer[0].salesman

  //titleSelectJson.value.customer
}

@@ -614,11 +910,23 @@
}

const area = (row) => {

  return parseFloat((row.width * row.height/1000000).toFixed(2))
}
const countArea = (row) => {
  const area = parseFloat((row.width * row.height/1000000).toFixed(2))
  return parseFloat((area * row.quantity).toFixed(2))
  let areaSum = 0
  switch (titleUploadData.value.calculateType){
    case 1:{
      areaSum = parseFloat((area * row.quantity).toFixed(2))
      break
    }
    case 2:{
      areaSum = parseFloat((row.width * row.height * row.quantity/1000000).toFixed(2))
      break
    }
  }
  return areaSum
}
//计算金钱
const countMoney = (list) => {
@@ -626,9 +934,9 @@
  list.forEach((item)=>{
    countMoney += parseFloat(item.grossAmount)
  })
  otherMoney.value.forEach(item => {
    countMoney+=item.quantity*item.price
  })
  // otherMoney.value.forEach(item => {
  //   countMoney+=item.quantity*item.price
  // })
  return parseFloat((countMoney).toFixed(2))
}
//导入功能
@@ -642,7 +950,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>240){
    if(jsonData.length>maxTableLen.value){
      ElMessage.error(`${t('order.msg.importMaxCheckFailFirst')}
                          ${jsonData.length}
                          ${t('order.msg.importMaxCheckFailMid')}
@@ -655,8 +963,17 @@
      }
      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))
      if(titleUploadData.value.calculateType===1){
        item.computeGrossArea = parseFloat((item.computeArea*item.quantity).toFixed(2))
      }else if(titleUploadData.value.calculateType===2){
        item.computeGrossArea = item.grossArea
      }
      if(titleUploadData.value.calculateType===3){
        item.grossAmount=parseFloat((item.price * item.quantity).toFixed(2))
      }else{
        item.grossAmount=parseFloat((item.price * item.computeGrossArea).toFixed(2))
      }

    })
    //赋值表头数据
    titleUploadData.value.money=countMoney(jsonData).toString()
@@ -680,6 +997,13 @@
  }, 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 }) => {
  //判断修改相应的数值修改面积与金额
@@ -691,20 +1015,26 @@
      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))
   }else if(column.property.indexOf('otherColumns.M')>-1){
     let quantity = 0
     xGrid.value.getTableData().fullData.forEach(item => {
       quantity += item.quantity*(getNestedProperty(item,column.property)*1)
     })
     if(!isNaN(quantity)){
       otherMoney.value.forEach(item => {
         if(item.column===column.property.split('.')[1]){
           item.quantity = quantity
         }
       })
     if(titleUploadData.value.calculateType!==3){
       row.grossAmount=parseFloat((row.price * row.computeGrossArea).toFixed(2))
     }

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


@@ -719,7 +1049,7 @@
  }
  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){
@@ -743,7 +1073,48 @@
    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 ){
      item.grossArea = countArea(item)
      item.computeGrossArea = item.grossArea
      if(titleUploadData.value.calculateType===3){
        item.grossAmount=parseFloat((item.price * item.quantity).toFixed(2))
      }else{
        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 } = xGrid.value.getSelectedCell() || xGrid.value.getEditRecord()
    if(rowIndex === length-1){
      xGrid.value.insertAt({}, xGrid.value.getTableData.length || -1)
    }

  }
}

</script>

@@ -791,7 +1162,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>
            <el-option  v-for="item in titleSelectJson['icon']"
                       :key="item.id"
                       :label="item.basicName"
@@ -800,7 +1171,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"
@@ -824,8 +1195,9 @@
        <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-select>
        </el-col>
        <el-col  :span="2"><el-text>*{{$t('order.salesman')}}：</el-text></el-col>
@@ -876,11 +1248,12 @@
    </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"
      >
        <template #num1_filter="{ column, $panel }">
@@ -896,10 +1269,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>


@@ -912,7 +1286,7 @@
          :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>
<!--误差结算-->
@@ -921,16 +1295,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"
@@ -939,6 +1313,21 @@
          ref="refOtherMoney"
          :otherMoney="otherMoney"
          style="width: 100%;height: 100%" />
    </el-dialog>

<!--    尺寸审核窗口-->
    <el-dialog
        id="sizeCheck"
        v-model="sizeCheckVisible"
       :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>
@@ -973,5 +1362,14 @@
    -ms-user-select: none;
    user-select: none;
  }
  :deep(#product .el-dialog__body){
    height: 90%;
    width: 100%;
  }

  :deep(#sizeCheck .el-dialog__body){
    height: 90%;
    width: 100%;
  }

</style>