查询条件微调

2024-07-24 15:48:21 +08:00 · 2024-07-24 15:48:21 +08:00 · d1a26b469b
commit d1a26b469b
parent d35742e5c8
6 changed files with 154 additions and 199 deletions
--- a/src/views/parking/appearancerecord/index.vue
+++ b/src/views/parking/appearancerecord/index.vue
@ -6,7 +6,7 @@
      :model="queryParams"
      ref="queryFormRef"
      :inline="true"
-      label-width="68px"
+      label-width="auto"
    >
      <el-form-item label="停车场编号" prop="parkNumber">
        <el-input
@ -73,7 +73,7 @@
          class="!w-240px"
        />
      </el-form-item>
-      <el-form-item label="车牌颜色" prop="plateColor">
+      <!-- <el-form-item label="车牌颜色" prop="plateColor">
        <el-input
          v-model="queryParams.plateColor"
          placeholder="请输入车牌颜色"
@ -445,8 +445,8 @@
          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
          class="!w-240px"
        />
-      </el-form-item>
-      <el-form-item>
+      </el-form-item> -->
+      <el-form-item style="float: right;">
        <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
        <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
        <el-button
@ -473,7 +473,10 @@
  <!-- 列表 -->
  <ContentWrap>
    <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
-      <el-table-column label="id" align="center" prop="id" />
+      <!-- <el-table-column label="id" align="center" prop="id" /> -->
+      <el-table-column label="序号" align="center" >
+        <template #default="scope">{{ (queryParams.pageNo - 1) * queryParams.pageSize + scope.$index + 1 }}</template>
+      </el-table-column>
      <el-table-column label="停车场编号" align="center" prop="parkNumber" />
      <el-table-column label="数据条数" align="center" prop="size" />
      <el-table-column
--- a/src/views/parking/channel/index.vue
+++ b/src/views/parking/channel/index.vue
@ -1,96 +1,56 @@
 <template>
  <ContentWrap>
    <!-- 搜索工作栏 -->
-    <el-form
-      class="-mb-15px"
-      :model="queryParams"
-      ref="queryFormRef"
-      :inline="true"
-      label-width="68px"
-    >
+    <el-form class="-mb-15px" :model="queryParams" ref="queryFormRef" :inline="true" label-width="auto">
      <el-form-item label="场库编号" prop="parkNumber">
        <el-input
-          v-model="queryParams.parkNumber"
-          placeholder="请输入场库编号"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
+v-model="queryParams.parkNumber" placeholder="请输入场库编号" clearable @keyup.enter="handleQuery"
+          class="!w-240px" />
      </el-form-item>
      <el-form-item label="数据条数" prop="size">
        <el-input
-          v-model="queryParams.size"
-          placeholder="请输入数据条数"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
+v-model="queryParams.size" placeholder="请输入数据条数" clearable @keyup.enter="handleQuery"
+          class="!w-240px" />
      </el-form-item>
      <el-form-item label="通道 Id" prop="passagewayId">
        <el-input
-          v-model="queryParams.passagewayId"
-          placeholder="请输入通道 Id"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
+v-model="queryParams.passagewayId" placeholder="请输入通道 Id" clearable @keyup.enter="handleQuery"
+          class="!w-240px" />
      </el-form-item>
      <el-form-item label="通道名称" prop="passagewayName">
        <el-input
-          v-model="queryParams.passagewayName"
-          placeholder="请输入通道名称"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
+v-model="queryParams.passagewayName" placeholder="请输入通道名称" clearable @keyup.enter="handleQuery"
+          class="!w-240px" />
      </el-form-item>
      <el-form-item label="源区域 Id" prop="sourceAreaId">
        <el-input
-          v-model="queryParams.sourceAreaId"
-          placeholder="请输入源区域 Id"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
+v-model="queryParams.sourceAreaId" placeholder="请输入源区域 Id" clearable @keyup.enter="handleQuery"
+          class="!w-240px" />
      </el-form-item>
      <el-form-item label="目标区域 Id" prop="targetAreaId">
        <el-input
