增加物流公司模块

src/api/company/logisticsCompany/index.ts

@@ -0,0 +1,75 @@
+import request from '@/utils/request';
+import { AxiosPromise } from 'axios';
+import { LogisticsCompanyVO, LogisticsCompanyForm, LogisticsCompanyQuery } from '@/api/company/logisticsCompany/types';
+
+/**
+ * 查询物流公司列表
+ * @param query
+ * @returns {*}
+ */
+
+export const listLogisticsCompany = (query?: LogisticsCompanyQuery): AxiosPromise<LogisticsCompanyVO[]> => {
+  return request({
+    url: '/system/logisticsCompany/list',
+    method: 'get',
+    params: query
+  });
+};
+
+/**
+ * 查询物流公司详细
+ * @param id
+ */
+export const getLogisticsCompany = (id: string | number): AxiosPromise<LogisticsCompanyVO> => {
+  return request({
+    url: '/system/logisticsCompany/' + id,
+    method: 'get'
+  });
+};
+
+/**
+ * 新增物流公司
+ * @param data
+ */
+export const addLogisticsCompany = (data: LogisticsCompanyForm) => {
+  return request({
+    url: '/system/logisticsCompany',
+    method: 'post',
+    data: data
+  });
+};
+
+/**
+ * 修改物流公司
+ * @param data
+ */
+export const updateLogisticsCompany = (data: LogisticsCompanyForm) => {
+  return request({
+    url: '/system/logisticsCompany',
+    method: 'put',
+    data: data
+  });
+};
+
+/**
+ * 删除物流公司
+ * @param id
+ */
+export const delLogisticsCompany = (id: string | number | Array<string | number>) => {
+  return request({
+    url: '/system/logisticsCompany/' + id,
+    method: 'delete'
+  });
+};
+
+export function changeStatus(id: string | number, isShow: string) {
+  const data = {
+    id,
+    isShow
+  };
+  return request({
+    url: '/system/logisticsCompany/changeStatus',
+    method: 'put',
+    data: data
+  });
+}

src/api/company/logisticsCompany/types.ts

@@ -0,0 +1,110 @@
+export interface LogisticsCompanyVO {
+  /**
+   * 主键ID
+   */
+  id: string | number;
+
+  /**
+   * 物流公司编码
+   */
+  logisticsCode: string;
+
+  /**
+   * 物流公司名称
+   */
+  logisticsName: string;
+
+  /**
+   * 物流公司描述
+   */
+  logisticsDescription: string;
+
+  /**
+   * 是否显示
+   */
+  isShow: string;
+
+  /**
+   * 数据来源
+   */
+  dataSource: string;
+
+  /**
+   * 备注
+   */
+  remark: string;
+}
+
+export interface LogisticsCompanyForm extends BaseEntity {
+  /**
+   * 主键ID
+   */
+  id?: string | number;
+
+  /**
+   * 物流公司编码
+   */
+  logisticsCode?: string;
+
+  /**
+   * 物流公司名称
+   */
+  logisticsName?: string;
+
+  /**
+   * 物流公司描述
+   */
+  logisticsDescription?: string;
+
+  /**
+   * 是否显示
+   */
+  isShow?: string;
+
+  /**
+   * 数据来源
+   */
+  dataSource?: string;
+
+  /**
+   * 备注
+   */
+  remark?: string;
+}
+
+export interface LogisticsCompanyQuery extends PageQuery {
+  /**
+   * 物流公司编码
+   */
+  logisticsCode?: string;
+
+  /**
+   * 物流公司名称
+   */
+  logisticsName?: string;
+
+  /**
+   * 物流公司描述
+   */
+  logisticsDescription?: string;
+
+  /**
+   * 是否显示
+   */
+  isShow?: string;
+
+  /**
+   * 数据来源
+   */
+  dataSource?: string;
+
+  /**
+   * 平台标识
+   */
+  platformCode?: string;
+
+  /**
+   * 日期范围参数
+   */
+  params?: any;
+}

src/api/company/warehouse/index.ts

