fengyuan_yang
/
boying-vue
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

2025-11-28 

IPQC、FQC、OQC检验单样式调整
master
fengyuan_yang 2 months ago
parent
993cfb9054
commit
7b05a19968
4 changed files with 223 additions and 286 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 98
      src/views/modules/qc/FQCResultEntry.vue
  2. 170
      src/views/modules/qc/IPQCResultEntry.vue
  3. 114
      src/views/modules/qc/IQCResultEntry.vue
  4. 127
      src/views/modules/qc/OQCResultEntry.vue

98
src/views/modules/qc/FQCResultEntry.vue
View File

@ -28,9 +28,9 @@
<!-- 所有查询条件 - 可展开/收起 --> <!-- 所有查询条件 - 可展开/收起 -->
<template v-if="searchExpanded"> <template v-if="searchExpanded">
<!-- 第一行 -->
<!-- 第一行：基础单据信息 -->
<el-row :gutter="16"> <el-row :gutter="16">
<el-col :span="6">
<el-col :span="4">
<el-form-item label="BU"> <el-form-item label="BU">
<el-select v-model="searchData.buNo" placeholder="请选择" clearable> <el-select v-model="searchData.buNo" placeholder="请选择" clearable>
<el-option <el-option
@ -42,37 +42,50 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6">
<el-col :span="5">
<el-form-item label="检验单号"> <el-form-item label="检验单号">
<el-input v-model="searchData.inspectionNo" placeholder="请输入检验单号" clearable>
<i slot="prefix" class="el-input__icon el-icon-document"></i>
</el-input>
<el-input v-model="searchData.inspectionNo" placeholder="请输入检验单号" clearable></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6">
<el-form-item label="物料编码">
<el-input v-model="searchData.partNo" placeholder="请输入物料编码" clearable>
<i slot="prefix" class="el-input__icon el-icon-goods"></i>
</el-input>
<el-col :span="5">
<el-form-item label="工单号">
<el-input v-model="searchData.orderNo" placeholder="请输入工单号" clearable></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6">
<el-form-item label="SKU">
<el-input v-model="searchData.sku" placeholder="请输入SKU" clearable></el-input>
<el-col :span="5">
<el-form-item label="派工单号">
<el-input v-model="searchData.seqNo" placeholder="请输入派工单号" clearable></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<!-- 第二行 -->
<!-- 第二行：物料信息 -->
<el-row :gutter="16"> <el-row :gutter="16">
<el-col :span="6">
<el-col :span="4">
<el-form-item label="物料编码">
<el-input v-model="searchData.partNo" placeholder="请输入物料编码" clearable></el-input>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="物料名称"> <el-form-item label="物料名称">
<el-input v-model="searchData.partDesc" placeholder="请输入物料名称" clearable>
<i slot="prefix" class="el-input__icon el-icon-goods"></i>
</el-input>
<el-input v-model="searchData.partDesc" placeholder="请输入物料名称" clearable></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6">
<el-col :span="5">
<el-form-item label="规格型号">
<el-input v-model="searchData.spec" placeholder="请输入规格型号" clearable></el-input>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="工序">
<el-input v-model="searchData.operationDesc" placeholder="请输入工序" clearable></el-input>
</el-form-item>
</el-col>
</el-row>
<!-- 第三行：检验相关信息 -->
<el-row :gutter="16">
<el-col :span="4">
<el-form-item label="检验结论"> <el-form-item label="检验结论">
<el-select v-model="searchData.inspectionResult" clearable placeholder="请选择检验结论"> <el-select v-model="searchData.inspectionResult" clearable placeholder="请选择检验结论">
<el-option label="合格" value="合格"> <el-option label="合格" value="合格">
@ -84,7 +97,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6">
<el-col :span="5">
<el-form-item label="处置措施"> <el-form-item label="处置措施">
<el-select v-model="searchData.disposalMeasures" clearable placeholder="请选择处置措施"> <el-select v-model="searchData.disposalMeasures" clearable placeholder="请选择处置措施">
<el-option <el-option
@ -96,31 +109,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6">
<el-form-item label="PN">
<el-input v-model="searchData.cinvSourceCode" placeholder="请输入PN" clearable></el-input>
</el-form-item>
</el-col>
</el-row>
<!-- 第三行 -->
<el-row :gutter="16">
<el-col :span="6">
<el-form-item label="工单号">
<el-input v-model="searchData.orderNo" placeholder="请输入工单号" clearable></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="派工单号">
<el-input v-model="searchData.seqNo" placeholder="请输入派工单号" clearable></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="工序">
<el-input v-model="searchData.operationDesc" placeholder="请输入工序" clearable></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-col :span="5">
<el-form-item label="状态"> <el-form-item label="状态">
<el-select v-model="searchData.states" multiple collapse-tags placeholder="请选择状态" class="status-select"> <el-select v-model="searchData.states" multiple collapse-tags placeholder="请选择状态" class="status-select">
<el-option label="未开始" value="未开始"></el-option> <el-option label="未开始" value="未开始"></el-option>
@ -130,11 +119,18 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="5">
<el-form-item label="质检员">
<el-input v-model="searchData.inspectorName" placeholder="请输入质检员姓名" clearable>
<i slot="prefix" class="el-input__icon el-icon-user"></i>
</el-input>
</el-form-item>
</el-col>
</el-row> </el-row>
<!-- 第四行 -->
<!-- 第四行：日期信息 -->
<el-row :gutter="16"> <el-row :gutter="16">
<el-col :span="12">
<el-col :span="9">
<el-form-item label="送检日期"> <el-form-item label="送检日期">
<el-date-picker <el-date-picker
v-model="searchData.startDate2" v-model="searchData.startDate2"
@ -144,7 +140,7 @@
placeholder="开始日期" placeholder="开始日期"
style="width: 44%"> style="width: 44%">
</el-date-picker> </el-date-picker>
<span style="margin: 0 4px; color: #DCDFE6;">~</span>
<span style="margin: 0 6px; color: #DCDFE6;">~</span>
<el-date-picker <el-date-picker
v-model="searchData.endDate2" v-model="searchData.endDate2"
type="datetime" type="datetime"
@ -155,7 +151,7 @@
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12">
<el-col :span="9">
<el-form-item label="检验时间"> <el-form-item label="检验时间">
<el-date-picker <el-date-picker
v-model="searchData.startDate" v-model="searchData.startDate"
@ -165,7 +161,7 @@
placeholder="开始日期" placeholder="开始日期"
style="width: 44%"> style="width: 44%">
</el-date-picker> </el-date-picker>
<span style="margin: 0 4px; color: #DCDFE6;">~</span>
<span style="margin: 0 6px; color: #DCDFE6;">~</span>
<el-date-picker <el-date-picker
v-model="searchData.endDate" v-model="searchData.endDate"
type="datetime" type="datetime"

