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()
@@ -189,6 +190,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 +210,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:[
      {
@@ -359,9 +360,15 @@
              creator:userStore.user.userName,
              creatorId:userStore.user.userId
            }
            const grossAreaList = $grid.getTableData().fullData.filter(
                item=>item.grossArea === 0
            )
            const errorAreaList = $grid.getTableData().fullData.filter(
                item=>item.width*item.height/1000000 < errorArea.value*1
            )
            if(grossAreaList.length>0){
              alert(t('order.msg.grossAreaIsNot0'))
            }
            if(errorAreaList.length){
              ElMessageBox.confirm(`${t('order.msg.calculationAreaPrompt1')}
                  ${errorAreaList.length}
@@ -382,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)
                }

@@ -607,7 +621,7 @@
          let result = toolbarButtonClickEvent()
          if(result){
            const dataList = xGrid.value.getTableData().visibleData
            const val = getNestedProperty(dataList[result.start],result.cell)
            const val = getNestedProperty(dataList[result.start],result.cell)+""

            const numbersArr = []
            const regex = /\d+/g
@@ -618,7 +632,7 @@
            let numbers=numbersArr[numbersArr.length-1]
            var subStr1 = val.substring(numbers.index);
            var subStr2 = val.substring(0, numbers.index);
            let number = parseInt(subStr1.match(/\d/))
            let number = parseInt(subStr1)
            var reg =new RegExp(number,"g")
            dataList.forEach((item,index) =>{
              if(index>=result.start ){
@@ -630,6 +644,7 @@
            })

          }
          computedMoney(result.cell)
          gridOptions.menuConfig.body.options[0][5].disabled=false
          break
        }
@@ -637,7 +652,7 @@
          let result = toolbarButtonClickEvent()
          if (result) {
            const dataList = xGrid.value.getTableData().visibleData
            const val = getNestedProperty(dataList[result.start], result.cell)
            const val = getNestedProperty(dataList[result.start], result.cell)+""
            const numbersArr = []
            const regex = /\d+/g
            let match
@@ -647,7 +662,7 @@
            let numbers=numbersArr[numbersArr.length-1]
            var subStr1 = val.substring(numbers.index);
            var subStr2 = val.substring(0, numbers.index);
            let number = parseInt(subStr1.match(/\d/))
            let number = parseInt(subStr1)
            var reg =new RegExp(number,"g")
            dataList.forEach((item,index) =>{
              if(index >= result.start && index <= result.end){
@@ -667,6 +682,7 @@
            })*/

          }
          computedMoney(result.cell)
          gridOptions.menuConfig.body.options[0][5].disabled = false
          break
        }
@@ -745,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
      //工艺审核后保存按钮禁用
@@ -770,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
@@ -781,6 +798,9 @@
        }
      }
      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
@@ -825,9 +845,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)
    }

  })
@@ -886,7 +906,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() +
@@ -936,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)
    }
@@ -1023,7 +1049,7 @@
const countArea = (row) => {
  const area = parseFloat((row.width * row.height/1000000).toFixed(company.decValue))
  let areaSum = 0
  // 获取保留面积
  // 获取保留面积,
  const decValue = company.decValue
  switch (titleUploadData.value.calculateType){
    case 2:{
@@ -1031,7 +1057,7 @@
      break
    }
    default :{
      areaSum = parseFloat((row.computeArea * row.quantity).toFixed(decValue))
      areaSum = parseFloat((area * row.quantity).toFixed(decValue))
      break
    }
  }
@@ -1088,9 +1114,9 @@
        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)
      }

    })
@@ -1150,9 +1176,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'){
@@ -1160,7 +1186,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)
     }

   }
@@ -1184,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
  }
@@ -1198,6 +1244,7 @@
  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))
@@ -1206,6 +1253,7 @@
  titleUploadData.value.money=countMoney(xGrid.value.getTableData().fullData).toString()
  errorAreaVisible.value= false
}




@@ -1265,8 +1313,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]);
    }
@@ -1370,7 +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="'数量金额'"/>
            <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>
@@ -1428,6 +1474,7 @@
          v-on="gridEvents"
          @keydown="handleKeyDown"
          @edit-closed="editClosedEvent"
          :cell-style="cellStyle"
      >
        <template #num1_filter="{ column, $panel }">
          <div>