黄伟杰 4 months ago
commit cafcaacdfc

@ -71,6 +71,10 @@ export const MoldBrandApi = {
// 查询模具列表 // 查询模具列表
getMoldList: async (params) => { getMoldList: async (params) => {
return await request.get({ url: `/erp/mold-brand/getMoldList`, params }) return await request.get({ url: `/erp/mold-brand/getMoldList`, params })
},
// 查询模具列表
getMoldAllList: async () => {
return await request.get({ url: `/erp/mold-brand/getMoldAllList`})
}, },
// 获得模具分页 // 获得模具分页
getMoldPage: async (params) => { getMoldPage: async (params) => {

@ -0,0 +1,27 @@
import request from '@/config/axios'
export interface RecipeDeviceRecordVO {
id?: number
code?: string
name?: string
recipeId?: number | string
recipeName?: string
planId?: number | string
planCode?: string
creator?: string
createTime?: string
source?: string
isEnable?: string | number | boolean
}
export const RecipeDeviceRecordApi = {
createRecipeDeviceRecordBatch: async (id: number) => {
return await request.post({ url: `/iot/recipe-device-record/batch-create?id=` + id })
},
getRecipeDeviceRecordPage: async (params: any) => {
return await request.get({ url: `/iot/recipe-device-record/page`, params })
}
}

@ -33,6 +33,11 @@ export const RecipePlanDetailApi = {
exportRecipePlanDetail: async (params: any) => { exportRecipePlanDetail: async (params: any) => {
return await request.download({ url: `/iot/recipe-plan-detail/export-excel`, params }) return await request.download({ url: `/iot/recipe-plan-detail/export-excel`, params })
} },
createRecipeDeviceRecordBatch: async (id: number) => {
return await request.post({ url: `/iot/recipe-plan-detail/batch-create?id=` + id })
},
} }

@ -1,7 +1,6 @@
import request from '@/config/axios' import request from '@/config/axios'
export interface RecipePointVO { export interface RecipePointVO {
id?: number
recipeId?: number | string recipeId?: number | string
name?: string name?: string
refer?: string refer?: string
@ -16,6 +15,9 @@ export interface RecipePointVO {
export const RecipePointApi = { export const RecipePointApi = {
getRecipePointPage: async (params: any) => { getRecipePointPage: async (params: any) => {
return await request.get({ url: `/iot/recipe-point/page`, params }) return await request.get({ url: `/iot/recipe-point/page`, params })
},
getRecipePointList: async (recipeId: number) => {
return await request.get({ url: `/iot/recipe-point/list?id=`+ recipeId })
} }
} }

@ -0,0 +1,21 @@
import request from '@/config/axios'
export interface RecipePointRecordVO {
recipe_id?: number
name: string
max: number
min:number
data_type: string
data_unit: string
remark: string
refer: string
}
export const RecipePointRecordApi = {
// 新增记录
createRecipePointRecordBatch: async (data: RecipePointRecordVO[]) => {
return await request.post({ url: `/iot/recipe-point-record/batch-create`, data })
},
getRecipePointRecordPage: async (params: any) => {
return await request.get({ url: `/iot/recipe-point-record/page`, params })
}
}

@ -45,7 +45,7 @@
class="!w-220px" class="!w-220px"
/> />
</el-form-item> </el-form-item>
<el-form-item label="供应商" prop="supplierId"> <!-- <el-form-item label="供应商" prop="supplierId">
<el-select <el-select
v-model="queryParams.supplierId" v-model="queryParams.supplierId"
clearable clearable
@ -60,7 +60,7 @@
:value="item.id" :value="item.id"
/> />
</el-select> </el-select>
</el-form-item> </el-form-item> -->
<el-form-item label="仓库" prop="warehouseId"> <el-form-item label="仓库" prop="warehouseId">
<el-select <el-select
v-model="queryParams.warehouseId" v-model="queryParams.warehouseId"
@ -148,10 +148,10 @@
<!-- 列表 --> <!-- 列表 -->
<ContentWrap> <ContentWrap>
<el-tabs v-model="activeName" @tab-click="handleTabClick"> <el-tabs v-model="activeName" @tab-click="handleTabClick">
<el-tab-pane label="产品" name="产品入库" /> <el-tab-pane label="产品入库" name="产品入库" />
<el-tab-pane label="原料" name="原料入库" /> <el-tab-pane label="原料入库" name="原料入库" />
<el-tab-pane label="备件" name="备件入库" /> <el-tab-pane label="备件入库" name="备件入库" />
<el-tab-pane label="其他" name="其他入库" /> <el-tab-pane label="其他入库" name="其他入库" />
</el-tabs> </el-tabs>
<el-table <el-table
@ -164,7 +164,7 @@
<el-table-column width="30" label="选择" type="selection" /> <el-table-column width="30" label="选择" type="selection" />
<el-table-column min-width="180" label="入库单号" align="center" prop="no" /> <el-table-column min-width="180" label="入库单号" align="center" prop="no" />
<el-table-column label="产品信息" align="left" sortable prop="productNames" min-width="200" /> <el-table-column label="产品信息" align="left" sortable prop="productNames" min-width="200" />
<el-table-column label="供应商" align="center" prop="supplierName" /> <!-- <el-table-column label="供应商" align="center" prop="supplierName" /> -->
<el-table-column <el-table-column
label="入库时间" label="入库时间"
align="center" align="center"
@ -180,13 +180,13 @@
prop="totalCount" prop="totalCount"
:formatter="erpCountTableColumnFormatter" :formatter="erpCountTableColumnFormatter"
/> />
<el-table-column <!-- <el-table-column
label="金额" label="金额"
align="right" align="right"
sortable sortable
prop="totalPrice" prop="totalPrice"
:formatter="erpPriceTableColumnFormatter" :formatter="erpPriceTableColumnFormatter"
/> /> -->
<el-table-column label="状态" align="center" fixed="right" width="90" prop="status"> <el-table-column label="状态" align="center" fixed="right" width="90" prop="status">
<template #default="scope"> <template #default="scope">
<dict-tag :type="DICT_TYPE.ERP_AUDIT_STATUS" :value="scope.row.status" /> <dict-tag :type="DICT_TYPE.ERP_AUDIT_STATUS" :value="scope.row.status" />
@ -281,7 +281,7 @@ const queryParams = reactive({
productId: undefined, productId: undefined,
supplierId: undefined, supplierId: undefined,
inTime: [], inTime: [],
status: undefined, status: 10,
remark: undefined, remark: undefined,
inType: undefined, inType: undefined,
creator: undefined creator: undefined

@ -45,12 +45,12 @@
class="!w-240px" class="!w-240px"
/> />
</el-form-item> </el-form-item>
<el-form-item label="客户" prop="customerId"> <!-- <el-form-item label="客户" prop="customerId">
<el-select <el-select
v-model="queryParams.customerId" v-model="queryParams.customerId"
clearable clearable
filterable filterable
placeholder="请选择客户" placeholder="请选择客户"
class="!w-240px" class="!w-240px"
> >
<el-option <el-option
@ -60,7 +60,7 @@
:value="item.id" :value="item.id"
/> />
</el-select> </el-select>
</el-form-item> </el-form-item> -->
<el-form-item label="仓库" prop="warehouseId"> <el-form-item label="仓库" prop="warehouseId">
<el-select <el-select
v-model="queryParams.warehouseId" v-model="queryParams.warehouseId"
@ -148,10 +148,11 @@
<!-- 列表 --> <!-- 列表 -->
<ContentWrap> <ContentWrap>
<el-tabs v-model="activeName" @tab-click="handleTabClick"> <el-tabs v-model="activeName" @tab-click="handleTabClick">
<el-tab-pane label="产品" name="产品出库" /> <el-tab-pane label="产品出库" name="产品出库" />
<el-tab-pane label="原料" name="原料出库" /> <el-tab-pane label="原料出库" name="原料出库" />
<el-tab-pane label="备件" name="备件出库" /> <el-tab-pane label="备件出库" name="备件出库" />
<el-tab-pane label="其他" name="其他出库" /> <el-tab-pane label="其他出库" name="其他出库" />
<el-tab-pane label="领料出库" name="领料出库" />
</el-tabs> </el-tabs>
<el-table <el-table
@ -163,8 +164,8 @@
> >
<el-table-column width="30" label="选择" type="selection" /> <el-table-column width="30" label="选择" type="selection" />
<el-table-column min-width="180" label="出库单号" align="center" prop="no" /> <el-table-column min-width="180" label="出库单号" align="center" prop="no" />
<el-table-column label="产品信息" align="left" sortable prop="productNames" min-width="210" /> <el-table-column label="产品信息" align="left" sortable prop="productNames" min-width="180" />
<el-table-column label="客户" align="center" prop="customerName" /> <!-- <el-table-column label="客户" align="center" prop="customerName" /> -->
<el-table-column <el-table-column
label="出库时间" label="出库时间"
align="center" align="center"
@ -181,13 +182,13 @@
prop="totalCount" prop="totalCount"
:formatter="erpCountTableColumnFormatter" :formatter="erpCountTableColumnFormatter"
/> />
<el-table-column <!-- <el-table-column
label="金额" label="金额"
align="right" align="right"
sortable sortable
prop="totalPrice" prop="totalPrice"
:formatter="erpPriceTableColumnFormatter" :formatter="erpPriceTableColumnFormatter"
/> /> -->
<el-table-column label="状态" align="center" fixed="right" width="90" prop="status"> <el-table-column label="状态" align="center" fixed="right" width="90" prop="status">
<template #default="scope"> <template #default="scope">
<dict-tag :type="DICT_TYPE.ERP_AUDIT_STATUS" :value="scope.row.status" /> <dict-tag :type="DICT_TYPE.ERP_AUDIT_STATUS" :value="scope.row.status" />
@ -285,7 +286,7 @@ const queryParams = reactive({
outType: undefined, outType: undefined,
warehouseId: undefined, warehouseId: undefined,
outTime: [], outTime: [],
status: undefined, status: 10,
remark: undefined, remark: undefined,
creator: undefined creator: undefined
}) })

@ -2,15 +2,22 @@
<el-tabs v-model="activeTab"> <el-tabs v-model="activeTab">
<el-tab-pane label="设备数据" name="detail"> <el-tab-pane label="设备数据" name="detail">
<el-table :data="detailList" :stripe="true" :show-overflow-tooltip="true" row-key="key"> <el-table :data="detailList" :stripe="true" :show-overflow-tooltip="true" row-key="key">
<el-table-column type="index" label="序号" align="center" width="70" /> <!-- <el-table-column type="index" label="序号" align="center" width="70" /> -->
<el-table-column label="点位名称" align="center" prop="pointName" min-width="180" /> <el-table-column label="点位名称" align="center" prop="attributeName" min-width="180" />
<el-table-column label="数据类型" align="center" prop="dataType" min-width="180" />
<!-- <el-table-column label="地址" align="center" prop="address" min-width="180" /> -->
<el-table-column label="单位" align="center" prop="dataUnit" width="120" />
<el-table-column label="采集值" align="center" prop="value" min-width="180" /> <el-table-column label="采集值" align="center" prop="value" min-width="180" />
<el-table-column label="单位" align="center" prop="unit" width="120" />
</el-table> </el-table>
<Pagination
:total="to"
v-model:page="queryParams.pageNo"
v-model:limit="queryParams.pageSize"
@pagination="getList"
/>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="手动录入参数" name="manual"> <el-tab-pane label="手动录入参数" name="manual">
<el-form <!-- <el-form
class="-mb-15px" class="-mb-15px"
:model="queryParams" :model="queryParams"
ref="queryFormRef" ref="queryFormRef"
@ -61,16 +68,15 @@
<Icon icon="ep:refresh" class="mr-5px" /> 重置 <Icon icon="ep:refresh" class="mr-5px" /> 重置
</el-button> </el-button>
</el-form-item> </el-form-item>
</el-form> </el-form> -->
<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true" row-key="id"> <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true" row-key="id">
<el-table-column type="index" label="序号" align="center" width="70" /> <!-- <el-table-column type="index" label="序号" align="center" width="70" /> -->
<el-table-column label="名称" align="center" prop="name" min-width="160" /> <el-table-column label="名称" align="center" prop="name" min-width="140" />
<el-table-column label="参考值" align="center" prop="refer" min-width="160" /> <el-table-column label="数据类型" align="center" prop="dataType" width="140" />
<el-table-column label="单位" align="center" prop="dataUnit" width="140" /> <el-table-column label="单位" align="center" prop="dataUnit" width="140" />
<el-table-column label="参考值" align="center" prop="refer" min-width="160" />
<el-table-column label="备注" align="center" prop="remark" min-width="180" /> <el-table-column label="备注" align="center" prop="remark" min-width="180" />
</el-table> </el-table>
<Pagination <Pagination
:total="total" :total="total"
v-model:page="queryParams.pageNo" v-model:page="queryParams.pageNo"
@ -82,7 +88,8 @@
</template> </template>
<script setup lang="ts"> <script setup lang="ts">
import { RecipePointApi, RecipePointVO } from '@/api/iot/recipePoint' import { RecipePointRecordApi } from '@/api/iot/recipepointrecord'
import { RecipeDeviceRecordApi } from '@/api/iot/recipeDeviceRecord'
defineOptions({ name: 'FormulaLibraryDetailTabs' }) defineOptions({ name: 'FormulaLibraryDetailTabs' })
@ -100,6 +107,7 @@ const detailList = ref<{ key: string; pointName: string; value: string; unit: st
const loading = ref(false) const loading = ref(false)
const list = ref<RecipePointVO[]>([]) const list = ref<RecipePointVO[]>([])
const total = ref(0) const total = ref(0)
const to = ref(0)
const queryFormRef = ref() const queryFormRef = ref()
const queryParams = reactive({ const queryParams = reactive({
@ -135,9 +143,16 @@ const getList = async () => {
} }
loading.value = true loading.value = true
try { try {
const data = await RecipePointApi.getRecipePointPage(buildQueryParams()) if (activeTab.value === 'manual') {
const data = await RecipePointRecordApi.getRecipePointRecordPage(buildQueryParams())
list.value = data.list list.value = data.list
total.value = data.total total.value = data.total
} else {
const d = await RecipeDeviceRecordApi.getRecipeDeviceRecordPage(buildQueryParams())
detailList.value = d.list
to.value = d.total
}
} finally { } finally {
loading.value = false loading.value = false
} }
@ -157,14 +172,16 @@ watch(
() => props.recipeId, () => props.recipeId,
() => { () => {
queryParams.pageNo = 1 queryParams.pageNo = 1
if (activeTab.value === 'manual') getList() // if (activeTab.value === 'manual')
getList()
} }
) )
watch( watch(
() => activeTab.value, () => activeTab.value,
(tab) => { (tab) => {
if (tab === 'manual') getList() // if (tab === 'manual')
getList()
} }
) )
</script> </script>

@ -2,14 +2,17 @@
<Dialog v-model="visible" :title="title" width="920px"> <Dialog v-model="visible" :title="title" width="920px">
<div class="formula-library-read-content"> <div class="formula-library-read-content">
<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true" row-key="id"> <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true" row-key="id">
<el-table-column type="index" label="序号" align="center" width="70" /> <!-- <el-table-column type="index" label="序号" align="center" width="70" /> -->
<el-table-column label="名称" align="center" prop="name" min-width="160" /> <el-table-column label="名称" align="center" prop="name" min-width="160" />
<el-table-column label="参考值" align="center" prop="refer" min-width="160" /> <!-- <el-table-column label="参考值" align="center" prop="refer" min-width="160" /> -->
<el-table-column label="数据类型" align="center" prop="dataType" width="140" />
<el-table-column label="单位" align="center" prop="dataUnit" width="140" /> <el-table-column label="单位" align="center" prop="dataUnit" width="140" />
<el-table-column label="上限" align="center" prop="max" width="140" />
<el-table-column label="下限" align="center" prop="min" width="140" />
<el-table-column label="备注" align="center" prop="remark" min-width="180" /> <el-table-column label="备注" align="center" prop="remark" min-width="180" />
<el-table-column label="采集值" align="center" min-width="160" fixed="right"> <el-table-column label="采集值" align="center" min-width="160" fixed="right" prop="refer">
<template #default="scope"> <template #default="{ row }">
<el-input v-model="collectedValueMap[String(scope.row.id)]" placeholder="请输入采集值" clearable /> <el-input v-model="row.refer" placeholder="请输入采集值" />
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -30,6 +33,7 @@
</div> </div>
<template #footer> <template #footer>
<el-button @click="submitForm" type="primary"> </el-button>
<el-button @click="visible = false"> </el-button> <el-button @click="visible = false"> </el-button>
</template> </template>
</Dialog> </Dialog>
@ -37,6 +41,8 @@
<script setup lang="ts"> <script setup lang="ts">
import { RecipePointApi, RecipePointVO } from '@/api/iot/recipePoint' import { RecipePointApi, RecipePointVO } from '@/api/iot/recipePoint'
import { RecipeDeviceRecordApi} from '@/api/iot/recipeDeviceRecord'
import { RecipePointRecordApi,RecipePointRecordVO} from '@/api/iot/recipepointrecord'
defineOptions({ name: 'FormulaLibraryReadDialog' }) defineOptions({ name: 'FormulaLibraryReadDialog' })
@ -50,6 +56,9 @@ const recipeId = ref<string | number | undefined>(undefined)
const list = ref<RecipePointVO[]>([]) const list = ref<RecipePointVO[]>([])
const total = ref(0) const total = ref(0)
const { t } = useI18n() //
const message = useMessage() //
const queryParams = reactive({ const queryParams = reactive({
pageNo: 1, pageNo: 1,
pageSize: 10 pageSize: 10
@ -71,11 +80,7 @@ const getList = async () => {
if (!recipeId.value) return if (!recipeId.value) return
loading.value = true loading.value = true
try { try {
const data = await RecipePointApi.getRecipePointPage({ const data = await RecipePointApi.getRecipePointList(Number(recipeId.value))
pageNo: queryParams.pageNo,
pageSize: queryParams.pageSize,
recipeId: String(recipeId.value)
})
setPageData(data) setPageData(data)
} finally { } finally {
loading.value = false loading.value = false
@ -91,23 +96,37 @@ const handleCurrentChange = () => {
getList() getList()
} }
const formulaLibraryId = ref()
const open = async (options: { const open = async (options: {
recipeId: string | number recipeId: string | number
recipeName?: string recipeName?: string
initialData?: PageResult<RecipePointVO> data?: Array<RecipePointVO>
id : undefined | number
}) => { }) => {
visible.value = true
formulaLibraryId.value = options.id
recipeId.value = options.recipeId recipeId.value = options.recipeId
title.value = options.recipeName ? `读取-${options.recipeName}` : '读取' title.value = options.recipeName ? `读取-${options.recipeName}` : '读取'
queryParams.pageNo = 1 queryParams.pageNo = 1
visible.value = true list.value = options.data ?? []
if (options.initialData) { // if (options.initialData) {
setPageData(options.initialData) // // setPageData(options.initialData)
return // return
} // }
await getList() //await getList()
} }
defineExpose({ open }) defineExpose({ open })
const submitForm = async() => {
console.log(list.value)
await RecipePointRecordApi.createRecipePointRecordBatch(list.value as unknown as RecipePointRecordVO[])
await RecipeDeviceRecordApi.createRecipeDeviceRecordBatch(formulaLibraryId.value)
visible.value = false
message.success(t('common.createSuccess'))
}
</script> </script>
<style scoped> <style scoped>

@ -57,11 +57,11 @@
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="来源" prop="source"> <!-- <el-form-item label="来源" prop="source">
<el-select v-model="queryParams.source" placeholder="请选择来源" clearable class="!w-240px"> <el-select v-model="queryParams.source" placeholder="请选择来源" clearable class="!w-240px">
<el-option v-for="opt in sourceOptions" :key="opt.value" :label="opt.label" :value="opt.value" /> <el-option v-for="opt in sourceOptions" :key="opt.value" :label="opt.label" :value="opt.value" />
</el-select> </el-select>
</el-form-item> </el-form-item> -->
<el-form-item> <el-form-item>
<el-button @click="handleQuery"> <el-button @click="handleQuery">
<Icon icon="ep:search" class="mr-5px" /> 查询 <Icon icon="ep:search" class="mr-5px" /> 查询
@ -103,12 +103,12 @@
</el-table-column> </el-table-column>
<el-table-column label="创建人" align="center" prop="creator" width="120" /> <el-table-column label="创建人" align="center" prop="creator" width="120" />
<el-table-column label="创建时间" align="center" prop="createTime" :formatter="dateFormatter" width="180" /> <el-table-column label="创建时间" align="center" prop="createTime" :formatter="dateFormatter" width="180" />
<el-table-column label="来源" align="center" prop="source" width="120"> <!-- <el-table-column label="来源" align="center" prop="source" width="120">
<template #default="scope"> <template #default="scope">
<el-tag v-if="scope.row.source" :type="getSourceTagType(scope.row.source)">{{ scope.row.source }}</el-tag> <el-tag v-if="scope.row.source" :type="getSourceTagType(scope.row.source)">{{ scope.row.source }}</el-tag>
<span v-else>-</span> <span v-else>-</span>
</template> </template>
</el-table-column> </el-table-column> -->
<el-table-column label="操作" align="center" width="180" fixed="right"> <el-table-column label="操作" align="center" width="180" fixed="right">
<template #default="scope"> <template #default="scope">
<el-button link type="primary" @click.stop="handleRead(scope.row)">读取</el-button> <el-button link type="primary" @click.stop="handleRead(scope.row)">读取</el-button>
@ -172,6 +172,7 @@ import { RecipePointApi } from '@/api/iot/recipePoint'
import { PlanApi } from '@/api/mes/plan' import { PlanApi } from '@/api/mes/plan'
import FormulaLibraryDetailTabs from './components/FormulaLibraryDetailTabs.vue' import FormulaLibraryDetailTabs from './components/FormulaLibraryDetailTabs.vue'
import FormulaLibraryReadDialog from './components/FormulaLibraryReadDialog.vue' import FormulaLibraryReadDialog from './components/FormulaLibraryReadDialog.vue'
import { RecipeDeviceRecordApi} from '@/api/iot/recipeDeviceRecord'
type SelectOption<T = any> = { label: string; value: T } type SelectOption<T = any> = { label: string; value: T }
@ -350,11 +351,19 @@ const readDialogRef = ref<InstanceType<typeof FormulaLibraryReadDialog>>()
const handleRead = async (row: RecipePlanDetailVO) => { const handleRead = async (row: RecipePlanDetailVO) => {
const recipeId = row?.recipeId const recipeId = row?.recipeId
const id = row?.id
if (!recipeId) return if (!recipeId) return
const recipeName = row?.recipeName const recipeName = row?.recipeName
const data = await RecipePointApi.getRecipePointPage({ pageNo: 1, pageSize: 10, recipeId: String(recipeId) }) const data = await RecipePointApi.getRecipePointList(Number(recipeId))
if (!data?.list?.length) return if (!data?.length) {
await readDialogRef.value?.open({ recipeId, recipeName, initialData: data }) await message.confirm('是否读取设备数据?')
if (id != null) {
await RecipeDeviceRecordApi.createRecipeDeviceRecordBatch(id)
message.success(t('common.createSuccess'))
return
}
}
await readDialogRef.value?.open({ recipeId, recipeName, data, id })
} }
const submitDialog = async () => { const submitDialog = async () => {

@ -1,58 +1,110 @@
<template> <template>
<Dialog :title="dialogTitle" v-model="dialogVisible"> <Dialog :title="dialogTitle" v-model="dialogVisible" width="1080">
<el-form <el-form
ref="formRef" ref="formRef"
:model="formData" :model="formData"
:rules="formRules" :rules="formRules"
label-width="100px" label-width="100px"
v-loading="formLoading" v-loading="formLoading"
:disabled="disabled"
> >
<el-form-item label="领模单号" prop="orderId"> <el-row :gutter="20">
<el-input v-model="formData.orderId" placeholder="请输入领模单号" /> <el-col :span="8">
</el-form-item> <el-form-item label="出库单号" prop="no">
<el-form-item label="模具编码" prop="code"> <el-input disabled v-model="formData.no" placeholder="保存时自动生成" />
<el-input v-model="formData.code" placeholder="请输入模具编码" /> </el-form-item>
</el-form-item> </el-col>
<el-form-item label="模具名称" prop="name"> <el-col :span="8">
<el-input v-model="formData.name" placeholder="请输入模具名称" /> <el-form-item label="客户" prop="customerId">
</el-form-item> <el-select
<el-form-item label="状态" prop="state"> v-model="formData.customerId"
<el-input v-model="formData.state" placeholder="请输入状态" /> clearable
</el-form-item> filterable
<el-form-item label="领模人" prop="person"> placeholder="请选择客户"
<el-input v-model="formData.person" placeholder="请输入领模人" /> class="!w-1/1"
</el-form-item> >
<el-form-item label="设备id" prop="deviceId"> <el-option
<el-input v-model="formData.deviceId" placeholder="请输入设备id" /> v-for="item in customerList"
</el-form-item> :key="item.id"
<el-form-item label="设备名称" prop="deviceName"> :label="item.name"
<el-input v-model="formData.deviceName" placeholder="请输入设备名称" /> :value="item.id"
</el-form-item> />
<el-form-item label="领取时间" prop="getTime"> </el-select>
<el-date-picker </el-form-item>
v-model="formData.getTime" </el-col>
type="date" <el-col :span="8">
value-format="x" <el-form-item label="出库时间" prop="outTime">
placeholder="选择领取时间" <el-date-picker
/> v-model="formData.outTime"
</el-form-item> type="date"
<el-form-item label="库管员" prop="principal"> value-format="x"
<el-input v-model="formData.principal" placeholder="请输入库管员" /> placeholder="选择出库时间"
</el-form-item> class="!w-1/1"
<el-form-item label="备注" prop="remark"> />
<el-input v-model="formData.remark" placeholder="请输入备注" /> </el-form-item>
</el-form-item> </el-col>
<el-col :span="8">
<el-form-item label="出库类型" prop="outType">
<el-select
v-model="formData.outType"
clearable
filterable
placeholder="请选择出库类型"
class="!w-1/1"
>
<el-option
v-for="item in options"
:key="item.value"
:label="item.label"
:value="item.value"
:disabled="item.disabled"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="备注" prop="remark">
<el-input
type="textarea"
v-model="formData.remark"
:rows="1"
placeholder="请输入备注"
/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="附件" prop="fileUrl">
<UploadFile :is-show-tip="false" v-model="formData.fileUrl" :limit="1" />
</el-form-item>
</el-col>
</el-row>
</el-form> </el-form>
<!-- 子表的表单 -->
<ContentWrap>
<el-tabs v-model="subTabsName" class="-mt-15px -mb-10px">
<el-tab-pane label="出库产品清单" name="item">
<!-- <StockOutItemForm ref="itemFormRef" :items="formData.items" :disabled="disabled" /> -->
</el-tab-pane>
</el-tabs>
</ContentWrap>
<template #footer> <template #footer>
<el-button @click="submitForm" type="primary" :disabled="formLoading"> </el-button> <el-button @click="submitForm" type="primary" :disabled="formLoading" v-if="!disabled">
</el-button>
<el-button @click="dialogVisible = false"> </el-button> <el-button @click="dialogVisible = false"> </el-button>
</template> </template>
</Dialog> </Dialog>
</template> </template>
<script setup lang="ts"> <script setup lang="ts">
import { MoldGetApi, MoldGetVO } from '@/api/mes/moldget' import { StockOutApi, StockOutVO } from '@/api/erp/stock/out'
// import StockOutItemForm from './components/StockOutItemForm.vue'
import { CustomerApi, CustomerVO } from '@/api/erp/sale/customer'
import {DICT_TYPE, getBoolDictOptions, getStrDictOptions} from "@/utils/dict";
/** 模具管理-领模申请 表单 */ /** ERP 其它出库单表单 */
defineOptions({ name: 'MoldGetForm' }) defineOptions({ name: 'MoldGetForm' })
const { t } = useI18n() // const { t } = useI18n() //
@ -61,27 +113,51 @@ const message = useMessage() // 消息弹窗
const dialogVisible = ref(false) // const dialogVisible = ref(false) //
const dialogTitle = ref('') // const dialogTitle = ref('') //
const formLoading = ref(false) // 12 const formLoading = ref(false) // 12
const formType = ref('') // create - update - const formType = ref('') // create - update - detail -
const formData = ref({ const formData = ref({
id: undefined, id: undefined,
orderId: undefined, customerId: undefined,
code: undefined, outTime: undefined,
name: undefined,
state: undefined,
person: undefined,
deviceId: undefined,
deviceName: undefined,
getTime: undefined,
principal: undefined,
remark: undefined, remark: undefined,
outType: undefined,
fileUrl: '',
items: []
}) })
const formRules = reactive({ const formRules = reactive({
orderId: [{ required: true, message: '领模单号不能为空', trigger: 'blur' }], outTime: [{ required: true, message: '出库时间不能为空', trigger: 'blur' }],
code: [{ required: true, message: '模具编码不能为空', trigger: 'blur' }], outType: [{ required: true, message: '出库类型不能为空', trigger: 'blur' }]
name: [{ required: true, message: '模具名称不能为空', trigger: 'blur' }],
state: [{ required: true, message: '状态不能为空', trigger: 'blur' }],
}) })
const disabled = computed(() => formType.value === 'detail')
const formRef = ref() // Ref const formRef = ref() // Ref
const customerList = ref<CustomerVO[]>([]) //
const options = [
{
value: '其他出库',
label: '其他出库',
},
{
value: '备件出库',
label: '备件出库',
},
{
value: '原料出库',
label: '原料出库',
},
{
value: '产品出库',
label: '产品出库',
},
{
value: '领料出库',
label: '领料出库',
disabled: true,
},
]
/** 子表的表单 */
const subTabsName = ref('item')
const itemFormRef = ref()
/** 打开弹窗 */ /** 打开弹窗 */
const open = async (type: string, id?: number) => { const open = async (type: string, id?: number) => {
@ -93,11 +169,13 @@ const open = async (type: string, id?: number) => {
if (id) { if (id) {
formLoading.value = true formLoading.value = true
try { try {
formData.value = await MoldGetApi.getMoldGet(id) formData.value = await StockOutApi.getStockOut(id)
} finally { } finally {
formLoading.value = false formLoading.value = false
} }
} }
//
customerList.value = await CustomerApi.getCustomerSimpleList()
} }
defineExpose({ open }) // open defineExpose({ open }) // open
@ -106,15 +184,16 @@ const emit = defineEmits(['success']) // 定义 success 事件,用于操作成
const submitForm = async () => { const submitForm = async () => {
// //
await formRef.value.validate() await formRef.value.validate()
await itemFormRef.value.validate()
// //
formLoading.value = true formLoading.value = true
try { try {
const data = formData.value as unknown as MoldGetVO const data = formData.value as unknown as StockOutVO
if (formType.value === 'create') { if (formType.value === 'create') {
await MoldGetApi.createMoldGet(data) await StockOutApi.createStockOut(data)
message.success(t('common.createSuccess')) message.success(t('common.createSuccess'))
} else { } else {
await MoldGetApi.updateMoldGet(data) await StockOutApi.updateStockOut(data)
message.success(t('common.updateSuccess')) message.success(t('common.updateSuccess'))
} }
dialogVisible.value = false dialogVisible.value = false
@ -129,16 +208,11 @@ const submitForm = async () => {
const resetForm = () => { const resetForm = () => {
formData.value = { formData.value = {
id: undefined, id: undefined,
orderId: undefined, customerId: undefined,
code: undefined, outTime: undefined,
name: undefined,
state: undefined,
person: undefined,
deviceId: undefined,
deviceName: undefined,
getTime: undefined,
principal: undefined,
remark: undefined, remark: undefined,
fileUrl: undefined,
items: []
} }
formRef.value?.resetFields() formRef.value?.resetFields()
} }

@ -1,4 +1,5 @@
<template> <template>
<ContentWrap> <ContentWrap>
<!-- 搜索工作栏 --> <!-- 搜索工作栏 -->
<el-form <el-form
@ -8,88 +9,109 @@
:inline="true" :inline="true"
label-width="68px" label-width="68px"
> >
<el-form-item label="领模单号" prop="orderId"> <el-form-item label="领模单号" prop="no">
<el-input <el-input
v-model="queryParams.orderId" v-model="queryParams.no"
placeholder="请输入领模单号" placeholder="请选择领模单号"
clearable clearable
@keyup.enter="handleQuery" @keyup.enter="handleQuery"
class="!w-240px" class="!w-240px"
/> />
</el-form-item> </el-form-item>
<el-form-item label="模具编码" prop="code"> <el-form-item label="模具" prop="productId">
<el-input <el-select
v-model="queryParams.code" v-model="queryParams.productId"
placeholder="请输入模具编码"
clearable clearable
@keyup.enter="handleQuery" filterable
placeholder="请选择模具"
class="!w-240px"
>
<el-option
v-for="item in moldList"
:key="item.id"
:label="item.name"
:value="item.id"
/>
</el-select>
</el-form-item>
<el-form-item label="出库时间" prop="outTime">
<el-date-picker
v-model="queryParams.outTime"
value-format="YYYY-MM-DD HH:mm:ss"
type="daterange"
start-placeholder="开始日期"
end-placeholder="结束日期"
:default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
class="!w-240px" class="!w-240px"
/> />
</el-form-item> </el-form-item>
<el-form-item label="模具名称" prop="name"> <!-- <el-form-item label="客户" prop="customerId">
<el-input <el-select
v-model="queryParams.name" v-model="queryParams.customerId"
placeholder="请输入模具名称"
clearable clearable
@keyup.enter="handleQuery" filterable
placeholder="请选择客户"
class="!w-240px" class="!w-240px"
/> >
<el-option
v-for="item in customerList"
:key="item.id"
:label="item.name"
:value="item.id"
/>
</el-select>
</el-form-item> -->
<el-form-item label="仓库" prop="warehouseId">
<el-select
v-model="queryParams.warehouseId"
clearable
filterable
placeholder="请选择仓库"
class="!w-240px"
>
<el-option
v-for="item in warehouseList"
:key="item.id"
:label="item.name"
:value="item.id"
/>
</el-select>
</el-form-item> </el-form-item>
<el-form-item label="状态" prop="state"> <el-form-item label="创建人" prop="creator">
<el-select <el-select
v-model="queryParams.state" v-model="queryParams.creator"
placeholder="请选择状态"
clearable clearable
filterable
placeholder="请选择创建人"
class="!w-240px" class="!w-240px"
> >
<el-option <el-option
v-for="dict in getIntDictOptions(DICT_TYPE.MOLD_GET_STATUS)" v-for="item in userList"
:key="item.id"
:label="item.nickname"
:value="item.id"
/>
</el-select>
</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.ERP_AUDIT_STATUS)"
:key="dict.value" :key="dict.value"
:label="dict.label" :label="dict.label"
:value="dict.value" :value="dict.value"
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="领模人" prop="person"> <el-form-item label="备注" prop="remark">
<el-input
v-model="queryParams.person"
placeholder="请输入领模人"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="设备名称" prop="deviceName">
<el-input <el-input
v-model="queryParams.deviceName" v-model="queryParams.remark"
placeholder="请输入设备名称" placeholder="请输入备注"
clearable clearable
@keyup.enter="handleQuery" @keyup.enter="handleQuery"
class="!w-240px" class="!w-240px"
/> />
</el-form-item> </el-form-item>
<el-form-item label="领取时间" prop="getTime">
<el-date-picker
v-model="queryParams.getTime"
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> <el-form-item>
<el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button> <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 @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
@ -97,7 +119,7 @@
type="primary" type="primary"
plain plain
@click="openForm('create')" @click="openForm('create')"
v-hasPermi="['mes:mold-get:create']" v-hasPermi="['erp:stock-out:create']"
> >
<Icon icon="ep:plus" class="mr-5px" /> 新增 <Icon icon="ep:plus" class="mr-5px" /> 新增
</el-button> </el-button>
@ -106,54 +128,112 @@
plain plain
@click="handleExport" @click="handleExport"
:loading="exportLoading" :loading="exportLoading"
v-hasPermi="['mes:mold-get:export']" v-hasPermi="['erp:stock-out:export']"
> >
<Icon icon="ep:download" class="mr-5px" /> 导出 <Icon icon="ep:download" class="mr-5px" /> 导出
</el-button> </el-button>
<el-button
type="danger"
plain
@click="handleDelete(selectionList.map((item) => item.id))"
v-hasPermi="['erp:stock-out:delete']"
:disabled="selectionList.length === 0"
>
<Icon icon="ep:delete" class="mr-5px" /> 删除
</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
</ContentWrap> </ContentWrap>
<!-- 列表 --> <!-- 列表 -->
<ContentWrap> <ContentWrap>
<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true"> <!-- <el-tabs v-model="activeName" @tab-click="handleTabClick"> -->
<el-table-column label="领模单号" align="center" prop="orderId" /> <!-- <el-tab-pane label="产品出库" name="产品出库" />
<el-table-column label="模具编码" align="center" prop="code" /> <el-tab-pane label="原料出库" name="原料出库" />
<el-table-column label="模具名称" align="center" prop="name" /> <el-tab-pane label="备件出库" name="备件出库" />
<el-table-column label="状态" align="center" prop="state" /> <el-tab-pane label="其他出库" name="其他出库" />
<el-table-column label="领模人" align="center" prop="person" /> <el-tab-pane label="领模出库" name="领料出库" />
<el-table-column label="设备名称" align="center" prop="deviceName" /> </el-tabs> -->
<el-table-column <el-table
label="领取时间" v-loading="loading"
align="center" :data="list"
prop="getTime" :stripe="true"
:formatter="dateFormatter" :show-overflow-tooltip="true"
width="180px" @selection-change="handleSelectionChange"
/> >
<el-table-column label="库管员" align="center" prop="principal" /> <el-table-column width="30" label="选择" type="selection" />
<el-table-column label="备注" align="center" prop="remark" /> <el-table-column min-width="180" label="出库单号" align="center" prop="no" />
<el-table-column label="模具信息" align="left" sortable prop="productNames" min-width="180" />
<!-- <el-table-column label="客户" align="center" prop="customerName" /> -->
<el-table-column <el-table-column
label="创建时间" label="出库时间"
align="center" align="center"
prop="createTime" sortable
:formatter="dateFormatter" prop="outTime"
width="180px" :formatter="dateFormatter2"
width="120px"
/> />
<el-table-column label="操作" align="center" min-width="120px"> <el-table-column label="创建人" align="center" prop="creatorName" />
<!-- <el-table-column
label="数量"
align="right"
sortable
prop="totalCount"
:formatter="erpCountTableColumnFormatter"
/> -->
<!-- <el-table-column
label="金额"
align="right"
sortable
prop="totalPrice"
:formatter="erpPriceTableColumnFormatter"
/> -->
<el-table-column label="状态" align="center" fixed="right" width="90" prop="status">
<template #default="scope">
<dict-tag :type="DICT_TYPE.ERP_AUDIT_STATUS" :value="scope.row.status" />
</template>
</el-table-column>
<el-table-column label="操作" align="center" fixed="right" width="220">
<template #default="scope"> <template #default="scope">
<el-button
link
@click="openForm('detail', scope.row.id)"
v-hasPermi="['erp:stock-out:query']"
>
详情
</el-button>
<el-button <el-button
link link
type="primary" type="primary"
@click="openForm('update', scope.row.id)" @click="openForm('update', scope.row.id)"
v-hasPermi="['mes:mold-get:update']" v-hasPermi="['erp:stock-out:update']"
:disabled="scope.row.status === 20"
> >
编辑 编辑
</el-button> </el-button>
<el-button
link
type="primary"
@click="handleUpdateStatus(scope.row.id, 20)"
v-hasPermi="['erp:stock-out:update-status']"
v-if="scope.row.status === 10"
>
审批
</el-button>
<el-button
link
type="danger"
@click="handleUpdateStatus(scope.row.id, 10)"
v-hasPermi="['erp:stock-out:update-status']"
v-else
>
反审批
</el-button>
<el-button <el-button
link link
type="danger" type="danger"
@click="handleDelete(scope.row.id)" @click="handleDelete([scope.row.id])"
v-hasPermi="['mes:mold-get:delete']" v-hasPermi="['erp:stock-out:delete']"
> >
删除 删除
</el-button> </el-button>
@ -174,44 +254,55 @@
</template> </template>
<script setup lang="ts"> <script setup lang="ts">
import { dateFormatter } from '@/utils/formatTime' import { getIntDictOptions, DICT_TYPE } from '@/utils/dict'
import { dateFormatter2 } from '@/utils/formatTime'
import download from '@/utils/download' import download from '@/utils/download'
import { MoldGetApi, MoldGetVO } from '@/api/mes/moldget' import { StockOutApi, StockOutVO } from '@/api/erp/stock/out'
import MoldGetForm from './MoldGetForm.vue' import MoldGetForm from './MoldGetForm.vue'
import { getIntDictOptions, DICT_TYPE } from '@/utils/dict' import { ProductApi, ProductVO } from '@/api/erp/product/product'
import { MoldBrandApi, MoldVO } from '@/api/erp/mold'
import { WarehouseApi, WarehouseVO } from '@/api/erp/stock/warehouse'
import { SupplierApi, SupplierVO } from '@/api/erp/purchase/supplier'
import { UserVO } from '@/api/system/user'
import * as UserApi from '@/api/system/user'
import { erpCountTableColumnFormatter, erpPriceTableColumnFormatter } from '@/utils'
import { CustomerApi, CustomerVO } from '@/api/erp/sale/customer'
/** 模具管理-领模申请 列表 */ /** ERP 其它出库单列表 */
defineOptions({ name: 'MoldGet' }) defineOptions({ name: 'MoldGet' })
const message = useMessage() // const message = useMessage() //
const { t } = useI18n() // const { t } = useI18n() //
const loading = ref(true) // const loading = ref(true) //
const list = ref<MoldGetVO[]>([]) // const list = ref<StockOutVO[]>([]) //
const total = ref(0) // const total = ref(0) //
const queryParams = reactive({ const queryParams = reactive({
pageNo: 1, pageNo: 1,
pageSize: 10, pageSize: 10,
orderId: undefined, no: undefined,
code: undefined, productId: undefined,
name: undefined, customerId: undefined,
state: undefined, outType: '领模出库',
person: undefined, warehouseId: undefined,
deviceId: undefined, outTime: [],
deviceName: undefined, status: 10,
getTime: [],
principal: undefined,
remark: undefined, remark: undefined,
createTime: [], creator: undefined
}) })
const queryFormRef = ref() // const queryFormRef = ref() //
const exportLoading = ref(false) // const exportLoading = ref(false) //
const productList = ref<ProductVO[]>([]) //
const warehouseList = ref<WarehouseVO[]>([]) //
const customerList = ref<CustomerVO[]>([]) //
const userList = ref<UserVO[]>([]) //
const moldList = ref<MoldVO[]>([]) //
/** 查询列表 */ /** 查询列表 */
const getList = async () => { const getList = async () => {
loading.value = true loading.value = true
try { try {
const data = await MoldGetApi.getMoldGetPage(queryParams) const data = await StockOutApi.getStockOutPage(queryParams)
list.value = data.list list.value = data.list
total.value = data.total total.value = data.total
} finally { } finally {
@ -238,15 +329,29 @@ const openForm = (type: string, id?: number) => {
} }
/** 删除按钮操作 */ /** 删除按钮操作 */
const handleDelete = async (id: number) => { const handleDelete = async (ids: number[]) => {
try { try {
// //
await message.delConfirm() await message.delConfirm()
// //
await MoldGetApi.deleteMoldGet(id) await StockOutApi.deleteStockOut(ids)
message.success(t('common.delSuccess')) message.success(t('common.delSuccess'))
// //
await getList() await getList()
selectionList.value = selectionList.value.filter((item) => !ids.includes(item.id))
} catch {}
}
/** 审批/反审批操作 */
const handleUpdateStatus = async (id: number, status: number) => {
try {
//
await message.confirm(`确定${status === 20 ? '审批' : '反审批'}该出库单吗?`)
//
await StockOutApi.updateStockOutStatus(id, status)
message.success(`${status === 20 ? '审批' : '反审批'}成功`)
//
await getList()
} catch {} } catch {}
} }
@ -257,16 +362,40 @@ const handleExport = async () => {
await message.exportConfirm() await message.exportConfirm()
// //
exportLoading.value = true exportLoading.value = true
const data = await MoldGetApi.exportMoldGet(queryParams) const data = await StockOutApi.exportStockOut(queryParams)
download.excel(data, '模具管理-领模申请.xls') download.excel(data, '其它出库单.xls')
} catch { } catch {
} finally { } finally {
exportLoading.value = false exportLoading.value = false
} }
} }
/** 选中操作 */
const selectionList = ref<StockOutVO[]>([])
const handleSelectionChange = (rows: StockOutVO[]) => {
selectionList.value = rows
}
const query = reactive({
brandId: undefined
})
/** 初始化 **/ /** 初始化 **/
onMounted(() => { onMounted(async () => {
getList() queryParams.outType ='领模出库'
await getList()
//
// productList.value = await ProductApi.getProductSimpleList()
moldList.value = await MoldBrandApi.getMoldAllList()
warehouseList.value = await WarehouseApi.getWarehouseSimpleList()
customerList.value = await CustomerApi.getCustomerSimpleList()
userList.value = await UserApi.getSimpleUserList()
}) })
// TODO
// TODO
/** tab 切换 */
let activeName = '产品出库'
const handleTabClick = (tab: TabsPaneContext) => {
queryParams.outType = tab.paneName
handleQuery()
}
</script> </script>

@ -150,6 +150,7 @@ import { defaultProps, handleTree } from '@/utils/tree';
import { OrganizationApi } from '@/api/mes/organization'; import { OrganizationApi } from '@/api/mes/organization';
import {WorkTeamApi} from "@/api/mes/workteam"; import {WorkTeamApi} from "@/api/mes/workteam";
import {DICT_TYPE, getIntDictOptions} from "@/utils/dict"; import {DICT_TYPE, getIntDictOptions} from "@/utils/dict";
import { StockOutApi, StockOutVO } from '@/api/erp/stock/out'
/** 生产计划 表单 */ /** 生产计划 表单 */
defineOptions({ name: 'PlanForm' }) defineOptions({ name: 'PlanForm' })

@ -103,7 +103,6 @@ const open = async (productId?: number,type?:string, status?:number,id?:number,i
try { try {
queryParams.productId = productId queryParams.productId = productId
const data = await ZjProductRecordApi.getZjProductRecordPage(queryParams) const data = await ZjProductRecordApi.getZjProductRecordPage(queryParams)
console.log('rrr')
list.value = data.list list.value = data.list
total.value = data.total total.value = data.total
} finally { } finally {

Loading…
Cancel
Save