黄伟杰 4 weeks ago
commit 355c121814

@ -8,7 +8,7 @@ VITE_DEV=true
# 线上环境
# VITE_BASE_URL='https://besure.ngsk.tech:7001'
# 本地联调
VITE_BASE_URL='http://192.168.5.107:48081'
VITE_BASE_URL='http://localhost:48081'
# VITE_BASE_URL='http://192.168.5.135:48081'

@ -0,0 +1,52 @@
import request from '@/config/axios'
// 试产质检记录 VO
export interface ZjProductRecordVO {
id: number // ID
type: string // 工序
name: string // 名称
unit: string // 单位
upperVal: number // 上限值
lowerVal: number // 下限值
productId: number // 关联产品id
remark: string // 备注
planId: number // 关联计划id
}
// 试产质检记录 API
export const ZjProductRecordApi = {
// 查询试产质检记录分页
getZjProductRecordPage: async (params: any) => {
return await request.get({ url: `/mes/zj-product-record/page`, params })
},
// 查询试产质检记录详情
getZjProductRecord: async (id: number) => {
return await request.get({ url: `/mes/zj-product-record/get?id=` + id })
},
// 新增试产质检记录
createZjProductRecord: async (data: ZjProductRecordVO) => {
return await request.post({ url: `/mes/zj-product-record/create`, data })
},
// 修改试产质检记录
updateZjProductRecord: async (data: ZjProductRecordVO) => {
return await request.put({ url: `/mes/zj-product-record/update`, data })
},
// 批量修改试产质检记录
updateZjProductRecordBatch: async (data: ZjProductRecordVO[]) => {
return await request.put({ url: `/mes/zj-product-record/updateBatch`, data })
},
// 删除试产质检记录
deleteZjProductRecord: async (id: number) => {
return await request.delete({ url: `/mes/zj-product-record/delete?id=` + id })
},
// 导出试产质检记录 Excel
exportZjProductRecord: async (params) => {
return await request.download({ url: `/mes/zj-product-record/export-excel`, params })
}
}

@ -61,7 +61,7 @@
/>
</el-form-item>
</el-col>
<el-col :span="12">
<!-- <el-col :span="12">
<el-form-item label="采购价格" prop="purchasePrice">
<el-input-number
v-model="formData.purchasePrice"
@ -71,7 +71,7 @@
class="!w-1/1"
/>
</el-form-item>
</el-col>
</el-col> -->
<el-col :span="12">
<el-form-item label="预警库存" prop="safetyNumber">
<el-input-number

@ -2,7 +2,9 @@
<!-- 列表 -->
<ContentWrap>
<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
<el-table-column label="报工数量" prop="num" align="center"/>
<el-table-column label="合格数量" prop="num" align="center"/>
<el-table-column label="不合格数量" prop="noPassNum" align="center"/>
<el-table-column label="原因" prop="remark" align="center"/>
<el-table-column
label="报工时间"
align="center"

