add plan progress

main
chenshuichuan 2 years ago
parent fb89b36055
commit 3cab8d3ca6

@ -2,11 +2,14 @@
<!-- 列表 -->
<ContentWrap>
<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
<el-table-column label="原料" align="center" prop="productName" />
<el-table-column label="单位" align="center" prop="unitName" />
<el-table-column label="需求数量" align="center" prop="number" />
<el-table-column label="已下料" align="center" prop="finishNumber" />
<el-table-column label="备注" align="center" prop="remark" />
<el-table-column label="原料" align="center" prop="productName" width="120px" />
<el-table-column label="单位" align="center" prop="unitName" width="80px"/>
<el-table-column label="需求数量" align="center" prop="number" width="120px" />
<el-table-column label="已下料" align="center" prop="finishNumber" width="120px"/>
<el-table-column label="进度" align="center" >
<el-progress :percentage="50" :stroke-width="15" striped striped-flow />
</el-table-column>
<el-table-column label="操作" align="center"/>
</el-table>
</ContentWrap>
</template>

@ -63,22 +63,6 @@
/>
</el-form-item>
<el-form-item label="生产主管" prop="productionManagerId">
<el-select
v-model="formData.productionManagerId"
clearable
filterable
placeholder="请选择生产主管"
class="!w-1/1"
>
<el-option
v-for="item in userList"
:key="item.id"
:label="item.nickname"
:value="item.id"
/>
</el-select>
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input v-model="formData.remark" placeholder="请输入备注" />

@ -134,6 +134,17 @@
<el-tab-pane label="入库" name="5" />
</el-tabs>
<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
<!-- 投料进度子表的列表 -->
<el-table-column type="expand">
<template #default="scope">
<el-tabs v-if="scope.row.status > 0" model-value="itemRequisitionDetail">
<el-tab-pane label="投料明细" name="itemRequisitionDetail">
<ItemRequisitionDetailList :item-requisition-id="scope.row.requisitionId" />
</el-tab-pane>
</el-tabs>
</template>
</el-table-column>
<el-table-column label="计划编码" align="center" prop="code" min-width="150px" />
<el-table-column label="产品" align="center" prop="productName" min-width="150px"/>
<el-table-column label="任务单" align="center" prop="taskCode" min-width="150px" />
@ -247,6 +258,9 @@ import {ProductApi, ProductVO} from "@/api/erp/product/product";
import {TaskApi, TaskVO} from "@/api/mes/task";
import ItemNeedIndex from "@/views/mes/bom/ItemNeedIndex.vue";
import Paigong from "./components/Paigong.vue";
import BomDetailList from "@/views/mes/bom/components/BomDetailList.vue";
import ItemRequisitionDetailList
from "@/views/mes/itemrequisition/components/ItemRequisitionDetailList.vue";
const productList = ref<ProductVO[]>([]) //
const taskList = ref<TaskVO[]>([]) //
@ -277,6 +291,7 @@ const queryParams = reactive({
remark: undefined,
isEnable: undefined,
feedingPipeline: undefined,
requisitionId: undefined,
createTime: []
})
const queryFormRef = ref() //

