|
@@ -3,7 +3,7 @@
|
|
|
<!-- 左侧区域 -->
|
|
|
<section class="list-part-container" style="flex: 3">
|
|
|
<!-- 搜索区 -->
|
|
|
- <el-form class="list-search-container" :model="queryDayworkParams" ref="queryRef" :inline="true" style="margin-right: 0px;" >
|
|
|
+ <el-form class="list-search-container" :model="queryDayworkParams" ref="queryRef" :inline="true" style="margin-right: 0px;">
|
|
|
<el-form-item class="section-title" label="生产批次" />
|
|
|
<el-form-item label="生产计划单号:">
|
|
|
<el-input placeholder="请输入生产计划单号/批次号" v-model.trim="queryDayworkParams.productionPlanNo" @keyup.enter="handleQuery" @keydown.enter.prevent clearable style="width: 200px" />
|
|
@@ -17,7 +17,7 @@
|
|
|
<el-form-item class="section-title" label="请选择当前工段:">
|
|
|
<el-select-v2 v-model="queryDayworkParams.deptId" filterable :options="deptList" placeholder="请选择工段" style="width: 140px" @change="handleDeptChange" />
|
|
|
</el-form-item>
|
|
|
- <el-form-item style="margin-left: 0;" >
|
|
|
+ <el-form-item style="margin-left: 0;">
|
|
|
<el-button type="info" icon="Search" @click="handleQuery">搜索 </el-button>
|
|
|
</el-form-item>
|
|
|
</el-form>
|
|
@@ -47,8 +47,8 @@
|
|
|
<section class="list-part-container" style="flex: 2">
|
|
|
<el-form class="list-search-container" :inline="true">
|
|
|
<el-form-item class="section-title" label="报工信息" />
|
|
|
- <el-form-item class="section-title" label="请选择工序:" prop="technologicalProcessDetailId">
|
|
|
- <el-select-v2 v-model="queryItemParams.technologicalProcessDetailId" clearable :options="processList" placeholder="请选择工序" style="width: 100%" @change="handleProcessChange" />
|
|
|
+ <el-form-item class="section-title" label="请选择工序:" prop="processId">
|
|
|
+ <el-select-v2 v-model="queryItemParams.processId" clearable :options="processList" placeholder="请选择工序" style="width: 100%" @change="handleProcessChange" />
|
|
|
</el-form-item>
|
|
|
</el-form>
|
|
|
|
|
@@ -70,7 +70,7 @@
|
|
|
</el-table-column>
|
|
|
<el-table-column fixed="right" label="操作" align="center" width="70px">
|
|
|
<template #default="scope">
|
|
|
- <el-button link type="warning" icon="Edit" @click="handleUpdateDayworkItem(scope.row)" >编辑</el-button>
|
|
|
+ <el-button link type="warning" icon="Edit" @click="handleUpdateDayworkItem(scope.row)">编辑</el-button>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
</el-table>
|
|
@@ -79,7 +79,7 @@
|
|
|
<!-- 分页 -->
|
|
|
<pagination v-show="itemTotal > 0" :total="itemTotal" v-model:page="queryItemParams.pageNum" v-model:limit="queryItemParams.pageSize" @pagination="getDayworkItems" />
|
|
|
</section>
|
|
|
- <dayworkItem-form ref="dayworkItemRef" @handleSaveSuccess = "handleGetDayworkItems" />
|
|
|
+ <dayworkItem-form ref="dayworkItemRef" @handleSaveSuccess="handleGetDayworkItems" />
|
|
|
</div>
|
|
|
</template>
|
|
|
|
|
@@ -112,7 +112,7 @@ const itemTotal = ref(0)
|
|
|
/** 查询对象 */
|
|
|
const queryDayworkParams = ref({
|
|
|
productDescription: '',
|
|
|
- deptId:'',
|
|
|
+ deptId: '',
|
|
|
lotCode: '',
|
|
|
pageNum: 1,
|
|
|
pageSize: 10
|
|
@@ -129,12 +129,11 @@ const queryItemParams = ref({
|
|
|
function getList() {
|
|
|
loading.value = true
|
|
|
getDept().then((response) => {
|
|
|
- deptList.value = response.data
|
|
|
+ deptList.value = response.data
|
|
|
if (deptList.value.length > 0) {
|
|
|
queryDayworkParams.value.deptId = deptList.value[0].value
|
|
|
getDayworks()
|
|
|
- }
|
|
|
- else{
|
|
|
+ } else {
|
|
|
dayworkList.value = []
|
|
|
}
|
|
|
})
|
|
@@ -147,12 +146,10 @@ function getDayworks() {
|
|
|
dayworkList.value = res.rows
|
|
|
for (var i = 0; i < dayworkList.value.length; i++) {
|
|
|
let timeStamp = dayworkList.value[i].totalWorkingHours
|
|
|
- let seconds = Math.floor((timeStamp / 1000) % 60);
|
|
|
- let minutes = Math.floor(
|
|
|
- (timeStamp / (1000 * 60)) % 60
|
|
|
- );
|
|
|
- let hours = Math.floor(timeStamp / (1000 * 60 * 60));
|
|
|
- let time = `${hours}小时${minutes}分钟${seconds}秒`;
|
|
|
+ let seconds = Math.floor((timeStamp / 1000) % 60)
|
|
|
+ let minutes = Math.floor((timeStamp / (1000 * 60)) % 60)
|
|
|
+ let hours = Math.floor(timeStamp / (1000 * 60 * 60))
|
|
|
+ let time = `${hours}小时${minutes}分钟${seconds}秒`
|
|
|
dayworkList.value[i].totalWorkingHours = time
|
|
|
}
|
|
|
total.value = res.total
|
|
@@ -169,17 +166,15 @@ function handleGetDayworkItems() {
|
|
|
dayworkList.value = res.rows
|
|
|
for (var i = 0; i < dayworkList.value.length; i++) {
|
|
|
let timeStamp = dayworkList.value[i].totalWorkingHours
|
|
|
- let seconds = Math.floor((timeStamp / 1000) % 60);
|
|
|
- let minutes = Math.floor(
|
|
|
- (timeStamp / (1000 * 60)) % 60
|
|
|
- );
|
|
|
- let hours = Math.floor(timeStamp / (1000 * 60 * 60));
|
|
|
- let time = `${hours}小时${minutes}分钟${seconds}秒`;
|
|
|
+ let seconds = Math.floor((timeStamp / 1000) % 60)
|
|
|
+ let minutes = Math.floor((timeStamp / (1000 * 60)) % 60)
|
|
|
+ let hours = Math.floor(timeStamp / (1000 * 60 * 60))
|
|
|
+ let time = `${hours}小时${minutes}分钟${seconds}秒`
|
|
|
dayworkList.value[i].totalWorkingHours = time
|
|
|
}
|
|
|
total.value = res.total
|
|
|
dayworkLoading.value = false
|
|
|
- if (dayworkList.value.length > 0) {
|
|
|
+ if (dayworkList.value.length > 0) {
|
|
|
for (var i = 0; i < dayworkList.value.length; i++) {
|
|
|
if (dayworkList.value[i].id == currentDaywork.value.id) {
|
|
|
var index = i
|
|
@@ -189,7 +184,6 @@ function handleGetDayworkItems() {
|
|
|
}
|
|
|
proxy.$refs.dayworkTable.setCurrentRow(dayworkList.value[index])
|
|
|
})
|
|
|
-
|
|
|
}
|
|
|
function handleDeptChange() {
|
|
|
getDayworks()
|
|
@@ -197,14 +191,14 @@ function handleDeptChange() {
|
|
|
|
|
|
function handleUpdateDayworkItem(row) {
|
|
|
row.technologicalProcessId = queryItemParams.value.technologicalProcessId
|
|
|
- row.deptId = queryDayworkParams.value.deptId
|
|
|
+ row.deptId = queryDayworkParams.value.deptId
|
|
|
row.productionPlanDetailId = currentDaywork.value.productionPlanDetailId
|
|
|
row.dayworkId = currentDaywork.value.id
|
|
|
row.lotId = currentDaywork.value.lotId
|
|
|
//判断是否是当前工段
|
|
|
- if(row.deptId == currentDaywork.value.deptId) {
|
|
|
+ if (row.deptId == currentDaywork.value.deptId) {
|
|
|
row.currentDept = true
|
|
|
- }else {
|
|
|
+ } else {
|
|
|
row.currentDept = false
|
|
|
}
|
|
|
proxy.$refs.dayworkItemRef.open(row)
|
|
@@ -221,12 +215,10 @@ function getDayworkItems() {
|
|
|
dayworkItemList.value = res.rows
|
|
|
for (var i = 0; i < dayworkItemList.value.length; i++) {
|
|
|
let timeStamp = dayworkItemList.value[i].workingHours
|
|
|
- let seconds = Math.floor((timeStamp / 1000) % 60);
|
|
|
- let minutes = Math.floor(
|
|
|
- (timeStamp / (1000 * 60)) % 60
|
|
|
- );
|
|
|
- let hours = Math.floor(timeStamp / (1000 * 60 * 60));
|
|
|
- let time = `${hours}小时${minutes}分钟${seconds}秒`;
|
|
|
+ let seconds = Math.floor((timeStamp / 1000) % 60)
|
|
|
+ let minutes = Math.floor((timeStamp / (1000 * 60)) % 60)
|
|
|
+ let hours = Math.floor(timeStamp / (1000 * 60 * 60))
|
|
|
+ let time = `${hours}小时${minutes}分钟${seconds}秒`
|
|
|
dayworkItemList.value[i].workingHours = time
|
|
|
}
|
|
|
getProcessList({ technologicalProcessId: queryItemParams.value.technologicalProcessId }).then((res) => {
|
|
@@ -267,6 +259,6 @@ onMounted(() => {
|
|
|
</script>
|
|
|
<style scoped>
|
|
|
.el-form--inline .el-form-item {
|
|
|
- margin-right: 20px;
|
|
|
+ margin-right: 20px;
|
|
|
}
|
|
|
</style>
|