fix woker

main
chenshuichuan 2 years ago
parent 8d8a7f29cf
commit d26149b897

@ -6,6 +6,8 @@ export interface WorkTeamVO {
teamName: string // 班组名称
teamLeaderId: number // 组长ID
teamType: string // 工序类型
startTime: Date
endTime: Date
remark: string // 备注
isEnable: boolean // 是否启用
}

@ -250,6 +250,7 @@ export enum DICT_TYPE {
MES_ENERGY_DEVICE_TYPE = "mes_energy_device_type",
MES_MAINTAIN_TYPE = "mes_maintain_type",
MES_MAINTAIN_TIME_UNIT = "mes_maintain_time_unit",
MES_PROGRESS_TYPE = "mes_progress_type",
//====iot
IOT_SIEMENS_TYPE = "iot_siemens_type",
IOT_MODBUS_TYPE = "iot_modbus_type",

@ -36,6 +36,7 @@
<el-tab-pane label="所有" name="" />
<el-tab-pane label="白班" name="1" />
<el-tab-pane label="夜班" name="2" />
<el-tab-pane label="长白班" name="3" />
</el-tabs>
<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
<el-table-column

@ -4,7 +4,7 @@
<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
<el-table-column label="工序" align="center" prop="orgType" >
<template #default="scope">
<dict-tag :type="DICT_TYPE.MES_ORG_TYPE" :value="scope.row.orgType" />
<dict-tag :type="DICT_TYPE.MES_PROGRESS_TYPE" :value="scope.row.orgType" />
</template>
</el-table-column>
<el-table-column label="完成数量" align="center" prop="totalQualityNumber" width="80px"/>

@ -64,6 +64,13 @@
<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="openViewDayFormRefForm('create')"
>
<Icon icon="ep:document-checked" class="mr-5px" />未报工清单
</el-button>
<el-button
type="warning"
plain
@ -155,7 +162,7 @@
</el-button>
<el-button
link
v-if="scope.row.reportStatus === 1"
v-if="scope.row.reportStatus === 1 || scope.row.reportStatus === 3"
type="success"
@click="updateStatus(scope.row.id,2,'通过')"
>
@ -201,9 +208,11 @@
<!-- 表单弹窗添加/修改 -->
<ProduceReportForm ref="formRef" @success="getList" />
<!-- 代报工弹窗添加/修改 -->
<AdminReplaceForm ref="replaceFormRef" @success="getList" />
<!-- 未报工清单弹窗添加/修改 -->
<AdminViewDayWorkerReport ref="viewDayFormRef" />
</template>
<script setup lang="ts">
@ -332,4 +341,10 @@ const updateStatus = async (id:number, status:number, type:string) => {
exportLoading.value = false
}
}
/** 未报工清单 */
const viewDayFormRef = ref()
const openViewDayFormRefForm = (type: string, id?: number) => {
viewDayFormRef.value.open(type, id)
}
</script>

