From eb6479e7df9692aa3d79f36631c13c3f8b4b5797 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期四, 04 七月 2024 10:56:30 +0800
Subject: [PATCH] 增加幂次计算
---
src/components/do/b1-inspect-order-plan/Inspection.vue | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/src/components/do/b1-inspect-order-plan/Inspection.vue b/src/components/do/b1-inspect-order-plan/Inspection.vue
index 9e6591a..27b091c 100644
--- a/src/components/do/b1-inspect-order-plan/Inspection.vue
+++ b/src/components/do/b1-inspect-order-plan/Inspection.vue
@@ -981,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('>')){
@@ -1002,6 +1001,9 @@
this.saveInsContext()
},
wareFormChange(m,type){
+ if(this.PROJECT!='妫�娴嬩腑蹇�'){
+ return
+ }
if(m&&type){
this.wareForm[type] = Number(m)
}
@@ -1231,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['鍏夌氦']
@@ -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)
@@ -1674,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
@@ -2190,7 +2198,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