From d975fc4756806f5b51f006c19c33571b9b8c0b3b Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期五, 20 十二月 2024 09:30:19 +0800
Subject: [PATCH] 修改下单时要求值输入限制
---
src/components/do/b1-ins-order/add.vue | 2240 ++++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 1,602 insertions(+), 638 deletions(-)
diff --git a/src/components/do/b1-ins-order/add.vue b/src/components/do/b1-ins-order/add.vue
index 229fabb..7794127 100644
--- a/src/components/do/b1-ins-order/add.vue
+++ b/src/components/do/b1-ins-order/add.vue
@@ -74,18 +74,18 @@
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;
- }
- }
+ }
+ .opticalProject {
+ width: 38%;
+ }
+ .temperatureList {
+ width: 60%;
+ }
+ .temperatureListTitle {
+ display: flex;
+ flex-direction: row;
+ justify-content: space-between;
+ line-height: 30px;
}
</style>
<style>
@@ -118,7 +118,7 @@
}
.ins_order_add .el-table .warning-row .cell {
- color: #bababa;
+ color: #3A7BFA;
}
.ins_order_add .el-select .is-disabled {
@@ -131,12 +131,12 @@
</style>
<template>
- <div class="ins_order_add">
+ <div class="ins_order_add" style=" display: block; ">
<div v-show="!configShow&&!equipConfigShow&&!cableConfigShow">
<el-row class="title">
- <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-col :span="8" style="padding-left: 20px;text-align: left;">濮旀墭鍗曚俊鎭� 鍗曚綅鎴愭湰鎬讳环锛�<span
+ style="color: #3A7BFA">锟{total.toFixed(2)}}</span></el-col>
+ <el-col :span="16" style="text-align: right;">
<el-select v-model="template" size="medium" placeholder="涓嬪崟妯℃澘" style="margin-right: 10px;" v-show="active==1"
@change="selectInsOrderTemplateById">
<el-option v-for="(a, ai) in templates" :key="ai" :value="a.id" :label="a.name">
@@ -148,357 +148,471 @@
<el-button size="medium" @click="templateDia=true" v-show="active==1">
<span style="color: #3A7BFA;">淇濆瓨妯℃澘</span>
</el-button>
- <el-button size="medium" type="primary" @click="openCableConfig"
- v-if="active==1&&PROJECT=='瑁呭鐢电紗'&&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"
+ <el-button size="medium" @click="upInsOrderOfState(2)" :loading="saveLoad" v-show="active==3&&addObj.companyId"
:disabled="saveLoad">涓嶉�氳繃</el-button>
<el-button size="medium" type="primary" @click="upInsOrderOfState(1)" :loading="saveLoad"
- v-show="active==3">閫氳繃</el-button>
+ v-show="active==3&&addObj.companyId">閫氳繃</el-button>
<el-button size="medium" @click="$parent.playOrder(0)">
<span style="color: #3A7BFA;">杩斿洖</span>
</el-button>
</el-col>
</el-row>
</div>
- <div class="search" v-show="!configShow&&!equipConfigShow&&!cableConfigShow">
- <el-row>
- <el-col class="search_thing" :span="6">
- <div class="search_label">濮旀墭缂栧彿锛�</div>
- <div class="search_input">
- <el-input v-model="addObj.entrustCode" size="small" placeholder="绯荤粺鐢熸垚" disabled></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-select size="small" style="width: 100%;" clearable v-model="addObj.orderType" :disabled="active>1">
- <el-option v-for="(a, ai) in orderType" :key="ai" :value="a.value" :label="a.label"></el-option>
- </el-select>
- </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" 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 :readonly="active>1" v-model="addObj.phone"></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-select size="small" style="width: 100%;" clearable v-model="addObj.type" :disabled="active>1">
- <el-option v-for="(a, ai) in type" :key="ai" :value="a.value" :label="a.label"></el-option>
- </el-select>
- </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 readonly size="small" v-model="addObj.sample">
- <template slot="append"><el-button slot="append" icon="el-icon-search" @click="selectStandardTree = 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" clearable disabled v-model="addObj.sampleType"></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-number size="small" v-model="addObj.sampleNum" :min="1" :max="100" :precision="0"
- style="width: 65%;" @change="addStandardTree" :disabled="active>1"></el-input-number>
- </div>
- </el-col>
- <!-- <el-col class="search_thing" :span="6">
- <div class="search_label">鏍峰搧鍗曚綅锛�</div>
- <div class="search_input">
- <el-select v-model="addObj.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>
- </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-select v-model="addObj.formType" size="small" :disabled="active>1" style="width: 100%;">
- <el-option v-for="(a,ai) in formType" :key="ai" :label="a.label" :value="a.value"></el-option>
- </el-select>
- </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.send">
- <el-radio :label="1">鑷彇</el-radio>
- <el-radio :label="0">鍏朵粬</el-radio>
- </el-radio-group>
- </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.processing">
- <el-radio :label="0">濮旀墭鍗曚綅鍙栧洖</el-radio>
- <el-radio :label="1">瀹為獙瀹ゅ鐞�</el-radio>
- </el-radio-group>
- </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">
- <el-radio :label="0">涓嶇暀鏍�</el-radio>
- <el-radio :label="1">鐣欐牱</el-radio>
- </el-radio-group>
- </div>
- </el-col>
- <el-col class="search_thing" :span="6">
- <div class="search_label" style="width: 175px;">鏄惁娑夊強閰嶅鏍峰搧锛�</div>
- <div class="search_input" style="width: calc(100% - 175px);">
- <el-radio-group v-model="addObj.mating" @change="$refs.sampleTable.doLayout()">
- <el-radio :label="1">鏄�</el-radio>
- <el-radio :label="0">鍚�</el-radio>
- </el-radio-group>
- </div>
- </el-col>
- <el-col class="search_thing" :span="6">
- <div class="search_label">OTC璁㈠崟鍙凤細</div>
- <div class="search_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">濮旀墭浜猴細</div>
- <div class="search_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 :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&&!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 v-show="!configShow&&!equipConfigShow&&!cableConfigShow" class="container">
+ <div class="search">
+ <el-row>
+ <el-col class="search_thing" :span="6">
+ <div class="search_label">濮旀墭缂栧彿锛�</div>
+ <div class="search_input">
+ <el-input v-model="addObj.entrustCode" size="small" placeholder="绯荤粺鐢熸垚" disabled></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-select size="small" style="width: 100%;" clearable v-model="addObj.orderType" :disabled="active>1">
+ <el-option v-for="(a, ai) in orderType" :key="ai" :value="a.value" :label="a.label"></el-option>
+ </el-select>
+ </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" clearable disabled v-model="addObj.custom"></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 readonly size="small" v-model="addObj.company" placeholder="閫夋嫨濮旀墭鍗曚綅">
+ <template slot="append"><el-button slot="append" icon="el-icon-search" @click="selectUserDia = true,createState=1"
+ :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 :readonly="active>1" v-model="addObj.phone"></el-input>
+ </div>
+ </el-col>
+ <el-col class="search_thing" :span="6" v-if="addObj.orderType=='C'">
+ <div class="search_label"><span class="required-span">* </span>涓嬪崟鑷筹細</div>
+ <div class="search_input">
+ <el-select size="small" style="width: 100%;" clearable v-model="addObj.departmentLimsId" :disabled="active>1" placeholder="閮ㄩ棬">
+ <el-option v-for="(a, ai) in deaprtEnum" :key="ai" :value="a.id" :label="a.name"></el-option>
+ </el-select>
+ </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-select size="small" style="width: 100%;" clearable v-model="addObj.type" :disabled="active>1">
+ <el-option v-for="(a, ai) in type" :key="ai" :value="a.value" :label="a.label"></el-option>
+ </el-select>
+ </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 readonly size="small" v-model="addObj.sample">
+ <template slot="append"><el-button slot="append" icon="el-icon-search" @click="selectStandardTree = 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" clearable disabled v-model="addObj.sampleType"></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-number size="small" v-model="addObj.sampleNum" :min="1" :max="100" :precision="0"
+ style="width: 100%;" @change="addStandardTree" :disabled="active>1"></el-input-number>
+ </div>
+ </el-col>
+ <!-- <el-col class="search_thing" :span="6">
+ <div class="search_label">鏍峰搧鍗曚綅锛�</div>
+ <div class="search_input">
+ <el-select v-model="addObj.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>
+ </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-select v-model="addObj.formType" size="small" :disabled="active>1" style="width: 100%;">
+ <el-option v-for="(a,ai) in formType" :key="ai" :label="a.label" :value="a.value"></el-option>
+ </el-select>
+ </div>
+ </el-col>
+ <el-col class="search_thing" :span="6" v-if="addObj.formType==='鍏朵粬鎴愬搧'">
+ <div class="search_label">闆朵欢鍙凤細</div>
+ <div class="search_input">
+ <el-input size="small" :placeholder="active>1 ? '' : '璇疯緭鍏�'" clearable v-model="addObj.partNo"
+ :readonly="active>1"></el-input>
+ </div>
+ </el-col>
+ <el-col class="search_thing" :span="6" v-if="addObj.formType!='鍏朵粬鎴愬搧'&&addObj.formType">
+ <div class="search_label"><span class="required-span">* </span>閫氱煡鑷虫牱鏈哄憳锛�</div>
+ <div class="search_input">
+ <el-select v-model="addObj.issueUser" size="small" :disabled="active>1" style="width: 100%;">
+ <el-option v-for="(a,ai) in personList" :key="ai" :label="a.label" :value="a.value"></el-option>
+ </el-select>
+ </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.send">
+ <el-radio :label="1">鑷彇</el-radio>
+ <el-radio :label="0">鍏朵粬</el-radio>
+ </el-radio-group>
+ </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.processing">
+ <el-radio :label="0">濮旀墭鍗曚綅鍙栧洖</el-radio>
+ <el-radio :label="1">瀹為獙瀹ゅ鐞�</el-radio>
+ </el-radio-group>
+ </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> -->
+ <el-input size="small" v-model="addObj.production" placeholder="閫夋嫨鐢熶骇鍗曚綅" :readonly="active>1">
+ <template slot="append"><el-button slot="append" icon="el-icon-search" @click="selectUserDia = true,createState=2"
+ :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>鐢熶骇鍗曚綅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">
+ <el-radio :label="0">涓嶇暀鏍�</el-radio>
+ <el-radio :label="1">鐣欐牱</el-radio>
+ </el-radio-group>
+ </div>
+ </el-col> -->
+ <el-col class="search_thing" :span="6">
+ <div class="search_label" style="width: 175px;">鏄惁娑夊強閰嶅鏍峰搧锛�</div>
+ <div class="search_input" style="width: calc(100% - 175px);">
+ <el-radio-group v-model="addObj.mating" @change="$refs.sampleTable.doLayout()" :disabled="active>1">
+ <el-radio :label="1">鏄�</el-radio>
+ <el-radio :label="0">鍚�</el-radio>
+ </el-radio-group>
+ </div>
+ </el-col>
+ <!-- <el-col class="search_thing" :span="6">
+ <div class="search_label">OTC璁㈠崟鍙凤細</div>
+ <div class="search_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">濮旀墭浜猴細</div>
+ <div class="search_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">
+ <div class="search_label"><span class="required-span">* </span>绾﹀畾鏃堕棿锛�</div>
+ <div class="search_input">
+ <el-date-picker
+ v-model="addObj.appointed"
+ :disabled="active>1"
+ type="date"
+ placeholder="閫夋嫨鏃ユ湡"
+ size="small" format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 100%;">
+ </el-date-picker>
+ </div>
+ </el-col>
+ <el-col class="search_thing" :span="6" v-if="addObj.formType!='鍏朵粬鎴愬搧'&&addObj.formType">
+ <div class="search_label"><span class="required-span">* </span>鏍锋満瀹屾垚鏃堕棿锛�</div>
+ <div class="search_input">
+ <el-date-picker
+ v-model="addObj.issueTime"
+ :disabled="active>1"
+ type="date"
+ placeholder="閫夋嫨鏃ユ湡"
+ size="small" format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 100%;">
+ </el-date-picker>
+ </div>
+ </el-col>
+ <el-col class="search_thing upload" :span="4" style="align-items: flex-start;height: auto" v-if="active==1">
+ <el-upload
+ style="margin: 8px 0 0px 50px;"
+ action="#"
+ :auto-upload="false"
+ accept='.jpg,.jpeg,.png,.gif,.docx,.xls,.xlsx,.pdf,.zip,.rar,.csv' :on-change="handleChangeUpload">
+ <el-button size="small" type="primary">涓婁紶闄勪欢</el-button>
+ </el-upload>
+ </el-col>
+ <el-col class="search_thing" :span="8">
+ <div class="search_input" style="width: 100%;margin-left: 40px;">
+ <el-radio-group v-model="ruleInfo.rule" @change="$refs.sampleTable.doLayout()" :disabled="active>1">
+ <el-radio :label="1">涓嶈�冭檻涓嶇‘瀹氬害</el-radio>
+ <el-radio :label="2">鑰冭檻涓嶇‘瀹氬害<el-input placeholder="" v-model="ruleInfo.num" style="width: 100px;margin-left: 10px;" size="mini" :disabled="active>1">
+ <template slot="append">%</template>
+ </el-input></el-radio>
+ </el-radio-group>
+ </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 :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>
- <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>
- <el-table-column type="index" label="搴忓彿" width="65" align="center"></el-table-column>
- <el-table-column prop="sample" label="鏍峰搧鍚嶇О" align="center" min-width="100">
- <template slot-scope="scope">
- <el-input size="small" v-model="scope.row.sample" clearable :readonly="active>1"></el-input>
- </template>
- </el-table-column>
- <el-table-column prop="sampleCode" label="鏍峰搧缂栧彿" min-width="140" align="center">
- <template slot-scope="scope">
- <el-input size="small" v-model="scope.row.sampleCode" clearable placeholder="涓嶅～鍐欏垯绯荤粺鑷姩鐢熸垚"
- :readonly="active>1"></el-input>
- </template>
- </el-table-column>
- <el-table-column prop="model" label="鏍峰搧鍨嬪彿" align="center" min-width="100">
- <template slot-scope="scope">
- <el-select v-model="scope.row.model" filterable allow-create default-first-option placeholder="鏍峰搧鍨嬪彿"
- size="small" @change="handleChangeModel" :disabled="active>1" style="width: 100%;">
- <el-option v-for="item in models" :key="item.value" :label="item.label" :value="item.value">
- </el-option>
- </el-select>
- </template>
- </el-table-column>
- <el-table-column prop="modelNum" label="鍨嬪彿鍙傛暟" width="130" align="center" v-if="!(active>1)">
- <template slot-scope="scope">
- <el-input size="small" v-model="scope.row.modelNum" clearable placeholder="闈炲繀濉�"
- @keyup.enter.native="methodChange(scope.row.standardMethodListId, scope.row)"
- @clear="methodChange(scope.row.standardMethodListId, scope.row)"></el-input>
- </template>
- </el-table-column>
- <el-table-column prop="standardMethodListId" label="妫�楠屾爣鍑�" align="center" min-width="100">
- <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%;" 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="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}"
- v-model="scope.row.joinName"></el-input>
- </template>
- </el-table-column>
- <el-table-column prop="joinModel" 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}"
- v-model="scope.row.joinModel"></el-input>
- </template>
- </el-table-column>
- <el-table-column prop="joinNum" label="閰嶅鏍峰搧鏁伴噺" width="140" align="center" v-if="addObj.mating==1">
- <template slot-scope="scope">
- <el-input-number size="small" v-model="scope.row.joinNum" :min="1" :max="100" :precision="0"
- :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>
- <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 style="height: auto;">
+ <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-input size="small" v-model="allInfo.sample" @change="changeModel('sample')"></el-input>
</div>
- </template>
- </el-table-column>
- <el-table-column prop="inspectionItemSubclass" 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="inspectionItemSubclass"
+ </div>
+ <div class="search_thing">
+ <div class="search_label">鏍峰搧绫诲埆锛�</div>
+ <div class="search_input">
+ <el-select v-model="allInfo.model" :placeholder="active>1 ? '' : '璇疯緭鍏�'" filterable allow-create default-first-option size="small"
+ @change="changeModel('model')">
+ <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-input size="small" v-model="allInfo.modelNum" @change="changeModel('modelNum')"></el-input>
+ </div>
+ </div>
+ <div class="search_thing">
+ <div class="search_label">璇曢獙鏍囧噯锛�</div>
+ <div class="search_input">
+ <el-select v-model="allInfo.testRequirements" :placeholder="active>1 ? '' : '璇疯緭鍏�'" filterable allow-create default-first-option size="small"
+ @change="changeModel('testRequirements')">
+ <el-option v-for="item in standard" :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" multiple @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-radio-group v-model="currentPage" v-if="active>1" size="small" style="margin-top: 20px;">
+ <el-radio-button :label="0">鏍峰搧</el-radio-button>
+ <el-radio-button :label="1">闄勪欢</el-radio-button>
+ </el-radio-group>
+ <el-table class="el-table sampleTable" ref="sampleTable" :data="sampleList" max-height="400px" tooltip-effect="dark"
+ border @selection-change="selectSample" highlight-current-row @row-click="rowClick" style="margin-top: 10px;" v-show="currentPage==0">
+ <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">
+ <template slot-scope="scope">
+ <el-input size="small" v-model="scope.row.sample" clearable :readonly="active>1" placeholder="蹇呭～"></el-input>
+ </template>
+ </el-table-column>
+ <el-table-column prop="sampleCode" label="鏍峰搧缂栧彿" min-width="100" align="center">
+ <template slot-scope="scope">
+ <el-input size="small" v-model="scope.row.sampleCode" clearable placeholder="涓嶅～鍐欏垯绯荤粺鑷姩鐢熸垚"
+ :readonly="active>1"></el-input>
+ </template>
+ </el-table-column>
+ <el-table-column prop="model" label="鏍峰搧绫诲埆" align="center" min-width="100">
+ <template slot-scope="scope">
+ <el-select v-model="scope.row.model" filterable allow-create default-first-option placeholder="鏍峰搧绫诲埆"
+ size="small" @change="handleChangeModel" :disabled="active>1" style="width: 100%;">
+ <el-option v-for="item in models" :key="item.value" :label="item.label" :value="item.value">
+ </el-option>
+ </el-select>
+ </template>
+ </el-table-column>
+ <el-table-column prop="modelNum" label="浜у搧鍨嬪彿" min-width="100" align="center" v-if="!(active>1)">
+ <template slot-scope="scope">
+ <el-input size="small" v-model="scope.row.modelNum" clearable placeholder="蹇呭～"
+ @keyup.enter.native="methodChange(scope.row.standardMethodListId, scope.row)"
+ @clear="methodChange(scope.row.standardMethodListId, scope.row)"></el-input>
+ </template>
+ </el-table-column>
+ <el-table-column prop="testRequirements" label="璇曢獙鏍囧噯" align="center" min-width="100">
+ <template slot-scope="scope">
+ <el-select v-model="scope.row.testRequirements" :disabled="scope.row.model==null||active>1"
+ placeholder="璇曢獙鏍囧噯" size="small" :readonly="active>1" style="width: 100%;" clearable @change="changeModel0(scope.row)">
+ <el-option v-for="item in standard" :key="item.id" :label="item.label" :value="item.value">
+ </el-option>
+ </el-select>
+ </template>
+ </el-table-column>
+ <el-table-column prop="standardMethodListId" label="妫�楠屾爣鍑�" align="center" min-width="100">
+ <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%;" clearable @clear="productList = []" multiple>
+ <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="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}"
+ v-model="scope.row.joinName"></el-input>
+ </template>
+ </el-table-column>
+ <el-table-column prop="joinModel" 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}"
+ v-model="scope.row.joinModel"></el-input>
+ </template>
+ </el-table-column>
+ <el-table-column prop="joinNum" label="閰嶅鏍峰搧鏁伴噺" width="140" align="center" v-if="addObj.mating==1">
+ <template slot-scope="scope">
+ <el-input-number size="small" v-model="scope.row.joinNum" :min="1" :max="100" :precision="0"
+ :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" max-height="400px" tooltip-effect="dark" border
+ @selection-change="selectProduct" style="margin-bottom: 10px;" @select="upProductSelect"
+ :row-class-name="tableRowClassName" v-loading="getProductLoad" @select-all="handleAll" v-show="currentPage==0">
+ <el-table-column type="selection" width="65" :selectable="selectable" v-if="active==1"></el-table-column>
+ <el-table-column prop="inspectionItemClass" v-if="PROJECT === '瑁呭鐢电紗'" label="妫�楠岄」鍒嗙被" min-width="140" show-overflow-tooltip></el-table-column>
+ <el-table-column prop="inspectionItemClassEn" v-if="PROJECT === '瑁呭鐢电紗'" label="妫�楠岄」鍒嗙被(EN)" 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="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="deviceGroup" 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)"
- 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>
+ </template>
+ </el-table-column>
+ <el-table-column prop="inspectionItemSubclass" 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="inspectionItemSubclass"
+ @input="searchFilterList"
+ size="mini"
+ placeholder="璇疯緭鍏�"/>
+ </div>
+ </template>
+ </el-table-column>
+ <el-table-column prop="tell" label="瑕佹眰鎻忚堪" min-width="220px">
+ <template slot-scope="scope">
+ <el-input size="small" placeholder="瑕佹眰鎻忚堪" v-model="scope.row.tell" clearable type="textarea"
+ :autosize="{ minRows: 1, maxRows: 3}" @change="e=>requestChange(e,scope.row,'tell')"
+ v-if="active==1" :disabled="!!scope.row.tell&&scope.row.tell.includes('[')&&scope.row.tell.includes(']')&&scope.row.tell.includes(',')"></el-input>
+ <span v-else>
+ <template >{{ scope.row.tell }}</template>
+ </span>
+ </template>
+ </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,'ask')"
+ v-if="active==1&&scope.row.inspectionValueType!='5'" :disabled="!!scope.row.ask&&scope.row.ask.includes('[')&&scope.row.ask.includes(']')&&scope.row.ask.includes(',')"></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-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="deviceGroup" 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="sonLaboratory" label="瀛愬疄楠屽" min-width="130" show-overflow-tooltip :filters="filters"
+ :filter-method="filterHandler"></el-table-column>
+ </el-table>
+ <ValueTable class="value-table" ref="fileList" :url="$api.insOrderPlan.getFileList"
+ :componentData="componentData0"
+ :delUrl="$api.insOrderPlan.delfile" style="height: 100%;margin-top: 16px;" v-show="currentPage==1"/>
+ </div>
</div>
<el-dialog title="閫夋嫨鍗曚綅" :visible.sync="selectUserDia" width="70%">
<div class="body" style="height: 60vh;" v-if="selectUserDia">
@@ -509,7 +623,7 @@
<el-button type="primary" @click="selectUser">纭� 瀹�</el-button>
</span>
</el-dialog>
- <el-dialog title="閫夋嫨鏍峰搧" :visible.sync="selectStandardTree" width="400px">
+ <el-dialog title="閫夋嫨鏍峰搧" :visible.sync="selectStandardTree" width="500px">
<div class="body" style="height: 60vh;overflow-y: auto;user-select: none;" v-if="selectStandardTree">
<el-row>
<el-col :span="24">
@@ -549,7 +663,8 @@
<el-button type="primary" @click="addTemplateDia" :loading="templateLoading">纭� 瀹�</el-button>
</span>
</el-dialog>
- <el-dialog title="妫�楠屼笅鍙�" :visible.sync="issuedDialogVisible" width="400px">
+ <el-dialog title="妫�楠屼笅鍙�" :visible.sync="issuedDialogVisible" width="400px" :close-on-click-modal="false"
+ :close-on-press-escape="false" :show-close="false">
<div class="body" style="max-height: 60vh;">
<el-row>
<el-col class="search_thing" :span="22">
@@ -563,8 +678,17 @@
<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" filterable style="width: 100%;">
+ <el-select v-model="distributeData.userId" placeholder="璇烽�夋嫨" size="small" filterable style="width: 100%;" @change="changeUser">
<el-option v-for="item in personList" :key="item.value" :label="item.label" :value="item.value">
+ </el-option>
+ </el-select>
+ </div>
+ </el-col>
+ <el-col class="search_thing" :span="22" v-if="distributeData.userId">
+ <div class="search_label"><span class="required-span">* </span>璇曢獙瀹わ細</div>
+ <div class="search_input">
+ <el-select v-model="distributeData.sonLaboratory" placeholder="璇烽�夋嫨" size="small" filterable style="width: 100%;">
+ <el-option v-for="item in sonLaboratoryList" :key="item.value" :label="item.label" :value="item.value">
</el-option>
</el-select>
</div>
@@ -573,7 +697,7 @@
</div>
<span slot="footer" class="dialog-footer">
<el-row>
- <el-button @click="issuedDialogVisible=false">鍙� 娑�</el-button>
+ <el-button @click="issuedDialogVisible=false;$parent.playOrder(0)">鍙� 娑�</el-button>
<el-button type="primary" @click="submitForm2" :loading="upLoad">纭� 瀹�</el-button>
</el-row>
</span>
@@ -596,24 +720,28 @@
</el-row>
</span>
</el-dialog>
- <fiberOpticConfig :currentId="currentId" @saveFiberopticConfig="getTotal()" v-if="configShow" :active="active" />
+ <fiberOpticConfig :currentId="currentId" @saveFiberopticConfig="getTotal()" v-if="configShow && examine==0" :active="active" :inspectionItemST='inspectionItemST' />
+ <fiberOpticConfigTwo :currentId="currentId" v-if="configShow && examine==1" :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">
+ <el-dialog title="妫�娴嬪埌鐗规畩椤癸紝璇蜂綔鍑轰互涓嬮�夋嫨" :visible.sync="bsm1Dia"
+ :close-on-press-escape="false"
+ :close-on-click-modal="false"
+ min-width="400px" :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>
+ <el-col class="search_thing" :span="24" style="height: initial;margin: 5px 0;">
+ <div class="search_label" style="width: 80px;"><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>
+ <el-col class="search_thing" :span="24" style="height: initial;margin: 5px 0;">
+ <div class="search_label" style="width: 80px;">瑕佹眰鍊硷細</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"
@@ -660,22 +788,29 @@
</el-col>
</el-row> -->
</div>
+ <span slot="footer" class="dialog-footer">
+ <el-row>
+ <el-button type="primary" @click="save2" :loading="saveLoad">纭� 瀹�</el-button>
+ </el-row>
+ </span>
</el-dialog>
<!-- 鍏ㄩ�夌壒娈婂�煎鐞嗘-->
- <el-dialog title="妫�娴嬪埌鐗规畩椤癸紝璇蜂綔鍑轰互涓嬮�夋嫨" :visible.sync="bsm1DiaAll" width="500px" :show-close="false"
+ <el-dialog title="妫�娴嬪埌鐗规畩椤癸紝璇蜂綔鍑轰互涓嬮�夋嫨" :visible.sync="bsm1DiaAll" min-width="400px" :show-close="false"
+ :close-on-press-escape="false"
+ :close-on-click-modal="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>
+ <el-col class="search_thing" :span="24" style="height: initial;margin: 5px 0;">
+ <div class="search_label" style="width: 80px;"><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>
+ <el-col class="search_thing" :span="24" style="height: initial;margin: 5px 0;">
+ <div class="search_label" style="width: 80px;">瑕佹眰鍊硷細</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"
@@ -714,11 +849,18 @@
</el-col>
</el-row>
</div>
+ <span slot="footer" class="dialog-footer">
+ <el-row>
+ <el-button type="primary" @click="save1" :loading="saveLoad">纭� 瀹�</el-button>
+ </el-row>
+ </span>
</el-dialog>
- <el-dialog title="鐗规畩鍊煎～鍐�" :visible.sync="bsm3Dia" width="800px" :show-close="false">
+ <el-dialog title="鐗规畩鍊煎～鍐�" :visible.sync="bsm3Dia"
+ :close-on-click-modal="false" :close-on-press-escape="false"
+ width="800px" :show-close="false">
<el-table
:data="editTable"
- style="width: 100%">
+ style="width: 100%" height="80vh">
<!-- inspectionItemList -->
<el-table-column
prop="inspectionItemList"
@@ -743,7 +885,7 @@
prop="value"
label="璇嗗埆绗﹀��">
<template slot-scope="scope">
- <el-input v-model="scope.row.value" placeholder="璇疯緭鍏�" size="small"></el-input>
+ <el-input v-model="scope.row.value" placeholder="璇疯緭鍏�" @input="inputValueHandler(scope.row,scope.$index)" size="small"></el-input>
</template>
</el-table-column>
</el-table>
@@ -754,7 +896,9 @@
</el-row>
</span>
</el-dialog>
- <el-dialog title="娓╁害寰幆瑕佹眰濉啓" :visible.sync="circulateShow" width="900px" :before-close="beforeCirculateShowClose" :show-close="false">
+ <el-dialog title="娓╁害寰幆瑕佹眰濉啓" :visible.sync="circulateShow" width="900px"
+ :close-on-click-modal="false" :close-on-press-escape="false"
+ :before-close="beforeCirculateShowClose" :show-close="false">
<div class="search" style="display: flex;background: transparent;">
<div class="search_thing">
<div class="search_label">淇濇俯鏃堕棿锛�</div>
@@ -788,6 +932,9 @@
:data="opticalProject"
tooltip-effect="dark"
style="width: 100%"
+ @row-click="rowClickOptical"
+ @select="selectOpticalProject"
+ @select-all="selectAllOptical"
@selection-change="handleSelectionChange">
<el-table-column
type="selection"
@@ -799,7 +946,7 @@
</div>
<div class="temperatureList">
<div class="temperatureListTitle">
- <span>娓╁害鐐归泦鍚�(璇锋寜鐓ч『搴忓～鍐欙紝20鈩冨繀椤讳负棣栦綅)</span>
+ <span>娓╁害鐐归泦鍚�</span>
<span>
<el-button type="primary" size="mini" @click="addTemperatureData">鏂板</el-button>
<el-button size="mini" @click="deleteTemperatureData">鍒犻櫎</el-button>
@@ -814,45 +961,132 @@
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="璇疯緭鍏�"></el-input>
+ <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">
+ <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"></el-input>
+ <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="鍗曟牴鍨傜洿鐕冪儳妫�娴嬫鏁板～鍐�" :visible.sync="singleVerticalCombustionShow" width="900px"
+ :close-on-click-modal="false" :close-on-press-escape="false"
+ :before-close="beforeCirculateShowClose" :show-close="false">
+ <div>111</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"
+ :close-on-click-modal="false" :close-on-press-escape="false"
+ 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="powerShow"
+ :close-on-click-modal="false" :close-on-press-escape="false"
+ width="50%">
+ <el-table
+ :data="powerTable"
+ border
+ style="width: 100%">
+ <el-table-column
+ fixed
+ prop="sample"
+ label="鏍峰搧"
+ min-width="150">
+ </el-table-column>
+ <el-table-column
+ prop="model"
+ label="鍨嬪彿"
+ min-width="120">
+ </el-table-column>
+ <el-table-column
+ prop="inspectionItem"
+ label="妫�楠岄」"
+ min-width="120">
+ </el-table-column>
+ <el-table-column
+ prop="ask"
+ label="绔彛"
+ min-width="120">
+ <template slot-scope="scope">
+ <el-input-number v-model="scope.row.ask" :min="1" :max="100" label="绔彛" size="small"></el-input-number>
+ </template>
+ </el-table-column>
+ </el-table>
+ <span slot="footer" class="dialog-footer">
+ <el-button @click="powerShow=false">鍙栨秷</el-button>
+ <el-button type="primary" @click="savePowerTest">淇濆瓨</el-button>
+ </span>
+ </el-dialog>
+ <el-dialog
+ title="鏂囦欢棰勮"
+ :visible.sync="lookFileVisible"
+ width="60%" fullscreen>
+ <filePreview v-if="lookFileVisible" :fileUrl="currentFile.url"
+ :currentFile="currentFile" style="max-height: 87vh;overflow-y: auto;"/>
+ </el-dialog>
+ <p style="font-size: 12px;color: red;margin-top: 20px;margin-bottom: 20px;">鍙屾柟鎵胯:<br/>
+ 1銆佸鎵樻柟鎵胯鎻愪緵鐨勪俊鎭笌鏍峰搧鐨勭湡瀹炴��;<br/>
+ 2銆佸鎵橀�佹牱妫�楠岀粨鏋滀粎閫傜敤浜庢敹鍒扮殑鏍峰搧;<br/>
+ 3銆佽瘯楠岃繃绋嬪鑷寸殑鏍峰搧鎹熷潖銆侀厤浠舵崯鍧忋�佹崯鑰楋紝鏈祴璇曞満涓嶆壙鎷呰禂鍋胯矗浠�;<br/>
+ 4銆佸疄楠屽鎵胯鍏寮�灞曟娴嬫椿鍔紝骞舵壙璇轰繚瀹堝湪妫�娴嬫椿鍔ㄨ繃绋嬩腑鎵�鑾风煡鐨勪繚瀵嗕俊鎭��
+ </p>
</div>
</template>
<script>
import ValueTable from '../../tool/value-table.vue'
import fiberOpticConfig from './fiberoptic-config.vue'
+import fiberOpticConfigTwo from './fiberoptic-config-two.vue'
import equipConfig from './equip-config.vue'
import cableConfig from './cable-config.vue'
import Vue from 'vue'
-import {iuCharts} from "../../../util/echarts";
+import filePreview from '../../tool/file-preview.vue'
export default {
components: {
ValueTable,
fiberOpticConfig,
+ fiberOpticConfigTwo,
equipConfig,
- cableConfig
+ cableConfig,
+ filePreview
},
props: {
+ examine: {
+ type: Number,
+ default: () => 0
+ },
active: {
type: Number,
default: () => 0
@@ -864,6 +1098,10 @@
},
data() {
return {
+ currentFile:{},
+ lookFileVisible:false,
+ inspectionItemST: null,
+ sampleSelectionList: [],//鏍峰搧琛ㄦ牸閫変腑鏁版嵁
editTable:[],
template: null,
templates: [],
@@ -875,6 +1113,7 @@
type: '0',
code: null,
appointed: null,
+ issueTime:null,
remark: null,
otcCode: null,
mating: 0,
@@ -897,7 +1136,10 @@
production: null,
productionEn: null,
companyId: null,
- prepareUser:null
+ prepareUser:null,
+ departmentLimsId:null,
+ departmentLims:null,
+ partNo: null, // 闆朵欢鍙�
},
sample: {
sampleCode: null,
@@ -917,7 +1159,7 @@
entity: {
orderBy: {
field: 'id',
- order: 'asc'
+ order: 'desc'
}
},
isIndex: true,
@@ -962,7 +1204,8 @@
issuedDialogVisible: false,
distributeData: {
appointed: '',
- userId: ''
+ userId: '',
+ sonLaboratory:''
},
personList: [],
upLoad: false,
@@ -999,7 +1242,7 @@
RTS: '',
totalArr: [],
model: null,
- standardMethodListId: null,
+ standardMethodListId: [],
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,
@@ -1011,6 +1254,7 @@
entrustNum: '',
entrustPoint: ''
},
+ singleVerticalCombustionShow: false,
isBsm2Val2:false,
opticalProject: [], // 娓╁害寰幆寮规鍏夌氦椤圭洰鍒楄〃
opticalProjectList: [], // 娓╁害寰幆寮规鍏夌氦椤圭洰閫変腑鐨勬暟缁�
@@ -1018,10 +1262,81 @@
temperatureDataList: [
{label: '<', value: '<'},
{label: '鈮�', value: '鈮�'},
- {label: '锛�', value: '锛�'},
+ {label: '=', value: '='},
{label: '鈮�', value: '鈮�'},
- {label: '锛�', value: '锛�'},
- ]
+ {label: '>', value: '>'},
+ ],
+ temperatureShow: false, // 娓╁崌璇曢獙妫�楠岄」寮规
+ temperatureTest: [],
+ temperatureList: [],
+ temperatureEngList: [],
+ temperatureTitle: '',
+ temperatureTestNum: '',
+ isShowInput: false,
+ temId: '',
+ sonLaboratoryList:[],
+ selectiveEcho: [], // 妫�楠屼笅鍗曠殑鏃跺�欏嬀閫夋楠岄」鐩�,濡傛灉浣跨敤绛涢�夋彁浜ゆ樉绀烘楠岄」鐩负绌� 鍥炴樉鍒楄〃
+ deaprtEnum:[],
+ standard:[],
+ createState:1,//1:閫夋嫨濮旀墭鍗曚綅锛�2锛氶�夋嫨鐢熶骇鍗曚綅
+ fileList:[],
+ currentPage:0,//0:鏍峰搧淇℃伅锛�1锛氶檮浠�
+ componentData0: {
+ entity: {
+ insOrderId:''
+ },
+ isIndex: true,
+ showSelect: false,
+ select: false,
+ sort: false,
+ init:false,
+ do: [
+ {
+ id: 'handleDown',
+ font: '涓嬭浇',
+ type: 'text',
+ method: 'handleDown'
+ },
+ {
+ id: '1',
+ font: '棰勮',
+ type: 'text',
+ method: 'lookFile',
+ }
+ ],
+ isPage: false,
+ linkEvent: {},
+ tagField: {
+ type:{
+ select:[
+ {
+ value: 1,
+ label: '鍥剧墖'
+ },
+ {
+ value: 2,
+ label: '鏂囦欢'
+ }
+ ]
+ }
+ },
+ currentId: '',
+ selectField: {},
+ requiredAdd: [],
+ requiredUp: []
+ },
+ ruleInfo:{
+ rule:1,
+ num:null,
+ },
+ powerShow:false,
+ powerTable:[],
+ allInfo:{
+ model:null,
+ sample:null,
+ modelNum:null,
+ testRequirements:null,
+ }
}
},
watch: {
@@ -1046,6 +1361,25 @@
}
}
},
+ productListSelected: {
+ deep: true,
+ handler(val) {
+ if(val.length>0){
+ for(let i =0 ; i< val.length; i++){
+ if(val[i].inspectionItem.includes('鏉惧绠�')){
+ this.inspectionItemST = 1
+ break;
+ }else{
+ this.inspectionItemST = 0
+ }
+ }
+ }else{
+ this.inspectionItemST = 0
+ }
+
+ console.log('0000',this.inspectionItemST);
+ }
+ },
sampleList: {
deep: true,
handler(val) {
@@ -1053,23 +1387,34 @@
}
},
'addObj.sample'(val) {
- this.model = null
- this.standardMethodListId = null
+ this.allInfo.model = null
+ this.allInfo.sample = null
+ this.allInfo.modelNum = null
+ this.allInfo.testRequirements = null
+ this.standardMethodListId = []
},
'addObj.sampleNum'(val) {
- this.model = null
- this.standardMethodListId = null
+ this.allInfo.model = null
+ this.allInfo.sample = null
+ this.allInfo.modelNum = null
+ this.allInfo.testRequirements = null
+ this.standardMethodListId = []
+ },
+ active(val){
+ this.saveLoad = false
}
},
mounted() {
this.selectEnumByCategoryForType()
this.getUserNow()
this.selectStandardTreeList()
- this.selectInsOrderTemplate()
+ // this.selectInsOrderTemplate()
this.getAuthorizedPerson();
this.selectEnumByCategoryForUnit()
+ this.selectEnumByCategoryForStandard()
this.selectStandardMethods()
this.selectEnumByCategoryForOrderType()
+ this.selectDepartmentEnum()
// this.selectEnumByCategoryForSonLaboratory()
this.selectEnumByCategoryForSampleForm()
if (this.active != 1) {
@@ -1081,8 +1426,19 @@
this.addObj = {
...res.data.insOrder
};
+ if(this.addObj.rule){
+ if(this.addObj.rule=='涓嶈�冭檻涓嶇‘瀹氬害'){
+ this.ruleInfo.rule = 1
+ }else{
+ this.ruleInfo.rule = 2
+ this.ruleInfo.num = this.addObj.rule.split('-')[1]
+ }
+ }
this.addObj.type = String(this.addObj.type)
- this.sampleList = this.HaveJson(res.data.sampleProduct);
+ this.sampleList = this.HaveJson(res.data.sampleProduct)
+ this.sampleList.forEach(m=>{
+ m.standardMethodListId = JSON.parse(m.standardMethodListId)
+ });
this.getProNum()
this.addObj.sampleNum = this.sampleList.length
this.$nextTick(() => {
@@ -1093,36 +1449,94 @@
}
})
})
+ // 鏂囦欢淇℃伅
+ this.componentData0.entity.insOrderId = this.currentId;
+ this.$refs.fileList.selectList()
}
},
methods: {
+ lookFile(row){
+ this.currentFile = row;
+ if(row.type==1){
+ this.currentFile.url = this.javaApi+'/img/'+row.fileUrl
+ }else{
+ this.currentFile.url = this.javaApi+'/word/'+row.fileUrl
+ }
+ this.lookFileVisible = true
+ },
+ handleDown(row){
+ this.$axios.post(this.$api.insOrderPlan.downFile, {
+ id: row.id,
+ }).then(res => {
+ if (res.code === 200) {
+ let url = '';
+ if(res.data.type==1){
+ url = this.javaApi+'/img/'+res.data.fileUrl
+ file.downloadIamge(url,row.fileName)
+ }else{
+ url = this.javaApi+'/word/'+res.data.fileUrl
+ const link = document.createElement('a');
+ link.href = url;
+ link.download = row.fileName;
+ link.click();
+ }
+ }
+ }).catch(error => {
+
+ })
+ },
+ handleChangeUpload(file, fileLists){
+ this.fileList = fileLists
+ },
+ //鐗规畩鍊煎～鍐欏鐞�
+ inputValueHandler(row,index){
+ if(row){
+ const nextIndex = index+1
+ console.log(nextIndex, this.editTable)
+ for (let i = nextIndex; i < this.editTable.length; i++) {
+ const element = this.editTable[i];
+ if(element.model==row.model&&row.symbolItem==element.symbolItem){
+ this.editTable[i].value = row.value
+ }
+ }
+ }
+
+ },
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))
- let entrustTime = this.circulateForm.entrustTime
- let entrustNum = this.circulateForm.entrustNum
- let temperaturePoint1 = JSON.parse(JSON.stringify(this.temperatureData))
- temperaturePoint1.forEach(t => {
- if (!t.temperaturePoint || !t.askSymbol || !t.askNum) {
- throw this.$message.error('璇峰～鍐欏畬鏁存暟鎹�')
+ opticalProjectList.forEach(o => {
+ o.temperatureData.forEach(t => {
+ if (!t.temperaturePoint || !t.askSymbol || !t.askNum) {
+ throw this.$message.error('璇峰～鍐欏畬鏁存暟鎹�')
+ }
+ })
+ if (!o.temperatureData.some(item => item.temperaturePoint == '20')) {
+ throw this.$message.error(`${o.value + '娉㈤暱娌℃湁閰嶇疆20鈩冩俯搴︾偣'}`)
}
})
- let temperaturePoint = JSON.parse(JSON.stringify(this.temperatureData))
+ let entrustTime = this.circulateForm.entrustTime
+ let entrustNum = this.circulateForm.entrustNum
+ let opticalProjectList2 = JSON.parse(JSON.stringify(this.opticalProjectList))
let askArr = []
let opticalProjectArr = []
- // 鎷兼帴瑕佹眰鍊糰sk
opticalProjectList.forEach(o => {
opticalProjectArr.push(o.value)
- temperaturePoint.forEach(t => {
- const askObj = t.temperaturePoint + '鈩�' + ',' + o.value + ',' + t.askSymbol + t.askNum
- askArr.push(askObj)
+ 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.unshift(20 + '鈩�')
askArr.push(this.circulateForm.entrustNum)
const ask = askArr.join(';')
// 鎷兼帴瑕佹眰鎻忚堪tell
@@ -1131,20 +1545,22 @@
let temperaturePointList2 = []
entrustTime = entrustTime + 'h'
entrustNum = entrustNum + '娆�'
- temperaturePoint.forEach(t => {
- t.temperaturePoint = t.temperaturePoint + '鈩�'
- temperaturePointList.push(t.temperaturePoint)
+ 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')
+ })
})
- temperaturePoint1.forEach(t => {
- t.temperaturePoint = t.temperaturePoint + '鈩�'
- askNum.push(t.askSymbol + t.askNum + 'dB/Km')
- temperaturePointList2.push(t.temperaturePoint)
- })
+ temperaturePointList = Array.from(new Set(temperaturePointList))
+ temperaturePointList2 = Array.from(new Set(temperaturePointList2))
+ temperaturePointList2.unshift(20 + '鈩�(甯告俯)')
let additionArr = []
askNum.forEach(a => {
- additionArr.push(temperaturePointList2.join(',') + a)
+ additionArr.push(temperaturePointList.join(',') + a)
})
- temperaturePointList2.unshift(20 + '鈩�')
+ additionArr = Array.from(new Set(additionArr))
const tell = '娓╁害鑼冨洿:' + temperaturePointList2.join(',') + ';' + '淇濇俯鏃堕棿:' + entrustTime + ';' + '寰幆娆℃暟:'
+ entrustNum + ';' + '鍏夌氦(' + opticalProjectArr.join(',') + ')' + '闄勫姞琛板噺缁濆鍊�:' + additionArr.join(';')
this.productList.forEach(item => {
@@ -1153,33 +1569,166 @@
item.tell = tell
}
})
- console.log('ask---', ask)
- console.log('tell---', tell)
+ this.circulateShow = false
+ this.changeProductList0()
+ if(this.sampleSelectionList.length>0){
+ this.sampleSelectionList.forEach(item=>{
+ item.insProduct = this.productList0
+ })
+ }else{
+ this.currentMethod.insProduct = this.productList0
+ }
+ this.getProNum()
+ },
+ spliceTemperatureTest () {
+ if (this.temperatureTest.length === 0) {
+ this.$message.error('璇烽�夋嫨')
+ return
+ }
+ let askStr = ''
+ let askArr1 = []
+ let askArr2 = ''
+ let ask = ''
+ let index = ''
+ this.temperatureTest.map(val => {
+ index = this.temperatureEngList.findIndex(item => item.label === val)
+ if (index > -1) {
+ askStr = val + ',' + this.temperatureEngList[index].value
+ }
+ askArr1.push(askStr)
+ })
+
+ if (this.temperatureTitle === '娓╁崌璇曢獙瑕佹眰濉啓') {
+ askArr2 = askArr1.join(';')
+ ask = askArr2 + ';1'
+ } else {
+ if (!this.temperatureTestNum) {
+ this.$message.error('璇峰～鍐欏惊鐜鏁�')
+ return
+ }
+ askArr2 = askArr1.join(';')
+ ask = askArr2 + ';' + this.temperatureTestNum
+ }
+ this.productList.forEach(item => {
+ if (item.id === this.temId) {
+ item.ask = ask
+ item.tell = ask
+ }
+ })
+ // console.log('ask---', ask)
+ this.temperatureShow = false
+ },
+ temperatureShowClose () {
+ if (this.temperatureTitle === '鐑惊鐜姹傚～鍐�' && !this.temperatureTestNum) {
+ this.$message.error('璇峰～鍐欏惊鐜鏁�')
+ return
+ }
+ if (this.temperatureTest.length === 0) {
+ this.$message.error('璇烽�夋嫨')
+ return
+ }
+ this.spliceTemperatureTest()
+ },
+ savePowerTest(){
+ if(!this.powerTable.every(m=>m.ask))
+ {
+ this.$message.error('璇峰～鍐欏畬鏁存暟鎹�')
+ }
+ let num = 0;
+ let sampleList = this.HaveJson(this.sampleList)
+ sampleList.forEach(item=>{
+ item.insProduct.forEach(m=>{
+ if(m.inspectionItem.includes('鍔熺巼璇曢獙')&&m.state==1){
+ m.ask = '绔彛鏁�:'+this.powerTable[num].ask
+ num++
+ }
+ })
+ })
+ this.saveMethod(sampleList)
+ this.powerShow = false;
+ },
+ cleanTemperatureTest () {
+ this.temperatureTest = []
+ this.temperatureTestNum = ''
+ this.temperatureShow = false
+ },
+ cleanSpliceData () {
+ this.circulateForm.entrustNum = null
+ this.circulateForm.entrustTime = null
+ this.circulateForm.entrustPoint = null
+ this.opticalProjectList = []
+ this.$refs.multipleTable.clearSelection()
+ this.temperatureData = []
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('璇峰～鍐欏畬鏁存暟鎹�')
+ 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('璇峰～鍐欏畬鏁存暟鎹�')
+ }
+ })
+ if (!o.temperatureData.some(item => item.temperaturePoint == '20')) {
+ throw this.$message.error(`${o.value + '娉㈤暱娌℃湁閰嶇疆20鈩冩俯搴︾偣'}`)
+ }
+ })
+ this.spliceData()
+ },
+
+ handleTemperatureTestChange (value) {
+ // console.log('value---', value)
},
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
@@ -1194,6 +1743,22 @@
this.temperatureData = this.temperatureData.slice(0,-deleteNum)
}
},
+ changeProductList0(){
+ this.productList0.forEach(a=>{
+ let obj = this.productList.find(m => m.id == a.id)
+ if(obj){
+ a.state = obj.state
+ a.section = obj.section
+ a.ask = obj.ask
+ a.manHour = obj.manHour
+ a.price = obj.price
+ a.tell = obj.tell
+ }
+ if(a.state == 0&&a.bsmRow){
+ a = this.HaveJson(a.bsmRow)
+ }
+ })
+ },
searchFilterList () {
const vtw = {
inspectionItem: this.inspectionItem, // 妫�楠岄」
@@ -1203,6 +1768,7 @@
const isHaveValue = Object.values(vtw).some(item => {
return item
})
+ this.changeProductList0()
if (isHaveValue) {
for(let i in vtw) {
if (vtw[i]) {
@@ -1211,9 +1777,19 @@
})
}
}
+ this.$nextTick(()=>{
+ this.productList.forEach(a => {
+ if (a.state == 1) this.toggleSelection(a)
+ })
+ })
} else {
// 娌℃湁鏌ヨ鏉′欢鏃舵覆鏌撴墍鏈夋暟鎹�
this.productList = this.productList0
+ this.$nextTick(()=>{
+ this.productList.forEach(a => {
+ if (a.state == 1) this.toggleSelection(a)
+ })
+ })
}
},
getAuthorizedPerson() {
@@ -1241,9 +1817,22 @@
this.$message.error('鏈�夋嫨鏁版嵁')
return
}
- this.addObj.company = selects.company
- this.addObj.code = selects.code
- this.addObj.companyId = selects.id
+ if(this.createState==1){
+ this.addObj.company = selects.company
+ this.addObj.code = selects.code
+ this.addObj.companyId = selects.id
+ if(this.active==1){
+ this.selectInsOrderTemplate()
+ }
+ }else if(this.createState==2){
+ this.addObj.production = selects.company
+ // 濡傛灉閫夋嫨鐨勫崟浣嶆槸娌℃湁瀵瑰簲鐨勮嫳鏂囧悕绉板氨鐢�'/'浠ｆ浛
+ if (!selects.companyEn) {
+ this.addObj.productionEn = '/'
+ } else {
+ this.addObj.productionEn = selects.companyEn
+ }
+ }
this.selectUserDia = false
},
containsValue(str) {
@@ -1299,55 +1888,101 @@
return str.replace(find, value);
},
save() {
+ if(this.addObj.orderType=='C'&&this.addObj.departmentLimsId){
+ this.addObj.departmentLims = this.deaprtEnum.find(m=>m.id==this.addObj.departmentLimsId).name
+ }else if(this.addObj.orderType&&this.addObj.orderType!='C'&&!this.addObj.departmentLimsId){
+ this.addObj.departmentLims = '妫�娴嬩腑蹇�'
+ this.addObj.departmentLimsId = this.deaprtEnum.find(m=>m.name=='妫�娴嬩腑蹇�').id
+ }
+ // else{
+ // this.$message.error('璇烽�夋嫨妫�楠岀被鍒�')
+ // return
+ // }
if (!this.addObj.companyId) {
this.$message.error('鏈�夋嫨瀹㈡埛鍗曚綅')
+ return
+ }
+ let noLaboratory = this.totalArr.filter(a => a.state == 1&&!a.sonLaboratory)
+ if(noLaboratory.length>0){
+ let str = ''
+ noLaboratory.forEach((m,j)=>{
+ str += j==noLaboratory.length-1?m.inspectionItem+'-'+m.inspectionItemSubclass:m.inspectionItem+'-'+m.inspectionItemSubclass+','
+ })
+ this.$message.error(str+'娌℃湁鍏宠仈瀹為獙瀹ゅ锛岃鑱旂郴绠＄悊鍛�')
return
}
if (!this.addObj.type) {
this.$message.error('鏈�夋嫨绱ф�ョ▼搴�')
} else if (!this.addObj.formType) {
- this.$message.error('璇疯緭鍏ユ潵鏍锋柟寮�')
+ this.$message.error('璇疯緭鍏ヨ鍗曠被鍨�')
} else if (!this.addObj.orderType) {
this.$message.error('璇烽�夋嫨妫�楠岀被鍒�')
} else if (!this.addObj.production) {
this.$message.error('璇疯緭鍏ョ敓浜у崟浣�')
} else if (!this.addObj.productionEn) {
this.$message.error('璇疯緭鍏ョ敓浜у崟浣岴N')
+ }else if (!this.addObj.departmentLimsId) {
+ this.$message.error('閫夋嫨涓嬪崟鍒板摢涓儴闂�')
} else if (this.sampleList.length < 1) {
this.$message.error('璇锋坊鍔犱竴涓牱鍝�')
} else if (!this.sampleList.every(m => m.sample)) {
this.$message.error('璇疯緭鍏ユ牱鍝佸悕绉�')
} else if (!this.sampleList.every(m => m.model)) {
this.$message.error('璇疯緭鍏ユ牱鍝佸瀷鍙�')
- } else if (!this.sampleList.every(m => m.standardMethodListId)) {
+ }else if (!this.addObj.appointed) {
+ this.$message.error('璇烽�夋嫨绾﹀畾鏃堕棿')
+ }else if (!this.sampleList.every(m => m.standardMethodListId&&m.standardMethodListId.length>0)) {
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('鍏夌紗娓╁害寰幆椤圭洰蹇呴』杩涜鍏夌氦閰嶇疆')
- return
- }
+ } else if(this.addObj.formType&&this.addObj.formType!='鍏朵粬鎴愬搧'&&!this.addObj.issueUser){
+ this.$message.error('璇烽�夋嫨閫氱煡鑷虫牱鏈哄憳')
+ }else if(this.addObj.formType&&this.addObj.formType!='鍏朵粬鎴愬搧'&&!this.addObj.issueTime){
+ this.$message.error('璇烽�夋嫨鏍锋満瀹屾垚鏃堕棿')
+ }else{
+ //鏍￠獙妫�楠岄」鐨勮姹傚�煎拰瑕佹眰鎻忚堪,浠呭鎵樿姹�
+ // if(this.active==1&&this.isAskOnlyRead){
+ // const isTrue = this.checkRequiredValueAndRemark(filterProductList)
+ // if(!isTrue){
+ // this.$message.error('妫�楠岄」鐨勮姹傚�间笌瑕佹眰鎻忚堪涓嶅尮閰嶏紝 璇锋鏌�')
+ // return
+ // }
+ // }
let sampleList = this.HaveJson(this.sampleList)
+ for (let i = 0; i < sampleList.length; i++) {
+ if (sampleList[i].insProduct.length > 0) {
+ let set = new Set()
+ for (let j = 0; j < sampleList[i].insProduct.length; j++) {
+ if(sampleList[i].insProduct[j].state == 1){
+ let num0 = set.size
+ set.add(sampleList[i].insProduct[j].inspectionItem+'-'+sampleList[i].insProduct[j].inspectionItemSubclass)
+ let num1 = set.size
+ if(num0==num1){
+ this.$message.error(sampleList[i].insProduct[j].inspectionItem+'-'+sampleList[i].insProduct[j].inspectionItemSubclass+'閲嶅')
+ return
+ }
+ }
+ }
+ }
+ }
+
+ let index0 = sampleList.findIndex(m=>!m.sample)
+ if(index0>-1) return this.$message.error('璇峰～鍐欐牱鍝佸悕绉�')
+ let index1 = sampleList.findIndex(m=>!m.modelNum)
+ if(index1>-1) return this.$message.error('璇峰～鍐欎骇鍝佸瀷鍙�')
+
+
let projectNum = this.totalArr.filter(a => a.state == 1).length
if(projectNum==0){
- this.$confirm('妫�楠岄」鐩负绌猴紝鏄惁纭鎻愪氦?', "鎻愮ず", {
- confirmButtonText: "纭畾",
- cancelButtonText: "鍙栨秷",
- type: "warning"
- }).then(() => {
- this.saveMethod(sampleList)
- }).catch(() => {})
+ // this.$confirm('妫�楠岄」鐩负绌猴紝鏄惁纭鎻愪氦?', "鎻愮ず", {
+ // confirmButtonText: "纭畾",
+ // cancelButtonText: "鍙栨秷",
+ // type: "warning"
+ // }).then(() => {
+ // this.saveMethod(sampleList)
+ // }).catch(() => {})
+ return this.$message.error('璇锋坊鍔犳楠岄」鐩�')
}else{
- let isRTS = this.totalArr.find(a => a.ask != null && this.symbolList.find(b=>a.ask.includes(b)) && a.state == 1)
- if (isRTS) {
+ let isRTS = this.totalArr.find(a => a.ask != null && this.symbolList.find(b=>a.ask&&a.ask.includes(b)) && a.state == 1)
+ if (isRTS&&this.PROJECT=='妫�娴嬩腑蹇�') {
this.editTable = this.handleData(sampleList,this.containsValue, 0)
this.editTable.forEach(item => {
item.value = item.modelNum
@@ -1355,9 +1990,123 @@
this.bsm3Dia = true;
return
}
+ let isPower = this.totalArr.find(a => a.inspectionItem.includes('鍔熺巼璇曢獙')&&a.state==1)
+ if (isPower) {
+ this.powerTable = this.totalArr.filter(a => a.inspectionItem.includes('鍔熺巼璇曢獙')&&a.state==1)
+ this.powerTable.forEach(a => {
+ a.ask = null
+ })
+ this.powerShow = true;
+ return
+ }
this.saveMethod(sampleList)
}
}
+ },
+ /**
+ * 鏍￠獙濮旀墭瑕佹眰鐨勬楠岄」鐨勮姹傛弿杩板拰瑕佹眰鍊�
+ *
+ */
+ checkRequiredValueAndRemark(data){
+ let isTrue = true
+ try{
+ data.forEach(ele=>{
+ //鍒ゆ柇锛堚墹,鈮�,>,<,=锛夎繖鍑犵鎯呭喌
+ //鍒ゆ柇瑕佹眰鍊间腑鐨勬暟瀛楁槸鍚﹀寘鍚湪瑕佹眰鎻忚堪涓�
+ if(['鈮�','鈮�','>','<','='].includes(ele.ask[0])){
+ const askVal = ele.ask.substring(1,ele.ask.length)
+ if(isNaN(askVal) || ele.tell.indexOf(askVal)<0){
+ console.log(1111);
+ isTrue = false
+ }
+ }
+ //鍒ゆ柇鑼冨洿(10-25),瑕佹眰鍊煎繀椤绘槸-
+ if(ele.ask.indexOf('-')>0 && ele.ask.length>1){
+ //瑕佹眰鎻忚堪鐨剘鍜岃姹傚�肩殑-锛岀瓑鏁�
+ let tell = ele.tell
+ if(ele.tell.indexOf('~')>0 || ele.tell.indexOf('锛�') || ele.tell.indexOf('锛�')){
+ tell = tell.replace('~','-')
+ tell = tell.replace('锛�','(')
+ tell = tell.replace('锛�',')')
+ }
+ const splits = ele.ask.split('-')
+ //婊¤冻鏍煎紡瑕佹眰锛屽苟涓斾袱涓兘鏄暟瀛�
+ if(splits.length==2 && !isNaN(splits[0]) && !isNaN(splits[1])){
+ /**
+ * 鍒ゆ柇鎯呭喌
+ * 1.瑕佹眰鎻忚堪涓庤姹傛弿杩扮浉鍚�
+ * 2.瑕佹眰鎻忚堪鍖呭惈瑕佹眰鍊�
+ * 3.瑕佹眰鎻忚堪涓�3N-10N杩欑鎯呭喌
+ * 4.瑕佹眰鎻忚堪涓�10卤5杩欑鎯呭喌
+ * 5.
+ */
+ let min = Math.min(...splits)
+ let max = Math.max(...splits)
+ if(min==max){
+ isTrue = false
+ }
+ //瑕佹眰鎻忚堪涓笉鍖呭惈卤浠ュ強鍖洪棿鐨勬暟瀛楋紝鍒欒繑鍥瀎alse
+ if(tell.indexOf('卤')<0&&tell.indexOf('-')<0){
+ console.log(3333,ele);
+ console.log(3333333,tell,tell.indexOf('卤')<0,tell.indexOf('-')<0);
+ isTrue = false
+ }else if(ele.tell.indexOf('-')==0){
+ console.log(4444);
+ isTrue = false
+ }else if(tell.indexOf('-')>0){
+ if(tell.indexOf('卤')>0){
+ ////鏍￠獙瑕佹眰鎻忚堪涓�(10-15)卤5杩欑鍐欐硶鐨勬儏鍐�
+ const num = tell.split('卤')[1]
+ const startIndex = tell.indexOf('(')
+ const endIndex = tell.indexOf(')')
+ if(startIndex>-1 && endIndex>0 ){
+ const str = tell.substring(startIndex,endIndex)
+ if(str && str.indexOf('-')>0){
+ let strList = str.split('-')
+ const minNum = Number(strList[0]-num)
+ const maxNum = Number(strList[1]+num)
+ if(minNum>min || maxNum<max){
+ console.log(555555);
+ isTrue = false
+ }
+ }
+ }else{
+ //鏍￠獙瑕佹眰鎻忚堪涓�10卤5杩欑鍐欐硶鐨勬儏鍐�
+ let splitNums = ele.tell.split('卤')
+ if(splitNums.length<2){
+ console.log(66666);
+ isTrue = false
+ }else{
+ let minTell = Number(splitNums[0])-Number(splitNums[1])
+ let maxTell = Number(splitNums[0])+Number(splitNums[1])
+ if(minTell!=min || maxTell!=max){
+ console.log(7777777);
+ isTrue = false
+ }
+ }
+ }
+ }else{
+ const splitTells = tell.split('-')
+ if(splitTells[0].indexOf(min)<0 || splitTells[1].indexOf(max)<0){
+ console.log(88888888);
+ isTrue = false
+ }
+ }
+ }
+ }else{
+ console.log(89999999);
+ isTrue = false
+ }
+ }
+ // else if(ele.ask.indexOf('&')>0 && ele.ask.length>1){
+ // //鍒ゆ柇
+ // }
+ })
+ }catch(error){
+ console.log(error);
+ isTrue = false
+ }
+ return isTrue
},
save0(){
if(this.editTable.every(m=>m.value)){
@@ -1388,18 +2137,36 @@
})
}else if(type==1){
let arr = this.editTable.filter(b => b.sampleId == item.id)
- arr.forEach(f => {
- if(a.ask.includes(f.symbolItem)){
- let ask = calBack(a.ask, f.symbolItem,f.value)
- if (ask) {
- a.ask = ask
+ for (var i=0;i<arr.length;i++){
+ if(a.ask){
+ if(a.ask&&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
+ }
}
- let tell = this.handleTell(a.tell, f.symbolItem,f.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{}
+ // })
}
}
})
@@ -1555,19 +2322,79 @@
}
},
saveMethod(sampleList){
+ let isHaveAsk = this.totalArr.filter(a => (a.ask === null||a.ask=='')&&a.state==1)
+ let isHaveAsk0 = this.totalArr.filter(a => (a.ask=='/'||a.ask=='-'||a.ask=='鈥斺��'||((/\d/.test(a.ask))&&(a.ask.includes('<')||a.ask.includes('>')||a.ask.includes('=')||a.ask.includes('锛�')||a.ask.includes('锛�')||a.ask.includes('鈮�')||a.ask.includes('鈮�'))))&&a.state==1)
+ let stateArr = this.totalArr.filter(a=>a.state==1)
+ if (isHaveAsk.length > 0) {
+ this.$message({
+ type: 'error',
+ message: '璇峰～鍐欒姹傚�煎悗鍐嶆彁浜�'
+ })
+ return false;
+ }
+ if (isHaveAsk0.length <stateArr.length) {
+ this.$message({
+ type: 'error',
+ message: '瑕佹眰鍊艰緭鍏ユ牸寮忎笉瀵癸紝鍙緭鍏�/銆�-銆佲�斺�斾唬琛ㄤ笉鍒ゅ畾锛�<銆�=銆�>銆佲墺銆佲墹鍔犱笂鏁板瓧浠ｈ〃鑼冨洿锛岃閲嶆柊杈撳叆',
+ duration: 8 * 1000
+ })
+ return false;
+ }
+ let isHaveTell = this.totalArr.filter(a => (a.tell == null||a.tell=='')&&a.state==1)
+ if (isHaveTell.length > 0) {
+ this.$message({
+ type: 'error',
+ message: '璇峰～鍐欒姹傛弿杩板悗鍐嶆彁浜�'
+ })
+ return false;
+ }
+ if(this.ruleInfo.rule==1){
+ this.addObj.rule = '涓嶈�冭檻涓嶇‘瀹氬害'
+ }else if(this.ruleInfo.rule==2){
+ if(this.ruleInfo.rule==2&&(!this.ruleInfo.num||this.ruleInfo.num<0||this.ruleInfo.num==0)){
+ this.$message({
+ type: 'error',
+ message: '璇疯緭鍏ヤ笉纭畾搴�'
+ })
+ return;
+ }
+ this.addObj.rule = '鑰冭檻涓嶇‘瀹氬害'+'-'+this.ruleInfo.num
+ }
this.saveLoad = true
- this.$axios.post(this.$api.insOrder.addInsOrder, {
- str: JSON.stringify({
+ let fd = new FormData();
+ this.fileList.forEach((item,index)=>{
+ //鏂囦欢淇℃伅涓璻aw鎵嶆槸鐪熺殑鏂囦欢
+ fd.append("files",item.raw);
+ })
+ fd.append("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))
+ if (this.PROJECT === '瑁呭鐢电紗') {
+ if (a.modelNum) {
+ const index = a.modelNum.indexOf('脳')
+ if (index === 0) {
+ a.model = a.model + a.modelNum
+ } else if (index === -1) {
+ a.model = a.model + '-' + a.modelNum
+ } else {
+ a.model = a.modelNum + a.model
+ }
+ } else {
+ a.model = a.model + ((a.modelNum == null || a.modelNum == '' || a.modelNum == 'null') ? '' : ('-' + a.modelNum))
+ }
+ } else {
+ 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)
- })
+ }));
+ this.$axios.post(this.$api.insOrder.addInsOrder, fd,{
+ headers: {
+ 'Content-Type': 'multipart/form-data'
+ },
+ noQs:true
}).then(res => {
this.saveLoad = false
if (res.code == 201) return
@@ -1585,7 +2412,8 @@
state,
id: this.currentId,
companyId:this.addObj.companyId,
- laboratory:this.addObj.laboratory
+ laboratory:this.addObj.laboratory,
+ company: this.addObj.company
}, {
headers: {
'Content-Type': 'application/json'
@@ -1615,7 +2443,10 @@
this.distributeData.appointed = ress.data
})
setTimeout(() => {
- this.issuedDialogVisible = true;
+ // this.issuedDialogVisible = true;
+ // this.$message.success('鎻愪氦鎴愬姛')
+ this.upLoad = false
+ this.$parent.playOrder(0)
}, 1000)
})
} else {
@@ -1633,11 +2464,16 @@
this.$message.error('鎸囨淳浜哄憳鏈～鍐�')
return
}
+ if (this.distributeData.userId&&(this.distributeData.sonLaboratory== null ||this.distributeData.sonLaboratory== '')) {
+ this.$message.error('璇曢獙瀹ゆ湭濉啓')
+ return
+ }
this.upLoad = true;
this.$axios.post(this.$api.insOrder.upInsOrder, {
orderId: this.distributeData.orderId,
appointed: this.distributeData.appointed,
- userId: this.distributeData.userId
+ userId: this.distributeData.userId,
+ sonLaboratory:this.distributeData.sonLaboratory
}).then(res => {
if (res.code === 201) {
this.upLoad = false
@@ -1664,12 +2500,21 @@
this.addObj.companyId = selects.departId
this.addObj.production = '/'
this.addObj.productionEn = '/'
+ if(this.active==1){
+ this.selectInsOrderTemplate()
+ }
})
},
getProNum() {
- this.sampleList.forEach((m, i) => {
- Vue.set(this.sampleList[i], 'proNum', m.insProduct.filter(a => a.state == 1).length)
- })
+ if (this.active != 1) {
+ this.sampleList.forEach((m, i) => {
+ Vue.set(this.sampleList[i], 'proNum', m.insProduct.filter(a => a.state == 1).length)
+ })
+ }else{
+ this.sampleSelectionList.forEach((m, i) => {
+ Vue.set(this.sampleSelectionList[i], 'proNum', m.insProduct.filter(a => a.state == 1).length)
+ })
+ }
this.$refs.sampleTable.doLayout()
},
searchFilter() {
@@ -1685,7 +2530,7 @@
this.selectTree = ''
this.models = val.children
this.getNodeParent(node)
- this.selectTree = this.selectTree.replace(' - ', '')
+
let data = this.selectTree.split(' - ')
let data2 = ''
for (let index = data.length - 1; index >= 0; index--) {
@@ -1716,30 +2561,27 @@
return data.label.indexOf(value) !== -1;
},
activeStandardTree() {
- let trees = this.selectTree.split(" - ")
+ if(this.selectTree == null || this.selectTree == '') return this.$message.error('鏈�夋嫨鏍峰搧绫诲瀷')
+ let trees = this.selectTree.split(" - ").filter(m=>m)
if (trees.length < 3) {
- this.$message.error('鏈�夋嫨瀵硅薄')
+ this.$message.error('鏈�夋嫨鏍峰搧绫诲埆')
return
}
- this.addObj.factory = trees[0]
- this.addObj.laboratory = trees[1]
- this.addObj.sampleType = trees[2]
- 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.addObj.factory = '涓ぉ绉戞妧妫�娴嬩腑蹇�'
+ this.addObj.laboratory = '閫氫俊浜у搧瀹為獙瀹�'
+ this.addObj.sampleType = trees[0]
+ this.addObj.sample = trees[1]
+ this.addObj.model = trees[2]
this.selectStandardTree = false
this.sampleList = []
for (var i = 0; i < this.addObj.sampleNum; i++) {
this.sample.joinName = null
this.sample.joinModel = null
this.sample.joinNum = 1
- this.sample.sample = this.addObj.sample
+ // this.sample.sample = this.addObj.sample
this.sample.model = this.addObj.model
this.sample.unit = this.addObj.unit
- this.sample.standardMethodListId = null
+ this.sample.standardMethodListId = []
this.sample.insProduct = []
this.sample.id = this.count
this.sample.childSampleList = []
@@ -1754,23 +2596,10 @@
selectsStandardMethodByFLSSM() {
this.methodLoad = true
this.$axios.post(this.$api.standardTree.selectsStandardMethodByFLSSM, {
- tree: this.selectTree
+ tree: '涓ぉ绉戞妧妫�娴嬩腑蹇�'+' - '+'閫氫俊浜у搧瀹為獙瀹�'+' - '+this.selectTree
}).then(res => {
this.methodLoad = false
- try {
- if (res.data.standardMethodList.length == 0 && this.selectTree.split('-').length == 5) {
- let arr = this.selectTree.split('-')
- let arr0 = arr.slice(0, arr.length - 1)
- let selectTree = arr0.join('-').substring(0, arr0.join('-').length - 1)
- this.$axios.post(this.$api.standardTree.selectsStandardMethodByFLSSM, {
- tree: selectTree
- }).then(ress => {
- this.methods = ress.data.standardMethodList
- })
- } else {
- this.methods = res.data.standardMethodList
- }
- } catch (e) {}
+ this.methods = res.data.standardMethodList
})
},
addStandardTree() {
@@ -1781,17 +2610,17 @@
this.sample.joinName = null
this.sample.joinModel = null
this.sample.joinNum = 1
- this.sample.sample = this.addObj.sample
+ // this.sample.sample = this.addObj.sample
this.sample.model = this.addObj.model
this.sample.unit = this.addObj.unit
- this.sample.standardMethodListId = null
+ this.sample.standardMethodListId = []
this.sample.insProduct = []
- this.sample.id = this.count
+ this.sample.id = parseInt(i+1)
this.sample.childSampleList = []
this.sample.insulating = null
this.sample.sheath = null
this.sampleList.push(this.HaveJson(this.sample))
- this.count++
+ // this.count++
}
this.computationalPairing(this.sampleList.length)
this.bsm2Val2 = this.HaveJson(this.bsm2Val3)
@@ -1801,6 +2630,7 @@
val.forEach(a => {
this.sampleIds.push(a.id)
})
+ this.sampleSelectionList = val
},
delSample() {
this.sampleIds.forEach(a => {
@@ -1823,21 +2653,24 @@
},
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.sampleSelectionList.forEach(ele=>{
+ if(ele.id == row.id){
+ this.sampleIds.push(row.id)
+ }
+ })
}
this.productList = row.insProduct
+ this.productList0 = JSON.parse(JSON.stringify(this.productList))
setTimeout(() => {
this.productList.forEach(a => {
- if (a.state == 1) this.toggleSelection(a)
+ if (a.state == 1) {
+ this.toggleSelection(a)
+ }else{
+ this.$refs.productTable.toggleRowSelection(a, false);
+ }
})
}, 200)
},
@@ -1847,15 +2680,36 @@
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 === null) {
+ row.section = ""
+ }
+ // console.log(row,this.productList)
+ let arr = this.productList.filter(m=>m.state==1&&m.bsmRow&&m.bsmRow.section==row.section&&row.section.includes(m.section)&&m.ask&&m.section.indexOf('[')==-1)
+ if (row.bsm === '1' && row.section !== '' && row.section !== null && row.state === 1&&arr.length==0) {
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) {
+ } else if (row.bsm === '1' && row.section !== '' && row.section !== null && row.state === 0&&arr.length==0) {
row.bsm1 = false
+ }else if(arr.length>0){
+ try{
+ row.bsmRow = this.HaveJson(row)
+ let section = arr[0].section
+ let arr0 = JSON.parse(row.section)
+ let arr1 = JSON.parse(row.ask)
+ let arr2 = JSON.parse(row.manHour)
+ let arr3 = JSON.parse(row.price)
+ let arr4 = JSON.parse(row.tell)
+ let index = arr0.indexOf(section)
+ row.section = section
+ row.ask = arr1[index]
+ row.manHour = arr2[index]
+ row.price = arr3[index]
+ row.tell = arr4[index]
+ } catch(e) {}
}
if (row.bsm === '1' && row.inspectionItem === '鍏夌氦鎺ュご鎹熻��' && this.sampleList.length > 1 && row.state === 1&&!this.isBsm2Val2) {
this.bsm2 = true
@@ -1893,12 +2747,14 @@
}
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.changeProductList0()
+ if(this.sampleSelectionList.length>0){
+ this.sampleSelectionList.forEach(item=>{
+ item.insProduct = this.productList0
+ })
+ }else{
+ this.currentMethod.insProduct = this.productList0
}
this.getProNum()
},
@@ -1941,12 +2797,12 @@
rowIndex
}) {
if (row.state === 0) {
- return 'warning-row';
+ return '';
}
- return '';
+ return 'warning-row';
},
selectInsOrderTemplate() {
- this.$axios.get(this.$api.insOrder.selectInsOrderTemplate).then(res => {
+ this.$axios.get(this.$api.insOrder.selectInsOrderTemplate+'?company='+this.addObj.company).then(res => {
if (res.code == 201) return
this.templates = res.data
})
@@ -1974,12 +2830,29 @@
// 淇濆瓨妯℃澘
addTemplateDia() {
if (this.templateName) {
- this.templateLoading = true;
+ if(this.templates.find(m=>m.name==this.templateName)){
+ this.$confirm('宸插瓨鍦ㄥ悓鍚嶆ā鏉匡紝鏄惁杩涜鏇挎崲?', "鎻愮ず", {
+ confirmButtonText: "纭畾",
+ cancelButtonText: "鍙栨秷",
+ type: "warning"
+ }).then(() => {
+ this.saveTemplateDia()
+ }).catch(() => {})
+ }else{
+ this.saveTemplateDia()
+ }
+ } else {
+ this.$message.error('璇峰～鍐欐ā鏉垮悕绉�')
+ }
+ },
+ saveTemplateDia(){
+ this.templateLoading = true;
this.$axios.post(this.$api.insOrder.addInsOrderTemplate, {
name: this.templateName,
thing: JSON.stringify({
addObj: this.addObj,
- sampleList: this.sampleList
+ sampleList: this.sampleList,
+ selectTree:this.selectTree
})
}, {
headers: {
@@ -1993,17 +2866,20 @@
this.selectInsOrderTemplate()
this.templateName = ''
})
- } else {
- this.$message.error('璇峰～鍐欐ā鏉垮悕绉�')
- }
},
// 鏌ヨ妯℃澘
selectInsOrderTemplateById(e) {
this.$axios.post(this.$api.insOrder.selectInsOrderTemplateById + '?id=' + e).then(res => {
if (res.code == 201) return
let obj = JSON.parse(res.data)
+ console.log(obj);
+ //鍒跺崟浜鸿缃负褰撳墠鐧诲綍鐢ㄦ埛
+ let user = JSON.parse(localStorage.getItem('user'))
+ obj.addObj.custom = user.name
+ obj.addObj.userId = user.userId
this.addObj = obj.addObj;
this.sampleList = obj.sampleList;
+ this.selectTree = obj.selectTree
})
},
delSampleAndProduct() {
@@ -2017,19 +2893,26 @@
this.units = res.data
})
},
+ selectEnumByCategoryForStandard() {
+ this.$axios.post(this.$api.enums.selectEnumByCategory, {
+ category: "璇曢獙鏍囧噯"
+ }).then(res => {
+ this.standard = res.data
+ })
+ },
selectEnumByCategoryForOrderType() {
this.$axios.post(this.$api.enums.selectEnumByCategory, {
category: "妫�楠岀被鍒�"
}).then(res => {
this.orderType = res.data
if (res.data.length > 0) {
- this.addObj.orderType = res.data[0].value
+ this.addObj.orderType = 'C'
}
})
},
selectEnumByCategoryForSampleForm() {
this.$axios.post(this.$api.enums.selectEnumByCategory, {
- category: "鏉ユ牱鏂瑰紡"
+ category: "璁㈠崟绫诲瀷"
}).then(res => {
this.formType = res.data
if (this.formType.length > 0) {
@@ -2038,29 +2921,25 @@
})
},
methodChange(val, row) {
- if (val === null || val === '') return
+ if (val === null || val === ''||val.length ==0) 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
+ let selectTreeList = this.selectTree.split(" - ")
+ this.addObj.model&&(selectTreeList[selectTreeList.length - 1] = this.addObj.model)
this.$axios.post(this.$api.standardTree.selectStandardProductList, {
- model: row.model + '-' + row.modelNum,
- standardMethodListId: val,
- factory: this.selectTree,
+ model: (this.addObj.model?this.addObj.model:row.model) + '-' + row.modelNum+';'+row.testRequirements,
+ standardMethodListId: val.join(','),
+ factory: '涓ぉ绉戞妧妫�娴嬩腑蹇�'+' - '+'閫氫俊浜у搧瀹為獙瀹�'+' - '+selectTreeList.join(" - "),
}, {
headers: {
'Content-Type': 'application/json'
}
}).then(res => {
+ this.getProductLoad = false
res.data.forEach(a => {
a.state = 0
})
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)
@@ -2069,16 +2948,41 @@
if (a.state == 1) this.toggleSelection(a)
})
}, 200)
+ }).catch(e => {
+ this.getProductLoad = false
})
this.searchProject()
+ this.searchTemList()
},
- changeModel() {
+ searchTemList () {
+ this.temperatureList = []
+ this.$axios.post(this.$api.enums.selectEnumByCategory, {
+ category: "鐢靛姏娓╁害寰幆妫�楠�"
+ }).then(res => {
+ if (res.data.length > 0) {
+ this.temperatureEngList = res.data
+ res.data.forEach(item => {
+ this.temperatureList.push(item.label)
+ })
+ }
+ })
+ },
+ changeModel(type) {
this.sampleList.forEach(a => {
let obj = this.sampleIds.find(b => b == a.id)
if (obj) {
- a.model = this.model
+ this.$set(a,type, this.allInfo[type])
+ if(type=='testRequirements'&&a.standardMethodListId&&a.standardMethodListId.length>0){
+ this.methodChange(a.standardMethodListId, a)
+ }
+ // a[type] = this.allInfo[type]
}
})
+ },
+ changeModel0(row){
+ if(row.standardMethodListId&&row.standardMethodListId.length>0){
+ this.methodChange(row.standardMethodListId, row)
+ }
},
changeStandardMethodListId() {
this.sampleList.forEach(a => {
@@ -2104,18 +3008,28 @@
}
},
// 瑕佹眰鍊煎彉鍖栨椂
- requestChange(e, row) {
- this.sampleList.map(item => {
- if (this.sampleIds.indexOf(item.id) > -1) {
- item.insProduct.map(m => {
- if (m.id == row.id) {
- m.ask = e;
+ requestChange(e, row,type) {
+ //this.currentMethod 褰撳墠鏍峰搧id
+ this.sampleList.forEach(item=>{
+ if(item.id == this.currentMethod.id){
+ item.insProduct.forEach(i=>{
+ if(i.id == row.id){
+ i[type] = e
}
- return m;
})
}
- return item
})
+ // this.sampleList.map(item => {
+ // if (this.sampleIds.indexOf(item.id) > -1) {
+ // item.insProduct.map(m => {
+ // if (m.id == row.id) {
+ // m[type] = e;
+ // }
+ // return m;
+ // })
+ // }
+ // return item
+ // })
},
selectStandardMethods() {
this.$axios.get(this.$api.standardTree.selectStandardMethodEnum).then(res => {
@@ -2130,13 +3044,18 @@
}
},
handleAll(e) {
+ console.log(1111,this.bsm1DiaAll,this.bsm1Dia)
+ // console.log('e---', e)
if (e.length > 0) {
this.productList.map(m => {
- m.state = 1
+ if(e.find(a=>a.id == m.id)){
+ m.state = 1
+ }
return m
})
} else {
this.productList.map(m => {
+ console.log('m----', m)
m.state = 0
return m
})
@@ -2169,13 +3088,6 @@
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 => {
@@ -2197,6 +3109,14 @@
}
return item
})
+ }
+ this.changeProductList0()
+ if(this.sampleSelectionList.length>0){
+ this.sampleSelectionList.forEach(item=>{
+ item.insProduct = this.productList0
+ })
+ }else{
+ this.currentMethod.insProduct = this.productList0
}
this.getProNum()
this.$nextTick(() => {
@@ -2243,35 +3163,6 @@
const property = column['property'];
return row[property] === value;
},
- 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
- })
- }
- },
openEquipConfig() {
if (this.active === 1) {
if (this.sampleIds.length === 0) {
@@ -2279,35 +3170,6 @@
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('鏈�変腑鏍峰搧')
@@ -2352,25 +3214,103 @@
}
},
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
+ // console.log(1111,item,this.bsm1DiaList)
+ for (let i =0;i<this.bsm1DiaList.length;i++){
+ this.bsm1DiaList[i].bsm1Val = item.bsm1Val
+ let sections = JSON.parse(this.bsm1DiaList[i].bsmRow.section);
+ let asks = JSON.parse(this.bsm1DiaList[i].bsmRow.ask);
+ let tells = JSON.parse(this.bsm1DiaList[i].bsmRow.tell);
+ let manHours = JSON.parse(this.bsm1DiaList[i].bsmRow.manHour);
+ let prices = JSON.parse(this.bsm1DiaList[i].bsmRow.price);
+ for (var a in sections) {
+ if (this.bsm1DiaList[i].bsm1Val === sections[a]) {
+ this.productList.forEach(p => {
+ if (p.id === this.bsm1DiaList[i].bsmRow.id) {
+ p.section = sections[a]
+ p.ask = asks[a]
+ p.tell = tells[a]
+ p.manHour = manHours[a]
+ p.price = prices[a]
+ }
+ })
+ break
+ }
}
}
+ this.changeProductList0()
+ if(this.sampleSelectionList.length>0){
+ this.sampleSelectionList.forEach(item=>{
+ item.insProduct = this.productList0
+ })
+ }else{
+ this.currentMethod.insProduct = this.productList0
+ }
+ },
+ save1 () {
+ 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;
+ }
+ this.bsm1DiaAll = false
+ },
+ save2 () {
+ 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;
+ }
+ this.bsm1Dia = false
},
beforeClose(done) {
// if (this.bsm1) {
@@ -2501,6 +3441,20 @@
arr0.forEach(item => {
this.total += Number(item.price)
})
+ let arr1 = this.totalArr.filter(item => item.state == 1)
+ let mySet0 = new Set();
+ this.sonLaboratoryList = []
+ arr1.forEach(item => {
+ let num1 = mySet0.size
+ mySet0.add(item.sonLaboratory)
+ let num2 = mySet0.size
+ if(num2>num1){
+ this.sonLaboratoryList.push({
+ label:item.sonLaboratory,
+ value:item.sonLaboratory,
+ })
+ }
+ })
},
bsm2Up(val) {
let list = []
@@ -2516,6 +3470,16 @@
for (let a of set) {
this.bsm2Val2.push(this.HaveJson(this.bsm2Val3[a - 1]))
}
+ },
+ changeUser(){
+ if(this.sonLaboratoryList.length>0){
+ this.distributeData.sonLaboratory = this.sonLaboratoryList[0].value
+ }
+ },
+ selectDepartmentEnum(){
+ this.$axios.get(this.$api.department.selectDepartmentLimsEnum).then(res=>{
+ this.deaprtEnum = res.data.filter(item=>item.name === '璐ㄩ噺閮�' || item.name === '妫�娴嬩腑蹇�')
+ })
}
}
}
--
Gitblit v1.9.3