@ -0,0 +1,246 @@
<template>
<Dialog :title="dialogTitle" v-model="dialogVisible" width="1400px">
<el-row>
<el-col :span="8">
<el-form-item label="工作日期" prop="workDate">
<el-date-picker
v-model="queryParams.workDate"
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-160px"
/>
</el-form-item>
</el-col>
<el-col :span="2">
<el-text>&nbsp;&nbsp;&nbsp;</el-text>
</el-col>
<el-col :span="8">
<el-form-item label="班别" prop="groupType">
<el-select
v-model="queryParams.groupType"
placeholder="请选择班别"
clearable
@change="handleQuery"
class="!w-180px"
>
<el-option
v-for="dict in getIntDictOptions(DICT_TYPE.MES_GROUP_TYPE)"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item>
<el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="10">
<ContentWrap>
<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
<el-table-column
label="工作日期"
align="center"
prop="workDate"
:formatter="dateFormatter2"
width="140px"
/>
<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" sortable/>
<el-table-column label="操作" align="center">
<template #default="scope">
<el-button
link
type="danger"
@click="handleDelete(scope.row.id)"
v-hasPermi="['mes:org-worker: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>
</el-col>
<el-col :span="14">
<!-- 列表 -->
<ContentWrap>
<el-table v-loading="loading" :data="listReport" :stripe="true" :show-overflow-tooltip="true">
<!-- 子表的列表 -->
<el-table-column type="expand">
<template #default="scope">
<el-tabs model-value="produceReportDetail">
<el-tab-pane label="生产报工明细" name="produceReportDetail">
<ProduceReportDetailList :report-id="scope.row.id" />
</el-tab-pane>
</el-tabs>
</template>
</el-table-column>
<el-table-column
label="报工日期"
align="center"
prop="reportDate"
:formatter="dateFormatter2"
width="130px"
/>
<el-table-column label="工位" align="center" prop="orgName" sortable/>
<el-table-column label="工人" align="center" prop="userName" width="130px" 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" fixed="right" prop="reportStatus">
<template #default="scope">
<dict-tag :type="DICT_TYPE.MES_RECORD_STATUS" :value="scope.row.reportStatus" />
</template>
</el-table-column>
</el-table>
<!-- 分页 -->
<Pagination
:total="total"
v-model:page="queryParams.pageNo"
v-model:limit="queryParams.pageSize"
@pagination="getListReport"
/>
</ContentWrap>
</el-col>
</el-row>
<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 {useUserStore} from "@/store/modules/user";
import {dateFormatter, dateFormatter2} from "@/utils/formatTime";
import {DICT_TYPE, getIntDictOptions} from "@/utils/dict";
import {OrgWorkerApi, OrgWorkerVO} from "@/api/mes/orgworker";
import ProduceReportDetailList
from "@/views/mes/producereport/components/ProduceReportDetailList.vue";
import {ProduceReportApi, ProduceReportVO} from "@/api/mes/producereport";
/** 生产报工单 表单 */
defineOptions({ name: 'AdminViewDayWorkerReport' })
const { t } = useI18n() //
const message = useMessage() //
const userStore = useUserStore()
const dialogVisible = ref(false) //
const dialogTitle = ref('') //
const listReport = ref<ProduceReportVO[]>([]) //
const totalReport = ref(0) //
/** 打开弹窗 */
const open = async (type: string, id?: number) => {
dialogVisible.value = true
dialogTitle.value = '未报工清单'
queryParams.workDate=[getCurrentDate() +" 00:00:00",getCurrentDate() +" 23:59:59"]
await getList()
await getListReport()
}
defineExpose({ open }) // open
/** 提交表单 */
const emit = defineEmits(['success']) // success
const submitForm = async () => {
}
const loading = ref(true) //
const list = ref<OrgWorkerVO[]>([]) //
const total = ref(0) //
const queryParams = reactive({
pageNo: 1,
pageSize: 10,
orgId: undefined,
workDate: [],
reportDate: [],
groupType: undefined,
orgType: undefined,
workerId: undefined,
reportId: undefined,
createTime: []
})
const queryFormRef = ref() //
const exportLoading = ref(false) //
/** 搜索按钮操作 */
const handleQuery = () => {
queryParams.pageNo = 1
getList()
getListReport()
}
/** 查询列表 */
const getList = async () => {
loading.value = true
try {
const data = await OrgWorkerApi.getOrgWorkerPage(queryParams)
list.value = data.list
total.value = data.total
} finally {
loading.value = false
}
}
/** 删除按钮操作 */
const handleDelete = async (id: number) => {
try {
//
await message.delConfirm()
//
await OrgWorkerApi.deleteOrgWorker(id)
message.success(t('common.delSuccess'))
//
await getList()
} catch {}
}
/** 查询列表 */
const getListReport = async () => {
loading.value = true
try {
queryParams.reportDate = queryParams.workDate
const data = await ProduceReportApi.getProduceReportPage(queryParams)
listReport.value = data.list
totalReport.value = data.total
} finally {
loading.value = false
}
}
const getCurrentDate = () =>{
let now = new Date();
let year = now.getFullYear();
let month = now.getMonth() + 1;
if(month<10){month = '0'+month}
let day = now.getDate();
if(day<10)day = '0'+day;
return year + "-" + month + "-" + day;
}
</script>

@ -32,6 +32,16 @@
</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="工作时间" prop="工作时间">
<el-time-picker
v-model="formData.dateRange"
is-range
value-format="x"
range-separator="至"
start-placeholder="开始时间"
end-placeholder="结束时间"
/>
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input v-model="formData.remark" placeholder="请输入备注" />
</el-form-item>
@ -73,9 +83,13 @@ const formData = ref({
teamLeaderId: undefined,
teamType: undefined,
groupType: undefined,
startTime: undefined,
endTime: undefined,
remark: undefined,
isEnable: undefined,
dateRange:[]
})
const formRules = reactive({
teamType: [{ required: true, message: '工序类型不能为空', trigger: 'blur' }],
groupType: [{ required: true, message: '班组类型不能为空', trigger: 'blur' }],
@ -93,11 +107,13 @@ const open = async (type: string, id?: number) => {
formData.value.groupType = '1'
formData.value.teamType = 'chengxing'
formData.value.isEnable = true
formData.value.dateRange=[new Date(), new Date()]
//
if (id) {
formLoading.value = true
try {
formData.value = await WorkTeamApi.getWorkTeam(id)
formData.value.dateRange = [formData.value.startTime, formData.value.endTime]
} finally {
formLoading.value = false
}
@ -113,6 +129,8 @@ const submitForm = async () => {
//
formLoading.value = true
try {
formData.value.startTime = formData.value.dateRange[0]
formData.value.endTime = formData.value.dateRange[1]
const data = formData.value as unknown as WorkTeamVO
if (formType.value === 'create') {
await WorkTeamApi.createWorkTeam(data)

@ -90,6 +90,11 @@
<dict-tag :type="DICT_TYPE.MES_GROUP_TYPE" :value="scope.row.groupType" />
</template>
</el-table-column>
<el-table-column label="工作时间" align="center" prop="startTime">
<template #default="scope">
<el-text>{{getHour(scope.row.startTime)+'-'+getHour(scope.row.endTime)}}</el-text>
</template>
</el-table-column>
<el-table-column label="工序类型" align="center" prop="teamType" sortable>
<template #default="scope">
<dict-tag :type="DICT_TYPE.MES_ORG_TYPE" :value="scope.row.teamType" />
@ -255,4 +260,16 @@ const handleTabClick = (tab: TabsPaneContext) => {
queryParams.groupType = tab.paneName
handleQuery()
}
const getHour = (timeStamp) =>{
let now = new Date(timeStamp);
let hours = now.getHours();
let minutes = now.getMinutes();
let seconds = now.getSeconds();
if(hours<10)hours = '0'+hours;
if(minutes<10)minutes = '0'+minutes;
if(seconds<10)seconds = '0'+seconds;
return hours+":"+minutes+":"+seconds;
}
</script>

Loading…
Cancel
Save