From 94e2f78c6ff8eb51ce9b0a8c7a85062872cacb0c Mon Sep 17 00:00:00 2001 From: value <z1292839451@163.com> Date: 星期一, 22 四月 2024 17:25:48 +0800 Subject: [PATCH] 检验模板调整 --- src/components/view/a5-capacity-scope.vue | 112 ++++++++++++++++++++++++++++++++++++++++++-------------- 1 files changed, 84 insertions(+), 28 deletions(-) diff --git a/src/components/view/a5-capacity-scope.vue b/src/components/view/a5-capacity-scope.vue index 05a36fd..476b7a1 100644 --- a/src/components/view/a5-capacity-scope.vue +++ b/src/components/view/a5-capacity-scope.vue @@ -66,14 +66,9 @@ v-model="itemParameterData.entity.inspectionItem" @keyup.enter.native="refreshTable()"></el-input></div> </div> <div class="search_thing"> - <div class="search_label">瀹為獙瀹わ細</div> + <div class="search_label">妫�楠屽瓙椤癸細</div> <div class="search_input"><el-input size="small" placeholder="璇疯緭鍏�" clearable - v-model="itemParameterData.entity.laboratory" @keyup.enter.native="refreshTable()"></el-input></div> - </div> - <div class="search_thing"> - <div class="search_label">璁惧缁勶細</div> - <div class="search_input"><el-input size="small" placeholder="璇疯緭鍏�" clearable - v-model="itemParameterData.entity.deviceGroup" @keyup.enter.native="refreshTable()"></el-input></div> + v-model="itemParameterData.entity.inspectionItemSubclass" @keyup.enter.native="refreshTable()"></el-input></div> </div> <div class="search_thing" style="padding-left: 30px;"> <el-button size="small" @click="refresh()">閲� 缃�</el-button> @@ -121,8 +116,7 @@ itemParameterData: { entity: { inspectionItem: null, - laboratory: null, - deviceGroup: null, + inspectionItemSubclass: null, orderBy: { field: 'id', order: 'asc' @@ -148,9 +142,6 @@ inspectionItemType: { select: [] }, - valueType: { - select: [] - }, bsm:{ select: [] }, @@ -161,15 +152,18 @@ select:[] }, method:{select:[]}, - deviceGroup:{select:[]} + templateId:{ + select:[] + }, + sonLaboratory: {select:[]}, + unit: {select:[]}, + sample: {select:[]}, + dic: {select:[]}, }, selectField: { inspectionItemType: { select: [] }, - valueType: { - select: [] - }, bsm:{ select: [] }, @@ -179,11 +173,17 @@ laboratory:{ select:[] }, - method:{select:[]}, - deviceGroup:{select:[]} + templateId:{ + select:[] + }, + method:{select:[],choose: true}, + sample: {select:[]}, + sonLaboratory: {select:[]}, + unit: {select:[]}, + dic:{select:[]}, }, - requiredAdd: ['inspectionItem', 'manHour', 'inspectionItemType','inspectionValueType','inspectionItemClassify','laboratory','unit','method','price','manDay','deviceGroup','checkoutNumber','valueType'], - requiredUp: ['inspectionItem', 'manHour', 'inspectionItemType','inspectionValueType','inspectionItemClassify','laboratory','unit','method','price','manDay','deviceGroup','checkoutNumber','valueType'] + requiredAdd: ['sonLaboratory','inspectionItem', 'manHour', 'inspectionItemType','inspectionValueType','laboratory','unit','method','price','manDay','sample'], + requiredUp: ['sonLaboratory','inspectionItem', 'manHour', 'inspectionItemType','inspectionValueType','laboratory','unit','method','price','manDay','sample'] }, testObjectData: { entity: { @@ -225,12 +225,16 @@ this.itemParameterEntityCopy = this.HaveJson(this.itemParameterData.entity) this.testObjectDataEntityCopy = this.HaveJson(this.testObjectData.entity) this.selectEnumByCategory() - this.selectEnumByCategoryForValue() + // this.selectEnumByCategoryForValue() this.selectEnumByCategoryForSpecial() this.selectEnumByCategoryForInspectionValueType() this.obtainItemParameterList() this.selectStandardMethods() - this.selectEnumByCategoryForDevice() + this.selectTestObjectByName() + this.getStandardTemplate() + this.selectEnumByCategoryForSLaboratory() + this.selectDocUnit() + this.selectEnumByCategoryForUnit() this.getPower('0') }, methods: { @@ -285,7 +289,7 @@ }, selectEnumByCategoryForSpecial() { this.$axios.post(this.$api.enums.selectEnumByCategory, { - category: "鐗规畩鏍囪瘑" + category: "鏄惁" }).then(res => { this.itemParameterData.selectField.bsm.select = res.data this.itemParameterData.tagField.bsm.select = res.data @@ -299,12 +303,36 @@ this.itemParameterData.tagField.inspectionValueType.select = res.data }) }, - selectEnumByCategoryForDevice() { + selectEnumByCategoryForSLaboratory() { this.$axios.post(this.$api.enums.selectEnumByCategory, { - category: "璁惧鍒嗙被" + category: "瀛愬疄楠屽" }).then(res => { - this.itemParameterData.selectField.deviceGroup.select = res.data - this.itemParameterData.tagField.deviceGroup.select = res.data + this.itemParameterData.selectField.sonLaboratory.select = res.data + this.itemParameterData.tagField.sonLaboratory.select = res.data + }) + }, + selectEnumByCategoryForUnit() { + this.$axios.post(this.$api.enums.selectEnumByCategory, { + category: "鍗曚綅" + }).then(res => { + this.itemParameterData.selectField.unit.select = res.data + this.itemParameterData.tagField.unit.select = res.data + }) + }, + selectDocUnit() { + this.$axios.post(this.$api.enums.getDic).then(res => { + this.itemParameterData.selectField.dic.select = res.data.map(m=>{ + return { + label: m, + value:m + } + }) + this.itemParameterData.tagField.dic.select = res.data.map(m=>{ + return { + label: m, + value:m + } + }) }) }, obtainItemParameterList() { @@ -325,7 +353,7 @@ let data = [] res.data.forEach(a=>{ data.push({ - label: a.name, + label: a.code, value: a.code }) }) @@ -333,6 +361,34 @@ this.itemParameterData.tagField.method.select = data }) }, + selectTestObjectByName() { + this.$axios.get(this.$api.capacityScope.selectTestObjectByName).then(res => { + let data = [] + res.data.forEach(a => { + data.push({ + label: a.specimenName, + value: a.id, + type: 'success' + }) + }) + this.itemParameterData.selectField.sample.select = data + this.itemParameterData.tagField.sample.select = data + }) + }, + getStandardTemplate() { + this.$axios.get(this.$api.StandardTemplate.getStandardTemplate).then(res => { + let data = [] + res.data.forEach(a => { + data.push({ + label: a.name, + value: a.id, + type: 'success' + }) + }) + this.itemParameterData.selectField.templateId.select = data + this.itemParameterData.tagField.templateId.select = data + }) + }, // 鏉冮檺鍒嗛厤 getPower(radio) { let power = JSON.parse(sessionStorage.getItem('power')) -- Gitblit v1.9.3