提交

廖井涛

2024-07-04 5486827babb25c1f59cdc24142806ac1a8cc6a89

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

@@ -109,7 +109,7 @@
          { code: 'computedMoney', name: t('basicData.calculateAmount'), prefixIcon: 'vxe-icon-chart-bar-x', visible: true, disabled: true },
          { 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 }
          { code: 'sizeCheck', name: t('basicData.sizeReview'), prefixIcon: 'vxe-icon-eye-fill', visible: true, disabled: false }
        ]
      ]
    }
@@ -130,7 +130,7 @@
    isDel: true,
    isEnter: true,
    isTab: true,
    isEdit: true,
    //isEdit: true,
    isChecked: true
  },
  editConfig: {
@@ -346,6 +346,7 @@
              ElMessage.error("请先取消筛选")
              return
            }
            //xGrid.value.clearSort()
            let order ={
              title:titleUploadData.value,
              detail:$grid.getTableData().tableData,
@@ -366,13 +367,17 @@
              {
                confirmButtonText: t('basicData.confirmButtonText'),
                cancelButtonText: t('basicData.cancelButtonText'),
                distinguishCancelAndClose: true,
                type: 'warning',
              }
              ).then(()=>{
                errorAreaComputed()
                selectOrder(order)
              }).catch(()=>{
                selectOrder(order)
              }).catch((action)=>{
                if(action === 'cancel'){
                  selectOrder(order)
                }

              })

            }else {
@@ -604,16 +609,20 @@
  }
}
//获取子页面产品方法
const getProductRow = (row) => {
const getProductRow = (row,type) => {
  if(row.state!=1){
    ElMessage.warning(t('order.msg.productStateCheck'))
    return
  }

  rowIndex.productName = row.productName
  if(type==1){
    rowIndex.productName = row.productName
  }else{
    rowIndex.productName = row.productAbbreviation
  }
  rowIndex.productId = row.id
  productVisible.value = false
}




@@ -663,7 +672,7 @@
      //工艺审核后，订单未审核 取消审核按钮禁用和尺寸审核
      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
        //gridOptions.menuConfig.body.options[0][8].disabled =false
      }

      //按钮审核过后变为反审
@@ -784,7 +793,7 @@
    titleUploadData.value.alType = titleSelectJson.value.alType[0].basicName
    titleUploadData.value.calculateType = 2
    const today = new Date
    today.setTime(today.getTime() + (15 * 24 * 60 * 60 * 1000))
    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)
@@ -844,11 +853,11 @@
  })
}

//更新金额
//更新金额重置
const updateMoney = () => {
  const updateData = {
    order: titleUploadData.value,
    detail: xGrid.value.getTableData().fullData
    detail: xGrid.value.getTableData().fullData,
  }
  request.post(`/order/updateOrderMoney`,updateData).then(res => {
    if (res.code == 200){
@@ -887,9 +896,6 @@
}

const gaveOrderSizeCheck = () => {



  reviewOrder(2)
}

@@ -1132,12 +1138,20 @@
    return
  }
  if(evnt.$event.keyCode === 13 ){
    const { rowIndex } = xGrid.value.getSelectedCell() || xGrid.value.getEditRecord()
    const { rowIndex,row,column } = xGrid.value.getSelectedCell() || xGrid.value.getEditRecord()
    //xGrid.value.setEditCell(row,column)
    if(xGrid.value.getEditRecord()===null){
      xGrid.value.setEditCell(row,column)
    }
    if(rowIndex === length-1){
      xGrid.value.insertAt({}, xGrid.value.getTableData.length || -1)
    }

  }
}

const inputFocus = ()=>{
  xGrid.value.clearSelected()
}

</script>
@@ -1287,6 +1301,7 @@
            <div v-for="(option, index) in column.filters" :key="index">
              <input type="text"
                     v-model="option.data"
                     @focus="inputFocus"
                     @input="changeFilterEvent($event, option, $panel)"/>
            </div>
          </div>