From 760d1a1f815d349832a36fac25b28abb51ff53d4 Mon Sep 17 00:00:00 2001
From: gaoluyang <gaoluyang@rengu.cc>
Date: 星期三, 25 九月 2024 17:20:35 +0800
Subject: [PATCH] 1.检验任务提交之后的弹框,填写 试验信息只有在电路试验的站点才会进行填写,其余站点不需要

---
 src/components/do/b1-ins-order/fiberoptic-config.vue | 1728 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 1,577 insertions(+), 151 deletions(-)

diff --git a/src/components/do/b1-ins-order/fiberoptic-config.vue b/src/components/do/b1-ins-order/fiberoptic-config.vue
index 4066118..d58d897 100644
--- a/src/components/do/b1-ins-order/fiberoptic-config.vue
+++ b/src/components/do/b1-ins-order/fiberoptic-config.vue
@@ -2,7 +2,7 @@
   <div class="ins_order_config">
     <div>
       <el-row class="title">
-        <el-col :span="6" style="padding-left: 20px;">鍏夌氦閰嶇疆</el-col>
+        <el-col :span="6" style="padding-left: 20px;text-align: left;">鍏夌氦閰嶇疆</el-col>
         <el-col :span="18" style="text-align: right;">
           <el-button size="medium" type="primary" @click="save" :loading="saveLoad" v-if="active==1">淇� 瀛�</el-button>
           <el-button size="medium" @click="outConfig">
@@ -22,7 +22,7 @@
                 <label style="width: 70px;">鏍峰搧鍨嬪彿</label>
                 <span style="font-size: 14px;">{{models}}</span>
               </div>
-              <el-radio-group v-model="packageInfo.radio" size="small" @change="upNum()" :disabled="active!=1">
+              <el-radio-group v-model="packageInfo.radio" size="small" @change="isInspection()" :disabled="active!=1">
                 <el-radio :label="0">鍏ㄦ</el-radio>
                 <el-radio :label="1">鎶芥</el-radio>
               </el-radio-group>
@@ -31,16 +31,16 @@
               style="display: flex;align-items: center;justify-content: space-between;margin-bottom: 8px;padding: 0 12px;box-sizing: border-box;">
               <div class="search-item" style="margin-right: 10px;">
                 <label>濂楃鏁扮洰</label>
-                <el-input v-model="packageInfo.num1" placeholder="璇疯緭鍏�" size="small" @change="upNum" :disabled="active!=1"></el-input>
+                <el-input v-model="packageInfo.num1" placeholder="璇疯緭鍏�" size="small" @blur="addBushing" :disabled="active!=1" ></el-input>
               </div>
               <div class="search-item" style="margin-right: 10px;">
-                <label style="width: 70px;">鏍囧噯閲�</label>
-                <el-input v-model="packageInfo.standNum" placeholder="璇疯緭鍏�" size="small" @change="upNum" :disabled="active!=1"></el-input>
+                <label style="width: 100px">姣忔牴绠℃娊妫�鏍囧噯閲�</label>
+                <el-input v-model="packageInfo.standNum" placeholder="璇疯緭鍏�" size="small" @blur="addStandNum" :disabled="packageInfo.radio===0||active!=1" style="width:100px"></el-input>
               </div>
               <div class="search-item">
-                <label style="width: 70px;">妫�娴嬮噺</label>
-                <el-input v-model="packageInfo.testNum" placeholder="璇疯緭鍏�" size="small" @change="upNum"
-                  :disabled="packageInfo.radio===0||active!=1"></el-input>
+                <label style="width: 100px">姣忔牴绠℃娊妫�妫�娴嬮噺</label>
+                <el-input v-model="packageInfo.testNum" placeholder="璇疯緭鍏�" size="small" @blur="addTestNum"
+                  :disabled="packageInfo.radio===0||active!=1" style="width:70px"></el-input>
               </div>
             </div>
             <el-table ref="table0" :data="bushing" tooltip-effect="dark" style="width: 100%" height="203px" size="small"
@@ -53,7 +53,7 @@
               </el-table-column>
               <el-table-column label="绠¤壊鏍�" show-overflow-tooltip>
                 <template slot-scope="scope">
-                  <el-select v-model="scope.row.color" size="mini" :disabled="active!=1">
+                  <el-select v-model="scope.row.color" size="mini" :disabled="active!=1" allow-create filterable >
                     <el-option v-for="(color,i) in colors" :key="i" :label="color.lable"
                       :value="color.value"></el-option>
                   </el-select>
@@ -78,7 +78,7 @@
               @select="upProductSelect"
               >
               <el-table-column type="selection" width="55"
-              :selectable="()=>((currentDetectionItems||this.multiFiberList.length > 0)&&active==1)">
+              :selectable="()=>((currentDetectionItems||this.selectFiberList.length > 0 || this.multiFiberList.length > 0)&&active==1)">
               </el-table-column>
               <el-table-column label="瀹為獙瀹�" show-overflow-tooltip prop="sonLaboratory" ></el-table-column>
               <el-table-column prop="inspectionItem" label="妫�楠岄」" show-overflow-tooltip>
@@ -95,8 +95,14 @@
               </el-table-column> -->
               <el-table-column prop="ask" label="妫�娴嬭姹�" show-overflow-tooltip width="200px">
                 <template slot-scope="scope">
