From 9bd835ce42d2c26507508126b4f21a5fcbb0401d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E5=A5=89=E6=BA=90?= <1976974459@qq.com> Date: Mon, 20 Nov 2023 11:02:09 +0800 Subject: [PATCH] =?UTF-8?q?2023-11-20=20=E8=AE=BE=E5=A4=87=E5=92=8C?= =?UTF-8?q?=E8=B4=A8=E9=87=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/qc/qc.js | 1 + src/views/modules/qc/IPQCResultEntry.vue | 4 + src/views/modules/qc/qcTemplate.vue | 104 +++++++++++++---------- 3 files changed, 66 insertions(+), 43 deletions(-) diff --git a/src/api/qc/qc.js b/src/api/qc/qc.js index 25cfdea..a86ff58 100644 --- a/src/api/qc/qc.js +++ b/src/api/qc/qc.js @@ -34,6 +34,7 @@ export const getItemList = data => createAPI(`/pms/qc/getItemList`,'post',data) export const delItemDetails = data => createAPI(`/pms/qc/delItemDetails`,'post',data) export const uploadTemplateExcel = data => createAPI(`/pms/qc/uploadTemplateExcel`,'post',data) export const saveItemDetailed = data => createAPI(`/pms/qc/saveItemDetailed`,'post',data) +export const getItem = data => createAPI(`/pms/qc/getItem`,'post',data) // ===================================== 样本量 ===================================== export const samplingQtySearch = data => createAPI(`/pms/qc/samplingQtySearch`,'post',data) diff --git a/src/views/modules/qc/IPQCResultEntry.vue b/src/views/modules/qc/IPQCResultEntry.vue index d577057..7968dd9 100644 --- a/src/views/modules/qc/IPQCResultEntry.vue +++ b/src/views/modules/qc/IPQCResultEntry.vue @@ -1740,6 +1740,10 @@ }, methods: { + handleKeyUp (event) { + this.$message.error(event.keyCodes) + }, + // 子明细导入 subDetailUpload () { let currentData = { diff --git a/src/views/modules/qc/qcTemplate.vue b/src/views/modules/qc/qcTemplate.vue index 4cc4376..cae20f9 100644 --- a/src/views/modules/qc/qcTemplate.vue +++ b/src/views/modules/qc/qcTemplate.vue @@ -56,34 +56,6 @@ border v-loading="dataListLoading" style="width: 100%;"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +
- - - + + + - - + + + + + + + + + + + 查询
- + 可选项目： + + + + + + - +
添加>>
@@ -397,7 +403,7 @@ prop="itemDesc" header-align="center" align="center" - min-width="230" + min-width="200" label="项目名称"> @@ -427,6 +433,7 @@ getItemList, // 获取明细列表 delItemDetails, // 删除项目的检验明细 saveItemDetailed, // 新增项目明细的最大最小值 + getItem, // 查询检验项目 } from "@/api/qc/qc.js" import Chooselist from '@/views/modules/common/Chooselist_eam' import {userFavoriteList, saveUserFavorite, removeUserFavorite} from '@/api/userFavorite.js' @@ -538,7 +545,7 @@ fixed: '', }, { - columnProp: 'samplingProgrammeNo', + columnProp: 'samplingProgrammeDesc', headerAlign: "center", align: "center", columnLabel: '抽样方案', @@ -805,6 +812,17 @@ this.favoriteIsOk() }, methods: { + /** + * 查询检验项目 + */ + getItem () { + getItem(this.detailData).then(({data}) => { + if (data.code === 0) { + this.itemList1 = data.rows + } + }) + }, + /** * 自适应 * @param label @@ -1086,7 +1104,7 @@ this.detailList = data.rows this.objectSearch() }) - this.detailModelFlag = true; + this.detailModelFlag = true }, // 保存模板项目 saveDetail(){ @@ -1113,10 +1131,10 @@ this.itemSelections1 = null this.itemSelections2 = null getItemList(this.detailData).then(({data}) => { - this.itemList1 = data.row1; - this.itemList2 = data.row2; + this.itemList1 = data.row1 + this.itemList2 = data.row2 }) - this.fastAddFlag = true; + this.fastAddFlag = true }, // clickItem1(row){ // this.itemListRow1 = JSON.parse(JSON.stringify(row));