main
chenshuichuan 2 years ago
parent 0e3db55c03
commit 84a521bbf8

@ -81,11 +81,11 @@
<el-table-column label="id" align="center" prop="id" />
<el-table-column label="记录" align="center" prop="recordCode" />
<el-table-column label="记录明细" align="center" prop="recordDetailId" />
<el-table-column label="计划" align="center" prop="planCode" />
<el-table-column label="计划" align="center" prop="planCode" sortable/>
<el-table-column label="原料" align="center" prop="itemName" />
<el-table-column label="重量" align="center" prop="weight" />
<el-table-column label="单位" align="center" prop="unitName" />
<el-table-column label="记录人" align="center" prop="userName" />
<el-table-column label="记录人" align="center" prop="userName" sortable/>
<el-table-column
label="投料时间"
align="center"

@ -109,12 +109,12 @@
</template>
</el-table-column>
<el-table-column label="单号" align="center" prop="feedingRecordCode" width="150px"/>
<el-table-column label="制浆线" align="center" prop="feedingPipeline">
<el-table-column label="制浆线" align="center" prop="feedingPipeline" sortable>
<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" prop="feedingType">
<el-table-column label="投料类型" align="center" prop="feedingType" sortable>
<template #default="scope">
<dict-tag :type="DICT_TYPE.MES_FEEDING_TYPE" :value="scope.row.feedingType" />
</template>

@ -109,6 +109,7 @@
prop="requisitionDate"
:formatter="dateFormatter2"
width="180px"
sortable
/>
<el-table-column
label="实际下料"
@ -116,6 +117,7 @@
prop="deliveryDate"
:formatter="dateFormatter"
width="180px"
sortable
/>
<el-table-column
label="创建时间"
@ -123,17 +125,9 @@
prop="createTime"
:formatter="dateFormatter"
width="180px"
sortable
/>
<!-- <el-table-column label="操作" align="center" fixed="right" width="150">-->
<!-- <template #default="scope">-->
<!-- <el-button link type="primary" @click="openForm('update', scope.row.id)" v-hasPermi="['mes:item-requisition:update']">-->
<!-- 编辑-->
<!-- </el-button>-->
<!-- <el-button link type="danger" @click="handleDelete(scope.row.id)" v-hasPermi="['mes:item-requisition:delete']">-->
<!-- 删除-->
<!-- </el-button>-->
<!-- </template>-->
<!-- </el-table-column>-->
</el-table>
<!-- 分页 -->
<Pagination