@ -20,22 +20,6 @@
placeholder="请选择制浆线"
/>
</el-form-item> -->
<el-form-item label="生产计划" prop="planId">
<el-select
v-model="formData.planId"
@change="handleQuery(formData.planId)"
clearable
filterable
placeholder="请选择"
>
<el-option
v-for="item in planList"
:key="item.id"
:label="item.code"
:value="item.id"
/>
</el-select>
</el-form-item>
<el-form-item prop="feedingType">
<template #label>
<span>
@ -55,6 +39,32 @@
</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="生产计划" prop="planId" v-if = "formData.feedingType == 'org'">
<el-select
v-model="formData.planId"
@change="handleQuery(formData.planId)"
clearable
filterable
placeholder="请选择生产计划"
>
<el-option
v-for="item in planList"
:key="item.id"
:label="item.code"
:value="item.id"
/>
</el-select>
</el-form-item>
<el-form-item label="制浆线:" prop="feedingPipeline" v-if = "formData.feedingType != 'org'">
<el-tree-select
v-model="formData.feedingPipeline"
:data="organizationTree"
:props="defaultProps"
check-strictly
default-expand-all
placeholder="请选择制浆线"
/>
</el-form-item>
<el-form-item label="产品" prop="productId" v-if="formData.feedingType !='org'">
<el-select
v-model="formData.productId"
@ -93,7 +103,8 @@
<el-tab-pane label="投料明细" name="feedingRecordDetail">
<!-- <FeedingRecordDetailForm ref="feedingRecordDetailFormRef" :record-id="formData.id" /> -->
<el-form
ref="formRef"
ref="recordFormRef"
:rules="recordFormRules"
:model="recordData"
v-loading="formLoading"
label-width="0px"
@ -101,47 +112,11 @@
>
<el-table :data="recordData" 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}.itemId`" class="mb-0px!">
<el-select
v-model="row.itemId"
clearable
filterable
placeholder="请选择原料"
>
<el-option
v-for="item in productList"
:key="item.id"
:label="item.name"
:value="item.id"
/>
</el-select>
</el-form-item>
</template>
</el-table-column>
<el-table-column label="单位" min-width="80">
<template #default="{ row, $index }">
<el-form-item :prop="`${$index}.unitId`" class="mb-0px!">
<el-select
v-model="row.unitId"
clearable
filterable
placeholder="请选择原料"
>
<el-option
v-for="item in unitList"
:key="item.id"
:label="item.name"
:value="item.id"
/>
</el-select>
</el-form-item>
</template>
</el-table-column>
<el-table-column label="原料" prop="productName" width="100" />
<el-table-column label="单位" prop="unitName" width="100" />
<el-table-column label="数量" min-width="150">
<template #default="{ row, $index }">
<el-form-item :prop="`${$index}.weight`" class="mb-0px!">
<el-form-item :prop="`${$index}.weight`" :rules="recordFormRules.weight">
<el-input-number v-model="row.weight" :min="0" :precision="2" class="!w-1/1" placeholder=""
/>
</el-form-item>
@ -202,7 +177,11 @@ const formData = ref({
})
const formRules = reactive({
feedingType: [{ required: true, message: '投料类型不能为空', trigger: 'blur' }],
feedingPipeline: [{ required: true, message: '制浆线不能为空', trigger: 'blur' }]
feedingPipeline: [{ required: true, message: '制浆线不能为空', trigger: 'blur' }],
planId: [{ required: true, message: '生产计划不能为空', trigger: 'change' }]
})
const recordFormRules = reactive({
weight: [{ required: true, message: '数量不能为空', trigger: 'blur' }]
})
const formRef = ref() // Ref
@ -212,7 +191,7 @@ const recordData = ref([])
/** 子表的表单 */
const subTabsName = ref('feedingRecordDetail')
const feedingRecordDetailFormRef = ref()
const recordFormRef = ref()
/** 打开弹窗 */
const open = async (type: string, id?: number) => {
@ -246,7 +225,7 @@ const submitForm = async () => {
if(formData.value.feedingType == 'org'){
//
try {
await feedingRecordDetailFormRef.value.validate()
await recordFormRef.value.validate()
} catch (e) {
subTabsName.value = 'feedingRecordDetail'
return
@ -258,7 +237,9 @@ const submitForm = async () => {
const data = formData.value as unknown as FeedingRecordVO
//
if(formData.value.feedingType == 'org'){
data.feedingRecordDetails = feedingRecordDetailFormRef.value.getData()
//data.feedingRecordDetails = feedingRecordDetailFormRef.value.getData()
data.feedingRecordDetails = recordData.value
console.log(data.feedingRecordDetails)
}
if (formType.value === 'create') {
await FeedingRecordApi.createFeedingRecord(data)
@ -291,6 +272,7 @@ const resetForm = () => {
remark: undefined,
recordStatus: undefined,
}
recordData.value = []
formRef.value?.resetFields()
}
@ -307,12 +289,12 @@ const getOrganizationTree = async () => {
const data = ref({
requisitionId : undefined
})
const to = ref(0) //
const handleQuery = async(planId : number) => {
data.value = await PlanApi.getPlan(planId)
console.log(data.value)
//console.log(data.value)
list.value = await ItemRequisitionApi.getItemRequisitionDetailListByItemRequisitionId(data.value.requisitionId)
if (data.value.requisitionId == 233) {
formData.id = 1
}
recordData.value = list.value
to.value = list.total
}
</script>

@ -135,11 +135,6 @@ const handleAdd = () => {
formData.value.push(row)
}
/** 删除按钮操作 */
const handleDelete = (index) => {
formData.value.splice(index, 1)
}
/** 表单校验 */
const validate = () => {
return formRef.value.validate()

@ -3,7 +3,7 @@
<ContentWrap>
<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
<el-table-column label="原料" align="center" prop="itemName" />
<el-table-column label="原料" align="center" prop="productName" />
<el-table-column label="数量" align="center" prop="weight" />
<el-table-column label="单位" align="center" prop="unitName" />
<el-table-column label="投料时间" align="center" prop="feedingTime" :formatter="dateFormatter"/>

@ -111,11 +111,11 @@
<el-table-column label="数量" align="center" prop="weight" />
<el-table-column label="记录人" align="center" prop="userName" />
<el-table-column label="备注" align="center" prop="remark" />
<el-table-column label="状态" align="center" prop="recordStatus">
<!-- <el-table-column label="状态" align="center" prop="recordStatus">
<template #default="scope">
<dict-tag :type="DICT_TYPE.MES_FEEDING_RECORD_STATUS" :value="scope.row.recordStatus" />
</template>
</el-table-column>
</el-table-column> -->
<el-table-column
label="投料时间"
align="center"
@ -126,7 +126,7 @@
<el-table-column label="操作" align="center" width="200px">
<template #default="scope">
<el-button
<!-- <el-button
link
type="primary"
@click="openForm('update', scope.row.id)"
@ -134,7 +134,7 @@
v-if="scope.row.recordStatus=='1'"
>
编辑
</el-button>
</el-button> -->
<el-button
link
type="danger"

@ -10,9 +10,15 @@
<el-form-item v-show="false" label="计划" prop="planId">
<el-input v-model="formData.planId" placeholder="请输入计划ID" />
</el-form-item>
<el-form-item label="数量" prop="num">
<el-form-item label="合格数量" prop="num">
<el-input-number v-model="formData.num" placeholder="请输入数量" class="!w-240px"/>
</el-form-item>
<el-form-item label="不合格数量" prop="noPassNum">
<el-input-number v-model="formData.noPassNum" placeholder="请输入数量" class="!w-240px"/>
</el-form-item>
<el-form-item label="原因" prop="remark">
<el-input v-model="formData.remark" placeholder="请输入原因"/>
</el-form-item>
</el-form>
<template #footer>
@ -40,9 +46,12 @@ const formData = ref({
planId: undefined,
num: undefined,
baogongTime: undefined,
noPassNum: undefined,
remark: undefined,
})
const formRules = reactive({
num: [{ required: true, message: '数量不能为空', trigger: 'blur' }],
noPassNum: [{ required: true, message: '数量不能为空', trigger: 'blur' }],
})
const formRef = ref() // Ref

@ -0,0 +1,214 @@
<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="taskId">
<el-select
disabled
v-model="formData.taskId"
clearable
filterable
placeholder="请选择"
@change="handleTaskChange"
>
<el-option
v-for="item in taskList"
:key="item.id"
:label="item.code"
:value="item.id"
/>
</el-select>
</el-form-item>
<el-form-item label="明细项" prop="taskId">
<el-select
disabled
v-model="formData.taskDetailId"
clearable
filterable
placeholder="请选择"
@change="handleTaskDetailChange"
>
<el-option
v-for="item in taskDetailList"
:key="item.id"
:label="item.productName+'-未计划:'+(item.number-item.planNumber)"
:value="item.id"
/>
</el-select>
</el-form-item>
<el-form-item label="计划编码" prop="code">
<el-input disabled v-model="formData.code" placeholder="请输入计划编码" />
</el-form-item>
<el-form-item label="生产线" prop="feedingPipelineName">
<el-input disabled v-model="formData.feedingPipelineName" placeholder="请输入生产线名称" />
</el-form-item>
<el-form-item label="领料人" prop="worker">
<el-input disabled v-model="formData.worker" placeholder="请输入领料人" />
</el-form-item>
<!-- <el-form-item label="产品" prop="productId">-->
<!-- <el-select-->
<!-- :disabled='editDisable'-->
<!-- v-model="formData.productId"-->
<!-- clearable-->
<!-- filterable-->
<!-- placeholder="请选择产品"-->
<!-- class="!w-1/1"-->
<!-- >-->
<!-- <el-option-->
<!-- v-for="item in productList"-->
<!-- :key="item.id"-->
<!-- :label="item.name"-->
<!-- :value="item.id"-->
<!-- />-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<el-form-item label="数量" prop="planNumber">
<el-input disabled v-model="formData.planNumber" />
</el-form-item>
<el-form-item label="是否试生产" prop="isPreProduction">
<el-radio-group disabled v-model="formData.isPreProduction">
<el-radio
v-for="dict in getIntDictOptions(DICT_TYPE.MES_PRE_PRODUCTION)"
:key="dict.value"
:label="dict.value"
>
{{ dict.label }}
</el-radio>
</el-radio-group>
</el-form-item>
<!-- <el-form-item label="热压数量" prop="reyaNumber">
<el-input v-model="formData.reyaNumber" />
</el-form-item> -->
<el-form-item label="计划开始" prop="planStartTime">
<el-date-picker
disabled
v-model="formData.planStartTime"
type="date"
value-format="x"
placeholder="选择计划开始时间"
/>
</el-form-item>
<el-form-item label="计划结束" prop="planEndTime">
<el-date-picker
disabled
v-model="formData.planEndTime"
type="date"
value-format="x"
placeholder="选择计划结束时间"
/>
</el-form-item>
<!-- <el-form-item label="班别" prop="groupType">
<el-radio-group v-model="formData.groupType">
<el-radio
v-for="dict in getIntDictOptions(DICT_TYPE.MES_GROUP_TYPE)"
:key="dict.value"
:label="dict.value"
>
{{ dict.label }}
</el-radio>
</el-radio-group>
</el-form-item> -->
<el-form-item label="备注" prop="remark">
<el-input disabled 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 { PlanApi, PlanVO } from '@/api/mes/plan'
import { TaskApi, TaskDetailVO, TaskVO} from "@/api/mes/task";
import {DICT_TYPE, getIntDictOptions} from "@/utils/dict";
/** 生产计划 表单 */
defineOptions({ name: 'PlanDetail' })
const taskList = ref<TaskVO[]>([]) //
const taskDetailList = ref<TaskDetailVO[]>([]) //
const { t } = useI18n() //
const message = useMessage() //
const editDisable = ref(false) //
const dialogVisible = ref(false) //
const dialogTitle = ref('') //
const formLoading = ref(false) // 12
const formData = ref({
id: undefined,
code: undefined,
productId: undefined,
taskDetailId: undefined,
taskId: undefined,
planNumber: undefined,
reyaNumber: undefined,
finishNumber: undefined,
status: undefined,
planStartTime: undefined,
planEndTime: undefined,
startTime: undefined,
endTime: undefined,
productionManagerId: undefined,
remark: undefined,
groupType: undefined,
isEnable: undefined,
feedingPipeline: undefined,
feedingPipelineName: undefined,
workerId: undefined,
worker: undefined,
isPreProduction: undefined
})
const formRef = ref() // Ref
/** 打开弹窗 */
const open = async (id?: number) => {
dialogVisible.value = true
dialogTitle.value = t('action.' + '详情')
// formType.value = type
editDisable.value = false
resetForm()
formData.value = await PlanApi.getPlan(id)
}
defineExpose({ open }) // open
/** 重置表单 */
const resetForm = () => {
formData.value = {
id: undefined,
code: undefined,
productId: undefined,
taskDetailId: undefined,
taskId: undefined,
planNumber: 0,
finishNumber: 0,
status: undefined,
planStartTime: undefined,
planEndTime: undefined,
startTime: undefined,
endTime: undefined,
productionManagerId: undefined,
remark: undefined,
groupType: undefined,
isEnable: undefined,
isPreProduction: 0,
feedingPipelineName: undefined,
worker: undefined,
}
formRef.value?.resetFields()
}
</script>

@ -156,7 +156,9 @@
<el-table-column label="产品" align="center" prop="productName" min-width="200px" sortable/>
<!-- <el-table-column label="任务单" align="center" prop="taskCode" min-width="150px" />-->
<el-table-column label="生产线" align="center" prop="feedingPipelineName"/>
<el-table-column label="数量" align="center" prop="planNumber" />
<el-table-column label="计划数量" align="center" prop="planNumber" />
<el-table-column label="完工数量" align="center" prop="wangongNumber" />
<el-table-column label="合格率(%)" align="center" prop="passRate" />
<!-- <el-table-column label="热压数量" align="center" prop="reyaNumber" /> -->
<el-table-column label="状态" align="center" prop="status" sortable>
<template #default="scope">
@ -168,7 +170,7 @@
<dict-tag :type="DICT_TYPE.MES_GROUP_TYPE" :value="scope.row.groupType" />
</template>
</el-table-column>
<el-table-column label="领料人" align="center" prop="productionManagerName" />
<!-- <el-table-column label="领料人" align="center" prop="productionManagerName" /> -->
<el-table-column label="计划开始时间" align="center" sortable prop="planStartTime" :formatter="dateFormatter2" width="150px"/>
<el-table-column label="计划结束时间" align="center" sortable prop="planEndTime" :formatter="dateFormatter2" width="150px"/>
<el-table-column label="是否检验" align="center" prop="isZj" v-if="activeName === '6'">
@ -176,9 +178,17 @@
<dict-tag :type="DICT_TYPE.MES_ZJ_PRODUCT" :value="scope.row.isZj" />
</template>
</el-table-column>
<el-table-column label="备注" align="center" prop="remark" />
<!-- <el-table-column label="备注" align="center" prop="remark" /> -->
<el-table-column label="操作" align="center" fixed="right" width="350">
<template #default="scope">
<el-button
link
type="info"
@click="openDetail(scope.row.id)"
v-hasPermi="['mes:plan:query']"
>
详情
</el-button>
<el-button
link
type="primary"
@ -226,8 +236,7 @@
<el-button
link
type="primary"
v-hasPermi="['mes:plan:update']"
@click="handleZjStatus(scope.row.code, scope.row.id)"
@click="openZjProductForm(scope.row.productId,'pre',6,scope.row.id,scope.row.isZj)"
v-if="scope.row.status === 6"
>
检验
@ -311,6 +320,12 @@
<!-- 报工弹出 -->
<Baogong ref="baogongFormRef" @success="getList" />
<!-- 详情弹窗 -->
<PlanDetail ref="detailRef" />
<!-- 产品质检弹出 -->
<ZjProductRecord ref="zjProductRecordFormRef" @success="getList" />
</template>
<script setup lang="ts">
@ -324,10 +339,12 @@ import {TaskApi, TaskVO} from "@/api/mes/task";
import ItemNeedIndex from "@/views/mes/bom/ItemNeedIndex.vue";
import Paigong from "./components/Paigong.vue";
import TypePaigong from "./components/TypePaigong.vue";
import PlanDetail from "./components/PlanDetail.vue";
import Baogong from "./components/Baogong.vue";
import ItemRequisitionDetailList from "@/views/mes/itemrequisition/components/ItemRequisitionDetailList.vue";
import ZjProductPreList from "@/views/mes/zjproduct/components/ZjProductPreList.vue";
import BaogongRecordList from "@/views/mes/baogongrecord/components/BaogongRecordList.vue";
import ZjProductRecord from "@/views/mes/zjproductrecord/components/ZjProductRecordForm.vue";
const productList = ref<ProductVO[]>([]) //
const taskList = ref<TaskVO[]>([]) //
@ -365,6 +382,12 @@ const queryParams = reactive({
const queryFormRef = ref() //
const exportLoading = ref(false) //
/** 详情操作 */
const detailRef = ref()
const openDetail = (id: number) => {
detailRef.value.open(id)
}
/** 查询列表 */
const getList = async () => {
loading.value = true
@ -462,6 +485,13 @@ const openBaogongForm = (planCode: string, planId: number) => {
baogongFormRef.value.open(planCode, planId)
}
/** 质检 */
const zjProductRecordFormRef = ref()
const openZjProductForm = (productId: number,type:string, status:number,id: number, isZj: number) => {
zjProductRecordFormRef.value.open(productId,type,status,id,isZj)
}
/** 开工 */
const handleStatus = async (planCode:string, id: number,
type:string, status:number, tip:string, isZj: number) => {

@ -0,0 +1,131 @@
<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="type">
<el-select v-model="formData.type" placeholder="请选择工序">
<el-option label="请选择字典生成" value="" />
</el-select>
</el-form-item>
<el-form-item label="名称" prop="name">
<el-input v-model="formData.name" placeholder="请输入名称" />
</el-form-item>
<el-form-item label="单位" prop="unit">
<el-input v-model="formData.unit" placeholder="请输入单位" />
</el-form-item>
<el-form-item label="上限值" prop="upperVal">
<el-input v-model="formData.upperVal" placeholder="请输入上限值" />
</el-form-item>
<el-form-item label="下限值" prop="lowerVal">
<el-input v-model="formData.lowerVal" placeholder="请输入下限值" />
</el-form-item>
<el-form-item label="关联产品id" prop="productId">
<el-input v-model="formData.productId" placeholder="请输入关联产品id" />
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input v-model="formData.remark" placeholder="请输入备注" />
</el-form-item>
<el-form-item label="关联计划id" prop="planId">
<el-input v-model="formData.planId" placeholder="请输入关联计划id" />
</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 { ZjProductRecordApi, ZjProductRecordVO } from '@/api/mes/zjproductrecord'
/** 试产质检记录 表单 */
defineOptions({ name: 'ZjProductRecordForm' })
const { t } = useI18n() //
const message = useMessage() //
const dialogVisible = ref(false) //
const dialogTitle = ref('') //
const formLoading = ref(false) // 12
const formType = ref('') // create - update -
const formData = ref({
id: undefined,
type: undefined,
name: undefined,
unit: undefined,
upperVal: undefined,
lowerVal: undefined,
productId: undefined,
remark: undefined,
planId: undefined
})
const formRules = reactive({
type: [{ required: true, message: '工序不能为空', trigger: 'change' }],
name: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
productId: [{ required: true, message: '关联产品id不能为空', 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 ZjProductRecordApi.getZjProductRecord(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 ZjProductRecordVO
if (formType.value === 'create') {
await ZjProductRecordApi.createZjProductRecord(data)
message.success(t('common.createSuccess'))
} else {
await ZjProductRecordApi.updateZjProductRecord(data)
message.success(t('common.updateSuccess'))
}
dialogVisible.value = false
//
emit('success')
} finally {
formLoading.value = false
}
}
/** 重置表单 */
const resetForm = () => {
formData.value = {
id: undefined,
type: undefined,
name: undefined,
unit: undefined,
upperVal: undefined,
lowerVal: undefined,
productId: undefined,
remark: undefined,
planId: undefined
}
formRef.value?.resetFields()
}
</script>

@ -0,0 +1,144 @@
<template>
<Dialog :title="dialogTitle" v-model="dialogVisible" width="1200px">
<!-- 列表 -->
<ContentWrap>
<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
<el-table-column label="工序" align="center" prop="type" >
<template #default="scope">
<dict-tag :type="DICT_TYPE.MES_ORG_TYPE" :value="scope.row.type" />
</template>
</el-table-column>
<el-table-column label="名称" align="center" prop="name" />
<el-table-column label="单位" align="center" prop="unit" />
<el-table-column label="上限值" align="center" prop="upperVal" />
<el-table-column label="下限值" align="center" prop="lowerVal" />
<el-table-column label="实际值" align="center" prop="realVal" >
<template #default="{ row }">
<el-input :disabled = "planisZj === 1" v-model="row.realVal" placeholder="请输入实际值" />
</template>
</el-table-column>
<el-table-column label="备注" align="center" prop="remark" >
<template #default="{ row }">
<!-- <el-form-item :prop="`${$index}.remark`"> -->
<el-input :disabled = "planisZj === 1" v-model="row.remark" placeholder="请输入备注" />
<!-- </el-form-item> -->
</template>
</el-table-column>
</el-table>
<!-- 分页 -->
<!-- <Pagination
:total="total"
v-model:page="queryParams.pageNo"
v-model:limit="queryParams.pageSize"
@pagination="getList"
/> -->
</ContentWrap>
<template #footer>
<el-button v-if = "planisZj === 0" @click="submitForm" type="primary" :disabled="formLoading" > </el-button>
<el-button @click="dialogVisible = false"> </el-button>
</template>
</Dialog>
</template>
<script setup lang="ts">
import { ZjProductRecordApi, ZjProductRecordVO } from '@/api/mes/zjproductrecord'
import {DICT_TYPE} from '@/utils/dict'
import { PlanApi } from '@/api/mes/plan'
/** 试产质检记录 列表 */
defineOptions({ name: 'ZjProductRecord' })
const message = useMessage() //
const { t } = useI18n() //
const dialogVisible = ref(false) //
const dialogTitle = ref('') //
const loading = ref(false) //
const list = ref<ZjProductRecordVO[]>([]) //
const formLoading = ref(false) // 12
const total = ref(0) //
const queryParams = reactive({
pageNo: 1,
pageSize: 100,
type: undefined,
name: undefined,
unit: undefined,
upperVal: undefined,
lowerVal: undefined,
productId: undefined,
realVal: undefined,
remark: undefined,
createTime: [],
planId: undefined
})
/** 查询列表 */
const getList = async () => {
loading.value = true
try {
const data = await ZjProductRecordApi.getZjProductRecordPage(queryParams)
list.value = data.list
total.value = data.total
} finally {
loading.value = false
}
}
const planId = ref('')
const planType = ref('')
const planStatus = ref(0)
const planisZj = ref(0)
/** 打开弹窗 */
const open = async (productId?: number,type?:string, status?:number,id?:number,isZj?:number) => {
planType.value = type
planStatus.value = status
planId.value = id
planisZj.value = isZj
dialogVisible.value = true
dialogTitle.value = t('质检')
loading.value = true
console.log('hhhh')
try {
queryParams.productId = productId
const data = await ZjProductRecordApi.getZjProductRecordPage(queryParams)
console.log('rrr')
list.value = data.list
total.value = data.total
} finally {
loading.value = false
}
}
defineExpose({ open }) // open
/** 提交表单 */
const emit = defineEmits(['success']) // success
const submitForm = async () => {
//
// await formRef.value.validate()
//
formLoading.value = true
try {
await ZjProductRecordApi.updateZjProductRecordBatch(list.value)
//
const data ={
id: planId.value,
code: planType.value,
status: planStatus.value //
}
await PlanApi.updatePlanZjStatus(data)
message.success(t('common.createSuccess'))
dialogVisible.value = false
//
emit('success')
} finally {
formLoading.value = false
}
}
/** 初始化 **/
// onMounted(() => {
// getList()
// })
</script>

@ -0,0 +1,265 @@
<template>
<ContentWrap>
<!-- 搜索工作栏 -->
<el-form
class="-mb-15px"
:model="queryParams"
ref="queryFormRef"
:inline="true"
label-width="68px"
>
<el-form-item label="工序" prop="type">
<el-select
v-model="queryParams.type"
placeholder="请选择工序"
clearable
class="!w-240px"
>
<el-option label="请选择字典生成" value="" />
</el-select>
</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="unit">
<el-input
v-model="queryParams.unit"
placeholder="请输入单位"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="上限值" prop="upperVal">
<el-input
v-model="queryParams.upperVal"
placeholder="请输入上限值"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="下限值" prop="lowerVal">
<el-input
v-model="queryParams.lowerVal"
placeholder="请输入下限值"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="关联产品id" prop="productId">
<el-input
v-model="queryParams.productId"
placeholder="请输入关联产品id"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input
v-model="queryParams.remark"
placeholder="请输入备注"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</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="关联计划id" prop="planId">
<el-input
v-model="queryParams.planId"
placeholder="请输入关联计划id"
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="['mes:zj-product-record:create']"
>
<Icon icon="ep:plus" class="mr-5px" /> 新增
</el-button>
<el-button
type="success"
plain
@click="handleExport"
:loading="exportLoading"
v-hasPermi="['mes:zj-product-record: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="ID" align="center" prop="id" />
<el-table-column label="工序" align="center" prop="type" />
<el-table-column label="名称" align="center" prop="name" />
<el-table-column label="单位" align="center" prop="unit" />
<el-table-column label="上限值" align="center" prop="upperVal" />
<el-table-column label="下限值" align="center" prop="lowerVal" />
<el-table-column label="关联产品id" align="center" prop="productId" />
<el-table-column label="备注" align="center" prop="remark" />
<el-table-column
label="创建时间"
align="center"
prop="createTime"
:formatter="dateFormatter"
width="180px"
/>
<el-table-column label="关联计划id" align="center" prop="planId" />
<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="['mes:zj-product-record:update']"
>
编辑
</el-button>
<el-button
link
type="danger"
@click="handleDelete(scope.row.id)"
v-hasPermi="['mes:zj-product-record: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>
<!-- 表单弹窗添加/修改 -->
<ZjProductRecordForm ref="formRef" @success="getList" />
</template>
<script setup lang="ts">
import { dateFormatter } from '@/utils/formatTime'
import download from '@/utils/download'
import { ZjProductRecordApi, ZjProductRecordVO } from '@/api/mes/zjproductrecord'
import ZjProductRecordForm from './ZjProductRecordForm.vue'
/** 试产质检记录 列表 */
defineOptions({ name: 'ZjProductRecord' })
const message = useMessage() //
const { t } = useI18n() //
const loading = ref(true) //
const list = ref<ZjProductRecordVO[]>([]) //
const total = ref(0) //
const queryParams = reactive({
pageNo: 1,
pageSize: 10,
type: undefined,
name: undefined,
unit: undefined,
upperVal: undefined,
lowerVal: undefined,
productId: undefined,
remark: undefined,
createTime: [],
planId: undefined
})
const queryFormRef = ref() //
const exportLoading = ref(false) //
/** 查询列表 */
const getList = async () => {
loading.value = true
try {
const data = await ZjProductRecordApi.getZjProductRecordPage(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 ZjProductRecordApi.deleteZjProductRecord(id)
message.success(t('common.delSuccess'))
//
await getList()
} catch {}
}
/** 导出按钮操作 */
const handleExport = async () => {
try {
//
await message.exportConfirm()
//
exportLoading.value = true
const data = await ZjProductRecordApi.exportZjProductRecord(queryParams)
download.excel(data, '试产质检记录.xls')
} catch {
} finally {
exportLoading.value = false
}
}
/** 初始化 **/
onMounted(() => {
getList()
})
</script>
Loading…
Cancel
Save