Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

chenlu

2024-10-11 82a5de6d2ec80b45660149c84be28734032562f6

 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,multiplyAuto,divideAuto} from '@/utils/decimal'
const { t } = useI18n()

let dialogTableVisible = ref(false)
@@ -22,7 +23,8 @@
let errorAreaVisible = ref(false)
let otherMoneyVisible = ref(false)
let sizeCheckVisible = ref(false)
const maxTableLen =ref(150)
let orderIdVisible = ref(false)
const maxTableLen =ref(500)
let errorArea = ref(0.4)
const userStore = useUserInfoStore()
const company = companyInfo()
@@ -33,6 +35,7 @@
const shapeList = ref([
    {label:t('order.universalShape'),value:'1'}, {label:t('order.alien'),value:'2'}
])
const newOrderId = ref([])

// 定义表头上传数据
const titleUploadData = ref({
@@ -111,7 +114,8 @@
          { 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 }
          { code: 'sizeCheck', name: t('basicData.sizeReview'), prefixIcon: 'vxe-icon-eye-fill', visible: true, disabled: false },
          { code: 'updateOrderId', name: '修改订单号', prefixIcon: 'vxe-icon-eye-fill', visible: true, disabled: false }
        ]
      ]
    }
@@ -189,6 +193,16 @@
        }
      }
    ],
    quantity: [
      {
        validator ({ cellValue }) {
          const regex = /^[1-9]\d*$/
          if ( !regex.test(cellValue) ) {
            return new Error(t('basicData.msg.greater0') )
          }
        }
      }
    ],
    computeArea: [
      {
        validator ({ cellValue }) {
@@ -199,16 +213,6 @@
          }
        }
      }
    ],
    quantity: [
        //type: 'number', min: 0, message: '请输入大于等于0的数值' ,
      {
        validator ({ cellValue }) {
          const regex = /^[1-9]\d*$/
          if (!regex.test(cellValue)) {
            return new Error(t('basicData.msg.greater0'))
          }
        }}
    ],
    bendRadius:[
      {
@@ -345,20 +349,30 @@
              ElMessage.error(t('basicData.msg.checkoutLose'))
              return
            }
            if($grid.getTableData().tableData.length!=$grid.getTableData().fullData.length){

            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
              orderIdType:company.orderIdType,
              creator:userStore.user.userName,
              creatorId:userStore.user.userId,
              newOrderId:newOrderId.value
            }
            const errorAreaList = $grid.getTableData().fullData.filter(
                item=>item.width*item.height/1000000 < 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}
@@ -379,6 +393,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)
                }

@@ -428,7 +449,8 @@
              ElMessage.error(t('basicData.msg.checkoutLose'))
              return
            }

            titleUploadData.value.creatorId=userStore.user.userId
            titleUploadData.value.creator=userStore.user.userName
            let order ={
              title:titleUploadData.value,
            }
@@ -457,7 +479,7 @@
            ElMessage.error(t('order.msg.tableLengthMax'))
            return
          }
          if ($grid.getTableData().tableData.length != $grid.getTableData().fullData.length){
          if ($grid.getCheckedFilters().length!==0){
            ElMessage.error(t('order.msg.pleaseCancelTheFilteringFirst'))
            return
          }
@@ -600,22 +622,41 @@
          sizeCheckVisible.value=true
          break
        }
        case 'updateOrderId' :{
          orderIdVisible.value=true
          break
        }
        case 'incrementalAll' :{
          let result = toolbarButtonClickEvent()
          if(result){
            const dataList = xGrid.value.getTableData().visibleData
            const val = getNestedProperty(dataList[result.start],result.cell)
            let numbers = parseInt(val.match(/(\d+)$/))
            const string=val.replace(/\d+$/, '')
            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 ){
                setNestedValue(item,result.cell,string+numbers)
                numbers=numbers+1
                let newStr = subStr1.replace(reg, number);
                if(parseInt(newStr)>9){
                  newStr=parseInt(newStr)
                }
                setNestedValue(item,result.cell,subStr2+newStr)
                number=number+1
              }

            })

          }
          computedMoney(result.cell)
          gridOptions.menuConfig.body.options[0][5].disabled=false
          break
        }
