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

chenlu

2025-01-15 27b3352a6a7f514c98cce083eded6c3bb9e3f519

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

@@ -25,9 +25,9 @@
let sizeCheckVisible = ref(false)
let orderIdVisible = ref(false)
const maxTableLen =ref(500)
let errorArea = ref(0.4)
const userStore = useUserInfoStore()
const company = companyInfo()
let errorArea = ref(company.errorArea)
const router = useRouter()
const route = useRoute()
const xGrid = ref()
@@ -134,7 +134,7 @@
  keyboardConfig:{
    isArrow: true,
    isDel: true,
    isEnter: true,
    //isEnter: true,
    isTab: true,
    isEdit: true,
    isChecked: true
@@ -324,9 +324,8 @@
          }

          const project = titleUploadData.value.project
          if(project === null || project === undefined || project === ''){
            ElMessage.error(t('order.msg.projectCheck'))
            return
          if(project === null || project === undefined ){
            titleUploadData.value.project=''
          }
          const customer = titleUploadData.value.customerId
          if(customer === null || customer === undefined || customer === ''){
@@ -423,11 +422,6 @@
            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'))
@@ -1068,7 +1062,35 @@


// 审核订单
const reviewOrder = (state) => {
const reviewOrder = async (state) => {
  let differentSize = null
  if(state===0){
    await request.post(`/order/selectDifferentSize/${titleUploadData.value.orderId}`).then(res =>{
      differentSize = res.data
    })
  }
  let orderGlassState = null
  if(differentSize===true){
  await  ElMessageBox.confirm(
        t('order.msg.differentSize'),
        t('order.msg.warning'),
        {
          confirmButtonText: t('basicData.confirmButtonText'),
          cancelButtonText: t('basicData.cancelButtonText'),
          type: 'warning',
        }
    )
        .then(async () => {

        })
        .catch(async () => {
          orderGlassState = false
        })
  }
  if (orderGlassState===false){
    return
  }

  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
@@ -1364,13 +1386,45 @@
  }
  if(evnt.$event.keyCode === 13 ){
    const { rowIndex,row,column } = xGrid.value.getSelectedCell() || xGrid.value.getEditRecord()
    let nextRowIndex = xGrid.value.getRowIndex(row) + 1;
    if (nextRowIndex < xGrid.value.getTableData().fullData.length) {
    let nextRowIndex = xGrid.value.getRowIndex(row) + 1


    switch (column.field){
      case 'width':
        xGrid.value.setSelectCell(row, 'height')
        break;
      case 'height':
        xGrid.value.setSelectCell(row, 'quantity')
        break;
      case 'quantity':
        if(nextRowIndex === length){
          xGrid.value.insertAt({}, xGrid.value.getTableData.length || -1)
        }
        const nextRow = xGrid.value.getTableData().fullData[nextRowIndex]
        xGrid.value.setCurrentRow(nextRow)
        xGrid.value.scrollToRow(nextRow)
        xGrid.value.setSelectCell(nextRow, 'width')
        break;
      default:
        if(nextRowIndex === length){
          xGrid.value.insertAt({}, xGrid.value.getTableData.length || -1)
        }
        const nextRow1 = xGrid.value.getTableData().fullData[nextRowIndex]
        xGrid.value.setCurrentRow(nextRow1)
        xGrid.value.scrollToRow(nextRow1)
        xGrid.value.setSelectCell(nextRow1, column.field)
        break;

    }



    /*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 ){
@@ -1402,7 +1456,7 @@
    <div class="order-primary" style="background-color: white">
      <el-row>
        <el-col  :span="2"><el-text>*{{$t('order.project')}}：</el-text></el-col>
        <el-col  :span="2"><el-input v-model="titleUploadData.project"/></el-col>
        <el-col  :span="2"><el-input v-model.trim="titleUploadData.project"/></el-col>
        <el-col  :span="2"><el-text>*{{$t('order.customers')}}：</el-text></el-col>
        <el-col  :span="2">
          <el-select  v-model="titleUploadData.customerId"