@@ -0,0 +1,75 @@
+import request from '@/utils/request';
+import { AxiosPromise } from 'axios';
+import { WarehouseVO, WarehouseForm, WarehouseQuery } from '@/api/company/warehouse/types';
+
+/**
+ * 查询仓库信息列表
+ * @param query
+ * @returns {*}
+ */
+
+export const listWarehouse = (query?: WarehouseQuery): AxiosPromise<WarehouseVO[]> => {
+  return request({
+    url: '/system/warehouse/list',
+    method: 'get',
+    params: query
+  });
+};
+
+/**
+ * 查询仓库信息详细
+ * @param id
+ */
+export const getWarehouse = (id: string | number): AxiosPromise<WarehouseVO> => {
+  return request({
+    url: '/system/warehouse/' + id,
+    method: 'get'
+  });
+};
+
+/**
+ * 新增仓库信息
+ * @param data
+ */
+export const addWarehouse = (data: WarehouseForm) => {
+  return request({
+    url: '/system/warehouse',
+    method: 'post',
+    data: data
+  });
+};
+
+/**
+ * 修改仓库信息
+ * @param data
+ */
+export const updateWarehouse = (data: WarehouseForm) => {
+  return request({
+    url: '/system/warehouse',
+    method: 'put',
+    data: data
+  });
+};
+
+/**
+ * 删除仓库信息
+ * @param id
+ */
+export const delWarehouse = (id: string | number | Array<string | number>) => {
+  return request({
+    url: '/system/warehouse/' + id,
+    method: 'delete'
+  });
+};
+
+export function changeStatus(id: string | number, isShow: string) {
+  const data = {
+    id,
+    isShow
+  };
+  return request({
+    url: '/system/warehouse/changeStatus',
+    method: 'put',
+    data: data
+  });
+}

src/api/company/warehouse/types.ts

