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

廖井涛

2025-10-14 eed6d0336e2898a73f626b8c68033a66e3588443

 north-glass-erp/northglass-erp/src/components/BasicTable.vue

@@ -61,7 +61,8 @@
  toolbarConfig: {
    buttons: [],
    slots: {
      tools: 'toolbar_buttons'
      tools: 'toolbar_buttons',
      buttons:'buttons'
    },
    // import: false,
    // export: true,
@@ -115,7 +116,7 @@
  }
})
const basicProp = ref({
  pageSize : 100,//页面显示数量
  pageSize : 10000,//页面显示数量
  pageNum:1,//当前页
  selectDate:['',''],//查询的日期
  pageTotal : 0,//总页数
@@ -139,8 +140,6 @@
  gridOptions.columns = props.childrenData.columns
  getReportData()
  addListener(xGrid.value,gridOptions)


})
function filterChanged(column){
  //gridOptions.loading=true
@@ -174,6 +173,17 @@
}

const  getReportData = () => {
  if(props.childrenData.model!=null){
    request.post(`${props.childrenData.url}/${basicProp.value.pageNum}/${basicProp.value.pageSize}/${orderInfo.reportFormDate}/${props.childrenData.model}/${props.childrenData.scope}`,filterData.value).then(res => {
      if(res.code === '200'){
        props.childrenData.data = res.data.data
        basicProp.value.pageTotal = res.data.total.pageTotal
        basicProp.value.dataTotal = res.data.total.total
        orderInfo.reportFormDate = res.data.selectDate
      }
    })
    return
  }
  request.post(`${props.childrenData.url}/${basicProp.value.pageNum}/${basicProp.value.pageSize}/${orderInfo.reportFormDate}`,filterData.value).then(res => {
    if(res.code === '200'){
      props.childrenData.data = res.data.data
@@ -184,13 +194,23 @@
  })
}


const exportEvent = () => {
  const $table = xGrid.value
  if ($table) {
    $table.exportData({
      filename: 'order_export',
      sheetName: 'Sheet1',
      type: 'xlsx'
    })
  }
}


</script>

<template>
  <div class="main-div">
  <div  style="width: 100%;height: 100%">
    <div class="head">
    <el-date-picker
        v-model="orderInfo.reportFormDate"
        type="daterange"
@@ -205,10 +225,11 @@
        type="primary"
        style="margin-top: -5px"
        :icon="Search">{{$t('basicData.search')}}</el-button>
    <div class="order-detail">
    </div>
    <div class="main-table">
      <vxe-grid
          @filter-change="filterChanged"
          height="110%"
          height="100%"
          class="mytable-scrollbar"
          ref="xGrid"
          v-bind="gridOptions"
@@ -227,18 +248,30 @@
        <template #num1_filter="{ column, $panel }">
          <div>
            <div v-for="(option, index) in column.filters" :key="index">
              <input type="type" v-model="option.data" @input="changeFilterEvent($event, option, $panel)"/>
              <input type="text"
                     v-model="option.data"
                     @keyup.enter.native="$panel.confirmFilter()"
                     @input="changeFilterEvent($event, option, $panel)"/>
            </div>
          </div>
        </template>

        <template #toolbar_buttons>
          <vxe-button style="margin-right: 0.5rem"
                      @click="exportExcel(props.childrenData.exportUrl,
          <vxe-button icon="vxe-icon-download" circle
                    style="margin-right: 0.5rem"
                    @click="exportEvent" />

          <vxe-button icon="vxe-icon-cloud-download" style="margin-right: 0.5rem"
                      circle
                    @click="exportExcel(props.childrenData.exportUrl,
                                          props.childrenData.exportName,
                                          orderInfo.reportFormDate)">
            {{$t('basicData.export')}}</vxe-button>
                                          orderInfo.reportFormDate)" />

        </template>
        <template #buttons>
          <slot  name="buttons"></slot>
        </template>


        <template #pager>
          <!--使用 pager 插槽-->
@@ -273,13 +306,14 @@
  border: none !important;
  background-color: transparent;
}
.order-primary{
.head{
  width: 100%;
  height: 35px;
}
.order-detail{
  width: 100%;
  height:  calc(100% - 30px);

.main-table{
  width: 100%;
  height: calc(100% - 35px);
}

.vxe-grid {