-                  <el-input v-model="scope.row.ask" placeholder="璇疯緭鍏�" size="small" :disabled="active!=1" v-if="!isAskOnlyRead"></el-input>
+                  <el-input v-model="scope.row.ask" placeholder="璇疯緭鍏�" size="small" :disabled="active!=1" v-if="!isAskOnlyRead" @change="changeASk(scope.row,'ask')"></el-input>
                   <span v-else>{{ scope.row.ask }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column prop="tell" label="瑕佹眰鎻忚堪" show-overflow-tooltip width="150">
+                <template slot-scope="scope">
+                  <el-input v-model="scope.row.tell" placeholder="璇疯緭鍏�" size="small" :disabled="active!=1" v-if="!isAskOnlyRead" @change="changeASk(scope.row)"></el-input>
+                  <span v-else>{{ scope.row.tell }}</span>
                 </template>
               </el-table-column>
             </el-table>
@@ -104,24 +110,25 @@
         </el-col>
       </el-row>
       <el-row :gutter="10">
-        <el-col :span="12">
+        <el-col :span="12" v-if="packageInfo.ismiers && inspectionItemST != 1">
           <div class="grid-content">
             <h5>鍏夌氦甯�
               <el-button size="mini" type="primary" class="btns" @click="addFibers"
-                :disabled="packageInfo.ismiers===false||miresModel===null||miresStandard===null" v-if="active==1">鐢熸垚鍏夌氦甯�</el-button>
-              <el-button size="mini" class="btns" @click="clearFibers" :disabled="selectBushing.length === 0" v-if="active==1">娓呴櫎</el-button>
+                 v-if="active==1">鐢熸垚鍏夌氦甯�</el-button>
+              <!-- <el-button size="mini" class="btns" @click="clearFibers" :disabled="selectBushing.length === 0" v-if="active==1">娓呴櫎</el-button> -->
             </h5>
             <div
               style="display: flex;align-items: center;justify-content: space-between;margin:4px 0 6px 0;padding: 0 12px;box-sizing: border-box;">
-              <div class="search-item" style="width: 50%;margin-right: 16px;">
+              <!-- <div class="search-item" style="width: 50%;margin-right: 16px;">
                 <label style="width: 80px;">绾ゅ甫绫诲瀷</label>
                 <el-select v-model="miresModel" placeholder="璇烽�夋嫨" size="small" style="width: 100%;"
-                  :disabled="selectBushing.length===0||active!=1">
+                  :disabled="selectBushing.length===0||active!=1"
+                  >
                   <el-option v-for="(item,a) in miresModels" :key="a" :label="item.label" :value="item.value">
                   </el-option>
                 </el-select>
-              </div>
-              <div class="search-item" style="width: 50%;">
+              </div> -->
+              <!-- <div class="search-item" style="width: 50%;">
                 <label style="width: 80px;">鍙傝�冩爣鍑�</label>
                 <el-select v-model="miresStandard" placeholder="璇烽�夋嫨" size="small" style="width: 100%;"
                   :disabled="miresModel===null||active!=1" @focus="selectsStandardMethodByFLSSM2()"
@@ -129,10 +136,33 @@
                   <el-option v-for="item in miresStandards" :key="item.id" :label="item.code" :value="item.id">
                   </el-option>
                 </el-select>
+              </div> -->
+              <div class="search-item" style="width: 50%;margin-right: 16px;">
+                <label style="width: 80px;">绾ゅ甫绫诲瀷</label>
+                <el-select v-model="miresModel" placeholder="璇烽�夋嫨" size="small" style="width: 100%;"
+
+                  >
+                  <el-option v-for="(item,a) in miresModels" :key="a" :label="item.label" :value="item.value">
+                  </el-option>
+                </el-select>
               </div>
+              <div class="search-item" style="width: 50%;">
+                <label style="width: 80px;">鍙傝�冩爣鍑�</label>
+                <el-select v-model="miresStandard" placeholder="璇烽�夋嫨" size="small" style="width: 100%;"
+                :disabled="miresModel===null||active!=1"
+                 @focus="selectsStandardMethodByFLSSM2()"
+                  @change="(value)=>methodChange2(value)">
+                  <el-option v-for="item in miresStandards" :key="item.id" :label="item.code" :value="item.id">
+                  </el-option>
+                </el-select>
+              </div>
+
             </div>
-            <el-table ref="table2" :data="fibersList" tooltip-effect="dark" style="width: 100%" height="270px"
-              size="small" @selection-change="handleSelectionChange" highlight-current-row @row-click="(row, column, event)=>rowClickFiber(row, column, event,0)"
+            <!-- <el-table ref="table2" :data="fibersList" tooltip-effect="dark" style="width: 100%" height="270px"
+              size="small" @selection-change="handleSelectionChange" highlight-current-row @row-click="(row, column, event)=>rowClickFiber(row, column, event,1)"
+              :header-cell-class-name="setClassName0"> -->
+              <el-table ref="table2" :data="fibersList" tooltip-effect="dark" style="width: 100%" height="270px"
+              size="small" @selection-change="handleSelectionChange" highlight-current-row
               :header-cell-class-name="setClassName0">
               <el-table-column
               type="selection"
@@ -140,23 +170,37 @@
               :selectable="()=>(active==1)">
               </el-table-column>
               <el-table-column prop="code" label="鍏夌氦甯︾紪鍙�" show-overflow-tooltip align="center">
+                <template slot-scope="scope">
+                  <el-input v-model="scope.row.code" placeholder="璇疯緭鍏�" size="mini" ></el-input>
+                </template>
               </el-table-column>
               <el-table-column prop="model" label="鍏夌氦甯﹁鏍�" show-overflow-tooltip align="center">
+                <template slot-scope="scope">
+                  <el-input v-model="scope.row.model" placeholder="璇疯緭鍏�" size="mini" ></el-input>
+                </template>
               </el-table-column>
               <el-table-column prop="standard" label="鍙傝�冩爣鍑�" show-overflow-tooltip align="center">
+                <template slot-scope="scope">
+                  <el-input v-model="scope.row.standard" placeholder="璇疯緭鍏�" size="mini" ></el-input>
+                </template>
               </el-table-column>
               <el-table-column prop="num" label="鍏夌氦妫�娴嬮噺" show-overflow-tooltip align="center">
+                <template slot-scope="scope">
+                  <el-input v-model="scope.row.num" placeholder="璇疯緭鍏�" size="mini" ></el-input>
+                </template>
               </el-table-column>
             </el-table>
           </div>
         </el-col>
-        <el-col :span="12">
+        <el-col :span="!packageInfo.ismiers?24:12" v-if=" inspectionItemST != 1">
           <div class="grid-content">
-            <h5>鍏夌氦<el-button size="mini" type="primary" class="btns" @click="addFiber"
-                :disabled="mireModel===null||mireStandard===null" v-if="active==1">鍏夌氦閰嶈壊</el-button></h5>
+            <h5>鍏夌氦
+              <el-button size="mini" type="primary" class="btns" @click="addFiber"
+                 v-if="active==1">鍏夌氦閰嶈壊</el-button>
+              </h5>
             <div
               style="display: flex;align-items: center;justify-content: space-between;margin: 4px 0 6px 0;padding: 0 12px;box-sizing: border-box;">
-              <div class="search-item" style="width: 50%;margin-right: 16px;">
+              <!-- <div class="search-item" style="width: 50%;margin-right: 16px;">
                 <label style="width: 80px;">鍏夌氦绫诲瀷</label>
                 <el-select v-model="mireModel" placeholder="璇烽�夋嫨" size="small" style="width: 100%;"
                   :disabled="selectBushing.length===0||active!=1">
@@ -172,11 +216,32 @@
                   <el-option v-for="item in mireStandards" :key="item.id" :label="item.code" :value="item.id">
                   </el-option>
                 </el-select>
+              </div> -->
+              <div class="search-item" style="width: 50%;margin-right: 16px;">
+                <label style="width: 80px;">鍏夌氦绫诲瀷</label>
+                <el-select v-model="mireModel" placeholder="璇烽�夋嫨" size="small" style="width: 100%;"
+               >
+                  <el-option v-for="(item,a) in mireModels" :key="a" :label="item.label" :value="item.value">
+                  </el-option>
+                </el-select>
+              </div>
+              <div class="search-item" style="width: 50%;">
+                <label style="width: 80px;">鍙傝�冩爣鍑�</label>
+                <el-select v-model="mireStandard" placeholder="璇烽�夋嫨" size="small" style="width: 100%;"
+                :disabled="mireModel===null||active!=1"
+                 @focus="selectsStandardMethodByFLSSM()"
+                  @change="(value)=>methodChange(value)" :loading="mireStandardLoading">
+                  <el-option v-for="item in mireStandards" :key="item.id" :label="item.code" :value="item.id">
+                  </el-option>
+                </el-select>
               </div>
             </div>
-            <el-table ref="table3" :data="fiberList" tooltip-effect="dark" style="width: 100%" height="270px"
+            <!-- <el-table ref="table3" :data="fiberList" tooltip-effect="dark" style="width: 100%" height="270px"
               size="small" highlight-current-row @selection-change="handleSelectionChange4"
-              @row-click="(row, column, event)=>rowClickFiber(row, column, event,1)"
+              @row-click="(row, column, event)=>rowClickFiber(row, column, event,0)"
+              :header-cell-class-name="setClassName0"> -->
+              <el-table ref="table3" :data="fiberList" tooltip-effect="dark" style="width: 100%" height="270px"
+              size="small" highlight-current-row @selection-change="handleSelectionChange4"
               :header-cell-class-name="setClassName0">
               <el-table-column
               type="selection"
@@ -187,7 +252,7 @@
               </el-table-column>
               <el-table-column prop="color" label="鍏夌氦鑹叉爣" width="120">
                 <template slot-scope="scope">
-                  <el-select v-model="scope.row.color" size="mini" :disabled="active!=1">
+                  <el-select v-model="scope.row.color" size="mini" :disabled="active!=1" allow-create filterable >
                     <el-option v-for="(color,i) in colors" :key="i" :label="color.lable"
                       :value="color.value"></el-option>
                   </el-select>
@@ -202,19 +267,115 @@
         </el-col>
       </el-row>
     </div>
+    <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">
+          <el-col class="search_thing" :span="22">
+            <div class="search_label"><span class="required-span">* </span>鎶ゅ瀵嗗害锛�</div>
+            <div class="search_input">
+              <el-radio-group v-model="bsm1Val" @input="upBsm1">
+                <el-radio v-for="(a, ai) in JSON.parse(bsmRow.section)" :key="ai" :label="a"></el-radio>
+              </el-radio-group>
+            </div>
+          </el-col>
+          <el-col class="search_thing" :span="22">
+            <div class="search_label">瑕佹眰鍊硷細</div>
+            <div class="search_input" v-show="bsm1Val!==null&&bsm1Val!==''">
+              <el-radio-group v-model="bsm1Val" @input="upBsm1">
+                <el-radio v-for="(a, ai) in JSON.parse(bsmRow.section)" :key="ai"
+                  :label="a">{{JSON.parse(bsmRow.ask)[ai]}}</el-radio>
+              </el-radio-group>
+            </div>
+          </el-col>
+          <el-col class="search_thing" :span="22">
+            <div class="search_label">鍗曚环锛�</div>
+            <div class="search_input" v-show="bsm1Val!==null&&bsm1Val!==''">
+              <el-radio-group v-model="bsm1Val" @input="upBsm1">
+                <el-radio v-for="(a, ai) in JSON.parse(bsmRow.section)" :key="ai"
+                  :label="a">{{JSON.parse(bsmRow.price)[ai]}}</el-radio>
+              </el-radio-group>
+            </div>
+          </el-col>
+        </el-row>
+        <el-row v-if="bsm2">
+          <el-col class="search_thing" :span="22">
+            <div class="search_label" style="width: 220px;"><span class="required-span">* </span>鏍峰搧鐔旀帴閰嶅鏁伴噺锛�</div>
+            <div class="search_input">
+              <el-input-number size="medium" v-model="bsm2Val" :min="1" :max="bsm2Val3.length" :precision="0" style="width: 70%;"
+                :controls="false" @change="bsm2Up"></el-input-number>
+              <span>MAX锛歿{bsm2Val3.length}}</span>
+            </div>
+          </el-col>
+          <el-col style="margin-top: 6px;">
+            <el-col v-for="(a,ai) in bsm2Val2" :key="ai">
+              <el-col :span="10">
+                <el-select v-model="a[0]" placeholder="璇烽�夋嫨" size="small" style="width: 100%;">
+                  <el-option
+                    v-for="(item,index) in sampleList"
+                    :key="index"
+                    :label="index+1"
+                    :value="index+1">
+                  </el-option>
+                </el-select>
+              </el-col>
+              <!-- <el-col :span="10" class="pairing">{{a[0]}}</el-col> -->
+              <el-col :span="4" class="pairing" style="border: 0;color: rgba(0, 0, 0, 0.2);">鈥斺��</el-col>
+              <el-col :span="10">
+                <el-select v-model="a[1]" placeholder="璇烽�夋嫨" size="small" style="width: 100%;">
+                  <el-option
+                    v-for="(item,index) in sampleList"
+                    :key="index"
+                    :label="index+1"
+                    :value="index+1">
+                  </el-option>
+                </el-select>
+              </el-col>
+              <!-- <el-col :span="10" class="pairing">{{a[1]}}</el-col> -->
+            </el-col>
+          </el-col>
+        </el-row>
+        <!-- <el-row v-if="bsm3">
+          <el-col class="search_thing" :span="22" style="display: flex;align-items: center;">
+            <div class="search_label"><span class="required-span">* </span>RTS锛�</div>
+            <div class="search_input">
+              <el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="bsm3Val"></el-input>
+            </div>
+          </el-col>
+        </el-row> -->
+      </div>
+    </el-dialog>
+    <el-dialog title="RTS濉啓" :visible.sync="bsm3Dia" width="500px" :show-close="false" :before-close="beforeClose0">
+      <el-row>
+        <el-col class="search_thing" :span="22" style="display: flex;align-items: center;">
+          <div class="search_label"><span class="required-span">* </span>RTS锛�</div>
+          <div class="search_input">
+            <el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="bsm3Val"></el-input>
+          </div>
+        </el-col>
+      </el-row>
+    </el-dialog>
   </div>
 </template>
 
 <script>
