From 843104043cb7c573b31b96bf2fd8a24d3e8c12a1 Mon Sep 17 00:00:00 2001 From: value <z1292839451@163.com> Date: 星期四, 06 六月 2024 00:29:47 +0800 Subject: [PATCH] 部分功能小调整 --- src/components/do/b1-inspect-order-plan/Inspection.vue | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 58 insertions(+), 2 deletions(-) diff --git a/src/components/do/b1-inspect-order-plan/Inspection.vue b/src/components/do/b1-inspect-order-plan/Inspection.vue index 936331e..13d3872 100644 --- a/src/components/do/b1-inspect-order-plan/Inspection.vue +++ b/src/components/do/b1-inspect-order-plan/Inspection.vue @@ -120,6 +120,19 @@ .collection:active { opacity: .7; } + .table_caret{ + font-size: 16px; + margin: 0 5px; + color: rgba(0, 0, 0, 0.1); + } + .table_caret:hover{ + color: #409eff; + cursor: pointer; + } + + .table_caret:active{ + opacity: .8; + } </style> <style> .inspection .el-form-item__label { @@ -169,6 +182,11 @@ .inspection .el-textarea__inner { min-height: 100% !important; } + + .inspection .tables .el-input{ + display: flex; + align-items: center; + } </style> <template> <div v-loading="loading" class="inspection"> @@ -213,7 +231,7 @@ <el-input clearable v-model="insOrder.appointed" disabled size="small" placeholder="璇疯緭鍏�"></el-input> </el-form-item> <el-form-item label="褰撳墠鏍峰搧浣嶆暟:"> - <el-tag v-if="currentSample.index">{{ `NO.${currentSample.index}` }}</el-tag> + <el-tag v-if="currentKey">{{ `NO.${currentKey}` }}</el-tag> </el-form-item> </el-form> </div> @@ -284,6 +302,16 @@ <el-option v-for="(e, i) in enumList" :key="i" :label="e.label" :value="e.value"></el-option> </el-select> --> <span :style="`font-family:${n.v.ff} !important;`">{{n.v.v}}</span> + </template> + <template v-else-if="n.v.ps!=undefined && n.v.ps.value==='鏍峰搧缂栧彿'"> + <div style="display: flex;flex-wrap: nowrap;align-items: center;"> + <i class="el-icon-caret-left table_caret" @click="caretSample(-1)"></i> + <div :style="`font-family:${n.v.ff} !important;`">{{currentSample.sampleCode}}</div> + <i class="el-icon-caret-right table_caret" @click="caretSample(1)"></i> + </div> + </template> + <template v-else-if="n.v.ps!=undefined && n.v.ps.value==='鏍峰搧鍨嬪彿'"> + <div :style="`font-family:${n.v.ff} !important;`" v-if="currentSample.model!==undefined&¤tSample.model!==null">{{currentSample.model}}</div> </template> <span v-else :style="`font-family:${n.v.ff} !important;`">{{n.v.v}}</span> </div> @@ -491,7 +519,7 @@ this.$axios.post(this.$api.insOrderPlan.doInsOrder, { id: val, laboratory: this.sonLaboratory - }).then(res => { + }).then(async res => { this.insOrder = res.data.insOrder; this.urgentList.forEach(m => { if (m.value == this.insOrder.type) { @@ -500,6 +528,8 @@ }) this.sampleProduct = res.data.sampleProduct this.currentSample = this.HaveJson(this.sampleProduct[0]) + let list = await this.getCurrentProduct(this.currentSample.id,0) + this.currentSample.insProduct = this.HaveJson(list) this.currentSample.insProduct.forEach(a => { this.param[a.id] = { insValue: [], @@ -615,6 +645,7 @@ this.bushing = [] this.currentBushing = null; this.sampleVisible = false; + this.currentSample = this.HaveJson(row) let list = await this.getCurrentProduct(row.id,0) this.currentSample.insProduct = this.HaveJson(list) this.currentSample.insProduct.forEach(a => { @@ -1459,6 +1490,31 @@ nav.addEventListener("mouseleave", function(event) { flag = false; }); + }, + async caretSample(num){ + let index = this.currentKey + num + if(index < 1){ + this.$message.error('褰撳墠鏄涓�涓牱鍝�') + return + } else if(index > this.sampleProduct.length){ + this.$message.error('褰撳墠鏄渶鍚庝竴涓牱鍝�') + return + } + this.currentKey = index + this.currentSample = this.HaveJson(this.sampleProduct[index - 1]) + let list = await this.getCurrentProduct(this.currentSample.id,0) + this.currentSample.insProduct = this.HaveJson(list) + this.currentSample.insProduct.forEach(a => { + this.param[a.id] = { + insValue: [], + comValue: [], + resValue: null, + equipValue: [], + equipName: [], + insResult: null + } + }) + this.getTableLists() } } } -- Gitblit v1.9.3