|
@@ -1,7 +1,7 @@
|
|
<template>
|
|
<template>
|
|
<div class="page-container row-container">
|
|
<div class="page-container row-container">
|
|
<!-- 左侧区域 -->
|
|
<!-- 左侧区域 -->
|
|
- <section class="list-part-container" style="flex: 2">
|
|
|
|
|
|
+ <section class="list-part-container" style="flex: 3">
|
|
<!-- 搜索区 -->
|
|
<!-- 搜索区 -->
|
|
<el-form class="list-search-container" :model="queryDayworkParams" ref="queryRef" :inline="true">
|
|
<el-form class="list-search-container" :model="queryDayworkParams" ref="queryRef" :inline="true">
|
|
<el-form-item class="section-title" label="生产批次" />
|
|
<el-form-item class="section-title" label="生产批次" />
|
|
@@ -55,7 +55,7 @@
|
|
/>
|
|
/>
|
|
</section>
|
|
</section>
|
|
<!-- 右侧区域 -->
|
|
<!-- 右侧区域 -->
|
|
- <section class="list-part-container">
|
|
|
|
|
|
+ <section class="list-part-container" style="flex: 2">
|
|
<el-form class="list-search-container" :inline="true">
|
|
<el-form class="list-search-container" :inline="true">
|
|
<el-form-item class="section-title" label="报工信息" />
|
|
<el-form-item class="section-title" label="报工信息" />
|
|
<el-form-item>
|
|
<el-form-item>
|
|
@@ -66,18 +66,13 @@
|
|
<div class="el-table-container">
|
|
<div class="el-table-container">
|
|
<div class="el-table-inner-container">
|
|
<div class="el-table-inner-container">
|
|
<el-table :data="dayworkItemList" v-loading="dayworkItemLoading" height="100%">
|
|
<el-table :data="dayworkItemList" v-loading="dayworkItemLoading" height="100%">
|
|
- <el-table-column label="客户简称" prop="companyAlias" width="160" align="center" />
|
|
|
|
- <el-table-column label="生产计划单号" prop="productionPlanNo" width="100" align="center" />
|
|
|
|
- <el-table-column label="批次号" prop="lotCode" width="100" align="center" />
|
|
|
|
- <el-table-column label="产品描述" prop="productDescription" align="center" />
|
|
|
|
- <el-table-column label="图纸版本" prop="technologyVersion" width="60" align="center" />
|
|
|
|
- <el-table-column label="投产量" prop="productionQuantity" width="60" align="center" />
|
|
|
|
- <el-table-column label="炉号" prop="furnaceNumber" width="60" align="center" />
|
|
|
|
- <el-table-column label="下达日期" prop="createTime" width="100" align="center">
|
|
|
|
- <template #default="scope">
|
|
|
|
- <span>{{ proxy.moment(scope.row.createTime).format('YYYY-MM-DD') }}</span>
|
|
|
|
- </template>
|
|
|
|
- </el-table-column>
|
|
|
|
|
|
+ <el-table-column label="操作者" prop="nickName" width="60" align="center" />
|
|
|
|
+ <el-table-column label="工序" prop="nickName" align="center" />
|
|
|
|
+ <el-table-column label="投产量" prop="productionNum" width="60" align="center" />
|
|
|
|
+ <el-table-column label="合格数" prop="qualifiedNum" width="60" align="center" />
|
|
|
|
+ <el-table-column label="废品数" prop="rejectNum" width="60" align="center" />
|
|
|
|
+ <el-table-column label="开始时间" prop="startTime" width="160" align="center" />
|
|
|
|
+ <el-table-column label="结束时间" prop="endTime" width="160" align="center" />
|
|
</el-table>
|
|
</el-table>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
@@ -94,8 +89,7 @@
|
|
</template>
|
|
</template>
|
|
|
|
|
|
<script setup>
|
|
<script setup>
|
|
-import { listDaywork } from '@/api/business/daywork.js'
|
|
|
|
-import { ref } from 'vue'
|
|
|
|
|
|
+import { listDaywork, listDayworkItem } from '@/api/business/daywork.js'
|
|
const { proxy } = getCurrentInstance()
|
|
const { proxy } = getCurrentInstance()
|
|
|
|
|
|
/** daywork 列表 */
|
|
/** daywork 列表 */
|
|
@@ -118,14 +112,15 @@ const queryDayworkParams = ref({
|
|
pageSize: 10
|
|
pageSize: 10
|
|
})
|
|
})
|
|
const queryItemParams = ref({
|
|
const queryItemParams = ref({
|
|
|
|
+ dayworkId: '0',
|
|
pageNum: 1,
|
|
pageNum: 1,
|
|
pageSize: 10
|
|
pageSize: 10
|
|
})
|
|
})
|
|
|
|
|
|
/*********************** 方法区 ****************************/
|
|
/*********************** 方法区 ****************************/
|
|
|
|
|
|
-/**查询计划明细 */
|
|
|
|
-function getDayworks() {
|
|
|
|
|
|
+/** 查询计划明细 */
|
|
|
|
+const getDayworks = () => {
|
|
dayworkLoading.value = true
|
|
dayworkLoading.value = true
|
|
listDaywork(queryDayworkParams.value).then((res) => {
|
|
listDaywork(queryDayworkParams.value).then((res) => {
|
|
dayworkList.value = res.rows
|
|
dayworkList.value = res.rows
|
|
@@ -137,6 +132,18 @@ function getDayworks() {
|
|
}
|
|
}
|
|
})
|
|
})
|
|
}
|
|
}
|
|
|
|
+
|
|
|
|
+/** 查询报工详情列表 */
|
|
|
|
+const getDayworkItems = () => {
|
|
|
|
+ dayworkItemLoading.value = true
|
|
|
|
+ console.log(queryItemParams.value)
|
|
|
|
+ listDayworkItem(queryItemParams.value).then((res) => {
|
|
|
|
+ dayworkItemList.value = res.rows
|
|
|
|
+ itemTotal.value = res.total
|
|
|
|
+ dayworkItemLoading.value = false
|
|
|
|
+ })
|
|
|
|
+}
|
|
|
|
+
|
|
/** 搜索按钮操作 */
|
|
/** 搜索按钮操作 */
|
|
function handleQuery() {
|
|
function handleQuery() {
|
|
queryDayworkParams.value.pageNum = 1
|
|
queryDayworkParams.value.pageNum = 1
|
|
@@ -147,13 +154,16 @@ function handleQuery() {
|
|
function handleDayworkCurrentChange(row) {
|
|
function handleDayworkCurrentChange(row) {
|
|
if (row) {
|
|
if (row) {
|
|
currentDaywork.value = row
|
|
currentDaywork.value = row
|
|
|
|
+ queryItemParams.value.dayworkId = currentDaywork.value.id
|
|
|
|
+ getDayworkItems()
|
|
} else {
|
|
} else {
|
|
|
|
+ dayworkItemList.value = []
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
/** 刷新 报工信息 按钮操作 */
|
|
/** 刷新 报工信息 按钮操作 */
|
|
const handleQueryDayworkItem = () => {
|
|
const handleQueryDayworkItem = () => {
|
|
- dayworkTable.value.clearSelection()
|
|
|
|
|
|
+ getDayworkItems()
|
|
}
|
|
}
|
|
|
|
|
|
onMounted(() => {
|
|
onMounted(() => {
|