From a0db9daa3a9ea540fd78203e53a9b7d38e9aecd9 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期四, 04 七月 2024 10:56:53 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/center-lims-before into master
---
src/components/do/b1-inspect-order-plan/Inspection.vue | 37 +++++++++++++++++++++++++------------
1 files changed, 25 insertions(+), 12 deletions(-)
diff --git a/src/components/do/b1-inspect-order-plan/Inspection.vue b/src/components/do/b1-inspect-order-plan/Inspection.vue
index 4e3ceb3..a38a441 100644
--- a/src/components/do/b1-inspect-order-plan/Inspection.vue
+++ b/src/components/do/b1-inspect-order-plan/Inspection.vue
@@ -301,7 +301,8 @@
<template v-if="n.v.ps!=undefined && n.v.ps.value==='妫�楠屽��' && state==1">
<el-input v-if="getInspectionValueType(n.i) == 1" class="table_input" v-model="n.v.v"
:disabled="getInspectionItemType(n.i) == 1 || (n.u != userId && n.u != undefined && n.u != '')"
- @change="m=>changeInput(m,`${item.templateId}-${n.r}-${n.c}-${n.i}`)" type="number" @mousewheel.native.prevent :key="'abc-'+'000'+index+'000'+i+'000'+j">
+ @input="handleInput(n)"
+ @change="m=>changeInput(m,`${item.templateId}-${n.r}-${n.c}-${n.i}`)" @mousewheel.native.prevent :key="'abc-'+'000'+index+'000'+i+'000'+j">
<el-button slot="append" type="primary" icon="el-icon-edit" size="mini"
v-if="getInspectionItemType(n.i) == 1" @click="getSystemValue(n)"></el-button>
</el-input>
@@ -866,7 +867,7 @@
}
let list = await this.getCurrentProduct(this.currentSample.id,0)
this.currentSample.insProduct = this.HaveJson(list)
- console.log(this.currentSample)
+ // console.log(this.currentSample)
this.currentSample.insProduct.forEach(a => {
this.param[a.id] = {
insValue: [],
@@ -980,7 +981,6 @@
row.resValue = row.comValue?Math.abs(row.comValue-20).toFixed(5):''
this.param[row.id].resValue.v.v = row.resValue
if(row.ask&&row.resValue){
- console.log(row.ask,row.resValue)
if(row.ask.includes('<')){
row.insResult = row.resValue<row.ask.split('<')[1]?1:0
}else if(row.ask.includes('>')){
@@ -1001,6 +1001,9 @@
this.saveInsContext()
},
wareFormChange(m,type){
+ if(this.PROJECT!='妫�娴嬩腑蹇�'){
+ return
+ }
if(m&&type){
this.wareForm[type] = Number(m)
}
@@ -1230,6 +1233,9 @@
this.currentTab = null;
},
getReportModel(id){
+ if(this.PROJECT!='妫�娴嬩腑蹇�'){
+ return
+ }
this.$axios.post(this.$api.insOrderPlan.getReportModel+'?sampleId='+id, {}).then(res => {
this.fibers = res.data['鍏夌氦甯�']
this.fiber = res.data['鍏夌氦']
@@ -1484,7 +1490,6 @@
}
}
})
- console.log(5555,a.template)
// return
ids.forEach(id => {
for (let b = 0; b < a.template.length; b++) {
@@ -1617,7 +1622,6 @@
try {
let equipValue = JSON.parse(a.insProductResult.equipValue)
for (let i = 0; i < equipValue.length; i++) {
- console.log(444,this.equipForm)
if(this.tableLists.find(m=>m.templateId==this.currentTable)&&this.tableLists.find(m=>m.templateId==this.currentTable).templateName=='娓╁害寰幆妫�楠屽師濮嬭褰�'){
// 娓╁害寰幆璧嬪��
this.$set(this.equipForm,`code`+i,equipValue[i].v)
@@ -1651,7 +1655,6 @@
let id = str[0]
let pId = str[3]
var list = []
- // console.log(id, 'r', r , 'c',c,this.tableList)
for (let a in this.tableList) {
if (this.tableList[a].templateId == id) {
list = this.tableList[a].arr
@@ -1675,7 +1678,11 @@
}
if(this.getInspectionValueType(item.i)==1){
if (!isNaN(parseFloat(c.v.v))) {
- comValue[(tableCode + (c.r + 1))] = parseFloat(c.v.v)
+ if(c.v.v.includes('^')){
+ comValue[(tableCode + (c.r + 1))] = c.v.v
+ }else{
+ comValue[(tableCode + (c.r + 1))] = parseFloat(c.v.v)
+ }
}
}else{
comValue[(tableCode + (c.r + 1))] = c.v.v
@@ -1991,6 +1998,13 @@
}
return sum
},
+ handleInput (n) {
+ if (n.v.v > 10000) {
+ let num2 = new this.$Big(n.v.v)
+ n.v.v = num2.toExponential()
+ }
+ n.v.v = n.v.v.replace(/[^\d.^e]/g, '');
+ },
getInspectionItemType(id) {
for (var a in this.currentSample.insProduct) {
if (this.currentSample.insProduct[a].id == id) {
@@ -2019,14 +2033,14 @@
}
})
} catch (e) {
- console.log(e);
+ // console.log(e);
this.$message.error('鎵句笉鍒拌澶囧唴瀹�')
}
- console.log(n, code);
+ // console.log(n, code);
fetch('http://localhost:82/寰俊鍥剧墖_20240518100811.png').then(res=>res.blob()).then(blob=>{
- console.log(blob);
+ // console.log(blob);
const url = URL.createObjectURL(blob)
- console.log(url);
+ // console.log(url);
})
/* this.$message.error('閲囬泦澶辫触銆愬凡寮�鏀炬墜鍔ㄦ柟寮忋��')
for (var a in this.currentSample.insProduct) {
@@ -2188,7 +2202,6 @@
},
saveInsContext() {
if(this.param){
- console.log(33333,this.param)
this.$axios.post(this.$api.insOrderPlan.saveInsContext, {
param: JSON.stringify(this.param)
}).then(res => {
--
Gitblit v1.9.3