@@ -623,17 +664,40 @@
          let result = toolbarButtonClickEvent()
          if (result) {
            const dataList = xGrid.value.getTableData().visibleData
            const val = getNestedProperty(dataList[result.start], result.cell)
            let numbers = parseInt(val.match(/(\d+)$/))
            const val = getNestedProperty(dataList[result.start], result.cell)+""
            const numbersArr = []
            const regex = /\d+/g
            let match
            while ((match = regex.exec(val))) {
              numbersArr.push({ number: match[0], index: match.index });
            }
            let numbers=numbersArr[numbersArr.length-1]
            var subStr1 = val.substring(numbers.index);
            var subStr2 = val.substring(0, numbers.index);
            let number = parseInt(subStr1)
            var reg =new RegExp(number,"g")
            dataList.forEach((item,index) =>{
              if(index >= result.start && index <= result.end){
                let newStr = subStr1.replace(reg, number);
                if(parseInt(newStr)>9){
                  newStr=parseInt(newStr)
                }
                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
        }
@@ -681,7 +745,7 @@
  addListener(xGrid.value,gridOptions)
  const str = route.query.orderId || history.state.orderId
  if (typeof str === 'undefined' || str === null || str === '' || str === '\n' || str === '\r'){

    gridOptions.menuConfig.body.options[0][11].disabled = true
    gridOptions.loading = false
    return
  }
@@ -689,6 +753,7 @@
  request.post(`/order/getOrderById/${str}`).then((res) => {
    if(res.code==200){
      titleUploadData.value = res.data.order
      newOrderId.value=titleUploadData.value.orderId
      if(history.state.orderId!=null){
        titleUploadData.value.orderId=''
        titleUploadData.value.id=null
@@ -707,16 +772,25 @@

        if(history.state.type=='copy'){
          xGrid.value.reloadData(orderDetails)
          gridOptions.menuConfig.body.options[0][11].disabled = true
        }
        if(history.state.type=='copyTitle'){
          gridOptions.menuConfig.body.options[0][11].disabled = true
        }

        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
        gridOptions.menuConfig.body.options[0][11].disabled = true


      }
@@ -732,22 +806,26 @@
        gridOptions.toolbarConfig.buttons[2].code='reviews'
        gridOptions.toolbarConfig.buttons[2].name=t('basicData.cancelReview')
        gridOptions.toolbarConfig.buttons[3].disabled = false
        gridOptions.menuConfig.body.options[0][11].disabled = true

        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': 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
          gridOptions.toolbarConfig.buttons[4].disabled = true


        }
      }

      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
@@ -792,9 +870,9 @@
    }

    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,item.computeGrossArea)
    }

  })
@@ -828,9 +906,9 @@
          gridOptions.editRules[`otherColumns.${item.column}`] = [
            {
              validator ({ cellValue }) {
                const regex = /^(0|[1-9][0-9]{0,4}([.][0-9]{1,2})?)$/
                const regex = /^(0(\.\d{1,3})?|([1-9]\d{0,4})(\.\d{1,3})?|99999(\.9{1,3})?)$/
                if (cellValue && !regex.test(cellValue)) {
                  return new Error(t('basicData.msg.range99999Dec2'))
                  return new Error(t('basicData.msg.range99999Dec3'))
                }
              }
            }
@@ -853,7 +931,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 = company.calculateType
      const today = new Date
      today.setTime(today.getTime() + (7 * 24 * 60 * 60 * 1000))
      titleUploadData.value.deliveryDate = today.getFullYear() +
@@ -903,7 +981,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)
    }
@@ -922,8 +1006,40 @@
  })
}

//修改订单号方法
const updateOrderId = () => {
  let orderId ={
    oldOrderId:titleUploadData.value.orderId,
    newOrderId:newOrderId.value,
    orderIdType:company.orderIdType,
    creator:userStore.user.userName,
  }
  request.post(`/order/updateOrderId`,orderId).then((res) => {
    if(res.code==200 && res.data==="true"){
      ElMessage.success(t('basicData.msg.saveSuccess'))
      router.push({path:'/main/order/createOrder',query:{
          orderId:newOrderId.value,
          random:Math.random()}})
    }else if(res.data==="false1"){
      ElMessage.warning("输入订单号不能大于最大订单号")
    }else if(res.data==="false2"){
      ElMessage.warning("输入订单号已存在")
    }else if(res.data==="false3"){
      ElMessage.warning("输入订单号相同")
    }else if(res.data==="false4"){
      ElMessage.warning("输入订单号长度不符")
    }else if(res.data==="false5"){
      ElMessage.warning("请输入数字")
    }else if(res.data==="false6"){
      ElMessage.warning("不能修改第一个单子")
    }
  })
}