@@ -0,0 +1,380 @@
+export interface WarehouseVO {
+  /**
+   * 主键ID
+   */
+  id: string | number;
+
+  /**
+   * 仓库编码
+   */
+  warehouseCode: string;
+
+  /**
+   * 仓库名称
+   */
+  warehouseName: string;
+
+  /**
+   * 库存状态
+   */
+  stkStu: string;
+
+  /**
+   * 所属公司
+   */
+  companyId: string | number;
+
+  /**
+   * 省份
+   */
+  province: string;
+
+  /**
+   * 城市
+   */
+  city: string;
+
+  /**
+   * 区/县
+   */
+  district: string;
+
+  /**
+   * 省市区
+   */
+  provinceCityDistrict: string;
+
+  /**
+   * 仓库类型
+   */
+  warehouseType: string;
+
+  /**
+   * 仓库功能
+   */
+  warehouseFunction: string;
+
+  /**
+   * 是否支持发货
+   */
+  isShip: string;
+
+  /**
+   * 是否支持退货
+   */
+  isReturn: string;
+
+  /**
+   * 是否默认仓库
+   */
+  isDefault: string;
+
+  /**
+   * 是否前台展示
+   */
+  isShow: string;
+
+  /**
+   * 数据来源
+   */
+  dataSource: string;
+
+  /**
+   * 联系人姓名
+   */
+  contacts: string;
+
+  /**
+   * 手机号
+   */
+  mobile: string;
+
+  /**
+   * 固定电话
+   */
+  phone: string;
+
+  /**
+   * 详细地址
+   */
+  address: string;
+
+  /**
+   * 邮政编码
+   */
+  zipCode: string;
+
+  /**
+   * 最大配送时效（天）
+   */
+  maxLeadTime: number;
+
+  /**
+   * 最小配送时效（天）
+   */
+  minLeadTime: number;
+
+  /**
+   * 状态（0正常 1停用）
+   */
+  status: string;
+
+  /**
+   * 备注
+   */
+  remark: string;
+}
+
+export interface WarehouseForm extends BaseEntity {
+  /**
+   * 主键ID
+   */
+  id?: string | number;
+
+  /**
+   * 仓库编码
+   */
+  warehouseCode?: string;
+
+  /**
+   * 仓库名称
+   */
+  warehouseName?: string;
+
+  /**
+   * 库存状态
+   */
+  stkStu?: string;
+
+  /**
+   * 所属公司
+   */
+  companyId?: string | number;
+
+  /**
+   * 省份
+   */
+  province?: string;
+
+  /**
+   * 城市
+   */
+  city?: string;
+
+  /**
+   * 区/县
+   */
+  district?: string;
+
+  /**
+   * 省市区
+   */
+  provinceCityDistrict?: string;
+
+  /**
+   * 仓库类型
+   */
+  warehouseType?: string;
+
+  /**
+   * 仓库功能
+   */
+  warehouseFunction?: string;
+
+  /**
+   * 是否支持发货
+   */
+  isShip?: string;
+
+  /**
+   * 是否支持退货
+   */
+  isReturn?: string;
+
+  /**
+   * 是否默认仓库
+   */
+  isDefault?: string;
+
+  /**
+   * 是否前台展示
+   */
+  isShow?: string;
+
+  /**
+   * 数据来源
+   */
+  dataSource?: string;
+
+  /**
+   * 联系人姓名
+   */
+  contacts?: string;
+
+  /**
+   * 手机号
+   */
+  mobile?: string;
+
+  /**
+   * 固定电话
+   */
+  phone?: string;
+
+  /**
+   * 详细地址
+   */
+  address?: string;
+
+  /**
+   * 邮政编码
+   */
+  zipCode?: string;
+
+  /**
+   * 最大配送时效（天）
+   */
+  maxLeadTime?: number;
+
+  /**
+   * 最小配送时效（天）
+   */
+  minLeadTime?: number;
+
+  /**
+   * 状态（0正常 1停用）
+   */
+  status?: string;
+
+  /**
+   * 备注
+   */
+  remark?: string;
+}
+
+export interface WarehouseQuery extends PageQuery {
+  /**
+   * 仓库编码
+   */
+  warehouseCode?: string;
+
+  /**
+   * 仓库名称
+   */
+  warehouseName?: string;
+
+  /**
+   * 库存状态
+   */
+  stkStu?: string;
+
+  /**
+   * 所属公司
+   */
+  companyId?: string | number;
+
+  /**
+   * 省份
+   */
+  province?: string;
+
+  /**
+   * 城市
+   */
+  city?: string;
+
+  /**
+   * 区/县
+   */
+  district?: string;
+
+  /**
+   * 省市区
+   */
+  provinceCityDistrict?: string;
+
+  /**
+   * 仓库类型
+   */
+  warehouseType?: string;
+
+  /**
+   * 仓库功能
+   */
+  warehouseFunction?: string;
+
+  /**
+   * 是否支持发货
+   */
+  isShip?: string;
+
+  /**
+   * 是否支持退货
+   */
+  isReturn?: string;
+
+  /**
+   * 是否默认仓库
+   */
+  isDefault?: string;
+
+  /**
+   * 是否前台展示
+   */
+  isShow?: string;
+
+  /**
+   * 数据来源
+   */
+  dataSource?: string;
+
+  /**
+   * 联系人姓名
+   */
+  contacts?: string;
+
+  /**
+   * 手机号
+   */
+  mobile?: string;
+
+  /**
+   * 固定电话
+   */
+  phone?: string;
+
+  /**
+   * 详细地址
+   */
+  address?: string;
+
+  /**
+   * 邮政编码
+   */
+  zipCode?: string;
+
+  /**
+   * 最大配送时效（天）
+   */
+  maxLeadTime?: number;
+
+  /**
+   * 最小配送时效（天）
+   */
+  minLeadTime?: number;
+
+  /**
+   * 状态（0正常 1停用）
+   */
+  status?: string;
+
+  /**
+   * 平台标识
+   */
+  platformCode?: string;
+
+  /**
+   * 日期范围参数
+   */
+  params?: any;
+}

src/views/company/company/index.vue

@@ -27,7 +27,6 @@
           </el-col>
         </el-row>
       </template>
-
       <el-table v-loading="loading" border :data="companyList" @selection-change="handleSelectionChange">
         <el-table-column type="selection" width="55" align="center" />
         <el-table-column label="企业编号" align="center" prop="companyCode" />

src/views/company/logisticsCompany/index.vue