-          v-model="queryParams.targetAreaId"
-          placeholder="请输入目标区域 Id"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
+v-model="queryParams.targetAreaId" placeholder="请输入目标区域 Id" clearable @keyup.enter="handleQuery"
+          class="!w-240px" />
      </el-form-item>
      <el-form-item label="创建时间" prop="createTime">
        <el-date-picker
-          v-model="queryParams.createTime"
-          value-format="YYYY-MM-DD HH:mm:ss"
-          type="daterange"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
-          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
-          class="!w-240px"
-        />
+v-model="queryParams.createTime" value-format="YYYY-MM-DD HH:mm:ss" type="daterange"
+          start-placeholder="开始日期" end-placeholder="结束日期"
+          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]" class="!w-240px" />
      </el-form-item>
-      <el-form-item>
-        <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
-        <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
-        <el-button
-          type="primary"
-          plain
-          @click="openForm('create')"
-          v-hasPermi="['channel:information:create']"
-        >
+      <el-form-item style="float:right;">
+        <el-button @click="handleQuery">
+          <Icon icon="ep:search" class="mr-5px" /> 搜索
+        </el-button>
+        <el-button @click="resetQuery">
+          <Icon icon="ep:refresh" class="mr-5px" /> 重置
+        </el-button>
+        <el-button type="primary" plain @click="openForm('create')" v-hasPermi="['channel:information:create']">
          <Icon icon="ep:plus" class="mr-5px" /> 新增
        </el-button>
        <el-button
-          type="success"
-          plain
-          @click="handleExport"
-          :loading="exportLoading"
-          v-hasPermi="['channel:information:export']"
-        >
+type="success" plain @click="handleExport" :loading="exportLoading"
+          v-hasPermi="['channel:information:export']">
          <Icon icon="ep:download" class="mr-5px" /> 导出
        </el-button>
      </el-form-item>
@ -100,36 +60,25 @@
  <!-- 列表 -->
  <ContentWrap>
    <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
-      <el-table-column label="id" align="center" prop="id" />
+      <!-- <el-table-column label="id" align="center" prop="id" /> -->
+      <el-table-column label="序号" align="center" >
+        <template #default="scope">{{ (queryParams.pageNo - 1) * queryParams.pageSize + scope.$index + 1 }}</template>
+      </el-table-column>
      <el-table-column label="场库编号" align="center" prop="parkNumber" />
      <el-table-column label="数据条数" align="center" prop="size" />
      <el-table-column label="通道 Id" align="center" prop="passagewayId" />
      <el-table-column label="通道名称" align="center" prop="passagewayName" />
      <el-table-column label="源区域 Id" align="center" prop="sourceAreaId" />
      <el-table-column label="目标区域 Id" align="center" prop="targetAreaId" />
-      <el-table-column
-        label="创建时间"
-        align="center"
-        prop="createTime"
-        :formatter="dateFormatter"
-        width="180px"
-      />
+      <el-table-column label="创建时间" align="center" prop="createTime" :formatter="dateFormatter" width="180px" />
      <el-table-column label="操作" align="center">
        <template #default="scope">
          <el-button
-            link
-            type="primary"
-            @click="openForm('update', scope.row.id)"
-            v-hasPermi="['channel:information:update']"
-          >
+link type="primary" @click="openForm('update', scope.row.id)"
+            v-hasPermi="['channel:information:update']">
            编辑
          </el-button>
-          <el-button
-            link
-            type="danger"
-            @click="handleDelete(scope.row.id)"
-            v-hasPermi="['channel:information:delete']"
-          >
+          <el-button link type="danger" @click="handleDelete(scope.row.id)" v-hasPermi="['channel:information:delete']">
            删除
          </el-button>
        </template>
@ -137,11 +86,8 @@
    </el-table>
    <!-- 分页 -->
    <Pagination
