From 7e61ac3148a1988fe1ea0e3b4426543766f2fe37 Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期三, 12 六月 2024 07:18:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/components/do/b1-ins-order/add.vue |   43 +++++++++++++++++++++++++++++++++++++++----
 1 files changed, 39 insertions(+), 4 deletions(-)

diff --git a/src/components/do/b1-ins-order/add.vue b/src/components/do/b1-ins-order/add.vue
index 7400a9b..cddcf96 100644
--- a/src/components/do/b1-ins-order/add.vue
+++ b/src/components/do/b1-ins-order/add.vue
@@ -100,7 +100,7 @@
 
 <template>
   <div class="ins_order_add">
-    <div v-show="!configShow&&!equipConfigShow">
+    <div v-show="!configShow&&!equipConfigShow&&!cableConfigShow">
       <el-row class="title">
         <el-col :span="6" style="padding-left: 20px;">濮旀墭鍗曚俊鎭�&nbsp;&nbsp;&nbsp;鎬讳环锛�<span
             style="color: #3A7BFA">锟{total}}</span></el-col>
@@ -116,6 +116,8 @@
           <el-button size="medium" @click="templateDia=true" v-show="active==1">
             <span style="color: #3A7BFA;">淇濆瓨妯℃澘</span>
           </el-button>
+          <el-button size="medium" type="primary" @click="openCableConfig"
+            v-if="active==1&&PROJECT=='瑁呭鐢电紗'">鐢电紗閰嶇疆</el-button>
           <el-button size="medium" type="primary" @click="openEquipConfig"
             v-if="active==1">瀛愭牱鍝侀厤缃�</el-button>
           <el-button size="medium" type="primary" @click="openConfig"
@@ -132,7 +134,7 @@
         </el-col>
       </el-row>
     </div>
-    <div class="search" v-show="!configShow&&!equipConfigShow">
+    <div class="search" v-show="!configShow&&!equipConfigShow&&!cableConfigShow">
       <el-row>
         <el-col class="search_thing" :span="6">
           <div class="search_label">濮旀墭缂栧彿锛�</div>
@@ -300,7 +302,7 @@
         </el-col>
       </el-row>
     </div>
-    <div v-show="!configShow&&!equipConfigShow">
+    <div v-show="!configShow&&!equipConfigShow&&!cableConfigShow">
       <el-table class="el-table sampleTable" ref="sampleTable" :data="sampleList" height="250px" tooltip-effect="dark"
         border @selection-change="selectSample" highlight-current-row @row-click="rowClick" style="margin-top: 10px;">
         <el-table-column type="selection" width="60" :selectable="selectable" v-if="active==1"></el-table-column>
@@ -489,6 +491,7 @@
      v-if="configShow" :active="active" />
      <equipConfig :currentId="currentId"
      v-if="equipConfigShow" :active="active"/>
+     <cableConfig v-if="cableConfigShow" :active="active" />
     <el-dialog title="妫�娴嬪埌鐗规畩椤癸紝璇蜂綔鍑轰互涓嬮�夋嫨" :visible.sync="bsm1Dia" width="500px" :show-close="false" :before-close="beforeClose">
       <div class="body" style="max-height: 60vh;">
         <el-row v-if="bsm1">
@@ -565,11 +568,13 @@
   import ValueTable from '../../tool/value-table.vue'
   import fiberOpticConfig from './fiberoptic-config.vue'
   import equipConfig from './equip-config.vue'
+  import cableConfig from './cable-config.vue'
   export default {
     components: {
       ValueTable,
       fiberOpticConfig,
-      equipConfig
+      equipConfig,
+      cableConfig
     },
     props: {
       active: {
@@ -699,6 +704,7 @@
         bsm1Val: null,
         bsm1Dia: false,
         equipConfigShow: false,
+        cableConfigShow:false,
         bsm2: false,
         bsm2Val: null,
         bsm2Dia: false,
@@ -1582,6 +1588,35 @@
           // })
         }
       },
+      openCableConfig(){
+        if (this.active === 1) {
+          if (this.sampleIds.length === 0) {
+            this.$message.error("鏈�夋嫨鏍峰搧")
+            return
+          }
+          this.cableConfigShow = true
+        } else {
+          if (this.sampleId === null) {
+            this.$message.error('鏈�変腑鏍峰搧')
+            return
+          }
+          // this.$axios.post(this.$api.insBushing.selectBushingBySampleId, {
+          //   sampleId: this.sampleId
+          // }).then(res => {
+          //   if (res.data.length === 0) {
+          //     this.$message.error('璇ユ牱鍝佹病鏈夐厤缃厜绾�')
+          //     return
+          //   }
+          //   for (var i in this.sampleList) {
+          //     if (this.sampleList[i].id = this.sampleId) {
+          //       this.sampleList[i].bushing = res.data
+          //       break
+          //     }
+          //   }
+          //   this.configShow = true
+          // })
+        }
+      },
       upBsm1(val) {
         let sections = JSON.parse(this.bsmRow.section);
         let asks = JSON.parse(this.bsmRow.ask);

--
Gitblit v1.9.3