init

src/api/erp/bdorderprequote/index.ts

@@ -0,0 +1,61 @@
+import request from '@/config/axios'
+
+// erp商务预报价 VO
+export interface BdOrderPreQuoteVO {
+  orderId: string // 报价单ID
+  sypplierId: number // 供应商id
+  orderStatusId: number // 工单状态
+  fpTime: Date // 分配时间
+  pickOrderTime: Date // 接单时间
+  startPriceTime: Date // 开始报价时间
+  needEndTime: Date // 最晚报价时间
+  endPriceTime: Date // 结束报价时间
+  closeOrderTime: Date // 关单时间
+  cancelRemark: string // 取消工单原因
+  priceUserRemark: string // 报价者备注
+  dispUserId: number // 派单者id
+  pickUserId: number // 接单者id
+  priceUserId: number // 报价者id
+  address: string // 地址
+  expedited: number // 加急
+}
+
+// erp商务预报价 API
+export const BdOrderPreQuoteApi = {
+  // 查询erp商务预报价分页
+  getBdOrderPreQuotePage: async (params: any) => {
+    return await request.get({ url: `/erp/bd-order-pre-quote/page`, params })
+  },
+
+  // 查询erp商务预报价详情
+  getBdOrderPreQuote: async (id: number) => {
+    return await request.get({ url: `/erp/bd-order-pre-quote/get?id=` + id })
+  },
+
+  // 新增erp商务预报价
+  createBdOrderPreQuote: async (data: BdOrderPreQuoteVO) => {
+    return await request.post({ url: `/erp/bd-order-pre-quote/create`, data })
+  },
+
+  // 修改erp商务预报价
+  updateBdOrderPreQuote: async (data: BdOrderPreQuoteVO) => {
+    return await request.put({ url: `/erp/bd-order-pre-quote/update`, data })
+  },
+
+  // 删除erp商务预报价
+  deleteBdOrderPreQuote: async (id: number) => {
+    return await request.delete({ url: `/erp/bd-order-pre-quote/delete?id=` + id })
+  },
+
+  // 导出erp商务预报价 Excel
+  exportBdOrderPreQuote: async (params) => {
+    return await request.download({ url: `/erp/bd-order-pre-quote/export-excel`, params })
+  },
+
+// ==================== 子表（Erp单据文件） ====================
+
+  // 获得Erp单据文件列表
+  getOrderFileListByOrderId: async (orderId) => {
+    return await request.get({ url: `/erp/bd-order-pre-quote/order-file/list-by-order-id?orderId=` + orderId })
+  }
+}

src/api/erp/warehouse/index.ts

@@ -0,0 +1,98 @@
+import request from '@/config/axios'
+
+// ERP 仓库 VO
+export interface WarehouseVO {
+  id: number // 仓库编号
+  name: string // 仓库名称
+  address: string // 仓库地址
+  sort: number // 排序
+  remark: string // 备注
+  principal: string // 负责人
+  warehousePrice: number // 仓储费，单位：元
+  truckagePrice: number // 搬运费，单位：元
+  status: number // 开启状态
+  defaultStatus: boolean // 是否默认
+}
+
+export interface WarehouseLocationVO {
+  id: number // 仓库编号
+  name: string // 仓库名称
+  sort: number // 排序
+  warehouseId: number //仓库编号
+  remark: string // 备注
+  principal: string // 负责人
+  warehousePrice: number // 仓储费，单位：元
+  truckagePrice: number // 搬运费，单位：元
+  status: number // 开启状态
+  defaultStatus: boolean // 是否默认
+}
+
+// ERP 仓库 API
+export const WarehouseApi = {
+  // 查询ERP 仓库分页
+  getWarehousePage: async (params: any) => {
+    return await request.get({ url: `/erp/warehouse/page`, params })
+  },
+
+  // 查询ERP 仓库详情
+  getWarehouse: async (id: number) => {
+    return await request.get({ url: `/erp/warehouse/get?id=` + id })
+  },
+
+  // 新增ERP 仓库
+  createWarehouse: async (data: WarehouseVO) => {
+    return await request.post({ url: `/erp/warehouse/create`, data })
+  },
+
+  // 修改ERP 仓库
+  updateWarehouse: async (data: WarehouseVO) => {
+    return await request.put({ url: `/erp/warehouse/update`, data })
+  },
+
+// 修改仓库默认状态
+updateWarehouseDefaultStatus: async (id: number, defaultStatus: boolean) => {
+  return await request.put({
+    url: `/erp/warehouse/update-default-status`,
+    params: {
+      id,
+      defaultStatus
+    }
+  })
+},
+
+  // 删除ERP 仓库
+  deleteWarehouse: async (id: number) => {
+    return await request.delete({ url: `/erp/warehouse/delete?id=` + id })
+  },
+
+  // 导出ERP 仓库 Excel
+  exportWarehouse: async (params) => {
+    return await request.download({ url: `/erp/warehouse/export-excel`, params })
+  },
+
+// ==================== 子表（ERP 仓库货位） ====================
+
+  // 获得ERP 仓库货位分页
+  getWarehouseLocationPage: async (params) => {
+    return await request.get({ url: `/erp/warehouse/warehouse-location/page`, params })
+  },
+  // 新增ERP 仓库货位
+  createWarehouseLocation: async (data) => {
+    return await request.post({ url: `/erp/warehouse/warehouse-location/create`, data })
+  },
+
+  // 修改ERP 仓库货位
+  updateWarehouseLocation: async (data) => {
+    return await request.put({ url: `/erp/warehouse/warehouse-location/update`, data })
+  },
+
+  // 删除ERP 仓库货位
+  deleteWarehouseLocation: async (id: number) => {
+    return await request.delete({ url: `/erp/warehouse/warehouse-location/delete?id=` + id })
+  },
+
+  // 获得ERP 仓库货位
+  getWarehouseLocation: async (id: number) => {
+    return await request.get({ url: `/erp/warehouse/warehouse-location/get?id=` + id })
+  }
+}

src/views/erp/bdorderprequote/BdOrderPreQuoteForm.vue

