diff --git a/src/views/modules/qc/IQCResultEntry.vue b/src/views/modules/qc/IQCResultEntry.vue
index 2ab1422..5d7470d 100644
--- a/src/views/modules/qc/IQCResultEntry.vue
+++ b/src/views/modules/qc/IQCResultEntry.vue
@@ -438,15 +438,6 @@
-
-
- 供应商编码:
-
-
-
-
-
-
确定
关闭
@@ -503,46 +494,6 @@
-
-
-
-
-
-
-
-
-
-
-
- 查询
-
-
-
-
-
-
-
-
-
-
- 关闭
-
-
-
@@ -831,7 +782,6 @@
import subDetailUpload from "./sub_detail_upload"
import QrCode from "../common/QrCode.vue";
import IqcFileTable from "./IQCFileTable.vue";
- import {getManufacturerList, searchPartAttributeDetails} from "@/api/qc/qc.js";
export default {
components: {
IqcFileTable,
@@ -1316,24 +1266,6 @@
fixed: '',
columnWidth: 100,
},
- {
- userId: this.$store.state.user.name,
- functionId: 301006,
- serialNumber: '301006Table1SupplierDesc',
- tableId: "301006Table1",
- tableName: "IQC检验记录表",
- columnProp: 'supplierDesc',
- headerAlign: "center",
- align: "left",
- columnLabel: '供应商',
- columnHidden: false,
- columnImage: false,
- columnSortable: false,
- sortLv: 0,
- status: true,
- fixed: '',
- columnWidth: 200,
- },
{
userId: this.$store.state.user.name,
functionId: 301006,
@@ -1838,16 +1770,8 @@
detailInformationFlag: false,
iqcRecordOverFlag: false,
iqcRecordOverFlag2: false,
- manufacturerModelFlag: false,
- manufacturerData: {
- site: '',
- manufacturerID: '',
- manufacturerName: ''
- },
iqcRecordOverPartNo: '',
iqcRecordOverPartDesc: '',
- iqcRecordOverSupplierNo: '',
- iqcRecordOverSupplierDesc: '',
iqcRecordOverModal:{
attributeType: 'A',
userName: this.$store.state.user.name,
@@ -1857,7 +1781,6 @@
partDesc: ''
},
overLoadPartList: [],
- manufacturerList: [],
detailList: [],
saveInformationData: {
site: '',
@@ -3007,8 +2930,6 @@
if (this.IQCSelections.length === 1 && this.IQCSelections[0].buNo == '02-Hardtag' && (this.IQCSelections[0].state=='待检验'|| this.IQCSelections[0].state=='未开始') &&this.IQCSelections[0].partNo.substring(0,1) === '4') {
this.iqcRecordOverPartNo = this.IQCSelections[0].partNo
this.iqcRecordOverPartDesc = this.IQCSelections[0].partDesc
- this.iqcRecordOverSupplierNo = this.IQCSelections[0].supplierNo
- this.iqcRecordOverSupplierDesc = this.IQCSelections[0].supplierDesc
this.iqcRecordOverFlag = true
} else {
if (this.IQCSelections.every(val => val.state === '待检验' || val.state === '未开始')) {
@@ -3067,7 +2988,7 @@
let IQCSelections = this.IQCSelections
IQCSelections[0].partNo = this.iqcRecordOverPartNo
IQCSelections[0].partDesc = this.iqcRecordOverPartDesc
- IQCSelections[0].supplierNo = this.iqcRecordOverSupplierNo
+ IQCSelections[0].supplierNo = '*'
let tempData = {
site: '',
submitList: IQCSelections
@@ -3084,47 +3005,11 @@
})
this.iqcRecordOverFlag2 = true
},
- // 获取供应商列表
- getManufacturerList () {
- this.manufacturerData.site = '3'
- getManufacturerList(this.manufacturerData).then(({data}) => {
- if (data && data.code === 0) {
- this.manufacturerList = data.rows
- this.manufacturerModelFlag = true
- } else {
- this.$alert(data.msg, '错误', {
- confirmButtonText: '确定'
- })
- }
- })
- },
getRowData1(row){
this.iqcRecordOverPartNo = row.partNo
this.iqcRecordOverPartDesc = row.partDesc
- let param = {
- site: '3',
- buNo: '02-Hardtag',
- partNo: this.iqcRecordOverPartNo,
- attributeNo: this.iqcRecordOverPartNo,
- partDesc: this.iqcRecordOverPartDesc,
- inspectionTypeNo: '105',
- attributeType: 'A'
- }
- //查询选择的物料属性 对应的检验模板 供应商信息
- searchPartAttributeDetails(param).then(({data}) => {
- console.log(data.rows.length)
- if (data.rows.length > 0) {
- this.iqcRecordOverSupplierNo = data.rows[0].manufacturerID
- this.iqcRecordOverSupplierDesc = data.rows[0].manufacturerName
- }
- })
this.iqcRecordOverFlag2 = false
},
- manufacturerClickRow(row){
- this.iqcRecordOverSupplierNo = row.manufacturerID
- this.iqcRecordOverSupplierDesc = row.manufacturerName
- this.manufacturerModelFlag = false
- },
// 审核按钮
submitResult () {
let tempData1 = '' // 记录不是待审核状态的单号
diff --git a/src/views/modules/qc/qcPartAttribute.vue b/src/views/modules/qc/qcPartAttribute.vue
index e655417..358c7d1 100644
--- a/src/views/modules/qc/qcPartAttribute.vue
+++ b/src/views/modules/qc/qcPartAttribute.vue
@@ -331,7 +331,6 @@
工序
- 供应商
机台
@@ -430,12 +429,6 @@
-
-
1) {
+ const last = val[val.length - 1]
+ this.$refs.itemTable1.clearSelection()
+ this.$refs.itemTable1.toggleRowSelection(last, true)
+ this.itemSelections1 = [last]
+ } else {
+ this.itemSelections1 = val
+ }
},
selectionItem2 (val) {
@@ -1887,6 +1869,19 @@
this.$message.warning('请选择可选模板！')
return
}
+ if (this.itemSelections1.length > 1) {
+ this.$message.warning('每次只能添加一个模板！')
+ return
+ }
+ const selectedTemplateId = this.itemSelections1[0].templateId
+ const existingTemplateIds = new Set([
+ ...(this.itemList2 || []).map(item => item.templateId),
+ ...(this.detailList || []).map(item => item.templateId)
+ ])
+ if (existingTemplateIds.has(selectedTemplateId)) {
+ this.$message.warning(`模板编码【${selectedTemplateId}】已存在，不能重复添加！`)
+ return
+ }
if ((this.detailData.inspectionTypeNo === '101' || this.detailData.inspectionTypeNo === '102' || this.detailData.inspectionTypeNo === '103' || this.detailData.inspectionTypeNo === '104' || this.detailData.inspectionTypeNo === '106' || this.detailData.inspectionTypeNo === '107' || this.detailData.inspectionTypeNo === '108') && (this.operation == null || this.operation === '')) {
this.$message.warning('请选择工序！')
return
@@ -1895,18 +1890,14 @@
this.$message.warning('请选择机台！')
return
}
- if ((this.detailData.inspectionTypeNo === '105') && (this.selectionManufacturer == null || this.selectionManufacturer.length === 0)) {
- this.$message.warning('请选择供应商！')
- return
- }
let inData = {
site: this.detailData.site,
buNo: this.detailData.buNo,
attributeNo: this.detailData.partNo,
- itemList: this.itemSelections1,
+ itemList: [this.itemSelections1[0]],
operation: this.operation,
resourceID: this.resourceId,
- manufacturerList: this.selectionManufacturer,
+ manufacturerList: ['*'],
attributeType: this.detailData.attributeType,
inspectionTypeNo: this.detailData.inspectionTypeNo,
createBy: this.$store.state.user.name,