+import { set } from 'vue'
   export default {
     props: {
       active: {
         type: Number,
         default: () => 0
       },
+      inspectionItemST: {
+        type: Number,
+        default: () => 0
+      }
     },
     data() {
       return {
+        detectionType: null,
+        detectionSelect: [],
+        selectFiberList: [],
+        type:1,
         saveLoad: false,
         packageInfo: {
           radio: 1,
@@ -247,11 +408,24 @@
         fiberList: [],
         fibersList: [],
         selectFibers: [],
-        detectionItems:[],
+        detectionItems: [],
         currentDetectionItems:null,
         mireStandardLoading:false,
         multiFiberList:[],
-        isAskOnlyRead:true
+        isAskOnlyRead:true,
+        bsm1Dia: false,
+        bsmRow: null,
+        bsm1: false,
+        bsm1Val: null,
+        bsm2: false,
+        bsm2Val: null,
+        bsm2Dia: false,
+        bsm2Val2: [],
+        bsm2Val3: [],
+        sampleIds:[],
+        bsm3Val: null,
+        bsmRow3: null,
+        bsm3Dia: false,
       }
     },
     computed: {
@@ -260,25 +434,26 @@
       },
     },
     watch: {
-      mireModel(val1,val0) {
-        if(val1!=val0){
-          this.mireStandards = []
-          this.fiberList = []
-          this.multiFiberList = []
-          this.detectionItems = []
-          this.currentDetectionItems = null;
-        }
-      },
-      mireStandard(val1,val0) {
-        if(val1!=val0){
-          this.fiberList = []
-          this.multiFiberList = []
-          this.detectionItems = []
-          this.currentDetectionItems = null;
-        }
-      }
+      // mireModel(val1,val0) {
+      //   if(val1!=val0){
+      //     this.mireStandards = []
+      //     this.fiberList = []
+      //     this.multiFiberList = []
+      //     this.detectionItems = []
+      //     this.currentDetectionItems = null;
+      //   }
+      // },
+      // mireStandard(val1,val0) {
+      //   if(val1!=val0){
+      //     this.fiberList = []
+      //     this.multiFiberList = []
+      //     this.detectionItems = []
+      //     this.currentDetectionItems = null;
+      //   }
+      // }
     },
     mounted() {
+      console.log('inspectionItemST',this.inspectionItemST);
       this.$parent.sampleIds.forEach(a => {
         for (var i = 0; i < this.$parent.sampleList.length; i++) {
           if (this.$parent.sampleList[i].id == a) {
@@ -288,8 +463,9 @@
           }
         }
       })
+      console.log(111, this.sample);
       this.models = this.models.replace(',', '')
-      this.packageInfo.ismiers = this.models.split(',').every(e=>(e.indexOf('d')>-1||e.indexOf('D')))
+      this.packageInfo.ismiers = this.models.split(',').every(e=>(e.indexOf('d')>-1||e.indexOf('D')>-1))
       if(this.sample[0].bushing === undefined || this.sample[0].bushing === null){
         this.bushing = []
       }else{
@@ -298,37 +474,262 @@
         this.packageInfo.standNum = this.sample[0].bushing[0].standNum
         this.packageInfo.testNum = this.sample[0].bushing[0].testNum
         this.bushing.forEach(a=>{
-          if(a.fibers===null)a.fibers=[]
-          if(a.fiber===null)a.fiber=[]
+          if(a.fibers==null || a.fibers.length ==0)a.fibers=[]
+          if(a.fiber==null || a.fiber.length == 0)a.fiber=[]
+          // 鍒ゆ柇鏄惁鍚湁鍏夌氦甯�
           if(this.packageInfo.ismiers){
-            a.fibers.forEach(b=>{
+            this.fibersList = [] // 鏂板
+            this.fiberList = []  // 鏂板
+            if(a.fibers.length>0){
+              a.fibers.forEach(b=>{
+              // 鍏夌氦甯�
               this.fibersList.push(b)
-              b.fiber.forEach(c=>{
-                this.fiberList.push(c)
-              })
+              // 鍏夌氦
+              // this.fiberList = []
+              // this.fiberList = b.fiber
             })
+            } else {
+              a.fiber.forEach(b=>{
+              this.fiberList.push(b)
+            })
+            }
+
           }else{
+            this.fiberList = []
             a.fiber.forEach(b=>{
               this.fiberList.push(b)
             })
           }
         })
       }
+
       this.getTypeDicts1()
       this.getStandTreeBySampleType()
       this.getStandTreeBySampleType2()
+      this.selectsStandardMethodByFLSSM2()
     },
     methods: {
       handleSelectionChange(val) {
-        this.selectFibers = val
+        // this.selectFibers = val
         this.multiFiberList = val
+        if(val.length > 0) {
+          this.rowClickFiber(val[val.length-1],null,null,1)
+        }
       },
       handleSelectionChange1(val) {
         this.selectBushing = val
       },
-      handleSelectionChange2(val){},
+      handleSelectionChange2(val){
+        this.detectionSelect = val
+        // 璧嬪�兼娴嬮」淇℃伅 鍏夌氦甯�
+        if(this.detectionItems.type == 1) {
+            this.multiFiberList.forEach(item => {
+            this.fibersList.forEach(a => {
+              if(a.ident == item.ident){
+                a.productList  =  []
+                this.fibersList.find(a => a.ident == item.ident).productList = this.detectionSelect
+              }
+            })
+          })
+      }
+      console.log(this.fibersList);
+      
+
+      if(this.detectionItems.type == 0) {
+        // 璧嬪�兼娴嬮」淇℃伅 鍏夌氦
+        this.selectFiberList.forEach(item => {
+            this.fiberList.forEach(a => {
+              if(a.ident == item.ident){
+                a.productList  =  []
+                this.fiberList.find(a => a.ident == item.ident).productList = this.detectionSelect
+              }
+            })
+          })
+          // 閫夋嫨鐨勬椂鍊欏氨灏唂iberList鐨勫�艰祴鍊肩粰瀵瑰簲鐨刦iberList
+          setTimeout(() => {
+            if(this.multiFiberList.length > 0) {
+            this.multiFiberList.forEach(item => {
+            this.fibersList.forEach(a => {
+              if(a.ident == item.ident){
+                a.fiber = this.fiberList
+              }
+            })
+          })
+          }
+          },100)
+        }
+      },
       handleSelectionChange4(val){
-        this.multiFiberList = val
+        this.selectFiberList = val
+        if(val != 0) {
+          this.rowClickFiber(val[val.length-1],null,null,0)
+        }
+      },
+
+      changeASk(row,type) {
+        if(type == 'ask') {
+          // 濡傛灉妫�娴嬭姹傚惈鏈夋璐熷彿
+          if(row.tell.indexOf('卤') != -1) {
+            let left = row.tell.substring(0,row.tell.indexOf('卤'))
+            let right = row.tell.substring(row.tell.indexOf('卤')+1)
+            // 濡傛灉鍙互杞寲涓烘暟鍊�
+           if(!isNaN(Number(left)) && !isNaN(Number(right))) {
+              if(row.ask.indexOf('-') != -1) {
+                  let left1 = row.ask.substring(0,row.ask.indexOf('-'))
+                  let right1 = row.ask.substring(row.ask.indexOf('-')+1)
+                  if(Number(left1) != (Number(left) - Number(right)) || Number(right1) != (Number(left) + Number(right))) {
+                    this.$message.error('妫�娴嬭姹備笉绗﹀悎瑕佹眰鎻忚堪')
+                    row.ask = (Number(left) - Number(right)) + '-' + (Number(left) + Number(right))
+                  }
+              }else {
+                this.$message.error('妫�娴嬭姹備笉绗﹀悎瑙勮寖')
+                row.ask = left + '-' + right
+                return
+              }
+           }
+           // 濡傛灉瑕佹眰鎻忚堪宸﹁竟涓嶈兘杞寲涓烘暟鍊�
+           else if(isNaN(Number(left)) && !isNaN(Number(right))) {
+            const regex = /[~-]/
+            const match = left.match(regex)
+            // 宸﹁竟鍚湁 - ~ 绗﹀彿
+            if(match) {
+              let newLeft = '';
+              if(left.includes('锛�')) {
+               newLeft = left.replace('锛�','(')
+              }
+              if(left.includes('锛�')) {
+                newLeft = newLeft.replace('锛�',')')
+              }
+              const regexTwo = /\((\d+(\.\d+)?)([~-])(\d+(\.\d+)?)\)/;
+              const matchTwo = newLeft.match(regexTwo);
+              let leftTwo = Number(matchTwo[1]) - Number(right)
+              let rightTwo = Number(matchTwo[4]) + Number(right)
+              console.log(matchTwo);
+              console.log(leftTwo,rightTwo);
+
+              console.log(row.ask.indexOf('-'));
+              if(row.ask.indexOf('-') != -1) {
+                  let left1 = row.ask.substring(0,row.ask.indexOf('-'))
+                  let right1 = row.ask.substring(row.ask.indexOf('-')+1)
+                  if(Number(left1) != leftTwo || Number(right1) != rightTwo) {
+                    this.$message.error('妫�娴嬭姹備笉绗﹀悎瑕佹眰鎻忚堪')
+                    row.ask = leftTwo + '-' + rightTwo
+                  }
+              }else {
+                this.$message.error('妫�娴嬭姹備笉绗﹀悎瑙勮寖')
+                row.ask = leftTwo + '-' + rightTwo
+                return
+              }
+            }
+           }
+          }
+          // 濡傛灉瑕佹眰鎻忚堪鍚湁鈮� < 鈮� > 绗﹀彿
+          const regex = /[鈮�<鈮�>]/
+          const match = row.tell.match(regex)
+          if(match) {
+            // 绗﹀彿涓嶄竴鑷�
+            if( row.ask.indexOf(match[0]) != 0) {
+                this.$message.error('妫�娴嬭姹備笉绗﹀悎瑕佹眰鎻忚堪')
+                return
+              }else {
+                // 绗﹀彿涓�鑷�
+              // 濡傛灉妫�娴嬭姹傚惈鏈夋璐熷彿 骞朵笖鍚湁&鍙� 鈮�0.69&鈮�0.76 瑕佹眰鎻忚堪
+              if(row.tell.indexOf('&') != -1) {
+                if(row.ask.indexOf('&') == -1) {
+                  this.$message.error('妫�娴嬭姹備笉绗﹀悎瑕佹眰鎻忚堪')
+                row.ask = row.tell
+                return
+                }else{
+                  let left = row.tell.substring(0,row.tell.indexOf('&'))
+                  let right = row.tell.substring(row.tell.indexOf('&')+1)
+
+                  let leftAsk = row.ask.substring(0,row.ask.indexOf('&'))
+                  let rightAsk = row.ask.substring(row.ask.indexOf('&')+1)
+                  if(leftAsk != left || rightAsk != right) {
+                    this.$message.error('妫�娴嬭姹備笉绗﹀悎瑕佹眰鎻忚堪')
+                  }
+                }
+              }else {
+                // 娌℃湁&鍙�
+              const regex = new RegExp(`${match[0]}(\\d+(\\.\\d+)?)`, 'g')
+                const matchTow = row.tell.match(regex);
+              let right =  Number(matchTow[0].split(match[0])[1])
+              let left = row.ask.substring(row.ask.indexOf(match[0])+1)
+              if(Number(left) != Number(right)) {
+                this.$message.error('妫�娴嬭姹備笉绗﹀悎瑕佹眰鎻忚堪')
+                row.ask = match[0] + right
+              }
+              }
+              
+              }
+              
+
+
+            }
+
+            
+
+
+
+
+
+            // 濡傛灉瑕佹眰鎻忚堪鍚湁鑼冨洿
+            const regexTwo = /[~-]/
+            const matchTwo = row.tell.match(regexTwo)
+            const matchAsk = row.ask.match(regexTwo)
+            if(matchTwo) {
+              let left = row.tell.substring(0,row.tell.indexOf(matchTwo[0]))
+              let right = row.tell.substring(row.tell.indexOf(matchTwo[0])+1)
+
+
+              if(!isNaN(Number(left)) && !isNaN(Number(right))) {
+                let leftAsk = row.ask.substring(0,row.ask.indexOf(matchAsk[0]))
+                let rightAsk = row.ask.substring(row.ask.indexOf(matchAsk[0])+1)
+                if(Number(leftAsk) != Number(left) || Number(rightAsk) != Number(right)) {
+                  this.$message.error('妫�娴嬭姹備笉绗﹀悎瑕佹眰鎻忚堪')
+                  row.ask = left + '-' + right
+                }
+              }
+            }
+          }
+
+        // 鍏堝嬀閫夌殑鎯呭喌涓�
+          this.detectionSelect.forEach(item => {
+            if(item.id == row.id) {
+              item.ask = row.ask
+              item.tell = row.tell
+              // 鍏夌氦 0  鍏夌氦甯� 1
+            if(item.isFibers == 0) {
+              this.selectFiberList.forEach(a => {
+                this.fiberList.forEach(b => {
+                  if(b.ident == a.ident){
+                    b.productList.forEach(item => {
+                      if(item.id == row.id) {
+                        item.ask = row.ask
+                        item.tell = row.tell
+                      }
+                    })
+                  }
+                })
+              })
+            }
+            if(item.isFibers == 1) {
+              this.multiFiberList.forEach(a => {
+                this.fibersList.forEach(b => {
+                  if(b.ident == a.ident){
+                    b.productList.forEach(item => {
+                      if(item.id == row.id) {
+                        item.ask = row.ask
+                        item.tell = row.tell
+                      }
+                    })
+                  }
+                })
+              })
+
+            }
+            }
+          })
       },
       outConfig() {
         this.$parent.configShow = false
@@ -339,6 +740,126 @@
         }).then(res => {
           this.colors = res.data
         })
+      },
+      // 濂楃鏁扮洰鐢熸垚琛ㄦ牸鏁版嵁
+      addBushing() {
+        this.bushing = []
+        for(let i = 0; i < this.packageInfo.num1; i++){
+          let bushing = {
+            ident: this.bushing.length + 1,
+            color: this.colors[i].label,
+            standNum: null,
+            testNum: null,
+            fibers: [],
+            fiber: []
+          }
+          this.bushing.push(bushing)
+        }
+      },
+      // 濂楃鏍囧噯閲忚祴鍊�
+      addStandNum() {
+        if(this.packageInfo.testNum > this.packageInfo.standNum) {
+          this.$message.error('妫�娴嬮噺涓嶈兘澶т簬鏍囧噯閲�')
+          this.packageInfo.testNum = this.packageInfo.standNum
+        }
+
+        if(this.selectBushing.length > 0) {
+          this.bushing.forEach(item => {
+          this.selectBushing.forEach(a => {
+            if(item.ident == a.ident) {
+              item.standNum = this.packageInfo.standNum
+            }
+          })
+        })
+        }
+      },
+      // 濂楃妫�娴嬮噺璧嬪��
+      addTestNum() {
+
+        if(parseInt(this.packageInfo.testNum) > parseInt(this.packageInfo.standNum)) {
+          this.packageInfo.testNum = this.packageInfo.standNum
+          this.$message.error('妫�娴嬮噺涓嶈兘澶т簬鏍囧噯閲�')
+        }
+        if(this.selectBushing.length > 0) {
+          this.bushing.forEach(item => {
+          this.selectBushing.forEach(a => {
+            if(item.ident == a.ident) {
+              item.testNum = this.packageInfo.testNum
+            }
+          })
+        })
+        }
+      },
+      isInspection() {
+        this.fiberList = []
+        this.fibersList = []
+        this.detectionItems = []
+        // 椤甸潰鏄惁鍚湁鍏夌氦甯�
+        if(this.packageInfo.ismiers) {
+          // 鍏ㄦ
+          if (this.packageInfo.radio == 0) {
+            if(this.packageInfo.standNum == null || this.packageInfo.standNum == '') {
+          this.$message.error('璇峰厛杈撳叆鏍囧噯閲�')
+          return
+        }
+          // 鏍规嵁鏍囧噯閲忚祴鍊兼娴嬮噺
+          if(parseInt(this.packageInfo.standNum) > 0 ) {
+            this.packageInfo.testNum = this.packageInfo.standNum
+            // 缁欏厜绾ゅ甫璧嬪��
+            this.bushing.forEach(item => {
+                item.testNum = this.packageInfo.testNum
+                item.standNum = this.packageInfo.standNum
+                this.$refs.table0.toggleRowSelection(item, true)
+              })
+
+            this.addFibers()
+            this.multiFiberList = this.fibersList
+            // 榛樿鍕鹃��
+            setTimeout(() => {
+              // this.selectBushing.forEach(item =>{
+              // let rowToSelect =  this.bushing.find(a => a.ident == item.ident)
+              // this.$refs.table0.toggleRowSelection(rowToSelect, true)
+              // })
+
+              this.multiFiberList.forEach(item =>{
+              let rowToSelect =  this.fibersList.find(a => a.ident == item.ident)
+              this.$refs.table2.toggleRowSelection(rowToSelect, true)
+              })
+            }, 200)
+        }
+      }
+        }else {
+          if(this.packageInfo.radio == 0) {
+            if(this.packageInfo.standNum == null || this.packageInfo.standNum == '') {
+          this.$message.error('璇峰厛杈撳叆鏍囧噯閲�')
+          return
+        }
+            if(parseInt(this.packageInfo.standNum) > 0 ) {
+            this.packageInfo.testNum = this.packageInfo.standNum
+              this.bushing.forEach(item => {
+                item.testNum = this.packageInfo.testNum
+                item.standNum = this.packageInfo.standNum
+                this.$refs.table0.toggleRowSelection(item, true)
+              })
+              console.log(this.bushing);
+              this.selectBushing = this.bushing
+              this.addFiber(1)
+              // 榛樿鍕鹃��
+            setTimeout(() => {
+              // this.selectBushing.forEach(item =>{
+              // let rowToSelect =  this.bushing.find(a => a.ident == item.ident)
+              // this.$refs.table0.toggleRowSelection(rowToSelect, true)
+              // })
+              this.fiberList.forEach(item =>{
+                this.$refs.table3.toggleRowSelection(item, true)
+              })
+            }, 200)
+            }
+          }
+        }
+
+
+
       },
       upNum() {
         this.fiberList = []
@@ -374,7 +895,34 @@
             }
             this.bushing.push(bushing)
           }
-        } else {
+          // 缁欏厜绾ゅ甫璧嬪��
+          if(this.selectBushing.length===0){
+            this.selectBushing = this.bushing
+        }
+        // this.miresModels 绾ゅ甫绫诲瀷
+        // this.miresStandards 鍙傝�冩爣鍑�
+        this.fibersList = []
+        this.packageInfo.ismiers = true
+        this.fiberList = []
+        this.selectBushing.forEach(a => {
+          a.fiber = []
+          a.fibers = []
+              for(let j = 0; j < parseInt(a.testNum); j++){
+                let fibers = {
+                  id: this.fibersList.length + 1,
+                  code: null,
+                  color: a.color,
+                  model: null,
+                  standard: null,
+                  num: a.testNum,
+                  productList: this.HaveJson(this.productList2),
+                  fiber: []
+                }
+                a.fibers.push(fibers)
+                this.fibersList.push(fibers)
+              }
+        })
+      } else {
           this.bushing = []
         }
       },
