|
|
|
@ -213,14 +213,24 @@ |
|
|
|
</el-form-item> |
|
|
|
</el-form> |
|
|
|
<el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: -5px;"> |
|
|
|
<el-form-item label="送检数量:" prop="rollQty" :rules="rules.rollQtyType"> |
|
|
|
<el-input v-model="modalData.rollQty" type="number" style="width: 221px"></el-input> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item> |
|
|
|
<span v-if="this.controlData.baseData === '控制'" slot="label" @click="queryTemplateList()"><a>检验模板</a></span> |
|
|
|
<span v-if="this.controlData.baseData === '未控制'" slot="label">检验模板</span> |
|
|
|
<el-input v-model="modalData.templateName" disabled style="width: 221px"></el-input> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item label="送检数量:" prop="rollQty" :rules="rules.rollQtyType"> |
|
|
|
<el-input v-model="modalData.rollQty" type="number" style="width: 103px"></el-input> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item label="单位" prop="umId" :rules="rules.umIdType"> |
|
|
|
<el-select v-model="modalData.umId" placeholder="请选择" style="width: 103px"> |
|
|
|
<el-option |
|
|
|
v-for = "i in umList" |
|
|
|
:key = "i.umId" |
|
|
|
:label = "i.umName" |
|
|
|
:value = "i.umId"> |
|
|
|
</el-option> |
|
|
|
</el-select> |
|
|
|
</el-form-item> |
|
|
|
</el-form> |
|
|
|
<el-form :inline="true" label-position="top" :model="modalData" style="margin-left: 7px;margin-top: -5px;"> |
|
|
|
<el-form-item label="老卷号"> |
|
|
|
@ -265,6 +275,9 @@ |
|
|
|
<el-form-item :label="'抽样数量'"> |
|
|
|
<el-input v-model="detailData.samplingQty" type="number" style="width: 80px"></el-input> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item :label="'单位'"> |
|
|
|
<el-input v-model="detailData.umName" readonly style="width: 80px"></el-input> |
|
|
|
</el-form-item> |
|
|
|
</el-form> |
|
|
|
<el-form :inline="true" label-position="top" @keyup.enter.native = "getDataList()"> |
|
|
|
<el-form-item :label="'不合格项目数量'"> |
|
|
|
@ -322,8 +335,8 @@ |
|
|
|
</el-select> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item :label="'质检备注'"> |
|
|
|
<el-input v-if="detailData.submitFlag === 'Y'" v-model="detailData.inspectionRemark" disabled style="width: 200px"></el-input> |
|
|
|
<el-input v-if="detailData.submitFlag != 'Y'" v-model="detailData.inspectionRemark" style="width: 200px"></el-input> |
|
|
|
<el-input v-if="detailData.submitFlag === 'Y'" v-model="detailData.inspectionRemark" disabled style="width: 300px"></el-input> |
|
|
|
<el-input v-if="detailData.submitFlag != 'Y'" v-model="detailData.inspectionRemark" style="width: 300px"></el-input> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item :label="' '"> |
|
|
|
<el-button type="primary" @click="addUploadFileModal()">上传文件</el-button> |
|
|
|
@ -647,11 +660,12 @@ |
|
|
|
queryTemplateList, // 获取检验模板列表 |
|
|
|
getPartInformation, // 获取物料信息 |
|
|
|
getSpecialOperationList, // 获取特殊工序列表 |
|
|
|
InspectionTypeSearch, // 搜索所有检验类型 |
|
|
|
inspectionTypeSearch, // 搜索所有检验类型 |
|
|
|
disposalMeasuresSearch, // 获取处置措施列表 |
|
|
|
getRollNo, // 模糊查询标签号 |
|
|
|
rollNoEnter, // 标签号回车事件 |
|
|
|
queryPartList // 查询物料集合 |
|
|
|
queryPartList, // 查询物料集合 |
|
|
|
umSearch // 查询单位列表 |
|
|
|
} from "@/api/qc/qc.js"; |
|
|
|
import Chooselist from '@/views/modules/common/Chooselist_eam'; |
|
|
|
import {getFileContentList, downLoadObjectFile} from '@/api/eam/eam_object_list.js'; |
|
|
|
@ -730,7 +744,9 @@ |
|
|
|
templateName: '', |
|
|
|
specialTaskFlag: '', |
|
|
|
workCenterNo: '', |
|
|
|
rollNo: '' |
|
|
|
rollNo: '', |
|
|
|
umId: '', |
|
|
|
umName: '' |
|
|
|
}, |
|
|
|
// 展示列集 |
|
|
|
columnList: [ |
|
|
|
@ -968,6 +984,19 @@ |
|
|
|
fixed: '', |
|
|
|
columnWidth: 80, |
|
|
|
}, |
|
|
|
{ |
|
|
|
columnProp: 'umName', |
|
|
|
headerAlign: "center", |
|
|
|
align: "center", |
|
|
|
columnLabel: '单位', |
|
|
|
columnHidden: false, |
|
|
|
columnImage: false, |
|
|
|
columnSortable: false, |
|
|
|
sortLv: 0, |
|
|
|
status: true, |
|
|
|
fixed: '', |
|
|
|
columnWidth: 80, |
|
|
|
}, |
|
|
|
{ |
|
|
|
columnProp: 'inspectionRemark', |
|
|
|
headerAlign: "center", |
|
|
|
@ -1053,7 +1082,9 @@ |
|
|
|
submitFlag: '', |
|
|
|
cinvSourceCode: '', |
|
|
|
sku: '', |
|
|
|
spec: '' |
|
|
|
spec: '', |
|
|
|
umId: '', |
|
|
|
umName: '' |
|
|
|
}, |
|
|
|
detailInformationFlag:false, |
|
|
|
detailList:[], |
|
|
|
@ -1311,6 +1342,13 @@ |
|
|
|
message: ' ', |
|
|
|
trigger: 'change' |
|
|
|
} |
|
|
|
], |
|
|
|
umIdType: [ |
|
|
|
{ |
|
|
|
required: true, |
|
|
|
message: ' ', |
|
|
|
trigger: 'change' |
|
|
|
} |
|
|
|
] |
|
|
|
}, |
|
|
|
resourceList: [], |
|
|
|
@ -1418,7 +1456,8 @@ |
|
|
|
fixed: '', |
|
|
|
}, |
|
|
|
], |
|
|
|
partModelFlag: false |
|
|
|
partModelFlag: false, |
|
|
|
umList: [] |
|
|
|
} |
|
|
|
}, |
|
|
|
mounted () { |
|
|
|
@ -1427,13 +1466,34 @@ |
|
|
|
}) |
|
|
|
}, |
|
|
|
created () { |
|
|
|
// 数据列表 |
|
|
|
this.getDataList() |
|
|
|
// 收藏 |
|
|
|
this.favoriteIsOk() |
|
|
|
this.InspectionTypeSearch() |
|
|
|
// 检验类型 |
|
|
|
this.inspectionTypeSearch() |
|
|
|
// 处置措施列表 |
|
|
|
this.disposalMeasuresSearch() |
|
|
|
// 单位 |
|
|
|
this.umSearch() |
|
|
|
// 查看 质量任务生成规则控制 动控是否开启 |
|
|
|
this.queryController() |
|
|
|
}, |
|
|
|
methods: { |
|
|
|
|
|
|
|
// 查询单位 |
|
|
|
umSearch(){ |
|
|
|
let tempData = { |
|
|
|
site: this.$store.state.user.site, |
|
|
|
active: 'Y' |
|
|
|
} |
|
|
|
umSearch(tempData).then(({data}) => { |
|
|
|
if (data.code === 0) { |
|
|
|
this.umList = data.rows |
|
|
|
} |
|
|
|
}) |
|
|
|
}, |
|
|
|
|
|
|
|
// 标签号回车事件 |
|
|
|
rollNoEnter () { |
|
|
|
let tempData = { |
|
|
|
@ -1516,11 +1576,11 @@ |
|
|
|
}, |
|
|
|
|
|
|
|
// 查询检验类型 |
|
|
|
InspectionTypeSearch(){ |
|
|
|
inspectionTypeSearch(){ |
|
|
|
let tempData = { |
|
|
|
site: this.$store.state.user.site |
|
|
|
} |
|
|
|
InspectionTypeSearch(tempData).then(({data}) => { |
|
|
|
inspectionTypeSearch(tempData).then(({data}) => { |
|
|
|
if (data.code === 0) { |
|
|
|
this.typeOptions = data.rows |
|
|
|
} |
|
|
|
@ -1672,7 +1732,9 @@ |
|
|
|
templateName: '', |
|
|
|
specialTaskFlag: '', |
|
|
|
workCenterNo: '', |
|
|
|
rollNo: '' |
|
|
|
rollNo: '', |
|
|
|
umId: this.umList[0].umId, |
|
|
|
umName: this.umList[0].umName |
|
|
|
} |
|
|
|
// 获取选中框 |
|
|
|
let obj = document.getElementsByName('specialTask') |
|
|
|
@ -1702,6 +1764,7 @@ |
|
|
|
|
|
|
|
// 新增FAI巡检记录 |
|
|
|
saveData(){ |
|
|
|
console.log(this.modalData) |
|
|
|
if (this.modalData.seqNo === '' || this.modalData.seqNo == null) { |
|
|
|
this.$message.warning('请选择派工单！') |
|
|
|
return |
|
|
|
@ -1726,6 +1789,10 @@ |
|
|
|
this.$message.warning('请填写送检数量！') |
|
|
|
return |
|
|
|
} |
|
|
|
if (this.modalData.umId === '' || this.modalData.umId == null) { |
|
|
|
this.$message.warning('请选择单位！') |
|
|
|
return |
|
|
|
} |
|
|
|
if (this.controlData.baseData === '控制' && (this.modalData.templateId == null || this.modalData.templateId === '')) { |
|
|
|
this.$message.warning('请选择检验模板！') |
|
|
|
return |
|
|
|
@ -1773,8 +1840,6 @@ |
|
|
|
|
|
|
|
// 新增 |
|
|
|
addModal(){ |
|
|
|
// 查看 质量任务生成规则控制 动控是否开启 |
|
|
|
this.queryController() |
|
|
|
this.modalData = { |
|
|
|
flag: '1', |
|
|
|
site: this.$store.state.user.site, |
|
|
|
@ -1801,7 +1866,9 @@ |
|
|
|
templateName: '', |
|
|
|
specialTaskFlag: '', |
|
|
|
workCenterNo: '', |
|
|
|
rollNo: '' |
|
|
|
rollNo: '', |
|
|
|
umId: this.umList[0].umId, |
|
|
|
umName: this.umList[0].umName |
|
|
|
} |
|
|
|
this.operationList = [] |
|
|
|
this.resourceList = [] |
|
|
|
@ -2131,6 +2198,8 @@ |
|
|
|
this.detailData.cinvSourceCode = row.cinvSourceCode |
|
|
|
this.detailData.sku = row.sku |
|
|
|
this.detailData.spec = row.spec |
|
|
|
this.detailData.umId = row.umId |
|
|
|
this.detailData.umName = row.umName |
|
|
|
this.getInspectionFormData() |
|
|
|
this.inspectorSearch() |
|
|
|
this.detailInformationFlag = true |
|
|
|
|
杨奉源
3 years ago