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

2023-11-08 设备和质量修改

java8
杨奉源 3 years ago
parent
f264ba7ad3
commit
7d142c1e8d
9 changed files with 275 additions and 70 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. 3
      src/api/qc/qc.js
  2. 103
      src/views/modules/qc/FAIResultEntry.vue
  3. 102
      src/views/modules/qc/FQCResultEntry.vue
  4. 99
      src/views/modules/qc/IPQCResultEntry.vue
  5. 6
      src/views/modules/qc/qcFamilyAttribute.vue
  6. 8
      src/views/modules/qc/qcItem.vue
  7. 8
      src/views/modules/qc/qcMethod.vue
  8. 8
      src/views/modules/qc/qcPartAttribute.vue
  9. 8
      src/views/modules/qc/qcTemplate.vue

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

@ -25,7 +25,7 @@ export const templateSearch = data => createAPI(`/pms/qc/templateSearch`,'post',
export const templateSave = data => createAPI(`/pms/qc/templateSave`,'post',data) export const templateSave = data => createAPI(`/pms/qc/templateSave`,'post',data)
export const templateUpdate = data => createAPI(`/pms/qc/templateUpdate`,'post',data) export const templateUpdate = data => createAPI(`/pms/qc/templateUpdate`,'post',data)
export const templateDelete = data => createAPI(`/pms/qc/templateDelete`,'post',data) export const templateDelete = data => createAPI(`/pms/qc/templateDelete`,'post',data)
export const InspectionTypeSearch = data => createAPI(`/pms/qc/InspectionTypeSearch`,'post',data)
export const inspectionTypeSearch = data => createAPI(`/pms/qc/inspectionTypeSearch`,'post',data)
export const objectSearch = data => createAPI(`/pms/qc/objectSearch`,'post',data) export const objectSearch = data => createAPI(`/pms/qc/objectSearch`,'post',data)
export const templateDetailsSearch = data => createAPI(`/pms/qc/templateDetailsSearch`,'post',data) export const templateDetailsSearch = data => createAPI(`/pms/qc/templateDetailsSearch`,'post',data)
export const addItemDetails = data => createAPI(`/pms/qc/addItemDetails`,'post',data) export const addItemDetails = data => createAPI(`/pms/qc/addItemDetails`,'post',data)
@ -137,6 +137,7 @@ export const getSpecialOperationList = data => createAPI(`/pms/qc/getSpecialOper
export const getRollNo = data => createAPI(`/pms/qc/getRollNo`,'post',data) export const getRollNo = data => createAPI(`/pms/qc/getRollNo`,'post',data)
export const rollNoEnter = data => createAPI(`/pms/qc/rollNoEnter`,'post',data) export const rollNoEnter = data => createAPI(`/pms/qc/rollNoEnter`,'post',data)
export const queryPartList = data => createAPI(`/pms/qc/queryPartList`,'post',data) export const queryPartList = data => createAPI(`/pms/qc/queryPartList`,'post',data)
export const umSearch = data => createAPI(`/pms/qc/umSearch`,'post',data)
// ===================================== IQC检验 ===================================== // ===================================== IQC检验 =====================================
export const qcIQCInspectionSearch = data => createAPI(`/pms/qc/qcIQCInspectionSearch`,'post',data) export const qcIQCInspectionSearch = data => createAPI(`/pms/qc/qcIQCInspectionSearch`,'post',data)

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

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

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

@ -211,14 +211,24 @@
</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;margin-top: -5px;"> <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> <el-form-item>
<span v-if="this.controlData.baseData === '控制'" slot="label" @click="queryTemplateList()"><a>检验模板</a></span> <span v-if="this.controlData.baseData === '控制'" slot="label" @click="queryTemplateList()"><a>检验模板</a></span>
<span v-if="this.controlData.baseData === '未控制'" slot="label">检验模板</span> <span v-if="this.controlData.baseData === '未控制'" slot="label">检验模板</span>
<el-input v-model="modalData.templateName" disabled style="width: 221px"></el-input> <el-input v-model="modalData.templateName" disabled style="width: 221px"></el-input>
</el-form-item> </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>
<el-form :inline="true" label-position="top" :model="modalData" style="margin-left: 7px;margin-top: -5px;"> <el-form :inline="true" label-position="top" :model="modalData" style="margin-left: 7px;margin-top: -5px;">
<el-form-item label="老卷号"> <el-form-item label="老卷号">
@ -263,6 +273,9 @@
<el-form-item :label="'抽样数量'"> <el-form-item :label="'抽样数量'">
<el-input v-model="detailData.samplingQty" type="number" style="width: 80px"></el-input> <el-input v-model="detailData.samplingQty" type="number" style="width: 80px"></el-input>
</el-form-item> </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>
<el-form :inline="true" label-position="top" @keyup.enter.native = "getDataList()"> <el-form :inline="true" label-position="top" @keyup.enter.native = "getDataList()">
<el-form-item :label="'不合格项目数量'"> <el-form-item :label="'不合格项目数量'">
@ -320,8 +333,8 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item :label="'质检备注'"> <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>
<el-form-item :label="' '"> <el-form-item :label="' '">
<el-button type="primary" @click="addUploadFileModal()">上传文件</el-button> <el-button type="primary" @click="addUploadFileModal()">上传文件</el-button>
@ -645,11 +658,12 @@
queryTemplateList, // 获取检验模板列表 queryTemplateList, // 获取检验模板列表
getPartInformation, // 获取物料信息 getPartInformation, // 获取物料信息
getSpecialOperationList, // 获取特殊工序列表 getSpecialOperationList, // 获取特殊工序列表
InspectionTypeSearch, // 搜索所有检验类型
inspectionTypeSearch, // 搜索所有检验类型
disposalMeasuresSearch, // 获取处置措施列表 disposalMeasuresSearch, // 获取处置措施列表
getRollNo, // 模糊查询标签号 getRollNo, // 模糊查询标签号
rollNoEnter, // 标签号回车事件 rollNoEnter, // 标签号回车事件
queryPartList // 查询物料集合
queryPartList, // 查询物料集合
umSearch // 查询单位列表
} from "@/api/qc/qc.js"; } from "@/api/qc/qc.js";
import Chooselist from '@/views/modules/common/Chooselist_eam'; import Chooselist from '@/views/modules/common/Chooselist_eam';
import {getFileContentList, downLoadObjectFile} from '@/api/eam/eam_object_list.js'; import {getFileContentList, downLoadObjectFile} from '@/api/eam/eam_object_list.js';
@ -728,7 +742,9 @@
templateName: '', templateName: '',
specialTaskFlag: '', specialTaskFlag: '',
workCenterNo: '', workCenterNo: '',
rollNo: ''
rollNo: '',
umId: '',
umName: ''
}, },
// 展示列集 // 展示列集
columnList: [ columnList: [
@ -966,6 +982,19 @@
fixed: '', fixed: '',
columnWidth: 80, columnWidth: 80,
}, },
{
columnProp: 'umName',
headerAlign: "center",
align: "center",
columnLabel: '单位',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 80,
},
{ {
columnProp: 'inspectionRemark', columnProp: 'inspectionRemark',
headerAlign: "center", headerAlign: "center",
@ -1051,7 +1080,9 @@
submitFlag: '', submitFlag: '',
cinvSourceCode: '', cinvSourceCode: '',
sku: '', sku: '',
spec: ''
spec: '',
umId: '',
umName: ''
}, },
detailInformationFlag:false, detailInformationFlag:false,
detailList:[], detailList:[],
@ -1309,6 +1340,13 @@
message: ' ', message: ' ',
trigger: 'change' trigger: 'change'
} }
],
umIdType: [
{
required: true,
message: ' ',
trigger: 'change'
}
] ]
}, },
resourceList: [], resourceList: [],
@ -1416,7 +1454,8 @@
fixed: '', fixed: '',
}, },
], ],
partModelFlag: false
partModelFlag: false,
umList: []
} }
}, },
mounted () { mounted () {
@ -1425,13 +1464,34 @@
}) })
}, },
created () { created () {
// 数据列表
this.getDataList() this.getDataList()
// 收藏
this.favoriteIsOk() this.favoriteIsOk()
this.InspectionTypeSearch()
// 检验类型
this.inspectionTypeSearch()
// 处置措施
this.disposalMeasuresSearch() this.disposalMeasuresSearch()
// 单位
this.umSearch()
// 查看 质量任务生成规则控制 动控是否开启
this.queryController()
}, },
methods: { 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 () { rollNoEnter () {
let tempData = { let tempData = {
@ -1514,11 +1574,11 @@
}, },
// 查询检验类型 // 查询检验类型
InspectionTypeSearch(){
inspectionTypeSearch(){
let tempData = { let tempData = {
site: this.$store.state.user.site site: this.$store.state.user.site
} }
InspectionTypeSearch(tempData).then(({data}) => {
inspectionTypeSearch(tempData).then(({data}) => {
if (data.code === 0) { if (data.code === 0) {
this.typeOptions = data.rows this.typeOptions = data.rows
} }
@ -1670,7 +1730,9 @@
templateName: '', templateName: '',
specialTaskFlag: '', specialTaskFlag: '',
workCenterNo: '', workCenterNo: '',
rollNo: ''
rollNo: '',
umId: this.umList[0].umId,
umName: this.umList[0].umName
} }
// 获取选中框 // 获取选中框
let obj = document.getElementsByName('specialTask') let obj = document.getElementsByName('specialTask')
@ -1724,6 +1786,10 @@
this.$message.warning('请填写送检数量！') this.$message.warning('请填写送检数量！')
return return
} }
if (this.modalData.umId === '' || this.modalData.umId == null) {
this.$message.warning('请选择单位！')
return
}
if (this.controlData.baseData === '控制' && (this.modalData.templateId == null || this.modalData.templateId === '')) { if (this.controlData.baseData === '控制' && (this.modalData.templateId == null || this.modalData.templateId === '')) {
this.$message.warning('请选择检验模板！') this.$message.warning('请选择检验模板！')
return return
@ -1771,8 +1837,6 @@
// 新增 // 新增
addModal(){ addModal(){
// 查看 质量任务生成规则控制 动控是否开启
this.queryController()
this.modalData = { this.modalData = {
flag: '1', flag: '1',
site: this.$store.state.user.site, site: this.$store.state.user.site,
@ -1799,7 +1863,9 @@
templateName: '', templateName: '',
specialTaskFlag: '', specialTaskFlag: '',
workCenterNo: '', workCenterNo: '',
rollNo: ''
rollNo: '',
umId: this.umList[0].umId,
umName: this.umList[0].umName
} }
this.operationList = [] this.operationList = []
this.resourceList = [] this.resourceList = []
@ -2129,6 +2195,8 @@
this.detailData.cinvSourceCode = row.cinvSourceCode this.detailData.cinvSourceCode = row.cinvSourceCode
this.detailData.sku = row.sku this.detailData.sku = row.sku
this.detailData.spec = row.spec this.detailData.spec = row.spec
this.detailData.umId = row.umId
this.detailData.umName = row.umName
this.getInspectionFormData() this.getInspectionFormData()
this.inspectorSearch() this.inspectorSearch()
this.detailInformationFlag = true this.detailInformationFlag = true

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

@ -231,7 +231,17 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="送检数量" prop="rollQty" :rules="rules.rollQtyType"> <el-form-item label="送检数量" prop="rollQty" :rules="rules.rollQtyType">
<el-input v-model="modalData.rollQty" type="number" style="width: 221px"></el-input>
<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-item>
</el-form> </el-form>
<el-form :inline="true" label-position="top" :model="modalData" style="margin-left: 7px;margin-top: -5px;"> <el-form :inline="true" label-position="top" :model="modalData" style="margin-left: 7px;margin-top: -5px;">
@ -284,6 +294,9 @@
<el-form-item :label="'抽样数量'"> <el-form-item :label="'抽样数量'">
<el-input v-model="detailData.samplingQty" type="number" style="width: 80px"></el-input> <el-input v-model="detailData.samplingQty" type="number" style="width: 80px"></el-input>
</el-form-item> </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>
<el-form :inline="true" label-position="top" @keyup.enter.native = "getDataList()"> <el-form :inline="true" label-position="top" @keyup.enter.native = "getDataList()">
<el-form-item :label="'不合格项目数量'"> <el-form-item :label="'不合格项目数量'">
@ -341,8 +354,8 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item :label="'质检备注'"> <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>
<el-form-item :label="' '"> <el-form-item :label="' '">
<el-button type="primary" @click="addUploadFileModal()">上传文件</el-button> <el-button type="primary" @click="addUploadFileModal()">上传文件</el-button>
@ -663,11 +676,12 @@
queryTemplateList, // 获取检验模板列表 queryTemplateList, // 获取检验模板列表
getPartInformation, // 获取物料信息 getPartInformation, // 获取物料信息
getSpecialOperationList, // 获取特殊工序列表 getSpecialOperationList, // 获取特殊工序列表
InspectionTypeSearch, // 搜索所有检验类型
inspectionTypeSearch, // 搜索所有检验类型
disposalMeasuresSearch, // 获取处置措施列表 disposalMeasuresSearch, // 获取处置措施列表
getRollNo, // 模糊查询标签号 getRollNo, // 模糊查询标签号
rollNoEnter, // 标签号回车事件 rollNoEnter, // 标签号回车事件
queryPartList // 查询物料集合
queryPartList, // 查询物料集合
umSearch // 查询单位列表
} from "@/api/qc/qc.js" } from "@/api/qc/qc.js"
import Chooselist from '@/views/modules/common/Chooselist_eam' import Chooselist from '@/views/modules/common/Chooselist_eam'
import {getFileContentList, downLoadObjectFile} from '@/api/eam/eam_object_list.js' import {getFileContentList, downLoadObjectFile} from '@/api/eam/eam_object_list.js'
@ -754,7 +768,9 @@
templateName: '', templateName: '',
specialTaskFlag: '', specialTaskFlag: '',
workCenterNo: '', workCenterNo: '',
rollNo: ''
rollNo: '',
umId: '',
umName: ''
}, },
// 展示列集 // 展示列集
columnList: [ columnList: [
@ -1005,6 +1021,19 @@
fixed: '', fixed: '',
columnWidth: 80, columnWidth: 80,
}, },
{
columnProp: 'umName',
headerAlign: "center",
align: "center",
columnLabel: '单位',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 80,
},
{ {
columnProp: 'inspectionRemark', columnProp: 'inspectionRemark',
headerAlign: "center", headerAlign: "center",
@ -1090,7 +1119,9 @@
submitFlag: '', submitFlag: '',
cinvSourceCode: '', cinvSourceCode: '',
sku: '', sku: '',
spec: ''
spec: '',
umId: '',
umName: ''
}, },
detailInformationFlag:false, detailInformationFlag:false,
detailList:[], detailList:[],
@ -1359,6 +1390,13 @@
message: ' ', message: ' ',
trigger: 'change' trigger: 'change'
} }
],
umIdType: [
{
required: true,
message: ' ',
trigger: 'change'
}
] ]
}, },
batchHandleAddModalFlag: false, batchHandleAddModalFlag: false,
@ -1463,7 +1501,8 @@
typeOptions: [], typeOptions: [],
disposalMeasuresOptions: [], disposalMeasuresOptions: [],
timeout: null, timeout: null,
partModelFlag: false
partModelFlag: false,
umList: []
} }
}, },
mounted () { mounted () {
@ -1472,12 +1511,32 @@
}) })
}, },
created () { created () {
// 数据列表
this.getDataList() this.getDataList()
// 收藏
this.favoriteIsOk() this.favoriteIsOk()
this.InspectionTypeSearch()
// 检验类型
this.inspectionTypeSearch()
// 处置措施
this.disposalMeasuresSearch() this.disposalMeasuresSearch()
// 单位
this.umSearch()
// 查看 质量任务生成规则控制 动控是否开启
this.queryController()
}, },
methods: { 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 () { rollNoEnter () {
@ -1562,11 +1621,11 @@
}, },
// 查询检验类型 // 查询检验类型
InspectionTypeSearch(){
inspectionTypeSearch(){
let tempData = { let tempData = {
site: this.$store.state.user.site site: this.$store.state.user.site
} }
InspectionTypeSearch(tempData).then(({data}) => {
inspectionTypeSearch(tempData).then(({data}) => {
if (data.code === 0) { if (data.code === 0) {
this.typeOptions = data.rows this.typeOptions = data.rows
} }
@ -1689,7 +1748,7 @@
}) })
}, },
// 查询检验类型
// 查询检验员
inspectorSearch(){ inspectorSearch(){
inspectorSearch().then(({data}) => { inspectorSearch().then(({data}) => {
if (data.code === 0) { if (data.code === 0) {
@ -1831,8 +1890,6 @@
}, },
addModal(){ addModal(){
// 查看 质量任务生成规则控制 动控是否开启
this.queryController()
this.modalData = { this.modalData = {
flag: '1', flag: '1',
site: this.$store.state.user.site, site: this.$store.state.user.site,
@ -1859,7 +1916,9 @@
templateName: '', templateName: '',
specialTaskFlag: '', specialTaskFlag: '',
workCenterNo: '', workCenterNo: '',
rollNo: ''
rollNo: '',
umId: this.umList[0].umId,
umName: this.umList[0].umName
} }
this.operationList = [] this.operationList = []
this.resourceList = [] this.resourceList = []
@ -1944,7 +2003,9 @@
templateName: '', templateName: '',
specialTaskFlag: '', specialTaskFlag: '',
workCenterNo: '', workCenterNo: '',
rollNo: ''
rollNo: '',
umId: this.umList[0].umId,
umName: this.umList[0].umName
} }
// 获取选中框 // 获取选中框
let obj = document.getElementsByName('specialTask') let obj = document.getElementsByName('specialTask')
@ -2002,6 +2063,10 @@
this.$message.warning('请填写送检数量！') this.$message.warning('请填写送检数量！')
return return
} }
if (this.modalData.umId === '' || this.modalData.umId == null) {
this.$message.warning('请选择单位！')
return
}
if (this.controlData.baseData === '控制' && (this.modalData.templateId == null || this.modalData.templateId === '')) { if (this.controlData.baseData === '控制' && (this.modalData.templateId == null || this.modalData.templateId === '')) {
this.$message.warning('请选择检验模板！') this.$message.warning('请选择检验模板！')
return return
@ -2176,6 +2241,8 @@
this.detailData.cinvSourceCode = row.cinvSourceCode this.detailData.cinvSourceCode = row.cinvSourceCode
this.detailData.sku = row.sku this.detailData.sku = row.sku
this.detailData.spec = row.spec this.detailData.spec = row.spec
this.detailData.umId = row.umId
this.detailData.umName = row.umName
this.getInspectionFormData() this.getInspectionFormData()
this.inspectorSearch() this.inspectorSearch()
this.detailInformationFlag = true this.detailInformationFlag = true

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

@ -832,7 +832,7 @@
created () { created () {
this.getDataList(); this.getDataList();
this.favoriteIsOk(); this.favoriteIsOk();
this.InspectionTypeSearch();
this.inspectionTypeSearch();
}, },
methods: { methods: {
/** /**
@ -878,11 +878,11 @@
}, },
// 查询检验类型 // 查询检验类型
InspectionTypeSearch(){
inspectionTypeSearch(){
let tempData = { let tempData = {
site: this.$store.state.user.site site: this.$store.state.user.site
} }
InspectionTypeSearch(tempData).then(({data}) => {
inspectionTypeSearch(tempData).then(({data}) => {
if (data.code === 0) { if (data.code === 0) {
this.options = data.rows this.options = data.rows
} }

8
src/views/modules/qc/qcItem.vue
View File

@ -185,7 +185,7 @@
qcItemSave, // 新增项目 qcItemSave, // 新增项目
qcItemUpdate, // 修改项目 qcItemUpdate, // 修改项目
qcItemDelete, // 删除项目 qcItemDelete, // 删除项目
InspectionTypeSearch
inspectionTypeSearch
} from "@/api/qc/qc.js" } from "@/api/qc/qc.js"
import Chooselist from '@/views/modules/common/Chooselist_eam' import Chooselist from '@/views/modules/common/Chooselist_eam'
import {userFavoriteList, saveUserFavorite, removeUserFavorite} from '@/api/userFavorite.js' import {userFavoriteList, saveUserFavorite, removeUserFavorite} from '@/api/userFavorite.js'
@ -461,7 +461,7 @@
created () { created () {
this.getDataList() this.getDataList()
this.favoriteIsOk() this.favoriteIsOk()
this.InspectionTypeSearch()
this.inspectionTypeSearch()
}, },
methods: { methods: {
/** /**
@ -522,11 +522,11 @@
this.getDataList() this.getDataList()
}, },
// 查询检验类型 // 查询检验类型
InspectionTypeSearch(){
inspectionTypeSearch(){
let tempData = { let tempData = {
site: this.$store.state.user.site site: this.$store.state.user.site
} }
InspectionTypeSearch(tempData).then(({data}) => {
inspectionTypeSearch(tempData).then(({data}) => {
if (data.code === 0) { if (data.code === 0) {
this.options = data.rows this.options = data.rows
} }

8
src/views/modules/qc/qcMethod.vue
View File

@ -147,7 +147,7 @@
qcMethodSave, // 检验方法新增 qcMethodSave, // 检验方法新增
qcMethodUpdate, // 检验方法修改 qcMethodUpdate, // 检验方法修改
qcMethodDelete, // 检验方法删除 qcMethodDelete, // 检验方法删除
InspectionTypeSearch, // 搜索所有检验类型
inspectionTypeSearch, // 搜索所有检验类型
} from "@/api/qc/qc.js" } from "@/api/qc/qc.js"
import {userFavoriteList, saveUserFavorite, removeUserFavorite} from '@/api/userFavorite.js' import {userFavoriteList, saveUserFavorite, removeUserFavorite} from '@/api/userFavorite.js'
export default { export default {
@ -320,7 +320,7 @@
created () { created () {
this.getDataList() this.getDataList()
this.favoriteIsOk() this.favoriteIsOk()
this.InspectionTypeSearch()
this.inspectionTypeSearch()
}, },
methods: { methods: {
/** /**
@ -484,11 +484,11 @@
} }
}, },
// 查询检验类型 // 查询检验类型
InspectionTypeSearch(){
inspectionTypeSearch(){
let tempData = { let tempData = {
site: this.$store.state.user.site site: this.$store.state.user.site
} }
InspectionTypeSearch(tempData).then(({data}) => {
inspectionTypeSearch(tempData).then(({data}) => {
if (data.code === 0) { if (data.code === 0) {
this.options = data.rows this.options = data.rows
} }

8
src/views/modules/qc/qcPartAttribute.vue
View File

@ -567,7 +567,7 @@
deletePartAttributeDetails, // 删除物料属性模板 deletePartAttributeDetails, // 删除物料属性模板
saveAttributeDetailed, // 新增物料属性模板详情 saveAttributeDetailed, // 新增物料属性模板详情
getPartTemplateLists, // 获取模板列表 getPartTemplateLists, // 获取模板列表
InspectionTypeSearch, // 搜索所有检验类型
inspectionTypeSearch, // 搜索所有检验类型
getOperationDescList, // 查询工序列表 getOperationDescList, // 查询工序列表
getManufacturerList, // 查询供应商列表 getManufacturerList, // 查询供应商列表
getAllResourceList // 查询机台列表 getAllResourceList // 查询机台列表
@ -889,7 +889,7 @@
created () { created () {
this.getDataList(); this.getDataList();
this.favoriteIsOk(); this.favoriteIsOk();
this.InspectionTypeSearch();
this.inspectionTypeSearch();
}, },
methods: { methods: {
@ -936,11 +936,11 @@
}, },
// 查询检验类型 // 查询检验类型
InspectionTypeSearch(){
inspectionTypeSearch(){
let tempData = { let tempData = {
site: this.$store.state.user.site site: this.$store.state.user.site
} }
InspectionTypeSearch(tempData).then(({data}) => {
inspectionTypeSearch(tempData).then(({data}) => {
if (data.code === 0) { if (data.code === 0) {
this.options = data.rows this.options = data.rows
} }

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

@ -420,7 +420,7 @@
templateSave, // 新增模板 templateSave, // 新增模板
templateUpdate, // 修改模板 templateUpdate, // 修改模板
templateDelete, // 删除模板 templateDelete, // 删除模板
InspectionTypeSearch, // 搜索所有检验类型
inspectionTypeSearch, // 搜索所有检验类型
objectSearch, // 搜索所有设备 objectSearch, // 搜索所有设备
templateDetailsSearch, // 查询明细列表 templateDetailsSearch, // 查询明细列表
addItemDetails, // 新增项目的检验明细 addItemDetails, // 新增项目的检验明细
@ -801,7 +801,7 @@
}, },
created () { created () {
this.getDataList() this.getDataList()
this.InspectionTypeSearch()
this.inspectionTypeSearch()
this.favoriteIsOk() this.favoriteIsOk()
}, },
methods: { methods: {
@ -841,11 +841,11 @@
}, },
// 查询检验类型 // 查询检验类型
InspectionTypeSearch(){
inspectionTypeSearch(){
let tempData = { let tempData = {
site: this.$store.state.user.site site: this.$store.state.user.site
} }
InspectionTypeSearch(tempData).then(({data}) => {
inspectionTypeSearch(tempData).then(({data}) => {
if (data.code === 0) { if (data.code === 0) {
this.options = data.rows this.options = data.rows
} }

Write Preview
Loading…
Cancel
Save