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,
@@ -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,7 +194,16 @@
  })
}


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


</script>
@@ -229,7 +248,7 @@
        <template #num1_filter="{ column, $panel }">
          <div>
            <div v-for="(option, index) in column.filters" :key="index">
              <input type="type"
              <input type="text"
                     v-model="option.data"
                     @keyup.enter.native="$panel.confirmFilter()"
                     @input="changeFilterEvent($event, option, $panel)"/>
@@ -238,12 +257,21 @@
        </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 插槽-->