@@ -0,0 +1,220 @@
+<template>
+  <div class="p-2">
+    <el-card shadow="never">
+      <template #header>
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="22"><span>物流公司信息列表</span> </el-col>
+          <el-col :span="1.5">
+            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['system:logisticsCompany:add']">新增</el-button>
+          </el-col>
+        </el-row>
+      </template>
+
+      <el-table v-loading="loading" border :data="logisticsCompanyList" @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="55" align="center" />
+        <el-table-column label="物流公司编码" align="center" prop="logisticsCode" />
+        <el-table-column label="物流公司名称" align="center" prop="logisticsName" />
+        <el-table-column label="物流公司描述" align="center" prop="logisticsDescription" />
+        <el-table-column label="是否显示" align="center" prop="isShow">
+          <template #default="scope">
+            <el-switch v-model="scope.row.isShow" active-value="0" inactive-value="1" @change="handleStatusChange(scope.row)"></el-switch>
+          </template>
+        </el-table-column>
+        <el-table-column label="数据来源" align="center" prop="dataSource" />
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+          <template #default="scope">
+            <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:logisticsCompany:edit']">编辑</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
+    </el-card>
+    <!-- 添加或修改物流公司对话框 -->
+    <el-dialog :title="dialog.title" v-model="dialog.visible" width="600px" append-to-body>
+      <el-form ref="logisticsCompanyFormRef" :model="form" :rules="rules" label-width="110px">
+        <el-form-item label="物流公司名称" prop="logisticsName">
+          <el-input v-model="form.logisticsName" placeholder="请输入物流公司名称" />
+        </el-form-item>
+        <el-form-item label="物流公司描述" prop="logisticsDescription">
+          <el-input v-model="form.logisticsDescription" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+        <el-form-item label="是否显示" prop="isShow">
+          <el-radio-group v-model="form.isShow">
+            <el-radio v-for="dict in sys_platform_yes_no" :key="dict.value" :value="dict.value">{{ dict.label }}</el-radio>
+          </el-radio-group>
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup name="LogisticsCompany" lang="ts">
+import {
+  listLogisticsCompany,
+  getLogisticsCompany,
+  delLogisticsCompany,
+  addLogisticsCompany,
+  updateLogisticsCompany,
+  changeStatus
+} from '@/api/company/logisticsCompany';
+import { LogisticsCompanyVO, LogisticsCompanyQuery, LogisticsCompanyForm } from '@/api/company/logisticsCompany/types';
+
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const { sys_platform_yes_no } = toRefs<any>(proxy?.useDict('sys_platform_yes_no'));
+
+const logisticsCompanyList = ref<LogisticsCompanyVO[]>([]);
+const buttonLoading = ref(false);
+const loading = ref(true);
+const showSearch = ref(true);
+const ids = ref<Array<string | number>>([]);
+const single = ref(true);
+const multiple = ref(true);
+const total = ref(0);
+
+const queryFormRef = ref<ElFormInstance>();
+const logisticsCompanyFormRef = ref<ElFormInstance>();
+
+const dialog = reactive<DialogOption>({
+  visible: false,
+  title: ''
+});
+
+const initFormData: LogisticsCompanyForm = {
+  id: undefined,
+  logisticsCode: undefined,
+  logisticsName: undefined,
+  logisticsDescription: undefined,
+  isShow: '0',
+  dataSource: undefined,
+  remark: undefined
+};
+const data = reactive<PageData<LogisticsCompanyForm, LogisticsCompanyQuery>>({
+  form: { ...initFormData },
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    logisticsCode: undefined,
+    logisticsName: undefined,
+    logisticsDescription: undefined,
+    isShow: undefined,
+    dataSource: undefined,
+    platformCode: undefined,
+    params: {}
+  },
+  rules: {
+    logisticsName: [{ required: true, message: '物流公司名称不能为空', trigger: 'blur' }]
+  }
+});
+
+const { queryParams, form, rules } = toRefs(data);
+
+/** 查询物流公司列表 */
+const getList = async () => {
+  loading.value = true;
+  const res = await listLogisticsCompany(queryParams.value);
+  logisticsCompanyList.value = res.rows;
+  total.value = res.total;
+  loading.value = false;
+};
+
+/** 取消按钮 */
+const cancel = () => {
+  reset();
+  dialog.visible = false;
+};
+
+/** 表单重置 */
+const reset = () => {
+  form.value = { ...initFormData };
+  logisticsCompanyFormRef.value?.resetFields();
+};
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.value.pageNum = 1;
+  getList();
+};
+
+const handleStatusChange = async (row: LogisticsCompanyVO) => {
+  const oldValue = row.isShow; // 保存旧值（0 或 1）
+
+  try {
+    await changeStatus(row.id, row.isShow); // 传新值
+    proxy?.$modal.msgSuccess('操作成功');
+  } catch {
+    row.isShow = oldValue; // 失败回滚
+    proxy?.$modal.msgError('操作失败，请重试');
+  }
+};
+/** 多选框选中数据 */
+const handleSelectionChange = (selection: LogisticsCompanyVO[]) => {
+  ids.value = selection.map((item) => item.id);
+  single.value = selection.length != 1;
+  multiple.value = !selection.length;
+};
+
+/** 新增按钮操作 */
+const handleAdd = () => {
+  reset();
+  dialog.visible = true;
+  dialog.title = '添加物流公司';
+};
+
+/** 修改按钮操作 */
+const handleUpdate = async (row?: LogisticsCompanyVO) => {
+  reset();
+  const _id = row?.id || ids.value[0];
+  const res = await getLogisticsCompany(_id);
+  Object.assign(form.value, res.data);
+  dialog.visible = true;
+  dialog.title = '修改物流公司';
+};
+
+/** 提交按钮 */
+const submitForm = () => {
+  logisticsCompanyFormRef.value?.validate(async (valid: boolean) => {
+    if (valid) {
+      buttonLoading.value = true;
+      if (form.value.id) {
+        await updateLogisticsCompany(form.value).finally(() => (buttonLoading.value = false));
+      } else {
+        await addLogisticsCompany(form.value).finally(() => (buttonLoading.value = false));
+      }
+      proxy?.$modal.msgSuccess('操作成功');
+      dialog.visible = false;
+      await getList();
+    }
+  });
+};
+
+/** 删除按钮操作 */
+const handleDelete = async (row?: LogisticsCompanyVO) => {
+  const _ids = row?.id || ids.value;
+  await proxy?.$modal.confirm('是否确认删除物流公司编号为"' + _ids + '"的数据项？').finally(() => (loading.value = false));
+  await delLogisticsCompany(_ids);
+  proxy?.$modal.msgSuccess('删除成功');
+  await getList();
+};
+
+/** 导出按钮操作 */
+const handleExport = () => {
+  proxy?.download(
+    'system/logisticsCompany/export',
+    {
+      ...queryParams.value
+    },
+    `logisticsCompany_${new Date().getTime()}.xlsx`
+  );
+};
+
+onMounted(() => {
+  getList();
+});
+</script>

