Merge branch 'master' of http://bore.pub:10439/r/ERP_override

廖井涛

2025-03-26 7a0527e207c59cdcce0b1f7a41bd7457a236ab23

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

@@ -99,7 +99,7 @@
            },
            {
              prefixIcon: 'vxe-icon-repeat',
              name: '一键退回',
              name: t('order.oneClickReturn'),
              children: [
                // { code: 'sheet1', name: '横版-普通' },
                { code: 'back1', name: t('searchOrder.createOrder'),disabled:true },
@@ -401,13 +401,13 @@
  }


  const getOrderList = () => {
  const getOrderList = async () => {
    //加载请求
    const config = {
      filter: filterData.value,
      sort: sortData.value
    }
    request.post(`/order/getOrderList/1/${total.value.pageSize}/${orderType.value}/${orderInfo.selectDate}`,config).then((res) => {
    await request.post(`/order/getOrderList/1/${total.value.pageSize}/${orderType.value}/${orderInfo.selectDate}`,config).then((res) => {
      if(res.code==200){
        total.value = res.data.total
        /*total.dataTotal = res.data.total.dataTotal*1
@@ -420,8 +420,12 @@
      }
    })
  }
  onMounted(() => {
    getOrderList()
  onMounted(async () => {
    filterData.value = orderInfo.searchOrderFilter.data
    await getOrderList()
    orderInfo.searchOrderFilter.list.forEach(item =>{
      xGrid.value.getColumnByField(item.field).filters = item.column.filters
    })
  })

  const changeFilterEvent = (event, option, $panel) => {
@@ -430,7 +434,6 @@
  }

  function filterChanged(column){
    //console.log(column)
    gridOptions.loading=true
    //筛选条件发生变化条件发生变化
    let value = column.datas[0]!=undefined?column.datas[0]:''
@@ -458,6 +461,8 @@
        orderList.value = deepClone(res.data.data)
        xGrid.value.loadData(orderList.value)
        gridOptions.loading=false
        orderInfo.searchOrderFilter.list = xGrid.value.getCheckedFilters()
        orderInfo.searchOrderFilter.data = filterData.value
      }else{
        ElMessage.warning(res.msg)
      }