//更新金额重置
const updateMoney = () => {
  titleUploadData.value.creatorId=userStore.user.userId
  titleUploadData.value.creator=userStore.user.userName
  const updateData = {
    order: titleUploadData.value,
    detail: xGrid.value.getTableData().fullData,
@@ -985,20 +1101,20 @@
}

const area = (row) => {
  return parseFloat((row.width * row.height/1000000).toFixed(company.decValue))
  return  parseFloat(divideAuto(row.width * row.height,1000000,company.decValue))
}
const countArea = (row) => {
  const area = parseFloat((row.width * row.height/1000000).toFixed(company.decValue))
  const area =  parseFloat(divideAuto(row.width * row.height,1000000,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))
      areaSum = parseFloat(divideAuto(row.width * row.height* row.quantity,1000000,company.decValue))
      break
    }
    default :{
      areaSum = parseFloat((row.computeArea * row.quantity).toFixed(decValue))
      areaSum = parseFloat(multiplyAuto(area ,row.quantity,company.decValue))
      break
    }
  }
@@ -1050,14 +1166,14 @@
      const decValue = company.decValue

      if(titleUploadData.value.calculateType===1){
        item.computeGrossArea = parseFloat((item.computeArea*item.quantity).toFixed(decValue))
        item.computeGrossArea = parseFloat(multiplyAuto(item.computeArea,item.quantity,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 * 1 * item.computeGrossArea).toFixed(2))
        item.grossAmount=multiply(item.price * 1 , item.computeGrossArea)
      }

    })
@@ -1117,9 +1233,9 @@
        row.computeGrossArea = row.grossArea
     }
     if(titleUploadData.value.calculateType===3){
       row.grossAmount=parseFloat((row.price * row.quantity).toFixed(2))
       row.grossAmount=multiply(row.price ,row.quantity)
     }else{
       row.grossAmount=parseFloat((row.price * row.computeGrossArea).toFixed(2))
       row.grossAmount=multiply(row.price , row.computeGrossArea)
     }

   }else if(column.property === 'computeArea'){
@@ -1127,7 +1243,7 @@
       if(titleUploadData.value?.orderReview!==2){
          row.computeGrossArea = row.computeArea * row.quantity
       }
       row.grossAmount=parseFloat((row.price * row.computeGrossArea).toFixed(2))
       row.grossAmount=multiply(row.price , row.computeGrossArea)
     }

   }
@@ -1151,10 +1267,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
  }
@@ -1165,14 +1301,16 @@
  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))
      item.computeGrossArea =  parseFloat(multiply(item.computeArea,item.quantity))
      item.grossAmount=parseFloat(multiply(item.price , item.computeGrossArea))
    }
  })
  titleUploadData.value.money=countMoney(xGrid.value.getTableData().fullData).toString()
  errorAreaVisible.value= false
}




@@ -1195,11 +1333,11 @@

    if( !isNaN(item.computeArea*1) && item.computeArea != null ){
      if(titleUploadData.value.calculateType===3){
        item.grossAmount=parseFloat((item.price * item.quantity).toFixed(2))
        item.grossAmount=parseFloat(multiply(item.price , item.quantity))
      }else{
        item.grossArea = countArea(item)
        item.computeGrossArea = item.grossArea
        item.grossAmount=parseFloat((item.price * item.computeGrossArea).toFixed(2))
        item.grossAmount=parseFloat(multiply(item.price , item.computeGrossArea))
      }
    }
  })
@@ -1232,8 +1370,6 @@
  if(evnt.$event.keyCode === 38 ){
    const { rowIndex,row,column } = xGrid.value.getSelectedCell() || xGrid.value.getEditRecord()
    let nextRowIndex = xGrid.value.getRowIndex(row) - 1;
    console.log(xGrid.value.getTableData().fullData.length)
    console.log(nextRowIndex)
    if (nextRowIndex < xGrid.value.getTableData().fullData.length && nextRowIndex>=0) {
      xGrid.value.setCurrentRow(xGrid.value.getTableData().fullData[nextRowIndex]);
    }
@@ -1337,7 +1473,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="'数量金额'"/>
            <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>
@@ -1395,6 +1531,7 @@
          v-on="gridEvents"
          @keydown="handleKeyDown"
          @edit-closed="editClosedEvent"
          :cell-style="cellStyle"
      >
        <template #num1_filter="{ column, $panel }">
          <div>
@@ -1444,6 +1581,16 @@
        </el-col>
      </el-row>
    </el-dialog>
    <el-dialog v-model="orderIdVisible"  style="width: 300px;height:150px ">
      <el-row>
        <el-col :span="12">
          <el-input v-model="newOrderId"/>
        </el-col>
        <el-col :span="6">
          <el-button @click="updateOrderId">{{$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"
@@ -1460,6 +1607,7 @@
    <el-dialog
        id="sizeCheck"
        v-model="sizeCheckVisible"
        :draggable="true"
       :title="$t('basicData.sizeReview')"
       :close-on-click-modal="false"
       :close-on-press-escape="false"