From 07ea6a242b16b7ad61602915698a9852cc894246 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 08 八月 2024 22:07:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/components/do/b1-ins-order/add.vue | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/src/components/do/b1-ins-order/add.vue b/src/components/do/b1-ins-order/add.vue
index cb130d3..548df9e 100644
--- a/src/components/do/b1-ins-order/add.vue
+++ b/src/components/do/b1-ins-order/add.vue
@@ -906,6 +906,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 +916,15 @@
components: {
ValueTable,
fiberOpticConfig,
+ fiberOpticConfigTwo,
equipConfig,
cableConfig
},
props: {
+ examine: {
+ type: Number,
+ default: () => 0
+ },
active: {
type: Number,
default: () => 0
@@ -1593,6 +1599,7 @@
return
}
}
+
console.log('isHaveBushing===', this.totalArr)
// inspectionItem
let spcialItem = null//this.totalArr.find(a => a.state == 1 && a.inspectionItem.includes('鏉惧绠�'))
@@ -2435,11 +2442,6 @@
this.$axios.post(this.$api.insOrder.selectInsOrderTemplateById + '?id=' + e).then(res => {
if (res.code == 201) return
let obj = JSON.parse(res.data)
- console.log(obj);
- //鍒跺崟浜鸿缃负褰撳墠鐧诲綍鐢ㄦ埛
- let user = JSON.parse(localStorage.getItem('user'))
- obj.addObj.custom = user.name
- obj.addObj.userId = user.userId
this.addObj = obj.addObj;
this.sampleList = obj.sampleList;
this.selectTree = obj.selectTree
--
Gitblit v1.9.3