@ -0,0 +1,76 @@
<template>
<!-- 列表 -->
<ContentWrap>
<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
<el-table-column label="工序" align="center" prop="productName" width="120px" />
<el-table-column label="成品数量" align="center" prop="number" width="80px"/>
<el-table-column label="完成进度" align="center" >
<el-progress :percentage="50" :stroke-width="15" striped striped-flow :color="finishColors"/>
</el-table-column>
<el-table-column label="废品数量" align="center" prop="finishNumber" width="120px"/>
<el-table-column label="废品率" align="center" >
<el-progress type="circle" :percentage="5" :color="wasteColors" :width="40">
<template #default="{ percentage }">
<span class="percentage-value">{{ percentage }}%</span>
</template>
</el-progress>
</el-table-column>
<el-table-column label="操作" align="center"/>
</el-table>
</ContentWrap>
</template>
<script setup lang="ts">
import { ItemRequisitionApi } from '@/api/mes/itemrequisition'
const { t } = useI18n() //
const message = useMessage() //
const props = defineProps<{
itemRequisitionId?: number // ID
}>()
const loading = ref(false) //
const list = ref([]) //
const finishColors = [
{ color: '#ce1f09', percentage: 20 },
{ color: '#e1820a', percentage: 40 },
{ color: '#16cada', percentage: 60 },
{ color: '#17d4b1', percentage: 80 },
{ color: '#339c1e', percentage: 100 },
]
const wasteColors = [
{ color: '#339c1e', percentage: 8 },
{ color: '#e1820a', percentage: 12 },
{ color: '#e66126', percentage: 16 },
{ color: '#f31226', percentage: 20 },
{ color: '#9b0c54', percentage: 25 },
]
/** 查询列表 */
const getList = async () => {
loading.value = true
try {
list.value = await ItemRequisitionApi.getItemRequisitionDetailListByItemRequisitionId(props.itemRequisitionId)
} finally {
loading.value = false
}
}
/** 搜索按钮操作 */
const handleQuery = () => {
queryParams.pageNo = 1
getList()
}
/** 初始化 **/
onMounted(() => {
getList()
})
</script>
<style scoped>
.percentage-value {
display: block;
margin-top: 5px;
font-size: 16px;
}
</style>

