From 1640da462fc045545a20736861e385bad85b9544 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期二, 23 七月 2024 14:00:48 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/center-lims-before into master
---
src/components/do/b1-material-ins-order/customs-inspection.vue | 801 ++++++++++++++++++++++++++++----------------------------
1 files changed, 404 insertions(+), 397 deletions(-)
diff --git a/src/components/do/b1-material-ins-order/customs-inspection.vue b/src/components/do/b1-material-ins-order/customs-inspection.vue
index 240003f..5c511f3 100644
--- a/src/components/do/b1-material-ins-order/customs-inspection.vue
+++ b/src/components/do/b1-material-ins-order/customs-inspection.vue
@@ -158,8 +158,10 @@
</div>
</div>
</div>
- <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-bottom: 10px;">
+ <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-bottom: 10px;">
<el-table-column type="selection" width="60" :selectable="selectable" v-if="active==1"></el-table-column>
<el-table-column type="index" label="搴忓彿" width="65" align="center"></el-table-column>
<el-table-column prop="sample" label="鏍峰搧鍚嶇О" align="center" min-width="100">
@@ -219,9 +221,14 @@
</el-table-column>
<el-table-column prop="proNum" label="寰呮椤规暟閲�" width="105" align="center"></el-table-column>
</el-table>
- <el-table class="el-table" ref="productTable" :data="productList" height="380px" tooltip-effect="dark" border
- @selection-change="selectProduct" style="margin-bottom: 10px;" @select="upProductSelect"
- :row-class-name="tableRowClassName" v-loading="getProductLoad" @select-all="handleAll">
+ <el-table class="el-table" ref="productTable" :data="productList"
+ height="380px" tooltip-effect="dark" border
+ style="margin-bottom: 10px;"
+ @selection-change="selectProduct"
+ @select="upProductSelect"
+ :row-class-name="tableRowClassName"
+ @select-all="handleAll"
+ v-loading="getProductLoad">
<el-table-column type="selection" width="65" :selectable="selectable" v-if="active==1"></el-table-column>
<el-table-column prop="inspectionItem" label="妫�楠岄」" min-width="140" show-overflow-tooltip>
<template slot="header" slot-scope="scope">
@@ -382,251 +389,251 @@
<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">
- <el-col class="search_thing" :span="22" style="height: initial;margin: 5px 0;">
- <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" style="margin-bottom: 2px;margin-top: 2px;"></el-radio>
- </el-radio-group>
- </div>
- </el-col>
- <el-col class="search_thing" :span="22" style="height: initial;margin: 5px 0;">
- <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-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>
- </el-col>
- </el-row>
- </div>
- </el-dialog>
+<!-- <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" style="height: initial;margin: 5px 0;">-->
+<!-- <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" style="margin-bottom: 2px;margin-top: 2px;"></el-radio>-->
+<!-- </el-radio-group>-->
+<!-- </div>-->
+<!-- </el-col>-->
+<!-- <el-col class="search_thing" :span="22" style="height: initial;margin: 5px 0;">-->
+<!-- <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-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>-->
+<!-- </el-col>-->
+<!-- </el-row>-->
+<!-- </div>-->
+<!-- </el-dialog>-->
<!-- 鍏ㄩ�夌壒娈婂�煎鐞嗘-->
- <el-dialog title="妫�娴嬪埌鐗规畩椤癸紝璇蜂綔鍑轰互涓嬮�夋嫨" :visible.sync="bsm1DiaAll" width="500px" :show-close="false"
- :before-close="beforeClose">
- <div class="body" style="max-height: 60vh;" v-for="(item, index) in bsm1DiaList" :key="index">
- <el-row v-if="item.bsm1">
- <el-col class="search_thing" :span="22" style="height: initial;margin: 5px 0;">
- <div class="search_label"><span class="required-span">* </span>閫夐」锛�</div>
- <div class="search_input">
- <el-radio-group v-model="item.bsm1Val" @input="upBsmAll(item)">
- <el-radio v-for="(a, ai) in JSON.parse(item.bsmRow.section)" :key="ai" :label="a" style="margin-bottom: 2px;margin-top: 2px;"></el-radio>
- </el-radio-group>
- </div>
- </el-col>
- <el-col class="search_thing" :span="22" style="height: initial;margin: 5px 0;">
- <div class="search_label">瑕佹眰鍊硷細</div>
- <div class="search_input" v-show="item.bsm1Val!==null&&item.bsm1Val!==''">
- <el-radio-group v-model="item.bsm1Val" @input="upBsmAll(item)">
- <el-radio v-for="(a, ai) in JSON.parse(item.bsmRow.section)" :key="ai"
- :label="a">{{JSON.parse(item.bsmRow.ask)[ai]}}</el-radio>
- </el-radio-group>
- </div>
- </el-col>
- </el-row>
- <el-row v-if="item.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="item.bsm2Val" :min="1" :max="item.bsm2Val3.length" :precision="0"
- style="width: 70%;" :controls="false" @change="bsm2Up"></el-input-number>
- <span>MAX锛歿{item.bsm2Val3.length}}</span>
- </div>
- </el-col>
- <el-col style="margin-top: 6px;">
- <el-col v-for="(a,ai) in item.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 item.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 item.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>
- </div>
- </el-dialog>
- <el-dialog title="鐗规畩鍊煎～鍐�" :visible.sync="bsm3Dia" width="800px" :show-close="false">
- <el-table
- :data="editTable"
- style="width: 100%">
- <!-- inspectionItemList -->
- <el-table-column
- prop="inspectionItemList"
- label="妫�楠岄」"
- width="180">
- </el-table-column>
- <el-table-column
- prop="sampleCode"
- label="鏍峰搧缂栧彿"
- width="180">
- </el-table-column>
- <el-table-column
- prop="model"
- label="鏍峰搧鍨嬪彿"
- width="180">
- </el-table-column>
- <el-table-column
- prop="symbolItem"
- label="璇嗗埆绗﹀彿">
- </el-table-column>
- <el-table-column
- prop="value"
- label="璇嗗埆绗﹀��">
- <template slot-scope="scope">
- <el-input v-model="scope.row.value" placeholder="璇疯緭鍏�" size="small"></el-input>
- </template>
- </el-table-column>
- </el-table>
- <span slot="footer" class="dialog-footer">
- <el-row>
- <el-button @click="bsm3Dia=false">鍙� 娑�</el-button>
- <el-button type="primary" @click="save0" :loading="saveLoad">纭� 瀹�</el-button>
- </el-row>
- </span>
- </el-dialog>
- <el-dialog title="娓╁害寰幆瑕佹眰濉啓" :visible.sync="circulateShow" width="900px" :before-close="beforeCirculateShowClose" :show-close="false">
- <div class="search" style="display: flex;background: transparent;">
- <div class="search_thing">
- <div class="search_label">淇濇俯鏃堕棿锛�</div>
- <div class="search_input">
- <el-input v-model="circulateForm.entrustTime" size="small" placeholder="" type="number"></el-input>
- </div>
- </div>
- <div class="search_thing">
- <div class="search_label">寰幆娆℃暟锛�</div>
- <div class="search_input">
- <el-input v-model="circulateForm.entrustNum" size="small" placeholder="" type="number"></el-input>
- </div>
- </div>
- <div class="search_thing">
- <div class="search_label">娓╁害鐐癸細</div>
- <div class="search_input">
- <el-input @blur="changeTemperatureData" v-model="circulateForm.entrustPoint" size="small" placeholder="" type="number"></el-input>
- </div>
- </div>
- </div>
- <div class="circulateTable">
- <div class="opticalProject">
- <div style="line-height: 30px;">鍏夌氦椤圭洰</div>
- <el-divider></el-divider>
- <div>
- <el-table
- ref="multipleTable"
- border
- :header-cell-style="{'text-align':'center'}"
- :cell-style="{'text-align':'center'}"
- :data="opticalProject"
- tooltip-effect="dark"
- style="width: 100%"
- @row-click="rowClickOptical"
- @select="selectOpticalProject"
- @select-all="selectAllOptical"
- @selection-change="handleSelectionChange">
- <el-table-column
- type="selection"
- width="55">
- </el-table-column>
- <el-table-column prop="value" label="鍏夌氦椤圭洰" show-overflow-tooltip></el-table-column>
- </el-table>
- </div>
- </div>
- <div class="temperatureList">
- <div class="temperatureListTitle">
- <span>娓╁害鐐归泦鍚�</span>
- <span>
- <el-button type="primary" size="mini" @click="addTemperatureData">鏂板</el-button>
- <el-button size="mini" @click="deleteTemperatureData">鍒犻櫎</el-button>
- </span>
- </div>
- <el-divider></el-divider>
- <el-table
- :data="temperatureData"
- border
- :header-cell-style="{'text-align':'center'}"
- :cell-style="{'text-align':'center'}"
- style="width: 100%">
- <el-table-column prop="date" label="娓╁害鐐�(鈩�)" width="120px">
- <template slot-scope="scope">
- <el-input size="small" v-model="scope.row.temperaturePoint" clearable placeholder="璇疯緭鍏�" @change="changeTemperature"></el-input>
- </template>
- </el-table-column>
- <el-table-column prop="name" label="瑕佹眰(dB/Km)">
- <template slot-scope="scope">
- <span>x</span>
- <el-select v-model="scope.row.askSymbol" placeholder="璇烽�夋嫨" size="small" style="width: 120px" @change="changeTemperature">
- <el-option v-for="item in temperatureDataList" :key="item.value" :label="item.label" :value="item.value">
- </el-option>
- </el-select>
- <el-input size="small" v-model="scope.row.askNum" clearable placeholder="璇疯緭鍏�" style="width: 120px" @change="changeTemperature"></el-input>
- </template>
- </el-table-column>
- </el-table>
- </div>
- </div>
- <span slot="footer" class="dialog-footer">
- <el-button @click="cleanSpliceData">鍙栨秷</el-button>
- <el-button type="primary" @click="spliceData">淇濆瓨</el-button>
- </span>
- </el-dialog>
- <el-dialog :title="temperatureTitle" :visible.sync="temperatureShow" width="260px" :before-close="temperatureShowClose" :show-close="false">
- <div>
- <div v-if="isShowInput" style="margin-bottom: 6px">
- <span>寰幆娆℃暟:</span>
- <!-- <el-input size="small" type="number" v-model="temperatureTestNum" style="width: 120px"></el-input> -->
- <el-input-number v-model="temperatureTestNum" :min="2" :max="1000000" size="small" label=""></el-input-number>
- </div>
- <el-checkbox-group v-model="temperatureTest" @change="handleTemperatureTestChange" style="display: flex;flex-direction: column;">
- <el-checkbox v-for="item in temperatureList" :label="item" :key="item" style="margin-bottom: 6px">{{item}}</el-checkbox>
- </el-checkbox-group>
- </div>
- <span slot="footer" class="dialog-footer">
- <el-button @click="cleanTemperatureTest">鍙栨秷</el-button>
- <el-button type="primary" @click="spliceTemperatureTest">淇濆瓨</el-button>
- </span>
- </el-dialog>
+<!-- <el-dialog title="妫�娴嬪埌鐗规畩椤癸紝璇蜂綔鍑轰互涓嬮�夋嫨" :visible.sync="bsm1DiaAll" width="500px" :show-close="false"-->
+<!-- :before-close="beforeClose">-->
+<!-- <div class="body" style="max-height: 60vh;" v-for="(item, index) in bsm1DiaList" :key="index">-->
+<!-- <el-row v-if="item.bsm1">-->
+<!-- <el-col class="search_thing" :span="22" style="height: initial;margin: 5px 0;">-->
+<!-- <div class="search_label"><span class="required-span">* </span>閫夐」锛�</div>-->
+<!-- <div class="search_input">-->
+<!-- <el-radio-group v-model="item.bsm1Val" @input="upBsmAll(item)">-->
+<!-- <el-radio v-for="(a, ai) in JSON.parse(item.bsmRow.section)" :key="ai" :label="a" style="margin-bottom: 2px;margin-top: 2px;"></el-radio>-->
+<!-- </el-radio-group>-->
+<!-- </div>-->
+<!-- </el-col>-->
+<!-- <el-col class="search_thing" :span="22" style="height: initial;margin: 5px 0;">-->
+<!-- <div class="search_label">瑕佹眰鍊硷細</div>-->
+<!-- <div class="search_input" v-show="item.bsm1Val!==null&&item.bsm1Val!==''">-->
+<!-- <el-radio-group v-model="item.bsm1Val" @input="upBsmAll(item)">-->
+<!-- <el-radio v-for="(a, ai) in JSON.parse(item.bsmRow.section)" :key="ai"-->
+<!-- :label="a">{{JSON.parse(item.bsmRow.ask)[ai]}}</el-radio>-->
+<!-- </el-radio-group>-->
+<!-- </div>-->
+<!-- </el-col>-->
+<!-- </el-row>-->
+<!-- <el-row v-if="item.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="item.bsm2Val" :min="1" :max="item.bsm2Val3.length" :precision="0"-->
+<!-- style="width: 70%;" :controls="false" @change="bsm2Up"></el-input-number>-->
+<!-- <span>MAX锛歿{item.bsm2Val3.length}}</span>-->
+<!-- </div>-->
+<!-- </el-col>-->
+<!-- <el-col style="margin-top: 6px;">-->
+<!-- <el-col v-for="(a,ai) in item.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 item.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 item.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>-->
+<!-- </div>-->
+<!-- </el-dialog>-->
+<!-- <el-dialog title="鐗规畩鍊煎～鍐�" :visible.sync="bsm3Dia" width="800px" :show-close="false">-->
+<!-- <el-table-->
+<!-- :data="editTable"-->
+<!-- style="width: 100%">-->
+<!-- <!– inspectionItemList –>-->
+<!-- <el-table-column-->
+<!-- prop="inspectionItemList"-->
+<!-- label="妫�楠岄」"-->
+<!-- width="180">-->
+<!-- </el-table-column>-->
+<!-- <el-table-column-->
+<!-- prop="sampleCode"-->
+<!-- label="鏍峰搧缂栧彿"-->
+<!-- width="180">-->
+<!-- </el-table-column>-->
+<!-- <el-table-column-->
+<!-- prop="model"-->
+<!-- label="鏍峰搧鍨嬪彿"-->
+<!-- width="180">-->
+<!-- </el-table-column>-->
+<!-- <el-table-column-->
+<!-- prop="symbolItem"-->
+<!-- label="璇嗗埆绗﹀彿">-->
+<!-- </el-table-column>-->
+<!-- <el-table-column-->
+<!-- prop="value"-->
+<!-- label="璇嗗埆绗﹀��">-->
+<!-- <template slot-scope="scope">-->
+<!-- <el-input v-model="scope.row.value" placeholder="璇疯緭鍏�" size="small"></el-input>-->
+<!-- </template>-->
+<!-- </el-table-column>-->
+<!-- </el-table>-->
+<!-- <span slot="footer" class="dialog-footer">-->
+<!-- <el-row>-->
+<!-- <el-button @click="bsm3Dia=false">鍙� 娑�</el-button>-->
+<!-- <el-button type="primary" @click="save0" :loading="saveLoad">纭� 瀹�</el-button>-->
+<!-- </el-row>-->
+<!-- </span>-->
+<!-- </el-dialog>-->
+<!-- <el-dialog title="娓╁害寰幆瑕佹眰濉啓" :visible.sync="circulateShow" width="900px" :before-close="beforeCirculateShowClose" :show-close="false">-->
+<!-- <div class="search" style="display: flex;background: transparent;">-->
+<!-- <div class="search_thing">-->
+<!-- <div class="search_label">淇濇俯鏃堕棿锛�</div>-->
+<!-- <div class="search_input">-->
+<!-- <el-input v-model="circulateForm.entrustTime" size="small" placeholder="" type="number"></el-input>-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- <div class="search_thing">-->
+<!-- <div class="search_label">寰幆娆℃暟锛�</div>-->
+<!-- <div class="search_input">-->
+<!-- <el-input v-model="circulateForm.entrustNum" size="small" placeholder="" type="number"></el-input>-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- <div class="search_thing">-->
+<!-- <div class="search_label">娓╁害鐐癸細</div>-->
+<!-- <div class="search_input">-->
+<!-- <el-input @blur="changeTemperatureData" v-model="circulateForm.entrustPoint" size="small" placeholder="" type="number"></el-input>-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- <div class="circulateTable">-->
+<!-- <div class="opticalProject">-->
+<!-- <div style="line-height: 30px;">鍏夌氦椤圭洰</div>-->
+<!-- <el-divider></el-divider>-->
+<!-- <div>-->
+<!-- <el-table-->
+<!-- ref="multipleTable"-->
+<!-- border-->
+<!-- :header-cell-style="{'text-align':'center'}"-->
+<!-- :cell-style="{'text-align':'center'}"-->
+<!-- :data="opticalProject"-->
+<!-- tooltip-effect="dark"-->
+<!-- style="width: 100%"-->
+<!-- @row-click="rowClickOptical"-->
+<!-- @select="selectOpticalProject"-->
+<!-- @select-all="selectAllOptical"-->
+<!-- @selection-change="handleSelectionChange">-->
+<!-- <el-table-column-->
+<!-- type="selection"-->
+<!-- width="55">-->
+<!-- </el-table-column>-->
+<!-- <el-table-column prop="value" label="鍏夌氦椤圭洰" show-overflow-tooltip></el-table-column>-->
+<!-- </el-table>-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- <div class="temperatureList">-->
+<!-- <div class="temperatureListTitle">-->
+<!-- <span>娓╁害鐐归泦鍚�</span>-->
+<!-- <span>-->
+<!-- <el-button type="primary" size="mini" @click="addTemperatureData">鏂板</el-button>-->
+<!-- <el-button size="mini" @click="deleteTemperatureData">鍒犻櫎</el-button>-->
+<!-- </span>-->
+<!-- </div>-->
+<!-- <el-divider></el-divider>-->
+<!-- <el-table-->
+<!-- :data="temperatureData"-->
+<!-- border-->
+<!-- :header-cell-style="{'text-align':'center'}"-->
+<!-- :cell-style="{'text-align':'center'}"-->
+<!-- style="width: 100%">-->
+<!-- <el-table-column prop="date" label="娓╁害鐐�(鈩�)" width="120px">-->
+<!-- <template slot-scope="scope">-->
+<!-- <el-input size="small" v-model="scope.row.temperaturePoint" clearable placeholder="璇疯緭鍏�" @change="changeTemperature"></el-input>-->
+<!-- </template>-->
+<!-- </el-table-column>-->
+<!-- <el-table-column prop="name" label="瑕佹眰(dB/Km)">-->
+<!-- <template slot-scope="scope">-->
+<!-- <span>x</span>-->
+<!-- <el-select v-model="scope.row.askSymbol" placeholder="璇烽�夋嫨" size="small" style="width: 120px" @change="changeTemperature">-->
+<!-- <el-option v-for="item in temperatureDataList" :key="item.value" :label="item.label" :value="item.value">-->
+<!-- </el-option>-->
+<!-- </el-select>-->
+<!-- <el-input size="small" v-model="scope.row.askNum" clearable placeholder="璇疯緭鍏�" style="width: 120px" @change="changeTemperature"></el-input>-->
+<!-- </template>-->
+<!-- </el-table-column>-->
+<!-- </el-table>-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- <span slot="footer" class="dialog-footer">-->
+<!-- <el-button @click="cleanSpliceData">鍙栨秷</el-button>-->
+<!-- <el-button type="primary" @click="spliceData">淇濆瓨</el-button>-->
+<!-- </span>-->
+<!-- </el-dialog>-->
+<!-- <el-dialog :title="temperatureTitle" :visible.sync="temperatureShow" width="260px" :before-close="temperatureShowClose" :show-close="false">-->
+<!-- <div>-->
+<!-- <div v-if="isShowInput" style="margin-bottom: 6px">-->
+<!-- <span>寰幆娆℃暟:</span>-->
+<!-- <!– <el-input size="small" type="number" v-model="temperatureTestNum" style="width: 120px"></el-input> –>-->
+<!-- <el-input-number v-model="temperatureTestNum" :min="2" :max="1000000" size="small" label=""></el-input-number>-->
+<!-- </div>-->
+<!-- <el-checkbox-group v-model="temperatureTest" @change="handleTemperatureTestChange" style="display: flex;flex-direction: column;">-->
+<!-- <el-checkbox v-for="item in temperatureList" :label="item" :key="item" style="margin-bottom: 6px">{{item}}</el-checkbox>-->
+<!-- </el-checkbox-group>-->
+<!-- </div>-->
+<!-- <span slot="footer" class="dialog-footer">-->
+<!-- <el-button @click="cleanTemperatureTest">鍙栨秷</el-button>-->
+<!-- <el-button type="primary" @click="spliceTemperatureTest">淇濆瓨</el-button>-->
+<!-- </span>-->
+<!-- </el-dialog>-->
</div>
</template>
@@ -771,21 +778,21 @@
currentMethod: null,
isAskOnlyRead: false,
sampleId: null,
- bsmRow: null,
- bsm1: false,
- bsm1Val: null,
- bsm1Dia: false,
- bsm1DiaAll: false,
+ // bsmRow: null,
+ // bsm1: false,
+ // bsm1Val: null,
+ // bsm1Dia: false,
+ // bsm1DiaAll: false,
equipConfigShow: false,
cableConfigShow: false,
- bsm2: false,
- bsm2Val: null,
- bsm2Dia: false,
- bsm2Val2: [],
- bsm2Val3: [],
- bsmRow3: null,
- bsm3Val: null,
- bsm3Dia: false,
+ // bsm2: false,
+ // bsm2Val: null,
+ // bsm2Dia: false,
+ // bsm2Val2: [],
+ // bsm2Val3: [],
+ // bsmRow3: null,
+ // bsm3Val: null,
+ // bsm3Dia: false,
total: 0,
RTS: '',
totalArr: [],
@@ -796,30 +803,30 @@
inspectionItem:null,
inspectionItemSubclass:null,
methodS:null,
- circulateShow:false,
- circulateForm:{
- entrustTime: '',
- entrustNum: '',
- entrustPoint: ''
- },
- isBsm2Val2:false,
- opticalProject: [], // 娓╁害寰幆寮规鍏夌氦椤圭洰鍒楄〃
- opticalProjectList: [], // 娓╁害寰幆寮规鍏夌氦椤圭洰閫変腑鐨勬暟缁�
- temperatureData: [], // 娓╁害寰幆寮规娓╁害鐐归泦鍚堝垪琛�
- temperatureDataList: [
- {label: '<', value: '<'},
- {label: '鈮�', value: '鈮�'},
- {label: '=', value: '='},
- {label: '鈮�', value: '鈮�'},
- {label: '>', value: '>'},
- ],
- temperatureShow: false, // 娓╁崌璇曢獙妫�楠岄」寮规
- temperatureTest: [],
- temperatureList: [],
- temperatureEngList: [],
- temperatureTitle: '',
- temperatureTestNum: '',
- isShowInput: false,
+ // circulateShow:false,
+ // circulateForm:{
+ // entrustTime: '',
+ // entrustNum: '',
+ // entrustPoint: ''
+ // },
+ // isBsm2Val2:false,
+ // opticalProject: [], // 娓╁害寰幆寮规鍏夌氦椤圭洰鍒楄〃
+ // opticalProjectList: [], // 娓╁害寰幆寮规鍏夌氦椤圭洰閫変腑鐨勬暟缁�
+ // temperatureData: [], // 娓╁害寰幆寮规娓╁害鐐归泦鍚堝垪琛�
+ // temperatureDataList: [
+ // {label: '<', value: '<'},
+ // {label: '鈮�', value: '鈮�'},
+ // {label: '=', value: '='},
+ // {label: '鈮�', value: '鈮�'},
+ // {label: '>', value: '>'},
+ // ],
+ // temperatureShow: false, // 娓╁崌璇曢獙妫�楠岄」寮规
+ // temperatureTest: [],
+ // temperatureList: [],
+ // temperatureEngList: [],
+ // temperatureTitle: '',
+ // temperatureTestNum: '',
+ // isShowInput: false,
temId: ''
}
},
@@ -1011,7 +1018,7 @@
this.$message.error('璇烽�夋嫨')
return
}
- this.spliceTemperatureTest()
+ // this.spliceTemperatureTest()
},
cleanTemperatureTest () {
this.temperatureTest = []
@@ -1044,7 +1051,7 @@
throw this.$message.error(`${o.value + '娉㈤暱娌℃湁閰嶇疆20鈩冩俯搴︾偣'}`)
}
})
- this.spliceData()
+ // this.spliceData()
},
handleTemperatureTestChange (value) {
@@ -1236,24 +1243,24 @@
} else if (!this.sampleList.every(m => m.standardMethodListId)) {
this.$message.error('璇烽�夋嫨妫�楠屾爣鍑�')
} else {
- const select = this.selectTree.split(' - ')
- const productListSelected = this.productListSelected.some(item => item.inspectionItem === '娓╁害寰幆')
- let isHaveBushing = ''
- this.sampleList.forEach(item => {
- if (!item.bushing || item.bushing.length === 0) {
- isHaveBushing = false
- }
- })
- console.log('isHaveBushing===', isHaveBushing)
- if (productListSelected && select[2] === '鍏夌紗' && isHaveBushing === false) {
- this.$message.error('鍏夌紗娓╁害寰幆椤圭洰蹇呴』杩涜鍏夌氦閰嶇疆')
-
- this.$refs.sampleTable.setCurrentRow(this.currentMethod, true)
- this.rowClick(this.currentMethod)
- this.sampleIds = [this.currentMethod.id]
- this.openConfig()
- return
- }
+ // const select = this.selectTree.split(' - ')
+ // const productListSelected = this.productListSelected.some(item => item.inspectionItem === '娓╁害寰幆')
+ // let isHaveBushing = ''
+ // this.sampleList.forEach(item => {
+ // if (!item.bushing || item.bushing.length === 0) {
+ // isHaveBushing = false
+ // }
+ // })
+ // console.log('isHaveBushing===', isHaveBushing)
+ // if (productListSelected && select[2] === '鍏夌紗' && isHaveBushing === false) {
+ // this.$message.error('鍏夌紗娓╁害寰幆椤圭洰蹇呴』杩涜鍏夌氦閰嶇疆')
+ //
+ // this.$refs.sampleTable.setCurrentRow(this.currentMethod, true)
+ // this.rowClick(this.currentMethod)
+ // this.sampleIds = [this.currentMethod.id]
+ // this.openConfig()
+ // return
+ // }
let sampleList = this.HaveJson(this.sampleList)
let projectNum = this.totalArr.filter(a => a.state == 1).length
if(projectNum==0){
@@ -1781,34 +1788,34 @@
this.$refs.productTable.toggleRowSelection(row, true);
},
upProductSelect(selection, row) {
- this.bsm1DiaList = []
- row.state = row.state == 1 ? 0 : 1
- if (row.bsm === '1' && row.section !== '' && row.section !== null && row.state === 1) {
- if (row.section.indexOf('[') > -1) {
- row.bsmRow = this.HaveJson(row)
- }
- row.bsm1 = true
- this.bsm1DiaList.push(row)
- this.bsm1DiaAll = true
- } else if (row.bsm === '1' && row.section !== '' && row.section !== null && row.state === 0) {
- row.bsm1 = false
- }
- if (row.bsm === '1' && row.inspectionItem === '鍏夌氦鎺ュご鎹熻��' && this.sampleList.length > 1 && row.state === 1&&!this.isBsm2Val2) {
- 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.sampleList.length > 1) {
- this.bsm2 = false
- } else if (row.bsm === '1' && row.inspectionItem === '鍏夌氦鎺ュご鎹熻��' && this.sampleList.length < 2) {
- this.$message.error('鏍峰搧鏁伴噺涓嶈冻澶熻繘琛岄厤瀵规搷浣�')
- row.state = row.state == 1 ? 0 : 1
- this.$refs.productTable.toggleRowSelection(row, false)
- return
- }
+ // this.bsm1DiaList = []
+ // row.state = row.state == 1 ? 0 : 1
+ // if (row.bsm === '1' && row.section !== '' && row.section !== null && row.state === 1) {
+ // if (row.section.indexOf('[') > -1) {
+ // row.bsmRow = this.HaveJson(row)
+ // }
+ // row.bsm1 = true
+ // this.bsm1DiaList.push(row)
+ // this.bsm1DiaAll = true
+ // } else if (row.bsm === '1' && row.section !== '' && row.section !== null && row.state === 0) {
+ // row.bsm1 = false
+ // }
+ // if (row.bsm === '1' && row.inspectionItem === '鍏夌氦鎺ュご鎹熻��' && this.sampleList.length > 1 && row.state === 1&&!this.isBsm2Val2) {
+ // 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.sampleList.length > 1) {
+ // this.bsm2 = false
+ // } else if (row.bsm === '1' && row.inspectionItem === '鍏夌氦鎺ュご鎹熻��' && this.sampleList.length < 2) {
+ // this.$message.error('鏍峰搧鏁伴噺涓嶈冻澶熻繘琛岄厤瀵规搷浣�')
+ // row.state = row.state == 1 ? 0 : 1
+ // this.$refs.productTable.toggleRowSelection(row, false)
+ // return
+ // }
this.sampleList.map(item => {
if (this.sampleIds.indexOf(item.id) > -1) {
item.insProduct.map(m => {
@@ -1820,23 +1827,23 @@
}
return item
})
- const select = this.selectTree.split(' - ')
- if (row.inspectionItem === '娓╁害寰幆' && select[2] === '鍏夌紗' && row.state === 1) {
- this.circulateShow = true;
- return
- } else if (row.inspectionItem === '娓╁害寰幆' && select[2] === '鍏夌紗' && row.state === 0) {
- this.circulateShow = false;
- }
- if ((row.inspectionItem === '娓╁崌璇曢獙' || row.inspectionItem === '鐑惊鐜�') && row.state === 1) {
- console.log('row---', row)
- this.temperatureTitle = `${row.inspectionItem}瑕佹眰濉啓`
- this.isShowInput = row.inspectionItem === '鐑惊鐜�'
- this.temId = row.id
- this.temperatureShow = true;
- return
- } else if ((row.inspectionItem === '娓╁崌璇曢獙' || row.inspectionItem === '鐑惊鐜�') && row.state === 0) {
- this.temperatureShow = false;
- }
+ // const select = this.selectTree.split(' - ')
+ // if (row.inspectionItem === '娓╁害寰幆' && select[2] === '鍏夌紗' && row.state === 1) {
+ // this.circulateShow = true;
+ // return
+ // } else if (row.inspectionItem === '娓╁害寰幆' && select[2] === '鍏夌紗' && row.state === 0) {
+ // this.circulateShow = false;
+ // }
+ // if ((row.inspectionItem === '娓╁崌璇曢獙' || row.inspectionItem === '鐑惊鐜�') && row.state === 1) {
+ // console.log('row---', row)
+ // this.temperatureTitle = `${row.inspectionItem}瑕佹眰濉啓`
+ // this.isShowInput = row.inspectionItem === '鐑惊鐜�'
+ // this.temId = row.id
+ // this.temperatureShow = true;
+ // return
+ // } else if ((row.inspectionItem === '娓╁崌璇曢獙' || row.inspectionItem === '鐑惊鐜�') && row.state === 0) {
+ // this.temperatureShow = false;
+ // }
this.getProNum()
},
searchProject () {
@@ -2095,52 +2102,52 @@
return m
})
}
- this.bsmRow3 = [];
- this.bsm1DiaList = []
- this.productList.forEach(p => {
- if (p.bsm === '1' && p.section !== '' && p.section !== null && p.state === 1) {
- if (p.section.indexOf('[') > -1) {
- p.bsmRow = this.HaveJson(p)
- }
- p.bsm1 = true
- this.bsm1DiaList.push(p)
- this.bsm1DiaAll = true
- } else if (p.bsm === '1' && p.section !== '' && p.section !== null && p.state === 0) {
- p.bsm1 = false
- }
- if (p.bsm === '1' && p.inspectionItem === '鍏夌氦鎺ュご鎹熻��' && this.sampleList.length > 1 && p.state === 1&&!this.isBsm2Val2) {
- 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.sampleList.length > 1) {
- this.bsm2 = false
- } else if (p.bsm === '1' && p.inspectionItem === '鍏夌氦鎺ュご鎹熻��' && this.sampleList.length < 2) {
- this.$message.error('鏍峰搧鏁伴噺涓嶈冻澶熻繘琛岄厤瀵规搷浣�')
- this.$refs.productTable.clearSelection()
- return
- }
- const select = this.selectTree.split(' - ')
- if (p.inspectionItem === '娓╁害寰幆' && select[2] === '鍏夌紗' && p.state === 1) {
- this.circulateShow = true;
- return
- } else if (p.inspectionItem === '娓╁害寰幆' && select[2] === '鍏夌紗' && p.state === 0) {
- this.circulateShow = false;
- }
- if ((p.inspectionItem === '娓╁崌璇曢獙' || p.inspectionItem === '鐑惊鐜�') && p.state === 1) {
- console.log('p---', p)
- this.temperatureTitle = `${p.inspectionItem}瑕佹眰濉啓`
- this.isShowInput = p.inspectionItem === '鐑惊鐜�'
- this.temId = p.id
- this.temperatureShow = true;
- return
- } else if ((p.inspectionItem === '娓╁崌璇曢獙' || p.inspectionItem === '鐑惊鐜�') && p.state === 0) {
- this.temperatureShow = false;
- }
- })
+ // this.bsmRow3 = [];
+ // this.bsm1DiaList = []
+ // this.productList.forEach(p => {
+ // if (p.bsm === '1' && p.section !== '' && p.section !== null && p.state === 1) {
+ // if (p.section.indexOf('[') > -1) {
+ // p.bsmRow = this.HaveJson(p)
+ // }
+ // p.bsm1 = true
+ // this.bsm1DiaList.push(p)
+ // this.bsm1DiaAll = true
+ // } else if (p.bsm === '1' && p.section !== '' && p.section !== null && p.state === 0) {
+ // p.bsm1 = false
+ // }
+ // if (p.bsm === '1' && p.inspectionItem === '鍏夌氦鎺ュご鎹熻��' && this.sampleList.length > 1 && p.state === 1&&!this.isBsm2Val2) {
+ // 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.sampleList.length > 1) {
+ // this.bsm2 = false
+ // } else if (p.bsm === '1' && p.inspectionItem === '鍏夌氦鎺ュご鎹熻��' && this.sampleList.length < 2) {
+ // this.$message.error('鏍峰搧鏁伴噺涓嶈冻澶熻繘琛岄厤瀵规搷浣�')
+ // this.$refs.productTable.clearSelection()
+ // return
+ // }
+ // const select = this.selectTree.split(' - ')
+ // if (p.inspectionItem === '娓╁害寰幆' && select[2] === '鍏夌紗' && p.state === 1) {
+ // this.circulateShow = true;
+ // return
+ // } else if (p.inspectionItem === '娓╁害寰幆' && select[2] === '鍏夌紗' && p.state === 0) {
+ // this.circulateShow = false;
+ // }
+ // if ((p.inspectionItem === '娓╁崌璇曢獙' || p.inspectionItem === '鐑惊鐜�') && p.state === 1) {
+ // console.log('p---', p)
+ // this.temperatureTitle = `${p.inspectionItem}瑕佹眰濉啓`
+ // this.isShowInput = p.inspectionItem === '鐑惊鐜�'
+ // this.temId = p.id
+ // this.temperatureShow = true;
+ // return
+ // } else if ((p.inspectionItem === '娓╁崌璇曢獙' || p.inspectionItem === '鐑惊鐜�') && p.state === 0) {
+ // this.temperatureShow = false;
+ // }
+ // })
if (e.length > 0) {
this.sampleList.map(item => {
if (this.sampleIds.indexOf(item.id) > -1) {
--
Gitblit v1.9.3