Merge remote-tracking branch 'origin/master'

jiangping

2025-02-26 4e2e52b766d87fc528d02bdebc1757c3dda8c596

 admin/src/views/platform/LogisticsRecord/subscribe.vue

@@ -41,6 +41,7 @@
        <template v-slot="scope">
          <el-button type="text" v-permissions="['business:platformbooks:detail']"
            @click="handleDetail(scope.row)">预约详情</el-button>
          <el-button  type="text" class="red" v-permissions="['business:platformjob:delete']" @click="handleDel(scope.row)">删除</el-button>
        </template>
      </el-table-column>
    </el-table>
@@ -144,7 +145,6 @@
      rules: {
        contractNum: [{ required: true, message: '请输入', trigger: 'blur' }],
        totalNum: [{ required: true, message: '请输入', trigger: 'blur' }],
        driverName: [{ required: true, message: '请输入', trigger: 'blur' }],
        driverPhone: [{ required: true, message: '请输入', trigger: 'blur' }],
        carCodeFront: [{ required: true, message: '请输入', trigger: 'blur' }],
        carCodeBack: [{ required: true, message: '请输入', trigger: 'blur' }],
@@ -197,7 +197,7 @@
          }
        ],
        online: true
      },
      }
    }
  },
  created() {
@@ -256,11 +256,16 @@
    handleEx() {
      this.$dialog.exportConfirm('确认导出吗？')
        .then(() => {
          const { filters } = this
          this.exLoading = true
          platformBooksExport({
            page: this.pagination.page,
            capacity: 1000000,
            model: this.filters
            model: {
              ...filters,
              arriveDateStart: filters.selDate && filters.selDate.length > 0 ? filters.selDate[0] : null,
              arriveDateEnd: filters.selDate && filters.selDate.length > 0 ? filters.selDate[1] : null,
            },
          })
            .then(response => {
              this.download(response)
@@ -320,9 +325,9 @@
      this.pagination.page = 1
      this.filters = {
        selDate: [],
        fastdate: 0,
      }
      this.changeRadio('0')
      this.getList()
      // this.changeRadio('0')
    },
    handleDetail(row) {
      this.isShowDriver = true
@@ -348,4 +353,4 @@
  color: #000000;
  margin-bottom: 15px;
}
</style>
</style>