@@ -0,0 +1,219 @@
+<template>
+  <Dialog :title="dialogTitle" v-model="dialogVisible">
+    <el-form
+      ref="formRef"
+      :model="formData"
+      :rules="formRules"
+      label-width="100px"
+      v-loading="formLoading"
+    >
+      <el-form-item label="供应商id" prop="sypplierId">
+        <el-input v-model="formData.sypplierId" placeholder="请输入供应商id" />
+      </el-form-item>
+      <el-form-item label="工单状态" prop="orderStatusId">
+        <el-select v-model="formData.orderStatusId" placeholder="请选择工单状态">
+          <el-option
+            v-for="dict in getIntDictOptions(DICT_TYPE.ERP_ORDER_PRE_STATUS)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="分配时间" prop="fpTime">
+        <el-date-picker
+          v-model="formData.fpTime"
+          type="date"
+          value-format="x"
+          placeholder="选择分配时间"
+        />
+      </el-form-item>
+      <el-form-item label="接单时间" prop="pickOrderTime">
+        <el-date-picker
+          v-model="formData.pickOrderTime"
+          type="date"
+          value-format="x"
+          placeholder="选择接单时间"
+        />
+      </el-form-item>
+      <el-form-item label="开始报价时间" prop="startPriceTime">
+        <el-date-picker
+          v-model="formData.startPriceTime"
+          type="date"
+          value-format="x"
+          placeholder="选择开始报价时间"
+        />
+      </el-form-item>
+      <el-form-item label="最晚报价时间" prop="needEndTime">
+        <el-date-picker
+          v-model="formData.needEndTime"
+          type="date"
+          value-format="x"
+          placeholder="选择最晚报价时间"
+        />
+      </el-form-item>
+      <el-form-item label="结束报价时间" prop="endPriceTime">
+        <el-date-picker
+          v-model="formData.endPriceTime"
+          type="date"
+          value-format="x"
+          placeholder="选择结束报价时间"
+        />
+      </el-form-item>
+      <el-form-item label="关单时间" prop="closeOrderTime">
+        <el-date-picker
+          v-model="formData.closeOrderTime"
+          type="date"
+          value-format="x"
+          placeholder="选择关单时间"
+        />
+      </el-form-item>
+      <el-form-item label="取消工单原因" prop="cancelRemark">
+        <el-input v-model="formData.cancelRemark" type="textarea" placeholder="请输入取消工单原因" />
+      </el-form-item>
+      <el-form-item label="报价者备注" prop="priceUserRemark">
+        <el-input v-model="formData.priceUserRemark" type="textarea" placeholder="请输入报价者备注" />
+      </el-form-item>
+      <el-form-item label="派单者id" prop="dispUserId">
+        <el-input v-model="formData.dispUserId" placeholder="请输入派单者id" />
+      </el-form-item>
+      <el-form-item label="接单者id" prop="pickUserId">
+        <el-input v-model="formData.pickUserId" placeholder="请输入接单者id" />
+      </el-form-item>
+      <el-form-item label="报价者id" prop="priceUserId">
+        <el-input v-model="formData.priceUserId" placeholder="请输入报价者id" />
+      </el-form-item>
+      <el-form-item label="地址" prop="address">
+        <el-input v-model="formData.address" placeholder="请输入地址" />
+      </el-form-item>
+      <el-form-item label="加急" prop="expedited">
+        <el-input v-model="formData.expedited" placeholder="请输入加急" />
+      </el-form-item>
+    </el-form>
+    <!-- 子表的表单 -->
+    <el-tabs v-model="subTabsName">
+      <el-tab-pane label="Erp单据文件" name="orderFile">
+        <OrderFileForm ref="orderFileFormRef" :order-id="formData.id" />
+      </el-tab-pane>
+    </el-tabs>
+    <template #footer>
+      <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
+      <el-button @click="dialogVisible = false">取 消</el-button>
+    </template>
+  </Dialog>
+</template>
+<script setup lang="ts">
+import { getIntDictOptions, DICT_TYPE } from '@/utils/dict'
+import { BdOrderPreQuoteApi, BdOrderPreQuoteVO } from '@/api/erp/bdorderprequote'
+import OrderFileForm from './components/OrderFileForm.vue'
+
+/** erp商务预报价 表单 */
+defineOptions({ name: 'BdOrderPreQuoteForm' })
+
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const dialogTitle = ref('') // 弹窗的标题
+const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+const formType = ref('') // 表单的类型：create - 新增；update - 修改
+const formData = ref({
+  orderId: undefined,
+  sypplierId: undefined,
+  orderStatusId: undefined,
+  fpTime: undefined,
+  pickOrderTime: undefined,
+  startPriceTime: undefined,
+  needEndTime: undefined,
+  endPriceTime: undefined,
+  closeOrderTime: undefined,
+  cancelRemark: undefined,
+  priceUserRemark: undefined,
+  dispUserId: undefined,
+  pickUserId: undefined,
+  priceUserId: undefined,
+  address: undefined,
+  expedited: undefined
+})
+const formRules = reactive({
+})
+const formRef = ref() // 表单 Ref
+
+/** 子表的表单 */
+const subTabsName = ref('orderFile')
+const orderFileFormRef = ref()
+
+/** 打开弹窗 */
+const open = async (type: string, id?: number) => {
+  dialogVisible.value = true
+  dialogTitle.value = t('action.' + type)
+  formType.value = type
+  resetForm()
+  // 修改时，设置数据
+  if (id) {
+    formLoading.value = true
+    try {
+      formData.value = await BdOrderPreQuoteApi.getBdOrderPreQuote(id)
+    } finally {
+      formLoading.value = false
+    }
+  }
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+
+/** 提交表单 */
+const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+const submitForm = async () => {
+  // 校验表单
+  await formRef.value.validate()
+  // 校验子表单
+  try {
+    await orderFileFormRef.value.validate()
+  } catch (e) {
+    subTabsName.value = 'orderFile'
+    return
+  }
+  // 提交请求
+  formLoading.value = true
+  try {
+    const data = formData.value as unknown as BdOrderPreQuoteVO
+    // 拼接子表的数据
+    data.orderFiles = orderFileFormRef.value.getData()
+    if (formType.value === 'create') {
+      await BdOrderPreQuoteApi.createBdOrderPreQuote(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await BdOrderPreQuoteApi.updateBdOrderPreQuote(data)
+      message.success(t('common.updateSuccess'))
+    }
+    dialogVisible.value = false
+    // 发送操作成功的事件
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
+}
+
+/** 重置表单 */
+const resetForm = () => {
+  formData.value = {
+    orderId: undefined,
+    sypplierId: undefined,
+    orderStatusId: undefined,
+    fpTime: undefined,
+    pickOrderTime: undefined,
+    startPriceTime: undefined,
+    needEndTime: undefined,
+    endPriceTime: undefined,
+    closeOrderTime: undefined,
+    cancelRemark: undefined,
+    priceUserRemark: undefined,
+    dispUserId: undefined,
+    pickUserId: undefined,
+    priceUserId: undefined,
+    address: undefined,
+    expedited: undefined
+  }
+  formRef.value?.resetFields()
+}
+</script>

src/views/erp/bdorderprequote/components/OrderFileForm.vue

@@ -0,0 +1,105 @@
+<template>
+  <el-form
+    ref="formRef"
+    :model="formData"
+    :rules="formRules"
+    v-loading="formLoading"
+    label-width="0px"
+    :inline-message="true"
+  >
+    <el-table :data="formData" class="-mt-10px">
+      <el-table-column label="序号" type="index" width="100" />
+       <el-table-column label="文件单据类型" min-width="150">
+        <template #default="{ row, $index }">
+          <el-form-item :prop="`${$index}.fileTypeId`" :rules="formRules.fileTypeId" class="mb-0px!">
+            <el-select v-model="row.fileTypeId" placeholder="请选择文件单据类型">
+                <el-option
+                  v-for="dict in getIntDictOptions(DICT_TYPE.ERP_FILE_ORDER_TYPE)"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
+            </el-select>
+          </el-form-item>
+        </template>
+      </el-table-column>
+      <el-table-column label="关联文件id" min-width="150">
+        <template #default="{ row, $index }">
+          <el-form-item :prop="`${$index}.infraFileId`" :rules="formRules.infraFileId" class="mb-0px!">
+            <el-input v-model="row.infraFileId" placeholder="请输入关联文件id" />
+          </el-form-item>
+        </template>
+      </el-table-column>
+      <el-table-column align="center" fixed="right" label="操作" width="60">
+        <template #default="{ $index }">
+          <el-button @click="handleDelete($index)" link>—</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+  </el-form>
+  <el-row justify="center" class="mt-3">
+    <el-button @click="handleAdd" round>+ 添加Erp单据文件</el-button>
+  </el-row>
+</template>
+<script setup lang="ts">
+import { getIntDictOptions, DICT_TYPE } from '@/utils/dict'
+import { BdOrderPreQuoteApi } from '@/api/erp/bdorderprequote'
+
+const props = defineProps<{
+  orderId: undefined // 关联单号（主表的关联字段）
+}>()
+const formLoading = ref(false) // 表单的加载中
+const formData = ref([])
+const formRules = reactive({
+})
+const formRef = ref() // 表单 Ref
+
+/** 监听主表的关联字段的变化，加载对应的子表数据 */
+watch(
+  () => props.orderId,
+  async (val) => {
+    // 1. 重置表单
+    formData.value = []
+    // 2. val 非空，则加载数据
+    if (!val) {
+      return;
+    }
+    try {
+      formLoading.value = true
+      formData.value = await BdOrderPreQuoteApi.getOrderFileListByOrderId(val)
+    } finally {
+      formLoading.value = false
+    }
+  },
+  { immediate: true }
+)
+
+/** 新增按钮操作 */
+const handleAdd = () => {
+  const row = {
+    id: undefined,
+    orderId: undefined,
+    fileTypeId: undefined,
+    infraFileId: undefined
+  }
+  row.orderId = props.orderId
+  formData.value.push(row)
+}
+
+/** 删除按钮操作 */
+const handleDelete = (index) => {
+  formData.value.splice(index, 1)
+}
+
+/** 表单校验 */
+const validate = () => {
+  return formRef.value.validate()
+}
+
+/** 表单值 */
+const getData = () => {
+  return formData.value
+}
+
+defineExpose({ validate, getData })
+</script>

src/views/erp/bdorderprequote/components/OrderFileList.vue

@@ -0,0 +1,56 @@
+<template>
+  <!-- 列表 -->
+  <ContentWrap>
+    <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
+      <el-table-column label="主键" align="center" prop="id" />
+       <el-table-column label="文件单据类型" align="center" prop="fileTypeId">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.ERP_FILE_ORDER_TYPE" :value="scope.row.fileTypeId" />
+        </template>
+      </el-table-column>
+      <el-table-column label="关联文件id" align="center" prop="infraFileId" />
+      <el-table-column
+        label="创建时间"
+        align="center"
+        prop="createTime"
+        :formatter="dateFormatter"
+        width="180px"
+      />
+    </el-table>
+  </ContentWrap>
+</template>
+<script setup lang="ts">
+import { DICT_TYPE } from '@/utils/dict'
+import { dateFormatter } from '@/utils/formatTime'
+import { BdOrderPreQuoteApi } from '@/api/erp/bdorderprequote'
+
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+
+const props = defineProps<{
+  orderId?: number // 关联单号（主表的关联字段）
+}>()
+const loading = ref(false) // 列表的加载中
+const list = ref([]) // 列表的数据
+
+/** 查询列表 */
+const getList = async () => {
+  loading.value = true
+  try {
+    list.value = await BdOrderPreQuoteApi.getOrderFileListByOrderId(props.orderId)
+  } finally {
+    loading.value = false
+  }
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.pageNo = 1
+  getList()
+}
+
+/** 初始化 **/
+onMounted(() => {
+  getList()
+})
+</script>

src/views/erp/bdorderprequote/index.vue

@@ -0,0 +1,317 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <el-form
+      class="-mb-15px"
+      :model="queryParams"
+      ref="queryFormRef"
+      :inline="true"
+      label-width="68px"
+    >
+      
+      <el-form-item label="工单状态" prop="orderStatusId">
+        <el-select
+          v-model="queryParams.orderStatusId"
+          placeholder="请选择工单状态"
+          clearable
+          class="!w-240px"
+        >
+          <el-option
+            v-for="dict in getIntDictOptions(DICT_TYPE.ERP_ORDER_PRE_STATUS)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="分配时间" prop="fpTime">
+        <el-date-picker
+          v-model="queryParams.fpTime"
+          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-220px"
+        />
+      </el-form-item>
+      <el-form-item label="接单时间" prop="pickOrderTime">
+        <el-date-picker
+          v-model="queryParams.pickOrderTime"
+          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-220px"
+        />
+      </el-form-item>
+   
+      <el-form-item label="关单时间" prop="closeOrderTime">
+        <el-date-picker
+          v-model="queryParams.closeOrderTime"
+          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-220px"
+        />
+      </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-220px"
+        />
+      </el-form-item>
+      <el-form-item label="地址" prop="address">
+        <el-input
+          v-model="queryParams.address"
+          placeholder="请输入地址"
+          clearable
+          @keyup.enter="handleQuery"
+          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="['erp:bd-order-pre-quote:create']"
+        >
+          <Icon icon="ep:plus" class="mr-5px" /> 新增
+        </el-button>
+        <el-button
+          type="success"
+          plain
+          @click="handleExport"
+          :loading="exportLoading"
+          v-hasPermi="['erp:bd-order-pre-quote:export']"
+        >
+          <Icon icon="ep:download" class="mr-5px" /> 导出
+        </el-button>
+      </el-form-item>
+    </el-form>
+  </ContentWrap>
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
+      <!-- 子表的列表 -->
+      <el-table-column type="expand">
+        <template #default="scope">
+          <el-tabs model-value="orderFile">
+            <el-tab-pane label="Erp单据文件" name="orderFile">
+              <OrderFileList :order-id="scope.row.id" />
+            </el-tab-pane>
+          </el-tabs>
+        </template>
+      </el-table-column>
+      <el-table-column label="报价单号" align="center" prop="orderId" />
+      <el-table-column label="供应商" align="center" prop="sypplierId" />
+      <el-table-column label="工单状态" align="center" prop="orderStatusId">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.ERP_ORDER_PRE_STATUS" :value="scope.row.orderStatusId" />
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="分配时间"
+        align="center"
+        prop="fpTime"
+        :formatter="dateFormatter"
+        width="180px"
+      />
+      <el-table-column
+        label="接单时间"
+        align="center"
+        prop="pickOrderTime"
+        :formatter="dateFormatter"
+        width="180px"
+      />
+      <el-table-column
+        label="开始报价时间"
+        align="center"
+        prop="startPriceTime"
+        :formatter="dateFormatter"
+        width="180px"
+      />
+      <el-table-column
+        label="最晚报价时间"
+        align="center"
+        prop="needEndTime"
+        :formatter="dateFormatter"
+        width="180px"
+      />
+      <el-table-column
+        label="结束报价时间"
+        align="center"
+        prop="endPriceTime"
+        :formatter="dateFormatter"
+        width="180px"
+      />
+      <el-table-column
+        label="关单时间"
+        align="center"
+        prop="closeOrderTime"
+        :formatter="dateFormatter"
+        width="180px"
+      />
+      <el-table-column label="取消工单原因" align="center" prop="cancelRemark" />
+      <el-table-column label="报价者备注" align="center" prop="priceUserRemark" />
+      <el-table-column label="派单者" align="center" prop="dispUserId" />
+      <el-table-column label="接单者" align="center" prop="pickUserId" />
+      <el-table-column label="报价者" align="center" prop="priceUserId" />
+      <el-table-column label="地址" align="center" prop="address" />
+      <el-table-column label="加急" align="center" prop="expedited" />
+      <el-table-column
+        label="创建时间"
+        align="center"
+        prop="createTime"
+        :formatter="dateFormatter"
+        width="180px"
+      />
+      <el-table-column label="操作" align="center" min-width="120px">
+        <template #default="scope">
+          <el-button
+            link
+            type="primary"
+            @click="openForm('update', scope.row.id)"
+            v-hasPermi="['erp:bd-order-pre-quote:update']"
+          >
+            编辑
+          </el-button>
+          <el-button
+            link
+            type="danger"
+            @click="handleDelete(scope.row.id)"
+            v-hasPermi="['erp:bd-order-pre-quote:delete']"
+          >
+            删除
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页 -->
+    <Pagination
+      :total="total"
+      v-model:page="queryParams.pageNo"
+      v-model:limit="queryParams.pageSize"
+      @pagination="getList"
+    />
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BdOrderPreQuoteForm ref="formRef" @success="getList" />
+</template>
+
+<script setup lang="ts">
+import { getIntDictOptions, DICT_TYPE } from '@/utils/dict'
+import { dateFormatter } from '@/utils/formatTime'
+import download from '@/utils/download'
+import { BdOrderPreQuoteApi, BdOrderPreQuoteVO } from '@/api/erp/bdorderprequote'
+import BdOrderPreQuoteForm from './BdOrderPreQuoteForm.vue'
+import OrderFileList from './components/OrderFileList.vue'
+
+/** erp商务预报价 列表 */
+defineOptions({ name: 'BdOrderPreQuote' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const loading = ref(true) // 列表的加载中
+const list = ref<BdOrderPreQuoteVO[]>([]) // 列表的数据
+const total = ref(0) // 列表的总页数
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  sypplierId: undefined,
+  orderStatusId: undefined,
+  fpTime: [],
+  pickOrderTime: [],
+  startPriceTime: [],
+  needEndTime: [],
+  endPriceTime: [],
+  closeOrderTime: [],
+  cancelRemark: undefined,
+  priceUserRemark: undefined,
+  dispUserId: undefined,
+  pickUserId: undefined,
+  priceUserId: undefined,
+  address: undefined,
+  expedited: undefined,
+  createTime: []
+})
+const queryFormRef = ref() // 搜索的表单
+const exportLoading = ref(false) // 导出的加载中
+
+/** 查询列表 */
+const getList = async () => {
+  loading.value = true
+  try {
+    const data = await BdOrderPreQuoteApi.getBdOrderPreQuotePage(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 BdOrderPreQuoteApi.deleteBdOrderPreQuote(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await BdOrderPreQuoteApi.exportBdOrderPreQuote(queryParams)
+    download.excel(data, 'erp商务预报价.xls')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 初始化 **/
+onMounted(() => {
+  getList()
+})
+</script>

src/views/erp/product/category/productcategoryproperties/ProductCategoryPropertiesForm.vue

@@ -0,0 +1,152 @@
+<template>
+  <Dialog :title="dialogTitle" v-model="dialogVisible">
+    <el-form
+      ref="formRef"
+      :model="formData"
+      :rules="formRules"
+      label-width="100px"
+      v-loading="formLoading"
+    >
+      <el-form-item label="类别属性id" prop="productCategoryId">
+        <el-select v-model="formData.productCategoryId" placeholder="请选择类别属性id">
+          <el-option label="请选择字典生成" value="" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="是否单数属性" prop="ifSingleProperty">
+        <el-checkbox-group v-model="formData.ifSingleProperty">
+          <el-checkbox
+            v-for="dict in getBoolDictOptions(DICT_TYPE.INFRA_BOOLEAN_STRING)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-checkbox-group>
+      </el-form-item>
+      <el-form-item label="设备属性英文" prop="productPropertiesEn">
+        <el-input v-model="formData.productPropertiesEn" placeholder="请输入设备属性英文" />
+      </el-form-item>
+      <el-form-item label="设备属性中文" prop="productPropertiesCn">
+        <el-input v-model="formData.productPropertiesCn" placeholder="请输入设备属性中文" />
+      </el-form-item>
+      <el-form-item label="是否必填" prop="ifRequired">
+        <el-select v-model="formData.ifRequired" placeholder="请选择是否必填">
+          <el-option
+            v-for="dict in getBoolDictOptions(DICT_TYPE.INFRA_BOOLEAN_STRING)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="是否配件" prop="ifAttachment">
+        <el-select v-model="formData.ifAttachment" placeholder="请选择是否配件">
+          <el-option
+            v-for="dict in getBoolDictOptions(DICT_TYPE.INFRA_BOOLEAN_STRING)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="是否允许记录sn" prop="ifSn">
+        <el-radio-group v-model="formData.ifSn">
+          <el-radio value="1">请选择字典生成</el-radio>
+        </el-radio-group>
+      </el-form-item>
+    </el-form>
+    <template #footer>
+      <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
+      <el-button @click="dialogVisible = false">取 消</el-button>
+    </template>
+  </Dialog>
+</template>
+<script setup lang="ts">
+import { getBoolDictOptions, DICT_TYPE } from '@/utils/dict'
+import { ProductCategoryPropertiesApi, ProductCategoryPropertiesVO } from '@/api/erp/product/category/productcategoryproperties'
+
+/** ERP 产品分类属性 表单 */
+defineOptions({ name: 'ProductCategoryPropertiesForm' })
+
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const dialogTitle = ref('') // 弹窗的标题
+const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+const formType = ref('') // 表单的类型：create - 新增；update - 修改
+const formData = ref({
+  id: undefined,
+  productCategoryId: undefined,
+  ifSingleProperty: [],
+  productPropertiesEn: undefined,
+  productPropertiesCn: undefined,
+  ifRequired: undefined,
+  ifAttachment: undefined,
+  ifSn: undefined
+})
+const formRules = reactive({
+  productCategoryId: [{ required: true, message: '类别属性id不能为空', trigger: 'change' }],
+  ifSingleProperty: [{ required: true, message: '是否单数属性不能为空', trigger: 'blur' }],
+  ifRequired: [{ required: true, message: '是否必填不能为空', trigger: 'change' }],
+  ifAttachment: [{ required: true, message: '是否配件不能为空', trigger: 'change' }],
+  ifSn: [{ required: true, message: '是否允许记录sn不能为空', trigger: 'blur' }]
+})
+const formRef = ref() // 表单 Ref
+
+/** 打开弹窗 */
+const open = async (type: string, id?: number) => {
+  dialogVisible.value = true
+  dialogTitle.value = t('action.' + type)
+  formType.value = type
+  resetForm()
+  // 修改时，设置数据
+  if (id) {
+    formLoading.value = true
+    try {
+      formData.value = await ProductCategoryPropertiesApi.getProductCategoryProperties(id)
+    } finally {
+      formLoading.value = false
+    }
+  }
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+
+/** 提交表单 */
+const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+const submitForm = async () => {
+  // 校验表单
+  await formRef.value.validate()
+  // 提交请求
+  formLoading.value = true
+  try {
+    const data = formData.value as unknown as ProductCategoryPropertiesVO
+    if (formType.value === 'create') {
+      await ProductCategoryPropertiesApi.createProductCategoryProperties(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await ProductCategoryPropertiesApi.updateProductCategoryProperties(data)
+      message.success(t('common.updateSuccess'))
+    }
+    dialogVisible.value = false
+    // 发送操作成功的事件
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
+}
+
+/** 重置表单 */
+const resetForm = () => {
+  formData.value = {
+    id: undefined,
+    productCategoryId: undefined,
+    ifSingleProperty: [],
+    productPropertiesEn: undefined,
+    productPropertiesCn: undefined,
+    ifRequired: undefined,
+    ifAttachment: undefined,
+    ifSn: undefined
+  }
+  formRef.value?.resetFields()
+}
+</script>

src/views/erp/product/category/productcategoryproperties/index.vue

@@ -0,0 +1,271 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <el-form
+      class="-mb-15px"
+      :model="queryParams"
+      ref="queryFormRef"
+      :inline="true"
+      label-width="68px"
+    >
+      <el-form-item label="类别属性" prop="productCategoryId">
+        <el-select
+          v-model="queryParams.productCategoryId"
+          placeholder="请选择类别属性"
+          clearable
+          class="!w-240px"
+        >
+          <el-option label="请选择字典生成" value="" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="设备属性英文" prop="productPropertiesEn">
+        <el-input
+          v-model="queryParams.productPropertiesEn"
+          placeholder="请输入设备属性英文"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="设备属性中文" prop="productPropertiesCn">
+        <el-input
+          v-model="queryParams.productPropertiesCn"
+          placeholder="请输入设备属性中文"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="是否必填" prop="ifRequired">
+        <el-select
+          v-model="queryParams.ifRequired"
+          placeholder="请选择是否必填"
+          clearable
+          class="!w-240px"
+        >
+          <el-option
+            v-for="dict in getBoolDictOptions(DICT_TYPE.INFRA_BOOLEAN_STRING)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="是否配件" prop="ifAttachment">
+        <el-select
+          v-model="queryParams.ifAttachment"
+          placeholder="请选择是否配件"
+          clearable
+          class="!w-240px"
+        >
+          <el-option
+            v-for="dict in getBoolDictOptions(DICT_TYPE.INFRA_BOOLEAN_STRING)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="是否允许记录sn" prop="ifSn">
+        <el-select
+          v-model="queryParams.ifSn"
+          placeholder="请选择是否允许记录sn"
+          clearable
+          class="!w-240px"
+        >
+          <el-option label="请选择字典生成" value="" />
+        </el-select>
+      </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-220px"
+        />
+      </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="['erp:product-category-properties:create']"
+        >
+          <Icon icon="ep:plus" class="mr-5px" /> 新增
+        </el-button>
+        <el-button
+          type="success"
+          plain
+          @click="handleExport"
+          :loading="exportLoading"
+          v-hasPermi="['erp:product-category-properties:export']"
+        >
+          <Icon icon="ep:download" class="mr-5px" /> 导出
+        </el-button>
+      </el-form-item>
+    </el-form>
+  </ContentWrap>
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
+      <el-table-column label="类别属性编号" align="center" prop="id" />
+      <el-table-column label="类别属性" align="center" prop="productCategoryId" />
+      <el-table-column label="是否单数属性" align="center" prop="ifSingleProperty">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="scope.row.ifSingleProperty" />
+        </template>
+      </el-table-column>
+      <el-table-column label="设备属性英文" align="center" prop="productPropertiesEn" />
+      <el-table-column label="设备属性中文" align="center" prop="productPropertiesCn" />
+      <el-table-column label="是否必填" align="center" prop="ifRequired">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="scope.row.ifRequired" />
+        </template>
+      </el-table-column>
+      <el-table-column label="是否配件" align="center" prop="ifAttachment">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="scope.row.ifAttachment" />
+        </template>
+      </el-table-column>
+      <el-table-column label="是否允许记录sn" align="center" prop="ifSn" />
+      <el-table-column
+        label="创建时间"
+        align="center"
+        prop="createTime"
+        :formatter="dateFormatter"
+        width="180px"
+      />
+      <el-table-column label="操作" align="center" min-width="120px">
+        <template #default="scope">
+          <el-button
+            link
+            type="primary"
+            @click="openForm('update', scope.row.id)"
+            v-hasPermi="['erp:product-category-properties:update']"
+          >
+            编辑
+          </el-button>
+          <el-button
+            link
+            type="danger"
+            @click="handleDelete(scope.row.id)"
+            v-hasPermi="['erp:product-category-properties:delete']"
+          >
+            删除
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页 -->
+    <Pagination
+      :total="total"
+      v-model:page="queryParams.pageNo"
+      v-model:limit="queryParams.pageSize"
+      @pagination="getList"
+    />
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <ProductCategoryPropertiesForm ref="formRef" @success="getList" />
+</template>
+
+<script setup lang="ts">
+import { getBoolDictOptions, DICT_TYPE } from '@/utils/dict'
+import { dateFormatter } from '@/utils/formatTime'
+import download from '@/utils/download'
+import { ProductCategoryPropertiesApi, ProductCategoryPropertiesVO } from '@/api/erp/product/category/productcategoryproperties'
+import ProductCategoryPropertiesForm from './ProductCategoryPropertiesForm.vue'
+
+/** ERP 产品分类属性 列表 */
+defineOptions({ name: 'ProductCategoryProperties' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const loading = ref(true) // 列表的加载中
+const list = ref<ProductCategoryPropertiesVO[]>([]) // 列表的数据
+const total = ref(0) // 列表的总页数
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  productCategoryId: undefined,
+  ifSingleProperty: undefined,
+  productPropertiesEn: undefined,
+  productPropertiesCn: undefined,
+  ifRequired: undefined,
+  ifAttachment: undefined,
+  ifSn: undefined,
+  createTime: []
+})
+const queryFormRef = ref() // 搜索的表单
+const exportLoading = ref(false) // 导出的加载中
+
+/** 查询列表 */
+const getList = async () => {
+  loading.value = true
+  try {
+    const data = await ProductCategoryPropertiesApi.getProductCategoryPropertiesPage(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 ProductCategoryPropertiesApi.deleteProductCategoryProperties(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await ProductCategoryPropertiesApi.exportProductCategoryProperties(queryParams)
+    download.excel(data, 'ERP 产品分类属性.xls')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 初始化 **/
+onMounted(() => {
+  getList()
+})
+</script>

src/views/erp/product/product/ProductForm.vue

@@ -57,6 +57,19 @@
             </el-radio-group>
           </el-form-item>
         </el-col>
+        <el-col :span="12">
+          <el-form-item label="一物一码" prop="ifQr">
+            <el-radio-group v-model="formData.ifQr">
+              <el-radio
+                v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)"
+                :key="dict.value"
+                :value="dict.value"
+              >
+                {{ dict.label }}
+              </el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
         <el-col :span="12">
           <el-form-item label="规格" prop="standard">
             <el-input v-model="formData.standard" placeholder="请输入规格" />
@@ -153,21 +166,24 @@ const formData = ref({
   barCode: undefined,
   categoryId: undefined,
   unitId: undefined,
-  status: undefined,
+  status: 0,
   standard: undefined,
   remark: undefined,
   expiryDay: undefined,
   weight: undefined,
   purchasePrice: undefined,
   salePrice: undefined,
-  minPrice: undefined
+  minPrice: undefined,
+  ifQr:undefined
 })
 const formRules = reactive({
   name: [{ required: true, message: '产品名称不能为空', trigger: 'blur' }],
   barCode: [{ required: true, message: '产品条码不能为空', trigger: 'blur' }],
   categoryId: [{ required: true, message: '产品分类编号不能为空', trigger: 'blur' }],
   unitId: [{ required: true, message: '单位编号不能为空', trigger: 'blur' }],
-  status: [{ required: true, message: '产品状态不能为空', trigger: 'blur' }]
+  status: [{ required: true, message: '产品状态不能为空', trigger: 'blur' }],
+  ifQr: [{ required: true, message: '一物一码不能为空', trigger: 'blur' }]
+
 })
 const formRef = ref() // 表单 Ref
 const categoryList = ref<ProductCategoryVO[]>([]) // 产品分类列表
@@ -235,7 +251,8 @@ const resetForm = () => {
     weight: undefined,
     purchasePrice: undefined,
     salePrice: undefined,
-    minPrice: undefined
+    minPrice: undefined,
+    ifQr:undefined
   }
   formRef.value?.resetFields()
 }

src/views/erp/product/product/index.vue

@@ -86,6 +86,11 @@
           <dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status" />
         </template>
       </el-table-column>
+      <el-table-column label="一物一码" align="center" prop="ifQr">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.ifQr" />
+        </template>
+      </el-table-column>
       <el-table-column
         label="创建时间"
         align="center"

src/views/erp/purchase/in/components/PurchaseInItemForm.vue

@@ -22,7 +22,7 @@
               clearable
               filterable
               placeholder="请选择仓库"
-              @change="onChangeWarehouse($event, row)"
+              @change="onChangeWarehouse(row)"
             >
               <el-option
                 v-for="item in warehouseList"
@@ -34,6 +34,31 @@
           </el-form-item>
         </template>
       </el-table-column>
+      <el-table-column label="货位" min-width="125">
+        <template #default="{ row, $index }">
+          <el-form-item
+            :prop="`${$index}.warehouseLocationId`"
+            :rules="formRules.warehouseLocationId"
+            class="mb-0px!"
+          >
+            <el-select
+              v-model="row.warehouseLocationId"
+              clearable
+              filterable
+              placeholder="请选择货位"
+            
+            >
+              <el-option
+                v-for="item in locationList"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
+              />
+            </el-select>
+          </el-form-item>
+        </template>
+      </el-table-column>
+      
       <el-table-column label="产品名称" min-width="180">
         <template #default="{ row }">
           <el-form-item class="mb-0px!">
@@ -170,6 +195,8 @@
   </el-form>
 </template>
 <script setup lang="ts">
+import { WarehouseApi as WarehouseLocactionApi ,WarehouseLocationVO} from '@/api/erp/warehouse'
+
 import { StockApi } from '@/api/erp/stock/stock'
 import {
   erpCountInputFormatter,
@@ -188,10 +215,12 @@ const formData = ref([])
 const formRules = reactive({
   warehouseId: [{ required: true, message: '仓库不能为空', trigger: 'blur' }],
   productId: [{ required: true, message: '产品不能为空', trigger: 'blur' }],
+  warehouseLocationId: [{ required: true, message: '货位不能为空', trigger: 'blur' }],
   count: [{ required: true, message: '产品数量不能为空', trigger: 'blur' }]
 })
 const formRef = ref([]) // 表单 Ref
 const warehouseList = ref<WarehouseVO[]>([]) // 仓库列表
+const locationList = ref<WarehouseLocationVO[]>([]) // 仓库列表
 const defaultWarehouse = ref<WarehouseVO>(undefined) // 默认仓库
 
 /** 初始化设置入库项 */
@@ -271,6 +300,40 @@ const handleAdd = () => {
   }
   formData.value.push(row)
 }
+const queryLocationParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  warehouseId: undefined as unknown
+})
+
+//仓库变更，同步变更货位列表
+const onChangeWarehouse = async (row: typeof props.items[0]) => {
+  queryLocationParams.warehouseId = row.warehouseId;
+  try {
+        const response = await WarehouseLocactionApi.getWarehouseLocationPage(queryLocationParams);
+        if (response) {
+            if (response.list.length !== 0) {
+                locationList.value = response.list;
+            } else {
+                console.error('获取货位列表失败，错误码:', response.code, '，错误信息:', response.msg);
+            }
+        } else {
+            console.error('获取货位列表失败，响应为空');
+        }
+    } catch (error: any) {
+        if (error.response) {
+            // Axios错误，有响应体
+            console.error('获取货位列表失败，HTTP错误码:', error.response.status, '，错误信息:', error.response.data);
+        } else if (error.request) {
+            // 发出了请求，但没有收到响应
+            console.error('获取货位列表失败，没有收到响应');
+        } else {
+            // 其他错误
+            console.error('获取货位列表时发生错误:', error.message);
+        }
+    }
+};
+
 
 /** 删除按钮操作 */
 const handleDelete = (index: number) => {
@@ -296,5 +359,6 @@ defineExpose({ validate })
 onMounted(async () => {
   warehouseList.value = await WarehouseApi.getWarehouseSimpleList()
   defaultWarehouse.value = warehouseList.value.find((item) => item.defaultStatus)
+  locationList.value = onChangeWarehouse({pageNo: 1,pageSize: 10,warehouseId: defaultWarehouse.value?.id})
 })
 </script>

src/views/erp/purchase/order/components/PurchaseOrderItemForm.vue

@@ -66,11 +66,7 @@
       </el-table-column>
       <el-table-column label="产品单价" fixed="right" min-width="120">
         <template #default="{ row, $index }">
-          <el-form-item
+          <el-form-item :prop="`${$index}.productPrice`" class="mb-0px!">
-            :prop="`${$index}.productPrice`"
-            :rules="formRules.productPrice"
-            class="mb-0px!"
-          >
             <el-input-number
               v-model="row.productPrice"
               controls-position="right"
@@ -157,7 +153,6 @@ const formLoading = ref(false) // 表单的加载中
 const formData = ref([])
 const formRules = reactive({
   productId: [{ required: true, message: '产品不能为空', trigger: 'blur' }],
-  productPrice: [{ required: true, message: '产品单价不能为空', trigger: 'blur' }],
   count: [{ required: true, message: '产品数量不能为空', trigger: 'blur' }]
 })
 const formRef = ref([]) // 表单 Ref

src/views/erp/warehouse/WarehouseForm.vue

@@ -0,0 +1,157 @@
+<template>
+  <Dialog :title="dialogTitle" v-model="dialogVisible">
+    <el-form
+      ref="formRef"
+      :model="formData"
+      :rules="formRules"
+      label-width="100px"
+      v-loading="formLoading"
+    >
+      <el-form-item label="仓库名称" prop="name">
+        <el-input v-model="formData.name" placeholder="请输入仓库名称" />
+      </el-form-item>
+      <el-form-item label="仓库地址" prop="address">
+        <el-input v-model="formData.address" placeholder="请输入仓库地址" />
+      </el-form-item>
+      <el-form-item label="仓库状态" prop="status">
+        <el-radio-group v-model="formData.status">
+          <el-radio
+            v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)"
+            :key="dict.value"
+            :value="dict.value"
+          >
+            {{ dict.label }}
+          </el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item label="仓储费" prop="warehousePrice">
+        <el-input-number
+          v-model="formData.warehousePrice"
+          placeholder="请输入仓储费，单位：元/天/KG"
+          :min="0"
+          :precision="2"
+          class="!w-1/1"
+        />
+      </el-form-item>
+      <el-form-item label="搬运费" prop="truckagePrice">
+        <el-input-number
+          v-model="formData.truckagePrice"
+          placeholder="请输入搬运费，单位：元"
+          :min="0"
+          :precision="2"
+          class="!w-1/1"
+        />
+      </el-form-item>
+      <el-form-item label="负责人" prop="principal">
+        <el-input v-model="formData.principal" placeholder="请输入负责人" />
+      </el-form-item>
+      <el-form-item label="排序" prop="sort">
+        <el-input-number
+          v-model="formData.sort"
+          placeholder="请输入排序"
+          :precision="0"
+          class="!w-1/1"
+        />
+      </el-form-item>
+      <el-form-item label="备注" prop="remark">
+        <el-input type="textarea" v-model="formData.remark" placeholder="请输入备注" />
+      </el-form-item>
+    </el-form>
+    <template #footer>
+      <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
+      <el-button @click="dialogVisible = false">取 消</el-button>
+    </template>
+  </Dialog>
+</template>
+<script setup lang="ts">
+import { WarehouseApi, WarehouseVO } from '@/api/erp/warehouse'
+import { getIntDictOptions, DICT_TYPE } from '@/utils/dict'
+
+/** ERP 仓库 表单 */
+defineOptions({ name: 'WarehouseForm' })
+
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const dialogTitle = ref('') // 弹窗的标题
+const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+const formType = ref('') // 表单的类型：create - 新增；update - 修改
+const formData = ref({
+  id: undefined,
+  name: undefined,
+  address: undefined,
+  sort: undefined,
+  remark: undefined,
+  principal: undefined,
+  warehousePrice: undefined,
+  truckagePrice: undefined,
+  status: undefined,
+  defaultStatus: undefined
+})
+const formRules = reactive({
+  name: [{ required: true, message: '仓库名称不能为空', trigger: 'blur' }],
+  sort: [{ required: true, message: '排序不能为空', trigger: 'blur' }],
+  status: [{ required: true, message: '开启状态不能为空', trigger: 'blur' }]
+})
+const formRef = ref() // 表单 Ref
+
+/** 打开弹窗 */
+const open = async (type: string, id?: number) => {
+  dialogVisible.value = true
+  dialogTitle.value = t('action.' + type)
+  formType.value = type
+  resetForm()
+  // 修改时，设置数据
+  if (id) {
+    formLoading.value = true
+    try {
+      formData.value = await WarehouseApi.getWarehouse(id)
+    } finally {
+      formLoading.value = false
+    }
+  }
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+
+/** 提交表单 */
+const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+const submitForm = async () => {
+  // 校验表单
+  await formRef.value.validate()
+  // 提交请求
+  formLoading.value = true
+  try {
+    const data = formData.value as unknown as WarehouseVO
+    if (formType.value === 'create') {
+      await WarehouseApi.createWarehouse(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await WarehouseApi.updateWarehouse(data)
+      message.success(t('common.updateSuccess'))
+    }
+    dialogVisible.value = false
+    // 发送操作成功的事件
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
+}
+
+/** 重置表单 */
+const resetForm = () => {
+  formData.value = {
+    id: undefined,
+    name: undefined,
+    address: undefined,
+    sort: undefined,
+    remark: undefined,
+    principal: undefined,
+    warehousePrice: undefined,
+    truckagePrice: undefined,
+    status: undefined,
+    defaultStatus: undefined
+  }
+  formRef.value?.resetFields()
+}
+</script>

src/views/erp/warehouse/components/WarehouseLocationForm.vue

@@ -0,0 +1,125 @@
+<template>
+  <Dialog :title="dialogTitle" v-model="dialogVisible">
+    <el-form
+      ref="formRef"
+      :model="formData"
+      :rules="formRules"
+      label-width="100px"
+      v-loading="formLoading"
+    >
+      <el-form-item label="货位名称" prop="name">
+        <el-input v-model="formData.name" placeholder="请输入货位名称" />
+      </el-form-item>
+      <el-form-item label="排序" prop="sort">
+        <el-input-number
+          v-model="formData.sort"
+          placeholder="请输入排序"
+          :precision="0"
+          class="!w-1/1"
+        />
+      </el-form-item>
+      <el-form-item label="备注" prop="remark">
+        <el-input v-model="formData.remark" placeholder="请输入备注" />
+      </el-form-item>
+      <el-form-item label="货位状态" prop="status">
+          <el-radio-group v-model="formData.status">
+            <el-radio
+              v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)"
+              :key="dict.value"
+              :value="dict.value"
+            >
+              {{ dict.label }}
+            </el-radio>
+        </el-radio-group>
+      </el-form-item>
+     </el-form>
+    <template #footer>
+      <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
+      <el-button @click="dialogVisible = false">取 消</el-button>
+    </template>
+  </Dialog>
+</template>
+<script setup lang="ts">
+import { WarehouseApi } from '@/api/erp/warehouse'
+import { getIntDictOptions, DICT_TYPE } from '@/utils/dict'
+
+
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const dialogTitle = ref('') // 弹窗的标题
+const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+const formType = ref('') // 表单的类型：create - 新增；update - 修改
+const formData = ref({
+  id: undefined,
+  name: undefined,
+  sort: undefined,
+  remark: undefined,
+  status: undefined,
+  warehouseId: 0
+})
+const formRules = reactive({
+  name: [{ required: true, message: '货位名称不能为空', trigger: 'blur' }],
+  sort: [{ required: true, message: '排序不能为空', trigger: 'blur' }],
+  status: [{ required: true, message: '开启状态不能为空', trigger: 'blur' }],
+  warehouseId: [{ required: true, message: '仓库编号不能为空', trigger: 'blur' }]
+})
+const formRef = ref() // 表单 Ref
+
+/** 打开弹窗 */
+const open = async (type: string, id: number, warehouseId: number) => {
+  dialogVisible.value = true
+  dialogTitle.value = t('action.' + type)
+  formType.value = type
+  resetForm()
+  formData.value.warehouseId = warehouseId
+  // 修改时，设置数据
+  if (id) {
+    formLoading.value = true
+    try {
+      formData.value = await WarehouseApi.getWarehouseLocation(id)
+    } finally {
+      formLoading.value = false
+    }
+  }
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+
+/** 提交表单 */
+const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+const submitForm = async () => {
+  // 校验表单
+  await formRef.value.validate()
+  // 提交请求
+  formLoading.value = true
+  try {
+    const data = formData.value
+    if (formType.value === 'create') {
+      await WarehouseApi.createWarehouseLocation(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await WarehouseApi.updateWarehouseLocation(data)
+      message.success(t('common.updateSuccess'))
+    }
+    dialogVisible.value = false
+    // 发送操作成功的事件
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
+}
+
+/** 重置表单 */
+const resetForm = () => {
+  formData.value = {
+    id: undefined,
+    name: undefined,
+    sort: undefined,
+    remark: undefined,
+    status: undefined,
+    warehouseId: 0
+  }
+  formRef.value?.resetFields()
+}
+</script>

src/views/erp/warehouse/components/WarehouseLocationList.vue

@@ -0,0 +1,135 @@
+<template>
+  <!-- 列表 -->
+  <ContentWrap>
+    <el-button
+      type="primary"
+      plain
+      @click="openForm('create')"
+      v-hasPermi="['erp:warehouse:create']"
+    >
+      <Icon icon="ep:plus" class="mr-5px" /> 新增
+    </el-button>
+    <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
+      <el-table-column label="货位编号" align="center" prop="id" />
+      <el-table-column label="货位名称" align="center" prop="name" />
+      <el-table-column label="排序" align="center" prop="sort" />
+      <el-table-column label="备注" align="center" prop="remark" />
+      <el-table-column label="货位状态" align="center" prop="status">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status" />
+        </template>
+      </el-table-column>
+      <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="['erp:warehouse:update']"
+          >
+            编辑
+          </el-button>
+          <el-button
+            link
+            type="danger"
+            @click="handleDelete(scope.row.id)"
+            v-hasPermi="['erp:warehouse:delete']"
+          >
+            删除
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页 -->
+    <Pagination
+      :total="total"
+      v-model:page="queryParams.pageNo"
+      v-model:limit="queryParams.pageSize"
+      @pagination="getList"
+    />
+  </ContentWrap>
+  <!-- 表单弹窗：添加/修改 -->
+  <WarehouseLocationForm ref="formRef" @success="getList" />
+</template>
+<script setup lang="ts">
+import { dateFormatter } from '@/utils/formatTime'
+import { WarehouseApi } from '@/api/erp/warehouse'
+import WarehouseLocationForm from './WarehouseLocationForm.vue'
+import { DICT_TYPE } from '@/utils/dict'
+
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+
+const props = defineProps<{
+  warehouseId?: number // 仓库编号（主表的关联字段）
+}>()
+const loading = ref(false) // 列表的加载中
+const list = ref([]) // 列表的数据
+const total = ref(0) // 列表的总页数
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  warehouseId: undefined as unknown
+})
+
+/** 监听主表的关联字段的变化，加载对应的子表数据 */
+watch(
+  () => props.warehouseId,
+  (val: number) => {
+    if (!val) {
+      return
+    }
+    queryParams.warehouseId = val
+    handleQuery()
+  },
+  { immediate: true, deep: true }
+)
+
+/** 查询列表 */
+const getList = async () => {
+  loading.value = true
+  try {
+    const data = await WarehouseApi.getWarehouseLocationPage(queryParams)
+    list.value = data.list
+    total.value = data.total
+  } finally {
+    loading.value = false
+  }
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.pageNo = 1
+  getList()
+}
+
+/** 添加/修改操作 */
+const formRef = ref()
+const openForm = (type: string, id?: number) => {
+  if (!props.warehouseId) {
+    message.error('请选择一个ERP 仓库')
+    return
+  }
+  formRef.value.open(type, id, props.warehouseId)
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await WarehouseApi.deleteWarehouseLocation(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+</script>

src/views/erp/warehouse/index.vue

@@ -0,0 +1,275 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <el-form
+      class="-mb-15px"
+      :model="queryParams"
+      ref="queryFormRef"
+      :inline="true"
+      label-width="68px"
+    >
+      <el-form-item label="仓库名称" prop="name">
+        <el-input
+          v-model="queryParams.name"
+          placeholder="请输入仓库名称"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="仓库状态" prop="status">
+        <el-select
+          v-model="queryParams.status"
+          placeholder="请选择仓库状态"
+          clearable
+          class="!w-240px"
+        >
+          <el-option
+            v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </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="['erp:warehouse:create']"
+        >
+          <Icon icon="ep:plus" class="mr-5px" /> 新增
+        </el-button>
+        <el-button
+          type="success"
+          plain
+          @click="handleExport"
+          :loading="exportLoading"
+          v-hasPermi="['erp:warehouse:export']"
+        >
+          <Icon icon="ep:download" class="mr-5px" /> 导出
+        </el-button>
+      </el-form-item>
+    </el-form>
+  </ContentWrap>
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <el-table
+      v-loading="loading"
+      :data="list"
+      :stripe="true"
+      :show-overflow-tooltip="true"
+      highlight-current-row
+      @current-change="handleCurrentChange"
+    >
+    <el-table-column label="仓库名称" align="center" prop="name" />
+      <el-table-column label="仓库地址" align="center" prop="address" />
+      <el-table-column
+        label="仓储费"
+        align="center"
+        prop="warehousePrice"
+        :formatter="erpPriceTableColumnFormatter"
+      />
+      <el-table-column
+        label="搬运费"
+        align="center"
+        prop="truckagePrice"
+        :formatter="erpPriceTableColumnFormatter"
+      />
+      <el-table-column label="负责人" align="center" prop="principal" />
+      <el-table-column label="备注" align="center" prop="remark" />
+      <el-table-column label="排序" align="center" prop="sort" />
+      <el-table-column label="状态" align="center" prop="status">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status" />
+        </template>
+      </el-table-column>
+      <el-table-column label="是否默认" align="center" prop="defaultStatus">
+        <template #default="scope">
+          <el-switch
+            v-model="scope.row.defaultStatus"
+            :active-value="true"
+            :inactive-value="false"
+            @change="handleDefaultStatusChange(scope.row)"
+          />
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="创建时间"
+        align="center"
+        prop="createTime"
+        :formatter="dateFormatter"
+        width="180px"
+      />
+      <el-table-column label="操作" align="center" min-width="120px">
+        <template #default="scope">
+          <el-button
+            link
+            type="primary"
+            @click="openForm('update', scope.row.id)"
+            v-hasPermi="['erp:warehouse:update']"
+          >
+            编辑
+          </el-button>
+          <el-button
+            link
+            type="danger"
+            @click="handleDelete(scope.row.id)"
+            v-hasPermi="['erp:warehouse:delete']"
+          >
+            删除
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页 -->
+    <Pagination
+      :total="total"
+      v-model:page="queryParams.pageNo"
+      v-model:limit="queryParams.pageSize"
+      @pagination="getList"
+    />
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <WarehouseForm ref="formRef" @success="getList" />
+  <!-- 子表的列表 -->
+  <ContentWrap>
+    <el-tabs model-value="warehouseLocation">
+      <el-tab-pane label="ERP 仓库货位" name="warehouseLocation">
+        <WarehouseLocationList :warehouse-id="currentRow.id" />
+      </el-tab-pane>
+    </el-tabs>
+  </ContentWrap>
+</template>
+
+<script setup lang="ts">
+import { dateFormatter } from '@/utils/formatTime'
+import download from '@/utils/download'
+import { WarehouseApi, WarehouseVO } from '@/api/erp/warehouse'
+import WarehouseForm from './WarehouseForm.vue'
+import WarehouseLocationList from './components/WarehouseLocationList.vue'
+import { getIntDictOptions, DICT_TYPE } from '@/utils/dict'
+import { erpPriceTableColumnFormatter } from '@/utils'
+
+/** ERP 仓库 列表 */
+defineOptions({ name: 'Warehouse' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const loading = ref(true) // 列表的加载中
+const list = ref<WarehouseVO[]>([]) // 列表的数据
+const total = ref(0) // 列表的总页数
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  name: undefined,
+  address: undefined,
+  sort: undefined,
+  remark: undefined,
+  principal: undefined,
+  warehousePrice: undefined,
+  truckagePrice: undefined,
+  status: undefined,
+  defaultStatus: undefined,
+  createTime: []
+})
+const queryFormRef = ref() // 搜索的表单
+const exportLoading = ref(false) // 导出的加载中
+
+/** 查询列表 */
+const getList = async () => {
+  loading.value = true
+  try {
+    const data = await WarehouseApi.getWarehousePage(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 WarehouseApi.deleteWarehouse(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+
+/** 修改默认状态 */
+const handleDefaultStatusChange = async (row: WarehouseVO) => {
+  try {
+    // 修改状态的二次确认
+    const text = row.defaultStatus ? '设置' : '取消'
+    await message.confirm('确认要' + text + '"' + row.name + '"默认吗?')
+    // 发起修改状态
+    await WarehouseApi.updateWarehouseDefaultStatus(row.id, row.defaultStatus)
+    // 刷新列表
+    await getList()
+  } catch (e) {
+    // 取消后，进行恢复按钮
+    row.defaultStatus = !row.defaultStatus
+  }
+}
+
+
+/** 导出按钮操作 */
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await WarehouseApi.exportWarehouse(queryParams)
+    download.excel(data, 'ERP 仓库.xls')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 选中行操作 */
+const currentRow = ref({
+  id: undefined
+}) 
+
+// 选中行
+const handleCurrentChange = (row) => {
+  currentRow.value = row
+}
+
+/** 初始化 **/
+onMounted(() => {
+  getList()
+})
+</script>