From 90ef20e23e11803d967582f93f58f0b52cddb3a1 Mon Sep 17 00:00:00 2001
From: gaoluyang <gaoluyang@rengu.cc>
Date: 星期二, 23 七月 2024 13:44:36 +0800
Subject: [PATCH] 装备电缆-下单时样品型号根据×位置拼接
---
src/components/do/b1-inspect-order-plan/Inspection.vue | 12 ++++--------
1 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/src/components/do/b1-inspect-order-plan/Inspection.vue b/src/components/do/b1-inspect-order-plan/Inspection.vue
index b7fd57c..cb67224 100644
--- a/src/components/do/b1-inspect-order-plan/Inspection.vue
+++ b/src/components/do/b1-inspect-order-plan/Inspection.vue
@@ -295,8 +295,8 @@
<span style="margin-left: 4px;">%</span>
</el-form-item>
</el-form>
- <el-button type="primary" size="small" v-if="dataAcquisitionEidt>0&&PROJECT=='妫�娴嬩腑蹇�'&&collection" @click="getDataAcquisitionDevice" :loading="dataAcquisitionLoading">鏁版嵁閲囬泦</el-button>
- <el-button :type="dataAcquisitionEidtAble?'':'primary'" size="small" v-if="dataAcquisitionEidt>0&&PROJECT=='妫�娴嬩腑蹇�'&&collection&&collected" @click="dataAcquisitionEidtAble=!dataAcquisitionEidtAble">{{dataAcquisitionEidtAble?'鍏抽棴缂栬緫':'缂栬緫鏁伴噰'}}</el-button>
+ <el-button type="primary" size="small" v-if="dataAcquisitionEidt>0&&PROJECT=='妫�娴嬩腑蹇�'" @click="getDataAcquisitionDevice" :loading="dataAcquisitionLoading">鏁版嵁閲囬泦</el-button>
+ <el-button :type="dataAcquisitionEidtAble?'':'primary'" size="small" v-if="dataAcquisitionEidt>0&&PROJECT=='妫�娴嬩腑蹇�'&&collected" @click="dataAcquisitionEidtAble=!dataAcquisitionEidtAble">{{dataAcquisitionEidtAble?'鍏抽棴缂栬緫':'缂栬緫鏁伴噰'}}</el-button>
</div>
</div>
<div class="center-box" id="nav" v-loading="tableLoading" v-if="!tableLists.find(m=>m.templateId==currentTable)||tableLists.find(m=>m.templateId==currentTable).templateName!='娓╁害寰幆妫�楠屽師濮嬭褰�'">
@@ -845,7 +845,6 @@
dataAcquisitionEidt:0,
dataAcquisitionEidtAble:false,
dataAcquisitionLoading:false,
- collection:false,
collected:false
}
},
@@ -1286,7 +1285,6 @@
let power = JSON.parse(sessionStorage.getItem('power'))
let fileDel = false
let fileAdd = false
- let collection = false
let collected = false
for (var i = 0; i < power.length; i++) {
if (power[i].menuMethod == 'uploadFile') {
@@ -1294,9 +1292,6 @@
}
if (power[i].menuMethod == 'delfile') {
fileDel = true
- }
- if (power[i].menuMethod == 'dataCollection') {
- collection = true
}
if (power[i].menuMethod == 'isItAllowedToModifyTheCollectedValues') {
collected = true
@@ -1306,7 +1301,6 @@
this.componentData0.do.splice(1, 1)
}
this.fileAdd = fileAdd
- this.collection = collection
this.collected = collected
},
async getCurrentProduct(id,type){
@@ -1659,6 +1653,7 @@
}
}
})
+ console.log(1111,str)
if (str != '') {
let count2 = 0
for (let i in this.currentSample.insProduct) {
@@ -1671,6 +1666,7 @@
.insProduct[i].inspectionItemSubclass==null||this.currentSample
.insProduct[i].inspectionItemSubclass==undefined?'':this.currentSample
.insProduct[i].inspectionItemSubclass
+ console.log(inspectionItemClass, inspectionItem, inspectionItemSubclass)
if (this.currentSample.insProduct[i].templateId === a.templateId && inspectionItemClass +inspectionItem+inspectionItemSubclass ===
str) {
ids.push({
--
Gitblit v1.9.3