From 57e76b55709e8ea88a83ab6c3f665fd9ee7fd64c Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期三, 03 七月 2024 14:23:48 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/center-lims-before into master
---
src/components/do/b1-ins-order/add.vue | 1721 +++++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 1,485 insertions(+), 236 deletions(-)
diff --git a/src/components/do/b1-ins-order/add.vue b/src/components/do/b1-ins-order/add.vue
index 8762763..20b16e4 100644
--- a/src/components/do/b1-ins-order/add.vue
+++ b/src/components/do/b1-ins-order/add.vue
@@ -47,6 +47,46 @@
align-items: center;
justify-content: space-between;
}
+
+ .pairing {
+ text-align: center;
+ line-height: 36px;
+ margin: 3px 0;
+ border: 1px solid rgba(0, 0, 0, 0.1);
+ border-radius: 4px;
+ }
+
+ .askRts {
+ width: 100px;
+ font-size: 12px;
+ border-top: 0;
+ border-left: 0;
+ border-right: 0;
+ border-bottom: 2px solid rgba(0, 0, 0, 0.3);
+ text-align: center;
+ background-color: rgba(0, 0, 0, 0.1);
+ outline: none;
+ border-radius: 2px;
+ line-height: 24px;
+ margin-top: 5px;
+ }
+ .circulateTable {
+ display: flex;
+ flex-direction: row;
+ justify-content: space-between;
+ .opticalProject {
+ width: 38%;
+ }
+ .temperatureList {
+ width: 60%;
+ .temperatureListTitle {
+ display: flex;
+ flex-direction: row;
+ justify-content: space-between;
+ line-height: 30px;
+ }
+ }
+ }
</style>
<style>
.ins_order_add .el-input-group__append,
@@ -92,9 +132,10 @@
<template>
<div class="ins_order_add">
- <div v-show="!configShow">
+ <div v-show="!configShow&&!equipConfigShow&&!cableConfigShow">
<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;">濮旀墭鍗曚俊鎭� 鎬讳环锛�<span
+ style="color: #3A7BFA">锟{total}}</span></el-col>
<el-col :span="18" style="text-align: right;">
<el-select v-model="template" size="medium" placeholder="涓嬪崟妯℃澘" style="margin-right: 10px;" v-show="active==1"
@change="selectInsOrderTemplateById">
@@ -107,7 +148,10 @@
<el-button size="medium" @click="templateDia=true" v-show="active==1">
<span style="color: #3A7BFA;">淇濆瓨妯℃澘</span>
</el-button>
- <el-button size="medium" type="primary" @click="openConfig">鍏夌氦閰嶇疆</el-button>
+ <el-button size="medium" type="primary" @click="openCableConfig"
+ v-if="active==1&&PROJECT=='瑁呭鐢电紗'&&addObj.sampleType!=undefined&&addObj.sampleType.indexOf('鐢电紗')>-1">鐢电紗閰嶇疆</el-button>
+ <el-button size="medium" type="primary" @click="openEquipConfig" v-if="active==1">瀛愭牱鍝侀厤缃�</el-button>
+ <el-button size="medium" type="primary" @click="openConfig" v-if="addObj.sampleType==='鍏夌紗'">鍏夌氦閰嶇疆</el-button>
<el-button size="medium" type="primary" @click="save" :loading="saveLoad" v-show="active==1">鎻愪氦</el-button>
<!-- 瀹℃牳 -->
<el-button size="medium" @click="upInsOrderOfState(2)" :loading="saveLoad" v-show="active==3"
@@ -120,7 +164,7 @@
</el-col>
</el-row>
</div>
- <div class="search" v-show="!configShow">
+ <div class="search" v-show="!configShow&&!equipConfigShow&&!cableConfigShow">
<el-row>
<el-col class="search_thing" :span="6">
<div class="search_label">濮旀墭缂栧彿锛�</div>
@@ -136,25 +180,30 @@
</el-select>
</div>
</el-col>
- <el-col class="search_thing" :span="6">
- <div class="search_label"><span class="required-span">* </span>濮旀墭瀹㈡埛锛�</div>
+ <el-col class="search_thing" :span="6" >
+ <div class="search_label"><span class="required-span">* </span>鍒跺崟浜猴細</div>
<div class="search_input">
- <el-input readonly size="small" v-model="addObj.custom">
+ <el-input size="small" clearable disabled v-model="addObj.custom"></el-input>
+ <!-- <el-input readonly size="small" v-model="addObj.custom">
+ <template slot="append"><el-button slot="append" icon="el-icon-search" @click="selectUserDia = true"
+ :disabled="active>1"></el-button></template>
+ </el-input> -->
+ </div>
+ </el-col>
+ <el-col class="search_thing" :span="6">
+ <div class="search_label"><span class="required-span">* </span>濮旀墭鍗曚綅锛�</div>
+ <div class="search_input">
+ <!-- <el-input size="small" placeholder="鈫愰�夋嫨濮旀墭瀹㈡埛" clearable disabled v-model="addObj.company"></el-input> -->
+ <el-input readonly size="small" v-model="addObj.company" placeholder="閫夋嫨濮旀墭鍗曚綅">
<template slot="append"><el-button slot="append" icon="el-icon-search" @click="selectUserDia = true"
:disabled="active>1"></el-button></template>
</el-input>
</div>
</el-col>
<el-col class="search_thing" :span="6">
- <div class="search_label"><span class="required-span">* </span>濮旀墭鍗曚綅锛�</div>
- <div class="search_input">
- <el-input size="small" placeholder="閫夋嫨濮旀墭瀹㈡埛" clearable disabled v-model="addObj.company"></el-input>
- </div>
- </el-col>
- <el-col class="search_thing" :span="6">
<div class="search_label"><span class="required-span">* </span>鑱旂郴鏂瑰紡锛�</div>
<div class="search_input">
- <el-input size="small" placeholder="閫夋嫨濮旀墭瀹㈡埛" clearable disabled v-model="addObj.phone"></el-input>
+ <el-input size="small" placeholder="閫夋嫨濮旀墭瀹㈡埛" clearable :readonly="active>1" v-model="addObj.phone"></el-input>
</div>
</el-col>
<el-col class="search_thing" :span="6">
@@ -174,12 +223,12 @@
</el-input>
</div>
</el-col>
- <el-col class="search_thing" :span="6">
+ <!-- <el-col class="search_thing" :span="6">
<div class="search_label"><span class="required-span">* </span>鏍峰搧绫诲瀷锛�</div>
<div class="search_input">
<el-input size="small" clearable disabled v-model="addObj.sampleType"></el-input>
</div>
- </el-col>
+ </el-col> -->
<el-col class="search_thing" :span="6">
<div class="search_label"><span class="required-span">* </span>鏍峰搧鏁伴噺锛�</div>
<div class="search_input">
@@ -222,6 +271,34 @@
</div>
</el-col>
<el-col class="search_thing" :span="6">
+ <div class="search_label">宸ョ▼鍚嶇О锛�</div>
+ <div class="search_input">
+ <el-input size="small" :placeholder="active>1 ? '' : '璇疯緭鍏�'" clearable v-model="addObj.engineering"
+ :readonly="active>1"></el-input>
+ </div>
+ </el-col>
+ <el-col class="search_thing" :span="6">
+ <div class="search_label">宸ョ▼鍚嶇ОEN锛�</div>
+ <div class="search_input">
+ <el-input size="small" :placeholder="active>1 ? '' : '璇疯緭鍏�'" clearable v-model="addObj.engineeringEn"
+ :readonly="active>1"></el-input>
+ </div>
+ </el-col>
+ <el-col class="search_thing" :span="6">
+ <div class="search_label"><span class="required-span">* </span>鐢熶骇鍗曚綅锛�</div>
+ <div class="search_input">
+ <el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="addObj.production"
+ :readonly="active>1"></el-input>
+ </div>
+ </el-col>
+ <el-col class="search_thing" :span="6">
+ <div class="search_label"><span class="required-span">* </span>鐢熶骇鍗曚綅EN锛�</div>
+ <div class="search_input">
+ <el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="addObj.productionEn"
+ :readonly="active>1"></el-input>
+ </div>
+ </el-col>
+ <el-col class="search_thing" :span="6">
<div class="search_label">鏄惁鐣欐牱锛�</div>
<div class="search_input">
<el-radio-group v-model="addObj.isLeave">
@@ -242,43 +319,53 @@
<el-col class="search_thing" :span="6">
<div class="search_label">OTC璁㈠崟鍙凤細</div>
<div class="search_input">
- <el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="addObj.otcCode" :readonly="active>1"></el-input>
+ <el-input size="small" :placeholder="active>1 ? '' : '璇疯緭鍏�'" clearable v-model="addObj.otcCode" :readonly="active>1"></el-input>
</div>
</el-col>
<el-col class="search_thing" :span="6">
- <div class="search_label"><span class="required-span">* </span>宸ョ▼鍚嶇О锛�</div>
+ <div class="search_label">濮旀墭浜猴細</div>
<div class="search_input">
- <el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="addObj.engineering" :readonly="active>1"></el-input>
- </div>
- </el-col>
- <el-col class="search_thing" :span="6">
- <div class="search_label"><span class="required-span">* </span>宸ョ▼鍚嶇ОEN锛�</div>
- <div class="search_input">
- <el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="addObj.engineeringEn" :readonly="active>1"></el-input>
- </div>
- </el-col>
- <el-col class="search_thing" :span="6">
- <div class="search_label"><span class="required-span">* </span>鐢熶骇鍗曚綅锛�</div>
- <div class="search_input">
- <el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="addObj.production" :readonly="active>1"></el-input>
- </div>
- </el-col>
- <el-col class="search_thing" :span="6">
- <div class="search_label"><span class="required-span">* </span>鐢熶骇鍗曚綅EN锛�</div>
- <div class="search_input">
- <el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="addObj.productionEn" :readonly="active>1"></el-input>
+ <el-input size="small" :placeholder="active>1 ? '' : '璇疯緭鍏�'" clearable v-model="addObj.prepareUser" :readonly="active>1"></el-input>
</div>
</el-col>
<el-col class="search_thing" :span="6" style="align-items: flex-start;margin: 8px 0;">
<div class="search_label">澶囨敞锛�</div>
<div class="search_input">
- <el-input type="textarea" :autosize="{ minRows: 2, maxRows: 2}" size="small" clearable
+ <el-input type="textarea" :autosize="{ minRows: 2, maxRows: 2}" size="small" clearable :placeholder="active>1 ? '' : '璇疯緭鍏�'"
v-model="addObj.remark" :readonly="active>1"></el-input>
</div>
</el-col>
+ <!-- <el-col class="search_thing" :span="6" v-if="active==1">
+ <div class="search_label">RTS锛�</div>
+ <div class="search_input">
+ <el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="RTS"></el-input>
+ </div>
+ </el-col> -->
</el-row>
</div>
- <div v-show="!configShow">
+ <div v-show="!configShow&&!equipConfigShow&&!cableConfigShow">
+ <div class="search" v-if="active==1" style="display: flex;background: transparent;">
+ <div class="search_thing">
+ <div class="search_label">鏍峰搧鍨嬪彿锛�</div>
+ <div class="search_input">
+ <el-select v-model="model" :placeholder="active>1 ? '' : '璇疯緭鍏�'" filterable allow-create default-first-option size="small"
+ @change="changeModel">
+ <el-option v-for="item in models" :key="item.value" :label="item.label" :value="item.value">
+ </el-option>
+ </el-select>
+ </div>
+ </div>
+ <div class="search_thing">
+ <div class="search_label">妫�楠屾爣鍑嗭細</div>
+ <div class="search_input">
+ <el-select v-model="standardMethodListId" :placeholder="active>1 ? '' : '璇疯緭鍏�'" size="small" @focus="methodFocus"
+ :loading="methodLoad" @change="changeStandardMethodListId">
+ <el-option v-for="item in methods" :key="item.id" :label="item.code" :value="item.id">
+ </el-option>
+ </el-select>
+ </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-top: 10px;">
<el-table-column type="selection" width="60" :selectable="selectable" v-if="active==1"></el-table-column>
@@ -314,27 +401,12 @@
<template slot-scope="scope">
<el-select v-model="scope.row.standardMethodListId" :disabled="scope.row.model==null||active>1"
placeholder="妫�楠屾爣鍑�" size="small" :loading="methodLoad" @change="(value)=>methodChange(value, scope.row)"
- @focus="methodFocus" :readonly="active>1" style="width: 100%;">
+ @focus="methodFocus" :readonly="active>1" style="width: 100%;" clearable @clear="productList = []">
<el-option v-for="item in methods" :key="item.id" :label="item.code" :value="item.id">
</el-option>
</el-select>
</template>
</el-table-column>
- <!-- <el-table-column prop="unit" label="鍗曚綅" align="center" min-width="100">
- <template slot-scope="scope">
- <el-select v-model="scope.row.unit" clearable size="small" style="width: 100%;" :disabled="active>1">
- <el-option v-for="(a, i) in units" :key="i" :label="a.label" :value="a.value"></el-option>
- </el-select>
- </template>
- </el-table-column> -->
- <!-- <el-table-column prop="isLeave" label="鏄惁鐣欐牱" align="center" min-width="100">
- <template slot-scope="scope">
- <el-select v-model="scope.row.isLeave" size="small" :disabled="active>1">
- <el-option label="鐣欐牱" :value="1"></el-option>
- <el-option label="涓嶇暀鏍�" :value="0"></el-option>
- </el-select>
- </template>
- </el-table-column> -->
<el-table-column prop="joinName" label="閰嶅鏍峰搧鍚嶇О" width="140" align="center" v-if="addObj.mating==1">
<template slot-scope="scope">
<el-input size="small" type="textarea" :autosize="{ minRows: 1, maxRows: 1}"
@@ -353,33 +425,82 @@
:controls="false" style="width: 80%;"></el-input-number>
</template>
</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-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></el-table-column>
+ <el-table-column prop="inspectionItem" label="妫�楠岄」" min-width="140" show-overflow-tooltip>
+ <template slot="header" slot-scope="scope">
+ <div style="display: flex;align-items: center;flex-direction: column;font-size: 14px">
+ <span>妫�楠岄」</span>
+ <el-input
+ v-if="active==1"
+ v-model="inspectionItem"
+ @input="searchFilterList"
+ size="mini"
+ placeholder="璇疯緭鍏�"/>
+ </div>
+ </template>
+ </el-table-column>
<el-table-column prop="inspectionItemSubclass" label="妫�楠岄」瀛愰」" min-width="140"
- show-overflow-tooltip></el-table-column>
- <el-table-column prop="sonLaboratory" label="瀛愬疄楠屽" width="130" show-overflow-tooltip :filters="filters"
- :filter-method="filterHandler"></el-table-column>
+ show-overflow-tooltip>
+ <template slot="header" slot-scope="scope">
+ <div style="display: flex;align-items: center;flex-direction: column;font-size: 14px">
+ <span>妫�楠岄」瀛愰」</span>
+ <el-input
+ v-if="active==1"
+ v-model="inspectionItemSubclass"
+ @input="searchFilterList"
+ size="mini"
+ placeholder="璇疯緭鍏�"/>
+ </div>
+ </template>
+ </el-table-column>
+ <el-table-column prop="sonLaboratory" label="瀛愬疄楠屽" min-width="130" show-overflow-tooltip :filters="filters"
+ :filter-method="filterHandler"></el-table-column>
<el-table-column prop="methodS" label="璇曢獙鏂规硶" min-width="120" show-overflow-tooltip>
+ <template slot="header" slot-scope="scope">
+ <div style="display: flex;align-items: center;flex-direction: column;font-size: 14px">
+ <span>璇曢獙鏂规硶</span>
+ <el-input
+ v-if="active==1"
+ v-model="methodS"
+ @input="searchFilterList"
+ size="mini"
+ placeholder="璇疯緭鍏�"/>
+ </div>
+ </template>
</el-table-column>
<el-table-column prop="unit" label="璁￠噺鍗曚綅" width="100" show-overflow-tooltip></el-table-column>
<el-table-column prop="price" label="鍗曚环" width="100" show-overflow-tooltip></el-table-column>
- <el-table-column prop="manDay" label="棰勮鏃堕棿(澶�)" width="120" show-overflow-tooltip></el-table-column>
- <el-table-column prop="manHour" label="宸ユ椂绯绘暟" width="100" show-overflow-tooltip></el-table-column>
+ <!-- <el-table-column prop="manDay" label="棰勮鏃堕棿(澶�)" width="120" show-overflow-tooltip></el-table-column>
+ <el-table-column prop="manHour" label="宸ユ椂绯绘暟" width="100" show-overflow-tooltip></el-table-column> -->
<!-- <el-table-column prop="deviceGroup" label="璁惧缁�" width="120" show-overflow-tooltip></el-table-column> -->
- <el-table-column prop="section" label="鍖洪棿" width="120" show-overflow-tooltip></el-table-column>
+ <el-table-column prop="section" label="鍖洪棿" min-width="120" show-overflow-tooltip></el-table-column>
<el-table-column prop="ask" label="瑕佹眰鍊�" min-width="220px">
<template slot-scope="scope">
<el-input size="small" placeholder="瑕佹眰鍊�" v-model="scope.row.ask" clearable type="textarea"
- :autosize="{ minRows: 1, maxRows: 3}" @change="e=>requestChange(e,scope.row)" :readonly="active>1"></el-input>
+ :autosize="{ minRows: 1, maxRows: 3}" @change="e=>requestChange(e,scope.row)"
+ v-if="active==1&&isAskOnlyRead"></el-input>
+ <span v-else>
+ <!-- <template v-if="(scope.row.ask.indexOf('D')>-1
+ ||scope.row.ask.indexOf('W')>-1
+ ||scope.row.ask.indexOf('X')>-1
+ ||scope.row.ask.indexOf('RTS')>-1
+ ||scope.row.ask.indexOf('H')>-1
+ ||scope.row.ask.indexOf('L')>-1)&&active==1">
+ <input class="askRts" v-model="scope.row.rts" /><br />{{ scope.row.ask }}
+ </template>
+ <template v-else>{{ scope.row.ask }}</template> -->
+ <template >{{ scope.row.ask }}</template>
+ </span>
</template>
</el-table-column>
</el-table>
</div>
- <el-dialog title="閫夋嫨瀹㈡埛" :visible.sync="selectUserDia" width="70%">
+ <el-dialog title="閫夋嫨鍗曚綅" :visible.sync="selectUserDia" width="70%">
<div class="body" style="height: 60vh;" v-if="selectUserDia">
<ValueTable ref="ValueTable2" :url="$api.user.selectCustomPageList" :componentData="componentData2" />
</div>
@@ -389,7 +510,7 @@
</span>
</el-dialog>
<el-dialog title="閫夋嫨鏍峰搧" :visible.sync="selectStandardTree" width="400px">
- <div class="body" style="height: 60vh;overflow-y: auto;" v-if="selectStandardTree">
+ <div class="body" style="height: 60vh;overflow-y: auto;user-select: none;" v-if="selectStandardTree">
<el-row>
<el-col :span="24">
<el-input placeholder="杈撳叆鍏抽敭瀛楄繘琛屾悳绱�" suffix-icon="el-icon-search" v-model="search" size="small"
@@ -399,7 +520,7 @@
</el-row>
<el-tree :data="list" ref="tree" :props="{ children: 'children', label: 'label' }" node-key="label"
:filter-node-method="filterNode" @node-click="handleNodeClick" highlight-current @node-expand="nodeOpen"
- @node-collapse="nodeClose" :default-expanded-keys="expandedKeys">
+ @node-collapse="nodeClose" :default-expanded-keys="expandedKeys" @dblclick.native="activeStandardTree">
<div class="custom-tree-node" slot-scope="{ node, data }">
<el-row>
<el-col :span="24">
@@ -414,71 +535,6 @@
<span slot="footer" class="dialog-footer">
<el-button @click="selectStandardTree = false">鍙� 娑�</el-button>
<el-button type="primary" @click="activeStandardTree">纭� 瀹�</el-button>
- </span>
- </el-dialog>
- <el-dialog title="娣诲姞鏍峰搧" :visible.sync="addSampleDia" width="400px">
- <div class="body" style="max-height: 60vh;">
- <el-row>
- <el-col class="search_thing" :span="22">
- <div class="search_label"><span class="required-span">* </span>鏍峰搧鍚嶇О锛�</div>
- <div class="search_input">
- <el-input readonly size="small" v-model="sample.sample">
- <template slot="append"><el-button slot="append" icon="el-icon-search"
- @click="selectStandardTree = true"></el-button></template>
- </el-input>
- </div>
- </el-col>
- <el-col class="search_thing" :span="22">
- <div class="search_label"><span class="required-span">* </span>宸ュ巶鍚嶇О锛�</div>
- <div class="search_input">
- <el-input size="small" clearable disabled v-model="sample.factory"></el-input>
- </div>
- </el-col>
- <el-col class="search_thing" :span="22">
- <div class="search_label"><span class="required-span">* </span>瀹為獙瀹ゅ悕绉帮細</div>
- <div class="search_input">
- <el-input size="small" clearable disabled v-model="sample.laboratory"></el-input>
- </div>
- </el-col>
- <el-col class="search_thing" :span="22">
- <div class="search_label"><span class="required-span">* </span>鏍峰搧绫诲瀷锛�</div>
- <div class="search_input">
- <el-input size="small" clearable disabled v-model="sample.sampleType"></el-input>
- </div>
- </el-col>
- <el-col class="search_thing" :span="22">
- <div class="search_label"><span class="required-span">* </span>瑙勬牸鍨嬪彿锛�</div>
- <div class="search_input">
- <el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="sample.model"></el-input>
- </div>
- </el-col>
- <el-col class="search_thing" :span="22">
- <div class="search_label">鏍峰搧缂栧彿锛�</div>
- <div class="search_input">
- <el-input v-model="sample.sampleCode" size="small" placeholder="璇疯緭鍏�" clearable></el-input>
- </div>
- </el-col>
- <el-col class="search_thing" :span="24">
- <div class="search_label">鏍峰搧鏁伴噺锛�</div>
- <div class="search_input">
- <el-input-number size="small" v-model="sample.sampleNum" :min="1" :max="100" :precision="0"
- style="width: 50%;"></el-input-number>
- </div>
- </el-col>
- <el-col class="search_thing" :span="22">
- <div class="search_label">鏍峰搧鐣欐牱锛�</div>
- <div class="search_input">
- <el-radio-group v-model="sample.isLeave">
- <el-radio :label="1">鐣欐牱</el-radio>
- <el-radio :label="0">涓嶇暀鏍�</el-radio>
- </el-radio-group>
- </div>
- </el-col>
- </el-row>
- </div>
- <span slot="footer" class="dialog-footer">
- <el-button @click="addSampleDia = false">鍙� 娑�</el-button>
- <el-button type="primary" @click="onSample()" :loading="getProductLoad">纭� 瀹�</el-button>
</span>
</el-dialog>
<el-dialog title="淇濆瓨妯℃澘" :visible.sync="templateDia" width="400px">
@@ -507,7 +563,7 @@
<el-col class="search_thing" :span="22">
<div class="search_label"><span class="required-span" v-if="addObj.type == 2">* </span>鎸囨淳浜哄憳锛�</div>
<div class="search_input">
- <el-select v-model="distributeData.userId" placeholder="璇烽�夋嫨" size="small" style="width: 100%;">
+ <el-select v-model="distributeData.userId" placeholder="璇烽�夋嫨" size="small" filterable style="width: 100%;">
<el-option v-for="item in personList" :key="item.value" :label="item.label" :value="item.value">
</el-option>
</el-select>
@@ -540,17 +596,264 @@
</el-row>
</span>
</el-dialog>
- <fiberOpticConfig :currentId="currentId" v-if="configShow"/>
+ <fiberOpticConfig :currentId="currentId" @saveFiberopticConfig="getTotal()" v-if="configShow" :active="active" />
+ <equipConfig :currentId="currentId" v-if="equipConfigShow" :active="active" />
+ <cableConfig v-if="cableConfigShow" :active="active" />
+<!-- 鍗曢�夌壒娈婂�煎鐞嗘-->
+ <el-dialog title="妫�娴嬪埌鐗规畩椤癸紝璇蜂綔鍑轰互涓嬮�夋嫨" :visible.sync="bsm1Dia" width="500px" :show-close="false"
+ :before-close="beforeClose">
+ <div class="body" style="max-height: 60vh;">
+ <el-row v-if="bsm1">
+ <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 :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">
+ <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="妫�娴嬪埌鐗规畩椤癸紝璇蜂綔鍑轰互涓嬮�夋嫨" :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>娓╁害鐐归泦鍚�(璇锋寜鐓ч『搴忓～鍐欙紝20鈩冨繀椤讳负棣栦綅)</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 type="primary" @click="spliceData">淇濆瓨</el-button>
+ </span>
+ </el-dialog>
</div>
</template>
<script>
- import ValueTable from '../../tool/value-table.vue'
- import fiberOpticConfig from './fiberoptic-config.vue'
- export default {
+import ValueTable from '../../tool/value-table.vue'
+import fiberOpticConfig from './fiberoptic-config.vue'
+import equipConfig from './equip-config.vue'
+import cableConfig from './cable-config.vue'
+import Vue from 'vue'
+import {iuCharts} from "../../../util/echarts";
+
+export default {
components: {
ValueTable,
- fiberOpticConfig
+ fiberOpticConfig,
+ equipConfig,
+ cableConfig
},
props: {
active: {
@@ -564,6 +867,7 @@
},
data() {
return {
+ editTable:[],
template: null,
templates: [],
addObj: {
@@ -595,6 +899,8 @@
engineeringEn: null,
production: null,
productionEn: null,
+ companyId: null,
+ prepareUser:null
},
sample: {
sampleCode: null,
@@ -647,7 +953,10 @@
addSampleDia: false,
count: 1,
productList: [],
+ productList0: [],
+ bsm1DiaList: [],
productIds: [],
+ productListSelected: [],
getProductLoad: false,
saveLoad: false,
templateDia: false,
@@ -671,12 +980,88 @@
filters: [],
formType: [],
configShow: false,
+ currentMethod: null,
+ isAskOnlyRead: false,
+ sampleId: null,
+ 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,
+ total: 0,
+ RTS: '',
+ totalArr: [],
+ model: null,
+ standardMethodListId: null,
+ symbolList:[
+ 'RTS','A','B','C','D','E','F','G','H','I','J','K','L','M','N','O','P','Q','R','S','T','U','V','W','X','Y','Z'],
+ 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: '锛�'},
+ ]
}
},
watch: {
sampleList() {
this.addObj.method = null
this.productList = []
+ },
+ productList: {
+ deep: true,
+ handler(val) {
+ if (val && val.length > 0) {
+ let arr = [];
+ val.forEach(item => {
+ if (item.sonLaboratory && !arr.find(a => a.value == item.sonLaboratory)) {
+ arr.push({
+ text: item.sonLaboratory,
+ value: item.sonLaboratory
+ })
+ }
+ })
+ this.filters = arr
+ }
+ }
+ },
+ sampleList: {
+ deep: true,
+ handler(val) {
+ this.getTotal()
+ }
+ },
+ 'addObj.sample'(val) {
+ this.model = null
+ this.standardMethodListId = null
+ },
+ 'addObj.sampleNum'(val) {
+ this.model = null
+ this.standardMethodListId = null
}
},
mounted() {
@@ -688,7 +1073,7 @@
this.selectEnumByCategoryForUnit()
this.selectStandardMethods()
this.selectEnumByCategoryForOrderType()
- this.selectEnumByCategoryForSonLaboratory()
+ // this.selectEnumByCategoryForSonLaboratory()
this.selectEnumByCategoryForSampleForm()
if (this.active != 1) {
// 鏌ョ湅/瀹℃牳娴佺▼
@@ -701,11 +1086,12 @@
};
this.addObj.type = String(this.addObj.type)
this.sampleList = this.HaveJson(res.data.sampleProduct);
+ this.getProNum()
this.addObj.sampleNum = this.sampleList.length
this.$nextTick(() => {
this.$refs.sampleTable.doLayout()
- if(this.addObj.sampleNum>0){
- this.$refs.sampleTable.setCurrentRow(this.sampleList[0],true)
+ if (this.addObj.sampleNum > 0) {
+ this.$refs.sampleTable.setCurrentRow(this.sampleList[0], true)
this.rowClick(this.sampleList[0])
}
})
@@ -713,6 +1099,167 @@
}
},
methods: {
+ spliceData () {
+ if (!this.circulateForm.entrustNum || !this.circulateForm.entrustTime || !this.circulateForm.entrustPoint || this.opticalProjectList.length === 0 || this.temperatureData.length === 0) {
+ this.$message.error('璇峰～鍐欏畬鏁存暟鎹�')
+ return
+ }
+ // 鎷兼帴瑕佹眰鍊糰sk
+ const opticalProjectList = JSON.parse(JSON.stringify(this.opticalProjectList))
+ opticalProjectList.forEach(o => {
+ o.temperatureData.forEach(t => {
+ if (!t.temperaturePoint || !t.askSymbol || !t.askNum) {
+ throw this.$message.error('璇峰～鍐欏畬鏁存暟鎹�')
+ }
+ })
+ })
+ let entrustTime = this.circulateForm.entrustTime
+ let entrustNum = this.circulateForm.entrustNum
+ let opticalProjectList2 = JSON.parse(JSON.stringify(this.opticalProjectList))
+ let askArr = []
+ let opticalProjectArr = []
+ opticalProjectList.forEach(o => {
+ opticalProjectArr.push(o.value)
+ o.temperatureData.unshift({temperaturePoint: 20})
+ o.temperatureData.forEach(t => {
+ if (!t.askSymbol) {
+ const askObj = t.temperaturePoint + '鈩�' + ',' + o.value + ',' + null
+ askArr.push(askObj)
+ } else {
+ const askObj = t.temperaturePoint + '鈩�' + ',' + o.value + ',' + t.askSymbol + t.askNum
+ askArr.push(askObj)
+ }
+ })
+ })
+ askArr.push(this.circulateForm.entrustNum)
+ const ask = askArr.join(';')
+ // 鎷兼帴瑕佹眰鎻忚堪tell
+ let askNum = []
+ let temperaturePointList = []
+ let temperaturePointList2 = []
+ entrustTime = entrustTime + 'h'
+ entrustNum = entrustNum + '娆�'
+ opticalProjectList2.forEach(o => {
+ o.temperatureData.forEach(t => {
+ t.temperaturePoint = t.temperaturePoint + '鈩�'
+ temperaturePointList2.push(t.temperaturePoint)
+ temperaturePointList.push(t.temperaturePoint)
+ askNum.push(t.askSymbol + t.askNum + 'dB/Km')
+ })
+ })
+ temperaturePointList = Array.from(new Set(temperaturePointList))
+ temperaturePointList2 = Array.from(new Set(temperaturePointList2))
+ temperaturePointList2.unshift(20 + '鈩�')
+ let additionArr = []
+ askNum.forEach(a => {
+ additionArr.push(temperaturePointList.join(',') + a)
+ })
+ additionArr = Array.from(new Set(additionArr))
+ const tell = '娓╁害鑼冨洿:' + temperaturePointList2.join(',') + ';' + '淇濇俯鏃堕棿:' + entrustTime + ';' + '寰幆娆℃暟:'
+ + entrustNum + ';' + '鍏夌氦(' + opticalProjectArr.join(',') + ')' + '闄勫姞琛板噺缁濆鍊�:' + additionArr.join(';')
+ this.productList.forEach(item => {
+ if (item.inspectionItem === '娓╁害寰幆') {
+ item.ask = ask
+ item.tell = tell
+ }
+ })
+ console.log('ask---', ask)
+ console.log('tell---', tell)
+ this.circulateShow = false
+ },
+ beforeCirculateShowClose () {
+ if (!this.circulateForm.entrustNum || !this.circulateForm.entrustTime || !this.circulateForm.entrustPoint || this.opticalProjectList.length === 0 || this.temperatureData.length === 0) {
+ this.$message.error('璇峰～鍐欏畬鏁存暟鎹�')
+ return
+ }
+ let temperaturePoint1 = JSON.parse(JSON.stringify(this.temperatureData))
+ temperaturePoint1.forEach(t => {
+ if (!t.temperaturePoint || !t.askSymbol || !t.askNum) {
+ throw this.$message.error('璇峰～鍐欏畬鏁存暟鎹�')
+ }
+ })
+ },
+ handleSelectionChange(val) {
+ this.opticalProjectList = val;
+ },
+ selectAllOptical (val) {
+ if (val.length > 0) {
+ if (val[val.length-1].temperatureData) {
+ this.temperatureData = this.HaveJson(val.temperatureData)
+ } else {
+ this.temperatureData = []
+ }
+ } else {
+ this.temperatureData = []
+ }
+ this.circulateForm.entrustPoint = this.temperatureData.length
+ },
+ selectOpticalProject (val) {
+ if (val.temperatureData) {
+ this.temperatureData = this.HaveJson(val.temperatureData)
+ } else {
+ this.temperatureData = []
+ }
+ this.circulateForm.entrustPoint = this.temperatureData.length
+ },
+ rowClickOptical (val) {
+ const index = this.opticalProjectList.findIndex(item => item.value === val.value)
+ if (index > -1 && val.temperatureData) {
+ this.temperatureData = this.HaveJson(val.temperatureData)
+ }
+ this.circulateForm.entrustPoint = this.temperatureData.length
+ },
+ changeTemperature () {
+ this.opticalProjectList.forEach(item => {
+ item.temperatureData = this.HaveJson(this.temperatureData)
+ })
+ },
+ addTemperatureData () {
+ const obj = {}
+ this.temperatureData.push(obj)
+ this.circulateForm.entrustPoint = this.temperatureData.length
+ },
+ deleteTemperatureData () {
+ if (this.temperatureData.length > 0) {
+ this.temperatureData = this.temperatureData.slice(0,-1)
+ }
+ this.circulateForm.entrustPoint = this.temperatureData.length
+ },
+ changeTemperatureData () {
+ const length = this.temperatureData.length
+ const entrustPoint = Number(this.circulateForm.entrustPoint)
+ if (entrustPoint > length) {
+ for (let i = 0; i < (entrustPoint - length); i++) {
+ const obj = {}
+ this.temperatureData.push(obj)
+ }
+ } else if (entrustPoint < length) {
+ const deleteNum = length - entrustPoint
+ this.temperatureData = this.temperatureData.slice(0,-deleteNum)
+ }
+ },
+ searchFilterList () {
+ const vtw = {
+ inspectionItem: this.inspectionItem, // 妫�楠岄」
+ inspectionItemSubclass: this.inspectionItemSubclass, // 妫�楠岄」瀛愰」
+ methodS: this.methodS, // 璇曢獙鏂规硶
+ }
+ const isHaveValue = Object.values(vtw).some(item => {
+ return item
+ })
+ if (isHaveValue) {
+ for(let i in vtw) {
+ if (vtw[i]) {
+ this.productList = this.productList0.filter((item) => {
+ return item[i] && item[i].includes(vtw[i])
+ })
+ }
+ }
+ } else {
+ // 娌℃湁鏌ヨ鏉′欢鏃舵覆鏌撴墍鏈夋暟鎹�
+ this.productList = this.productList0
+ }
+ },
getAuthorizedPerson() {
this.$axios.get(this.$api.user.getUserMenu).then(res => {
let data = []
@@ -738,19 +1285,66 @@
this.$message.error('鏈�夋嫨鏁版嵁')
return
}
- delete selects['orderBy']
- delete selects['updateUser']
- delete selects['updateTime']
- this.addObj.userId = selects.id
this.addObj.company = selects.company
- this.addObj.custom = selects.name
this.addObj.code = selects.code
- this.addObj.phone = selects.phone
+ this.addObj.companyId = selects.id
this.selectUserDia = false
},
+ containsValue(str) {
+ if(str){
+ let symbolItem = ''
+ this.symbolList.some(value =>{
+ if(str.includes(value)){
+ symbolItem = value
+ return true
+ }
+ })
+ return symbolItem
+ }
+ },
+ handleAsk(ask,symbolItem, value) {
+ try{
+ let code = [">", "<", "=", "锛�", "锛�", "鈮�", "鈮�", "卤"];
+ if (ask.includes('&')) {
+ // 澶氫釜鏉′欢
+ let arr0 = ask.split('&')
+ let arr1 = []
+ arr0.forEach(m => {
+ let index = code.findIndex(b => m.includes(b))
+ if (index > -1) {
+ let arr = m.split(code[index]).filter(b => !!b)
+ let num = eval(this.replaceAll(arr[0], symbolItem, value))
+ m = code[index] + '' + num
+ arr1.push(m)
+ }
+ })
+ return arr1.join('&')
+ } else {
+ // 鍗曚釜鏉′欢
+ let index = code.findIndex(b => ask.includes(b))
+ if (index > -1) {
+ let arr = ask.split(code[index]).filter(b => !!b)
+ let num = eval(this.replaceAll(arr[0], symbolItem, value))
+ return code[index] + '' + num
+ }
+ }
+ }catch(e){}
+ },
+ handleTell(tell,symbolItem, value){
+ try{
+ let num = this.replaceAll(tell, symbolItem, value)
+ return num
+ }catch(e){}
+ },
+ replaceAll(str,find,value) {
+ if (str === undefined) {
+ return str
+ }
+ return str.replace(find, value);
+ },
save() {
- if (!this.addObj.custom) {
- this.$message.error('鏈�夋嫨涓嬪崟瀹㈡埛')
+ if (!this.addObj.companyId) {
+ this.$message.error('鏈�夋嫨瀹㈡埛鍗曚綅')
return
}
if (!this.addObj.type) {
@@ -759,13 +1353,9 @@
this.$message.error('璇疯緭鍏ユ潵鏍锋柟寮�')
} else if (!this.addObj.orderType) {
this.$message.error('璇烽�夋嫨妫�楠岀被鍒�')
- }else if (!this.addObj.engineering) {
- this.$message.error('璇疯緭鍏ュ伐绋嬪悕绉�')
- } else if (!this.addObj.engineeringEn) {
- this.$message.error('璇疯緭鍏ュ伐绋嬪悕绉癊N')
- }else if (!this.addObj.production) {
+ } else if (!this.addObj.production) {
this.$message.error('璇疯緭鍏ョ敓浜у崟浣�')
- }else if (!this.addObj.productionEn) {
+ } else if (!this.addObj.productionEn) {
this.$message.error('璇疯緭鍏ョ敓浜у崟浣岴N')
} else if (this.sampleList.length < 1) {
this.$message.error('璇锋坊鍔犱竴涓牱鍝�')
@@ -776,31 +1366,288 @@
} else if (!this.sampleList.every(m => m.standardMethodListId)) {
this.$message.error('璇烽�夋嫨妫�楠屾爣鍑�')
} else {
- this.saveLoad = true
- this.$axios.post(this.$api.insOrder.addInsOrder, {
- insOrder: this.addObj,
- list: JSON.stringify(this.sampleList.map(a=>{
- a.model = a.model + ((a.modelNum==null||a.modelNum==''||a.modelNum=='null')?'':('-'+a.modelNum))
- return a
- }))
- }, {
- headers: {
- 'Content-Type': 'application/json'
+ 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
}
- }).then(res => {
- this.saveLoad = false
- if (res.code == 201) return
- this.$message.success('宸叉彁浜�')
- this.$parent.playOrder(0)
})
+ console.log('isHaveBushing===', isHaveBushing)
+ if (productListSelected && select[2] === '鍏夌紗' && isHaveBushing === false) {
+ this.$message.error('鍏夌紗娓╁害寰幆椤圭洰蹇呴』杩涜鍏夌氦閰嶇疆')
+ return
+ }
+ let sampleList = this.HaveJson(this.sampleList)
+ let projectNum = this.totalArr.filter(a => a.state == 1).length
+ if(projectNum==0){
+ this.$confirm('妫�楠岄」鐩负绌猴紝鏄惁纭鎻愪氦?', "鎻愮ず", {
+ confirmButtonText: "纭畾",
+ cancelButtonText: "鍙栨秷",
+ type: "warning"
+ }).then(() => {
+ this.saveMethod(sampleList)
+ }).catch(() => {})
+ }else{
+ let isRTS = this.totalArr.find(a => a.ask != null && this.symbolList.find(b=>a.ask.includes(b)) && a.state == 1)
+ if (isRTS) {
+ this.editTable = this.handleData(sampleList,this.containsValue, 0)
+ this.editTable.forEach(item => {
+ item.value = item.modelNum
+ })
+ this.bsm3Dia = true;
+ return
+ }
+ this.saveMethod(sampleList)
+ }
}
+ },
+ save0(){
+ if(this.editTable.every(m=>m.value)){
+ let sampleList = this.handleData(this.HaveJson(this.sampleList),this.handleAsk,1)
+ this.saveMethod(sampleList)
+ }else{
+ this.$message.error('璇峰～鍐欒瘑鍒鍊�')
+ }
+ },
+ handleData(sampleList,calBack,type){
+ let editTable = []
+ sampleList.forEach(item => {
+ let obj = {
+ sampleCode:item.sampleCode,
+ model:item.model,
+ symbolList:[],
+ sampleId:item.id,
+ modelNum:item.modelNum,
+ }
+ if (item.insProduct && item.insProduct.length > 0) {
+ item.insProduct.forEach(a => {
+ if (a.state == 1) {
+ if(type==0){
+ let str = calBack(a.ask)
+ str&&obj.symbolList.push({
+ symbolItem:str,
+ inspectionItem:a.inspectionItem,
+ })
+ }else if(type==1){
+ let arr = this.editTable.filter(b => b.sampleId == item.id)
+ for (var i=0;i<arr.length;i++){
+ if(a.ask){
+ if(a.ask.includes(arr[i].symbolItem)){
+ let ask = calBack(a.ask, arr[i].symbolItem,arr[i].value)
+ if (ask) {
+ a.ask = ask
+ }
+ let tell = this.handleTell(a.tell, arr[i].symbolItem,arr[i].value)
+ if (tell) {
+ a.tell = tell
+ }
+ }
+ }else{
+ this.$message.error('瑕佹眰鍊间负绌猴紝闇�瑕佸幓鏍囧噯搴撶淮鎶わ紒')
+ }
+ }
+ // arr.forEach(f => {
+ // if(a.ask){
+ // if(a.ask.includes(f.symbolItem)){
+ // let ask = calBack(a.ask, f.symbolItem,f.value)
+ // if (ask) {
+ // a.ask = ask
+ // }
+ // let tell = this.handleTell(a.tell, f.symbolItem,f.value)
+ // if (tell) {
+ // a.tell = tell
+ // }
+ // }
+ // }else{}
+ // })
+ }
+ }
+ })
+ }
+ // 鍏夌氦甯﹂」鐩�
+ if (item.bushing && item.bushing.length > 0) {
+ item.bushing.forEach(a => {
+ if (a.fiber && a.fiber.length > 0) {
+ a.fiber.forEach(b => {
+ if (b.productList && b.productList.length > 0) {
+ b.productList.forEach(c => {
+ if (c.state == 1) {
+ if(type==0){
+ let str = calBack(c.ask)
+ str&&obj.symbolList.push({
+ symbolItem:str,
+ inspectionItem:c.inspectionItem,
+ })
+ }else if(type==1){
+ let arr = this.editTable.filter(b => b.sampleId == item.id)
+ arr.forEach(f => {
+ if(c.ask.includes(f.symbolItem)){
+ let ask = calBack(c.ask, f.symbolItem,f.value)
+ if (ask) {
+ c.ask = ask
+ }
+ let tell = this.handleTell(c.tell, f.symbolItem,f.value)
+ if (tell) {
+ c.tell = tell
+ }
+ }
+ })
+ }
+ }
+ })
+ }
+ })
+ }
+ if (a.fibers && a.fibers.length > 0) {
+ a.fibers.forEach(b => {
+ if (b.productList && b.productList.length > 0) {
+ b.productList.forEach(c => {
+ if (c.state == 1) {
+ if(type==0){
+ let str = calBack(c.ask)
+ str&&obj.symbolList.push({
+ symbolItem:str,
+ inspectionItem:c.inspectionItem,
+ })
+ }else if(type==1){
+ // let ask = calBack(c.ask, c.rts)
+ // if (ask && c.state == 1) {
+ // c.ask = csk
+ // }
+ let arr = this.editTable.filter(b => b.sampleId == item.id)
+ arr.forEach(f => {
+ if(c.ask.includes(f.symbolItem)){
+ let ask = calBack(c.ask, f.symbolItem,f.value)
+ if (ask) {
+ c.ask = ask
+ }
+ let tell = this.handleTell(c.tell, f.symbolItem,f.value)
+ if (tell) {
+ c.tell = tell
+ }
+ }
+ })
+ }
+ }
+ })
+ }
+ if (b.fiber && b.fiber.length > 0) {
+ b.fiber.forEach(c => {
+ if (c.productList && c.productList.length > 0) {
+ c.productList.forEach(d => {
+ if (d.state == 1) {
+ if(type==0){
+ let str = calBack(d.ask)
+ str&&obj.symbolList.push({
+ symbolItem:str,
+ inspectionItem:d.inspectionItem,
+ })
+ }else if(type==1){
+ // let ask = calBack(d.ask, d.rts)
+ // if (ask && d.state == 1) {
+ // d.ask = ask
+ // }
+ let arr = this.editTable.filter(b => b.sampleId == item.id)
+ arr.forEach(f => {
+ if(d.ask.includes(f.symbolItem)){
+ let ask = calBack(d.ask, f.symbolItem,f.value)
+ if (ask) {
+ d.ask = ask
+ }
+ let tell = this.handleTell(d.tell, f.symbolItem,f.value)
+ if (tell) {
+ d.tell = tell
+ }
+ }
+ })
+ }
+ }
+ })
+ }
+ })
+ }
+ })
+ }
+ })
+ }
+ if(type==0){
+ editTable.push(obj)
+ }
+ })
+ if(type==0){
+ editTable.forEach(a => {
+ a.symbolList.forEach(b => {
+ let arr = a.symbolList.filter(c => c.symbolItem == b.symbolItem);
+ b.inspectionItemList = arr.map(c => c.inspectionItem).join(',')
+ })
+ })
+ editTable.forEach(a => {
+ let mySet = new Set();
+ a.symbolList = a.symbolList.filter(b =>{
+ let num0 = mySet.size;
+ mySet.add(b.symbolItem);
+ let num1 = mySet.size;
+ if(num0!=num1){
+ return true;
+ }else{
+ return false
+ }
+ })
+ })
+ let editTableNew = []
+ editTable.forEach(a => {
+ a.symbolList.forEach(b => {
+ let obj = {
+ sampleCode:a.sampleCode,
+ model:a.model,
+ symbolItem:b.symbolItem,
+ sampleId:a.sampleId,
+ value:null,
+ inspectionItemList:b.inspectionItemList,
+ modelNum:a.modelNum,
+ }
+ editTableNew.push(obj)
+ })
+ })
+ return editTableNew
+ }else{
+ return sampleList
+ }
+ },
+ saveMethod(sampleList){
+ this.saveLoad = true
+ this.$axios.post(this.$api.insOrder.addInsOrder, {
+ str: JSON.stringify({
+ insOrder: this.addObj,
+ list: JSON.stringify(sampleList.map(a => {
+ a.model = a.model + ((a.modelNum == null || a.modelNum == '' || a.modelNum == 'null') ?
+ '' : (
+ '-' + a.modelNum))
+ a.insProduct = a.insProduct.filter(b=>b.state === 1)
+ return a
+ })),
+ pairing: JSON.stringify(this.bsm2Val2)
+ })
+ }).then(res => {
+ this.saveLoad = false
+ if (res.code == 201) return
+ this.$message.success('宸叉彁浜�')
+ this.bsm3Dia = false;
+ this.$parent.playOrder(0)
+ }).catch(e=>{
+ this.saveLoad = false
+ })
},
upInsOrderOfState(state) {
if (state == 1) {
this.saveLoad = true
this.$axios.post(this.$api.insOrder.upInsOrderOfState, {
state,
- id: this.currentId
+ id: this.currentId,
+ companyId:this.addObj.companyId,
+ laboratory:this.addObj.laboratory
}, {
headers: {
'Content-Type': 'application/json'
@@ -809,6 +1656,8 @@
this.saveLoad = false
if (res.code == 201) return
this.$message.success('鎻愪氦鎴愬姛')
+ // this.$parent.multipleSelection = [{id: this.currentId}]
+ // this.$parent.print()
// 濡傛灉绱ф�ョ▼搴︿负绱ф�ワ紝闇�瑕佺洿鎺ヤ笅鍙戜汉鍛�
// if (this.addObj.type == 2) {
// this.issuedDialogVisible = true;
@@ -827,9 +1676,9 @@
this.distributeData.orderId = this.currentId
this.distributeData.appointed = ress.data
})
- setTimeout(()=>{
+ setTimeout(() => {
this.issuedDialogVisible = true;
- },1000)
+ }, 1000)
})
} else {
// 涓嶉�氳繃
@@ -874,7 +1723,16 @@
this.addObj.custom = selects.name
this.addObj.code = selects.code
this.addObj.phone = selects.phone
+ this.addObj.companyId = selects.departId
+ this.addObj.production = '/'
+ this.addObj.productionEn = '/'
})
+ },
+ getProNum() {
+ this.sampleList.forEach((m, i) => {
+ Vue.set(this.sampleList[i], 'proNum', m.insProduct.filter(a => a.state == 1).length)
+ })
+ this.$refs.sampleTable.doLayout()
},
searchFilter() {
this.$refs.tree.filter(this.search)
@@ -885,7 +1743,7 @@
nodeClose(data, node, el) {
$($(el.$el).find('.node_i')[0]).attr('class', 'node_i el-icon-folder')
},
- handleNodeClick(val, node, el) { //鏍戠殑鍊�
+ handleNodeClick(val, node, el) {
this.selectTree = ''
this.models = val.children
this.getNodeParent(node)
@@ -899,12 +1757,16 @@
},
getNodeParent(val) {
if (val.parent != null) {
- this.selectTree += ' - ' + val.label
+ if (val.data.children === null) {
+ this.selectTree += ' - ' + val.label + ' - ' + ''
+ } else {
+ this.selectTree += ' - ' + val.label
+ }
this.getNodeParent(val.parent)
}
},
selectStandardTreeList() {
- this.$axios.get(this.$api.standardTree.selectStandardTreeList).then(res => {
+ this.$axios.get(this.$api.standardTree.selectStandardTreeList2).then(res => {
this.list = res.data
this.list.forEach(a => {
this.expandedKeys.push(a.label)
@@ -917,14 +1779,18 @@
},
activeStandardTree() {
let trees = this.selectTree.split(" - ")
- if (trees.length < 4) {
- this.$message.error('鏈�夋嫨浜у搧')
+ if (trees.length < 3) {
+ this.$message.error('鏈�夋嫨瀵硅薄')
return
}
this.addObj.factory = trees[0]
this.addObj.laboratory = trees[1]
this.addObj.sampleType = trees[2]
- this.addObj.sample = trees[3]
+ if (trees[3] === undefined || trees[3] === '') {
+ this.addObj.sample = trees[2]
+ } else {
+ this.addObj.sample = trees[3]
+ }
this.addObj.model = (trees[4] == undefined ? null : trees[4])
this.selectStandardTree = false
this.sampleList = []
@@ -938,6 +1804,9 @@
this.sample.standardMethodListId = null
this.sample.insProduct = []
this.sample.id = this.count
+ this.sample.childSampleList = []
+ this.sample.insulating = null
+ this.sample.sheath = null
this.sampleList.push(this.HaveJson(this.sample))
this.count++
}
@@ -969,6 +1838,7 @@
addStandardTree() {
if (this.selectTree == null) return
this.sampleList = []
+ this.productList = []
for (var i = 0; i < this.addObj.sampleNum; i++) {
this.sample.joinName = null
this.sample.joinModel = null
@@ -979,63 +1849,20 @@
this.sample.standardMethodListId = null
this.sample.insProduct = []
this.sample.id = this.count
+ this.sample.childSampleList = []
+ this.sample.insulating = null
+ this.sample.sheath = null
this.sampleList.push(this.HaveJson(this.sample))
this.count++
}
+ this.computationalPairing(this.sampleList.length)
+ this.bsm2Val2 = this.HaveJson(this.bsm2Val3)
},
selectSample(val) {
this.sampleIds = []
val.forEach(a => {
this.sampleIds.push(a.id)
})
- },
- onSample() {
- if (this.sample.sample == null || this.sample.sample == '') {
- this.$message.error('璇烽�夋嫨鏍峰搧')
- return
- }
- if (this.sample.model == null || this.sample.model == '') {
- this.$message.error('璇疯緭鍏ユ牱鍝佸瀷鍙�')
- return
- }
- // this.getProductLoad = true
- /* this.$axios.post(this.$api.standardTree.selectStandardProductList, {
- factory: this.sample.factory,
- laboratory: this.sample.laboratory,
- sampleType: this.sample.sampleType,
- sample: this.sample.sample,
- model: this.sample.model
- }, {
- headers: {
- 'Content-Type': 'application/json'
- }
- }).then(res => {
- res.data.forEach(a => {
- a.state = 1
- })
- for (var i = 0; i < this.sample.sampleNum; i++) {
- this.sample.joinName = null
- this.sample.joinModel = null
- this.sample.joinNum = 1
- this.sample.insProduct = res.data
- this.sample.id = this.count
- this.sampleList.push(this.HaveJson(this.sample))
- this.count++
- }
- this.$refs.sampleTable.doLayout()
- this.getProductLoad = false
- this.addSampleDia = false
- this.sample = {
- sampleCode: null,
- laboratory: null,
- factory: null,
- sampleType: null,
- sample: null,
- model: null,
- sampleNum: 1,
- isLeave: 0,
- }
- }) */
},
delSample() {
this.sampleIds.forEach(a => {
@@ -1050,12 +1877,25 @@
this.$refs.sampleTable.doLayout()
},
selectProduct(val) {
+ this.productListSelected = val
this.productIds = []
val.forEach(a => {
this.productIds.push(a.id)
})
},
rowClick(row, column, event) {
+ this.currentMethod = row
+ let obj = this.methods.find(a => a.id == this.currentMethod.standardMethodListId)
+ if (obj && obj.code == '濮旀墭瑕佹眰') {
+ this.isAskOnlyRead = true
+ } else {
+ this.isAskOnlyRead = false
+ }
+ this.sampleId = row.id
+ if (this.active !== 1) {
+ this.sampleIds = []
+ this.sampleIds.push(row.id)
+ }
this.productList = row.insProduct
setTimeout(() => {
this.productList.forEach(a => {
@@ -1067,7 +1907,43 @@
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
+ }
+ /* if (row.ask.includes('D')&&row.state === 1) {
+ this.bsmRow3 = null;
+ row.rts = ''
+ this.bsm3Val = ''
+ this.bsm3Dia = true
+ this.bsmRow3 = row
+ }else{
+ this.bsm3Dia = false
+ } */
this.sampleList.map(item => {
if (this.sampleIds.indexOf(item.id) > -1) {
item.insProduct.map(m => {
@@ -1079,6 +1955,48 @@
}
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;
+ }
+ this.getProNum()
+ },
+ searchProject () {
+ this.$axios.post(this.$api.enums.selectEnumByCategory, {
+ category: "鍏夌氦椤圭洰"
+ }).then(res => {
+ this.opticalProject = res.data
+ })
+ },
+ permute(nums) {
+ const result = [];
+
+ function backtrack(temp, nums) {
+ if (temp.length === 2) {
+ result.push([...temp]);
+ return;
+ }
+ for (let i = 0; i < nums.length; i++) {
+ if (temp.includes(nums[i])) continue;
+ // 閬垮厤閲嶅鏁板瓧
+ if (temp.length > 0 && nums[i] < temp[temp.length - 1]) continue; // 瑙勫畾椤哄簭锛岄伩鍏嶉噸澶嶇粍鍚�
+ temp.push(nums[i]);
+ backtrack(temp, nums);
+ temp.pop();
+ }
+ }
+ backtrack([], nums);
+ return result;
+ },
+ computationalPairing(n) {
+ const nums = [];
+ for (let i = 1; i <= n; i++) {
+ nums.push(i);
+ }
+ this.bsm2Val3 = this.HaveJson(this.permute(nums))
},
tableRowClassName({
row,
@@ -1166,7 +2084,7 @@
category: "妫�楠岀被鍒�"
}).then(res => {
this.orderType = res.data
- if(res.data.length > 0){
+ if (res.data.length > 0) {
this.addObj.orderType = res.data[0].value
}
})
@@ -1176,13 +2094,20 @@
category: "鏉ユ牱鏂瑰紡"
}).then(res => {
this.formType = res.data
- if(this.formType.length > 0){
+ if (this.formType.length > 0) {
this.addObj.formType = this.formType[0].value
}
})
},
methodChange(val, row) {
- if(val===null||val==='')return
+ if (val === null || val === '') return
+ this.currentMethod = row
+ let obj = this.methods.find(a => a.id == this.currentMethod.standardMethodListId)
+ if (obj && obj.code == '濮旀墭瑕佹眰') {
+ this.isAskOnlyRead = true
+ } else {
+ this.isAskOnlyRead = false
+ }
this.getProductLoad = true
this.$axios.post(this.$api.standardTree.selectStandardProductList, {
model: row.model + '-' + row.modelNum,
@@ -1199,6 +2124,7 @@
row.insProduct = this.HaveJson(res.data)
this.getProductLoad = false
this.productList = row.insProduct
+ this.productList0 = JSON.parse(JSON.stringify(this.productList))
this.$refs.sampleTable.setCurrentRow(row)
setTimeout(() => {
this.productList.forEach(a => {
@@ -1206,13 +2132,32 @@
})
}, 200)
})
+ this.searchProject()
+ },
+ changeModel() {
+ this.sampleList.forEach(a => {
+ let obj = this.sampleIds.find(b => b == a.id)
+ if (obj) {
+ a.model = this.model
+ }
+ })
+ },
+ changeStandardMethodListId() {
+ this.sampleList.forEach(a => {
+ let obj = this.sampleIds.find(b => b == a.id)
+ if (obj) {
+ a.standardMethodListId = this.standardMethodListId
+ this.methodChange(this.standardMethodListId, a)
+ }
+ })
},
methodFocus() {
this.selectsStandardMethodByFLSSM()
},
handleChangeModel(e) {
+ this.productList = []
let num = this.selectTree.split('-').length;
- if (num == 4) {
+ if (num != 5) {
this.selectTree = this.selectTree + ' - ' + e
} else {
let arr = this.selectTree.split('-')
@@ -1258,6 +2203,42 @@
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
+ }
+ /* if (p.ask.includes('RTS')&&p.state === 1) {
+ p.rts = ''
+ this.bsm3Val = ''
+ this.bsm3 = true
+ this.bsm3Dia = true
+ this.bsmRow3.push(p)
+ } */
+ })
if (e.length > 0) {
this.sampleList.map(item => {
if (this.sampleIds.indexOf(item.id) > -1) {
@@ -1279,6 +2260,7 @@
return item
})
}
+ this.getProNum()
this.$nextTick(() => {
this.$refs.productTable.doLayout()
})
@@ -1311,7 +2293,7 @@
category: "瀛愬疄楠屽"
}).then(res => {
this.factory = []
- res.data.forEach(a=>{
+ res.data.forEach(a => {
this.filters.push({
text: a.label,
value: a.value
@@ -1323,12 +2305,279 @@
const property = column['property'];
return row[property] === value;
},
- openConfig(){
- if(this.sampleIds.length===0){
- this.$message.error("鏈�夋嫨鏍峰搧")
- return
+ openConfig() {
+ if (this.active === 1) {
+ if (this.sampleIds.length === 0) {
+ this.$message.error("鏈�夋嫨鏍峰搧")
+ return
+ }
+ this.configShow = true
+ } else {
+ if (this.sampleId === null) {
+ this.$message.error('鏈�変腑鏍峰搧')
+ return
+ }
+ this.$axios.post(this.$api.insBushing.selectBushingBySampleId, {
+ sampleId: this.sampleId
+ }).then(res => {
+ if (res.data.length === 0) {
+ this.$message.error('璇ユ牱鍝佹病鏈夐厤缃厜绾�')
+ return
+ }
+ for (var i in this.sampleList) {
+ if (this.sampleList[i].id = this.sampleId) {
+ this.sampleList[i].bushing = res.data
+ break
+ }
+ }
+ this.configShow = true
+ })
}
- this.configShow = true
+ },
+ openEquipConfig() {
+ if (this.active === 1) {
+ if (this.sampleIds.length === 0) {
+ this.$message.error("鏈�夋嫨鏍峰搧")
+ return
+ }
+ this.equipConfigShow = true
+ } else {
+ if (this.sampleId === null) {
+ this.$message.error('鏈�変腑鏍峰搧')
+ return
+ }
+ // this.$axios.post(this.$api.insBushing.selectBushingBySampleId, {
+ // sampleId: this.sampleId
+ // }).then(res => {
+ // if (res.data.length === 0) {
+ // this.$message.error('璇ユ牱鍝佹病鏈夐厤缃厜绾�')
+ // return
+ // }
+ // for (var i in this.sampleList) {
+ // if (this.sampleList[i].id = this.sampleId) {
+ // this.sampleList[i].bushing = res.data
+ // break
+ // }
+ // }
+ // this.configShow = true
+ // })
+ }
+ },
+ openCableConfig() {
+ if (this.active === 1) {
+ if (this.sampleIds.length === 0) {
+ this.$message.error("鏈�夋嫨鏍峰搧")
+ return
+ }
+ this.cableConfigShow = true
+ } else {
+ if (this.sampleId === null) {
+ this.$message.error('鏈�変腑鏍峰搧')
+ return
+ }
+ // this.$axios.post(this.$api.insBushing.selectBushingBySampleId, {
+ // sampleId: this.sampleId
+ // }).then(res => {
+ // if (res.data.length === 0) {
+ // this.$message.error('璇ユ牱鍝佹病鏈夐厤缃厜绾�')
+ // return
+ // }
+ // for (var i in this.sampleList) {
+ // if (this.sampleList[i].id = this.sampleId) {
+ // this.sampleList[i].bushing = res.data
+ // break
+ // }
+ // }
+ // this.configShow = true
+ // })
+ }
+ },
+ upBsm1(val) {
+ let sections = JSON.parse(this.bsmRow.section);
+ let asks = JSON.parse(this.bsmRow.ask);
+ 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
+ }
+ }
+ },
+ upBsmAll (item) {
+ let sections = JSON.parse(item.bsmRow.section);
+ let asks = JSON.parse(item.bsmRow.ask);
+ let tells = JSON.parse(item.bsmRow.tell);
+ let manHours = JSON.parse(item.bsmRow.manHour);
+ let prices = JSON.parse(item.bsmRow.price);
+ for (var a in sections) {
+ if (item.bsm1Val === sections[a]) {
+ this.productList.forEach(p => {
+ if (p.id === item.bsmRow.id) {
+ p.section = sections[a]
+ p.ask = asks[a]
+ p.tell = tells[a]
+ p.manHour = manHours[a]
+ p.price = prices[a]
+ }
+ })
+ break
+ }
+ }
+ },
+ beforeClose(done) {
+ // if (this.bsm1) {
+ // if (this.bsm1Val === null || this.bsm1Val === '') {
+ // this.$message.error('鐗规畩椤圭洰蹇呴』澶勭悊')
+ // return
+ // }
+ // }
+ if (this.bsm1DiaList.length > 0) {
+ this.bsm1DiaList.forEach(item => {
+ if (!item.bsm1Val) {
+ throw this.$message.error('鐗规畩椤圭洰蹇呴』澶勭悊')
+ }
+ })
+ }
+ 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
+ }
+ }
+ this.isBsm2Val2 = true;
+ }
+ // if(this.bsm3){
+ // 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()
+ },
+ 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()
+ },
+ getTotal() {
+ this.totalArr = []
+ this.total = 0;
+ this.sampleList.forEach(item => {
+ if (item.insProduct && item.insProduct.length > 0) {
+ item.insProduct.forEach(a => {
+ this.totalArr.push(a)
+ })
+ }
+ if (item.bushing && item.bushing.length > 0) {
+ item.bushing.forEach(a => {
+ if (a.fiber && a.fiber.length > 0) {
+ a.fiber.forEach(b => {
+ if (b.productList && b.productList.length > 0) {
+ b.productList.forEach(c => {
+ this.totalArr.push(c)
+ })
+ }
+ })
+ }
+ if (a.fibers && a.fibers.length > 0) {
+ a.fibers.forEach(b => {
+ if (b.productList && b.productList.length > 0) {
+ b.productList.forEach(c => {
+ this.totalArr.push(c)
+ })
+ }
+ if (b.fiber && b.fiber.length > 0) {
+ b.fiber.forEach(c => {
+ if (c.productList && c.productList.length > 0) {
+ c.productList.forEach(d => {
+ this.totalArr.push(d)
+ })
+ }
+ })
+ }
+ })
+ }
+ })
+ }
+ })
+ let mySet = new Set();
+ let arr0 = this.totalArr.filter(item => {
+ if (item.state == 1) {
+ let num1 = mySet.size
+ if (item.manHourGroup === '' || !item.manHourGroup) {
+ return true
+ } else {
+ mySet.add(item.manHourGroup)
+ let num2 = mySet.size
+ if (num2 > num1) {
+ return true
+ } else {
+ return false
+ }
+ }
+ }
+ })
+ arr0.forEach(item => {
+ this.total += Number(item.price)
+ })
+ },
+ 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