@@ -400,8 +948,8 @@
           this.miresModels = []
           res.data.forEach(a => {
             this.miresModels.push({
-              label: a.sample,
-              value: a.sample
+              label: a.model,
+              value: a.model
             })
           })
         })
@@ -425,7 +973,36 @@
         })
       },
       methodChange(val) {
-        if (val === null || val === '') return
+        // if (val === null || val === '') return
+        // this.$axios.post(this.$api.standardTree.selectStandardProductList, {
+        //   model: this.mireModel.split(' - ')[1],
+        //   standardMethodListId: val,
+        //   factory: ''
+        // }, {
+        //   headers: {
+        //     'Content-Type': 'application/json'
+        //   }
+        // }).then(res => {
+        //   res.data.forEach(a => {
+        //     a.state = 0
+        //   })
+        //   this.productList = res.data
+        //   setTimeout(() => {
+        //     this.productList.forEach(a => {
+        //       if (a.state == 1) this.toggleSelection(a)
+        //     })
+        //     this.addFiber()
+        //   }, 200)
+        // })
+
+          // 灏嗕笅鎷夋鍊艰祴鍊肩粰鍏夌氦  鐩戝惉鍘婚櫎
+          if(this.selectFiberList.length == 0) {
+            this.$message.error('璇烽�夋嫨鏁版嵁')
+            return
+          }
+          
+         if (val === null || val === '') return
+         if(this.mireStandards == null ) return
         this.$axios.post(this.$api.standardTree.selectStandardProductList, {
           model: this.mireModel.split(' - ')[1],
           standardMethodListId: val,
@@ -435,18 +1012,57 @@
             'Content-Type': 'application/json'
           }
         }).then(res => {
-          res.data.forEach(a => {
+          this.detectionItems = []
+          if(res.data != null && res.data.length != 0){
+           res.data.forEach(a => {
             a.state = 0
           })
-          this.productList = res.data
-          setTimeout(() => {
-            this.productList.forEach(a => {
-              if (a.state == 1) this.toggleSelection(a)
+          this.detectionItems = res.data
+          this.detectionType = 0
+           this.$set(this.detectionItems,'type',0)
+          }
+          this.mireStandards.find(a => a.id == val).code == '濮旀墭瑕佹眰'?this.isAskOnlyRead = false:this.isAskOnlyRead = true
+          this.selectFiberList.forEach(item => {
+            this.fiberList.forEach(a => {
+              if(a.ident == item.ident){
+                a.model = this.mireModel.split(' - ')[1] // 鍏夌氦瑙勬牸
+                a.noSplitModel = this.mireModel // 鍏夌氦瑙勬牸
+                if(this.mireStandards != null) {
+                  a.standard = this.mireStandards.find(a => a.id == this.mireStandard).code  // 鍙傝�冩爣鍑�
+                }
+              }
             })
-          }, 200)
+          })
+
         })
       },
       methodChange2(val) {
+        // if (val === null || val === '') return
+        // this.$axios.post(this.$api.standardTree.selectStandardProductList, {
+        //   model: '',
+        //   standardMethodListId: val,
+        //   factory: '涓ぉ绉戞妧妫�娴嬩腑蹇� - 閫氫俊浜у搧瀹為獙瀹� - 鍏夌氦甯� - ' + this.miresModel + ' - ',
+        // }, {
+        //   headers: {
+        //     'Content-Type': 'application/json'
+        //   }
+        // }).then(res => {
+        //   res.data.forEach(a => {
+        //     a.state = 0
+        //   })
+        //   this.productList2 = res.data
+        //   setTimeout(() => {
+        //     this.productList2.forEach(a => {
+        //       if (a.state == 1) this.toggleSelection(a)
+        //     })
+        //     this.addFibers()
+        //   }, 200)
+        // })
+
+        if(this.multiFiberList.length == 0) {
+          this.$message.error('璇烽�夋嫨闇�瑕佹洿鏀圭殑鏁版嵁')
+          return
+        }
         if (val === null || val === '') return
         this.$axios.post(this.$api.standardTree.selectStandardProductList, {
           model: '',
@@ -457,18 +1073,38 @@
             'Content-Type': 'application/json'
           }
         }).then(res => {
-          res.data.forEach(a => {
-            a.state = 0
-          })
-          this.productList2 = res.data
-          setTimeout(() => {
-            this.productList2.forEach(a => {
-              if (a.state == 1) this.toggleSelection(a)
+          // 灏嗚幏鍙栫殑妫�娴嬮」淇℃伅璧嬪��
+          this.detectionItems = []
+          if(res.data != null && res.data.length != 0){
+            res.data.forEach(a => {
+              a.state = 0
             })
-          }, 200)
-        })
+            this.detectionItems = res.data
+            this.detectionType = 1
+            this.$set(this.detectionItems,'type',1)
+            // 鍒ゆ柇鏄惁涓哄鎵樿姹�
+            this.miresStandards.find(a => a.id == val).code == '濮旀墭瑕佹眰'?this.isAskOnlyRead = false:this.isAskOnlyRead = true
+          }
+
+          // 缁欓�変腑鐨勫厜绾ゅ甫璧嬪��
+        for(let i= 0; i < this.fibersList.length; i++){
+            this.multiFiberList.forEach(item => {
+              if(this.fibersList[i].ident == item.ident){
+                this.fibersList[i].model = this.miresModel // 绾ゅ甫瑙勬牸
+                this.fibersList[i].num = this.miresModel.replace('鑺�','') // 鍏夌氦妫�娴嬮噺
+                this.fibersList[i].productList = this.detectionItems // 妫�娴嬮」
+                this.miresStandards.forEach(a => {
+                  if(a.id == this.miresStandard) {
+                    this.fibersList[i].standard = a.code // 鍙傝�冩爣鍑�
+                  }
+                })
+              }
+            })
+        }
+      })
       },
-      addFiber() {
+      addFiber(isInspection) {
+        // 鏈�鏂�
         let colors2 = []
         if (this.packageInfo.num1 / this.colors.length > 1) {
           let num = this.packageInfo.num1 / this.colors.length
@@ -480,104 +1116,440 @@
           colors2 = colors2.concat(this.colors)
         }
         this.fiberList = []
-        let model = this.mireModel.split(' - ')[1]
-        let standard = this.mireStandards.find(a => a.id == this.mireStandard).code
+        // 閫夋嫨浜嗗厜绾ゅ甫
         if (this.packageInfo.ismiers) {
-          if(this.selectFibers.length === 0){
-            this.$message.error('鏈�夋嫨鍏夌氦甯�')
-            return
-          }
-          this.selectFibers.forEach(a => {
+          if(this.multiFiberList.length != 0){
+          this.multiFiberList.forEach((a,index) => {
             a.fiber = []
-            for (var i = 0; i < parseInt(a.num); i++) {
+            console.log('****',a,index);
+
+            if(index > 0 && index < this.multiFiberList.length) {
+              if(this.multiFiberList[index].color == this.multiFiberList[index-1].color) {
+
+
+
+                console.log('****',this.multiFiberList[index-1].num);
+
+
+
+                for (var i = 0; i < parseInt(a.num); i++) {
               let fiber = {
+                ident: this.fiberList.length + 1,
                 bushColor: a.color,
-                color: colors2[i].label,
-                model: model,
-                standard: standard,
-                productList: this.HaveJson(this.productList)
+                // color: colors2[(i+(parseInt(a.num)*index))>colors2.length?0:i+(parseInt(a.num)*index)*index].label,
+                color: colors2[i+parseInt(this.multiFiberList[index-1].num)].label,
+                model: null,
+                noSplitModel: null,
+                standard: null,
+                fibersIdent: a.ident,
+                productList: []
               }
-              a.fiber.push(fiber)
               this.fiberList.push(fiber)
+            }
+              }else {
+                for (var i = 0; i < parseInt(a.num); i++) {
+              let fiber = {
+                ident: this.fiberList.length + 1,
+                bushColor: a.color,
+                // color: colors2[(i+(parseInt(a.num)*index))>colors2.length?0:i+(parseInt(a.num)*index)*index].label,
+                color: colors2[i].label,
+                model: null,
+                noSplitModel: null,
+                standard: null,
+                fibersIdent: a.ident,
+                productList: []
+              }
+              this.fiberList.push(fiber)
+            }
+              }
+            }else{
+              for (var i = 0; i < parseInt(a.num); i++) {
+              let fiber = {
+                ident: this.fiberList.length + 1,
+                bushColor: a.color,
+                // color: colors2[(i+(parseInt(a.num)*index))>colors2.length?0:i+(parseInt(a.num)*index)*index].label,
+                color: colors2[i].label,
+                model: null,
+                noSplitModel: null,
+                standard: null,
+                fibersIdent: a.ident,
+                productList: []
+              }
+              this.fiberList.push(fiber)
+            }
             }
           })
         } else {
-          this.selectBushing.forEach(a => {
+          this.selectBushing.forEach((a,index) => {
             a.fiber = []
             for (var i = 0; i < parseInt(a.testNum); i++) {
               let fiber = {
+                ident: this.fiberList.length + 1,
                 bushColor: a.color,
-                color: colors2[i].label,
-                model: model,
-                standard: standard,
-                productList: this.HaveJson(this.productList)
+                color: colors2[(i+(parseInt(a.testNum))*index)>colors2.length?0:i+(parseInt(a.testNum))*index].label,
+                model: null,
+                noSplitModel: null,
+                standard: null,
+                productList: []
               }
-              a.fiber.push(fiber)
               this.fiberList.push(fiber)
             }
           })
         }
+      }else {
+        this.fiberList = []
+        let flag = true
+        // 鎸夌収椤哄簭鐢熸垚鍏夌氦鑹叉爣
+        let colors2 = []
+        if (this.packageInfo.num1 / this.colors.length > 1) {
+          let num = this.packageInfo.num1 / this.colors.length
+          if (this.packageInfo.num1 % this.colors.length > 0) num += 1
+          for (var i = 0; i < num; i++) {
+            colors2 = colors2.concat(this.colors)
+          }
+        } else {
+          colors2 = colors2.concat(this.colors)
+        }
+        // 鏍规嵁濂楃鐨勬祴璇曢噺鐢熸垚瀵瑰簲鐨勬暟閲忕殑鍏夌氦鏁版嵁
+        this.selectBushing.forEach((item,index) =>{
+          if(item.testNum != null && item.testNum != ''){
+
+            // 鍏ㄦ
+            if(isInspection == 1) { 
+              for(let i =0; i < parseInt(item.testNum); i++){
+              let fiber = {
+                ident: this.fiberList.length + 1,
+                bushColor: item.color,
+                color: colors2[i].label,
+                model:  null,
+                standard: null,
+                productList: []
+              }
+              this.fiberList.push(fiber)
+            }
+            }else {
+              for(let i =0; i < parseInt(item.testNum); i++){
+              let fiber = {
+                ident: this.fiberList.length + 1,
+                bushColor: item.color,
+                color: colors2[(i+(parseInt(item.testNum)*index))>colors2.length?0:i+(parseInt(item.testNum)*index)*index].label,
+                model:  null,
+                standard: null,
+                productList: []
+              }
+              this.fiberList.push(fiber)
+            }
+            }
+          }else {
+            flag = false
+          }
+        })
+        if(!flag){
+          this.$message.error('璇峰～鍐欏厜绾ゆ娴嬮噺')
+          return
+        }
+      }
+        // 浜屼唬
+        // // 鏄惁閫夋嫨濂楃
+        // if(this.selectBushing.length == 0) {
+        //   this.$message.error('鏈�夋嫨濂楃')
+        //   return
+        // }
+        // this.fiberList = []
+        // let flag = true
+        // // 鎸夌収椤哄簭鐢熸垚鍏夌氦鑹叉爣
+        // let colors2 = []
+        // if (this.packageInfo.num1 / this.colors.length > 1) {
+        //   let num = this.packageInfo.num1 / this.colors.length
+        //   if (this.packageInfo.num1 % this.colors.length > 0) num += 1
+        //   for (var i = 0; i < num; i++) {
+        //     colors2 = colors2.concat(this.colors)
+        //   }
+        // } else {
+        //   colors2 = colors2.concat(this.colors)
+        // }
+        // // 鏍规嵁濂楃鐨勬祴璇曢噺鐢熸垚瀵瑰簲鐨勬暟閲忕殑鍏夌氦鏁版嵁
+        // this.selectBushing.forEach((item,index) =>{
+        //   if(item.testNum != null && item.testNum != ''){
+        //     for(let i =0; i < parseInt(item.testNum); i++){
+        //       let fiber = {
+        //         ident: this.fiberList.length + 1,
+        //         bushColor: item.color,
+        //         color: colors2[(i+(parseInt(item.testNum)*index))>colors2.length?0:i+(parseInt(item.testNum)*index)*index].label,
+        //         model:  null,
+        //         standard: null,
+        //         productList: []
+        //       }
+        //       this.fiberList.push(fiber)
+        //     }
+        //   }else {
+        //     flag = false
+        //   }
+        // })
+        // if(!flag){
+        //   this.$message.error('璇峰～鍐欏厜绾ゆ娴嬮噺')
+        //   return
+        // }
+
+
+        // 鏈�鍒�
+        // let colors2 = []
+        // if (this.packageInfo.num1 / this.colors.length > 1) {
+        //   let num = this.packageInfo.num1 / this.colors.length
+        //   if (this.packageInfo.num1 % this.colors.length > 0) num += 1
+        //   for (var i = 0; i < num; i++) {
+        //     colors2 = colors2.concat(this.colors)
+        //   }
+        // } else {
+        //   colors2 = colors2.concat(this.colors)
+        // }
+        // this.fiberList = []
+        // let model = this.mireModel.split(' - ')[1]
+        // let standard = this.mireStandards.find(a => a.id == this.mireStandard).code
+        // if (this.packageInfo.ismiers) {
+        //   if(this.selectFibers.length === 0){
+        //     this.$message.error('鏈�夋嫨鍏夌氦甯�')
+        //     return
+        //   }
+        //   this.selectFibers.forEach((a,index) => {
+        //     a.fiber = []
+        //     for (var i = 0; i < parseInt(a.num); i++) {
+        //       let fiber = {
+        //         bushColor: a.color,
+        //         color: colors2[(i+(parseInt(a.num)*index))>colors2.length?0:i+(parseInt(a.num)*index)*index].label,
+        //         model: model,
+        //         standard: standard,
+        //         productList: this.HaveJson(this.productList)
+        //       }
+        //       a.fiber.push(fiber)
+        //       this.fiberList.push(fiber)
+        //     }
+        //   })
+        // } else {
+        //   this.selectBushing.forEach((a,index) => {
+        //     a.fiber = []
+        //     for (var i = 0; i < parseInt(a.testNum); i++) {
+        //       let fiber = {
+        //         bushColor: a.color,
+        //         color: colors2[(i+(parseInt(a.testNum))*index)>colors2.length?0:i+(parseInt(a.testNum))*index].label,
+        //         model: model,
+        //         standard: standard,
+        //         productList: this.HaveJson(this.productList)
+        //       }
+        //       a.fiber.push(fiber)
+        //       this.fiberList.push(fiber)
+        //     }
+        //   })
+        // }
       },
       addFibers() {
-        if(this.selectBushing.length===0){
+        // if(this.selectBushing.length===0){
+        //   this.$message.error('鏈�夋嫨濂楃')
+        //   return
+        // }
+        // this.fibersList = []
+        // let standard = this.miresStandards.find(a => a.id == this.miresStandard).code
+        // this.packageInfo.ismiers = true
+        // this.fiberList = []
+        // this.selectBushing.forEach(a => {
+        //   a.fiber = []
+        //   a.fibers = []
+        //   for (var i = 0; i < parseInt(a.testNum); i++) {
+        //     let fibers = {
+        //       code: null,
+        //       color: a.color,
+        //       model: this.miresModel,
+        //       standard: standard,
+        //       num: a.testNum,
+        //       productList: this.HaveJson(this.productList2),
+        //       fiber: []
+        //     }
+        //     a.fibers.push(fibers)
+        //     this.fibersList.push(fibers)
+        //   }
+        // })
+
+        if(this.selectBushing.length == 0) {
           this.$message.error('鏈�夋嫨濂楃')
           return
         }
+        // 濂楃鐨勬祴璇曢噺  *  閫夋嫨鐨勫厜绾ゅ甫鏁伴噺
         this.fibersList = []
-        let standard = this.miresStandards.find(a => a.id == this.miresStandard).code
-        this.packageInfo.ismiers = true
-        this.fiberList = []
-        this.selectBushing.forEach(a => {
-          a.fiber = []
-          a.fibers = []
-          for (var i = 0; i < parseInt(a.testNum); i++) {
-            let fibers = {
-              code: null,
-              color: a.color,
-              model: this.miresModel,
-              standard: standard,
-              num: a.testNum,
-              productList: this.HaveJson(this.productList2),
-              fiber: []
-            }
-            a.fibers.push(fibers)
-            this.fibersList.push(fibers)
+        this.selectBushing.forEach(item => {
+          for(let i = 0; i < parseInt(this.packageInfo.testNum); i++){
+          let fibers = {
+            ident: this.fibersList.length + 1,
+            color: item.color,
+            code: null,
+            model: null,
+            standard: null,
+            num: null,
+            fiber: [],
+            productList: []
           }
+          this.fibersList.push(fibers)
+        }
         })
       },
       rowClickFiber(row, column, event,type){
-        if(this.active===1){
-          if(type==0){
-            let standard = null;
-            try{
-              standard = this.miresStandards.find(a => a.id == this.miresStandards)
-            }catch(e){}
-            if(standard&&standard.code=='濮旀墭瑕佹眰'){
-              this.isAskOnlyRead = false;
-            }else{
-              this.isAskOnlyRead = true;
+        console.log('row',row);
+        // this.type = type
+        // if(this.active===1){
+        //   if(type==0){
+        //     let standard = null;
+        //     try{
+        //       standard = this.miresStandards.find(a => a.id == this.miresStandards)
+        //     }catch(e){}
+        //     if(standard&&standard.code=='濮旀墭瑕佹眰'){
+        //       this.isAskOnlyRead = false;
+        //     }else{
+        //       this.isAskOnlyRead = true;
+        //     }
+        //   }else{
+        //     let standard = null;
+        //     try{
+        //       standard = this.mireStandards.find(a => a.id == this.mireStandard)
+        //     }catch(e){}
+        //     if(standard&&standard.code=='濮旀墭瑕佹眰'){
+        //       this.isAskOnlyRead = false;
+        //     }else{
+        //       this.isAskOnlyRead = true;
+        //     }
+        //   }
+        // }
+        // if(this.type==1){
+        //   if (this.active !== 1) {
+        //     this.sampleIds = []
+        //     this.sampleIds.push(row.id)
+        //   }
+        // }
+        // this.currentDetectionItems = row
+        // this.detectionItems = row.productList
+        // if(this.detectionItems === null) return
+        // setTimeout(() => {
+        //   this.detectionItems.forEach(a => {
+        //     if (a.state == 1) this.toggleSelection(a)
+        //   })
+        // }, 200)
+        if(type == 1) {
+          this.fiberList = row.fiber
+          if((row.model == null || row.model == '') && (row.standard == null || row.standard == '')){
+            this.detectionItems = []
+            return
+          }
+          if(row.model != null && row.model != ''){
+          this.miresModel = row.model
+          this.selectsStandardMethodByFLSSM2()
+        }
+        setTimeout(() => {
+          if(row.standard !=null && row.standard != ''){
+          this.miresStandard = this.miresStandards.find(a => a.code == row.standard).id
+        }
+          this.$axios.post(this.$api.standardTree.selectStandardProductList, {
+          model: '',
+          standardMethodListId: this.miresStandard,
+          factory: '涓ぉ绉戞妧妫�娴嬩腑蹇� - 閫氫俊浜у搧瀹為獙瀹� - 鍏夌氦甯� - ' + this.miresModel + ' - ',
+        }, {
+          headers: {
+            'Content-Type': 'application/json'
+          }
+        }).then(res => {
+          // 灏嗚幏鍙栫殑妫�娴嬮」淇℃伅璧嬪��
+          this.detectionItems = []
+          if(res.data != null && res.data.length != 0){
+            res.data.forEach(a => {
+              this.$set(a,'isFibers',1)
+            })
+            // 鍒ゆ柇鏄惁涓哄鎵樿姹�
+            this.miresStandards.find(a => a.id == this.miresStandard).code == '濮旀墭瑕佹眰'?this.isAskOnlyRead = false:this.isAskOnlyRead = true
+            if(!this.isAskOnlyRead){
+              row.productList.forEach(a => {
+                res.data.forEach(b => {
+                  if(a.id == b.id){
+                    b.ask = a.ask
+                    b.tell = a.tell
+                  }
+                })
+              })
             }
-          }else{
-            let standard = null;
-            try{
-              standard = this.mireStandards.find(a => a.id == this.mireStandard)
-            }catch(e){}
-            if(standard&&standard.code=='濮旀墭瑕佹眰'){
-              this.isAskOnlyRead = false;
-            }else{
-              this.isAskOnlyRead = true;
+            this.detectionItems = res.data
+            this.detectionType = 1
+            this.$set(this.detectionItems,'type',1)
+            if (row.productList != null && row.productList.length > 0) {
+              let product =  JSON.parse(JSON.stringify(row.productList))
+              setTimeout(() => {
+                product.forEach(p => {
+                let rowToSelect = this.detectionItems.find(item => item.id === p.id);
+                if (rowToSelect) {
+                  this.toggleSelection(rowToSelect);
+                }
+              });
+            },200)
             }
           }
+        })
+        },500)
+      }else if(type == 0) {
+        if((row.noSplitModel == null || row.noSplitModel == '') && (row.standard == null || row.standard == '')){
+            this.detectionItems = []
+            return
+          }
+        if(row.model != null && row.model != ''){
+          this.mireModel = row.noSplitModel
+          this.selectsStandardMethodByFLSSM()
         }
-        this.currentDetectionItems = row
-        this.detectionItems = row.productList
-        if(this.detectionItems === null) return
         setTimeout(() => {
-          this.detectionItems.forEach(a => {
-            if (a.state == 1) this.toggleSelection(a)
+          if(row.standard !=null && row.standard != ''){
+          this.mireStandard = this.mireStandards.find(a => a.code == row.standard).id
+        }
+        this.$axios.post(this.$api.standardTree.selectStandardProductList, {
+          model: this.mireModel.split(' - ')[1],
+          standardMethodListId: this.mireStandard,
+          factory: ''
+        }, {
+          headers: {
+            'Content-Type': 'application/json'
+          }
+        }).then(res => {
+          this.detectionItems = []
+          if(res.data != null && res.data.length != 0){
+           res.data.forEach(a => {
+            a.state = 0
+            this.$set(a,'isFibers',0)
           })
-        }, 200)
-      },
+          // 鍒ゆ柇鏄惁涓哄鎵樿姹�
+          this.mireStandards.find(a => a.id == this.mireStandard).code == '濮旀墭瑕佹眰'?this.isAskOnlyRead = false:this.isAskOnlyRead = true
+          if(!this.isAskOnlyRead){
+            row.productList.forEach(a => {
+              res.data.forEach(b => {
+                if(a.id == b.id){
+                  b.ask = a.ask
+                  b.tell = a.tell
+                }
+              })
+            })
+          }
+          this.detectionItems = res.data
+          this.detectionType = 0
+          this.$set(this.detectionItems,'type',0)
+          
+
+          if (row.productList != null && row.productList.length > 0) {
+            let product =  JSON.parse(JSON.stringify(row.productList))
+            setTimeout(() => {
+              product.forEach(p => {
+                let rowToSelect = this.detectionItems.find(item => item.id === p.id);
+                if (rowToSelect) {
+                  this.toggleSelection(rowToSelect);
+                }
+              });
+            },200)
+            }
+          }
+        })
+        },500);
+      }
+    },
       toggleSelection(row) {
         this.$refs.productTable.toggleRowSelection(row, true);
       },
@@ -592,6 +1564,7 @@
       },
       handleAll(e) {
         if (e.length > 0) {
+          console.log(this.detectionItems);
           this.detectionItems.map(m => {
             m.state = 1
             return m
@@ -633,14 +1606,67 @@
             });
           }
         }
+        this.bsmRow3 = []
+        this.detectionItems.forEach(p => {
+          if(this.type==1){
+            if (p.bsm === '1' && p.section !== '' && p.section !== null && p.state === 1) {
+              if (p.section.indexOf('[') > -1) {
+                this.bsmRow = this.HaveJson(p)
+              }
+              this.bsm1 = true
+              this.bsm1Dia = true
+            } else if (p.bsm === '1' && p.section !== '' && p.section !== null && p.state === 0) {
+              this.bsm1 = false
+            }
+            if (p.bsm === '1' && p.inspectionItem === '鍏夌氦鎺ュご鎹熻��' && this.sampleList.length > 1 && p.state === 1) {
+              this.bsm2 = true
+              this.bsm1Dia = true
+              if(this.bsm2Val2.length === 0){
+                this.bsm2Val = (this.sampleList.length - 1) * this.sampleList.length / 2
+                this.computationalPairing(this.sampleList.length)
+                this.bsm2Val2 = this.HaveJson(this.bsm2Val3)
+              }
+            } else if (p.bsm === '1' && p.inspectionItem === '鍏夌氦鎺ュご鎹熻��' && p.state === 1) {
+              this.bsm2 = false
+            }
+          }
+          // if (p.ask.includes('RTS')&&p.state === 1) {
+          //   p.rts = ''
+          //   this.bsm3Val = ''
+          //   this.bsm3Dia = true
+          //   this.bsmRow3.push(p)
+          // }
+        })
+
+        if (e.length > 0) {
+          this.sampleList.map(item => {
+            if (this.sampleIds.indexOf(item.id) > -1) {
+              item.insProduct.map(m => {
+                m.state = 1
+                return m;
+              })
+            }
+            return item
+          })
+        } else {
+          this.sampleList.map(item => {
+            if (this.sampleIds.indexOf(item.id) > -1) {
+              item.insProduct.map(m => {
+                m.state = 0
+                return m;
+              })
+            }
+            return item
+          })
+        }
         this.$nextTick(() => {
           this.$refs.productTable.doLayout()
         })
       },
       upProductSelect(selection, row) {
         row.state = row.state == 1 ? 0 : 1
-        if(this.multiFiberList.length > 0){
-          this.multiFiberList.map(item => {
+        if(this.selectFiberList.length > 0){
+          this.selectFiberList.map(item => {
             item.productList.map(m=>{
               if(m.id == row.id){
                 m.state = row.state;
@@ -657,6 +1683,46 @@
               return m;
             });
         }
+        if(this.type==1){
+          if (row.bsm === '1' && row.section !== '' && row.section !== null && row.state === 1) {
+            if (row.section.indexOf('[') > -1) {
+              this.bsmRow = this.HaveJson(row)
+            }
+            this.bsm1 = true
+            this.bsm1Dia = true
+          } else if (row.bsm === '1' && row.section !== '' && row.section !== null && row.state === 0) {
+            this.bsm1 = false
+          }
+          if (row.bsm === '1' && row.inspectionItem === '鍏夌氦鎺ュご鎹熻��' && this.sampleList.length > 1 && row.state === 1) {
+          this.bsm2 = true
+          this.bsm1Dia = true
+            if(this.bsm2Val2.length === 0){
+              this.bsm2Val = (this.sampleList.length - 1) * this.sampleList.length / 2
+              this.computationalPairing(this.sampleList.length)
+              this.bsm2Val2 = this.HaveJson(this.bsm2Val3)
+            }
+          } else if (row.bsm === '1' && row.inspectionItem === '鍏夌氦鎺ュご鎹熻��' && row.state === 1) {
+            this.bsm2 = false
+          }
+        }else{
+          this.bsm1Dia = false
+        }
+        // if (row.ask.includes('RTS')&&row.state === 1) {
+        //   this.bsmRow3 = null;
+        //   row.rts = ''
+        //   this.bsm3Val = ''
+        //   this.bsm3Dia = true
+        //   this.bsmRow3 = row
+        // }else{
+        //   this.bsm3Dia = false
+        // }
+      },
+      computationalPairing(n){
+        const nums = [];
+        for (let i = 1; i <= n; i++) {
+          nums.push(i);
+        }
+        this.bsm2Val3 = this.HaveJson(this.permute(nums))
       },
       setClassName({ column }) {
         if (column.type == 'selection' && !this.isAllDisabled) {
@@ -676,21 +1742,381 @@
         })
       },
       save(){
+        // if(this.bushing.length === 0){
+        //   this.$message.error('缂哄皯閰嶇疆鏃犳硶淇濆瓨')
+        //   return
+        // }
+        // for(let a in this.bushing){
+        //   if(this.bushing[a].fibers.length===0&&this.bushing[a].fiber.length===0){
+        //     this.$message.error(this.bushing[a].color+'绠¤壊鏍囧绠＄己灏戦厤缃棤娉曚繚瀛�')
+        //     return
+        //   }
+        // }
+        // this.sample.forEach(a=>{
+        //   a.bushing = this.bushing
+        // })
+        // this.$message.success('宸蹭繚瀛�')
+        // this.$emit('saveFiberopticConfig')
+        if(this.inspectionItemST == 1) {
+          console.log('this.bushing',this.bushing);
+          this.$message.success('宸蹭繚瀛�')
+          this.sample.forEach(a=>{
+          a.bushing = this.bushing
+        })
+        this.$emit('saveFiberopticConfig')
+        return
+        }
+
+        let flag = true
+        let flags = true
+
+        // 鍏夌氦妫�娴嬮」淇℃伅鏍￠獙
+        this.fiberList.forEach(item=>{
+          if(item.productList.length > 0){
+            item.productList.forEach(row=>{
+              
+              // 濡傛灉妫�娴嬭姹傚惈鏈夋璐熷彿
+          if(row.tell.indexOf('卤') != -1) {
+            let left = row.tell.substring(0,row.tell.indexOf('卤'))
+            let right = row.tell.substring(row.tell.indexOf('卤')+1)
+            // 濡傛灉鍙互杞寲涓烘暟鍊�
+           if(!isNaN(Number(left)) && !isNaN(Number(right))) {
+              if(row.ask.indexOf('-') != -1) {
+                  let left1 = row.ask.substring(0,row.ask.indexOf('-'))
+                  let right1 = row.ask.substring(row.ask.indexOf('-')+1)
+                  if(Number(left1) != (Number(left) - Number(right)) || Number(right1) != (Number(left) + Number(right))) {
+                    // this.$message.error('11111')
+                    flag = false
+                  }
+              }else {
+                // this.$message.error('2222')
+                flag = false
+                return
+              }
+           }
+           // 濡傛灉瑕佹眰鎻忚堪宸﹁竟涓嶈兘杞寲涓烘暟鍊�
+           else if(isNaN(Number(left)) && !isNaN(Number(right))) {
+            const regex = /[~-]/
+            const match = left.match(regex)
+            // 宸﹁竟鍚湁 - ~ 绗﹀彿
+            if(match) {
+              let newLeft = '';
+              if(left.includes('锛�')) {
+               newLeft = left.replace('锛�','(')
+              }
+              if(left.includes('锛�')) {
+                newLeft = newLeft.replace('锛�',')')
+              }
+              const regexTwo = /\((\d+(\.\d+)?)([~-])(\d+(\.\d+)?)\)/;
+              const matchTwo = newLeft.match(regexTwo);
+              let leftTwo = Number(matchTwo[1]) - Number(right)
+              let rightTwo = Number(matchTwo[4]) + Number(right)
+              if(row.ask.indexOf('-') != -1) {
+                  let left1 = row.ask.substring(0,row.ask.indexOf('-'))
+                  let right1 = row.ask.substring(row.ask.indexOf('-')+1)
+                  if(Number(left1) != leftTwo || Number(right1) != rightTwo) {
+                    // this.$message.error('33333')
+                    flag = false
+                  }
+              }else {
+                // this.$message.error('44444')
+                flag = false
+                return
+              }
+            }
+           }
+          }
+          // 濡傛灉妫�娴嬭姹傚惈鏈夆墹 < 鈮� > 绗﹀彿
+          const regex = /[鈮�<鈮�>]/
+          const match = row.tell.match(regex)
+          if(match) {
+            // 绗﹀彿涓嶄竴鑷�
+            if( row.ask.indexOf(match[0]) != 0) {
+                // this.$message.error('555555')
+                flag = false
+                return
+              }else {
+                // 绗﹀彿涓�鑷�
+
+                // 濡傛灉妫�娴嬭姹傚惈鏈夋璐熷彿 骞朵笖鍚湁&鍙� 鈮�0.69&鈮�0.76 瑕佹眰鎻忚堪
+              if(row.tell.indexOf('&') != -1) {
+                console.log(11111);
+                if(row.ask.indexOf('&') == -1) {
+                  this.$message.error('妫�娴嬭姹備笉绗﹀悎瑕佹眰鎻忚堪')
+                row.ask = row.tell
+                return
+                }else{
+                  let left = row.tell.substring(0,row.tell.indexOf('&'))
+                  let right = row.tell.substring(row.tell.indexOf('&')+1)
+
+                  let leftAsk = row.ask.substring(0,row.ask.indexOf('&'))
+                  let rightAsk = row.ask.substring(row.ask.indexOf('&')+1)
+                  console.log('&',left,right,leftAsk,rightAsk);
+                  if(leftAsk != left || rightAsk != right) {
+                    flag = false
+                  }
+                }
+              }else{
+                const regex = new RegExp(`${match[0]}(\\d+(\\.\\d+)?)`, 'g')
+                const matchTow = row.tell.match(regex);
+                console.log('matchTow',matchTow);
+              let right =  Number(matchTow[0].split(match[0])[1])
+              let left = row.ask.substring(row.ask.indexOf(match[0])+1)
+              if(Number(left) != Number(right)) {
+                // this.$message.error('666666')
+                flag = false
+              }
+              }
+              }
+            }
+            // 濡傛灉瑕佹眰鎻忚堪鍚湁鑼冨洿
+            const regexTwo = /[~-]/
+            const matchTwo = row.tell.match(regexTwo)
+            const matchAsk = row.ask.match(regexTwo)
+            if(matchTwo) {
+              let left = row.tell.substring(0,row.tell.indexOf(matchTwo[0]))
+              let right = row.tell.substring(row.tell.indexOf(matchTwo[0])+1)
+              if(!isNaN(Number(left)) && !isNaN(Number(right))) {
+                let leftAsk = row.ask.substring(0,row.ask.indexOf(matchAsk[0]))
+                let rightAsk = row.ask.substring(row.ask.indexOf(matchAsk[0])+1)
+                if(Number(leftAsk) != Number(left) || Number(rightAsk) != Number(right)) {
+                  // this.$message.error('777777')
+                  flag = false
+                }
+              }
+            }
+            })
+          }
+        })
+
+        // 鍏夌氦甯︽娴嬮」淇℃伅鏍￠獙
+        this.fibersList.forEach(item=>{
+          if(item.productList.length > 0){
+            item.productList.forEach(row=>{
+              
+              // 濡傛灉妫�娴嬭姹傚惈鏈夋璐熷彿
+          if(row.tell.indexOf('卤') != -1) {
+            let left = row.tell.substring(0,row.tell.indexOf('卤'))
+            let right = row.tell.substring(row.tell.indexOf('卤')+1)
+            // 濡傛灉鍙互杞寲涓烘暟鍊�
+           if(!isNaN(Number(left)) && !isNaN(Number(right))) {
+              if(row.ask.indexOf('-') != -1) {
+                  let left1 = row.ask.substring(0,row.ask.indexOf('-'))
+                  let right1 = row.ask.substring(row.ask.indexOf('-')+1)
+                  if(Number(left1) != (Number(left) - Number(right)) || Number(right1) != (Number(left) + Number(right))) {
+                    // this.$message.error('11111')
+                    flags = false
+                  }
+              }else {
+                // this.$message.error('2222')
+                flags = false
+                return
+              }
+           }
+           // 濡傛灉瑕佹眰鎻忚堪宸﹁竟涓嶈兘杞寲涓烘暟鍊�
+           else if(isNaN(Number(left)) && !isNaN(Number(right))) {
+            const regex = /[~-]/
+            const match = left.match(regex)
+            // 宸﹁竟鍚湁 - ~ 绗﹀彿
+            if(match) {
+              let newLeft = '';
+              if(left.includes('锛�')) {
+               newLeft = left.replace('锛�','(')
+              }
+              if(left.includes('锛�')) {
+                newLeft = newLeft.replace('锛�',')')
+              }
+              const regexTwo = /\((\d+(\.\d+)?)([~-])(\d+(\.\d+)?)\)/;
+              const matchTwo = newLeft.match(regexTwo);
+              let leftTwo = Number(matchTwo[1]) - Number(right)
+              let rightTwo = Number(matchTwo[4]) + Number(right)
+              if(row.ask.indexOf('-') != -1) {
+                  let left1 = row.ask.substring(0,row.ask.indexOf('-'))
+                  let right1 = row.ask.substring(row.ask.indexOf('-')+1)
+                  if(Number(left1) != leftTwo || Number(right1) != rightTwo) {
+                    // this.$message.error('33333')
+                    flags = false
+                  }
+              }else {
+                // this.$message.error('44444')
+                flags = false
+                return
+              }
+            }
+           }
+          }
+          // 濡傛灉妫�娴嬭姹傚惈鏈夆墹 < 鈮� > 绗﹀彿
+          const regex = /[鈮�<鈮�>]/
+          const match = row.tell.match(regex)
+          if(match) {
+            // 绗﹀彿涓嶄竴鑷�
+            if( row.ask.indexOf(match[0]) != 0) {
+                // this.$message.error('555555')
+                flags = false
+                return
+              }else {
+                // 绗﹀彿涓�鑷�
+                if(row.tell.indexOf('&') != -1) {
+                console.log(11111);
+                if(row.ask.indexOf('&') == -1) {
+                  this.$message.error('妫�娴嬭姹備笉绗﹀悎瑕佹眰鎻忚堪')
+                row.ask = row.tell
+                return
+                }else{
+                  let left = row.tell.substring(0,row.tell.indexOf('&'))
+                  let right = row.tell.substring(row.tell.indexOf('&')+1)
+
+                  let leftAsk = row.ask.substring(0,row.ask.indexOf('&'))
+                  let rightAsk = row.ask.substring(row.ask.indexOf('&')+1)
+                  console.log('&',left,right,leftAsk,rightAsk);
+                  if(leftAsk != left || rightAsk != right) {
+                    flags = false
+                  }
+                }
+              }else {
+                const regex = new RegExp(`${match[0]}(\\d+(\\.\\d+)?)`, 'g')
+                const matchTow = row.tell.match(regex);
+              let right =  Number(matchTow[0].split(match[0])[1])
+              let left = row.ask.substring(row.ask.indexOf(match[0])+1)
+              if(Number(left) != Number(right)) {
+                // this.$message.error('666666')
+                flags = false
+              }
+              }
+                
+              }
+            }
+            // 濡傛灉瑕佹眰鎻忚堪鍚湁鑼冨洿
+            const regexTwo = /[~-]/
+            const matchTwo = row.tell.match(regexTwo)
+            const matchAsk = row.ask.match(regexTwo)
+            if(matchTwo) {
+              let left = row.tell.substring(0,row.tell.indexOf(matchTwo[0]))
+              let right = row.tell.substring(row.tell.indexOf(matchTwo[0])+1)
+              if(!isNaN(Number(left)) && !isNaN(Number(right))) {
+                let leftAsk = row.ask.substring(0,row.ask.indexOf(matchAsk[0]))
+                let rightAsk = row.ask.substring(row.ask.indexOf(matchAsk[0])+1)
+                if(Number(leftAsk) != Number(left) || Number(rightAsk) != Number(right)) {
+                  // this.$message.error('777777')
+                  flags = false
+                }
+              }
+            }
+            })
+          }
+        })
         if(this.bushing.length === 0){
-          this.$message.error('缂哄皯閰嶇疆鏃犳硶淇濆瓨')
+          this.$message.error('缂哄皯濂楃鏃犳硶淇濆瓨')
           return
         }
-        for(let a in this.bushing){
-          if(this.bushing[a].fibers.length===0&&this.bushing[a].fiber.length===0){
-            this.$message.error(this.bushing[a].color+'绠¤壊鏍囧绠＄己灏戦厤缃棤娉曚繚瀛�')
+        this.bushing.forEach(item=>{
+          // 濡傛灉鍏夌氦甯︽湁鍊�
+          if(this.fibersList.length != 0) {
+              // this.fibersList.forEach(a=>{
+              //   a.fiber = this.fiberList
+              // })
+              item.fibers = this.fibersList // 鍏夌氦甯�
+              item.fiber = [] // 鍏夌氦
+          }else {
+            // 濡傛灉鍏夌氦甯︽病鏈夊��
+            item.fibers = [] // 鍏夌氦甯�
+            item.fiber = this.fiberList // 鍏夌氦
+          }
+        })
+        
+        if(flag && flags) {
+          this.$message.success('宸蹭繚瀛�')
+          this.sample.forEach(a=>{
+          a.bushing = this.bushing
+        })
+        this.$emit('saveFiberopticConfig')
+        }else if(!flag) {
+          this.$message.error('鍏夌氦淇濆瓨鐨勬娴嬮」涓惈鏈変笉绗﹀悎瑕佹眰鐨勬暟鎹�')
+        }else if(!flags) {
+          this.$message.error('鍏夌氦甯︿繚瀛樼殑妫�娴嬮」涓惈鏈変笉绗﹀悎瑕佹眰鐨勬暟鎹�')
+        }
+      },
+      beforeClose(done){
+        if (this.bsm1) {
+          if (this.bsm1Val === null || this.bsm1Val === '') {
+            this.$message.error('鐗规畩椤圭洰蹇呴』澶勭悊')
             return
           }
         }
-        this.sample.forEach(a=>{
-          a.bushing = this.bushing
-        })
-        this.$message.success('宸蹭繚瀛�')
-        this.$emit('saveFiberopticConfig')
+        if (this.bsm2) {
+          if (this.bsm2Val2.length === 0) {
+            this.$message.error('鐗规畩椤圭洰蹇呴』澶勭悊')
+            return
+          }
+          let set = new Set()
+          for (let i=0;i<this.bsm2Val2.length;i++){
+            let num0 = set.size
+            set.add(JSON.stringify(this.bsm2Val2[i]))
+            let num1 = set.size
+            if(num1==num0){
+              this.$message.error('鍏宠仈椤圭洰涓嶈兘閲嶅')
+              return
+            }
+            set.add(JSON.stringify(this.bsm2Val2[i].reverse()))
+            let num2 = set.size
+            if(num1==num2){
+              this.$message.error('鍏宠仈椤圭洰涓嶈兘閲嶅')
+              return
+            }
+          }
+        }
+        done()
+      },
+      beforeClose0(done){
+        if(!this.bsm3Val){
+          this.$message.error('RST蹇呴』濉啓')
+          return
+        }else{
+          if(Array.isArray(this.bsmRow3)){
+            this.bsmRow3.forEach(item=>{
+              item.rts = this.bsm3Val
+            })
+          }else{
+            this.bsmRow3.rts = this.bsm3Val
+          }
+        }
+        done()
+      },
+      upBsm1(val) {
+        let sections = JSON.parse(this.bsmRow.section);
+        let asks = JSON.parse(this.bsmRow.ask);
+        let tells = JSON.parse(this.bsmRow.tell);
+        let manHours = JSON.parse(this.bsmRow.manHour);
+        let prices = JSON.parse(this.bsmRow.price);
+        for (var a in sections) {
+          if (val === sections[a]) {
+            this.productList.forEach(p => {
+              if (p.id === this.bsmRow.id) {
+                p.section = sections[a]
+                p.ask = asks[a]
+                p.tell = tells[a]
+                p.manHour = manHours[a]
+                p.price = prices[a]
+              }
+            })
+            break
+          }
+        }
+      },
+      bsm2Up(val){
+        let list = []
+        for(let a=1;a < this.bsm2Val3.length + 1;a++){
+          list.push(a)
+        }
+        let set = new Set()
+        let size1 = set.length
+        while(set.size < val){
+          set.add(Math.ceil(Math.random() * this.bsm2Val3.length))
+        }
+        this.bsm2Val2 = []
+        for(let a of set){
+          this.bsm2Val2.push(this.HaveJson(this.bsm2Val3[a-1]))
+        }
       }
     }
   }

--
Gitblit v1.9.3