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

chenlu

2024-03-01 37931d04e87cbae60cf833890c2c8432b389fa1a

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

@@ -218,6 +218,10 @@
        break
      }
      case 'delete': {
        if (row.processReview === 2) {
          ElMessage.warning('已审核的订单不能删除')
          return
        }
        request.post(`/order/deleteOrder/${row.orderId}`).then((res) => {
          if(res.code==200){
            ElMessage.success('删除成功')
@@ -236,7 +240,7 @@
</script>

<template>
  <div  style="width: 100%;height: 100%">
  <div  style="width: 100%;height: 100% ;">
    <el-date-picker
        v-model="selectDate"
        type="daterange"
@@ -250,7 +254,7 @@
    <vxe-grid
        @filter-change="filterChanged"
        @cell-dblclick="cellClickEvent"
        max-height="97%"
        style="max-height: 95%"
        class="mytable-scrollbar"
        ref="xGrid"
        v-bind="gridOptions"