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

2023-12-14 检验任务物料默认不查询、检验模版加个必填的标记、检验任务新增选择模版的时候 默认根据菜单的检验类型筛选

java8
fengyuan_yang 2 years ago
parent
c974d59507
commit
345724c311
3 changed files with 108 additions and 36 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 48
      src/views/modules/qc/FAIResultEntry.vue
  2. 48
      src/views/modules/qc/FQCResultEntry.vue
  3. 48
      src/views/modules/qc/IPQCResultEntry.vue

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

@ -232,7 +232,7 @@
</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>
<el-form-item prop="templateId" :rules="rules.templateId">
<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>
@ -1628,6 +1628,13 @@
message: ' ',
trigger: 'change'
}
],
templateId: [
{
required: true,
message: ' ',
trigger: 'change'
}
]
},
resourceList: [],
@ -1890,6 +1897,12 @@
inspectionTypeSearch(tempData).then(({data}) => {
if (data.code === 0) {
this.typeOptions = data.rows
this.typeOptions.forEach(val => {
if (val.inspectionTypeName.includes('FAI')) {
this.templateData.inspectionTypeNo = val.inspectionTypeNo
this.templateData.inspectionTypeName = val.inspectionTypeName
}
})
}
})
},
@ -2070,7 +2083,7 @@
},
// 新增FAI巡检记录
saveData(){
saveData () {
if (this.modalData.seqNo === '' || this.modalData.seqNo == null) {
this.$message.warning('请选择派工单！')
return
@ -2202,16 +2215,21 @@
// 获取物料列表
queryPartList () {
// 查询所有物料
queryPartList(this.partData).then(({data}) => {
if (data && data.code === 0) {
this.partList = data.rows
this.partModelFlag = true
}else {
this.$alert(data.msg, '错误', {
confirmButtonText: '确定'
})
}
})
if (this.partData.partNo === '' && this.partData.partDesc === '' && this.partData.sku === '') {
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.$alert(data.msg, '错误', {
confirmButtonText: '确定'
})
}
})
}
},
// 选中检验模板
@ -2227,6 +2245,12 @@
this.modalData.partDesc = row.partDesc
this.modalData.sku = row.sku
this.modalData.spec = row.spec
this.partData = {
site: this.$store.state.user.site,
partNo: '',
partDesc: '',
sku: ''
}
this.partModelFlag = false
},

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

@ -230,7 +230,7 @@
</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>
<el-form-item prop="templateId" :rules="rules.templateId">
<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>
@ -1627,6 +1627,13 @@
message: ' ',
trigger: 'change'
}
],
templateId: [
{
required: true,
message: ' ',
trigger: 'change'
}
]
},
resourceList: [],
@ -1889,6 +1896,12 @@
inspectionTypeSearch(tempData).then(({data}) => {
if (data.code === 0) {
this.typeOptions = data.rows
this.typeOptions.forEach(val => {
if (val.inspectionTypeName.includes('FQC')) {
this.templateData.inspectionTypeNo = val.inspectionTypeNo
this.templateData.inspectionTypeName = val.inspectionTypeName
}
})
}
})
},
@ -2069,7 +2082,7 @@
},
// 新增FAI巡检记录
saveData(){
saveData () {
if (this.modalData.seqNo === '' || this.modalData.seqNo == null) {
this.$message.warning('请选择派工单！')
return
@ -2201,16 +2214,21 @@
// 获取物料列表
queryPartList () {
// 查询所有物料
queryPartList(this.partData).then(({data}) => {
if (data && data.code === 0) {
this.partList = data.rows
this.partModelFlag = true
}else {
this.$alert(data.msg, '错误', {
confirmButtonText: '确定'
})
}
})
if (this.partData.partNo === '' && this.partData.partDesc === '' && this.partData.sku === '') {
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.$alert(data.msg, '错误', {
confirmButtonText: '确定'
})
}
})
}
},
// 选中检验模板
@ -2226,6 +2244,12 @@
this.modalData.partDesc = row.partDesc
this.modalData.sku = row.sku
this.modalData.spec = row.spec
this.partData = {
site: this.$store.state.user.site,
partNo: '',
partDesc: '',
sku: ''
}
this.partModelFlag = false
},

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

@ -259,7 +259,7 @@
</el-form-item>
</el-form>
<el-form :inline="true" label-position="top" :model="modalData" style="margin-left: 7px;margin-top: -5px;">
<el-form-item>
<el-form-item prop="templateId" :rules="rules.templateId">
<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>
@ -1675,6 +1675,13 @@
message: ' ',
trigger: 'change'
}
],
templateId: [
{
required: true,
message: ' ',
trigger: 'change'
}
]
},
batchHandleAddModalFlag: false,
@ -1936,6 +1943,12 @@
inspectionTypeSearch(tempData).then(({data}) => {
if (data.code === 0) {
this.typeOptions = data.rows
this.typeOptions.forEach(val => {
if (val.inspectionTypeName.includes('IPQC')) {
this.templateData.inspectionTypeNo = val.inspectionTypeNo
this.templateData.inspectionTypeName = val.inspectionTypeName
}
})
}
})
},
@ -2254,16 +2267,21 @@
// 获取物料列表
queryPartList () {
// 查询所有物料
queryPartList(this.partData).then(({data}) => {
if (data && data.code === 0) {
this.partList = data.rows
this.partModelFlag = true
}else {
this.$alert(data.msg, '错误', {
confirmButtonText: '确定'
})
}
})
if (this.partData.partNo === '' && this.partData.partDesc === '' && this.partData.sku === '') {
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.$alert(data.msg, '错误', {
confirmButtonText: '确定'
})
}
})
}
},
// 选中检验模板
@ -2279,6 +2297,12 @@
this.modalData.partDesc = row.partDesc
this.modalData.sku = row.sku
this.modalData.spec = row.spec
this.partData = {
site: this.$store.state.user.site,
partNo: '',
partDesc: '',
sku: ''
}
this.partModelFlag = false
},
@ -2342,7 +2366,7 @@
},
// 新增IPQC巡检记录
saveData(){
saveData () {
if (this.modalData.seqNo === '' || this.modalData.seqNo == null) {
this.$message.warning('请选择派工单！')
return

Write Preview
Loading…
Cancel
Save