|
|
@ -28,7 +28,7 @@ |
|
|
|
|
|
|
|
|
<!-- 所有查询条件 - 可展开/收起 --> |
|
|
<!-- 所有查询条件 - 可展开/收起 --> |
|
|
<template v-if="searchExpanded"> |
|
|
<template v-if="searchExpanded"> |
|
|
<!-- 第一行:基础单据信息 --> |
|
|
|
|
|
|
|
|
<!-- 第一行:5个 --> |
|
|
<el-row :gutter="16"> |
|
|
<el-row :gutter="16"> |
|
|
<el-col :span="5"> |
|
|
<el-col :span="5"> |
|
|
<el-form-item label="BU"> |
|
|
<el-form-item label="BU"> |
|
|
@ -51,17 +51,8 @@ |
|
|
<el-input v-model="searchData.inspectionNo" :placeholder="$t('qc.iqcPage.enterInspectionNo')" clearable></el-input> |
|
|
<el-input v-model="searchData.inspectionNo" :placeholder="$t('qc.iqcPage.enterInspectionNo')" clearable></el-input> |
|
|
</el-form-item> |
|
|
</el-form-item> |
|
|
</el-col> |
|
|
</el-col> |
|
|
<el-col :span="5"> |
|
|
|
|
|
<el-form-item :label="$t('qc.ipqcPage.workOrderNo')"> |
|
|
|
|
|
<el-input v-model="searchData.orderNo" :placeholder="$t('qc.ipqcPage.enterWorkOrderNo')" clearable></el-input> |
|
|
|
|
|
</el-form-item> |
|
|
|
|
|
</el-col> |
|
|
|
|
|
<el-col :span="5"> |
|
|
|
|
|
<el-form-item :label="$t('qc.iqcPage.seqNo')"> |
|
|
|
|
|
<el-input v-model="searchData.seqNo" :placeholder="$t('qc.ipqcPage.enterSeqNo')" clearable></el-input> |
|
|
|
|
|
</el-form-item> |
|
|
|
|
|
</el-col> |
|
|
|
|
|
<el-col :span="4"> |
|
|
|
|
|
|
|
|
<!-- 检验类型:库存检验不需要,已隐藏 --> |
|
|
|
|
|
<!-- <el-col :span="5"> |
|
|
<el-form-item :label="$t('qc.iqcPage.inspectionType')"> |
|
|
<el-form-item :label="$t('qc.iqcPage.inspectionType')"> |
|
|
<el-select v-model="searchData.inspectionTypeNo" clearable :placeholder="$t('qc.ipqcPage.selectInspectionType')"> |
|
|
<el-select v-model="searchData.inspectionTypeNo" clearable :placeholder="$t('qc.ipqcPage.selectInspectionType')"> |
|
|
<el-option :label="$t('qc.ipqcPage.firstInspection')" value="首件检"></el-option> |
|
|
<el-option :label="$t('qc.ipqcPage.firstInspection')" value="首件检"></el-option> |
|
|
@ -70,11 +61,7 @@ |
|
|
<el-option :label="$t('qc.ipqcPage.lastInspection')" value="末件检"></el-option> |
|
|
<el-option :label="$t('qc.ipqcPage.lastInspection')" value="末件检"></el-option> |
|
|
</el-select> |
|
|
</el-select> |
|
|
</el-form-item> |
|
|
</el-form-item> |
|
|
</el-col> |
|
|
|
|
|
</el-row> |
|
|
|
|
|
|
|
|
|
|
|
<!-- 第二行:物料信息 --> |
|
|
|
|
|
<el-row :gutter="16"> |
|
|
|
|
|
|
|
|
</el-col> --> |
|
|
<el-col :span="5"> |
|
|
<el-col :span="5"> |
|
|
<el-form-item :label="$t('qc.common.materialCode')"> |
|
|
<el-form-item :label="$t('qc.common.materialCode')"> |
|
|
<el-input v-model="searchData.partNo" :placeholder="$t('qc.iqcPage.enterPartNo')" clearable></el-input> |
|
|
<el-input v-model="searchData.partNo" :placeholder="$t('qc.iqcPage.enterPartNo')" clearable></el-input> |
|
|
@ -85,46 +72,15 @@ |
|
|
<el-input v-model="searchData.partDesc" :placeholder="$t('qc.iqcPage.enterPartName')" clearable></el-input> |
|
|
<el-input v-model="searchData.partDesc" :placeholder="$t('qc.iqcPage.enterPartName')" clearable></el-input> |
|
|
</el-form-item> |
|
|
</el-form-item> |
|
|
</el-col> |
|
|
</el-col> |
|
|
<el-col :span="5"> |
|
|
|
|
|
|
|
|
<el-col :span="4"> |
|
|
<el-form-item :label="$t('qc.iqcPage.spec')"> |
|
|
<el-form-item :label="$t('qc.iqcPage.spec')"> |
|
|
<el-input v-model="searchData.spec" :placeholder="$t('qc.iqcPage.enterSpec')" clearable></el-input> |
|
|
<el-input v-model="searchData.spec" :placeholder="$t('qc.iqcPage.enterSpec')" clearable></el-input> |
|
|
</el-form-item> |
|
|
</el-form-item> |
|
|
</el-col> |
|
|
</el-col> |
|
|
<el-col :span="5"> |
|
|
|
|
|
<el-form-item :label="$t('qc.ipqcPage.process')"> |
|
|
|
|
|
<el-select v-model="searchData.operationDesc" clearable filterable :placeholder="$t('qc.ipqcPage.selectProcess')"> |
|
|
|
|
|
<el-option v-for="item in operationDescList" :key="item" :label="item" :value="item"></el-option> |
|
|
|
|
|
</el-select> |
|
|
|
|
|
</el-form-item> |
|
|
|
|
|
</el-col> |
|
|
|
|
|
<el-col :span="4"> |
|
|
|
|
|
<el-form-item :label="$t('qc.iqcPage.machine')"> |
|
|
|
|
|
<el-select v-model="searchData.resourceId" clearable filterable :placeholder="$t('qc.ipqcPage.selectMachine')"> |
|
|
|
|
|
<el-option |
|
|
|
|
|
v-for="i in resourceList3" |
|
|
|
|
|
:key="i.resourceId" |
|
|
|
|
|
:label="i.resourceDesc" |
|
|
|
|
|
:value="i.resourceId"> |
|
|
|
|
|
</el-option> |
|
|
|
|
|
</el-select> |
|
|
|
|
|
</el-form-item> |
|
|
|
|
|
</el-col> |
|
|
|
|
|
</el-row> |
|
|
</el-row> |
|
|
|
|
|
|
|
|
<!-- 第四行:检验相关信息 --> |
|
|
|
|
|
|
|
|
<!-- 第二行:5个 --> |
|
|
<el-row :gutter="16"> |
|
|
<el-row :gutter="16"> |
|
|
<el-col :span="5"> |
|
|
|
|
|
<el-form-item :label="$t('qc.ipqcPage.workCenter')"> |
|
|
|
|
|
<el-select v-model="searchData.workCenterNo" clearable filterable :placeholder="$t('qc.ipqcPage.selectWorkCenter')"> |
|
|
|
|
|
<el-option |
|
|
|
|
|
v-for="i in workCenterList" |
|
|
|
|
|
:key="i.workCenterNo" |
|
|
|
|
|
:label="i.workCenterDesc" |
|
|
|
|
|
:value="i.workCenterNo"> |
|
|
|
|
|
</el-option> |
|
|
|
|
|
</el-select> |
|
|
|
|
|
</el-form-item> |
|
|
|
|
|
</el-col> |
|
|
|
|
|
<el-col :span="5"> |
|
|
<el-col :span="5"> |
|
|
<el-form-item :label="$t('qc.iqcPage.inspectionResult')"> |
|
|
<el-form-item :label="$t('qc.iqcPage.inspectionResult')"> |
|
|
<el-select v-model="searchData.inspectionResult" clearable :placeholder="$t('qc.iqcPage.selectInspectionResult')"> |
|
|
<el-select v-model="searchData.inspectionResult" clearable :placeholder="$t('qc.iqcPage.selectInspectionResult')"> |
|
|
@ -166,9 +122,9 @@ |
|
|
</el-col> |
|
|
</el-col> |
|
|
</el-row> |
|
|
</el-row> |
|
|
|
|
|
|
|
|
<!-- 第四行:日期信息 --> |
|
|
|
|
|
|
|
|
<!-- 第三行:日期(区间控件较宽,各占一半) --> |
|
|
<el-row :gutter="16"> |
|
|
<el-row :gutter="16"> |
|
|
<el-col :span="7"> |
|
|
|
|
|
|
|
|
<el-col :span="12"> |
|
|
<el-form-item :label="$t('qc.iqcPage.sendDate')"> |
|
|
<el-form-item :label="$t('qc.iqcPage.sendDate')"> |
|
|
<el-date-picker |
|
|
<el-date-picker |
|
|
v-model="searchData.startDate2" |
|
|
v-model="searchData.startDate2" |
|
|
@ -176,7 +132,7 @@ |
|
|
value-format='yyyy-MM-dd HH:mm' |
|
|
value-format='yyyy-MM-dd HH:mm' |
|
|
format='yyyy-MM-dd HH:mm' |
|
|
format='yyyy-MM-dd HH:mm' |
|
|
:placeholder="$t('qc.iqcPage.startDate')" |
|
|
:placeholder="$t('qc.iqcPage.startDate')" |
|
|
style="width: 44%"> |
|
|
|
|
|
|
|
|
style="width: 46%"> |
|
|
</el-date-picker> |
|
|
</el-date-picker> |
|
|
<span style="margin: 0 6px; color: #DCDFE6;">~</span> |
|
|
<span style="margin: 0 6px; color: #DCDFE6;">~</span> |
|
|
<el-date-picker |
|
|
<el-date-picker |
|
|
@ -185,11 +141,11 @@ |
|
|
value-format='yyyy-MM-dd HH:mm' |
|
|
value-format='yyyy-MM-dd HH:mm' |
|
|
format='yyyy-MM-dd HH:mm' |
|
|
format='yyyy-MM-dd HH:mm' |
|
|
:placeholder="$t('qc.iqcPage.endDate')" |
|
|
:placeholder="$t('qc.iqcPage.endDate')" |
|
|
style="width: 44%"> |
|
|
|
|
|
|
|
|
style="width: 46%"> |
|
|
</el-date-picker> |
|
|
</el-date-picker> |
|
|
</el-form-item> |
|
|
</el-form-item> |
|
|
</el-col> |
|
|
</el-col> |
|
|
<el-col :span="8"> |
|
|
|
|
|
|
|
|
<el-col :span="12"> |
|
|
<el-form-item :label="$t('qc.iqcPage.inspectionTime')"> |
|
|
<el-form-item :label="$t('qc.iqcPage.inspectionTime')"> |
|
|
<el-date-picker |
|
|
<el-date-picker |
|
|
v-model="searchData.startDate" |
|
|
v-model="searchData.startDate" |
|
|
@ -197,7 +153,7 @@ |
|
|
value-format='yyyy-MM-dd HH:mm:ss' |
|
|
value-format='yyyy-MM-dd HH:mm:ss' |
|
|
format='yyyy-MM-dd HH:mm:ss' |
|
|
format='yyyy-MM-dd HH:mm:ss' |
|
|
:placeholder="$t('qc.iqcPage.startDate')" |
|
|
:placeholder="$t('qc.iqcPage.startDate')" |
|
|
style="width: 44%"> |
|
|
|
|
|
|
|
|
style="width: 46%"> |
|
|
</el-date-picker> |
|
|
</el-date-picker> |
|
|
<span style="margin: 0 6px; color: #DCDFE6;">~</span> |
|
|
<span style="margin: 0 6px; color: #DCDFE6;">~</span> |
|
|
<el-date-picker |
|
|
<el-date-picker |
|
|
@ -206,7 +162,7 @@ |
|
|
value-format='yyyy-MM-dd HH:mm:ss' |
|
|
value-format='yyyy-MM-dd HH:mm:ss' |
|
|
format='yyyy-MM-dd HH:mm:ss' |
|
|
format='yyyy-MM-dd HH:mm:ss' |
|
|
:placeholder="$t('qc.iqcPage.endDate')" |
|
|
:placeholder="$t('qc.iqcPage.endDate')" |
|
|
style="width: 44%"> |
|
|
|
|
|
|
|
|
style="width: 46%"> |
|
|
</el-date-picker> |
|
|
</el-date-picker> |
|
|
</el-form-item> |
|
|
</el-form-item> |
|
|
</el-col> |
|
|
</el-col> |
|
|
@ -323,7 +279,7 @@ |
|
|
</template> |
|
|
</template> |
|
|
</el-table-column> |
|
|
</el-table-column> |
|
|
<el-table-column |
|
|
<el-table-column |
|
|
v-for="(item,index) in columnList1" :key="index" |
|
|
|
|
|
|
|
|
v-for="(item,index) in visibleColumnList1" :key="index" |
|
|
:sortable="item.columnSortable" |
|
|
:sortable="item.columnSortable" |
|
|
:prop="item.columnProp" |
|
|
:prop="item.columnProp" |
|
|
:header-align="item.headerAlign" |
|
|
:header-align="item.headerAlign" |
|
|
@ -333,7 +289,7 @@ |
|
|
:min-width="item.columnWidth" |
|
|
:min-width="item.columnWidth" |
|
|
:label="translateColumnLabel(item)"> |
|
|
:label="translateColumnLabel(item)"> |
|
|
<template slot-scope="scope"> |
|
|
<template slot-scope="scope"> |
|
|
<span v-if="!item.columnHidden"> {{ translateCellValue(item.columnProp, scope.row[item.columnProp]) }}</span> |
|
|
|
|
|
|
|
|
<span> {{ translateCellValue(item.columnProp, scope.row[item.columnProp]) }}</span> |
|
|
<span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span> |
|
|
<span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span> |
|
|
</template> |
|
|
</template> |
|
|
</el-table-column> |
|
|
</el-table-column> |
|
|
@ -380,11 +336,12 @@ |
|
|
</el-option> |
|
|
</el-option> |
|
|
</el-select> |
|
|
</el-select> |
|
|
</el-form-item> |
|
|
</el-form-item> |
|
|
<el-form-item :label="$t('qc.iqcPage.tagNo')"> |
|
|
|
|
|
|
|
|
<el-form-item :label="$t('qc.iqcPage.tagBatchNo')"> |
|
|
<el-input v-model="modalData.rollNo" @keyup.native.enter="rollNoEnter" clearable style="width: 221px"></el-input> |
|
|
<el-input v-model="modalData.rollNo" @keyup.native.enter="rollNoEnter" clearable style="width: 221px"></el-input> |
|
|
</el-form-item> |
|
|
</el-form-item> |
|
|
</el-form> |
|
|
</el-form> |
|
|
<el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px"> |
|
|
|
|
|
|
|
|
<!-- 派工单号、工单号、工序、机台:库存检验新增不需要,已隐藏 --> |
|
|
|
|
|
<!-- <el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px"> |
|
|
<el-form-item v-if="this.modalData.rollNo === '' || this.modalData.rollNo == null" prop="orderNo" :rules="rules.seqNoType"> |
|
|
<el-form-item v-if="this.modalData.rollNo === '' || this.modalData.rollNo == null" prop="orderNo" :rules="rules.seqNoType"> |
|
|
<span style="cursor: pointer" slot="label" @click="getBaseList(1052)"><a herf="#">{{ $t('qc.iqcPage.seqNo') }}</a></span> |
|
|
<span style="cursor: pointer" slot="label" @click="getBaseList(1052)"><a herf="#">{{ $t('qc.iqcPage.seqNo') }}</a></span> |
|
|
<el-input v-model="modalData.seqNo" style="width: 221px"></el-input> |
|
|
<el-input v-model="modalData.seqNo" style="width: 221px"></el-input> |
|
|
@ -411,9 +368,10 @@ |
|
|
<el-form-item :label="$t('qc.iqcPage.machine')" prop="resourceId" :rules="rules.resourceIdType"> |
|
|
<el-form-item :label="$t('qc.iqcPage.machine')" prop="resourceId" :rules="rules.resourceIdType"> |
|
|
<el-input v-model="modalData.resourceDesc" style="width: 221px"></el-input> |
|
|
<el-input v-model="modalData.resourceDesc" style="width: 221px"></el-input> |
|
|
</el-form-item> |
|
|
</el-form-item> |
|
|
</el-form> |
|
|
|
|
|
|
|
|
</el-form> --> |
|
|
<el-form :inline="true" label-position="top" :model="modalData" style="margin-left: 7px"> |
|
|
<el-form :inline="true" label-position="top" :model="modalData" style="margin-left: 7px"> |
|
|
<el-form-item :label="$t('qc.common.materialCode')" prop="partNo" :rules="rules.partNoType"> |
|
|
|
|
|
|
|
|
<el-form-item prop="partNo" :rules="rules.partNoType"> |
|
|
|
|
|
<span style="cursor: pointer" slot="label" @click="openPartDialog"><a herf="#">{{ $t('qc.common.materialCode') }}</a></span> |
|
|
<el-input v-model="modalData.partNo" readonly style="width: 221px"></el-input> |
|
|
<el-input v-model="modalData.partNo" readonly style="width: 221px"></el-input> |
|
|
</el-form-item> |
|
|
</el-form-item> |
|
|
<el-form-item :label="$t('qc.iqcPage.partName')"> |
|
|
<el-form-item :label="$t('qc.iqcPage.partName')"> |
|
|
@ -424,14 +382,19 @@ |
|
|
<el-form-item :label="$t('qc.iqcPage.partType')"> |
|
|
<el-form-item :label="$t('qc.iqcPage.partType')"> |
|
|
<el-input v-model="modalData.invdefinetype" readonly style="width: 221px"></el-input> |
|
|
<el-input v-model="modalData.invdefinetype" readonly style="width: 221px"></el-input> |
|
|
</el-form-item> |
|
|
</el-form-item> |
|
|
<el-form-item :label="$t('qc.iqcPage.inspectionType')" prop="inspectionTypeNo" :rules="rules.inspectionTypeNoType"> |
|
|
|
|
|
|
|
|
<el-form-item prop="inspectorBy" :rules="rules.inspectorByType"> |
|
|
|
|
|
<span style="cursor: pointer" slot="label" @click="getSenderList"><a>{{ $t('qc.table.sender') }}</a></span> |
|
|
|
|
|
<el-input v-model="modalData.inspectorByName" readonly style="width: 221px"></el-input> |
|
|
|
|
|
</el-form-item> |
|
|
|
|
|
<!-- 检验类型:库存检验不需要,已隐藏 --> |
|
|
|
|
|
<!-- <el-form-item :label="$t('qc.iqcPage.inspectionType')" prop="inspectionTypeNo" :rules="rules.inspectionTypeNoType"> |
|
|
<el-select v-model="modalData.inspectionTypeNo" style="width: 221px"> |
|
|
<el-select v-model="modalData.inspectionTypeNo" style="width: 221px"> |
|
|
<el-option :label="$t('qc.ipqcPage.firstInspection')" value="首件检"></el-option> |
|
|
<el-option :label="$t('qc.ipqcPage.firstInspection')" value="首件检"></el-option> |
|
|
<el-option :label="$t('qc.ipqcPage.selfInspection')" value="自检"></el-option> |
|
|
<el-option :label="$t('qc.ipqcPage.selfInspection')" value="自检"></el-option> |
|
|
<el-option :label="$t('qc.ipqcPage.patrolInspection')" value="巡检"></el-option> |
|
|
<el-option :label="$t('qc.ipqcPage.patrolInspection')" value="巡检"></el-option> |
|
|
<el-option :label="$t('qc.ipqcPage.lastInspection')" value="末件检"></el-option> |
|
|
<el-option :label="$t('qc.ipqcPage.lastInspection')" value="末件检"></el-option> |
|
|
</el-select> |
|
|
</el-select> |
|
|
</el-form-item> |
|
|
|
|
|
|
|
|
</el-form-item> --> |
|
|
</el-form> |
|
|
</el-form> |
|
|
<el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px"> |
|
|
<el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px"> |
|
|
|
|
|
|
|
|
@ -448,10 +411,7 @@ |
|
|
</el-option> |
|
|
</el-option> |
|
|
</el-select> |
|
|
</el-select> |
|
|
</el-form-item> |
|
|
</el-form-item> |
|
|
<el-form-item prop="inspectorBy" :rules="rules.inspectorByType"> |
|
|
|
|
|
<span style="cursor: pointer" slot="label" @click="getSenderList"><a>{{ $t('qc.table.sender') }}</a></span> |
|
|
|
|
|
<el-input v-model="modalData.inspectorByName" readonly style="width: 221px"></el-input> |
|
|
|
|
|
</el-form-item> |
|
|
|
|
|
|
|
|
|
|
|
</el-form> |
|
|
</el-form> |
|
|
<el-form :inline="true" label-position="top" :model="modalData" style="margin-left: 7px"> |
|
|
<el-form :inline="true" label-position="top" :model="modalData" style="margin-left: 7px"> |
|
|
<!-- <el-form-item prop="templateId" :rules="rules.templateId"> |
|
|
<!-- <el-form-item prop="templateId" :rules="rules.templateId"> |
|
|
@ -586,7 +546,8 @@ |
|
|
<el-input-number :controls="false" :step="0" min="0" v-model="detailData.batchQualifiedQty" disabled size="small" style="width: 100%"></el-input-number> |
|
|
<el-input-number :controls="false" :step="0" min="0" v-model="detailData.batchQualifiedQty" disabled size="small" style="width: 100%"></el-input-number> |
|
|
</div> |
|
|
</div> |
|
|
</el-col> |
|
|
</el-col> |
|
|
<el-col :span="4"> |
|
|
|
|
|
|
|
|
<!-- 工单号、派工单号:库存检验不需要,已隐藏 --> |
|
|
|
|
|
<!-- <el-col :span="4"> |
|
|
<div class="info-item"> |
|
|
<div class="info-item"> |
|
|
<label>{{ $t('qc.ipqcPage.workOrderNo') }}</label> |
|
|
<label>{{ $t('qc.ipqcPage.workOrderNo') }}</label> |
|
|
<el-input v-model="detailData.orderNo" disabled size="small"></el-input> |
|
|
<el-input v-model="detailData.orderNo" disabled size="small"></el-input> |
|
|
@ -597,7 +558,7 @@ |
|
|
<label>{{ $t('qc.iqcPage.seqNo') }}</label> |
|
|
<label>{{ $t('qc.iqcPage.seqNo') }}</label> |
|
|
<el-input v-model="detailData.seqNo" disabled size="small"></el-input> |
|
|
<el-input v-model="detailData.seqNo" disabled size="small"></el-input> |
|
|
</div> |
|
|
</div> |
|
|
</el-col> |
|
|
|
|
|
|
|
|
</el-col> --> |
|
|
</el-row> |
|
|
</el-row> |
|
|
</div> |
|
|
</div> |
|
|
|
|
|
|
|
|
@ -981,26 +942,24 @@ |
|
|
</el-dialog> |
|
|
</el-dialog> |
|
|
|
|
|
|
|
|
<!-- 物料 --> |
|
|
<!-- 物料 --> |
|
|
<el-dialog :title="$t('qc.ipqcPage.materialList')" :close-on-click-modal="false" v-drag :visible.sync="partModelFlag" width="520px"> |
|
|
|
|
|
|
|
|
<el-dialog :title="$t('qc.ipqcPage.materialList')" :close-on-click-modal="false" v-drag :visible.sync="partModelFlag" width="520px" @close="closePartDialog"> |
|
|
<div class="rq"> |
|
|
<div class="rq"> |
|
|
<el-form :inline="true" label-position="top" :model="partData"> |
|
|
<el-form :inline="true" label-position="top" :model="partData"> |
|
|
<el-form-item :label="$t('qc.common.materialCode')"> |
|
|
<el-form-item :label="$t('qc.common.materialCode')"> |
|
|
<el-input v-model="partData.partNo" clearable style="width: 115px"></el-input> |
|
|
|
|
|
|
|
|
<el-input v-model="partData.partNo" clearable style="width: 115px" @keyup.enter.native="searchPartList"></el-input> |
|
|
</el-form-item> |
|
|
</el-form-item> |
|
|
<el-form-item :label="$t('qc.iqcPage.partName')"> |
|
|
<el-form-item :label="$t('qc.iqcPage.partName')"> |
|
|
<el-input v-model="partData.partDesc" clearable style="width: 115px"></el-input> |
|
|
|
|
|
</el-form-item> |
|
|
|
|
|
<el-form-item :label="'SKU'"> |
|
|
|
|
|
<el-input v-model="partData.sku" clearable style="width: 79px"></el-input> |
|
|
|
|
|
|
|
|
<el-input v-model="partData.partDesc" clearable style="width: 115px" @keyup.enter.native="searchPartList"></el-input> |
|
|
</el-form-item> |
|
|
</el-form-item> |
|
|
<el-form-item :label="'PN'"> |
|
|
<el-form-item :label="'PN'"> |
|
|
<el-input v-model="partData.cinvSourceCode" clearable style="width: 79px"></el-input> |
|
|
|
|
|
|
|
|
<el-input v-model="partData.cinvSourceCode" clearable style="width: 79px" @keyup.enter.native="searchPartList"></el-input> |
|
|
</el-form-item> |
|
|
</el-form-item> |
|
|
<el-form-item :label="' '"> |
|
|
<el-form-item :label="' '"> |
|
|
<el-button type="primary" @click="queryPartList">{{ $t('qc.common.search') }}</el-button> |
|
|
|
|
|
|
|
|
<el-button type="primary" :loading="partLoading" @click="searchPartList">{{ $t('qc.common.search') }}</el-button> |
|
|
</el-form-item> |
|
|
</el-form-item> |
|
|
</el-form> |
|
|
</el-form> |
|
|
<el-table |
|
|
<el-table |
|
|
|
|
|
v-loading="partLoading" |
|
|
:height="300" |
|
|
:height="300" |
|
|
:data="partList" |
|
|
:data="partList" |
|
|
@row-dblclick="getRowData2" |
|
|
@row-dblclick="getRowData2" |
|
|
@ -1022,8 +981,19 @@ |
|
|
</template> |
|
|
</template> |
|
|
</el-table-column> |
|
|
</el-table-column> |
|
|
</el-table> |
|
|
</el-table> |
|
|
|
|
|
<el-pagination |
|
|
|
|
|
small |
|
|
|
|
|
style="margin-top: 8px; text-align: right;" |
|
|
|
|
|
@size-change="partSizeChangeHandle" |
|
|
|
|
|
@current-change="partCurrentChangeHandle" |
|
|
|
|
|
:current-page="partPageIndex" |
|
|
|
|
|
:page-sizes="[20, 50, 100]" |
|
|
|
|
|
:page-size="partPageSize" |
|
|
|
|
|
:total="partTotalPage" |
|
|
|
|
|
layout="total, sizes, prev, pager, next"> |
|
|
|
|
|
</el-pagination> |
|
|
</div> |
|
|
</div> |
|
|
<el-footer style="height:40px;margin-top: 20px;text-align:center"> |
|
|
|
|
|
|
|
|
<el-footer style="height:40px;margin-top: 10px;text-align:center"> |
|
|
<el-button type="primary" @click="partModelFlag=false">{{ $t('qc.common.close') }}</el-button> |
|
|
<el-button type="primary" @click="partModelFlag=false">{{ $t('qc.common.close') }}</el-button> |
|
|
</el-footer> |
|
|
</el-footer> |
|
|
</el-dialog> |
|
|
</el-dialog> |
|
|
@ -1555,11 +1525,14 @@ |
|
|
// 添加固定的状态列 |
|
|
// 添加固定的状态列 |
|
|
fields['状态'] = 'state' |
|
|
fields['状态'] = 'state' |
|
|
// 添加动态列 |
|
|
// 添加动态列 |
|
|
this.columnList1.forEach(item => { |
|
|
|
|
|
|
|
|
this.visibleColumnList1.forEach(item => { |
|
|
fields[item.columnLabel] = item.columnProp |
|
|
fields[item.columnLabel] = item.columnProp |
|
|
}) |
|
|
}) |
|
|
return fields |
|
|
return fields |
|
|
}, |
|
|
}, |
|
|
|
|
|
visibleColumnList1 () { |
|
|
|
|
|
return this.filterMainTableColumns(this.columnList1 || []) |
|
|
|
|
|
}, |
|
|
visibleDetailColumnList () { |
|
|
visibleDetailColumnList () { |
|
|
return (this.detailColumnList || []) |
|
|
return (this.detailColumnList || []) |
|
|
.filter((item) => item.status !== false) |
|
|
.filter((item) => item.status !== false) |
|
|
@ -1769,7 +1742,7 @@ |
|
|
columnProp: 'rollNo', |
|
|
columnProp: 'rollNo', |
|
|
headerAlign: "center", |
|
|
headerAlign: "center", |
|
|
align: "center", |
|
|
align: "center", |
|
|
columnLabel: '标签条码', |
|
|
|
|
|
|
|
|
columnLabel: '标签/批次号', |
|
|
columnHidden: false, |
|
|
columnHidden: false, |
|
|
columnImage: false, |
|
|
columnImage: false, |
|
|
columnSortable: false, |
|
|
columnSortable: false, |
|
|
@ -1824,7 +1797,7 @@ |
|
|
headerAlign: "center", |
|
|
headerAlign: "center", |
|
|
align: "center", |
|
|
align: "center", |
|
|
columnLabel: '检验类型', |
|
|
columnLabel: '检验类型', |
|
|
columnHidden: false, |
|
|
|
|
|
|
|
|
columnHidden: true, |
|
|
columnImage: false, |
|
|
columnImage: false, |
|
|
columnSortable: false, |
|
|
columnSortable: false, |
|
|
sortLv: 0, |
|
|
sortLv: 0, |
|
|
@ -1896,7 +1869,7 @@ |
|
|
headerAlign: "center", |
|
|
headerAlign: "center", |
|
|
align: "left", |
|
|
align: "left", |
|
|
columnLabel: '工单号', |
|
|
columnLabel: '工单号', |
|
|
columnHidden: false, |
|
|
|
|
|
|
|
|
columnHidden: true, |
|
|
columnImage: false, |
|
|
columnImage: false, |
|
|
columnSortable: false, |
|
|
columnSortable: false, |
|
|
sortLv: 0, |
|
|
sortLv: 0, |
|
|
@ -1914,7 +1887,7 @@ |
|
|
headerAlign: "center", |
|
|
headerAlign: "center", |
|
|
align: "center", |
|
|
align: "center", |
|
|
columnLabel: '下达号', |
|
|
columnLabel: '下达号', |
|
|
columnHidden: false, |
|
|
|
|
|
|
|
|
columnHidden: true, |
|
|
columnImage: false, |
|
|
columnImage: false, |
|
|
columnSortable: false, |
|
|
columnSortable: false, |
|
|
sortLv: 0, |
|
|
sortLv: 0, |
|
|
@ -1932,7 +1905,7 @@ |
|
|
headerAlign: "center", |
|
|
headerAlign: "center", |
|
|
align: "center", |
|
|
align: "center", |
|
|
columnLabel: '行号', |
|
|
columnLabel: '行号', |
|
|
columnHidden: false, |
|
|
|
|
|
|
|
|
columnHidden: true, |
|
|
columnImage: false, |
|
|
columnImage: false, |
|
|
columnSortable: false, |
|
|
columnSortable: false, |
|
|
sortLv: 0, |
|
|
sortLv: 0, |
|
|
@ -1950,7 +1923,7 @@ |
|
|
headerAlign: "center", |
|
|
headerAlign: "center", |
|
|
align: "left", |
|
|
align: "left", |
|
|
columnLabel: '工序', |
|
|
columnLabel: '工序', |
|
|
columnHidden: false, |
|
|
|
|
|
|
|
|
columnHidden: true, |
|
|
columnImage: false, |
|
|
columnImage: false, |
|
|
columnSortable: false, |
|
|
columnSortable: false, |
|
|
sortLv: 0, |
|
|
sortLv: 0, |
|
|
@ -1968,7 +1941,7 @@ |
|
|
headerAlign: "center", |
|
|
headerAlign: "center", |
|
|
align: "left", |
|
|
align: "left", |
|
|
columnLabel: '机台', |
|
|
columnLabel: '机台', |
|
|
columnHidden: false, |
|
|
|
|
|
|
|
|
columnHidden: true, |
|
|
columnImage: false, |
|
|
columnImage: false, |
|
|
columnSortable: false, |
|
|
columnSortable: false, |
|
|
sortLv: 0, |
|
|
sortLv: 0, |
|
|
@ -1986,7 +1959,7 @@ |
|
|
headerAlign: "center", |
|
|
headerAlign: "center", |
|
|
align: "left", |
|
|
align: "left", |
|
|
columnLabel: '加工中心', |
|
|
columnLabel: '加工中心', |
|
|
columnHidden: false, |
|
|
|
|
|
|
|
|
columnHidden: true, |
|
|
columnImage: false, |
|
|
columnImage: false, |
|
|
columnSortable: false, |
|
|
columnSortable: false, |
|
|
sortLv: 0, |
|
|
sortLv: 0, |
|
|
@ -2826,34 +2799,35 @@ |
|
|
partList: [], |
|
|
partList: [], |
|
|
SQCSelections: [], |
|
|
SQCSelections: [], |
|
|
rules: { |
|
|
rules: { |
|
|
seqNoType: [ |
|
|
|
|
|
{ |
|
|
|
|
|
required: true, |
|
|
|
|
|
message: ' ', |
|
|
|
|
|
trigger: ['blur','change'] |
|
|
|
|
|
} |
|
|
|
|
|
], |
|
|
|
|
|
orderNoType: [ |
|
|
|
|
|
{ |
|
|
|
|
|
required: true, |
|
|
|
|
|
message: ' ', |
|
|
|
|
|
trigger: ['blur','change'] |
|
|
|
|
|
} |
|
|
|
|
|
], |
|
|
|
|
|
operationDescType: [ |
|
|
|
|
|
{ |
|
|
|
|
|
required: true, |
|
|
|
|
|
message: ' ', |
|
|
|
|
|
trigger: ['blur','change'] |
|
|
|
|
|
} |
|
|
|
|
|
], |
|
|
|
|
|
resourceIdType: [ |
|
|
|
|
|
{ |
|
|
|
|
|
required: true, |
|
|
|
|
|
message: ' ', |
|
|
|
|
|
trigger: ['blur','change'] |
|
|
|
|
|
} |
|
|
|
|
|
], |
|
|
|
|
|
|
|
|
// 派工单号、工单号、工序、机台:库存检验新增不需要,校验已去掉 |
|
|
|
|
|
// seqNoType: [ |
|
|
|
|
|
// { |
|
|
|
|
|
// required: true, |
|
|
|
|
|
// message: ' ', |
|
|
|
|
|
// trigger: ['blur','change'] |
|
|
|
|
|
// } |
|
|
|
|
|
// ], |
|
|
|
|
|
// orderNoType: [ |
|
|
|
|
|
// { |
|
|
|
|
|
// required: true, |
|
|
|
|
|
// message: ' ', |
|
|
|
|
|
// trigger: ['blur','change'] |
|
|
|
|
|
// } |
|
|
|
|
|
// ], |
|
|
|
|
|
// operationDescType: [ |
|
|
|
|
|
// { |
|
|
|
|
|
// required: true, |
|
|
|
|
|
// message: ' ', |
|
|
|
|
|
// trigger: ['blur','change'] |
|
|
|
|
|
// } |
|
|
|
|
|
// ], |
|
|
|
|
|
// resourceIdType: [ |
|
|
|
|
|
// { |
|
|
|
|
|
// required: true, |
|
|
|
|
|
// message: ' ', |
|
|
|
|
|
// trigger: ['blur','change'] |
|
|
|
|
|
// } |
|
|
|
|
|
// ], |
|
|
rollQtyType: [ |
|
|
rollQtyType: [ |
|
|
{ |
|
|
{ |
|
|
required: true, |
|
|
required: true, |
|
|
@ -2861,13 +2835,13 @@ |
|
|
trigger: ['blur','change'] |
|
|
trigger: ['blur','change'] |
|
|
} |
|
|
} |
|
|
], |
|
|
], |
|
|
inspectionTypeNoType: [ |
|
|
|
|
|
{ |
|
|
|
|
|
required: true, |
|
|
|
|
|
message: ' ', |
|
|
|
|
|
trigger: ['blur','change'] |
|
|
|
|
|
} |
|
|
|
|
|
], |
|
|
|
|
|
|
|
|
// inspectionTypeNoType: [ |
|
|
|
|
|
// { |
|
|
|
|
|
// required: true, |
|
|
|
|
|
// message: ' ', |
|
|
|
|
|
// trigger: ['blur','change'] |
|
|
|
|
|
// } |
|
|
|
|
|
// ], |
|
|
partNoType: [ |
|
|
partNoType: [ |
|
|
{ |
|
|
{ |
|
|
required: true, |
|
|
required: true, |
|
|
@ -2926,7 +2900,14 @@ |
|
|
partDesc: '', |
|
|
partDesc: '', |
|
|
sku: '', |
|
|
sku: '', |
|
|
cinvSourceCode: '', |
|
|
cinvSourceCode: '', |
|
|
|
|
|
page: 1, |
|
|
|
|
|
limit: 20 |
|
|
}, |
|
|
}, |
|
|
|
|
|
partPageIndex: 1, |
|
|
|
|
|
partPageSize: 20, |
|
|
|
|
|
partTotalPage: 0, |
|
|
|
|
|
partLoading: false, |
|
|
|
|
|
partHasSearched: false, |
|
|
templateList: [], |
|
|
templateList: [], |
|
|
templateModelFlag: false, |
|
|
templateModelFlag: false, |
|
|
templateDetailList: [ |
|
|
templateDetailList: [ |
|
|
@ -2990,18 +2971,8 @@ |
|
|
columnSortable: false, |
|
|
columnSortable: false, |
|
|
sortLv: 0, |
|
|
sortLv: 0, |
|
|
status: true, |
|
|
status: true, |
|
|
fixed: '', |
|
|
|
|
|
}, |
|
|
|
|
|
{ |
|
|
|
|
|
columnProp: 'sku', |
|
|
|
|
|
headerAlign: "center", |
|
|
|
|
|
align: "center", |
|
|
|
|
|
columnLabel: 'SKU', |
|
|
|
|
|
columnHidden: false, |
|
|
|
|
|
columnImage: false, |
|
|
|
|
|
columnSortable: false, |
|
|
|
|
|
sortLv: 0, |
|
|
|
|
|
status: true, |
|
|
|
|
|
|
|
|
columnWidth: 200, |
|
|
|
|
|
showOverflowTooltip: true, |
|
|
fixed: '', |
|
|
fixed: '', |
|
|
}, |
|
|
}, |
|
|
{ |
|
|
{ |
|
|
@ -3263,7 +3234,9 @@ |
|
|
if (!label) return label |
|
|
if (!label) return label |
|
|
const labelMap = { |
|
|
const labelMap = { |
|
|
'检验单号': 'qc.table.inspectionNo', |
|
|
'检验单号': 'qc.table.inspectionNo', |
|
|
'标签条码': 'qc.table.tagBarcode', |
|
|
|
|
|
|
|
|
'标签条码': 'qc.table.tagBatchNo', |
|
|
|
|
|
'标签号': 'qc.table.tagBatchNo', |
|
|
|
|
|
'标签/批次号': 'qc.table.tagBatchNo', |
|
|
'检验结论': 'qc.table.inspectionResult', |
|
|
'检验结论': 'qc.table.inspectionResult', |
|
|
'处置措施': 'qc.table.disposalMeasures', |
|
|
'处置措施': 'qc.table.disposalMeasures', |
|
|
'检验类型': 'qc.table.inspectionType', |
|
|
'检验类型': 'qc.table.inspectionType', |
|
|
@ -4207,22 +4180,80 @@ |
|
|
}) |
|
|
}) |
|
|
}, |
|
|
}, |
|
|
|
|
|
|
|
|
// 获取物料列表 |
|
|
|
|
|
|
|
|
// 打开物料选择弹框(不自动查询,需点击查询按钮) |
|
|
|
|
|
openPartDialog () { |
|
|
|
|
|
if (!this.modalData.bu) { |
|
|
|
|
|
this.$message.warning(this.$t('qc.common.pleaseSelectBu')) |
|
|
|
|
|
return |
|
|
|
|
|
} |
|
|
|
|
|
this.partPageIndex = 1 |
|
|
|
|
|
this.partList = [] |
|
|
|
|
|
this.partTotalPage = 0 |
|
|
|
|
|
this.partHasSearched = false |
|
|
|
|
|
this.partModelFlag = true |
|
|
|
|
|
}, |
|
|
|
|
|
|
|
|
|
|
|
// 物料弹框查询(重置到第一页) |
|
|
|
|
|
searchPartList () { |
|
|
|
|
|
this.partPageIndex = 1 |
|
|
|
|
|
this.queryPartList() |
|
|
|
|
|
}, |
|
|
|
|
|
|
|
|
|
|
|
// 获取物料列表(分页) |
|
|
queryPartList () { |
|
|
queryPartList () { |
|
|
this.partData.bu = this.modalData.bu |
|
|
this.partData.bu = this.modalData.bu |
|
|
// 查询所有物料 |
|
|
|
|
|
if (this.partData.partNo === '' && this.partData.partDesc === '' && this.partData.sku === '' && this.partData.cinvSourceCode === '') { |
|
|
|
|
|
this.partList = [] |
|
|
|
|
|
this.partModelFlag = true |
|
|
|
|
|
} else { |
|
|
|
|
|
queryPartList(this.partData).then(({data}) => { |
|
|
|
|
|
if (data && data.code === 0) { |
|
|
|
|
|
this.partList = data.rows |
|
|
|
|
|
this.partModelFlag = true |
|
|
|
|
|
}else { |
|
|
|
|
|
this.$message.error(data.msg) |
|
|
|
|
|
|
|
|
this.partData.page = this.partPageIndex |
|
|
|
|
|
this.partData.limit = this.partPageSize |
|
|
|
|
|
this.partLoading = true |
|
|
|
|
|
queryPartList(this.partData).then(({data}) => { |
|
|
|
|
|
this.partLoading = false |
|
|
|
|
|
if (data && data.code === 0) { |
|
|
|
|
|
this.partHasSearched = true |
|
|
|
|
|
if (data.page) { |
|
|
|
|
|
this.partList = data.page.list || [] |
|
|
|
|
|
this.partPageIndex = data.page.currPage |
|
|
|
|
|
this.partPageSize = data.page.pageSize |
|
|
|
|
|
this.partTotalPage = data.page.totalCount |
|
|
|
|
|
} else { |
|
|
|
|
|
this.partList = data.rows || [] |
|
|
|
|
|
this.partTotalPage = this.partList.length |
|
|
} |
|
|
} |
|
|
}) |
|
|
|
|
|
|
|
|
} else { |
|
|
|
|
|
this.$message.error(data.msg) |
|
|
|
|
|
} |
|
|
|
|
|
}).catch(() => { |
|
|
|
|
|
this.partLoading = false |
|
|
|
|
|
}) |
|
|
|
|
|
}, |
|
|
|
|
|
|
|
|
|
|
|
partSizeChangeHandle (val) { |
|
|
|
|
|
if (!this.partHasSearched) return |
|
|
|
|
|
this.partPageSize = val |
|
|
|
|
|
this.partPageIndex = 1 |
|
|
|
|
|
this.queryPartList() |
|
|
|
|
|
}, |
|
|
|
|
|
|
|
|
|
|
|
partCurrentChangeHandle (val) { |
|
|
|
|
|
if (!this.partHasSearched) return |
|
|
|
|
|
this.partPageIndex = val |
|
|
|
|
|
this.queryPartList() |
|
|
|
|
|
}, |
|
|
|
|
|
|
|
|
|
|
|
closePartDialog () { |
|
|
|
|
|
this.partList = [] |
|
|
|
|
|
this.partPageIndex = 1 |
|
|
|
|
|
this.partTotalPage = 0 |
|
|
|
|
|
this.partLoading = false |
|
|
|
|
|
this.partHasSearched = false |
|
|
|
|
|
this.partData = { |
|
|
|
|
|
site: '', |
|
|
|
|
|
bu: '', |
|
|
|
|
|
partNo: '', |
|
|
|
|
|
partDesc: '', |
|
|
|
|
|
sku: '', |
|
|
|
|
|
cinvSourceCode: '', |
|
|
|
|
|
page: 1, |
|
|
|
|
|
limit: this.partPageSize |
|
|
} |
|
|
} |
|
|
}, |
|
|
}, |
|
|
|
|
|
|
|
|
@ -4261,15 +4292,8 @@ |
|
|
this.modalData.sku = row.sku |
|
|
this.modalData.sku = row.sku |
|
|
this.modalData.invdefinetype = row.invdefinetype |
|
|
this.modalData.invdefinetype = row.invdefinetype |
|
|
this.modalData.cinvSourceCode = row.cinvSourceCode |
|
|
this.modalData.cinvSourceCode = row.cinvSourceCode |
|
|
this.partData = { |
|
|
|
|
|
site: '', |
|
|
|
|
|
bu: '', |
|
|
|
|
|
partNo: '', |
|
|
|
|
|
partDesc: '', |
|
|
|
|
|
sku: '', |
|
|
|
|
|
cinvSourceCode: '', |
|
|
|
|
|
} |
|
|
|
|
|
this.partModelFlag = false |
|
|
this.partModelFlag = false |
|
|
|
|
|
this.closePartDialog() |
|
|
}, |
|
|
}, |
|
|
|
|
|
|
|
|
// 是否新增特殊任务 |
|
|
// 是否新增特殊任务 |
|
|
@ -4342,30 +4366,31 @@ |
|
|
this.$message.warning(this.$t('qc.common.pleaseSelectBu')) |
|
|
this.$message.warning(this.$t('qc.common.pleaseSelectBu')) |
|
|
return |
|
|
return |
|
|
} |
|
|
} |
|
|
if (this.modalData.seqNo === '' || this.modalData.seqNo == null) { |
|
|
|
|
|
this.$message.warning(this.$t('qc.entry.selectDispatchNo')) |
|
|
|
|
|
return |
|
|
|
|
|
} |
|
|
|
|
|
if (this.modalData.orderNo === '' || this.modalData.orderNo == null) { |
|
|
|
|
|
this.$message.warning(this.$t('qc.entry.selectWorkOrder')) |
|
|
|
|
|
return |
|
|
|
|
|
} |
|
|
|
|
|
if (this.modalData.inspectionTypeNo === '' || this.modalData.inspectionTypeNo == null) { |
|
|
|
|
|
this.$message.warning(this.$t('qc.entry.selectInspectionTypeSop')) |
|
|
|
|
|
return |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
// 派工单号、工单号、工序、机台:库存检验新增不需要,校验已去掉 |
|
|
|
|
|
// if (this.modalData.seqNo === '' || this.modalData.seqNo == null) { |
|
|
|
|
|
// this.$message.warning(this.$t('qc.entry.selectDispatchNo')) |
|
|
|
|
|
// return |
|
|
|
|
|
// } |
|
|
|
|
|
// if (this.modalData.orderNo === '' || this.modalData.orderNo == null) { |
|
|
|
|
|
// this.$message.warning(this.$t('qc.entry.selectWorkOrder')) |
|
|
|
|
|
// return |
|
|
|
|
|
// } |
|
|
|
|
|
// if (this.modalData.inspectionTypeNo === '' || this.modalData.inspectionTypeNo == null) { |
|
|
|
|
|
// this.$message.warning(this.$t('qc.entry.selectInspectionTypeSop')) |
|
|
|
|
|
// return |
|
|
|
|
|
// } |
|
|
if (this.modalData.partNo === '' || this.modalData.partNo == null) { |
|
|
if (this.modalData.partNo === '' || this.modalData.partNo == null) { |
|
|
this.$message.warning(this.$t('qc.entry.selectPart')) |
|
|
this.$message.warning(this.$t('qc.entry.selectPart')) |
|
|
return |
|
|
return |
|
|
} |
|
|
} |
|
|
if (this.modalData.operationDesc === '' || this.modalData.operationDesc == null) { |
|
|
|
|
|
this.$message.warning(this.$t('qc.entry.selectOp')) |
|
|
|
|
|
return |
|
|
|
|
|
} |
|
|
|
|
|
if (this.modalData.resourceId === '' || this.modalData.resourceId == null) { |
|
|
|
|
|
this.$message.warning(this.$t('qc.entry.selectMachine')) |
|
|
|
|
|
return |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
// if (this.modalData.operationDesc === '' || this.modalData.operationDesc == null) { |
|
|
|
|
|
// this.$message.warning(this.$t('qc.entry.selectOp')) |
|
|
|
|
|
// return |
|
|
|
|
|
// } |
|
|
|
|
|
// if (this.modalData.resourceId === '' || this.modalData.resourceId == null) { |
|
|
|
|
|
// this.$message.warning(this.$t('qc.entry.selectMachine')) |
|
|
|
|
|
// return |
|
|
|
|
|
// } |
|
|
if (this.modalData.inspectorBy === '' || this.modalData.inspectorBy == null) { |
|
|
if (this.modalData.inspectorBy === '' || this.modalData.inspectorBy == null) { |
|
|
this.$message.warning(this.$t('qc.entry.selectSender')) |
|
|
this.$message.warning(this.$t('qc.entry.selectSender')) |
|
|
return |
|
|
return |
|
|
@ -5131,11 +5156,14 @@ |
|
|
}, |
|
|
}, |
|
|
|
|
|
|
|
|
filterMainTableColumns (columns) { |
|
|
filterMainTableColumns (columns) { |
|
|
return this.normalizeMainTableDateColumns(this.ensureMainTableReleaseLineColumns((columns || []).filter(item => { |
|
|
|
|
|
|
|
|
// 库存检验列表隐藏:派工单号、工单号、下达号、行号、工序、机台、加工中心、检验类型 |
|
|
|
|
|
const hideProps = ['seqNo', 'orderNo', 'releaseNo', 'lineNo', 'operationDesc', 'resourceDesc', 'workCenterDesc', 'inspectionTypeNo', 'inspectionTypeName'] |
|
|
|
|
|
const hideLabels = ['派工单号', '工单号', '下达号', '行号', '工序', '机台', '加工中心', '检验类型'] |
|
|
|
|
|
return this.normalizeMainTableDateColumns((columns || []).filter(item => { |
|
|
const prop = item && item.columnProp ? String(item.columnProp) : '' |
|
|
const prop = item && item.columnProp ? String(item.columnProp) : '' |
|
|
const label = item && item.columnLabel ? String(item.columnLabel) : '' |
|
|
const label = item && item.columnLabel ? String(item.columnLabel) : '' |
|
|
return prop !== 'seqNo' && label !== '派工单号' |
|
|
|
|
|
}))) |
|
|
|
|
|
|
|
|
return hideProps.indexOf(prop) === -1 && hideLabels.indexOf(label) === -1 |
|
|
|
|
|
})) |
|
|
}, |
|
|
}, |
|
|
|
|
|
|
|
|
normalizeMainTableDateColumns (columns) { |
|
|
normalizeMainTableDateColumns (columns) { |
|
|
|