feat(gltTicketOrder): 添加送水订单功能模块

- 在 GltTicketOrder 模型中新增配送员姓名、手机号、仓库名称、用户昵称、头像和手机号字段
- 新增送水订单编辑组件 gltTicketOrderEdit.vue，包含完整的表单验证和数据绑定功能
- 新增搜索组件 search.vue，支持按用户ID和订单编号搜索功能
- 新增送水订单主页面，集成表格展示、搜索、编辑、删除等功能
- 配置送水订单的完整列展示，包括用户信息、门店信息、配送员信息和订单状态
- 启用开发环境 API 地址配置，确保接口请求正常工作

.env.development

@@ -1,5 +1,5 @@
 VITE_APP_NAME=后台管理(开发环境)
-#VITE_API_URL=http://127.0.0.1:9200/api
+VITE_API_URL=http://127.0.0.1:9200/api
 #VITE_SERVER_API_URL=http://127.0.0.1:8000/api
 
 

src/api/glt/gltTicketOrder/model/index.ts

@@ -12,8 +12,14 @@ export interface GltTicketOrder {
   storeId?: number;
   // 配送员
   riderId?: number;
+  // 配送员名称
+  riderName?: string;
+  // 配送员手机号
+  riderPhone?: string;
   // 仓库ID
   warehouseId?: number;
+  // 仓库名称
+  warehouseName?: string;
   // 关联收货地址
   addressId?: number;
   // 收货地址
@@ -26,6 +32,12 @@ export interface GltTicketOrder {
   totalNum?: number;
   // 用户ID
   userId?: number;
+  // 用户昵称
+  nickname?: string;
+  // 用户头像
+  avatar?: string;
+  // 用户手机号
+  phone?: string;
   // 排序(数字越小越靠前)
   sortNumber?: number;
   // 备注

src/views/glt/gltTicketOrder/components/gltTicketOrderEdit.vue

@@ -0,0 +1,284 @@
+<!-- 编辑弹窗 -->
+<template>
+  <ele-modal
+    :width="800"
+    :visible="visible"
+    :maskClosable="false"
+    :maxable="maxable"
+    :title="isUpdate ? '编辑送水订单' : '添加送水订单'"
+    :body-style="{ paddingBottom: '28px' }"
+    @update:visible="updateVisible"
+    @ok="save"
+  >
+    <a-form
+      ref="formRef"
+      :model="form"
+      :rules="rules"
+      :label-col="styleResponsive ? { md: 4, sm: 5, xs: 24 } : { flex: '90px' }"
+      :wrapper-col="
+        styleResponsive ? { md: 19, sm: 19, xs: 24 } : { flex: '1' }
+      "
+    >
+      <a-form-item label="用户水票ID" name="userTicketId">
+        <a-input
+          allow-clear
+          placeholder="请输入用户水票ID"
+          v-model:value="form.userTicketId"
+        />
+      </a-form-item>
+      <a-form-item label="门店ID" name="storeId">
+        <a-input
+          allow-clear
+          placeholder="请输入门店ID"
+          v-model:value="form.storeId"
+        />
+      </a-form-item>
+      <a-form-item label="配送员" name="riderId">
+        <a-input
+          allow-clear
+          placeholder="请输入配送员"
+          v-model:value="form.riderId"
+        />
+      </a-form-item>
+      <a-form-item label="仓库ID" name="warehouseId">
+        <a-input
+          allow-clear
+          placeholder="请输入仓库ID"
+          v-model:value="form.warehouseId"
+        />
+      </a-form-item>
+      <a-form-item label="关联收货地址" name="addressId">
+        <a-input
+          allow-clear
+          placeholder="请输入关联收货地址"
+          v-model:value="form.addressId"
+        />
+      </a-form-item>
+      <a-form-item label="收货地址" name="address">
+        <a-input
+          allow-clear
+          placeholder="请输入收货地址"
+          v-model:value="form.address"
+        />
+      </a-form-item>
+      <a-form-item label="买家留言" name="buyerRemarks">
+        <a-input
+          allow-clear
+          placeholder="请输入买家留言"
+          v-model:value="form.buyerRemarks"
+        />
+      </a-form-item>
+      <a-form-item label="用于统计" name="price">
+        <a-input
+          allow-clear
+          placeholder="请输入用于统计"
+          v-model:value="form.price"
+        />
+      </a-form-item>
+      <a-form-item label="购买数量" name="totalNum">
+        <a-input
+          allow-clear
+          placeholder="请输入购买数量"
+          v-model:value="form.totalNum"
+        />
+      </a-form-item>
+      <a-form-item label="用户ID" name="userId">
+        <a-input
+          allow-clear
+          placeholder="请输入用户ID"
+          v-model:value="form.userId"
+        />
+      </a-form-item>
+      <a-form-item label="排序(数字越小越靠前)" name="sortNumber">
+        <a-input-number
+          :min="0"
+          :max="9999"
+          class="ele-fluid"
+          placeholder="请输入排序号"
+          v-model:value="form.sortNumber"
+        />
+      </a-form-item>
+      <a-form-item label="备注" name="comments">
+        <a-textarea
+          :rows="4"
+          :maxlength="200"
+          placeholder="请输入描述"
+          v-model:value="form.comments"
+        />
+      </a-form-item>
+      <a-form-item label="状态, 0正常, 1冻结" name="status">
+        <a-radio-group v-model:value="form.status">
+          <a-radio :value="0">显示</a-radio>
+          <a-radio :value="1">隐藏</a-radio>
+        </a-radio-group>
+      </a-form-item>
+      <a-form-item label="是否删除, 0否, 1是" name="deleted">
+        <a-input
+          allow-clear
+          placeholder="请输入是否删除, 0否, 1是"
+          v-model:value="form.deleted"
+        />
+      </a-form-item>
+      <a-form-item label="修改时间" name="updateTime">
+        <a-input
+          allow-clear
+          placeholder="请输入修改时间"
+          v-model:value="form.updateTime"
+        />
+      </a-form-item>
+    </a-form>
+  </ele-modal>
+</template>
+
+<script lang="ts" setup>
+  import { ref, reactive, watch } from 'vue';
+  import { Form, message } from 'ant-design-vue';
+  import { assignObject, uuid } from 'ele-admin-pro';
+  import { addGltTicketOrder, updateGltTicketOrder } from '@/api/glt/gltTicketOrder';
+  import { GltTicketOrder } from '@/api/glt/gltTicketOrder/model';
+  import { useThemeStore } from '@/store/modules/theme';
+  import { storeToRefs } from 'pinia';
+  import { ItemType } from 'ele-admin-pro/es/ele-image-upload/types';
+  import { FormInstance } from 'ant-design-vue/es/form';
+  import { FileRecord } from '@/api/system/file/model';
+
+  // 是否是修改
+  const isUpdate = ref(false);
+  const useForm = Form.useForm;
+  // 是否开启响应式布局
+  const themeStore = useThemeStore();
+  const { styleResponsive } = storeToRefs(themeStore);
+
+  const props = defineProps<{
+    // 弹窗是否打开
+    visible: boolean;
+    // 修改回显的数据
+    data?: GltTicketOrder | null;
+  }>();
+
+  const emit = defineEmits<{
+    (e: 'done'): void;
+    (e: 'update:visible', visible: boolean): void;
+  }>();
+
+  // 提交状态
+  const loading = ref(false);
+  // 是否显示最大化切换按钮
+  const maxable = ref(true);
+  // 表格选中数据
+  const formRef = ref<FormInstance | null>(null);
+  const images = ref<ItemType[]>([]);
+
+  // 用户信息
+  const form = reactive<GltTicketOrder>({
+    id: undefined,
+    userTicketId: undefined,
+    storeId: undefined,
+    riderId: undefined,
+    warehouseId: undefined,
+    addressId: undefined,
+    address: undefined,
+    buyerRemarks: undefined,
+    price: undefined,
+    totalNum: undefined,
+    userId: undefined,
+    sortNumber: undefined,
+    comments: undefined,
+    status: undefined,
+    deleted: undefined,
+    tenantId: undefined,
+    createTime: undefined,
+    updateTime: undefined,
+    gltTicketOrderId: undefined,
+    gltTicketOrderName: '',
+    status: 0,
+    comments: '',
+    sortNumber: 100
+  });
+
+  /* 更新visible */
+  const updateVisible = (value: boolean) => {
+    emit('update:visible', value);
+  };
+
+  // 表单验证规则
+  const rules = reactive({
+    gltTicketOrderName: [
+      {
+        required: true,
+        type: 'string',
+        message: '请填写送水订单名称',
+        trigger: 'blur'
+      }
+    ]
+  });
+
+  const chooseImage = (data: FileRecord) => {
+    images.value.push({
+      uid: data.id,
+      url: data.path,
+      status: 'done'
+    });
+    form.image = data.path;
+  };
+
+  const onDeleteItem = (index: number) => {
+    images.value.splice(index, 1);
+    form.image = '';
+  };
+
+  const { resetFields } = useForm(form, rules);
+
+  /* 保存编辑 */
+  const save = () => {
+    if (!formRef.value) {
+      return;
+    }
+    formRef.value
+      .validate()
+      .then(() => {
+        loading.value = true;
+        const formData = {
+          ...form
+        };
+        const saveOrUpdate = isUpdate.value ? updateGltTicketOrder : addGltTicketOrder;
+        saveOrUpdate(formData)
+          .then((msg) => {
+            loading.value = false;
+            message.success(msg);
+            updateVisible(false);
+            emit('done');
+          })
+          .catch((e) => {
+            loading.value = false;
+            message.error(e.message);
+          });
+      })
+      .catch(() => {});
+  };
+
+  watch(
+    () => props.visible,
+    (visible) => {
+      if (visible) {
+        images.value = [];
+        if (props.data) {
+          assignObject(form, props.data);
+          if(props.data.image){
+            images.value.push({
+              uid: uuid(),
+              url: props.data.image,
+              status: 'done'
+            })
+          }
+          isUpdate.value = true;
+        } else {
+          isUpdate.value = false;
+        }
+      } else {
+        resetFields();
+      }
+    },
+    { immediate: true }
+  );
+</script>

src/views/glt/gltTicketOrder/components/search.vue

@@ -0,0 +1,51 @@
+<!-- 搜索表单 -->
+<template>
+  <a-space :size="10" style="flex-wrap: wrap">
+    <a-input-search
+      allow-clear
+      placeholder="用户ID|订单编号"
+      style="width: 240px"
+      v-model:value="where.keywords"
+      @search="reload"
+    />
+  </a-space>
+</template>
+
+<script lang="ts" setup>
+import {watch} from 'vue';
+import useSearch from "@/utils/use-search";
+import {GltUserTicketParam} from "@/api/glt/gltUserTicket/model";
+
+const props = withDefaults(
+  defineProps<{
+    // 选中的角色
+    selection?: [];
+  }>(),
+  {}
+);
+
+const emit = defineEmits<{
+  (e: 'search', where?: GltUserTicketParam): void;
+  (e: 'add'): void;
+  (e: 'remove'): void;
+  (e: 'batchMove'): void;
+}>();
+
+// 表单数据
+const {where} = useSearch<GltUserTicketParam>({
+  keywords: '',
+  userId: undefined
+});
+
+
+const reload = () => {
+  emit('search', where);
+};
+
+
+watch(
+  () => props.selection,
+  () => {
+  }
+);
+</script>

src/views/glt/gltTicketOrder/index.vue

@@ -0,0 +1,305 @@
+<template>
+  <a-page-header :title="getPageTitle()" @back="() => $router.go(-1)">
+      <a-card :bordered="false" :body-style="{ padding: '16px' }">
+        <ele-pro-table
+          ref="tableRef"
+          row-key="id"
+          :columns="columns"
+          :datasource="datasource"
+          :customRow="customRow"
+          tool-class="ele-toolbar-form"
+          class="sys-org-table"
+        >
+          <template #toolbar>
+            <search
+              @search="reload"
+              :selection="selection"
+              @add="openEdit"
+              @remove="removeBatch"
+              @batchMove="openMove"
+            />
+          </template>
+          <template #bodyCell="{ column, record }">
+            <template v-if="column.key ==='nickname'">
+              <a-space>
+                <a-avatar :src="record.avatar" />
+                <div class="flex flex-col">
+                  <div class="font-bold">{{ record.nickname }}</div>
+                  <div class="text-gray-400">送货地址：{{ record.address }}</div>
+                  <div class="text-blue-400">联系电话：{{ record.phone }}</div>
+                  <div class="text-gray-400">买家留言：{{ record.buyerRemarks }}</div>
+                </div>
+              </a-space>
+            </template>
+            <template v-if="column.key === 'storeName'">
+              <a-space>
+                <div class="flex flex-col">
+                  <div class="font-bold">{{ record.storeName }}</div>
+                  <div class="text-gray-400">门店地址：{{ record.storeAddress }}</div>
+                  <div class="text-blue-400">门店电话：{{ record.storePhone }}</div>
+                  <div class="text-gray-400">仓库地址：{{ record.warehouseAddress }}</div>
+                </div>
+              </a-space>
+            </template>
+            <template v-if="column.key === 'riderName'">
+              <a-space>
+                <div class="flex flex-col" v-if="record.riderName">
+                  <div class="font-bold">{{ record.riderName }}</div>
+                  <div class="text-blue-400" v-if="record.riderPhone">联系电话：{{ record.riderPhone }}</div>
+                  <div class="text-gray-400">配送时间：{{ '-' }}</div>
+<!--                  <div class="text-blue-400">切换</div>-->
+                </div>
+              </a-space>
+            </template>
+            <template v-if="column.key === 'image'">
+              <a-image :src="record.image" :width="50" />
+            </template>
+            <template v-if="column.key === 'status'">
+              <a-tag v-if="record.status === 0" color="green">待配送</a-tag>
+              <a-tag v-if="record.status === 1" color="red">已派送</a-tag>
+              <a-tag v-if="record.status === 2" color="red">已送达</a-tag>
+              <a-tag v-if="record.status === 3" color="red">已签收</a-tag>
+            </template>
+            <template v-if="column.key ==='createTime'">
+              <a-space>
+                <div class="flex flex-col">
+                  <div class="text-gray-400">下单时间：{{ record.createTime }}</div>
+                  <div class="text-gray-400">派送时间：{{ record.updateTime }}</div>
+                  <div class="text-gray-400">送达时间：{{ record.createTime }}</div>
+                  <div class="text-gray-400">签收时间：{{ record.updateTime }}</div>
+                </div>
+              </a-space>
+            </template>
+            <template v-if="column.key === 'action'">
+              <a-space>
+                <a @click="openEdit(record)">修改</a>
+                <a-divider type="vertical" />
+                <a-popconfirm
+                  title="确定要删除此记录吗？"
+                  @confirm="remove(record)"
+                >
+                  <a class="ele-text-danger">删除</a>
+                </a-popconfirm>
+              </a-space>
+            </template>
+          </template>
+        </ele-pro-table>
+      </a-card>
+
+      <!-- 编辑弹窗 -->
+      <GltTicketOrderEdit v-model:visible="showEdit" :data="current" @done="reload" />
+  </a-page-header>
+</template>
+
+<script lang="ts" setup>
+  import { createVNode, ref } from 'vue';
+  import { message, Modal } from 'ant-design-vue';
+  import { ExclamationCircleOutlined } from '@ant-design/icons-vue';
+  import type { EleProTable } from 'ele-admin-pro';
+  import { toDateString } from 'ele-admin-pro';
+  import type {
+    DatasourceFunction,
+    ColumnItem
+  } from 'ele-admin-pro/es/ele-pro-table/types';
+  import Search from './components/search.vue';
+  import {getPageTitle} from '@/utils/common';
+  import GltTicketOrderEdit from './components/gltTicketOrderEdit.vue';
+  import { pageGltTicketOrder, removeGltTicketOrder, removeBatchGltTicketOrder } from '@/api/glt/gltTicketOrder';
+  import type { GltTicketOrder, GltTicketOrderParam } from '@/api/glt/gltTicketOrder/model';
+
+  // 表格实例
+  const tableRef = ref<InstanceType<typeof EleProTable> | null>(null);
+
+  // 表格选中数据
+  const selection = ref<GltTicketOrder[]>([]);
+  // 当前编辑数据
+  const current = ref<GltTicketOrder | null>(null);
+  // 是否显示编辑弹窗
+  const showEdit = ref(false);
+  // 是否显示批量移动弹窗
+  const showMove = ref(false);
+  // 加载状态
+  const loading = ref(true);
+
+  // 表格数据源
+  const datasource: DatasourceFunction = ({
+    page,
+    limit,
+    where,
+    orders,
+    filters
+  }) => {
+    if (filters) {
+      where.status = filters.status;
+    }
+    return pageGltTicketOrder({
+      ...where,
+      ...orders,
+      page,
+      limit
+    });
+  };
+
+  // 完整的列配置（包含所有字段）
+  const columns = ref<ColumnItem[]>([
+    {
+      title: '票号',
+      dataIndex: 'userTicketId',
+      key: 'userTicketId',
+      width: 90
+    },
+    {
+      title: '订水用户',
+      dataIndex: 'nickname',
+      key: 'nickname',
+      width: 360
+    },
+    // {
+    //   title: '送货地址',
+    //   dataIndex: 'address',
+    //   key: 'address'
+    // },
+    {
+      title: '下单门店',
+      dataIndex: 'storeName',
+      key: 'storeName'
+    },
+    {
+      title: '配送员',
+      dataIndex: 'riderName',
+      key: 'riderName'
+    },
+    {
+      title: '送水数量(桶)',
+      dataIndex: 'totalNum',
+      key: 'totalNum',
+      align: 'center'
+    },
+    // {
+    //   title: '买家留言',
+    //   dataIndex: 'buyerRemarks',
+    //   key: 'buyerRemarks'
+    // },
+    // {
+    //   title: '用于统计',
+    //   dataIndex: 'price',
+    //   key: 'price'
+    // },
+    // {
+    //   title: '备注',
+    //   dataIndex: 'comments',
+    //   key: 'comments',
+    //   ellipsis: true
+    // },
+    {
+      title: '下单时间',
+      dataIndex: 'createTime',
+      key: 'createTime',
+      width: 250,
+      align: 'center',
+      customRender: ({ text }) => toDateString(text, 'yyyy-MM-dd HH:mm:ss')
+    },
+    {
+      title: '状态',
+      dataIndex: 'status',
+      key: 'status',
+      align: 'center',
+      width: 120
+    }
+    // {
+    //   title: '操作',
+    //   key: 'action',
+    //   width: 180,
+    //   fixed: 'right',
+    //   align: 'center',
+    //   hideInSetting: true
+    // }
+  ]);
+
+  /* 搜索 */
+  const reload = (where?: GltTicketOrderParam) => {
+    selection.value = [];
+    tableRef?.value?.reload({ where: where });
+  };
+
+  /* 打开编辑弹窗 */
+  const openEdit = (row?: GltTicketOrder) => {
+    current.value = row ?? null;
+    showEdit.value = true;
+  };
+
+  /* 打开批量移动弹窗 */
+  const openMove = () => {
+    showMove.value = true;
+  };
+
+  /* 删除单个 */
+  const remove = (row: GltTicketOrder) => {
+    const hide = message.loading('请求中..', 0);
+    removeGltTicketOrder(row.id)
+      .then((msg) => {
+        hide();
+        message.success(msg);
+        reload();
+      })
+      .catch((e) => {
+        hide();
+        message.error(e.message);
+      });
+  };
+
+  /* 批量删除 */
+  const removeBatch = () => {
+    if (!selection.value.length) {
+      message.error('请至少选择一条数据');
+      return;
+    }
+    Modal.confirm({
+      title: '提示',
+      content: '确定要删除选中的记录吗?',
+      icon: createVNode(ExclamationCircleOutlined),
+      maskClosable: true,
+      onOk: () => {
+        const hide = message.loading('请求中..', 0);
+        removeBatchGltTicketOrder(selection.value.map((d) => d.id))
+          .then((msg) => {
+            hide();
+            message.success(msg);
+            reload();
+          })
+          .catch((e) => {
+            hide();
+            message.error(e.message);
+          });
+      }
+    });
+  };
+
+  /* 查询 */
+  const query = () => {
+    loading.value = true;
+  };
+
+  /* 自定义行属性 */
+  const customRow = (record: GltTicketOrder) => {
+    return {
+      // 行点击事件
+      onClick: () => {
+        // console.log(record);
+      },
+      // 行双击事件
+      onDblclick: () => {
+        openEdit(record);
+      }
+    };
+  };
+  query();
+</script>
+
+<script lang="ts">
+  export default {
+    name: 'GltTicketOrder'
+  };
+</script>
+
+<style lang="less" scoped></style>