From 647c215be49df760b2dd9f72559025a79128b6be Mon Sep 17 00:00:00 2001 From: fengyuan_yang <1976974459@qq.com> Date: Mon, 17 Jun 2024 16:28:17 +0800 Subject: [PATCH] =?UTF-8?q?2024-06-17=20=E7=B3=BB=E7=BB=9F=E9=83=A8?= =?UTF-8?q?=E7=BD=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/index.js | 4 +- index.html | 1 - src/api/qc/qc.js | 12 +- src/views/common/login.vue | 2 +- src/views/main-navbar.vue | 6 +- src/views/modules/common/Chooselist_eam.vue | 4 +- src/views/modules/qc/FQASResultEntry.vue | 2547 ++++++++++++++++++ src/views/modules/qc/IQCResultEntry.vue | 123 +- src/views/modules/qc/qcItem.vue | 122 +- src/views/modules/qc/qcPartAttribute.vue | 84 +- src/views/modules/qc/qcTemplate.vue | 34 +- src/views/modules/qc/qc_FAI_upload_file.vue | 2 +- src/views/modules/sys/menu-add-or-update.vue | 2 +- 13 files changed, 2692 insertions(+), 251 deletions(-) create mode 100644 src/views/modules/qc/FQASResultEntry.vue diff --git a/config/index.js b/config/index.js index 58d4a69..f7e3395 100644 --- a/config/index.js +++ b/config/index.js @@ -13,7 +13,7 @@ module.exports = { // 代理列表, 是否开启代理通过[./dev.env.js]配置 proxyTable: devEnv.OPEN_PROXY === false ? {} : { '/proxyApi': { - target: 'http://127.0.0.1:9000', + target: 'http://127.0.0.1:9090', changeOrigin: true, pathRewrite: { // 把 /proxyApi 替换成 / @@ -24,7 +24,7 @@ module.exports = { // Various Dev Server settings host: 'localhost', // can be overwritten by process.env.HOST - port: 8002, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined + port: 8003, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined autoOpenBrowser: true, errorOverlay: true, notifyOnErrors: true, diff --git a/index.html b/index.html index 96e2d2a..2c2b681 100644 --- a/index.html +++ b/index.html @@ -4,7 +4,6 @@ - Checkpoint MES 旭捷 MES diff --git a/src/api/qc/qc.js b/src/api/qc/qc.js index e78b055..82e861c 100644 --- a/src/api/qc/qc.js +++ b/src/api/qc/qc.js @@ -168,5 +168,15 @@ export const actionIPQCInspection = data => createAPI(`/pms/qc/actionIPQCInspect export const actionFQCInspection = data => createAPI(`/pms/qc/actionFQCInspection`,'post',data) export const dataAcquisition = data => createAPI(`/pms/qc/dataAcquisition`,'post',data) - +// ============================================= FQAS ================================================== +export const qcFQASInspectionSearch = data => createAPI(`/pms/qc/qcFQASInspectionSearch`,'post',data) +export const actionFQASInspection = data => createAPI(`/pms/qc/actionFQASInspection`,'post',data) +export const fqasDetailSearch = data => createAPI(`/pms/qc/fqasDetailSearch`,'post',data) +export const selectFQASSubDetailedRecord = data => createAPI(`/pms/qc/selectFQASSubDetailedRecord`,'post',data) +export const saveFQASSubDetailed = data => createAPI(`/pms/qc/saveFQASSubDetailed`,'post',data) +export const checkFQASIsSubmit = data => createAPI(`/pms/qc/checkFQASIsSubmit`,'post',data) +export const saveFQASDetailedRecord = data => createAPI(`/pms/qc/saveFQASDetailedRecord`,'post',data) +export const saveFQASSubmitResult = data => createAPI(`/pms/qc/saveFQASSubmitResult`,'post',data) +export const fqasRecordDelete = data => createAPI(`/pms/qc/fqasRecordDelete`,'post',data) +export const fqasRecordOverLoad = data => createAPI(`/pms/qc/fqasRecordOverLoad`,'post',data) diff --git a/src/views/common/login.vue b/src/views/common/login.vue index c931614..f6500ba 100644 --- a/src/views/common/login.vue +++ b/src/views/common/login.vue @@ -6,7 +6,7 @@
- +
diff --git a/src/views/main-navbar.vue b/src/views/main-navbar.vue index 262f74c..9d38595 100644 --- a/src/views/main-navbar.vue +++ b/src/views/main-navbar.vue @@ -56,8 +56,7 @@ - {{ userName }} - + {{ userName }} 退出 @@ -76,8 +75,7 @@
- - +
diff --git a/src/views/modules/common/Chooselist_eam.vue b/src/views/modules/common/Chooselist_eam.vue index 3a4a837..beb04de 100644 --- a/src/views/modules/common/Chooselist_eam.vue +++ b/src/views/modules/common/Chooselist_eam.vue @@ -207,12 +207,12 @@ export default { if (this.param6 ) { sql += " and active like '%" + this.param6 + "%'" } - if (this.tagNo <= 500 && this.tagNo !== 93) { + if (this.tagNo <= 500 && this.tagNo !== 93) { // 判断site和bu if (this.param7) { sql += " and site in (select site from eam_access_site where username = '" + this.param7 + "') " + " and (site + '-' + bu_no) in (select (a.site + '-' + a.bu_no) from AccessBu as a left join eam_access_site as b on a.site = b.site and a.username = b.username where a.username = '" + this.param7 + "')" } } - if (this.tagNo > 500 && this.tagNo < 1000) { + if (this.tagNo > 500 && this.tagNo < 1000) { // 只判断site if (this.param7) { sql += " and site in (select site from eam_access_site where username = '" + this.param7 + "') " } diff --git a/src/views/modules/qc/FQASResultEntry.vue b/src/views/modules/qc/FQASResultEntry.vue new file mode 100644 index 0000000..1b052b3 --- /dev/null +++ b/src/views/modules/qc/FQASResultEntry.vue @@ -0,0 +1,2547 @@ + + + + + diff --git a/src/views/modules/qc/IQCResultEntry.vue b/src/views/modules/qc/IQCResultEntry.vue index 829f4be..6012a52 100644 --- a/src/views/modules/qc/IQCResultEntry.vue +++ b/src/views/modules/qc/IQCResultEntry.vue @@ -27,22 +27,16 @@ - + - - - - + - - - @@ -197,23 +191,33 @@ - + - + - + - + - - 数据采集 + + + + + + + + + + + + 上传文件 @@ -228,8 +232,8 @@ - - + + @@ -259,8 +263,7 @@ 责任人 - - 上传文件 + 明细导入 @@ -599,6 +602,12 @@ subDetailUpload }, watch: { + detailData: { + deep: true, + handler: function (newV, oldV) { + this.detailData.notPassQty = this.detailData.samplingQty - this.detailData.passQty + } + }, detailList: { deep: true, handler: function (newV, oldV) { @@ -646,8 +655,6 @@ endDate2: '', partNo:'', partDesc:'', - cinvSourceCode:'', - sku:'', state: '', inspectionResult: '', supplierDesc: '', @@ -677,7 +684,6 @@ workOrderQuantity: '', reelNumber: '', partNo: '', - cinvSourceCode:'', rollingQuantity: '', sampleQuantity: '', detailCodeNo:'', @@ -836,42 +842,6 @@ fixed: '', columnWidth: 150, }, - { - userId: this.$store.state.user.name, - functionId: 301006, - serialNumber: '301006Table1SKU', - tableId: "301006Table1", - tableName: "IQC检验记录表", - columnProp: 'sku', - headerAlign: "center", - align: "center", - columnLabel: 'SKU', - columnHidden: false, - columnImage: false, - columnSortable: false, - sortLv: 0, - status: true, - fixed: '', - columnWidth: 100, - }, - { - userId: this.$store.state.user.name, - functionId: 301006, - serialNumber: '301006Table1CinvSourceCode', - tableId: "301006Table1", - tableName: "IQC检验记录表", - columnProp: 'cinvSourceCode', - headerAlign: "center", - align: "center", - columnLabel: 'PN', - columnHidden: false, - columnImage: false, - columnSortable: false, - sortLv: 0, - status: true, - fixed: '', - columnWidth: 100, - }, { userId: this.$store.state.user.name, functionId: 301006, @@ -1234,6 +1204,24 @@ fixed: '', columnWidth: 150, }, + { + userId: this.$store.state.user.name, + functionId: 301006, + serialNumber: '301006Table2DefectLevelDescription', + tableId: "301006Table2", + tableName: "检验单明细表", + columnProp: 'defectLevelDescription', + headerAlign: "center", + align: "center", + columnLabel: '缺陷等级名称', + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + columnWidth: 150, + }, { userId: this.$store.state.user.name, functionId: 301006, @@ -1435,8 +1423,6 @@ inspectionNo: '', partNo: '', partDesc: '', - cinvSourceCode:'', - sku:'', rollQty: '', samplingQty: '', unqualifiedQty: 0, @@ -1455,14 +1441,15 @@ operator: '', operatorName: '', responsiblePerson: '', - responsiblePersonName: '' + responsiblePersonName: '', + passQty: '', + notPassQty: '' }, detailInformationFlag: false, detailList: [], saveInformationData: { site: '', buNo: '', - cinvSourceCode:'', inspectionNo:'', disposalMeasures: '', disposalRemark: '', @@ -1476,12 +1463,13 @@ poItemNo: '', partNo: '', partDesc: '', - sku: '', operator: '', operatorName: '', responsiblePerson: '', responsiblePersonName: '', - subDetailList: [] + subDetailList: [], + passQty: '', + notPassQty: '' }, // 子明细数据对象 tableData: [], @@ -1849,6 +1837,8 @@ } if (type === 1) { this.detailData.unqualifiedQty = val + } else if (type === 2) { + this.detailData.passQty = val } }, @@ -2115,10 +2105,11 @@ this.saveInformationData.poItemNo = this.detailData.poItemNo this.saveInformationData.partNo = this.detailData.partNo this.saveInformationData.partDesc = this.detailData.partDesc - this.saveInformationData.sku = this.detailData.sku this.saveInformationData.operator = this.detailData.operator this.saveInformationData.responsiblePerson = this.detailData.responsiblePerson this.saveInformationData.itemList = JSON.parse(JSON.stringify(this.detailList)) + this.saveInformationData.passQty = this.detailData.passQty + this.saveInformationData.notPassQty = this.detailData.notPassQty // this.saveInformationData.subDetailList = this.acquisitionList saveIQCDetailedRecord(this.saveInformationData).then(({data}) => { if (data && data.code === 0) { @@ -2177,8 +2168,6 @@ this.detailData.inspectionNo = row.inspectionNo this.detailData.partNo = row.partNo this.detailData.partDesc = row.partDesc - this.detailData.cinvSourceCode = row.cinvSourceCode - this.detailData.sku = row.sku this.detailData.rollQty = row.rollQty this.detailData.samplingQty = row.samplingQty this.detailData.unqualifiedQty = row.unqualifiedQty @@ -2197,6 +2186,8 @@ this.detailData.operatorName = row.operatorName this.detailData.responsiblePerson = row.responsiblePerson this.detailData.responsiblePersonName = row.responsiblePersonName + this.detailData.passQty = row.passQty + this.detailData.notPassQty = row.notPassQty this.getInspectionFormData() this.inspectorSearch() // this.acquisitionList = [] diff --git a/src/views/modules/qc/qcItem.vue b/src/views/modules/qc/qcItem.vue index e48ade7..e359ef4 100644 --- a/src/views/modules/qc/qcItem.vue +++ b/src/views/modules/qc/qcItem.vue @@ -146,10 +146,10 @@ - 方法编码 + 检验方法编码 - + @@ -171,6 +171,15 @@ + + + 缺陷等级编码 + + + + + + @@ -191,35 +200,6 @@ - - 采集标记 - - - - - - - - - - - - - - - - - - - - - - - - - - - 保存 @@ -231,10 +211,10 @@
- + - + @@ -373,12 +353,8 @@ samplingLevelNo: '', samplingLevelDesc: '', defaultSamplingProportion: '', - collectionFlag: '', - collectionSource: '', - collectionSourceList: [], - collectionMethod: '', - collectionMethodList: [], - collectionCondition: '' + defectLevelCode: '', + defectLevelDescription: '' }, // 检验项目展示标头 columnList: [ @@ -749,7 +725,21 @@ message: ' ', trigger: ['blur','change'] } - ] + ], + defectLevelCodeType:[ + { + required: true, + message: ' ', + trigger: ['blur','change'] + } + ], + defectLevelDescriptionType:[ + { + required: true, + message: ' ', + trigger: ['blur','change'] + } + ], }, options: [], methodData: { @@ -871,6 +861,16 @@ this.$refs.baseList.init(val, strVal, conSql) } } + if (val === 211) { + strVal = this.modalData.defectLevelCode + if (this.modalData.bu === null || this.modalData.bu === '') { + this.$message.warning("请选择BU!") + return + } else { + conSql = " and bu_no = '" + this.modalData.bu.split('_')[1] + "'" + this.$refs.baseList.init(val, strVal, conSql) + } + } if (val === 1036) { strVal = this.modalData.methodNo this.$refs.baseList.init(val, strVal) @@ -917,6 +917,10 @@ this.modalData.samplingLevelNo = val.sampling_level_no this.modalData.samplingLevelDesc = val.sampling_level_desc } + if (this.tagNo === 211) { + this.modalData.defectLevelCode = val.defect_level_code + this.modalData.defectLevelDescription = val.defect_level_description + } }, // 获取数据列表 @@ -955,12 +959,8 @@ samplingLevelNo: '', samplingLevelDesc: '', defaultSamplingProportion: '', - collectionFlag: '', - collectionSource: '', - collectionSourceList: [], - collectionMethod: '', - collectionMethodList: [], - collectionCondition: '' + defectLevelCode: '', + defectLevelDescription: '' } this.modalDisableFlag = false this.modalFlag = true @@ -990,12 +990,8 @@ samplingLevelNo: row.samplingLevelNo, samplingLevelDesc: row.samplingLevelDesc, defaultSamplingProportion: row.defaultSamplingProportion, - collectionFlag: row.collectionFlag, - collectionSource: row.collectionSource, - collectionSourceList: row.collectionSource == null || row.collectionSource === '' ? [] : row.collectionSource.split(','), - collectionMethod: row.collectionMethod, - collectionMethodList: row.collectionMethod == null || row.collectionMethod === '' ? [] : row.collectionMethod.split(','), - collectionCondition: row.collectionCondition + defectLevelCode: row.defectLevelCode, + defectLevelDescription: row.defectLevelDescription } this.modalDisableFlag = true this.modalFlag = true @@ -1048,32 +1044,14 @@ this.$message.warning('请选择检验方法！') return } - // if ((this.modalData.samplingProgrammeNo === '' || this.modalData.samplingProgrammeNo == null) && (this.modalData.itemSamplingQuantity === '' || this.modalData.itemSamplingQuantity == null) && (this.modalData.defaultSamplingProportion === '' || this.modalData.defaultSamplingProportion == null)) { - // this.$message.warning('抽样方案、抽样数量、抽样比例至少选择一项！') - // return - // } if ((this.modalData.samplingProgrammeNo !== '' && this.modalData.samplingProgrammeNo != null) && (this.modalData.samplingLevelNo === '' || this.modalData.samplingLevelNo == null)) { this.$message.warning('请选择检验水平！') return } - if (this.modalData.collectionFlag === 'Y' && (this.modalData.collectionSourceList == null || this.modalData.collectionSourceList.length === 0)) { - this.$message.warning('请选择采集数据来源！') - return - } - if (this.modalData.collectionFlag === 'Y' && (this.modalData.collectionMethodList == null || this.modalData.collectionMethodList.length === 0)) { - this.$message.warning('请选择采集数据方式！') - return - } - if (this.modalData.collectionFlag === 'Y' && this.modalData.collectionSourceList.length !== this.modalData.collectionMethodList.length) { - this.$message.warning('采集数据来源和方式不对应！') - return - } - if (this.modalData.collectionFlag === 'Y' && (this.modalData.collectionCondition == null || this.modalData.collectionCondition === '')) { - this.$message.warning('请填写采集条件路径！') + if (this.modalData.defectLevelCode === '' || this.modalData.defectLevelCode == null) { + this.$message.warning('请选择缺陷等级！') return } - this.modalData.collectionSource = this.modalData.collectionSourceList.join(',') - this.modalData.collectionMethod = this.modalData.collectionMethodList.join(',') if (this.modalData.flag === '1') { qcItemSave(this.modalData).then(({data}) => { if (data && data.code === 0) { diff --git a/src/views/modules/qc/qcPartAttribute.vue b/src/views/modules/qc/qcPartAttribute.vue index 6be0129..c36a9e2 100644 --- a/src/views/modules/qc/qcPartAttribute.vue +++ b/src/views/modules/qc/qcPartAttribute.vue @@ -23,15 +23,9 @@ - - - - - - @@ -613,12 +607,6 @@ - - - - - - 查询 @@ -628,7 +616,6 @@ :data="partInfoList" @row-dblclick="getRowData1" border - v-loading="dataListLoading" style="width: 100%;"> - - - - 关闭 @@ -718,8 +693,6 @@ userName: this.$store.state.user.name, partNo: '', partDesc: '', - cinvSourceCode: '', - sku: '', familyID: '', familyName: '', buDesc: '', @@ -742,8 +715,6 @@ partDesc: '', familyID: '', familyName: '', - cinvSourceCode: '', - sku: '', umid: '', supplierNo: '', supplierDesc: '', @@ -759,8 +730,6 @@ partNo: '', attributeNo: '', partDesc: '', - cinvSourceCode: '', - sku: '', attributeType: 'A', inspectionTypeNo: '', templateId: '', @@ -804,24 +773,6 @@ status: true, fixed: '', }, - { - userId: this.$store.state.user.name, - functionId: 301003, - serialNumber: '301003Table1SKU', - tableId: "301003Table1", - tableName: "物料属性设置表", - columnWidth: 146, - columnProp: 'sku', - headerAlign: "center", - align: "center", - columnLabel: 'SKU', - columnHidden: false, - columnImage: false, - columnSortable: false, - sortLv: 0, - status: true, - fixed: '', - }, { userId: this.$store.state.user.name, functionId: 301003, @@ -840,24 +791,6 @@ status: true, fixed: '', }, - { - userId: this.$store.state.user.name, - functionId: 301003, - serialNumber: '301003Table1CinvSourceCode', - tableId: "301003Table1", - tableName: "物料属性设置表", - columnWidth: 144, - columnProp: 'cinvSourceCode', - headerAlign: "center", - align: "left", - columnLabel: 'PN', - columnHidden: false, - columnImage: false, - columnSortable: false, - sortLv: 0, - status: true, - fixed: '', - }, { userId: this.$store.state.user.name, functionId: 301003, @@ -1006,7 +939,6 @@ detailModelFlag: false, detailList: [], dataList: [], - dataListLoading: false, // 展示列集 columnDetailList: [ { @@ -1301,8 +1233,6 @@ partNo: '', partDesc: '', seqNo: '', - sku: '', - cinvSourceCode:'', }, authSearch: false, authSave: false, @@ -1353,7 +1283,7 @@ searchPartInfo () { this.partDetailData.bu = this.modalData.bu - if (!this.partDetailData.partNo && !this.partDetailData.partDesc && !this.partDetailData.sku && !this.partDetailData.cinvSourceCode) { + if (!this.partDetailData.partNo && !this.partDetailData.partDesc) { this.partInfoList = [] this.partDisableFlag = true } @@ -1452,8 +1382,6 @@ }, getRowData1 (row) { - this.modalData.sku = row.sku - this.modalData.cinvSourceCode = row.cinvSourceCode this.modalData.partNo = row.partNo this.modalData.partDesc = row.partDesc this.partDisableFlag = false @@ -1556,15 +1484,6 @@ this.$message.warning('请选择物料名称！') return } - // let obj = document.getElementsByName('isExemptInspection') - // let s = '' - // for (let i = 0; i < obj.length; i++) { - // if (obj[i].checked) { - // s += obj[i].value + ',' - // } - // } - // s = s.substring(0, s.length - 1) - // this.modalData.exemptInspection = s if (this.modalData.flag === '1') { qcPartAttributeSave(this.modalData).then(({data}) => { if (data && data.code === 0) { @@ -2206,7 +2125,6 @@ partNo: '', partDesc: '', seqNo: '', - sku: '', } this.partInfoList = [] }, diff --git a/src/views/modules/qc/qcTemplate.vue b/src/views/modules/qc/qcTemplate.vue index e1c2f94..01eec76 100644 --- a/src/views/modules/qc/qcTemplate.vue +++ b/src/views/modules/qc/qcTemplate.vue @@ -567,7 +567,7 @@ { userId: this.$store.state.user.name, functionId: 301008, - serialNumber: '301008TableItemNo', + serialNumber: '301008TableTemplateId', tableId: "301008Table", tableName: "检验模板维护表", columnWidth: 98, @@ -585,7 +585,7 @@ { userId: this.$store.state.user.name, functionId: 301008, - serialNumber: '301008TableItemNo', + serialNumber: '301008TableTemplateName', tableId: "301008Table", tableName: "检验模板维护表", columnWidth: 84, @@ -603,7 +603,7 @@ { userId: this.$store.state.user.name, functionId: 301008, - serialNumber: '301008TableItemNo', + serialNumber: '301008TableSamplingProgrammeDesc', tableId: "301008Table", tableName: "检验模板维护表", columnWidth: 84, @@ -621,7 +621,7 @@ { userId: this.$store.state.user.name, functionId: 301008, - serialNumber: '301008TableItemNo', + serialNumber: '301008TableSamplingLevelDesc', tableId: "301008Table", tableName: "检验模板维护表", columnWidth: 84, @@ -639,7 +639,7 @@ { userId: this.$store.state.user.name, functionId: 301008, - serialNumber: '301008TableItemNo', + serialNumber: '301008TableInspectionCycle', tableId: "301008Table", tableName: "检验模板维护表", columnWidth: 84, @@ -657,7 +657,7 @@ { userId: this.$store.state.user.name, functionId: 301008, - serialNumber: '301008TableItemNo', + serialNumber: '301008TableDefaultSamplingQuantity', tableId: "301008Table", tableName: "检验模板维护表", columnWidth: 84, @@ -675,7 +675,7 @@ { userId: this.$store.state.user.name, functionId: 301008, - serialNumber: '301008TableItemNo', + serialNumber: '301008TableDefaultSamplingProportion', tableId: "301008Table", tableName: "检验模板维护表", columnWidth: 84, @@ -693,7 +693,7 @@ { userId: this.$store.state.user.name, functionId: 301008, - serialNumber: '301008TableItemNo', + serialNumber: '301008TableAQL', tableId: "301008Table", tableName: "检验模板维护表", columnWidth: 84, @@ -711,7 +711,7 @@ { userId: this.$store.state.user.name, functionId: 301008, - serialNumber: '301008TableItemNo', + serialNumber: '301008TableAC', tableId: "301008Table", tableName: "检验模板维护表", columnWidth: 84, @@ -729,7 +729,7 @@ { userId: this.$store.state.user.name, functionId: 301008, - serialNumber: '301008TableItemNo', + serialNumber: '301008TableRE', tableId: "301008Table", tableName: "检验模板维护表", columnWidth: 84, @@ -747,7 +747,7 @@ { userId: this.$store.state.user.name, functionId: 301008, - serialNumber: '301008TableItemNo', + serialNumber: '301008TableInspectionTypeName', tableId: "301008Table", tableName: "检验模板维护表", columnWidth: 84, @@ -765,7 +765,7 @@ { userId: this.$store.state.user.name, functionId: 301008, - serialNumber: '301008TableItemNo', + serialNumber: '301008TableTemplateRemark', tableId: "301008Table", tableName: "检验模板维护表", columnWidth: 84, @@ -783,7 +783,7 @@ { userId: this.$store.state.user.name, functionId: 301008, - serialNumber: '301008TableItemNo', + serialNumber: '301008TableTemplateVersion', tableId: "301008Table", tableName: "检验模板维护表", columnWidth: 84, @@ -801,7 +801,7 @@ { userId: this.$store.state.user.name, functionId: 301008, - serialNumber: '301008TableItemNo', + serialNumber: '301008TableCreateTime', tableId: "301008Table", tableName: "检验模板维护表", columnWidth: 84, @@ -819,7 +819,7 @@ { userId: this.$store.state.user.name, functionId: 301008, - serialNumber: '301008TableItemNo', + serialNumber: '301008TableCreateBy', tableId: "301008Table", tableName: "检验模板维护表", columnWidth: 84, @@ -837,7 +837,7 @@ { userId: this.$store.state.user.name, functionId: 301008, - serialNumber: '301008TableItemNo', + serialNumber: '301008TableUpdateDate', tableId: "301008Table", tableName: "检验模板维护表", columnWidth: 84, @@ -855,7 +855,7 @@ { userId: this.$store.state.user.name, functionId: 301008, - serialNumber: '301008TableItemNo', + serialNumber: '301008TableUpdateBy', tableId: "301008Table", tableName: "检验模板维护表", columnWidth: 84, diff --git a/src/views/modules/qc/qc_FAI_upload_file.vue b/src/views/modules/qc/qc_FAI_upload_file.vue index 66ff508..52c69df 100644 --- a/src/views/modules/qc/qc_FAI_upload_file.vue +++ b/src/views/modules/qc/qc_FAI_upload_file.vue @@ -4,7 +4,7 @@ - + diff --git a/src/views/modules/sys/menu-add-or-update.vue b/src/views/modules/sys/menu-add-or-update.vue index 08d4b4a..b0333b6 100644 --- a/src/views/modules/sys/menu-add-or-update.vue +++ b/src/views/modules/sys/menu-add-or-update.vue @@ -241,7 +241,7 @@ this.$refs['dataForm'].validate((valid) => { if (valid) { this.$http({ - url: this.$http.adornUrl(`/api/sys/menu/${!this.dataForm.id ? 'save' : 'update'}`), + url: this.$http.adornUrl(`/sys/menu/${!this.dataForm.id ? 'save' : 'update'}`), method: 'post', data: this.$http.adornData({ 'menuId': this.dataForm.menuId,