From 1994756ca5b2e646202daa2c04a72bf2d421f3d8 Mon Sep 17 00:00:00 2001
From: lxp <1928192722@qq.com>
Date: 星期五, 09 八月 2024 17:57:05 +0800
Subject: [PATCH] modified: src/components/do/b1-ins-order/fiberoptic-config-two.vue modified: src/components/do/b1-ins-order/fiberoptic-config.vue modified: src/components/view/b1-inspect-order-plan.vue modified: src/components/view/b1-inspection-order.vue
---
src/components/do/b1-ins-order/add.vue | 19 ++++++++++++-------
1 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/src/components/do/b1-ins-order/add.vue b/src/components/do/b1-ins-order/add.vue
index cb130d3..ceb28b6 100644
--- a/src/components/do/b1-ins-order/add.vue
+++ b/src/components/do/b1-ins-order/add.vue
@@ -620,7 +620,8 @@
</el-row>
</span>
</el-dialog>
- <fiberOpticConfig :currentId="currentId" @saveFiberopticConfig="getTotal()" v-if="configShow" :active="active" />
+ <fiberOpticConfig :currentId="currentId" @saveFiberopticConfig="getTotal()" v-if="configShow && examine == 0" :active="active" />
+ <fiberOpticConfigTwo :currentId="currentId" @saveFiberopticConfig="getTotal()" v-if="configShow && examine == 1" :active="active" />
<equipConfig :currentId="currentId" v-if="equipConfigShow" :active="active" />
<cableConfig v-if="cableConfigShow" :active="active" />
<!-- 鍗曢�夌壒娈婂�煎鐞嗘-->
@@ -906,6 +907,7 @@
<script>
import ValueTable from '../../tool/value-table.vue'
import fiberOpticConfig from './fiberoptic-config.vue'
+import fiberOpticConfigTwo from './fiberoptic-config-two.vue'
import equipConfig from './equip-config.vue'
import cableConfig from './cable-config.vue'
import Vue from 'vue'
@@ -915,10 +917,15 @@
components: {
ValueTable,
fiberOpticConfig,
+ fiberOpticConfigTwo,
equipConfig,
cableConfig
},
props: {
+ examine: {
+ type: Number,
+ default: () => 0
+ },
active: {
type: Number,
default: () => 0
@@ -1593,10 +1600,9 @@
return
}
}
- console.log('isHaveBushing===', this.totalArr)
- // inspectionItem
- let spcialItem = null//this.totalArr.find(a => a.state == 1 && a.inspectionItem.includes('鏉惧绠�'))
- // console.log('isHaveBushing===', isHaveBushing)
+
+ // console.log('isHaveBushing===', this.totalArr)
+ let spcialItem = this.totalArr.find(a => a.state == 1 && a.inspectionItem.includes('鏉惧绠�'))
if (productListSelected && select[2] === '鍏夌紗' && isHaveBushing === false) {
this.$message.error('鍏夌紗娓╁害寰幆椤圭洰蹇呴』杩涜鍏夌氦閰嶇疆')
this.$refs.sampleTable.setCurrentRow(this.currentMethod, true)
@@ -2995,9 +3001,8 @@
getTotal() {
this.totalArr = []
this.total = 0;
- // console.log(this.sampleList)
this.sampleList.forEach(item => {
- if (item.insProduct && item.insProduct.length > 0) {
+ if (item.insProduct && item.insProduct.length > 0) {
item.insProduct.forEach(a => {
this.totalArr.push(a)
})
--
Gitblit v1.9.3