Merge remote-tracking branch 'origin/2.0.1' into 2.0.1

doum

2025-09-08 55ba702c1df240929e68df3b42fa9cb0607378b8

 admin/src/views/combo/record.vue

@@ -6,7 +6,7 @@
    <div class="table_btns">
      <el-button plain type="primary" @click="handleEx">导出</el-button>
      <el-button plain type="danger" @click="openModal('zuofei')">作废</el-button>
      <el-button plain @click="openModal('tiaozheng')">套餐调整</el-button>
      <el-button plain type="primary" @click="openModal('tiaozheng')">套餐调整</el-button>
    </div>
    <el-table v-loading="loading" :data="list" stripe border @selection-change="handleSelectionChange">
      <el-table-column fixed="left" align="center" type="selection" :selectable="handleDisable" width="55" />
@@ -32,6 +32,7 @@
          <span>{{ scope.row.useStartDate }}至{{ scope.row.useEndDate }}</span>
        </template>
      </el-table-column>
      <el-table-column align="center" label="创建时间" min-width="150" prop="createDate" show-overflow-tooltip />
      <el-table-column align="center" label="套餐状态" min-width="80">
        <template v-slot="scope">
          <span v-if="scope.row.status == '0'" class="text_success">正常</span>
@@ -144,8 +145,17 @@
          clearable: true,
          options: [
            { value: '0', label: '正常' },
            { value: '1', label: '作废' },
            // { value: '2', label: '待支付' }
            { value: '1', label: '作废' }
          ]
        },{
          filed: 'createDate',
          type: 'daterange',
          label: '创建日期',
          placeholder: '请选择状态',
          clearable: true,
          options: [
            { value: '0', label: '正常' },
            { value: '1', label: '作废' }
          ]
        }],
        online: true
@@ -171,7 +181,6 @@
      remarkCan: '',
      // ⬇️adjust调整相关
      isShowAdjust: false,
      isShowCan: false,
      canList: [],
      adjustData: {
        flag: 0,
@@ -200,13 +209,19 @@
    },
    handleEx() {
      const { pagination, filters } = this
      let form = JSON.parse(JSON.stringify(filters))
      if (form.createDate && form.createDate.length > 0) {
        form.startCreateDate = form.createDate[0] + ' 00:00:00'
        form.endCreateDate = form.createDate[1] + ' 23:59:59'
        delete form.createDate
      }
      this.$dialog.exportConfirm('确认导出吗？')
        .then(() => {
          this.loading = true
          comboSaleEx({
            page: 1,
            capacity: 1000000,
            model: filters
            model: form
          })
            .then(response => {
              this.download(response)
@@ -233,9 +248,15 @@
      const { pagination, filters } = this
      this.loading = true
      if (page) { pagination.page = page }
      let form = JSON.parse(JSON.stringify(filters))
      if (form.createDate && form.createDate.length > 0) {
        form.startCreateDate = form.createDate[0] + ' 00:00:00'
        form.endCreateDate = form.createDate[1] + ' 23:59:59'
        delete form.createDate
      }
      comboSalePage({
        model: {
          ...filters
          ...form
        },
        capacity: pagination.pageSize,
        page: pagination.page,