|
|
|
@ -14,8 +14,9 @@
|
|
|
|
:disabled="isDisableUpdate"
|
|
|
|
:disabled="isDisableUpdate"
|
|
|
|
v-model="formData.reportDate"
|
|
|
|
v-model="formData.reportDate"
|
|
|
|
type="date"
|
|
|
|
type="date"
|
|
|
|
value-format="x"
|
|
|
|
value-format="YYYY-MM-DD HH:mm:ss"
|
|
|
|
placeholder="选择日期"
|
|
|
|
placeholder="选择日期"
|
|
|
|
|
|
|
|
:default-value="new Date()"
|
|
|
|
@change="changeDate"
|
|
|
|
@change="changeDate"
|
|
|
|
/>
|
|
|
|
/>
|
|
|
|
</el-form-item>
|
|
|
|
</el-form-item>
|
|
|
|
@ -37,24 +38,27 @@
|
|
|
|
</el-col>
|
|
|
|
</el-col>
|
|
|
|
</el-row>
|
|
|
|
</el-row>
|
|
|
|
<el-form-item label="类型" prop="orgType">
|
|
|
|
<el-form-item label="类型" prop="orgType">
|
|
|
|
<el-select v-model="formData.orgType" @change="changeDate" placeholder="请选择类型">
|
|
|
|
<el-radio-group v-model="formData.orgType">
|
|
|
|
<el-option
|
|
|
|
<el-radio
|
|
|
|
:disabled="isDisableUpdate"
|
|
|
|
:disabled="isDisableUpdate"
|
|
|
|
v-for="dict in getStrDictOptions(DICT_TYPE.MES_ORG_TYPE)"
|
|
|
|
v-for="dict in getStrDictOptions(DICT_TYPE.MES_ORG_TYPE)"
|
|
|
|
:key="dict.value"
|
|
|
|
:key="dict.value"
|
|
|
|
:label="dict.label"
|
|
|
|
:label="dict.value"
|
|
|
|
:value="dict.value"
|
|
|
|
@change="changeDate"
|
|
|
|
/>
|
|
|
|
>
|
|
|
|
</el-select>
|
|
|
|
{{ dict.label }}
|
|
|
|
|
|
|
|
</el-radio>
|
|
|
|
|
|
|
|
</el-radio-group>
|
|
|
|
</el-form-item>
|
|
|
|
</el-form-item>
|
|
|
|
<el-row>
|
|
|
|
<el-row v-if="formData.orgType && formData.groupType && formData.reportDate">
|
|
|
|
<el-col :span="12">
|
|
|
|
<el-col :span="12">
|
|
|
|
<el-form-item label="工人" prop="userId">
|
|
|
|
<el-form-item label="工人" prop="userId">
|
|
|
|
<el-select
|
|
|
|
<el-select
|
|
|
|
:disabled="isDisable"
|
|
|
|
:disabled="isDisableUpdate"
|
|
|
|
v-model="formData.userId"
|
|
|
|
v-model="formData.userId"
|
|
|
|
clearable
|
|
|
|
clearable
|
|
|
|
filterable
|
|
|
|
filterable
|
|
|
|
|
|
|
|
@change="changeDateUser"
|
|
|
|
placeholder="请选择工人"
|
|
|
|
placeholder="请选择工人"
|
|
|
|
>
|
|
|
|
>
|
|
|
|
<el-option
|
|
|
|
<el-option
|
|
|
|
@ -68,19 +72,25 @@
|
|
|
|
</el-col>
|
|
|
|
</el-col>
|
|
|
|
<el-col :span="12">
|
|
|
|
<el-col :span="12">
|
|
|
|
<el-form-item label="工位" prop="orgId">
|
|
|
|
<el-form-item label="工位" prop="orgId">
|
|
|
|
<el-tree-select
|
|
|
|
<el-select
|
|
|
|
:disabled="isDisableUpdate"
|
|
|
|
:disabled="isDisableUpdate"
|
|
|
|
v-model="formData.orgId"
|
|
|
|
v-model="formData.orgId"
|
|
|
|
:data="organizationTree"
|
|
|
|
clearable
|
|
|
|
:props="defaultProps"
|
|
|
|
filterable
|
|
|
|
check-strictly
|
|
|
|
|
|
|
|
default-expand-all
|
|
|
|
|
|
|
|
placeholder="请选择工位"
|
|
|
|
placeholder="请选择工位"
|
|
|
|
/>
|
|
|
|
>
|
|
|
|
|
|
|
|
<el-option
|
|
|
|
|
|
|
|
v-for="item in orgWorkerList"
|
|
|
|
|
|
|
|
:key="item.orgId"
|
|
|
|
|
|
|
|
:label="item.orgName"
|
|
|
|
|
|
|
|
:value="item.orgId"
|
|
|
|
|
|
|
|
/>
|
|
|
|
|
|
|
|
</el-select>
|
|
|
|
</el-form-item>
|
|
|
|
</el-form-item>
|
|
|
|
</el-col>
|
|
|
|
</el-col>
|
|
|
|
|
|
|
|
|
|
|
|
</el-row>
|
|
|
|
</el-row>
|
|
|
|
|
|
|
|
<el-text v-if="warningInfo" class="mx-1" type="warning">{{warningInfo}}</el-text>
|
|
|
|
|
|
|
|
<el-divider />
|
|
|
|
<el-form-item label="产品" prop="productId">
|
|
|
|
<el-form-item label="产品" prop="productId">
|
|
|
|
<el-select v-model="formData.productId" clearable filterable placeholder="请选择" >
|
|
|
|
<el-select v-model="formData.productId" clearable filterable placeholder="请选择" >
|
|
|
|
<el-option
|
|
|
|
<el-option
|
|
|
|
@ -95,12 +105,12 @@
|
|
|
|
<el-row>
|
|
|
|
<el-row>
|
|
|
|
<el-col :span="12">
|
|
|
|
<el-col :span="12">
|
|
|
|
<el-form-item label="成品数量" prop="qualityNumber">
|
|
|
|
<el-form-item label="成品数量" prop="qualityNumber">
|
|
|
|
<el-input-number v-model="formData.qualityNumber" :min="0" placeholder="请输入数量"/>
|
|
|
|
<el-input-number v-model="formData.qualityNumber" :min="0" @change="numberChange" placeholder="请输入数量"/>
|
|
|
|
</el-form-item>
|
|
|
|
</el-form-item>
|
|
|
|
</el-col>
|
|
|
|
</el-col>
|
|
|
|
<el-col :span="12">
|
|
|
|
<el-col :span="12">
|
|
|
|
<el-form-item label="废品数量" prop="wasteNumber">
|
|
|
|
<el-form-item label="废品数量" prop="wasteNumber">
|
|
|
|
<el-input-number v-model="formData.wasteNumber" :min="0" placeholder="请输入"/>
|
|
|
|
<el-input-number v-model="formData.wasteNumber" :min="0" @change="numberChange" placeholder="请输入"/>
|
|
|
|
</el-form-item>
|
|
|
|
</el-form-item>
|
|
|
|
</el-col>
|
|
|
|
</el-col>
|
|
|
|
</el-row>
|
|
|
|
</el-row>
|
|
|
|
@ -111,7 +121,7 @@
|
|
|
|
</el-form-item>
|
|
|
|
</el-form-item>
|
|
|
|
</el-col>
|
|
|
|
</el-col>
|
|
|
|
<el-col :span="12">
|
|
|
|
<el-col :span="12">
|
|
|
|
<el-form-item label="成品率" prop="qualityRate">
|
|
|
|
<el-form-item label="成品率%" prop="qualityRate">
|
|
|
|
<el-input-number disabled v-model="formData.qualityRate" :min="0" :precision="2" placeholder="请输入数量"/>
|
|
|
|
<el-input-number disabled v-model="formData.qualityRate" :min="0" :precision="2" placeholder="请输入数量"/>
|
|
|
|
</el-form-item>
|
|
|
|
</el-form-item>
|
|
|
|
</el-col>
|
|
|
|
</el-col>
|
|
|
|
@ -151,7 +161,10 @@ import {defaultProps, handleTree} from "@/utils/tree";
|
|
|
|
import {OrganizationApi, OrganizationVO} from "@/api/mes/organization";
|
|
|
|
import {OrganizationApi, OrganizationVO} from "@/api/mes/organization";
|
|
|
|
import * as UserApi from "@/api/system/user";
|
|
|
|
import * as UserApi from "@/api/system/user";
|
|
|
|
import {ProductApi, ProductVO} from "@/api/erp/product/product";
|
|
|
|
import {ProductApi, ProductVO} from "@/api/erp/product/product";
|
|
|
|
import {OrgWorkerApi} from "@/api/mes/orgworker";
|
|
|
|
import {OrgWorkerApi, OrgWorkerVO} from "@/api/mes/orgworker";
|
|
|
|
|
|
|
|
import {PlanApi} from "@/api/mes/plan";
|
|
|
|
|
|
|
|
import {formatToDate, formatToDateTime} from "@/utils/dateUtil";
|
|
|
|
|
|
|
|
import {WorkTeamApi} from "@/api/mes/workteam";
|
|
|
|
|
|
|
|
|
|
|
|
/** 生产报工明细 表单 */
|
|
|
|
/** 生产报工明细 表单 */
|
|
|
|
defineOptions({ name: 'ProduceReportDetailForm' })
|
|
|
|
defineOptions({ name: 'ProduceReportDetailForm' })
|
|
|
|
@ -159,9 +172,9 @@ defineOptions({ name: 'ProduceReportDetailForm' })
|
|
|
|
const { t } = useI18n() // 国际化
|
|
|
|
const { t } = useI18n() // 国际化
|
|
|
|
const message = useMessage() // 消息弹窗
|
|
|
|
const message = useMessage() // 消息弹窗
|
|
|
|
const userList = ref<UserApi.UserVO[]>([]) // 用户列表
|
|
|
|
const userList = ref<UserApi.UserVO[]>([]) // 用户列表
|
|
|
|
const organizationTree = ref() // 树形结构
|
|
|
|
|
|
|
|
const productList = ref<ProductVO[]>([]) // 产品列表
|
|
|
|
const productList = ref<ProductVO[]>([]) // 产品列表
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
const dialogVisible = ref(false) // 弹窗的是否展示
|
|
|
|
const dialogVisible = ref(false) // 弹窗的是否展示
|
|
|
|
const dialogTitle = ref('') // 弹窗的标题
|
|
|
|
const dialogTitle = ref('') // 弹窗的标题
|
|
|
|
const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
|
|
|
|
const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
|
|
|
|
@ -187,6 +200,8 @@ const formData = ref({
|
|
|
|
reportDate: undefined,
|
|
|
|
reportDate: undefined,
|
|
|
|
reportTime: undefined,
|
|
|
|
reportTime: undefined,
|
|
|
|
reportStatus: undefined,
|
|
|
|
reportStatus: undefined,
|
|
|
|
|
|
|
|
reportDateString: undefined,
|
|
|
|
|
|
|
|
reportType: undefined
|
|
|
|
})
|
|
|
|
})
|
|
|
|
const formRules = reactive({
|
|
|
|
const formRules = reactive({
|
|
|
|
reportDate: [{ required: true, message: '日期不能为空', trigger: 'blur' }],
|
|
|
|
reportDate: [{ required: true, message: '日期不能为空', trigger: 'blur' }],
|
|
|
|
@ -197,7 +212,7 @@ const formRules = reactive({
|
|
|
|
orgType: [{ required: true, message: '工序不能为空', trigger: 'blur' }],
|
|
|
|
orgType: [{ required: true, message: '工序不能为空', trigger: 'blur' }],
|
|
|
|
})
|
|
|
|
})
|
|
|
|
const formRef = ref() // 表单 Ref
|
|
|
|
const formRef = ref() // 表单 Ref
|
|
|
|
const isDisable = ref(false)
|
|
|
|
|
|
|
|
const isDisableUpdate = ref(false)
|
|
|
|
const isDisableUpdate = ref(false)
|
|
|
|
/** 打开弹窗 */
|
|
|
|
/** 打开弹窗 */
|
|
|
|
const open = async (type: string, id?: number) => {
|
|
|
|
const open = async (type: string, id?: number) => {
|
|
|
|
@ -207,43 +222,46 @@ const open = async (type: string, id?: number) => {
|
|
|
|
resetForm()
|
|
|
|
resetForm()
|
|
|
|
formData.value.reportDate = getCurrentDate()
|
|
|
|
formData.value.reportDate = getCurrentDate()
|
|
|
|
formData.value.groupType = 1
|
|
|
|
formData.value.groupType = 1
|
|
|
|
|
|
|
|
formData.value.orgType = 'zhijiang'
|
|
|
|
|
|
|
|
warningInfo.value = ''
|
|
|
|
|
|
|
|
isDisableUpdate.value = false
|
|
|
|
// 修改时，设置数据
|
|
|
|
// 修改时，设置数据
|
|
|
|
if (id) {
|
|
|
|
if (id) {
|
|
|
|
formLoading.value = true
|
|
|
|
formLoading.value = true
|
|
|
|
try {
|
|
|
|
try {
|
|
|
|
formData.value = await ProduceReportDetailApi.getProduceReportDetail(id)
|
|
|
|
formData.value = await ProduceReportDetailApi.getProduceReportDetail(id)
|
|
|
|
|
|
|
|
formData.value.reportDate = formatToDateTime(new Date(formData.value.reportDate))
|
|
|
|
} finally {
|
|
|
|
} finally {
|
|
|
|
formLoading.value = false
|
|
|
|
formLoading.value = false
|
|
|
|
}
|
|
|
|
}
|
|
|
|
isDisableUpdate.value=true;
|
|
|
|
isDisableUpdate.value=true;
|
|
|
|
isDisable.value = true;
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
await getOrganizationTree()
|
|
|
|
await changeDate()
|
|
|
|
productList.value = await ProductApi.getItemSimpleList()
|
|
|
|
|
|
|
|
if(type == 'replace'){
|
|
|
|
productList.value = await PlanApi.getStartAndFinishPlanProduct()
|
|
|
|
isDisable.value = false
|
|
|
|
if(productList.value.length ==1)
|
|
|
|
userList.value = await OrgWorkerApi.getPersonalUser()
|
|
|
|
formData.value.productId = productList.value[0].id
|
|
|
|
|
|
|
|
if(type === 'replace'){
|
|
|
|
|
|
|
|
dialogTitle.value = "代报工"
|
|
|
|
|
|
|
|
formData.value.reportType = '代报工'
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if(type == 'create'){
|
|
|
|
else if(type === 'update'){
|
|
|
|
userList.value = await OrgWorkerApi.getOtherPersonalUser()
|
|
|
|
dialogTitle.value = "编辑代报工"
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// 加载用户列表
|
|
|
|
|
|
|
|
console.log(userList.value)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
defineExpose({ open }) // 提供 open 方法，用于打开弹窗
|
|
|
|
defineExpose({ open }) // 提供 open 方法，用于打开弹窗
|
|
|
|
|
|
|
|
|
|
|
|
/** 提交表单 */
|
|
|
|
/** 提交表单 */
|
|
|
|
const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
|
|
|
|
const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
|
|
|
|
const submitForm = async () => {
|
|
|
|
const submitForm = async (reportType?:string) => {
|
|
|
|
// 校验表单
|
|
|
|
// 校验表单
|
|
|
|
await formRef.value.validate()
|
|
|
|
await formRef.value.validate()
|
|
|
|
// 提交请求
|
|
|
|
// 提交请求
|
|
|
|
formLoading.value = true
|
|
|
|
formLoading.value = true
|
|
|
|
try {
|
|
|
|
try {
|
|
|
|
|
|
|
|
formData.value.reportDateString = formData.value.reportDate
|
|
|
|
const data = formData.value as unknown as ProduceReportDetailVO
|
|
|
|
const data = formData.value as unknown as ProduceReportDetailVO
|
|
|
|
if (formType.value === 'create') {
|
|
|
|
if (formType.value === 'replace') {
|
|
|
|
await ProduceReportDetailApi.createProduceReportDetail(data)
|
|
|
|
await ProduceReportDetailApi.createProduceReportDetail(data)
|
|
|
|
message.success(t('common.createSuccess'))
|
|
|
|
message.success(t('common.createSuccess'))
|
|
|
|
} else {
|
|
|
|
} else {
|
|
|
|
@ -282,15 +300,6 @@ const resetForm = () => {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
formRef.value?.resetFields()
|
|
|
|
formRef.value?.resetFields()
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/** 获得产线工位树 */
|
|
|
|
|
|
|
|
const getOrganizationTree = async () => {
|
|
|
|
|
|
|
|
organizationTree.value = []
|
|
|
|
|
|
|
|
const data = await OrganizationApi.getOrganizationList()
|
|
|
|
|
|
|
|
const root: Tree = { id: 0, name: 'ALL', children: [] }
|
|
|
|
|
|
|
|
root.children = handleTree(data, 'id', 'parentId')
|
|
|
|
|
|
|
|
organizationTree.value.push(root)
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
const getCurrentDate = () =>{
|
|
|
|
const getCurrentDate = () =>{
|
|
|
|
let now = new Date();
|
|
|
|
let now = new Date();
|
|
|
|
let year = now.getFullYear();
|
|
|
|
let year = now.getFullYear();
|
|
|
|
@ -300,22 +309,46 @@ const getCurrentDate = () =>{
|
|
|
|
if(day<10)day = '0'+day;
|
|
|
|
if(day<10)day = '0'+day;
|
|
|
|
return year + "-" + month + "-" + day +" 00:00:00";
|
|
|
|
return year + "-" + month + "-" + day +" 00:00:00";
|
|
|
|
}
|
|
|
|
}
|
|
|
|
const workOrgList = ref<OrganizationVO[]>([]) // 工位列表
|
|
|
|
|
|
|
|
|
|
|
|
const warningInfo = ref()
|
|
|
|
|
|
|
|
const orgWorkerList = ref<OrgWorkerVO[]>([]) // 用户列表
|
|
|
|
//更改报工日期时查询用户在该日期绑定的工位信息
|
|
|
|
//更改报工日期时查询用户在该日期绑定的工位信息
|
|
|
|
const changeDate = async () =>{
|
|
|
|
const changeDate = async () =>{
|
|
|
|
if(formData.value.reportDate && formData.value.groupType && formData.value.orgType){
|
|
|
|
if(formData.value.reportDate && formData.value.groupType && formData.value.orgType){
|
|
|
|
if(formType.value=='replace'){
|
|
|
|
formData.value.userId = null
|
|
|
|
workOrgList.value = await OrgWorkerApi.getOrgWorkerList2(formData.value)
|
|
|
|
formData.value.orgId = null
|
|
|
|
if(workOrgList.value && workOrgList.value.length>0){
|
|
|
|
userList.value = await WorkTeamApi.getUserList(formData.value.orgType, formData.value.groupType)
|
|
|
|
formData.value.orgType = workOrgList.value[0].orgType
|
|
|
|
if(userList.value && userList.value.length>0){
|
|
|
|
formData.value.orgId = workOrgList.value[0].id
|
|
|
|
formData.value.userId = userList.value[0].id
|
|
|
|
}
|
|
|
|
orgWorkerList.value = await OrgWorkerApi.getOrgWorkerList2(formData.value)
|
|
|
|
else{
|
|
|
|
if(orgWorkerList.value && orgWorkerList.value.length>0){
|
|
|
|
message.error('未查询到用户的工位安排信息！请联系组长或主管安排工位！')
|
|
|
|
formData.value.orgId = orgWorkerList.value[0].orgId
|
|
|
|
}
|
|
|
|
warningInfo.value=''
|
|
|
|
}else{
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if(!formData.value.userId || !formData.value.orgId){
|
|
|
|
|
|
|
|
warningInfo.value = '该条件下未查询到工位安排信息！'
|
|
|
|
|
|
|
|
message.error(warningInfo.value)
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
//更改报工日期时查询用户在该日期绑定的工位信息
|
|
|
|
|
|
|
|
const changeDateUser = async () =>{
|
|
|
|
|
|
|
|
if(formData.value.reportDate && formData.value.groupType
|
|
|
|
|
|
|
|
&& formData.value.orgType &&formData.value.userId){
|
|
|
|
|
|
|
|
orgWorkerList.value = await OrgWorkerApi.getOrgWorkerList2(formData.value)
|
|
|
|
|
|
|
|
if(orgWorkerList.value && orgWorkerList.value.length>0){
|
|
|
|
|
|
|
|
formData.value.orgId = orgWorkerList.value[0].orgId
|
|
|
|
|
|
|
|
warningInfo.value=''
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
else {
|
|
|
|
|
|
|
|
warningInfo.value = '该条件下未查询到工位安排信息！'
|
|
|
|
|
|
|
|
message.error(warningInfo.value)
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
const numberChange = async () =>{
|
|
|
|
|
|
|
|
formData.value.totalNumber = formData.value.qualityNumber+formData.value.wasteNumber
|
|
|
|
|
|
|
|
formData.value.qualityRate = formData.value.qualityNumber/formData.value.totalNumber * 100
|
|
|
|
|
|
|
|
}
|
|
|
|
</script>
|
|
|
|
</script>
|
|
|
|
|
chenshuichuan
2 years ago