yunxi
/
mes-majoys
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

生产进度统计新增搜索条件

Browse Source
dev
qiuhongwu 4 months ago
parent a64255276f
commit 618f68d852
1 changed files with 153 additions and 25 deletions
Show Stats Download Patch File Download Diff File

178
mes-ui/mes-ui-admin-vue3/src/views/biz/plan/planSchedule.vue
Unescape View File

@ -5,23 +5,85 @@
</template>
<ContentWrap class="borderxx">
<!-- 搜索工作栏 -->
<el-form class="-mb-15px" :model="queryParams" ref="queryFormRef" :inline="true" label-width="130px">
<el-form
class="-mb-15px"
:model="queryParams"
ref="queryFormRef"
:inline="true"
label-width="130px"
>
<el-form-item label="生产订单号" prop="projectCode">
<el-input v-model="queryParams.projectCode" placeholder="生产订单号" clearable @keyup.enter="handleQuery" class="!w-250px" />
<el-input
v-model="queryParams.projectCode"
placeholder="生产订单号"
clearable
@keyup.enter="handleQuery"
class="!w-250px"
/>
</el-form-item>
<el-form-item label="销售订单号" prop="externalCode">
<el-input v-model="queryParams.externalCode" placeholder="销售订单号" clearable @keyup.enter="handleQuery" class="!w-250px" />
<el-input
v-model="queryParams.externalCode"
placeholder="销售订单号"
clearable
@keyup.enter="handleQuery"
class="!w-250px"
/>
</el-form-item>
<el-form-item label="生产计划单号" prop="planNo">
<el-input v-model="queryParams.planNo" placeholder="生产计划单号" clearable @keyup.enter="handleQuery" class="!w-250px" />
<el-input
v-model="queryParams.planNo"
placeholder="生产计划单号"
clearable
@keyup.enter="handleQuery"
class="!w-250px"
/>
</el-form-item>
<el-form-item label="产品编码/名称" prop="projectSubName">
<el-input v-model="queryParams.projectSubName" placeholder="产品编码/名称" clearable @keyup.enter="handleQuery" class="!w-250px" />
<el-input
v-model="queryParams.projectSubName"
placeholder="产品编码/名称"
clearable
@keyup.enter="handleQuery"
class="!w-250px"
/>
</el-form-item>
<el-form-item label="规格/型号" prop="spec">
<el-input v-model="queryParams.spec" placeholder="规格/型号" clearable @keyup.enter="handleQuery" class="!w-250px" />
<el-input
v-model="queryParams.spec"
placeholder="规格/型号"
clearable
@keyup.enter="handleQuery"
class="!w-250px"
/>
</el-form-item>
<el-form-item style="margin-left:15px">
<el-form-item label="生产车间" prop="workshopId">
<WorkshopSelect
v-model="queryParams.workshopId"
class="!w-240px"
@update:newValue="handleSelectedWorkshop"
@keyup.enter="handleQuery"
/>
</el-form-item>
<el-form-item label="报工人" prop="reportUserName">
<el-input
v-model="queryParams.reportUserName"
placeholder="请输入报工人"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="工序名称" prop="procedureName">
<el-input
v-model="queryParams.procedureName"
placeholder="请输入工序名称"
clearable
@keyup.enter="handleQuery"
class="!w-250px"
/>
</el-form-item>
<el-form-item style="margin-left: 15px">
<el-button @click="handleQuery" type="primary">
<Icon icon="ep:search" class="mr-5px" /> 查询
</el-button>
@ -34,12 +96,30 @@
<!-- 列表 -->
<ContentWrap>
<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true" class="hl-table">
<el-table
v-loading="loading"
:data="list"
:stripe="true"
:show-overflow-tooltip="true"
class="hl-table"
>
<el-table-column type="index" min-width="70" fixed label="序号" align="center" />
<el-table-column label="生产订单号" fixed align="center" prop="projectCode" min-width="210" />
<el-table-column label="销售订单号" fixed align="center" prop="externalCode" min-width="210" />
<el-table-column label="生产计划单号" align="center" prop="planNo" min-width="150" />
<el-table-column label="生产状态" align="center" prop="status" min-width="120">
<el-table-column
label="生产订单号"
fixed
align="center"
prop="projectCode"
min-width="210"
/>
<el-table-column
label="销售订单号"
fixed
align="center"
prop="externalCode"
min-width="210"
/>
<el-table-column label="生产计划单号" align="center" prop="planNo" min-width="150" />
<el-table-column label="生产状态" align="center" prop="status" min-width="120">
<template #default="scope">
<dict-tag :type="DICT_TYPE.BIZ_PROJECT_PLAN_STATUS" :value="scope.row.status" />
</template>
@ -53,36 +133,77 @@
{{ scope.row.unit }}
</template>
</el-table-column>
<el-table-column label="生产起止日期" align="center" prop="projectStartTime" min-width="220">
<el-table-column
label="生产起止日期"
align="center"
prop="projectStartTime"
min-width="220"
>
<template #default="scope">
{{
formatDate(scope.row.projectStartTime, 'YYYY-MM-DD') + "~" + formatDate(scope.row.projectEndTime, 'YYYY-MM-DD')
formatDate(scope.row.projectStartTime, 'YYYY-MM-DD') +
'~' +
formatDate(scope.row.projectEndTime, 'YYYY-MM-DD')
}}
</template>
</el-table-column>
<el-table-column label="所属车间" align="center" prop="workshopName" min-width="150" />
<el-table-column label="工序名称" align="center" prop="procedureName" min-width="120" />
<el-table-column label="报工人" align="center" prop="reportUserName" min-width="120" />
<el-table-column label="预计工时" fixed="right" align="center" prop="workTime" min-width="110" />
<el-table-column label="派工数量" fixed="right" align="center" prop="deliverAmount" min-width="110" />
<el-table-column label="报工工时" fixed="right" align="center" prop="reportTime" min-width="110" />
<el-table-column label="报工数量" fixed="right" align="center" prop="reportAmount" min-width="110" />
<el-table-column label="完成标志" fixed="right" align="center" prop="isCompleted" min-width="110">
<el-table-column label="工序名称" align="center" prop="procedureName" min-width="120" />
<el-table-column label="报工人" align="center" prop="reportUserName" min-width="120" />
<el-table-column
label="预计工时"
fixed="right"
align="center"
prop="workTime"
min-width="110"
/>
<el-table-column
label="派工数量"
fixed="right"
align="center"
prop="deliverAmount"
min-width="110"
/>
<el-table-column
label="报工工时"
fixed="right"
align="center"
prop="reportTime"
min-width="110"
/>
<el-table-column
label="报工数量"
fixed="right"
align="center"
prop="reportAmount"
min-width="110"
/>
<el-table-column
label="完成标志"
fixed="right"
align="center"
prop="isCompleted"
min-width="110"
>
<template #default="scope">
<dict-tag :type="DICT_TYPE.BIZ_COMMON_IS_OR_NOT" :value="scope.row.isCompleted" />
</template>
</el-table-column>
</el-table>
<!-- 分页 -->
<Pagination :total="total" v-model:page="queryParams.pageNo" v-model:limit="queryParams.pageSize" @pagination="getList" />
<Pagination
:total="total"
v-model:page="queryParams.pageNo"
v-model:limit="queryParams.pageSize"
@pagination="getList"
/>
</ContentWrap>
</el-card>
</template>
<script setup lang="ts">
import { getIntDictOptions, getStrDictOptions, DICT_TYPE } from '@/utils/dict'
import WorkshopSelect from '@/views/biz/hlvuestyle/workshopSelect.vue'
import { formatDate } from '@/utils/formatTime'
import * as PlanApi from '@/api/biz/plan'
@ -103,7 +224,10 @@ const queryParams = reactive({
projectSubCode: undefined,
projectSubName: undefined,
spec: undefined,
owner: undefined
owner: undefined,
workshopId: undefined,
reportUserName: undefined,
procedureName: undefined
})
const queryFormRef = ref() // 搜索的表单
@ -136,6 +260,10 @@ onMounted(async () => {
//列表数据
await getList()
})
//接收车间传递的数据
const handleSelectedWorkshop = (newValue: any) => {
queryParams.workshopId = newValue?.id
}
</script>
<style scoped>
.el-dropdown-link {

Write Preview
Loading…
Cancel
Save