✨ feat(mes): 添加盘点任务相关的请求和响应 VO

src/views/mes/utils/constants.ts

@@ -237,7 +237,7 @@ export const MesWmStockTakingTypeEnum = {
 /** MES 盘点任务状态枚举 */
 export const MesWmStockTakingTaskStatusEnum = {
   PREPARE: MesOrderStatusConstants.DRAFT,
-  IN_PROGRESS: MesOrderStatusConstants.CONFIRMED,
+  APPROVING: MesOrderStatusConstants.APPROVING,
   FINISHED: MesOrderStatusConstants.FINISHED,
   CANCELED: MesOrderStatusConstants.CANCELLED
 }

src/views/mes/wm/stocktaking/plan/components/StockTakingPlanSelect.vue

@@ -0,0 +1,65 @@
+<!-- MES 盘点方案选择器：纯下拉，展示已启用方案（支持 code、name） -->
+<template>
+  <el-select
+    v-model="selectValue"
+    :placeholder="placeholder"
+    :disabled="disabled"
+    :clearable="clearable"
+    filterable
+    class="!w-full"
+    @change="handleChange"
+  >
+    <el-option
+      v-for="plan in planList"
+      :key="plan.id"
+      :label="plan.name || plan.code"
+      :value="plan.id"
+    >
+      <span>{{ plan.code }}</span>
+      <span class="ml-8px text-[var(--el-text-color-secondary)]">{{ plan.name }}</span>
+    </el-option>
+  </el-select>
+</template>
+
+<script setup lang="ts">
+import { StockTakingPlanApi, type StockTakingPlanVO } from '@/api/mes/wm/stocktaking/plan/index'
+
+defineOptions({ name: 'StockTakingPlanSelect' })
+
+const props = withDefaults(
+  defineProps<{
+    modelValue?: number
+    disabled?: boolean
+    clearable?: boolean
+    placeholder?: string
+  }>(),
+  {
+    disabled: false,
+    clearable: true,
+    placeholder: '请选择盘点方案'
+  }
+)
+
+const emit = defineEmits<{
+  'update:modelValue': [value: number | undefined]
+  change: [item: StockTakingPlanVO | undefined]
+}>()
+
+const planList = ref<StockTakingPlanVO[]>([])
+
+const selectValue = computed({
+  get: () => props.modelValue,
+  set: (val) => emit('update:modelValue', val)
+})
+
+/** 选中变化 */
+const handleChange = (val: number | undefined) => {
+  const item = planList.value.find((o) => o.id === val)
+  emit('change', item)
+}
+
+/** 加载盘点方案列表 */
+onMounted(async () => {
+  planList.value = await StockTakingPlanApi.getEnabledConfirmedStockTakingPlanSimpleList()
+})
+</script>

src/views/mes/wm/stocktaking/task/StockTakingForm.vue

@@ -0,0 +1,219 @@
+<template>
+  <Dialog :title="dialogTitle" v-model="dialogVisible" width="960px">
+    <el-form
+      ref="formRef"
+      :model="formData"
+      :rules="formRules"
+      label-width="110px"
+      v-loading="formLoading"
+    >
+      <el-row>
+        <el-col :span="8">
+          <el-form-item label="任务编码" prop="code">
+            <el-input v-model="formData.code" placeholder="请输入任务编码" :disabled="isDetail">
+              <template #append>
+                <el-button @click="generateCode" :disabled="formType !== 'create'">生成</el-button>
+              </template>
+            </el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="任务名称" prop="name">
+            <el-input v-model="formData.name" placeholder="请输入任务名称" :disabled="isDetail" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="盘点方案" prop="planId">
+            <StockTakingPlanSelect
+              v-model="formData.planId"
+              :disabled="isDetail"
+              @change="handlePlanChange"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="盘点类型" prop="type">
+            <el-select
+              v-model="formData.type"
+              placeholder="请选择盘点类型"
+              class="!w-full"
+              :disabled="isDetail"
+            >
+              <el-option
+                v-for="dict in getIntDictOptions(DICT_TYPE.MES_WM_STOCK_TAKING_TYPE)"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="盘点日期" prop="takingDate">
+            <el-date-picker
+              v-model="formData.takingDate"
+              type="date"
+              value-format="YYYY-MM-DD"
+              placeholder="请选择盘点日期"
+              class="!w-full"
+              :disabled="isDetail"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="是否盲盘" prop="blindFlag">
+            <el-switch v-model="formData.blindFlag" :disabled="isDetail" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="是否冻结库存" prop="frozenFlag">
+            <el-switch v-model="formData.frozenFlag" :disabled="isDetail" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="盘点人" prop="userId">
+            <UserSelect v-model="formData.userId" :disabled="isDetail" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="24">
+          <el-form-item label="备注" prop="remark">
+            <el-input
+              v-model="formData.remark"
+              type="textarea"
+              placeholder="请输入备注"
+              :disabled="isDetail"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+
+    <template #footer>
+      <el-button v-if="!isDetail" @click="submitForm" type="primary" :disabled="formLoading">
+        确 定
+      </el-button>
+      <el-button @click="dialogVisible = false">取 消</el-button>
+    </template>
+  </Dialog>
+</template>
+
+<script setup lang="ts">
+import { generateRandomStr } from '@/utils'
+import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
+import { StockTakingApi, type StockTakingTaskVO } from '@/api/mes/wm/stocktaking/task/index'
+import { type StockTakingPlanVO } from '@/api/mes/wm/stocktaking/plan/index'
+import StockTakingPlanSelect from '@/views/mes/wm/stocktaking/plan/components/StockTakingPlanSelect.vue'
+import UserSelect from '@/views/system/user/components/UserSelect.vue'
+
+defineOptions({ name: 'StockTakingForm' })
+
+const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const dialogTitle = computed(() => {
+  const titles = {
+    create: '新增盘点任务',
+    update: '编辑盘点任务',
+    detail: '盘点任务详情'
+  }
+  return titles[formType.value] || formType.value
+}) // 弹窗的标题
+const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+const formType = ref('create') // 表单的类型：create - 新增；update - 修改；detail - 详情
+const isDetail = computed(() => formType.value === 'detail') // 是否只读
+const formRef = ref() // 表单 Ref
+const formData = ref<StockTakingTaskVO>({
+  id: undefined,
+  code: undefined,
+  name: undefined,
+  takingDate: undefined,
+  type: undefined,
+  userId: undefined,
+  userNickname: undefined,
+  planId: undefined,
+  blindFlag: false,
+  frozenFlag: false,
+  remark: undefined
+})
+const formRules = reactive({
+  code: [{ required: true, message: '任务编码不能为空', trigger: 'blur' }],
+  name: [{ required: true, message: '任务名称不能为空', trigger: 'blur' }],
+  type: [{ required: true, message: '盘点类型不能为空', trigger: 'change' }],
+  takingDate: [{ required: true, message: '盘点日期不能为空', trigger: 'change' }],
+  blindFlag: [{ required: true, message: '是否盲盘不能为空', trigger: 'change' }],
+  frozenFlag: [{ required: true, message: '是否冻结库存不能为空', trigger: 'change' }],
+  userId: [{ required: true, message: '盘点人不能为空', trigger: 'change' }]
+})
+
+/** 生成任务编码 */
+const generateCode = () => {
+  formData.value.code = 'ST' + generateRandomStr(10)
+}
+
+/** 打开弹窗 */
+const open = async (type: string, id?: number) => {
+  dialogVisible.value = true
+  formType.value = type
+  resetForm()
+  if (id) {
+    formLoading.value = true
+    try {
+      formData.value = await StockTakingApi.getStockTaking(id)
+    } finally {
+      formLoading.value = false
+    }
+  }
+}
+defineExpose({ open })
+
+/** 提交表单 */
+const submitForm = async () => {
+  await formRef.value.validate()
+  formLoading.value = true
+  try {
+    const data = formData.value as unknown as StockTakingTaskVO
+    if (formType.value === 'create') {
+      await StockTakingApi.createStockTaking(data)
+      message.success(t('common.createSuccess'))
+      dialogVisible.value = false
+    } else {
+      await StockTakingApi.updateStockTaking(data)
+      message.success(t('common.updateSuccess'))
+      dialogVisible.value = false
+    }
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
+}
+
+/** 重置表单 */
+const resetForm = () => {
+  formData.value = {
+    id: undefined,
+    code: undefined,
+    name: undefined,
+    takingDate: undefined,
+    type: undefined,
+    userId: undefined,
+    userNickname: undefined,
+    planId: undefined,
+    blindFlag: false,
+    frozenFlag: false,
+    remark: undefined
+  }
+  formRef.value?.resetFields()
+}
+
+/** 方案变化处理 */
+const handlePlanChange = (plan?: StockTakingPlanVO) => {
+  if (!plan) {
+    return
+  }
+  formData.value.type = plan.type
+  formData.value.blindFlag = !!plan.blindFlag
+  formData.value.frozenFlag = !!plan.frozenFlag
+}
+</script>

src/views/mes/wm/stocktaking/task/index.vue

@@ -0,0 +1,275 @@
+<template>
+  <ContentWrap>
+    <el-form
+      ref="queryFormRef"
+      :model="queryParams"
+      :inline="true"
+      label-width="100px"
+      class="-mb-15px"
+    >
+      <el-form-item label="盘点类型" prop="type">
+        <el-select
+          v-model="queryParams.type"
+          placeholder="请选择盘点类型"
+          clearable
+          class="!w-240px"
+        >
+          <el-option
+            v-for="dict in getIntDictOptions(DICT_TYPE.MES_WM_STOCK_TAKING_TYPE)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="任务编码" prop="code">
+        <el-input
+          v-model="queryParams.code"
+          placeholder="请输入任务编码"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <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="takingDate">
+        <el-date-picker
+          v-model="queryParams.takingDate"
+          type="daterange"
+          value-format="YYYY-MM-DD HH:mm:ss"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          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.MES_WM_STOCK_TAKING_TASK_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="['mes:wm-stock-taking-task:create']"
+        >
+          <Icon icon="ep:plus" class="mr-5px" /> 新增
+        </el-button>
+        <el-button
+          type="success"
+          plain
+          @click="handleExport"
+          :loading="exportLoading"
+          v-hasPermi="['mes:wm-stock-taking-task: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="code" min-width="160">
+        <template #default="scope">
+          <el-button link type="primary" @click="openForm('detail', scope.row.id)">
+            {{ scope.row.code }}
+          </el-button>
+        </template>
+      </el-table-column>
+      <el-table-column label="任务名称" align="center" prop="name" min-width="160" />
+      <el-table-column label="盘点类型" align="center" prop="type" min-width="120">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.MES_WM_STOCK_TAKING_TYPE" :value="scope.row.type" />
+        </template>
+      </el-table-column>
+      <el-table-column label="盘点方案" align="center" prop="planName" min-width="180" />
+      <el-table-column label="盘点日期" align="center" prop="takingDate" min-width="180" />
+      <el-table-column label="盘点人" align="center" prop="userNickname" min-width="120" />
+      <el-table-column label="单据状态" align="center" prop="status" min-width="110">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.MES_WM_STOCK_TAKING_TASK_STATUS" :value="scope.row.status" />
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" width="360" fixed="right">
+        <template #default="scope">
+          <el-button
+            v-if="scope.row.status === MesWmStockTakingTaskStatusEnum.PREPARE"
+            link
+            type="primary"
+            @click="openForm('update', scope.row.id)"
+            v-hasPermi="['mes:wm-stock-taking-task:update']"
+          >
+            编辑
+          </el-button>
+          <el-button
+            v-if="scope.row.status === MesWmStockTakingTaskStatusEnum.PREPARE"
+            link
+            type="success"
+            @click="handleSubmit(scope.row.id)"
+            v-hasPermi="['mes:wm-stock-taking-task:update']"
+          >
+            提交
+          </el-button>
+          <el-button
+            v-if="scope.row.status === MesWmStockTakingTaskStatusEnum.PREPARE"
+            link
+            type="danger"
+            @click="handleDelete(scope.row.id)"
+            v-hasPermi="['mes:wm-stock-taking-task:delete']"
+          >
+            删除
+          </el-button>
+          <el-button
+            v-if="
+              scope.row.status !== MesWmStockTakingTaskStatusEnum.FINISHED &&
+              scope.row.status !== MesWmStockTakingTaskStatusEnum.CANCELED
+            "
+            link
+            type="danger"
+            @click="handleCancel(scope.row.id)"
+            v-hasPermi="['mes:wm-stock-taking-task:update']"
+          >
+            取消
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <Pagination
+      :total="total"
+      v-model:page="queryParams.pageNo"
+      v-model:limit="queryParams.pageSize"
+      @pagination="getList"
+    />
+  </ContentWrap>
+
+  <StockTakingForm ref="formRef" @success="getList" />
+</template>
+
+<script setup lang="ts">
+import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
+import download from '@/utils/download'
+import { StockTakingApi, type StockTakingTaskVO } from '@/api/mes/wm/stocktaking/task/index'
+import { MesWmStockTakingTaskStatusEnum } from '@/views/mes/utils/constants'
+import StockTakingForm from './StockTakingForm.vue'
+
+defineOptions({ name: 'MesWmStockTakingTaking' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+const router = useRouter() // 路由
+
+const loading = ref(true) // 列表的加载中
+const list = ref<StockTakingTaskVO[]>([]) // 列表数据
+const total = ref(0) // 列表的总页数
+const exportLoading = ref(false) // 导出的加载中
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  code: undefined,
+  name: undefined,
+  type: undefined,
+  status: undefined,
+  takingDate: undefined
+})
+const queryFormRef = ref() // 搜索的表单
+const formRef = ref() // 表单 Ref
+
+/** 查询列表 */
+const getList = async () => {
+  loading.value = true
+  try {
+    const data = await StockTakingApi.getStockTakingPage(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 openForm = (type: string, id?: number) => {
+  formRef.value.open(type, id)
+}
+
+/** 提交审批 */
+const handleSubmit = async (id: number) => {
+  try {
+    await message.confirm('确认提交该盘点任务进行审批？')
+    await StockTakingApi.submitStockTaking({ id })
+    message.success('提交成功')
+    await getList()
+  } catch {}
+}
+
+/** 取消任务 */
+const handleCancel = async (id: number) => {
+  try {
+    await message.confirm('确认取消该盘点任务？')
+    await StockTakingApi.cancelStockTaking({ id })
+    message.success('取消成功')
+    await getList()
+  } catch {}
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    await message.delConfirm()
+    await StockTakingApi.deleteStockTaking(id)
+    message.success(t('common.delSuccess'))
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const handleExport = async () => {
+  try {
+    await message.exportConfirm()
+    exportLoading.value = true
+    const data = await StockTakingApi.exportStockTaking(queryParams)
+    download.excel(data, '盘点任务.xls')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 初始化 */
+onMounted(() => {
+  getList()
+})
+</script>