-      :total="total"
-      v-model:page="queryParams.pageNo"
-      v-model:limit="queryParams.pageSize"
-      @pagination="getList"
-    />
+:total="total" v-model:page="queryParams.pageNo" v-model:limit="queryParams.pageSize"
+      @pagination="getList" />
  </ContentWrap>

  <!-- 表单弹窗：添加/修改 -->
@ -149,94 +95,94 @@
 </template>

 <script setup lang="ts">
-import { dateFormatter } from '@/utils/formatTime'
-import download from '@/utils/download'
-import { InformationApi, InformationVO } from '@/api/parking/channel'
-import InformationForm from './InformationForm.vue'
+  import { dateFormatter } from '@/utils/formatTime'
+  import download from '@/utils/download'
+  import { InformationApi, InformationVO } from '@/api/parking/channel'
+  import InformationForm from './InformationForm.vue'

-/** 通道信息 列表 */
-defineOptions({ name: 'ChannelInformation' })
+  /** 通道信息 列表 */
+  defineOptions({ name: 'ChannelInformation' })

-const message = useMessage() // 消息弹窗
-const { t } = useI18n() // 国际化
+  const message = useMessage() // 消息弹窗
+  const { t } = useI18n() // 国际化

-const loading = ref(true) // 列表的加载中
-const list = ref<InformationVO[]>([]) // 列表的数据
-const total = ref(0) // 列表的总页数
-const queryParams = reactive({
-  pageNo: 1,
-  pageSize: 10,
-  parkNumber: undefined,
-  size: undefined,
-  passagewayId: undefined,
-  passagewayName: undefined,
-  sourceAreaId: undefined,
-  targetAreaId: undefined,
-  createTime: [],
-})
-const queryFormRef = ref() // 搜索的表单
-const exportLoading = ref(false) // 导出的加载中
+  const loading = ref(true) // 列表的加载中
+  const list = ref<InformationVO[]>([]) // 列表的数据
+  const total = ref(0) // 列表的总页数
+  const queryParams = reactive({
+    pageNo: 1,
+    pageSize: 10,
+    parkNumber: undefined,
+    size: undefined,
+    passagewayId: undefined,
+    passagewayName: undefined,
+    sourceAreaId: undefined,
+    targetAreaId: undefined,
+    createTime: [],
+  })
+  const queryFormRef = ref() // 搜索的表单
+  const exportLoading = ref(false) // 导出的加载中

