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

6

java8
yfy 3 years ago
parent
cc20636988
commit
594be26531
4 changed files with 220 additions and 75 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. 1
      src/api/qc/qc.js
  2. 252
      src/views/modules/qc/FAIResultEntry.vue
  3. 2
      src/views/modules/qc/qcFamilyAttribute.vue
  4. 40
      src/views/modules/qc/qcTemplate.vue

1
src/api/qc/qc.js
View File

@ -122,3 +122,4 @@ export const uploadFamilyAttributeExcel = data => createAPI(`/pms/qc/uploadFamil
// ===================================== FAI检验 ===================================== // ===================================== FAI检验 =====================================
export const qcFAIInspectionSearch = data => createAPI(`/pms/qc/qcFAIInspectionSearch`,'post',data) export const qcFAIInspectionSearch = data => createAPI(`/pms/qc/qcFAIInspectionSearch`,'post',data)
export const faiDetailSearch = data => createAPI(`/pms/qc/faiDetailSearch`,'post',data)

252
src/views/modules/qc/FAIResultEntry.vue
View File

@ -8,11 +8,11 @@
</div> </div>
<!-- 条件查询 --> <!-- 条件查询 -->
<el-form :inline="true" label-position="top" :model="searchData" > <el-form :inline="true" label-position="top" :model="searchData" >
<el-form-item :label="'检验编码'">
<el-input v-model="searchData.inspectionNo" style="width: 120px"></el-input>
<el-form-item :label="'工单号'">
<el-input v-model="searchData.orderNo" style="width: 120px"></el-input>
</el-form-item> </el-form-item>
<el-form-item :label="'质检员编码'">
<el-input v-model="searchData.inspectorNo" style="width: 120px"></el-input>
<el-form-item :label="'工序'">
<el-input v-model="searchData.operationDesc" style="width: 120px"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="检验时间"> <el-form-item label="检验时间">
<el-col :span="11"> <el-col :span="11">
@ -73,7 +73,7 @@
width="230" width="230"
label="操作"> label="操作">
<template slot-scope="scope"> <template slot-scope="scope">
<a type="text" size="small" @click="detailModal(scope.row)">明细信息</a>
<a type="text" size="small" @click="detailModal(scope.row)">检验单</a>
<a type="text" v-if = "scope.row.isQualified == 'D'" size="small" @click="submitResult(scope.row)">提交</a> <a type="text" v-if = "scope.row.isQualified == 'D'" size="small" @click="submitResult(scope.row)">提交</a>
<a type="text" size="small" @click="deleteModal(scope.row)">删除</a> <a type="text" size="small" @click="deleteModal(scope.row)">删除</a>
</template> </template>
@ -289,6 +289,7 @@
<script> <script>
import { import {
qcFAIInspectionSearch, // 查询FAI的检验记录 qcFAIInspectionSearch, // 查询FAI的检验记录
faiDetailSearch, // 查询FAI的检验明细
qcInspectionInformationSearch, // 检验记录查询 qcInspectionInformationSearch, // 检验记录查询
qcInspectionInformationSave, // 新增检验记录 qcInspectionInformationSave, // 新增检验记录
@ -339,13 +340,10 @@
tagNo:'', tagNo:'',
searchData: { searchData: {
site: this.$store.state.user.site, site: this.$store.state.user.site,
inspectionNo: '',
inspectionTypeNo:'102',
inspectorNo: '',
isQualified: '',
familyType:'D',
partNo:'',
partDesc:'',
orderNo: '',
operationDesc: '',
startDate: '',
endDate: '',
page: 1, page: 1,
limit: 10, limit: 10,
}, },
@ -392,17 +390,17 @@
serialNumber: '301005TableSite', serialNumber: '301005TableSite',
tableId: "301005Table", tableId: "301005Table",
tableName: "检验记录表", tableName: "检验记录表",
columnProp: 'site',
columnProp: 'inspectionNo',
headerAlign: "center", headerAlign: "center",
align: "left", align: "left",
columnLabel: '工厂编码',
columnLabel: '检验单号',
columnHidden: false, columnHidden: false,
columnImage: false, columnImage: false,
columnSortable: false, columnSortable: false,
sortLv: 0, sortLv: 0,
status: true, status: true,
fixed: '', fixed: '',
columnWidth: 40,
columnWidth: 100,
}, },
{ {
userId: this.$store.state.user.name, userId: this.$store.state.user.name,
@ -410,10 +408,10 @@
serialNumber: '301005TablePlanID', serialNumber: '301005TablePlanID',
tableId: "301005Table", tableId: "301005Table",
tableName: "检验记录表", tableName: "检验记录表",
columnProp: 'inspectionNo',
columnProp: 'state',
headerAlign: "center", headerAlign: "center",
align: "left", align: "left",
columnLabel: '检验编码',
columnLabel: '状态',
columnHidden: false, columnHidden: false,
columnImage: false, columnImage: false,
columnSortable: false, columnSortable: false,
@ -428,10 +426,46 @@
serialNumber: '301005TablePlanDesc', serialNumber: '301005TablePlanDesc',
tableId: "301005Table", tableId: "301005Table",
tableName: "检验记录表", tableName: "检验记录表",
columnProp: 'workOrderNumber',
columnProp: 'inspectionResult',
headerAlign: "center", headerAlign: "center",
align: "left", align: "left",
columnLabel: '工单号',
columnLabel: '检验结论',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 100,
},
{
userId: this.$store.state.user.name,
functionId: 301005,
serialNumber: '301005TablePlanDesc',
tableId: "301005Table",
tableName: "检验记录表",
columnProp: 'taskDate',
headerAlign: "center",
align: "left",
columnLabel: '任务生成日期',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 100,
},
{
userId: this.$store.state.user.name,
functionId: 301005,
serialNumber: '301005TablePlanDesc',
tableId: "301005Table",
tableName: "检验记录表",
columnProp: 'inspectionTypeNo',
headerAlign: "center",
align: "left",
columnLabel: '检验类型',
columnHidden: false, columnHidden: false,
columnImage: false, columnImage: false,
columnSortable: false, columnSortable: false,
@ -446,10 +480,10 @@
serialNumber: '301005TablePlanDesc', serialNumber: '301005TablePlanDesc',
tableId: "301005Table", tableId: "301005Table",
tableName: "检验记录表", tableName: "检验记录表",
columnProp: 'reelNumber',
columnProp: 'inspectionCycle',
headerAlign: "center", headerAlign: "center",
align: "left", align: "left",
columnLabel: '取样所在卷号',
columnLabel: '检验周期(h)',
columnHidden: false, columnHidden: false,
columnImage: false, columnImage: false,
columnSortable: false, columnSortable: false,
@ -464,6 +498,60 @@
serialNumber: '301005TablePlanDesc', serialNumber: '301005TablePlanDesc',
tableId: "301005Table", tableId: "301005Table",
tableName: "检验记录表", tableName: "检验记录表",
columnProp: 'orderNo',
headerAlign: "center",
align: "left",
columnLabel: '工单号',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 100,
},
{
userId: this.$store.state.user.name,
functionId: 301005,
serialNumber: '301005TableObjectID',
tableId: "301005Table",
tableName: "检验记录表",
columnProp: 'operationDesc',
headerAlign: "center",
align: "left",
columnLabel: '工序',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 100,
},
{
userId: this.$store.state.user.name,
functionId: 301005,
serialNumber: '301005TablePropertiesCode',
tableId: "301005Table",
tableName: "检验记录表",
columnProp: 'resourceDesc',
headerAlign: "center",
align: "left",
columnLabel: '机台',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 100,
},
{
userId: this.$store.state.user.name,
functionId: 301005,
serialNumber: '301005TablePropertiesCode',
tableId: "301005Table",
tableName: "检验记录表",
columnProp: 'partNo', columnProp: 'partNo',
headerAlign: "center", headerAlign: "center",
align: "left", align: "left",
@ -479,7 +567,7 @@
{ {
userId: this.$store.state.user.name, userId: this.$store.state.user.name,
functionId: 301005, functionId: 301005,
serialNumber: '301005TablePlanDesc',
serialNumber: '301005TablePropertiesCode',
tableId: "301005Table", tableId: "301005Table",
tableName: "检验记录表", tableName: "检验记录表",
columnProp: 'partDesc', columnProp: 'partDesc',
@ -492,43 +580,79 @@
sortLv: 0, sortLv: 0,
status: true, status: true,
fixed: '', fixed: '',
columnWidth: 180,
columnWidth: 100,
}, },
{ {
userId: this.$store.state.user.name, userId: this.$store.state.user.name,
functionId: 301005, functionId: 301005,
serialNumber: '301005TablePlanDesc',
serialNumber: '301005TablePropertiesCode',
tableId: "301005Table", tableId: "301005Table",
tableName: "检验记录表", tableName: "检验记录表",
columnProp: 'inspectionTypeName',
columnProp: 'rollQty',
headerAlign: "center", headerAlign: "center",
align: "left", align: "left",
columnLabel: '检验类型',
columnLabel: '送检数量',
columnHidden: false, columnHidden: false,
columnImage: false, columnImage: false,
columnSortable: false, columnSortable: false,
sortLv: 0, sortLv: 0,
status: true, status: true,
fixed: '', fixed: '',
columnWidth: 80,
columnWidth: 100,
}, },
{ {
userId: this.$store.state.user.name, userId: this.$store.state.user.name,
functionId: 301005, functionId: 301005,
serialNumber: '301005TableObjectID',
serialNumber: '301005TablePropertiesCode',
tableId: "301005Table", tableId: "301005Table",
tableName: "检验记录表", tableName: "检验记录表",
columnProp: 'inspectorName',
columnProp: 'samplingQty',
headerAlign: "center", headerAlign: "center",
align: "left", align: "left",
columnLabel: '质检员',
columnLabel: '抽样数量',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 100,
},
{
userId: this.$store.state.user.name,
functionId: 301005,
serialNumber: '301005TablePropertiesCode',
tableId: "301005Table",
tableName: "检验记录表",
columnProp: 'disposalMeasures',
headerAlign: "center",
align: "left",
columnLabel: '处置措施',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 100,
},
{
userId: this.$store.state.user.name,
functionId: 301005,
serialNumber: '301005TablePropertiesCode',
tableId: "301005Table",
tableName: "检验记录表",
columnProp: 'disposalRemark',
headerAlign: "center",
align: "left",
columnLabel: '处置说明',
columnHidden: false, columnHidden: false,
columnImage: false, columnImage: false,
columnSortable: false, columnSortable: false,
sortLv: 0, sortLv: 0,
status: true, status: true,
fixed: '', fixed: '',
columnWidth: 80,
columnWidth: 100,
}, },
{ {
userId: this.$store.state.user.name, userId: this.$store.state.user.name,
@ -536,7 +660,7 @@
serialNumber: '301005TablePropertiesCode', serialNumber: '301005TablePropertiesCode',
tableId: "301005Table", tableId: "301005Table",
tableName: "检验记录表", tableName: "检验记录表",
columnProp: 'createTime',
columnProp: 'inspectorDate',
headerAlign: "center", headerAlign: "center",
align: "left", align: "left",
columnLabel: '检验时间', columnLabel: '检验时间',
@ -546,7 +670,7 @@
sortLv: 0, sortLv: 0,
status: true, status: true,
fixed: '', fixed: '',
columnWidth: 80,
columnWidth: 100,
}, },
{ {
userId: this.$store.state.user.name, userId: this.$store.state.user.name,
@ -554,30 +678,51 @@
serialNumber: '301005TablePropertiesCode', serialNumber: '301005TablePropertiesCode',
tableId: "301005Table", tableId: "301005Table",
tableName: "检验记录表", tableName: "检验记录表",
columnProp: 'isQualifiedChinese',
columnProp: 'inspectorNo',
headerAlign: "center", headerAlign: "center",
align: "left", align: "left",
columnLabel: '是否合格',
columnLabel: '质检员',
columnHidden: false, columnHidden: false,
columnImage: false, columnImage: false,
columnSortable: false, columnSortable: false,
sortLv: 0, sortLv: 0,
status: true, status: true,
fixed: '', fixed: '',
columnWidth: 80,
}
columnWidth: 100,
},
{
userId: this.$store.state.user.name,
functionId: 301005,
serialNumber: '301005TablePropertiesCode',
tableId: "301005Table",
tableName: "检验记录表",
columnProp: 'inspectionRemark',
headerAlign: "center",
align: "left",
columnLabel: '质检备注',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 100,
},
], ],
//项目清单 //项目清单
addDetailModalFlag:false, addDetailModalFlag:false,
detailData:{ detailData:{
site:'',
site: this.$store.state.user.site,
inspectionNo:'', inspectionNo:'',
functionType:'',
familyType:'',
detailCodeNo:'',
subDetailCodeNo:'',
inspectorNo:'',
userId:this.$store.state.user.name
partNo:'',
partDesc:'',
rollQty:'',
unqualifiedQuantity:'',
disposalMeasures:'',
disposalRemark: '',
inspectionResult: '',
inspectorNo: '',
inspectionRemark: '',
}, },
masterInformationFlag:false, masterInformationFlag:false,
detailInformationFlag:false, detailInformationFlag:false,
@ -844,11 +989,10 @@
doEmpty(){ doEmpty(){
this.searchData = { this.searchData = {
site: this.$store.state.user.site, site: this.$store.state.user.site,
inspectionNo: '',
inspectionTypeNo: '102',
inspectorNo: '',
isQualified: '',
familyType:'D',
orderNo: '',
operationDesc: '',
startDate: '',
endDate: '',
page: 1, page: 1,
limit: 10, limit: 10,
} }
@ -1102,11 +1246,11 @@
// 明细记录信息查询 // 明细记录信息查询
detailModal(row){ detailModal(row){
this.detailData.site = row.site
this.detailData.detailCodeNo = row.detailCodeNo
this.detailData.inspectionNo = row.inspectionNo
this.detailData.inspectorNo = row.inspectorNo
detailInformationSearch(this.detailData).then(({data}) => {
this.detailData.partNo = row.partNo
this.detailData.partDesc = row.partDesc
this.detailData.rollQty = row.rollQty
this.detailData.samplingQty = row.samplingQty
faiDetailSearch(this.detailData).then(({data}) => {
this.detailList = data.rows this.detailList = data.rows
}) })
this.detailInformationFlag = true; this.detailInformationFlag = true;

2
src/views/modules/qc/qcFamilyAttribute.vue
View File

@ -897,7 +897,7 @@
}, },
// 关闭后刷新列表 // 关闭后刷新列表
refreshDetailList(){ refreshDetailList(){
searchModalDetails(this.detailData).then(({data}) => {
searchPartAttributeDetails(this.detailData).then(({data}) => {
this.detailList = data.rows this.detailList = data.rows
}) })
}, },

40
src/views/modules/qc/qcTemplate.vue
View File

@ -103,7 +103,7 @@
<el-form-item label="检验模板名称:"> <el-form-item label="检验模板名称:">
<el-input v-model="modalData.templateName" style="width: 120px"></el-input> <el-input v-model="modalData.templateName" style="width: 120px"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="检验周期:">
<el-form-item label="检验周期(h):">
<el-input v-model="modalData.inspectionCycle" type="number" style="width: 120px"></el-input> <el-input v-model="modalData.inspectionCycle" type="number" style="width: 120px"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="检验类型"> <el-form-item label="检验类型">
@ -522,7 +522,7 @@
columnProp: 'inspectionCycle', columnProp: 'inspectionCycle',
headerAlign: "center", headerAlign: "center",
align: "left", align: "left",
columnLabel: '检验周期',
columnLabel: '检验周期(h)',
columnHidden: false, columnHidden: false,
columnImage: false, columnImage: false,
columnSortable: false, columnSortable: false,
@ -967,24 +967,24 @@
}) })
return false return false
} }
if (this.modalData.aql == '' || this.modalData.aql == null) {
this.$alert('请输入AQL！', '错误', {
confirmButtonText: '确定'
})
return false
}
if (this.modalData.ac == '' || this.modalData.ac == null) {
this.$alert('请输入AC！', '错误', {
confirmButtonText: '确定'
})
return false
}
if (this.modalData.re == '' || this.modalData.re == null) {
this.$alert('请输入RE！', '错误', {
confirmButtonText: '确定'
})
return false
}
// if (this.modalData.aql == '' || this.modalData.aql == null) {
// this.$alert('请输入AQL！', '错误', {
// confirmButtonText: '确定'
// })
// return false
// }
// if (this.modalData.ac == '' || this.modalData.ac == null) {
// this.$alert('请输入AC！', '错误', {
// confirmButtonText: '确定'
// })
// return false
// }
// if (this.modalData.re == '' || this.modalData.re == null) {
// this.$alert('请输入RE！', '错误', {
// confirmButtonText: '确定'
// })
// return false
// }
if(this.modalData.flag == '1'){ if(this.modalData.flag == '1'){
templateSave(this.modalData).then(({data}) => { templateSave(this.modalData).then(({data}) => {
if (data && data.code === 0) { if (data && data.code === 0) {

Write Preview
Loading…
Cancel
Save