src/views/company/warehouse/index.vue

@@ -0,0 +1,316 @@
+<template>
+  <div class="p-2">
+    <el-card shadow="never">
+      <template #header>
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="22"><span>仓库信息列表</span> </el-col>
+          <el-col :span="1.5">
+            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['system:warehouse:add']">新增</el-button>
+          </el-col>
+        </el-row>
+      </template>
+
+      <el-table v-loading="loading" border :data="warehouseList" @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="55" align="center" />
+        <el-table-column label="编号" align="center" prop="warehouseCode" />
+        <el-table-column label="仓库名称" align="center" prop="warehouseName" />
+        <el-table-column label="所属公司" align="center" prop="companyName" />
+        <el-table-column label="是否显示" align="center" prop="isShow">
+          <template #default="scope">
+            <el-switch v-model="scope.row.isShow" active-value="0" inactive-value="1" @change="handleStatusChange(scope.row)"></el-switch>
+          </template>
+        </el-table-column>
+        <el-table-column label="联系人姓名" align="center" prop="contacts" />
+        <el-table-column label="手机号" align="center" prop="mobile" />
+        <el-table-column label="固定电话" align="center" prop="phone" />
+        <el-table-column label="详细地址" align="center" prop="address" />
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+          <template #default="scope">
+            <el-tooltip content="修改" placement="top">
+              <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:warehouse:edit']"></el-button>
+            </el-tooltip>
+            <el-tooltip content="删除" placement="top">
+              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['system:warehouse:remove']"></el-button>
+            </el-tooltip>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
+    </el-card>
+    <!-- 添加或修改仓库信息对话框 -->
+    <el-dialog :title="dialog.title" v-model="dialog.visible" width="650px" append-to-body>
+      <el-form ref="warehouseFormRef" :model="form" :rules="rules" label-width="100px">
+        <el-form-item label="仓库名称" prop="warehouseName">
+          <el-input v-model="form.warehouseName" placeholder="请输入仓库名称" />
+        </el-form-item>
+        <el-form-item label="所属公司" prop="companyId">
+          <el-select v-model="form.companyId" placeholder="请选择所属公司">
+            <el-option
+              v-for="company in companyList"
+              :key="company.id"
+              :label="`${company.companyCode}-${company.companyName}`"
+              :value="company.id"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="仓库功能" prop="warehouseFunction">
+          <el-input v-model="form.warehouseFunction" placeholder="请输入仓库功能" />
+        </el-form-item>
+        <el-form-item label="是否支持发货" prop="isShip">
+          <el-radio-group v-model="form.isShip">
+            <el-radio v-for="dict in sys_platform_yes_no" :key="dict.value" :value="dict.value">{{ dict.label }}</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="是否支持退货" prop="isReturn">
+          <el-radio-group v-model="form.isReturn">
+            <el-radio v-for="dict in sys_platform_yes_no" :key="dict.value" :value="dict.value">{{ dict.label }}</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="是否默认仓库" prop="isDefault">
+          <el-radio-group v-model="form.isDefault">
+            <el-radio v-for="dict in sys_platform_yes_no" :key="dict.value" :value="dict.value">{{ dict.label }}</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="是否前台展示" prop="isShow">
+          <el-radio-group v-model="form.isShow">
+            <el-radio v-for="dict in sys_platform_yes_no" :key="dict.value" :value="dict.value">{{ dict.label }}</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="联系人姓名" prop="contacts">
+          <el-input v-model="form.contacts" placeholder="请输入联系人姓名" />
+        </el-form-item>
+        <el-form-item label="手机号" prop="mobile">
+          <el-input v-model="form.mobile" placeholder="请输入手机号" />
+        </el-form-item>
+        <el-form-item label="固定电话" prop="phone">
+          <el-input v-model="form.phone" placeholder="请输入固定电话" />
+        </el-form-item>
+        <el-form-item label="详细地址" prop="address">
+          <el-input v-model="form.address" placeholder="请输入详细地址" />
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup name="Warehouse" lang="ts">
+import { listWarehouse, getWarehouse, delWarehouse, addWarehouse, updateWarehouse, changeStatus } from '@/api/company/warehouse';
+import { WarehouseVO, WarehouseQuery, WarehouseForm } from '@/api/company/warehouse/types';
+import { listCompany, getCompany } from '@/api/company/company';
+import { CompanyVO, CompanyQuery, CompanyForm } from '@/api/company/company/types';
+
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const { sys_platform_yes_no } = toRefs<any>(proxy?.useDict('sys_platform_yes_no'));
+
+const warehouseList = ref<WarehouseVO[]>([]);
+const buttonLoading = ref(false);
+const loading = ref(true);
+const showSearch = ref(true);
+const ids = ref<Array<string | number>>([]);
+const single = ref(true);
+const multiple = ref(true);
+const total = ref(0);
+const companyList = ref<CompanyVO[]>([]);
+
+const queryFormRef = ref<ElFormInstance>();
+const warehouseFormRef = ref<ElFormInstance>();
+
+const dialog = reactive<DialogOption>({
+  visible: false,
+  title: ''
+});
+
+const initFormData: WarehouseForm = {
+  id: undefined,
+  warehouseCode: undefined,
+  warehouseName: undefined,
+  stkStu: undefined,
+  companyId: undefined,
+  province: undefined,
+  city: undefined,
+  district: undefined,
+  provinceCityDistrict: undefined,
+  warehouseType: undefined,
+  warehouseFunction: undefined,
+  isShip: '0',
+  isReturn: '0',
+  isDefault: '1',
+  isShow: '0',
+  dataSource: undefined,
+  contacts: undefined,
+  mobile: undefined,
+  phone: undefined,
+  address: undefined,
+  zipCode: undefined,
+  maxLeadTime: undefined,
+  minLeadTime: undefined,
+  status: undefined,
+  remark: undefined
+};
+const data = reactive<PageData<WarehouseForm, WarehouseQuery>>({
+  form: { ...initFormData },
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    warehouseCode: undefined,
+    warehouseName: undefined,
+    stkStu: undefined,
+    companyId: undefined,
+    province: undefined,
+    city: undefined,
+    district: undefined,
+    provinceCityDistrict: undefined,
+    warehouseType: undefined,
+    warehouseFunction: undefined,
+    isShip: undefined,
+    isReturn: undefined,
+    isDefault: undefined,
+    isShow: undefined,
+    dataSource: undefined,
+    contacts: undefined,
+    mobile: undefined,
+    phone: undefined,
+    address: undefined,
+    zipCode: undefined,
+    maxLeadTime: undefined,
+    minLeadTime: undefined,
+    status: undefined,
+    platformCode: undefined,
+    params: {}
+  },
+  rules: {
+    warehouseName: [{ required: true, message: '仓库名称不能为空', trigger: 'blur' }],
+    companyId: [{ required: true, message: '所属公司不能为空', trigger: 'blur' }]
+  }
+});
+
+const { queryParams, form, rules } = toRefs(data);
+
+/** 获取公司列表 */
+const getCompanyList = async () => {
+  try {
+    const res = await listCompany({ pageNum: 1, pageSize: 9999 });
+    companyList.value = res.rows || [];
+  } catch (error) {
+    console.error('获取公司列表失败', error);
+  }
+};
+
+/** 查询仓库信息列表 */
+const getList = async () => {
+  loading.value = true;
+  const res = await listWarehouse(queryParams.value);
+  warehouseList.value = res.rows;
+  total.value = res.total;
+  loading.value = false;
+};
+
+/** 取消按钮 */
+const cancel = () => {
+  reset();
+  dialog.visible = false;
+};
+
+/** 表单重置 */
+const reset = () => {
+  form.value = { ...initFormData };
+  warehouseFormRef.value?.resetFields();
+};
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.value.pageNum = 1;
+  getList();
+};
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value?.resetFields();
+  handleQuery();
+};
+
+const handleStatusChange = async (row: WarehouseVO) => {
+  const oldValue = row.isShow; // 保存旧值（0 或 1）
+
+  try {
+    await changeStatus(row.id, row.isShow); // 传新值
+    proxy?.$modal.msgSuccess('操作成功');
+  } catch {
+    row.isShow = oldValue; // 失败回滚
+    proxy?.$modal.msgError('操作失败，请重试');
+  }
+};
+
+/** 多选框选中数据 */
+const handleSelectionChange = (selection: WarehouseVO[]) => {
+  ids.value = selection.map((item) => item.id);
+  single.value = selection.length != 1;
+  multiple.value = !selection.length;
+};
+
+/** 新增按钮操作 */
+const handleAdd = () => {
+  reset();
+  dialog.visible = true;
+  dialog.title = '添加仓库信息';
+};
+
+/** 修改按钮操作 */
+const handleUpdate = async (row?: WarehouseVO) => {
+  reset();
+  const _id = row?.id || ids.value[0];
+  const res = await getWarehouse(_id);
+  Object.assign(form.value, res.data);
+  dialog.visible = true;
+  dialog.title = '修改仓库信息';
+};
+
+/** 提交按钮 */
+const submitForm = () => {
+  warehouseFormRef.value?.validate(async (valid: boolean) => {
+    if (valid) {
+      buttonLoading.value = true;
+      if (form.value.id) {
+        await updateWarehouse(form.value).finally(() => (buttonLoading.value = false));
+      } else {
+        await addWarehouse(form.value).finally(() => (buttonLoading.value = false));
+      }
+      proxy?.$modal.msgSuccess('操作成功');
+      dialog.visible = false;
+      await getList();
+    }
+  });
+};
+
+/** 删除按钮操作 */
+const handleDelete = async (row?: WarehouseVO) => {
+  const _ids = row?.id || ids.value;
+  await proxy?.$modal.confirm('是否确认删除仓库信息编号为"' + _ids + '"的数据项？').finally(() => (loading.value = false));
+  await delWarehouse(_ids);
+  proxy?.$modal.msgSuccess('删除成功');
+  await getList();
+};
+
+/** 导出按钮操作 */
+const handleExport = () => {
+  proxy?.download(
+    'system/warehouse/export',
+    {
+      ...queryParams.value
+    },
+    `warehouse_${new Date().getTime()}.xlsx`
+  );
+};
+
+onMounted(() => {
+  getCompanyList();
+  getList();
+});
+</script>

src/views/order/orderSet/index.vue

@@ -249,7 +249,7 @@ onMounted(async () => {
   .form-item-row {
     display: flex;
     align-items: center;
-    gap: 40px;
+    gap: 13px;
     margin-bottom: 20px;
 
     .form-item-input {