170
src/views/modules/qc/IPQCResultEntry.vue
View File

@ -28,9 +28,9 @@
<!-- 所有查询条件 - 可展开/收起 --> <!-- 所有查询条件 - 可展开/收起 -->
<template v-if="searchExpanded"> <template v-if="searchExpanded">
<!-- 第一行 -->
<!-- 第一行：基础单据信息 -->
<el-row :gutter="16"> <el-row :gutter="16">
<el-col :span="6">
<el-col :span="4">
<el-form-item label="BU"> <el-form-item label="BU">
<el-select v-model="searchData.buNo" placeholder="请选择" clearable> <el-select v-model="searchData.buNo" placeholder="请选择" clearable>
<el-option <el-option
@ -42,49 +42,22 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6">
<el-col :span="5">
<el-form-item label="检验单号"> <el-form-item label="检验单号">
<el-input v-model="searchData.inspectionNo" placeholder="请输入检验单号" clearable>
<i slot="prefix" class="el-input__icon el-icon-document"></i>
</el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="物料编码">
<el-input v-model="searchData.partNo" placeholder="请输入物料编码" clearable>
<i slot="prefix" class="el-input__icon el-icon-goods"></i>
</el-input>
<el-input v-model="searchData.inspectionNo" placeholder="请输入检验单号" clearable></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6">
<el-form-item label="SKU">
<el-input v-model="searchData.sku" placeholder="请输入SKU" clearable></el-input>
</el-form-item>
</el-col>
</el-row>
<!-- 第二行 -->
<el-row :gutter="16">
<el-col :span="6">
<el-form-item label="物料名称">
<el-input v-model="searchData.partDesc" placeholder="请输入物料名称" clearable>
<i slot="prefix" class="el-input__icon el-icon-goods"></i>
</el-input>
<el-col :span="5">
<el-form-item label="工单号">
<el-input v-model="searchData.orderNo" placeholder="请输入工单号" clearable></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6">
<el-form-item label="检验结论">
<el-select v-model="searchData.inspectionResult" clearable placeholder="请选择检验结论">
<el-option label="合格" value="合格">
<i class="el-icon-success" style="color: #67C23A;"></i> 合格
</el-option>
<el-option label="不合格" value="不合格">
<i class="el-icon-error" style="color: #F56C6C;"></i> 不合格
</el-option>
</el-select>
<el-col :span="5">
<el-form-item label="派工单号">
<el-input v-model="searchData.seqNo" placeholder="请输入派工单号" clearable></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6">
<el-col :span="5">
<el-form-item label="检验类型"> <el-form-item label="检验类型">
<el-select v-model="searchData.inspectionTypeNo" clearable placeholder="请选择检验类型"> <el-select v-model="searchData.inspectionTypeNo" clearable placeholder="请选择检验类型">
<el-option label="IPQC首检" value="首件检"></el-option> <el-option label="IPQC首检" value="首件检"></el-option>
@ -94,23 +67,31 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6">
<el-form-item label="处置措施">
<el-select v-model="searchData.disposalMeasures" clearable placeholder="请选择处置措施">
<el-option
v-for="i in disposalMeasuresOptions"
:key="i.id"
:label="i.disposalMeasures"
:value="i.disposalMeasures">
</el-option>
</el-select>
</el-form-item>
</el-col>
</el-row> </el-row>
<!-- 第三行 -->
<!-- 第二行：物料信息 -->
<el-row :gutter="16"> <el-row :gutter="16">
<el-col :span="6">
<el-col :span="4">
<el-form-item label="物料编码">
<el-input v-model="searchData.partNo" placeholder="请输入物料编码" clearable></el-input>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="物料名称">
<el-input v-model="searchData.partDesc" placeholder="请输入物料名称" clearable></el-input>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="规格型号">
<el-input v-model="searchData.spec" placeholder="请输入规格型号" clearable></el-input>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="工序">
<el-input v-model="searchData.operationDesc" placeholder="请输入工序" clearable></el-input>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="机台"> <el-form-item label="机台">
<el-select v-model="searchData.resourceId" clearable filterable placeholder="请选择机台"> <el-select v-model="searchData.resourceId" clearable filterable placeholder="请选择机台">
<el-option <el-option
@ -122,31 +103,35 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6">
<el-form-item label="PN">
<el-input v-model="searchData.cinvSourceCode" placeholder="请输入PN" clearable></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="工单号">
<el-input v-model="searchData.orderNo" placeholder="请输入工单号" clearable></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="派工单号">
<el-input v-model="searchData.seqNo" placeholder="请输入派工单号" clearable></el-input>
</el-form-item>
</el-col>
</el-row> </el-row>
<!-- 第四行 -->
<!-- 第三行：工序及检验相关信息 -->
<el-row :gutter="16"> <el-row :gutter="16">
<el-col :span="6">
<el-form-item label="工序">
<el-input v-model="searchData.operationDesc" placeholder="请输入工序" clearable></el-input>
<el-col :span="4">
<el-form-item label="检验结论">
<el-select v-model="searchData.inspectionResult" clearable placeholder="请选择检验结论">
<el-option label="合格" value="合格">
<i class="el-icon-success" style="color: #67C23A;"></i> 合格
</el-option>
<el-option label="不合格" value="不合格">
<i class="el-icon-error" style="color: #F56C6C;"></i> 不合格
</el-option>
</el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6">
<el-col :span="5">
<el-form-item label="处置措施">
<el-select v-model="searchData.disposalMeasures" clearable placeholder="请选择处置措施">
<el-option
v-for="i in disposalMeasuresOptions"
:key="i.id"
:label="i.disposalMeasures"
:value="i.disposalMeasures">
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="状态"> <el-form-item label="状态">
<el-select v-model="searchData.states" multiple collapse-tags placeholder="请选择状态" class="status-select"> <el-select v-model="searchData.states" multiple collapse-tags placeholder="请选择状态" class="status-select">
<el-option label="未开始" value="未开始"></el-option> <el-option label="未开始" value="未开始"></el-option>
@ -156,7 +141,17 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12">
<el-col :span="5">
<el-form-item label="质检员">
<el-input v-model="searchData.inspectorName" placeholder="请输入质检员姓名" clearable></el-input>
</el-form-item>
</el-col>
</el-row>
<!-- 第四行：日期信息 -->
<el-row :gutter="16">
<el-col :span="9">
<el-form-item label="送检日期"> <el-form-item label="送检日期">
<el-date-picker <el-date-picker
v-model="searchData.startDate2" v-model="searchData.startDate2"
@ -166,7 +161,7 @@
placeholder="开始日期" placeholder="开始日期"
style="width: 44%"> style="width: 44%">
</el-date-picker> </el-date-picker>
<span style="margin: 0 4px; color: #DCDFE6;">~</span>
<span style="margin: 0 6px; color: #DCDFE6;">~</span>
<el-date-picker <el-date-picker
v-model="searchData.endDate2" v-model="searchData.endDate2"
type="datetime" type="datetime"
@ -177,11 +172,7 @@
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row>
<!-- 第五行 -->
<el-row :gutter="16">
<el-col :span="12">
<el-col :span="9">
<el-form-item label="检验时间"> <el-form-item label="检验时间">
<el-date-picker <el-date-picker
v-model="searchData.startDate" v-model="searchData.startDate"
@ -191,7 +182,7 @@
placeholder="开始日期" placeholder="开始日期"
style="width: 44%"> style="width: 44%">
</el-date-picker> </el-date-picker>
<span style="margin: 0 4px; color: #DCDFE6;">~</span>
<span style="margin: 0 6px; color: #DCDFE6;">~</span>
<el-date-picker <el-date-picker
v-model="searchData.endDate" v-model="searchData.endDate"
type="datetime" type="datetime"
@ -1581,6 +1572,7 @@
limit: 10, limit: 10,
seqNo: '', seqNo: '',
states: ['未开始','待检验'], states: ['未开始','待检验'],
inspectionShift: ''
}, },
pageIndex: 1, pageIndex: 1,
pageSize: 20, pageSize: 20,
@ -1664,24 +1656,6 @@
fixed: '', fixed: '',
columnWidth: 120, columnWidth: 120,
}, },
{
userId: this.$store.state.user.name,
functionId: 301014,
serialNumber: '301014Table1BatchRollNo',
tableId: "301014Table1",
tableName: "IPQC检验记录表",
columnProp: 'batchRollNo',
headerAlign: "center",
align: "center",
columnLabel: '老卷号',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 150,
},
{ {
userId: this.$store.state.user.name, userId: this.$store.state.user.name,
functionId: 301014, functionId: 301014,

114
src/views/modules/qc/IQCResultEntry.vue
View File

@ -28,9 +28,9 @@
<!-- 所有查询条件 - 可展开/收起 --> <!-- 所有查询条件 - 可展开/收起 -->
<template v-if="searchExpanded"> <template v-if="searchExpanded">
<!-- 第一行 -->
<!-- 第一行：基础单据信息 -->
<el-row :gutter="16"> <el-row :gutter="16">
<el-col :span="6">
<el-col :span="4">
<el-form-item label="BU"> <el-form-item label="BU">
<el-select v-model="searchData.buNo" placeholder="请选择" clearable> <el-select v-model="searchData.buNo" placeholder="请选择" clearable>
<el-option <el-option
@ -42,75 +42,69 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6">
<el-col :span="5">
<el-form-item label="检验单号"> <el-form-item label="检验单号">
<el-input v-model="searchData.inspectionNo" placeholder="请输入检验单号" clearable>
<i slot="prefix" class="el-input__icon el-icon-document"></i>
</el-input>
<el-input v-model="searchData.inspectionNo" placeholder="请输入检验单号" clearable></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6">
<el-col :span="5">
<el-form-item label="单据号"> <el-form-item label="单据号">
<el-input v-model="searchData.poOrderNo" placeholder="请输入单据号" clearable>
<i slot="prefix" class="el-input__icon el-icon-document"></i>
</el-input>
<el-input v-model="searchData.poOrderNo" placeholder="请输入单据号" clearable></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6">
<el-col :span="5">
<el-form-item label="单据行号"> <el-form-item label="单据行号">
<el-input v-model="searchData.poItemNo" placeholder="请输入单据行号" clearable></el-input> <el-input v-model="searchData.poItemNo" placeholder="请输入单据行号" clearable></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="5">
<el-form-item label="采购类型">
<el-select v-model="searchData.orderType" clearable placeholder="请选择采购类型">
<el-option label="采购订单" value="采购订单"></el-option>
<el-option label="委外订单" value="委外订单"></el-option>
</el-select>
</el-form-item>
</el-col>
</el-row> </el-row>
<!-- 第二行 -->
<!-- 第二行：物料信息 -->
<el-row :gutter="16"> <el-row :gutter="16">
<el-col :span="6">
<el-col :span="4">
<el-form-item label="物料编码"> <el-form-item label="物料编码">
<el-input v-model="searchData.partNo" placeholder="请输入物料编码" clearable> <el-input v-model="searchData.partNo" placeholder="请输入物料编码" clearable>
<i slot="prefix" class="el-input__icon el-icon-goods"></i>
</el-input> </el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6">
<el-col :span="5">
<el-form-item label="物料名称"> <el-form-item label="物料名称">
<el-input v-model="searchData.partDesc" placeholder="请输入物料名称" clearable>
<i slot="prefix" class="el-input__icon el-icon-goods"></i>
</el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="SKU">
<el-input v-model="searchData.sku" placeholder="请输入SKU" clearable></el-input>
<el-input v-model="searchData.partDesc" placeholder="请输入物料名称" clearable></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6">
<el-form-item label="PN">
<el-input v-model="searchData.cinvSourceCode" placeholder="请输入PN" clearable></el-input>
<el-col :span="5">
<el-form-item label="规格型号">
<el-input v-model="searchData.spec" placeholder="请输入规格型号" clearable></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row>
<!-- 第三行 -->
<el-row :gutter="16">
<el-col :span="6">
<el-col :span="5">
<el-form-item label="物料类别"> <el-form-item label="物料类别">
<el-input v-model="searchData.invdefinetype" placeholder="请输入物料类别" clearable></el-input> <el-input v-model="searchData.invdefinetype" placeholder="请输入物料类别" clearable></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6">
<el-col :span="5">
<el-form-item label="供应商"> <el-form-item label="供应商">
<el-input v-model="searchData.supplierDesc" placeholder="请输入供应商" clearable></el-input> <el-input v-model="searchData.supplierDesc" placeholder="请输入供应商" clearable></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6">
</el-row>
<!-- 第三行：供应商及检验相关信息 -->
<el-row :gutter="16">
<el-col :span="4">
<el-form-item label="质检员"> <el-form-item label="质检员">
<el-input v-model="searchData.inspectorName" placeholder="请输入质检员姓名" clearable>
<i slot="prefix" class="el-input__icon el-icon-user"></i>
</el-input>
<el-input v-model="searchData.inspectorName" placeholder="请输入质检员姓名" clearable></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6">
<el-col :span="5">
<el-form-item label="状态"> <el-form-item label="状态">
<el-select v-model="searchData.states" multiple collapse-tags placeholder="请选择状态" class="status-select"> <el-select v-model="searchData.states" multiple collapse-tags placeholder="请选择状态" class="status-select">
<el-option label="未开始" value="未开始"></el-option> <el-option label="未开始" value="未开始"></el-option>
@ -120,11 +114,16 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row>
<!-- 第四行 -->
<el-row :gutter="16">
<el-col :span="6">
<el-col :span="5">
<el-form-item label="送检类型">
<el-select v-model="searchData.submissionType" clearable placeholder="请选择送检类型">
<el-option label="厂内使用" value="厂内使用"></el-option>
<el-option label="外协使用" value="外协使用"></el-option>
<el-option label="其他" value="其他"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="检验结论"> <el-form-item label="检验结论">
<el-select v-model="searchData.inspectionResult" clearable placeholder="请选择检验结论"> <el-select v-model="searchData.inspectionResult" clearable placeholder="请选择检验结论">
<el-option label="合格" value="合格"> <el-option label="合格" value="合格">
@ -139,7 +138,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6">
<el-col :span="5">
<el-form-item label="处置措施"> <el-form-item label="处置措施">
<el-select v-model="searchData.disposalMeasures" clearable placeholder="请选择处置措施"> <el-select v-model="searchData.disposalMeasures" clearable placeholder="请选择处置措施">
<el-option <el-option
@ -151,28 +150,11 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6">
<el-form-item label="采购类型">
<el-select v-model="searchData.orderType" clearable placeholder="请选择采购类型">
<el-option label="采购订单" value="采购订单"></el-option>
<el-option label="委外订单" value="委外订单"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="送检类型">
<el-select v-model="searchData.submissionType" clearable placeholder="请选择送检类型">
<el-option label="厂内使用" value="厂内使用"></el-option>
<el-option label="外协使用" value="外协使用"></el-option>
<el-option label="其他" value="其他"></el-option>
</el-select>
</el-form-item>
</el-col>
</el-row> </el-row>
<!-- 第五行 -->
<el-row :gutter="20">
<el-col :span="12">
<!-- 第四行：检验结论及处置措施 -->
<el-row :gutter="16">
<el-col :span="9">
<el-form-item label="送检日期"> <el-form-item label="送检日期">
<el-date-picker <el-date-picker
v-model="searchData.startDate2" v-model="searchData.startDate2"
@ -182,7 +164,7 @@
placeholder="开始日期" placeholder="开始日期"
style="width: 44%"> style="width: 44%">
</el-date-picker> </el-date-picker>
<span style="margin: 0 4px; color: #DCDFE6;">~</span>
<span style="margin: 0 6px; color: #DCDFE6;">~</span>
<el-date-picker <el-date-picker
v-model="searchData.endDate2" v-model="searchData.endDate2"
type="datetime" type="datetime"
@ -193,7 +175,7 @@
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12">
<el-col :span="9">
<el-form-item label="检验时间"> <el-form-item label="检验时间">
<el-date-picker <el-date-picker
v-model="searchData.startDate" v-model="searchData.startDate"
@ -203,7 +185,7 @@
placeholder="开始日期" placeholder="开始日期"
style="width: 44%"> style="width: 44%">
</el-date-picker> </el-date-picker>
<span style="margin: 0 4px; color: #DCDFE6;">~</span>
<span style="margin: 0 6px; color: #DCDFE6;">~</span>
<el-date-picker <el-date-picker
v-model="searchData.endDate" v-model="searchData.endDate"
type="datetime" type="datetime"

127
src/views/modules/qc/OQCResultEntry.vue
View File

@ -21,16 +21,17 @@
</div> </div>
<el-form <el-form
:inline="true"
label-position="top"
:model="searchData" :model="searchData"
label-width="90px"
class="search-form" class="search-form"
@keyup.enter.native="getDataList"> @keyup.enter.native="getDataList">
<!-- 所有查询条件 - 可展开/收起 --> <!-- 所有查询条件 - 可展开/收起 -->
<template v-if="searchExpanded"> <template v-if="searchExpanded">
<!-- 第一行 -->
<el-row :gutter="20">
<el-col :span="6">
<!-- 第一行：基础单据信息 -->
<el-row :gutter="16">
<el-col :span="4">
<el-form-item label="BU"> <el-form-item label="BU">
<el-select v-model="searchData.buDesc" placeholder="请选择BU" clearable> <el-select v-model="searchData.buDesc" placeholder="请选择BU" clearable>
<el-option <el-option
@ -42,68 +43,50 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6">
<el-col :span="5">
<el-form-item label="检验单号"> <el-form-item label="检验单号">
<el-input
v-model="searchData.inspectionNo"
placeholder="请输入检验单号"
clearable
prefix-icon="el-icon-document">
</el-input>
<el-input v-model="searchData.inspectionNo" placeholder="请输入检验单号" clearable></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6">
<el-form-item label="物料编码">
<el-input
v-model="searchData.partNo"
placeholder="请输入物料编码"
clearable
prefix-icon="el-icon-goods">
</el-input>
<el-col :span="5">
<el-form-item label="销售订单">
<el-input v-model="searchData.poOrderNo" placeholder="请输入销售订单" clearable></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6">
<el-form-item label="物料名称">
<el-input
v-model="searchData.partDesc"
placeholder="请输入物料名称"
clearable>
</el-input>
<el-col :span="5">
<el-form-item label="客户编码">
<el-input v-model="searchData.customerNo" placeholder="请输入客户编码" clearable></el-input>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="客户名称">
<el-input v-model="searchData.customerName" placeholder="请输入客户名称" clearable></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<!-- 第二行 -->
<el-row :gutter="20">
<el-col :span="6">
<el-form-item label="质检员">
<el-input
v-model="searchData.inspectorName"
placeholder="请输入质检员姓名"
clearable
prefix-icon="el-icon-user">
</el-input>
<!-- 第二行：物料信息 -->
<el-row :gutter="16">
<el-col :span="4">
<el-form-item label="物料编码">
<el-input v-model="searchData.partNo" placeholder="请输入物料编码" clearable></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6">
<el-form-item label="客户编码">
<el-input
v-model="searchData.customerNo"
placeholder="请输入客户编码"
clearable>
</el-input>
<el-col :span="5">
<el-form-item label="物料名称">
<el-input v-model="searchData.partDesc" placeholder="请输入物料名称" clearable></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6">
<el-form-item label="客户名称">
<el-input
v-model="searchData.customerName"
placeholder="请输入客户名称"
clearable>
</el-input>
<el-col :span="5">
<el-form-item label="规格型号">
<el-input v-model="searchData.spec" placeholder="请输入规格型号" clearable></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6">
</el-row>
<!-- 第三行：检验相关信息 -->
<el-row :gutter="16">
<el-col :span="4">
<el-form-item label="检验结论"> <el-form-item label="检验结论">
<el-select v-model="searchData.inspectionResult" placeholder="请选择" clearable> <el-select v-model="searchData.inspectionResult" placeholder="请选择" clearable>
<el-option label="合格" value="合格"> <el-option label="合格" value="合格">
@ -118,9 +101,6 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="5"> <el-col :span="5">
<el-form-item label="处置措施"> <el-form-item label="处置措施">
<el-select v-model="searchData.disposalMeasures" placeholder="请选择" clearable> <el-select v-model="searchData.disposalMeasures" placeholder="请选择" clearable>
@ -133,14 +113,9 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="7">
<el-col :span="5">
<el-form-item label="状态"> <el-form-item label="状态">
<el-select
v-model="searchData.states"
multiple
collapse-tags
placeholder="请选择状态"
class="status-select">
<el-select v-model="searchData.states" multiple collapse-tags placeholder="请选择状态" class="status-select">
<el-option label="未开始" value="未开始"></el-option> <el-option label="未开始" value="未开始"></el-option>
<el-option label="待检验" value="待检验"></el-option> <el-option label="待检验" value="待检验"></el-option>
<el-option label="待审核" value="待审核"></el-option> <el-option label="待审核" value="待审核"></el-option>
@ -148,7 +123,16 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6">
<el-col :span="5">
<el-form-item label="质检员">
<el-input v-model="searchData.inspectorName" placeholder="请输入质检员姓名" clearable></el-input>
</el-form-item>
</el-col>
</el-row>
<!-- 第四行：日期信息 -->
<el-row :gutter="16">
<el-col :span="9">
<el-form-item label="送检日期"> <el-form-item label="送检日期">
<el-date-picker <el-date-picker
v-model="searchData.startDate2" v-model="searchData.startDate2"
@ -156,20 +140,20 @@
value-format='yyyy-MM-dd' value-format='yyyy-MM-dd'
format='yyyy-MM-dd' format='yyyy-MM-dd'
placeholder="开始日期" placeholder="开始日期"
style="width: 45%">
style="width: 44%">
</el-date-picker> </el-date-picker>
<span style="color: #DCDFE6;">~</span>
<span style="margin: 0 6px; color: #DCDFE6;">~</span>
<el-date-picker <el-date-picker
v-model="searchData.endDate2" v-model="searchData.endDate2"
type="date" type="date"
value-format='yyyy-MM-dd' value-format='yyyy-MM-dd'
format='yyyy-MM-dd' format='yyyy-MM-dd'
placeholder="结束日期" placeholder="结束日期"
style="width: 45%">
style="width: 44%">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6">
<el-col :span="9">
<el-form-item label="检验日期"> <el-form-item label="检验日期">
<el-date-picker <el-date-picker
v-model="searchData.startDate" v-model="searchData.startDate"
@ -177,16 +161,16 @@
value-format='yyyy-MM-dd' value-format='yyyy-MM-dd'
format='yyyy-MM-dd' format='yyyy-MM-dd'
placeholder="开始日期" placeholder="开始日期"
style="width: 45%">
style="width: 44%">
</el-date-picker> </el-date-picker>
<span style="color: #DCDFE6;">~</span>
<span style="margin: 0 6px; color: #DCDFE6;">~</span>
<el-date-picker <el-date-picker
v-model="searchData.endDate" v-model="searchData.endDate"
type="date" type="date"
value-format='yyyy-MM-dd' value-format='yyyy-MM-dd'
format='yyyy-MM-dd' format='yyyy-MM-dd'
placeholder="结束日期" placeholder="结束日期"
style="width: 45%">
style="width: 44%">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -194,7 +178,7 @@
</template> </template>
<!-- 操作按钮区域 --> <!-- 操作按钮区域 -->
<el-row :gutter="20">
<el-row :gutter="16">
<el-col :span="24"> <el-col :span="24">
<div class="search-actions"> <div class="search-actions">
<div class="action-left"> <div class="action-left">
@ -1095,7 +1079,8 @@
limit: 10, limit: 10,
states: ['未开始','待检验'], states: ['未开始','待检验'],
customerNo: '', customerNo: '',
customerName: ''
customerName: '',
poOrderNo: ''
}, },
pageIndex: 1, pageIndex: 1,
pageSize: 200, pageSize: 200,

Write Preview
Loading…
Cancel
Save