From 72e151fe8c42e8ab39bc422b967291320ebec391 Mon Sep 17 00:00:00 2001 From: fengyuan_yang <1976974459@qq.com> Date: Fri, 24 May 2024 11:48:26 +0800 Subject: [PATCH] =?UTF-8?q?2024-05-24=20=E5=8A=9F=E8=83=BD=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- index.html | 1 + src/api/qc/qc.js | 3 +- src/views/common/login.vue | 130 +++++++----------------- src/views/main-navbar.vue | 4 +- src/views/modules/qc/IQCResultEntry.vue | 43 +++++++- src/views/modules/qc/qcItem.vue | 8 +- src/views/modules/qc/qcTemplate.vue | 4 +- 7 files changed, 89 insertions(+), 104 deletions(-) diff --git a/index.html b/index.html index 2a4e5e6..6d2ac20 100644 --- a/index.html +++ b/index.html @@ -5,6 +5,7 @@ Checkpoint MES + <% if (process.env.NODE_ENV === 'production') { %> diff --git a/src/api/qc/qc.js b/src/api/qc/qc.js index 397b43a..d71f81f 100644 --- a/src/api/qc/qc.js +++ b/src/api/qc/qc.js @@ -160,7 +160,8 @@ export const uploadSopFile = data => createAPI(`/pms/qc/upload`,'post',data) export const getSiteAndBuByUserName = data => createAPI(`/pms/qc/getSiteAndBuByUserName`,'post',data) export const searchSeqInfo = data => createAPI(`/pms/qc/searchSeqInfo`,'post',data) export const searchPartInfo = data => createAPI(`/pms/qc/searchPartInfo`,'post',data) - +// 获取采购类型 +export const orderTypeSearch = data => createAPI(`/pms/qc/orderTypeSearch`,'post',data) diff --git a/src/views/common/login.vue b/src/views/common/login.vue index 173cbdc..c931614 100644 --- a/src/views/common/login.vue +++ b/src/views/common/login.vue @@ -1,10 +1,16 @@ + + diff --git a/src/views/main-navbar.vue b/src/views/main-navbar.vue index b6e6662..262f74c 100644 --- a/src/views/main-navbar.vue +++ b/src/views/main-navbar.vue @@ -25,7 +25,7 @@ - + @@ -57,6 +57,7 @@ {{ userName }} + 退出 @@ -76,6 +77,7 @@
+
diff --git a/src/views/modules/qc/IQCResultEntry.vue b/src/views/modules/qc/IQCResultEntry.vue index 61f9e56..3a3ea72 100644 --- a/src/views/modules/qc/IQCResultEntry.vue +++ b/src/views/modules/qc/IQCResultEntry.vue @@ -73,6 +73,16 @@ + + + + + + @@ -486,7 +496,8 @@ iqcRecordDelete, // 删除检验记录 disposalMeasuresSearch, // 获取处置措施列表 iqcRecordOverLoad, // 重载检验单 - getSiteAndBuByUserName + getSiteAndBuByUserName, + orderTypeSearch, // 获取采购类型 } from "@/api/qc/qc.js" import {getTableDefaultListLanguage, getTableUserListLanguage} from "@/api/table.js" import Chooselist from '@/views/modules/common/Chooselist_eam' @@ -561,6 +572,7 @@ limit: 10, poOrderNo: '', poItemNo: '', + orderType: '' }, pageIndex: 1, pageSize: 20, @@ -864,6 +876,24 @@ fixed: '', columnWidth: 130, }, + { + userId: this.$store.state.user.name, + functionId: 301006, + serialNumber: '301006Table1OrderType', + tableId: "301006Table1", + tableName: "IQC检验记录表", + columnProp: 'orderType', + headerAlign: "center", + align: "center", + columnLabel: '采购类型', + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + columnWidth: 100, + }, { userId: this.$store.state.user.name, functionId: 301006, @@ -1367,6 +1397,7 @@ samplingNumber: '' }, disposalMeasuresOptions: [], + orderTypeList: [], userBuList: [], authSearch: false, authCheck: false, @@ -1391,6 +1422,7 @@ this.getSiteAndBuByUserName() this.favoriteIsOk() this.disposalMeasuresSearch() + this.orderTypeSearch() // 动态列 this.getTableUserColumn(this.$route.meta.menuId+'table1',1) this.getTableUserColumn(this.$route.meta.menuId+'table2',2) @@ -1475,6 +1507,15 @@ }) }, + // 获取采购类型列表 + orderTypeSearch () { + orderTypeSearch().then(({data}) => { + if (data.code === 0) { + this.orderTypeList = data.rows + } + }) + }, + selectFlag () { return true }, diff --git a/src/views/modules/qc/qcItem.vue b/src/views/modules/qc/qcItem.vue index 15bbb78..d97db41 100644 --- a/src/views/modules/qc/qcItem.vue +++ b/src/views/modules/qc/qcItem.vue @@ -1001,10 +1001,10 @@ 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.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 diff --git a/src/views/modules/qc/qcTemplate.vue b/src/views/modules/qc/qcTemplate.vue index a22ff94..e1c2f94 100644 --- a/src/views/modules/qc/qcTemplate.vue +++ b/src/views/modules/qc/qcTemplate.vue @@ -282,8 +282,8 @@ @clear="blurForBug()" @select="handleSelect" :popper-append-to-body="false" - style="width: 210px" - > + style="width: 210px"> +