@ -87,6 +87,7 @@ const userList = ref<UserApi.UserVO[]>([]) // 用户列表
const formData = ref({
id: undefined,
orgId: undefined,
orgType: undefined,
workDate: undefined,
groupType: undefined,
workerId: undefined,
@ -110,6 +111,7 @@ const open = async (type: string, orgId?: number) => {
//
if (orgId) {
formData.value.orgId = orgId
formData.value.orgType = type
}
await getOrganizationTree()
}

@ -45,13 +45,13 @@
:formatter="dateFormatter2"
width="140px"
/>
<el-table-column label="工位" align="center" prop="orgName" />
<el-table-column label="工位" align="center" prop="orgName" sortable />
<el-table-column label="班别" align="center" prop="groupType">
<template #default="scope">
<dict-tag :type="DICT_TYPE.MES_GROUP_TYPE" :value="scope.row.groupType" />
</template>
</el-table-column>
<el-table-column label="工人" align="center" prop="workerName" />
<el-table-column label="工人" align="center" prop="workerName" sortable/>
<el-table-column label="操作" align="center">
<template #default="scope">
<el-button
@ -164,7 +164,7 @@ const getCurrentDate = () =>{
/** 初始化 **/
onMounted(() => {
queryParams.workDate = [getCurrentDate(), getCurrentDate()]
getList()
// getList()
})
/** tab 切换 */
let activeName = ''
@ -187,20 +187,10 @@ watch(
() => props.orgType,
(val: string) => {
queryParams.orgType = val
queryParams.orgId = null
handleQuery()
},
{ immediate: true, deep: true }
)
// watch(
// () => props.workDate,
// (val: string) => {
// console.log("workDate:"+val)
// if (!val) {
// return
// }
//
// handleQuery()
// },
// { immediate: true, deep: true }
// )
</script>

@ -129,7 +129,7 @@ const submitForm = async () => {
try {
const data = formData.value as unknown as OrgWorkerVO
if (formType.value === 'create') {
await OrgWorkerApi.createOrgWorker(data)
await OrgWorkerApi.getCreateWorker(data)
message.success(t('common.createSuccess'))
} else {
await OrgWorkerApi.updateOrgWorker(data)

@ -100,21 +100,42 @@
<!-- 列表 -->
<ContentWrap>
<el-tabs v-model="activeName" @tab-click="handleTabClick">
<el-tab-pane label="成型" name="chengxing" />
<el-tab-pane label="烘干" name="honggan" />
<el-tab-pane label="转移" name="zhuanyi" />
<el-tab-pane label="加湿" name="jiashi" />
<el-tab-pane label="热压" name="reya" />
<el-tab-pane label="切边" name="qiebian" />
<el-tab-pane label="品检" name="pinjian" />
<el-tab-pane label="打包" name="dabao" />
<el-tab-pane label="贴标" name="tiebiao" />
<el-tab-pane label="品印" name="pinjian" />
<el-tab-pane label="塑封" name="sufeng" />
<el-tab-pane label="制浆" name="zhijiang" />
</el-tabs>
<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
<el-table-column label="ID" prop="id" />
<el-table-column
label="工作日期"
align="center"
prop="workDate"
:formatter="dateFormatter2"
width="180px"
sortable
/>
<el-table-column label="工位" align="center" prop="orgName" />
<el-table-column label="工位" align="center" prop="orgName" sortable/>
<el-table-column label="工序" align="center" prop="orgType">
<template #default="scope">
<dict-tag :type="DICT_TYPE.MES_ORG_TYPE" :value="scope.row.orgType" />
</template>
</el-table-column>
<el-table-column label="班别" align="center" prop="groupType">
<template #default="scope">
<dict-tag :type="DICT_TYPE.MES_GROUP_TYPE" :value="scope.row.groupType" />
</template>
</el-table-column>
<el-table-column label="工人" align="center" prop="workerName" />
<el-table-column label="工人" align="center" prop="workerName" sortable/>
<el-table-column label="报工单" align="center" prop="reportId" />
<el-table-column
label="创建时间"
@ -123,8 +144,8 @@
:formatter="dateFormatter"
width="180px"
/>
<el-table-column label="创建人" align="center" prop="creator" width="180px"/>
<el-table-column label="操作" align="center">
<el-table-column label="创建人" align="center" prop="creator" width="130px"/>
<el-table-column label="操作" align="center" fixed="right" width="130">
<template #default="scope">
<el-button
link
@ -183,6 +204,7 @@ const queryParams = reactive({
pageNo: 1,
pageSize: 10,
orgId: undefined,
orgType: undefined,
workDate: [],
groupType: undefined,
workerId: undefined,
@ -264,4 +286,10 @@ onMounted(async () => {
//
userList.value = await UserApi.getSimpleUserList()
})
/** tab 切换 */
let activeName = 'chengxing'
const handleTabClick = (tab: TabsPaneContext) => {
queryParams.orgType = tab.paneName
handleQuery()
}
</script>

@ -150,7 +150,7 @@
</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="productName" min-width="150px" sortable/>
<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>

@ -148,7 +148,6 @@
v-if="scope.row.reportStatus === 0"
type="success"
@click="updateStatus(scope.row.id,1,'提交')"
v-hasPermi="['mes:produce-report-detail:update']"
>
提交
</el-button>
@ -157,7 +156,6 @@
v-if="scope.row.reportStatus === 1"
type="success"
@click="updateStatus(scope.row.id,2,'通过')"
v-hasPermi="['mes:produce-report-detail:replace']"
>
通过
</el-button>
@ -166,7 +164,6 @@
v-if="scope.row.reportStatus === 1"
type="warning"
@click="updateStatus(scope.row.id,3,'驳回')"
v-hasPermi="['mes:produce-report-detail:replace']"
>
驳回
</el-button>
@ -176,7 +173,6 @@
link
type="primary"
@click="openReplaceForm('update', scope.row.id)"
v-hasPermi="['mes:produce-report-detail:update']"
>
编辑
</el-button>
@ -185,7 +181,6 @@
link
type="danger"
@click="handleDelete(scope.row.id)"
v-hasPermi="['mes:produce-report:delete']"
>
删除
</el-button>

@ -103,15 +103,16 @@
prop="reportDate"
:formatter="dateFormatter2"
width="120px"
sortable
/>
<el-table-column label="工人" align="center" width="80px" prop="userName" />
<el-table-column label="工位" align="center" width="100px" prop="orgName" />
<el-table-column label="工人" align="center" width="80px" prop="userName" sortable/>
<el-table-column label="工位" align="center" width="100px" prop="orgName" sortable/>
<el-table-column align="center" label="工序" >
<template #default="scope">
<dict-tag :type="DICT_TYPE.MES_ORG_TYPE" :value="scope.row.orgType" />
</template>
</el-table-column>
<el-table-column label="产品" align="center" width="120px" prop="productName" />
<el-table-column label="产品" align="center" width="120px" prop="productName" sortable/>
<el-table-column label="成品数量" align="center" prop="qualityNumber" />
<el-table-column label="废品数量" align="center" prop="wasteNumber" />
<el-table-column label="总数量" align="center" prop="totalNumber" />
@ -148,14 +149,15 @@
prop="reportDate"
:formatter="dateFormatter2"
width="180px"
sortable
/>
<el-table-column label="用户" align="center" prop="userName" />
<el-table-column label="工序" align="center" prop="orgType">
<el-table-column label="用户" align="center" prop="userName" sortable/>
<el-table-column label="工序" align="center" prop="orgType" >
<template #default="scope">
<dict-tag :type="DICT_TYPE.MES_ORG_TYPE" :value="scope.row.orgType" />
</template>
</el-table-column>
<el-table-column label="工位" align="center" prop="orgName" />
<el-table-column label="工位" align="center" prop="orgName" sortable/>
<el-table-column label="计件时段" align="center" prop="reportTime" />
<el-table-column label="计件时长" align="center" prop="totalTime" />
<el-table-column label="状态" align="center" prop="reportStatus">

@ -7,7 +7,7 @@
<el-table-column label="成品数量" align="center" prop="qualityNumber" />
<el-table-column label="废品数量" align="center" prop="wasteNumber" />
<el-table-column label="总数量" align="center" prop="totalNumber" />
<el-table-column label="成品率%" align="center" prop="qualityRate" />
<el-table-column label="成品率%" align="center" prop="qualityRate" :formatter="erpCountTableColumnFormatter"/>
<el-table-column label="打包数量" align="center" prop="packageNumber" />
<el-table-column label="备注" align="center" prop="remark" />
</el-table>
@ -17,6 +17,7 @@
import { DICT_TYPE } from '@/utils/dict'
import { dateFormatter } from '@/utils/formatTime'
import { ProduceReportApi } from '@/api/mes/producereport'
import {erpCountTableColumnFormatter} from "@/utils";
const { t } = useI18n() //
const message = useMessage() //

@ -116,7 +116,7 @@
>
<el-table-column width="30" label="选择" type="selection" />
<el-table-column min-width="180" label="入库单号" align="center" prop="no" />
<el-table-column label="产品信息" align="center" prop="productNames" min-width="200" />
<el-table-column label="产品信息" align="center" prop="productNames" min-width="200" sortable/>
<el-table-column label="供应商" align="center" prop="supplierName" />
<el-table-column
label="入库时间"

@ -60,14 +60,6 @@
<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:stock-in-detail:create']"-->
<!-- >-->
<!-- <Icon icon="ep:plus" class="mr-5px" /> 新增-->
<!-- </el-button>-->
<el-button
type="success"
plain
@ -86,10 +78,10 @@
<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="入库单id" align="center" prop="stockInId" />
<el-table-column label="入库单编号" align="center" prop="stockInNo" />
<el-table-column label="入库单编号" align="center" prop="stockInNo" sortable/>
<el-table-column label="入库单项id" align="center" prop="stockInItemId" />
<el-table-column label="计划" align="center" prop="planId" />
<el-table-column label="产品" align="center" prop="productId" />
<el-table-column label="产品" align="center" prop="productId" sortable/>
<el-table-column label="数量" align="center" prop="number" />
<el-table-column
label="创建时间"
@ -100,14 +92,6 @@
/>
<el-table-column label="操作" align="center">
<template #default="scope">
<!-- <el-button-->
<!-- link-->
<!-- type="primary"-->
<!-- @click="openForm('update', scope.row.id)"-->
<!-- v-hasPermi="['mes:stock-in-detail:update']"-->
<!-- >-->
<!-- 编辑-->
<!-- </el-button>-->
<el-button
link
type="danger"

@ -129,9 +129,10 @@
prop="outTime"
:formatter="dateFormatter2"
width="120px"
sortable
/>
<el-table-column label="领料人" align="center" prop="responseName" />
<el-table-column label="创建人" align="center" prop="creatorName" />
<el-table-column label="领料人" align="center" prop="responseName" sortable/>
<el-table-column label="创建人" align="center" prop="creatorName" sortable/>
<el-table-column label="操作" align="center" fixed="right" width="220">
<template #default="scope">
<el-button

@ -51,7 +51,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="itemName" sortable/>
<el-table-column label="数量" align="center" prop="count" />
<el-table-column label="单位" align="center" prop="unitName" />
<el-table-column label="分类" align="center" prop="categoryName" />
@ -61,6 +61,7 @@
prop="createTime"
:formatter="dateFormatter"
width="180px"
sortable
/>
<el-table-column label="操作" align="center">
<template #default="scope">

@ -10,7 +10,7 @@
<Icon icon="ep:plus" class="mr-5px" /> 新增
</el-button>
<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
<el-table-column label="产品" align="center" prop="productName" width="140px"/>
<el-table-column label="产品" align="center" prop="productName" width="140px" sortable/>
<el-table-column label="单位" align="center" prop="unitName" />
<el-table-column label="数量" align="center" prop="number" />
<el-table-column label="每包/个" align="center" prop="packageSize" />

@ -4,7 +4,7 @@
<ContentWrap>
<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
<el-table-column label="任务单" align="center" prop="taskCode" />
<el-table-column label="产品" align="center" prop="productName" />
<el-table-column label="产品" align="center" prop="productName" sortable/>
<el-table-column label="任务总数" align="center" prop="totalNumber" />
<el-table-column label="已计划" align="center" prop="planNumber" />
<el-table-column label="未计划" align="center">

@ -80,10 +80,11 @@
prop="reportDate"
:formatter="dateFormatter2"
width="180px"
sortable
/>
<el-table-column label="报工单" align="center" prop="reportCode" />
<el-table-column label="工位" align="center" prop="orgName" />
<el-table-column label="工序" align="center" prop="orgType" >
<el-table-column label="工位" align="center" prop="orgName" sortable/>
<el-table-column label="工序" align="center" prop="orgType" sortable>
<template #default="scope">
<dict-tag :type="DICT_TYPE.MES_ORG_TYPE" :value="scope.row.orgType" />
</template>
@ -93,8 +94,8 @@
<dict-tag :type="DICT_TYPE.MES_GROUP_TYPE" :value="scope.row.groupType" />
</template>
</el-table-column>
<el-table-column label="计划" align="center" prop="planCode" width="120px"/>
<el-table-column label="产品" align="center" prop="productName" width="120px"/>
<el-table-column label="计划" align="center" prop="planCode" width="120px" sortable/>
<el-table-column label="产品" align="center" prop="productName" width="120px" sortable/>
<el-table-column label="成品数量" align="center" prop="qualityNumberPlan" />
<el-table-column label="废品数量" align="center" prop="wasteNumberPlan" />
<el-table-column label="计件时间" align="center" prop="reportTimePlan" />

@ -89,7 +89,7 @@
<dict-tag :type="DICT_TYPE.MES_GROUP_TYPE" :value="scope.row.groupType" />
</template>
</el-table-column>
<el-table-column label="工序类型" align="center" prop="teamType">
<el-table-column label="工序类型" align="center" prop="teamType" sortable>
<template #default="scope">
<dict-tag :type="DICT_TYPE.MES_ORG_TYPE" :value="scope.row.teamType" />
</template>

Loading…
Cancel
Save