diff --git a/src/views/modules/qc/qcItem3.vue b/src/views/modules/qc/qcItem3.vue index b8984df..0d758c4 100644 --- a/src/views/modules/qc/qcItem3.vue +++ b/src/views/modules/qc/qcItem3.vue @@ -1419,7 +1419,7 @@ methodNo: 'IPQC-0001', methodName: '', updateBy: '', - inspectionTypeNo: 'PF', + inspectionTypeNo: '***', itemSamplingQuantity: '', samplingProgrammeNo: '', samplingProgrammeDesc: '', diff --git a/src/views/modules/qc/qcTemplate2.vue b/src/views/modules/qc/qcTemplate2.vue index 4556181..636193d 100644 --- a/src/views/modules/qc/qcTemplate2.vue +++ b/src/views/modules/qc/qcTemplate2.vue @@ -18,6 +18,16 @@ + + + + + + @@ -189,7 +199,7 @@ - + @@ -1104,6 +1114,10 @@ this.favoriteIsOk() // 获取检验类型 this.inspectionTypeSearch() + //查询数据字典数据 + this.queryTemplateSortList() + // 获取特殊工序列表 + this.getSpecialOperationList() // 动态列 this.getTableUserColumn(this.$route.meta.menuId+'table',1) if (!this.authSearch) { @@ -1408,10 +1422,6 @@ ac: '', re: '' } - //查询数据字典数据 - this.queryTemplateSortList() - // 获取特殊工序列表 - this.getSpecialOperationList() this.modalDisableFlag = false this.modalFlag = true }, @@ -1463,7 +1473,9 @@ ac: row.ac, re: row.re, defaultSamplingQuantity: row.defaultSamplingQuantity, - defaultSamplingProportion: row.defaultSamplingProportion + defaultSamplingProportion: row.defaultSamplingProportion, + templateSort : row.templateSort, + operation : row.operation } this.modalDisableFlag = true this.modalFlag = true diff --git a/src/views/modules/qc/qcTemplate3.vue b/src/views/modules/qc/qcTemplate3.vue index 853c0d8..4d32f51 100644 --- a/src/views/modules/qc/qcTemplate3.vue +++ b/src/views/modules/qc/qcTemplate3.vue @@ -18,6 +18,16 @@ + + + + + + @@ -190,7 +200,7 @@ - + @@ -1106,6 +1116,10 @@ this.favoriteIsOk() // 获取检验类型 this.inspectionTypeSearch() + //查询数据字典数据 + this.queryTemplateSortList() + // 获取特殊工序列表 + this.getSpecialOperationList() // 动态列 this.getTableUserColumn(this.$route.meta.menuId+'table',1) if (!this.authSearch) { @@ -1254,9 +1268,9 @@ * 查询检验项目 */ getItem () { - getItemList(this.detailData).then(({data}) => { + getItem(this.detailData).then(({data}) => { if (data.code === 0) { - this.itemList1 = data.row1 + this.itemList1 = data.rows } }) }, @@ -1410,10 +1424,6 @@ ac: '', re: '' } - //查询数据字典数据 - this.queryTemplateSortList() - // 获取特殊工序列表 - this.getSpecialOperationList() this.modalDisableFlag = false this.modalFlag = true }, @@ -1465,7 +1475,9 @@ ac: row.ac, re: row.re, defaultSamplingQuantity: row.defaultSamplingQuantity, - defaultSamplingProportion: row.defaultSamplingProportion + defaultSamplingProportion: row.defaultSamplingProportion, + templateSort : row.templateSort, + operation : row.operation } this.modalDisableFlag = true this.modalFlag = true