@ -0,0 +1,287 @@
<template>
<ContentWrap>
<!-- 搜索工作栏 -->
<el-form
class="-mb-15px"
:model="queryParams"
ref="queryFormRef"
:inline="true"
label-width="68px"
>
<el-form-item label="任务单" prop="taskId">
<el-select
v-model="queryParams.taskId"
@change="handleQuery"
clearable
filterable
placeholder="请选择"
class="!w-240px"
>
<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="code">
<el-input
v-model="queryParams.code"
placeholder="请输入计划编码"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="产品" prop="productId">
<el-select
v-model="queryParams.productId"
@change="handleQuery"
clearable
filterable
placeholder="请选择产品"
class="!w-240px"
>
<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="planStartTime">
<el-date-picker
v-model="queryParams.planStartTime"
value-format="YYYY-MM-DD HH:mm:ss"
type="daterange"
@change="handleQuery"
start-placeholder="开始日期"
end-placeholder="结束日期"
:default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="计划结束" prop="planEndTime">
<el-date-picker
v-model="queryParams.planEndTime"
value-format="YYYY-MM-DD HH:mm:ss"
type="daterange"
@change="handleQuery"
start-placeholder="开始日期"
end-placeholder="结束日期"
:default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
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>
<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="success"
plain
@click="handleExport"
:loading="exportLoading"
>
<Icon icon="ep:download" class="mr-5px" /> 导出
</el-button>
</el-form-item>
</el-form>
</ContentWrap>
<!-- 列表 -->
<ContentWrap>
<el-tabs v-model="activeName" @tab-click="handleTabClick">
<el-tab-pane label="所有" name="" />
<el-tab-pane label="计划" name="0" />
<el-tab-pane label="派工" name="1" />
<el-tab-pane label="开工" name="2" />
<el-tab-pane label="暂停" name="3" />
<el-tab-pane label="完工" name="4" />
<el-tab-pane label="入库" name="5" />
</el-tabs>
<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
<!-- 投料进度子表的列表 -->
<el-table-column type="expand">
<template #default="scope">
<el-tabs v-if="scope.row.status > 0" model-value="itemRequisitionDetail">
<el-tab-pane label="各工序进度" name="itemRequisitionDetail">
<ProgressList :item-requisition-id="scope.row.requisitionId" />
</el-tab-pane>
</el-tabs>
</template>
</el-table-column>
<el-table-column label="计划编码" align="center" prop="code" min-width="150px" />
<el-table-column label="产品" align="center" prop="productName" min-width="150px"/>
<el-table-column label="任务单" align="center" prop="taskCode" min-width="150px" />
<el-table-column label="数量" align="center" prop="planNumber" />
<el-table-column label="状态" align="center" prop="status" sortable>
<template #default="scope">
<dict-tag :type="DICT_TYPE.MES_PLAN_STATUS" :value="scope.row.status" />
</template>
</el-table-column>
<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="remark" />
<el-table-column label="领料人" align="center" prop="productionManagerName" />
<el-table-column label="制浆线" align="center" prop="feedingPipeline">
<template #default="scope">
<dict-tag :type="DICT_TYPE.MES_FEEDING_PIPELINE" :value="scope.row.feedingPipeline" />
</template>
</el-table-column>
<el-table-column label="操作" align="center" fixed="right" width="250">
<template #default="scope">
<el-button
link
type="info"
@click="openItemNeed(scope.row.code, scope.row.id)"
>
物料
</el-button>
</template>
</el-table-column>
</el-table>
<!-- 分页 -->
<Pagination
:total="total"
v-model:page="queryParams.pageNo"
v-model:limit="queryParams.pageSize"
@pagination="getList"
/>
</ContentWrap>
<!-- 物料列表 -->
<ItemNeedIndex ref="itemFormRef" @success="getList" />
</template>
<script setup lang="ts">
import { getIntDictOptions, getBoolDictOptions, DICT_TYPE } from '@/utils/dict'
import {dateFormatter, dateFormatter2} from '@/utils/formatTime'
import download from '@/utils/download'
import { PlanApi, PlanVO } from '@/api/mes/plan'
import PlanForm from './PlanForm.vue'
import {ProductApi, ProductVO} from "@/api/erp/product/product";
import {TaskApi, TaskVO} from "@/api/mes/task";
import ItemNeedIndex from "@/views/mes/bom/ItemNeedIndex.vue";
import Paigong from "./components/Paigong.vue";
import BomDetailList from "@/views/mes/bom/components/BomDetailList.vue";
import ItemRequisitionDetailList
from "@/views/mes/itemrequisition/components/ItemRequisitionDetailList.vue";
const productList = ref<ProductVO[]>([]) //
const taskList = ref<TaskVO[]>([]) //
/** 生产计划 列表 */
defineOptions({ name: 'PlanProgress' })
const message = useMessage() //
const { t } = useI18n() //
const {query} = useRoute() //
const loading = ref(true) //
const list = ref<PlanVO[]>([]) //
const total = ref(0) //
const queryParams = reactive({
pageNo: 1,
pageSize: 10,
code: undefined,
productId: undefined,
taskDetailId: undefined,
taskId: undefined,
planNumber: undefined,
finishNumber: undefined,
status: undefined,
planStartTime: [],
planEndTime: [],
startTime: [],
endTime: [],
productionManagerId: undefined,
remark: undefined,
isEnable: undefined,
feedingPipeline: undefined,
requisitionId: undefined,
createTime: []
})
const queryFormRef = ref() //
const exportLoading = ref(false) //
/** 查询列表 */
const getList = async () => {
loading.value = true
try {
const data = await PlanApi.getPlanPage(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 handleExport = async () => {
try {
//
await message.exportConfirm()
//
exportLoading.value = true
const data = await PlanApi.exportPlan(queryParams)
download.excel(data, '生产计划.xls')
} catch {
} finally {
exportLoading.value = false
}
}
/** 初始化 **/
onMounted(async () => {
//
if(query.taskId)
queryParams.taskId = String(query.taskId)
if(query.productId)
queryParams.productId = String(query.productId)
//
productList.value = await ProductApi.getMesProductSimpleList()
taskList.value = await TaskApi.getTaskList()
await getList()
})
/** 物料需求 */
const itemFormRef = ref()
const openItemNeed = (planCode:string, planId: number) => {
itemFormRef.value.open("plan","计划-"+planCode, planId)
}
/** tab 切换 */
let activeName = ''
const handleTabClick = (tab: TabsPaneContext) => {
queryParams.status = tab.paneName
handleQuery()
}
</script>

@ -6,6 +6,7 @@
:rules="formRules"
label-width="100px"
v-loading="formLoading"
:disabled="disabled"
>
<el-row :gutter="20">
<el-col :span="8">
@ -127,10 +128,11 @@
</el-row>
<el-form-item label="备注" prop="remark">
<Editor v-model="formData.remark" height="200px" />
<Editor disabled="disabled" v-model="formData.remark" height="500px" />
</el-form-item>
</el-form>
<template #footer>
<el-button @click="submitForm" type="primary" :disabled="formLoading"> </el-button>
<el-button @click="dialogVisible = false"> </el-button>
@ -150,7 +152,8 @@ const message = useMessage() // 消息弹窗
const dialogVisible = ref(false) //
const dialogTitle = ref('') //
const formLoading = ref(false) // 12
const formType = ref('') // create - update -
const formType = ref('') // create - update - detail
const disabled = computed(() => formType.value === 'detail')
const formData = ref({
id: undefined,
productId: undefined,

@ -17,17 +17,25 @@
<el-table-column label="交货日期" align="center" prop="finishDate" :formatter="dateFormatter2"/>
<el-table-column label="项目名称" align="center" prop="projectName" />
<el-table-column label="技术要求" align="center" prop="techRequirements" />
<el-table-column label="备注" align="center" prop="remark" />
<el-table-column label="备注" align="center" prop="remark" >
<template #default="scope">
<el-link @click="openFormView('detail', scope.row.id)" v-if="scope.row.remark" type="warning">
查看详情
</el-link>
</template>
</el-table-column>
<el-table-column label="订单单号" align="center" prop="saleOrderCode" />
<el-table-column
label="创建时间"
align="center"
prop="createTime"
:formatter="dateFormatter"
width="180px"
/>
<el-table-column label="操作" align="center" width="150px">
<template #default="scope">
<el-button
link
@click="openFormView('detail', scope.row.id)"
v-hasPermi="['mes:task:query']"
>
详情
</el-button>
<el-button
link
type="primary"
@ -57,6 +65,8 @@
</ContentWrap>
<!-- 表单弹窗添加/修改 -->
<TaskDetailForm ref="formRef" @success="getList" />
<!-- 表单弹窗添加/修改 -->
<TaskDetailView ref="formViewRef" />
</template>
<script setup lang="ts">
import {dateFormatter, dateFormatter2} from '@/utils/formatTime'
@ -118,7 +128,15 @@ const openForm = (type: string, id?: number) => {
}
formRef.value.open(type, id, props.taskId)
}
/** 详情操作 */
const formViewRef = ref()
const openFormView = (type: string, id?: number) => {
if (!props.taskId) {
message.error('请选择一个生产任务单')
return
}
formViewRef.value.open(type, id, props.taskId)
}
/** 删除按钮操作 */
const handleDelete = async (id: number) => {
try {

@ -0,0 +1,250 @@
<template>
<Dialog :title="dialogTitle" v-model="dialogVisible" width="1200px">
<el-form
ref="formRef"
:model="formData"
:rules="formRules"
label-width="100px"
v-loading="formLoading"
:disabled="disabled"
>
<el-row :gutter="20">
<el-col :span="8">
<el-form-item label="产品" prop="productId">
<el-select
v-model="formData.productId"
clearable
filterable
placeholder="请选择产品"
>
<el-option
v-for="item in productList"
:key="item.id"
:label="item.name"
:value="item.id"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="单位" prop="unitId">
<el-select
disabled
v-model="formData.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>
</el-col>
<el-col :span="8">
<el-form-item label="数量" prop="number">
<el-input-number
v-model="formData.number"
:min="0"
class="!w-1/1"
placeholder="请输入数量"
/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="项目" prop="projectName">
<el-input v-model="formData.projectName" placeholder="请输入项目名称" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="每包/个" prop="packageSize">
<el-input-number
v-model="formData.packageSize"
:min="0"
class="!w-1/1"
placeholder="请输入打包要求(每包/个)"
/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="打包数/包" prop="packageNumber">
<el-input-number
v-model="formData.packageNumber"
:min="0"
class="!w-1/1"
placeholder="请输入数量"
/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="条码" prop="barCode">
<el-input v-model="formData.barCode" placeholder="请输入条码" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="技术要求" prop="techRequirements">
<el-input v-model="formData.techRequirements" placeholder="请输入技术要求" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="工厂完成" prop="finishDate">
<el-date-picker
v-model="formData.finishDate"
type="date"
value-format="x"
placeholder="选择工厂完成日期"
/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="装柜日期" prop="boxingDate">
<el-date-picker
v-model="formData.boxingDate"
type="date"
value-format="x"
placeholder="选择装柜日期"
/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="到达日期" prop="arriveDate">
<el-date-picker
v-model="formData.arriveDate"
type="date"
value-format="x"
placeholder="选择到达日期"
/>
</el-form-item>
</el-col>
</el-row>
<div>
<label>备注</label>
<div v-html="formData.remark"></div>
</div>
</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 { TaskApi } from '@/api/mes/task'
import { ProductUnitApi, ProductUnitVO } from '@/api/erp/product/unit'
import {ProductApi, ProductVO} from "@/api/erp/product/product";
const unitList = ref<ProductUnitVO[]>([]) //
const productList = ref<ProductVO[]>([]) //
const { t } = useI18n() //
const message = useMessage() //
const dialogVisible = ref(false) //
const dialogTitle = ref('') //
const formLoading = ref(false) // 12
const formType = ref('') // create - update - ; detail-
const disabled = computed(() => formType.value === 'detail')
const formData = ref({
id: undefined,
productId: undefined,
unitId: undefined,
taskId: undefined,
number: undefined,
packageSize: undefined,
projectName: undefined,
techRequirements: undefined,
remark: undefined,
packageNumber: undefined,
finishDate: undefined,
boxingDate: undefined,
arriveDate: undefined,
})
const formRules = reactive({
productId: [{ required: true, message: '产品ID不能为空', trigger: 'blur' }],
unitId: [{ required: true, message: '单位ID不能为空', trigger: 'blur' }],
taskId: [{ required: true, message: 'task ID不能为空', trigger: 'blur' }],
number: [{ required: true, message: '数量不能为空', trigger: 'blur' }],
packageSize: [{ required: true, message: '打包要求(每包/个)不能为空', trigger: 'blur' }]
})
const formRef = ref() // Ref
/** 打开弹窗 */
const open = async (type: string, id?: number, taskId: number) => {
dialogVisible.value = true
dialogTitle.value = t('action.' + type)
formType.value = type
resetForm()
formData.value.taskId = taskId
//
if (id) {
formLoading.value = true
try {
formData.value = await TaskApi.getTaskDetail(id)
} finally {
formLoading.value = false
}
}
//
//unitList.value = await ProductUnitApi.getProductUnitSimpleList()
unitList.value= [
{
id: 5,
name: '个',
},
]
formData.value.unitId = 5
productList.value = await ProductApi.getMesProductSimpleList()
}
defineExpose({ open }) // open
/** 提交表单 */
const emit = defineEmits(['success']) // success
const submitForm = async () => {
//
await formRef.value.validate()
//
formLoading.value = true
try {
const data = formData.value
if (formType.value === 'create') {
await TaskApi.createTaskDetail(data)
message.success(t('common.createSuccess'))
} else {
await TaskApi.updateTaskDetail(data)
message.success(t('common.updateSuccess'))
}
dialogVisible.value = false
//
emit('success')
} finally {
formLoading.value = false
}
}
/** 重置表单 */
const resetForm = () => {
formData.value = {
id: undefined,
productId: undefined,
unitId: undefined,
taskId: undefined,
number: undefined,
packageSize: undefined,
projectName: undefined,
techRequirements: undefined,
remark: undefined
}
formRef.value?.resetFields()
}
</script>
Loading…
Cancel
Save