-/** 查询列表 */
-const getList = async () => {
-  loading.value = true
-  try {
-    const data = await InformationApi.getInformationPage(queryParams)
-    list.value = data.list
-    total.value = data.total
-  } finally {
-    loading.value = false
+  /** 查询列表 */
+  const getList = async () => {
+    loading.value = true
+    try {
+      const data = await InformationApi.getInformationPage(queryParams)
+      list.value = data.list
+      total.value = data.total
+    } finally {
+      loading.value = false
+    }
  }
-}

-/** 搜索按钮操作 */
-const handleQuery = () => {
-  queryParams.pageNo = 1
-  getList()
-}
-
-/** 重置按钮操作 */
-const resetQuery = () => {
-  queryFormRef.value.resetFields()
-  handleQuery()
-}
-
-/** 添加/修改操作 */
-const formRef = ref()
-const openForm = (type: string, id?: number) => {
-  formRef.value.open(type, id)
-}
-
-/** 删除按钮操作 */
-const handleDelete = async (id: number) => {
-  try {
-    // 删除的二次确认
-    await message.delConfirm()
-    // 发起删除
-    await InformationApi.deleteInformation(id)
-    message.success(t('common.delSuccess'))
-    // 刷新列表
-    await getList()
-  } catch {}
-}
-
-/** 导出按钮操作 */
-const handleExport = async () => {
-  try {
-    // 导出的二次确认
-    await message.exportConfirm()
-    // 发起导出
-    exportLoading.value = true
-    const data = await InformationApi.exportInformation(queryParams)
-    download.excel(data, '通道信息.xls')
-  } catch {
-  } finally {
-    exportLoading.value = false
+  /** 搜索按钮操作 */
+  const handleQuery = () => {
+    queryParams.pageNo = 1
+    getList()
  }
-}

-/** 初始化 **/
-onMounted(() => {
-  getList()
-})
+  /** 重置按钮操作 */
+  const resetQuery = () => {
+    queryFormRef.value.resetFields()
+    handleQuery()
+  }
+
+  /** 添加/修改操作 */
+  const formRef = ref()
+  const openForm = (type: string, id?: number) => {
+    formRef.value.open(type, id)
+  }
+
+  /** 删除按钮操作 */
+  const handleDelete = async (id: number) => {
+    try {
+      // 删除的二次确认
+      await message.delConfirm()
+      // 发起删除
+      await InformationApi.deleteInformation(id)
+      message.success(t('common.delSuccess'))
+      // 刷新列表
+      await getList()
+    } catch { }
+  }
+
+  /** 导出按钮操作 */
+  const handleExport = async () => {
+    try {
+      // 导出的二次确认
+      await message.exportConfirm()
+      // 发起导出
+      exportLoading.value = true
+      const data = await InformationApi.exportInformation(queryParams)
+      download.excel(data, '通道信息.xls')
+    } catch {
+    } finally {
+      exportLoading.value = false
+    }
+  }
+
+  /** 初始化 **/
+  onMounted(() => {
+    getList()
+  })
 </script>
--- a/src/views/parking/chargeinformation/index.vue
+++ b/src/views/parking/chargeinformation/index.vue
@ -6,7 +6,7 @@
      :model="queryParams"
      ref="queryFormRef"
      :inline="true"
-      label-width="68px"
+      label-width="auto"
    >
      <el-form-item label="场库编号" prop="parkNumber">
        <el-input
@ -75,7 +75,7 @@
          class="!w-240px"
        />
      </el-form-item>
-      <el-form-item label="支付类型" prop="payKind">
+      <!-- <el-form-item label="支付类型" prop="payKind">
        <el-input
          v-model="queryParams.payKind"
          placeholder="请输入支付类型"
@ -212,8 +212,8 @@
          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
          class="!w-240px"
        />
-      </el-form-item>
-      <el-form-item>
+      </el-form-item> -->
+      <el-form-item style="float:right;">
        <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
        <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
        <el-button
@ -240,7 +240,10 @@
  <!-- 列表 -->
  <ContentWrap>
    <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
-      <el-table-column label="id" align="center" prop="id" />
+      <!-- <el-table-column label="id" align="center" prop="id" /> -->
+      <el-table-column label="序号" align="center" >
+        <template #default="scope">{{ (queryParams.pageNo - 1) * queryParams.pageSize + scope.$index + 1 }}</template>
+      </el-table-column>
      <el-table-column label="场库编号" align="center" prop="parkNumber" />
      <el-table-column label="收费信息数量" align="center" prop="size" />
      <el-table-column label="车牌号" align="center" prop="plate" />
--- a/src/views/parking/entryrecord/index.vue
+++ b/src/views/parking/entryrecord/index.vue
@ -6,7 +6,7 @@
      :model="queryParams"
      ref="queryFormRef"
      :inline="true"
-      label-width="68px"
+      label-width="auto"
    >
      <el-form-item label="停车场编号" prop="parkNumber">
        <el-input
@ -73,7 +73,7 @@
          class="!w-240px"
        />
      </el-form-item>
-      <el-form-item label="入场记录编号" prop="orderId">
+      <!-- <el-form-item label="入场记录编号" prop="orderId">
        <el-input
          v-model="queryParams.orderId"
          placeholder="请输入入场记录编号"
@ -239,8 +239,8 @@
          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
          class="!w-240px"
        />
-      </el-form-item>
-      <el-form-item>
+      </el-form-item> -->
+      <el-form-item style="float: right;">
        <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
        <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
        <el-button
@ -267,7 +267,10 @@
  <!-- 列表 -->
  <ContentWrap>
    <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
-      <el-table-column label="id" align="center" prop="id" />
+      <!-- <el-table-column label="id" align="center" prop="id" /> -->
+      <el-table-column label="序号" align="center" >
+        <template #default="scope">{{ (queryParams.pageNo - 1) * queryParams.pageSize + scope.$index + 1 }}</template>
+      </el-table-column>
      <el-table-column label="停车场编号" align="center" prop="parkNumber" />
      <el-table-column label="数据条数" align="center" prop="size" />
      <el-table-column label="车牌" align="center" prop="plate" />
--- a/src/views/ticket/checkticket/index.vue
+++ b/src/views/ticket/checkticket/index.vue
@ -46,11 +46,11 @@
          class="!w-240px"
        />
      </el-form-item>
-      <!--
+      
      <el-form-item label="检票日期" prop="checkticketdate">
        <el-date-picker
          v-model="queryParams.checkticketdate"
-          value-format="YYYY-MM-DD HH:mm:ss"
+          value-format="YYYYMMDD"
          type="daterange"
          start-placeholder="开始日期"
          end-placeholder="结束日期"
@ -58,18 +58,18 @@
          class="!w-240px"
        />
      </el-form-item>
-      <el-form-item label="检票时间" prop="checktickettime">
+      <!-- <el-form-item label="检票时间" prop="checktickettime">
        <el-date-picker
          v-model="queryParams.checktickettime"
-          value-format="YYYY-MM-DD HH:mm:ss"
+          value-format="YYYYMMDD"
          type="daterange"
          start-placeholder="开始日期"
          end-placeholder="结束日期"
          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
          class="!w-240px"
        />
-      </el-form-item>
-      
+      </el-form-item> -->
+      <!--
      <el-form-item label="人数" prop="personcount">
        <el-input
          v-model="queryParams.personcount"
@ -148,7 +148,7 @@
      <el-table-column label="人数" align="center" prop="personcount" />
      <el-table-column label="订单明细ID" align="center" prop="sdshipping" />
      <el-table-column label="票ID" align="center" prop="ticket" />
-      <el-table-column label="销售特征名称（票种名称）" align="center" prop="salepropetyvaluename" />
+      <!-- <el-table-column label="销售特征名称（票种名称）" align="center" prop="salepropetyvaluename" /> -->
      <el-table-column label="操作" align="center">
        <template #default="scope">
          <el-button
--- a/src/views/ticket/saledata/index.vue
+++ b/src/views/ticket/saledata/index.vue
@ -28,7 +28,7 @@
          class="!w-240px"
        />
      </el-form-item>
-      <el-form-item label="金额" prop="amount">
+      <!-- <el-form-item label="金额" prop="amount">
        <el-input
          v-model="queryParams.amount"
          placeholder="请输入金额"
@ -36,7 +36,7 @@
          @keyup.enter="handleQuery"
          class="!w-240px"
        />
-      </el-form-item>
+      </el-form-item> -->
      <el-form-item label="证件号" prop="certificateno">
        <el-input
          v-model="queryParams.certificateno"
@ -113,10 +113,11 @@
          class="!w-240px"
        />
      </el-form-item>
+      -->
      <el-form-item label="销售日期" prop="sddate">
        <el-date-picker
          v-model="queryParams.sddate"
-          value-format="YYYY-MM-DD HH:mm:ss"
+          value-format="YYYYMMDD"
          type="daterange"
          start-placeholder="开始日期"
          end-placeholder="结束日期"
@ -124,7 +125,6 @@
          class="!w-240px"
        />
      </el-form-item>
-      -->
      <el-form-item label="订单号" prop="sdno">
        <el-input
          v-model="queryParams.sdno"
@ -134,7 +134,7 @@
          class="!w-240px"
        />
      </el-form-item>
-      <!--
+      <!-- 
      <el-form-item label="销售时间" prop="sdtime">
        <el-date-picker
          v-model="queryParams.sdtime"