From c2e684e0caab67573bb2df44d6f0c73bbaedd9c7 Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期四, 20 二月 2025 17:04:11 +0800
Subject: [PATCH] Merge branch 'dev' of http://114.132.189.42:9002/r/lims-ruoyi-before into dev
---
src/views/business/productOrder/components/add.vue | 1679 ++++++++++++-----------------------------------------------
1 files changed, 340 insertions(+), 1,339 deletions(-)
diff --git a/src/views/business/productOrder/components/add.vue b/src/views/business/productOrder/components/add.vue
index ddc6a68..4a13829 100644
--- a/src/views/business/productOrder/components/add.vue
+++ b/src/views/business/productOrder/components/add.vue
@@ -1,6 +1,6 @@
<template>
<div class="app-container">
- <div v-show="!configShow&&!equipConfigShow&&!cableConfigShow&&!auxiliaryShow">
+ <div v-show="!cableConfigShow&&!auxiliaryShow">
<div style="display: flex;justify-content: space-between;align-items:center;">
<div>
濮旀墭鍗曚俊鎭�
@@ -12,8 +12,7 @@
:options="quarterItemOptions"
size="small"
style="width: 380px"
- @change="handleChange"
- @focus="getQuarterOnOrder"></el-cascader>
+ @focus="getQuarterOnOrderList"></el-cascader>
<el-select v-show="active==1" v-model="template" placeholder="涓嬪崟妯℃澘" size="small"
@change="selectInsOrderTemplateById">
<el-option v-for="(a, ai) in templates" :key="ai" :label="a.name" :value="a.id">
@@ -27,219 +26,138 @@
</el-button>
<el-button v-if="active==1&&addObj.sampleType!=undefined&&(addObj.sampleType.indexOf('鐢电紗')>-1 ||addObj.sampleType.indexOf('缁煎悎')>-1)" size="small" type="primary" @click="openCableConfig">鐢电紗閰嶇疆</el-button>
<el-button v-if="active==1&&addObj.sampleType!=undefined&&addObj.sampleType.indexOf('鐢电紗')>-1" size="small" type="primary" @click="openAuxiliaryCore">杈呭姪绾胯姱閰嶇疆</el-button>
- <el-button v-if="active==1" size="small" type="primary" @click="openEquipConfig">瀛愭牱鍝侀厤缃�</el-button>
- <el-button v-if="addObj.sampleType==='鍏夌紗'" size="small" type="primary" @click="openConfig">鍏夌氦閰嶇疆</el-button>
<el-button v-show="active==1||(tabIndex==4&&active==2)" :loading="saveLoad" size="small" type="primary" @click="save">鎻愪氦</el-button>
<!-- 瀹℃牳 -->
<el-button v-show="active==3&&addObj.companyId" :disabled="saveLoad" :loading="saveLoad" size="small"
@click="upInsOrderOfState(2)">涓嶉�氳繃</el-button>
<el-button v-show="active==3&&addObj.companyId" :loading="saveLoad" size="small" type="primary"
@click="upInsOrderOfState(1)">閫氳繃</el-button>
- <el-button size="small" @click="$parent.playOrder(0)">
+ <el-button size="small" @click="goBack">
<span style="color: #3A7BFA;">杩斿洖</span>
</el-button>
</div>
</div>
</div>
- <div v-show="!configShow&&!equipConfigShow&&!cableConfigShow&&!auxiliaryShow" class="container">
+ <div v-show="!cableConfigShow&&!auxiliaryShow" style="margin-top: 10px">
<div class="search">
- <el-row>
- <el-col :span="6" class="search_thing">
- <div class="search_label">濮旀墭缂栧彿锛�</div>
- <div class="search_input">
- <el-input v-model="addObj.entrustCode" disabled placeholder="绯荤粺鐢熸垚" size="small"></el-input>
- </div>
- </el-col>
- <el-col :span="6" class="search_thing">
- <div class="search_label"><span class="required-span">* </span>妫�楠岀被鍒細</div>
- <div class="search_input">
- <el-select v-model="addObj.orderType" :disabled="active>1&&tabIndex!=4" clearable size="small" style="width: 100%;">
- <el-option v-for="(a, ai) in orderType" :key="ai" :label="a.label" :value="a.value"></el-option>
- </el-select>
- </div>
- </el-col>
- <el-col :span="6" class="search_thing" >
- <div class="search_label"><span class="required-span">* </span>鍒跺崟浜猴細</div>
- <div class="search_input">
- <el-input v-model="addObj.custom" clearable disabled size="small"></el-input>
- <!-- <el-input disabled 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 :span="6" class="search_thing">
- <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 v-model="addObj.company" disabled placeholder="閫夋嫨濮旀墭鍗曚綅" size="small">
- <template slot="append"><el-button slot="append" :disabled="active>1&&tabIndex!=4" icon="el-icon-search"
- @click="selectUserDia = true"></el-button></template>
- </el-input>
- </div>
- </el-col>
- <el-col :span="6" class="search_thing">
- <div class="search_label"><span class="required-span">* </span>鑱旂郴鏂瑰紡锛�</div>
- <div class="search_input">
- <el-input v-model="addObj.phone" :disabled="active>1&&tabIndex!=4" clearable placeholder="閫夋嫨濮旀墭瀹㈡埛" size="small"></el-input>
- </div>
- </el-col>
- <el-col :span="6" class="search_thing">
- <div class="search_label"><span class="required-span">* </span>绱ф�ョ▼搴︼細</div>
- <div class="search_input">
- <el-select v-model="addObj.type" :disabled="active>1&&tabIndex!=4" clearable size="small" style="width: 100%;">
- <el-option v-for="(a, ai) in type" :key="ai" :label="a.label" :value="a.value"></el-option>
- </el-select>
- </div>
- </el-col>
- <el-col :span="6" class="search_thing">
- <div class="search_label"><span class="required-span">* </span>鏍峰搧鍚嶇О锛�</div>
- <div class="search_input">
- <el-input v-model="addObj.sample" disabled size="small">
- <template slot="append"><el-button slot="append" :disabled="active>1&&tabIndex!=4" icon="el-icon-search"
- @click="selectStandardTree = true"></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 :span="6" class="search_thing">
- <div class="search_label"><span class="required-span">* </span>鏍峰搧鏁伴噺锛�</div>
- <div class="search_input">
- <el-input-number v-model="addObj.sampleNum" :disabled="active>1" :max="100" :min="1" :precision="0"
- size="small" style="width: 65%;" @change="addStandardTree"></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 :span="6" class="search_thing">
- <div class="search_label"><span class="required-span">* </span>鏍峰搧鐘舵�侊細</div>
- <div class="search_input">
- <el-select v-model="addObj.sampleStatus" :disabled="active>1&&tabIndex!=4" size="small" style="width: 100%;">
- <el-option v-for="(a,ai) in sampleStatusList" :key="ai" :label="a.label" :value="a.value"></el-option>
- </el-select>
- </div>
- </el-col>
- <el-col :span="6" class="search_thing">
- <div class="search_label"><span class="required-span">* </span>鎶芥鏁伴噺锛�</div>
- <div class="search_input">
- <el-input v-model="addObj.testQuantity" :disabled="active>1&&tabIndex!=4" clearable size="small"></el-input>
- </div>
- </el-col>
- <el-col :span="6" class="search_thing">
- <div class="search_label"><span class="required-span">* </span>鏉ユ牱鏂瑰紡锛�</div>
- <div class="search_input">
- <el-select v-model="addObj.formType" :disabled="active>1&&tabIndex!=4" size="small" 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 :span="6" class="search_thing">
- <div class="search_label">鎶ュ憡鍙戦�佹柟寮忥細</div>
- <div class="search_input">
- <el-radio-group v-model="addObj.send" :disabled="active>1&&tabIndex!=4">
- <el-radio :label="1">鑷彇</el-radio>
- <el-radio :label="0">鍏朵粬</el-radio>
- </el-radio-group>
- </div>
- </el-col>
- <el-col :span="6" class="search_thing">
- <div class="search_label">鏍峰搧澶勭悊鏂瑰紡锛�</div>
- <div class="search_input">
- <el-radio-group v-model="addObj.processing" :disabled="active>1&&tabIndex!=4">
- <el-radio :label="0">濮旀墭鍗曚綅鍙栧洖</el-radio>
- <el-radio :label="1">瀹為獙瀹ゅ鐞�</el-radio>
- </el-radio-group>
- </div>
- </el-col>
- <el-col :span="6" class="search_thing">
- <div class="search_label"><span class="required-span">* </span>鐢熶骇鍗曚綅锛�</div>
- <div class="search_input">
- <el-input v-model="addObj.production" :disabled="active>1&&tabIndex!=4" clearable placeholder="璇疯緭鍏�"
- size="small"></el-input>
- </div>
- </el-col>
- <el-col :span="6" class="search_thing">
- <div class="search_label"><span class="required-span">* </span>鐢熶骇鍗曚綅EN锛�</div>
- <div class="search_input">
- <el-input v-model="addObj.productionEn" :disabled="active>1&&tabIndex!=4" clearable placeholder="璇疯緭鍏�"
- size="small"></el-input>
- </div>
- </el-col>
- <el-col :span="6" class="search_thing">
- <div class="search_label">鏄惁鐣欐牱锛�</div>
- <div class="search_input">
- <el-radio-group v-model="addObj.isLeave" :disabled="active>1&&tabIndex!=4">
- <el-radio :label="0">涓嶇暀鏍�</el-radio>
- <el-radio :label="1">鐣欐牱</el-radio>
- </el-radio-group>
- </div>
- </el-col>
- <el-col :span="6" class="search_thing">
- <div class="search_label">濮旀墭浜猴細</div>
- <div class="search_input">
- <el-input v-model="addObj.prepareUser" :disabled="active>1&&tabIndex!=4" :placeholder="active>1 ? '' : '璇疯緭鍏�'" clearable size="small"></el-input>
- </div>
- </el-col>
- <el-col :span="6" class="search_thing">
- <div class="search_label">濮旀墭浜鸿嫳鏂囷細</div>
- <div class="search_input">
- <el-input v-model="addObj.prepareUserEn" :disabled="active>1&&tabIndex!=4" :placeholder="active>1 ? '' : '璇疯緭鍏�'" clearable size="small"></el-input>
- </div>
- </el-col>
- <el-col :span="6" class="search_thing" style="align-items: flex-start;margin: 8px 0;">
- <div class="search_label">澶囨敞锛�</div>
- <div class="search_input">
- <el-input v-model="addObj.remark" :autosize="{ minRows: 2, maxRows: 2}" :disabled="active>1&&tabIndex!=4" :placeholder="active>1 ? '' : '璇疯緭鍏�'" clearable
- size="small" type="textarea"></el-input>
- </div>
- </el-col>
- <el-col :span="6" class="search_thing" style="align-items: flex-start;margin: 8px 0;">
- <div class="search_label">澶囨敞鑻辨枃锛�</div>
- <div class="search_input">
- <el-input v-model="addObj.remarkEn" :autosize="{ minRows: 2, maxRows: 2}" :disabled="active>1&&tabIndex!=4" :placeholder="active>1 ? '' : '璇疯緭鍏�'" clearable
- size="small" type="textarea"></el-input>
- </div>
- </el-col>
- <el-col :span="6" class="search_thing" style="align-items: flex-start;margin: 8px 0;">
- <div class="search_label">鏍峰搧鍚嶇О锛�</div>
- <div class="search_input">
- <el-input v-model="addObj.sampleView" :disabled="active>1&&tabIndex!=4" :placeholder="active>1 ? '' : '璇疯緭鍏�'" clearable
- size="small"></el-input>
- </div>
- </el-col>
- <el-col :span="6" class="search_thing" style="align-items: flex-start;margin: 8px 0;">
- <div class="search_label">鏍峰搧鍚嶇О鑻辨枃锛�</div>
- <div class="search_input">
- <el-input v-model="addObj.sampleViewEn" :disabled="active>1&&tabIndex!=4" :placeholder="active>1 ? '' : '璇疯緭鍏�'" clearable
- size="small"></el-input>
- </div>
- </el-col>
- <el-col :span="6" class="search_thing" style="align-items: flex-start;margin: 8px 0;">
- <div class="search_label">濮旀墭浜哄伐鍙凤細</div>
- <div class="search_input">
- <el-input v-model="addObj.prepareCode" :disabled="active>1&&tabIndex!=4" :placeholder="active>1 ? '' : '璇疯緭鍏�'" clearable
- size="small"></el-input>
- </div>
- </el-col>
- </el-row>
+ <el-form ref="addObj" :inline="true" :model="addObj" :rules="addObjRules" label-width="108px" label-position="right">
+ <el-form-item label="濮旀墭缂栧彿:">
+ <el-input v-model="addObj.entrustCode" clearable disabled placeholder="绯荤粺鐢熸垚" size="small"></el-input>
+ </el-form-item>
+ <el-form-item label="妫�楠岀被鍒�:" prop="orderType">
+ <el-select v-model="addObj.orderType" :disabled="active>1&&tabIndex!=4" clearable size="small" style="width: 100%;">
+ <el-option v-for="(a, ai) in dict.type.check_type1" :key="ai" :label="a.label" :value="a.value"></el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="鍒跺崟浜�:">
+ <el-input v-model="addObj.custom" disabled size="small"></el-input>
+ </el-form-item>
+ <el-form-item label="濮旀墭鍗曚綅:" prop="company">
+ <el-input v-model="addObj.company" disabled placeholder="閫夋嫨濮旀墭鍗曚綅" size="small" style="width: 200px">
+ <template slot="append">
+ <el-button slot="append" :disabled="active>1&&tabIndex!=4" icon="el-icon-search"
+ @click="openCompanyList"></el-button>
+ </template>
+ </el-input>
+ </el-form-item>
+ <el-form-item label="鑱旂郴鏂瑰紡:" prop="phone">
+ <el-input v-model="addObj.phone" :disabled="active>1&&tabIndex!=4" clearable placeholder="閫夋嫨濮旀墭瀹㈡埛" size="small"></el-input>
+ </el-form-item>
+ <el-form-item label="绱ф�ョ▼搴�:" prop="type">
+ <el-select v-model="addObj.type" :disabled="active>1&&tabIndex!=4" clearable size="small">
+ <el-option v-for="(a, ai) in dict.type.urgency_level" :key="ai" :label="a.label" :value="a.value"></el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="鏍峰搧鍚嶇О:" prop="sample">
+ <el-input v-model="addObj.sample" disabled size="small" style="width: 178px">
+ <template slot="append"><el-button slot="append" :disabled="active>1&&tabIndex!=4" icon="el-icon-search"
+ @click="selectStandardTree = true"></el-button></template>
+ </el-input>
+ </el-form-item>
+ <el-form-item label="鏍峰搧鏁伴噺:" prop="sampleNum">
+ <el-input-number v-model="addObj.sampleNum" :disabled="active>1" :max="100" :min="1" :precision="0"
+ size="small" style="width: 65%;" @change="addStandardTree"></el-input-number>
+ </el-form-item>
+ <el-form-item label="鏍峰搧鐘舵��:" prop="sampleStatus">
+ <el-select v-model="addObj.sampleStatus" :disabled="active>1&&tabIndex!=4" size="small">
+ <el-option v-for="(a,ai) in dict.type.sample_status_list" :key="ai" :label="a.label" :value="a.value"></el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="鎶芥鏁伴噺:" prop="testQuantity">
+ <el-input v-model="addObj.testQuantity" :disabled="active>1&&tabIndex!=4" clearable size="small"></el-input>
+ </el-form-item>
+ <el-form-item label="鏉ユ牱鏂瑰紡:" prop="formType">
+ <el-select v-model="addObj.formType" :disabled="active>1&&tabIndex!=4" size="small">
+ <el-option v-for="(a,ai) in dict.type.form_type" :key="ai" :label="a.label" :value="a.value"></el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="鎶ュ憡鍙戦�佹柟寮�:">
+ <el-radio-group v-model="addObj.send" :disabled="active>1&&tabIndex!=4">
+ <el-radio :label="1">鑷彇</el-radio>
+ <el-radio :label="0">鍏朵粬</el-radio>
+ </el-radio-group>
+ </el-form-item>
+ <el-form-item label="鏍峰搧澶勭悊鏂瑰紡:">
+ <el-radio-group v-model="addObj.processing" :disabled="active>1&&tabIndex!=4">
+ <el-radio :label="0">濮旀墭鍗曚綅鍙栧洖</el-radio>
+ <el-radio :label="1">瀹為獙瀹ゅ鐞�</el-radio>
+ </el-radio-group>
+ </el-form-item>
+ <el-form-item label="鐢熶骇鍗曚綅:" prop="production">
+ <el-input v-model="addObj.production" :disabled="active>1&&tabIndex!=4" clearable placeholder="璇疯緭鍏�"
+ size="small"></el-input>
+ </el-form-item>
+ <el-form-item label="鐢熶骇鍗曚綅EN:" prop="productionEn">
+ <el-input v-model="addObj.productionEn" :disabled="active>1&&tabIndex!=4" clearable placeholder="璇疯緭鍏�"
+ size="small"></el-input>
+ </el-form-item>
+ <el-form-item label="鏄惁鐣欐牱:">
+ <el-radio-group v-model="addObj.isLeave" :disabled="active>1&&tabIndex!=4">
+ <el-radio :label="0">涓嶇暀鏍�</el-radio>
+ <el-radio :label="1">鐣欐牱</el-radio>
+ </el-radio-group>
+ </el-form-item>
+ <el-form-item label="濮旀墭浜�:">
+ <el-input v-model="addObj.prepareUser" :disabled="active>1&&tabIndex!=4" :placeholder="active>1 ? '' : '璇疯緭鍏�'" clearable size="small"></el-input>
+ </el-form-item>
+ <el-form-item label="濮旀墭浜鸿嫳鏂�:">
+ <el-input v-model="addObj.prepareUserEn" :disabled="active>1&&tabIndex!=4" :placeholder="active>1 ? '' : '璇疯緭鍏�'" clearable size="small"></el-input>
+ </el-form-item>
+ <el-form-item label="澶囨敞:">
+ <el-input v-model="addObj.remark" :autosize="{ minRows: 2, maxRows: 2}" :disabled="active>1&&tabIndex!=4" :placeholder="active>1 ? '' : '璇疯緭鍏�'" clearable
+ size="small" type="textarea"></el-input>
+ </el-form-item>
+ <el-form-item label="澶囨敞鑻辨枃:">
+ <el-input v-model="addObj.remarkEn" :autosize="{ minRows: 2, maxRows: 2}" :disabled="active>1&&tabIndex!=4" :placeholder="active>1 ? '' : '璇疯緭鍏�'" clearable
+ size="small" type="textarea"></el-input>
+ </el-form-item>
+ <el-row>
+ <el-col :span="6">
+ <el-form-item label="鏍峰搧鍚嶇О:">
+ <el-input v-model="addObj.sampleView" :disabled="active>1&&tabIndex!=4" :placeholder="active>1 ? '' : '璇疯緭鍏�'" clearable
+ size="small"></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="鏍峰搧鍚嶇О鑻辨枃:">
+ <el-input v-model="addObj.sampleViewEn" :disabled="active>1&&tabIndex!=4" :placeholder="active>1 ? '' : '璇疯緭鍏�'" clearable
+ size="small"></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="濮旀墭浜哄伐鍙�:">
+ <el-input v-model="addObj.prepareCode" :disabled="active>1&&tabIndex!=4" :placeholder="active>1 ? '' : '璇疯緭鍏�'" clearable
+ size="small"></el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ </el-form>
</div>
<div>
- <div style="display: flex;flex-direction: row;justify-content: space-between;padding: 5px 0;">
- <div v-if="active==1" style="display: flex;background: transparent;">
- <div class="search_thing">
- <div class="search_label">鏍峰搧鍨嬪彿锛�</div>
- <div class="search_input">
+ <div style="display: flex;justify-content: space-between;">
+ <div v-if="active==1">
+ <el-form :inline="true" :model="addObj1" label-width="90px">
+ <el-form-item label="鏍峰搧鍨嬪彿:" style="margin-bottom: 6px">
<el-select v-model="model" :placeholder="active>1 ? '' : '璇疯緭鍏�'"
allow-create clearable default-first-option filterable
size="small"
@@ -247,21 +165,18 @@
<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-form-item>
+ <el-form-item label="妫�楠屾爣鍑�:">
<el-select v-model="standardMethodListId" :loading="methodLoad"
:placeholder="active>1 ? '' : '璇疯緭鍏�'" clearable size="small"
@change="changeStandardMethodListId" @focus="methodFocus">
<el-option v-for="item in methods" :key="item.id" :label="item.code" :value="item.id">
</el-option>
</el-select>
- </div>
- </div>
+ </el-form-item>
+ </el-form>
</div>
- <div class="search_thing">
+ <div style="display: flex;align-items: center">
<span style="width: 150px;font-size: 14px;text-align: right;">鐗规畩鏍囧噯锛�</span>
<el-input v-model="specialStandardMethod" :disabled="!isSpecial" clearable
size="small"></el-input>
@@ -433,8 +348,11 @@
</div>
</div>
<el-dialog :visible.sync="selectUserDia" title="閫夋嫨鍗曚綅" width="70%">
- <div v-if="selectUserDia" class="body" style="height: 60vh;">
- <ValueTable ref="ValueTable2" :componentData="componentData2" :url="$api.user.selectCustomPageList" />
+ <div v-if="selectUserDia" class="body">
+ <lims-table :tableData="tableData1" :column="column1"
+ :isSelection="true" :handleSelectionChange="selectMethod"
+ @pagination="pagination1" height="400px" key="tableData1"
+ :page="page1" :tableLoading="tableLoading1"></lims-table>
</div>
<span slot="footer" class="dialog-footer">
<el-button @click="selectUserDia = false">鍙� 娑�</el-button>
@@ -481,8 +399,7 @@
<el-button :loading="templateLoading" type="primary" @click="addTemplateDia">纭� 瀹�</el-button>
</span>
</el-dialog>
- <el-dialog :close-on-click-modal="false" :close-on-press-escape="false" :show-close="false" :visible.sync="issuedDialogVisible"
- title="妫�楠屼笅鍙�" width="400px">
+ <el-dialog :close-on-click-modal="false" :close-on-press-escape="false" :show-close="false" :visible.sync="issuedDialogVisible" title="妫�楠屼笅鍙�" width="400px">
<div class="body" style="max-height: 60vh;">
<el-row>
<el-col :span="22" class="search_thing">
@@ -515,7 +432,7 @@
</div>
<span slot="footer" class="dialog-footer">
<el-row>
- <el-button @click="issuedDialogVisible=false;$parent.playOrder(0)">鍙� 娑�</el-button>
+ <el-button @click="issuedDialogVisible=false;goBack">鍙� 娑�</el-button>
<el-button :loading="upLoad" type="primary" @click="submitForm2">纭� 瀹�</el-button>
</el-row>
</span>
@@ -538,10 +455,6 @@
</el-row>
</span>
</el-dialog>
- <fiberOpticConfig v-if="configShow && examine==0" :active="active" :currentId="currentId" :inspectionItemST='inspectionItemST' @saveFiberopticConfig="getTotal()" />
- <fiberOpticConfigTwo v-if="configShow && examine==1" :active="active" :currentId="currentId" />
- <!--瀛愭牱鍝侀厤缃�-->
- <equipConfig v-if="equipConfigShow" :active="active" :currentId="currentId" />
<!--鐢电紗閰嶇疆-->
<cableConfig v-if="cableConfigShow" ref="cableConfigShow" :active="active" :isSpecial="isSpecial" :sampleSelectionList="sampleSelectionList" @goBackAdd="goBackAdd"/>
<!--杈呭姪绾胯姱閰嶇疆-->
@@ -579,6 +492,7 @@
</el-row>
</span>
</el-dialog>
+ <!--鍖洪棿濉啓-->
<el-dialog :close-on-click-modal="false" :close-on-press-escape="false"
:show-close="false" :visible.sync="bsm3Dia"
title="鍖洪棿鍊煎～鍐�" width="800px">
@@ -620,157 +534,43 @@
</el-row>
</span>
</el-dialog>
- <el-dialog :before-close="beforeCirculateShowClose" :close-on-click-modal="false" :close-on-press-escape="false"
- :show-close="false" :visible.sync="circulateShow"
- title="娓╁害寰幆瑕佹眰濉啓" width="900px">
- <div class="search" style="display: flex;background: transparent;">
- <div class="search_thing">
- <div class="search_label">淇濇俯鏃堕棿锛�</div>
- <div class="search_input">
- <el-input v-model="circulateForm.entrustTime" placeholder="" size="small" type="number"></el-input>
- </div>
- </div>
- <div class="search_thing">
- <div class="search_label">寰幆娆℃暟锛�</div>
- <div class="search_input">
- <el-input v-model="circulateForm.entrustNum" placeholder="" size="small" type="number"></el-input>
- </div>
- </div>
- <div class="search_thing">
- <div class="search_label">娓╁害鐐癸細</div>
- <div class="search_input">
- <el-input v-model="circulateForm.entrustPoint" placeholder="" size="small" type="number" @blur="changeTemperatureData"></el-input>
- </div>
- </div>
- </div>
- <div class="circulateTable">
- <div class="opticalProject">
- <div style="line-height: 30px;">鍏夌氦椤圭洰</div>
- <el-divider></el-divider>
- <div>
- <el-table
- ref="multipleTable"
- :cell-style="{'text-align':'center'}"
- :data="opticalProject"
- :header-cell-style="{'text-align':'center'}"
- border
- style="width: 100%"
- tooltip-effect="dark"
- @select="selectOpticalProject"
- @row-click="rowClickOptical"
- @select-all="selectAllOptical"
- @selection-change="handleSelectionChange">
- <el-table-column
- type="selection"
- width="55">
- </el-table-column>
- <el-table-column label="鍏夌氦椤圭洰" prop="value" show-overflow-tooltip></el-table-column>
- </el-table>
- </div>
- </div>
- <div class="temperatureList">
- <div class="temperatureListTitle">
- <span>娓╁害鐐归泦鍚�</span>
- <span>
- <el-button size="mini" type="primary" @click="addTemperatureData">鏂板</el-button>
- <el-button size="mini" @click="deleteTemperatureData">鍒犻櫎</el-button>
- </span>
- </div>
- <el-divider></el-divider>
- <el-table
- :cell-style="{'text-align':'center'}"
- :data="temperatureData"
- :header-cell-style="{'text-align':'center'}"
- border
- style="width: 100%">
- <el-table-column label="娓╁害鐐�(鈩�)" prop="date" width="120px">
- <template slot-scope="scope">
- <el-input v-model="scope.row.temperaturePoint" clearable placeholder="璇疯緭鍏�" size="small" @change="changeTemperature"></el-input>
- </template>
- </el-table-column>
- <el-table-column label="瑕佹眰(dB/Km)" prop="name">
- <template slot-scope="scope">
- <span>x</span>
- <el-select v-model="scope.row.askSymbol" placeholder="璇烽�夋嫨" size="small" style="width: 120px" @change="changeTemperature">
- <el-option v-for="item in temperatureDataList" :key="item.value" :label="item.label" :value="item.value">
- </el-option>
- </el-select>
- <el-input v-model="scope.row.askNum" clearable placeholder="璇疯緭鍏�" size="small" 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 :before-close="beforeCirculateShowClose" :close-on-click-modal="false" :close-on-press-escape="false"
- :show-close="false" :visible.sync="singleVerticalCombustionShow"
- title="鍗曟牴鍨傜洿鐕冪儳妫�娴嬫鏁板～鍐�" width="900px">
- <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 :before-close="temperatureShowClose" :close-on-click-modal="false"
- :close-on-press-escape="false" :show-close="false"
- :title="temperatureTitle" :visible.sync="temperatureShow" width="260px">
- <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" :max="1000000" :min="2" label="" size="small"></el-input-number>
- </div>
- <el-checkbox-group v-model="temperatureTest" style="display: flex;flex-direction: column;" @change="handleTemperatureTestChange">
- <el-checkbox v-for="item in temperatureList" :key="item" :label="item" style="margin-bottom: 6px">{{item}}</el-checkbox>
- </el-checkbox-group>
- </div>
- <span slot="footer" class="dialog-footer">
- <el-button @click="cleanTemperatureTest">鍙栨秷</el-button>
- <el-button type="primary" @click="spliceTemperatureTest">淇濆瓨</el-button>
- </span>
- </el-dialog>
</div>
</template>
<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 AuxiliaryWireCore from "./auxiliaryWireCore.vue";
+import cableConfig from './cable-config.vue'
+import AuxiliaryWireCore from "./auxiliaryWireCore.vue";
+import {
+ getInsOrder,
+ getUserNow, selectInsOrderTemplate,
+ selectStandardMethodEnum, selectStandardProductList,
+ selectStandardTreeList2
+} from "@/api/business/rawMaterialOrder";
+import {
+ addInsOrder, delInsOrderTemplate,
+ getQuarterOnOrder,
+ selectOrderManDay,
+ updateInsOrder,
+ upInsOrder,
+ upInsOrderOfState
+} from "@/api/business/add";
+import {selectUserCondition} from "@/api/performance/class";
+import {selectsStandardMethodByFLSSM} from "@/api/standard/standardLibrary";
+import limsTable from "@/components/Table/lims-table.vue";
+import {selectCustomPageList} from "@/api/system/customer";
export default {
- components: {
- // AuxiliaryWireCore,
- // ValueTable,
- // fiberOpticConfig,
- // fiberOpticConfigTwo,
- // equipConfig,
- // cableConfig
- },
- props: {
- currentId: {
- type: Number,
- default: () => 0
- },
- tabIndex:{
- type: Number,
- default: () => 0
- }
- },
+ components: {
+ limsTable,
+ cableConfig,
+ AuxiliaryWireCore
+ },
+ dicts: ['check_type1', 'urgency_level', 'form_type', 'sample_status_list'],
data() {
return {
- examine: '',
active: '',
- inspectionItemST: null,
+ tabIndex: '',
+ currentId: '',
sampleSelectionList: [],//鏍峰搧琛ㄦ牸閫変腑鏁版嵁
editTable:[],
template: null,
@@ -811,6 +611,41 @@
sampleView: '', // 鏍峰搧鍚嶇О锛堟姤鍛婂睍绀哄瓧娈碉級
sampleViewEn: '', // 鏍峰搧鍚嶇О鑻辨枃锛堟姤鍛婂睍绀哄瓧娈碉級
},
+ addObjRules: { // 琛ㄥ崟鏍￠獙瑙勫垯
+ orderType: [
+ { required: true, message: '璇烽�夋嫨妫�楠岀被鍒�', trigger: 'change' }
+ ],
+ company: [
+ { required: true, message: '璇烽�夋嫨濮旀墭鍗曚綅', trigger: 'change' }
+ ],
+ phone: [
+ { required: true, message: '璇峰～鍐欒仈绯绘柟寮�', trigger: 'blur' }
+ ],
+ type: [
+ { required: true, message: '璇烽�夋嫨绱ф�ョ▼搴�', trigger: 'change' }
+ ],
+ sample: [
+ { required: true, message: '璇烽�夋嫨鏍峰搧鍚嶇О', trigger: 'change' }
+ ],
+ sampleNum: [
+ { required: true, message: '璇峰～鍐欐牱鍝佹暟閲�', trigger: 'blur' }
+ ],
+ sampleStatus: [
+ { required: true, message: '璇烽�夋嫨鏍峰搧鐘舵��', trigger: 'change' }
+ ],
+ formType: [
+ { required: true, message: '璇烽�夋嫨鏉ユ牱鏂瑰紡', trigger: 'change' }
+ ],
+ testQuantity: [
+ { required: true, message: '璇峰～鍐欐娊妫�鏁伴噺', trigger: 'blur' }
+ ],
+ production: [
+ { required: true, message: '璇峰～鍐欑敓浜у崟浣�', trigger: 'blur' }
+ ],
+ productionEn: [
+ { required: true, message: '璇峰～鍐欑敓浜у崟浣岴N', trigger: 'blur' }
+ ],
+ },
sample: {
sampleCode: null,
laboratory: null,
@@ -825,31 +660,23 @@
},
type: [],
selectUserDia: false,
- componentData2: {
- entity: {
- orderBy: {
- field: 'id',
- order: 'desc'
- }
- },
- isIndex: true,
- showSelect: true,
- select: false,
- do: [],
- tagField: {
- state: {
- select: [{
- value: 1,
- type: 'success',
- label: '鍚敤'
- }, {
- value: 0,
- type: 'danger',
- label: '鍋滅敤'
- }]
- }
- },
- selectField: {},
+ tableData1: [],
+ tableLoading1: false,
+ multipleSelection: [],
+ column1: [
+ {label: '瀹㈡埛鍚嶇О', prop: 'company'},
+ {label: '瀹㈡埛鍗曚綅EN', prop: 'companyEn'},
+ {label: '鍗曚綅鍦板潃', prop: 'address'},
+ {label: '鍗曚綅鍦板潃EN', prop: 'addressEn'},
+ {label: '鍗曚綅鐢佃瘽', prop: 'phone'},
+ {label: '鍔犳�ラ搴�', prop: 'num'},
+ {label: '瀹㈡埛缂栧彿', prop: 'code2'},
+ {label: '宸ュ巶鍩�', prop: 'code'}
+ ],
+ page1: {
+ total:0,
+ size:10,
+ current:1
},
selectStandardTree: false,
search: null,
@@ -867,7 +694,6 @@
productList0: [],
bsm1DiaList: [],
productIds: [],
- productListSelected: [],
getProductLoad: false,
saveLoad: false,
templateDia: false,
@@ -881,7 +707,6 @@
},
personList: [],
upLoad: false,
- units: [],
models: [],
methods: [],
methodLoad: false,
@@ -891,7 +716,6 @@
orderType: [],
filters: [],
formType: [],
- configShow: false,
currentMethod: null,
isAskOnlyRead: false,
sampleId: null,
@@ -899,59 +723,28 @@
bsm1: false,
bsm1Val: null,
bsm1DiaAll: false,
- equipConfigShow: false,
cableConfigShow: false,
auxiliaryShow: false,
- bsm2: false,
- bsm2Val: null,
- bsm2Dia: false,
- bsm2Val2: [],
- bsm2Val3: [],
- bsmRow3: null,
- bsm3Val: null,
bsm3Dia: false,
// total: 0,
RTS: '',
totalArr: [],
+ addObj1: {},
model: null,
standardMethodListId: null,
symbolList:['RTS'],
inspectionItem:null,
inspectionItemSubclass:null,
methodS:null,
- circulateShow:false,
- circulateForm:{
- entrustTime: '',
- entrustNum: '',
- entrustPoint: ''
- },
- singleVerticalCombustionShow: false,
isBsm2Val2:false,
- opticalProject: [], // 娓╁害寰幆寮规鍏夌氦椤圭洰鍒楄〃
- opticalProjectList: [], // 娓╁害寰幆寮规鍏夌氦椤圭洰閫変腑鐨勬暟缁�
- temperatureData: [], // 娓╁害寰幆寮规娓╁害鐐归泦鍚堝垪琛�
- temperatureDataList: [
- {label: '<', value: '<'},
- {label: '鈮�', value: '鈮�'},
- {label: '=', value: '='},
- {label: '鈮�', value: '鈮�'},
- {label: '>', value: '>'},
- ],
- temperatureShow: false, // 娓╁崌璇曢獙妫�楠岄」寮规
- temperatureTest: [],
- temperatureList: [],
temperatureEngList: [],
- temperatureTitle: '',
- temperatureTestNum: '',
isShowInput: false,
temId: '',
sonLaboratoryList:[],
selectiveEcho: [], // 妫�楠屼笅鍗曠殑鏃跺�欏嬀閫夋楠岄」鐩�,濡傛灉浣跨敤绛涢�夋彁浜ゆ樉绀烘楠岄」鐩负绌� 鍥炴樉鍒楄〃
- sampleStatusList: [], // 鏍峰搧鐘舵�佷笅鎷夋鏁版嵁
quarterItemOptions: [], // 鏌ヨ瀛ｅ害淇℃伅
specialStandardMethod: '',
isSpecial: false,
- userList: [],
}
},
watch: {
@@ -973,23 +766,6 @@
}
})
this.filters = arr
- }
- }
- },
- 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
}
}
},
@@ -1017,24 +793,17 @@
},
mounted() {
this.active = this.$route.query.active
- this.examine = this.$route.query.examine
- this.selectEnumByCategoryForType()
- this.getUserNow()
+ this.tabIndex = this.$route.query.tabIndex
+ this.currentId = this.$route.query.currentId
+ this.getUserNowData()
this.selectStandardTreeList()
- // this.selectInsOrderTemplate()
this.getAuthorizedPerson();
- this.selectEnumByCategoryForUnit()
this.selectStandardMethods()
- this.selectEnumByCategoryForOrderType()
- // this.selectEnumByCategoryForSonLaboratory()
- this.selectEnumByCategoryForSampleForm() // 鏉ユ牱鏂瑰紡瀛楀吀
- this.selectSampleStatus() // 鏍峰搧鐘舵�佸瓧鍏�
- // this.getUserList()
this.getPrepareUser() // 澶嶅埗褰撳墠璐﹀彿浜轰负濮旀墭浜�
if (this.active != 1) {
// 鏌ョ湅/瀹℃牳娴佺▼
// 璇锋眰鎺ュ彛锛屽洖鏄炬暟鎹�
- this.$axios.post(this.$api.insOrder.getInsOrder, {
+ getInsOrder({
orderId: this.currentId
}).then(res => {
this.addObj = {
@@ -1062,39 +831,20 @@
},
methods: {
getPrepareUser () {
- this.addObj.prepareUser = JSON.parse(localStorage.getItem("user")).name;
- this.addObj.prepareUserEn = JSON.parse(localStorage.getItem("user")).nameEn
- this.addObj.prepareCode = JSON.parse(localStorage.getItem("user")).account
- },
- getUserList(){
- this.$axios.post(this.$api.user.selectUserList, {
- page: {current: -1, size: -1,},
- entity: {name: null}
- }, {
- headers: {
- 'Content-Type': 'application/json'
- }
- }).then(res => {
- if (res.code === 201) {
- return
- }
- this.userList = res.data.body.records
- })
+ // this.addObj.prepareUser = JSON.parse(localStorage.getItem("user")).name;
+ // this.addObj.prepareUserEn = JSON.parse(localStorage.getItem("user")).nameEn
+ // this.addObj.prepareCode = JSON.parse(localStorage.getItem("user")).account
},
// 缂栬緫瑕佹眰鍊艰〃鏍�
editSpecial () {
this.isSpecial = true
},
- getQuarterOnOrder () {
- this.$axios.get(this.$api.finishProductSpotCheck.getQuarterOnOrder).then(res => {
+ getQuarterOnOrderList () {
+ getQuarterOnOrder().then(res => {
if (res.code === 200) {
- console.log('res----', res)
this.quarterItemOptions = res.data
}
})
- },
- handleChange () {
-
},
//鐗规畩鍊煎～鍐欏鐞�
inputValueHandler(row,index){
@@ -1106,221 +856,6 @@
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))
- 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 entrustTime = this.circulateForm.entrustTime
- let entrustNum = this.circulateForm.entrustNum
- let opticalProjectList2 = JSON.parse(JSON.stringify(this.opticalProjectList))
- let askArr = []
- let opticalProjectArr = []
- opticalProjectList.forEach(o => {
- opticalProjectArr.push(o.value)
- o.temperatureData.unshift({temperaturePoint: 20})
- o.temperatureData.forEach(t => {
- if (!t.askSymbol) {
- const askObj = t.temperaturePoint + '鈩�(甯告俯)' + ',' + o.value + ',' + null
- askArr.push(askObj)
- } else {
- const askObj = t.temperaturePoint + '鈩�' + ',' + o.value + ',' + t.askSymbol + t.askNum
- askArr.push(askObj)
- }
- })
- })
- askArr.push(this.circulateForm.entrustNum)
- const ask = askArr.join(';')
- // 鎷兼帴瑕佹眰鎻忚堪tell
- let askNum = []
- let temperaturePointList = []
- let temperaturePointList2 = []
- entrustTime = entrustTime + 'h'
- entrustNum = entrustNum + '娆�'
- opticalProjectList2.forEach(o => {
- o.temperatureData.forEach(t => {
- t.temperaturePoint = t.temperaturePoint + '鈩�'
- temperaturePointList2.push(t.temperaturePoint)
- temperaturePointList.push(t.temperaturePoint)
- askNum.push(t.askSymbol + t.askNum + 'dB/Km')
- })
- })
- temperaturePointList = Array.from(new Set(temperaturePointList))
- temperaturePointList2 = Array.from(new Set(temperaturePointList2))
- temperaturePointList2.unshift(20 + '鈩�(甯告俯)')
- let additionArr = []
- askNum.forEach(a => {
- additionArr.push(temperaturePointList.join(',') + a)
- })
- additionArr = Array.from(new Set(additionArr))
- const tell = '娓╁害鑼冨洿:' + temperaturePointList2.join(',') + ';' + '淇濇俯鏃堕棿:' + entrustTime + ';' + '寰幆娆℃暟:'
- + entrustNum + ';' + '鍏夌氦(' + opticalProjectArr.join(',') + ')' + '闄勫姞琛板噺缁濆鍊�:' + additionArr.join(';')
- this.productList.forEach(item => {
- if (item.inspectionItem === '娓╁害寰幆') {
- item.ask = ask
- item.tell = tell
- }
- })
- this.circulateShow = false
- this.changeProductList0()
- 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
- }
- })
- this.temperatureShow = false
- },
- temperatureShowClose () {
- if (this.temperatureTitle === '鐑惊鐜姹傚～鍐�' && !this.temperatureTestNum) {
- this.$message.error('璇峰～鍐欏惊鐜鏁�')
- return
- }
- if (this.temperatureTest.length === 0) {
- this.$message.error('璇烽�夋嫨')
- return
- }
- this.spliceTemperatureTest()
- },
- 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
- }
- // 鎷兼帴瑕佹眰鍊糰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) {
- },
- handleSelectionChange(val) {
- this.opticalProjectList = val;
- },
- selectAllOptical (val) {
- if (val.length > 0) {
- if (val[val.length-1].temperatureData) {
- this.temperatureData = this.HaveJson(val.temperatureData)
- } else {
- this.temperatureData = []
- }
- } else {
- this.temperatureData = []
- }
- this.circulateForm.entrustPoint = this.temperatureData.length
- },
- selectOpticalProject (val) {
- if (val.temperatureData) {
- this.temperatureData = this.HaveJson(val.temperatureData)
- } else {
- this.temperatureData = []
- }
- this.circulateForm.entrustPoint = this.temperatureData.length
- },
- rowClickOptical (val) {
- const index = this.opticalProjectList.findIndex(item => item.value === val.value)
- if (index > -1 && val.temperatureData) {
- this.temperatureData = this.HaveJson(val.temperatureData)
- }
- this.circulateForm.entrustPoint = this.temperatureData.length
- },
- changeTemperature () {
- this.opticalProjectList.forEach(item => {
- item.temperatureData = this.HaveJson(this.temperatureData)
- })
- },
- addTemperatureData () {
- const obj = {}
- this.temperatureData.push(obj)
- this.circulateForm.entrustPoint = this.temperatureData.length
- },
- deleteTemperatureData () {
- if (this.temperatureData.length > 0) {
- this.temperatureData = this.temperatureData.slice(0,-1)
- }
- this.circulateForm.entrustPoint = this.temperatureData.length
- },
- changeTemperatureData () {
- const length = this.temperatureData.length
- const entrustPoint = Number(this.circulateForm.entrustPoint)
- if (entrustPoint > length) {
- for (let i = 0; i < (entrustPoint - length); i++) {
- const obj = {}
- this.temperatureData.push(obj)
- }
- } else if (entrustPoint < length) {
- const deleteNum = length - entrustPoint
- this.temperatureData = this.temperatureData.slice(0,-deleteNum)
}
},
changeProductList0(){
@@ -1380,8 +915,9 @@
})
}
},
+ // 鑾峰彇鐢ㄦ埛鍒楄〃
getAuthorizedPerson() {
- this.$axios.get(this.$api.user.selectQualityUserList).then(res => {
+ selectUserCondition().then(res => {
let data = []
res.data.forEach(a => {
data.push({
@@ -1392,22 +928,36 @@
this.personList = data
})
},
- selectEnumByCategoryForType() {
- this.$axios.post(this.$api.enums.selectEnumByCategory, {
- category: "绱ф�ョ▼搴�"
- }).then(res => {
- this.type = res.data
+ openCompanyList () {
+ this.selectUserDia = true
+ this.getCompanyList()
+ },
+ getCompanyList () {
+ selectCustomPageList().then(res => {
+ this.tableLoading1 = false
+ if (res.code === 200) {
+ this.tableData1 = res.data.records
+ this.page1.total = res.data.total
+ }
+ }).catch(err => {
+ this.tableLoading1 = false
})
},
+ pagination1 (page) {
+ this.page1.size = page.limit
+ this.getCompanyList()
+ },
+ selectMethod (row) {
+ this.multipleSelection = row
+ },
selectUser() {
- let selects = this.$refs.ValueTable2.multipleSelection
- if (selects.length == 0) {
+ if (this.multipleSelection.length === 0) {
this.$message.error('鏈�夋嫨鏁版嵁')
return
}
- this.addObj.company = selects.company
- this.addObj.code = selects.code
- this.addObj.companyId = selects.id
+ this.addObj.company = this.multipleSelection[0].company
+ this.addObj.code = this.multipleSelection[0].code
+ this.addObj.companyId = this.multipleSelection[0].id
this.selectUserDia = false
if(this.active==1){
// TODO
@@ -1473,12 +1023,6 @@
}
}catch(e){}
},
- handleTell(tell,symbolItem, value){
- try{
- let num = this.replaceAll(tell, symbolItem, value)
- return num
- }catch(e){}
- },
replaceAll(str,find,value) {
if (str === undefined) {
return str
@@ -1486,203 +1030,79 @@
return str.replaceAll(find, value);
},
save() {
- if (!this.addObj.companyId) {
- this.$message.error('鏈�夋嫨瀹㈡埛鍗曚綅')
- return
- }
- if (!this.addObj.type) {
- this.$message.error('鏈�夋嫨绱ф�ョ▼搴�')
- } else if (!this.addObj.formType) {
- this.$message.error('璇疯緭鍏ユ潵鏍锋柟寮�')
- } else if (!this.addObj.sampleStatus) {
- this.$message.error('璇烽�夋嫨鏍峰搧鐘舵��')
- } else if (!this.addObj.testQuantity) {
- 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.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)) {
- this.$message.error('璇烽�夋嫨妫�楠屾爣鍑�')
- } else {
- let isHaveBushing = ''
- this.sampleList.forEach(item => {
- if (!item.bushing || item.bushing.length === 0) {
- isHaveBushing = false
- }
- item.specialStandardMethod = this.specialStandardMethod
- })
- try {
+ this.$refs['addObj'].validate((valid) => {
+ if (valid) {
this.sampleList.forEach(item => {
- if (item.insulating){
- let sampleListArr = []
- let insulatingArr = []
- // 鏈夌數缂嗛厤缃椂锛屾瘮杈冪數缂嗛厤缃殑妫�楠岄」鏄惁涓庡闈㈤噸澶�
- item.insProduct.filter(a => a.state == 1).forEach(obj => {
- sampleListArr.push(obj.id)
- })
- item.insulating.insProduct.filter(a => a.state == 1).forEach(obj => {
- insulatingArr.push(obj.id)
- })
- const sameLength = sampleListArr.filter(id => insulatingArr.indexOf(id) > -1).length
- if (sameLength > 0) {
- this.$message.error('妫�楠岄」涓庣數缂嗛厤缃楠岄」涓嶈兘閲嶅')
- }
- throw sameLength > 0
- }
+ item.specialStandardMethod = this.specialStandardMethod
})
- } catch (e) {
- console.log('e---', e)
- if (e === true) throw e
- }
- let sampleList = this.HaveJson(this.sampleList)
- sampleList.forEach(a => {
- if (a.endModels) {
- a.model = a.endModels
- }
- a.insProduct = a.insProduct.filter(b=>b.state === 1)
- })
- let projectNum = this.totalArr.filter(a => a.state == 1).length
- if(projectNum==0){
- this.$confirm('妫�楠岄」鐩负绌猴紝鏄惁纭鎻愪氦?', "鎻愮ず", {
- confirmButtonText: "纭畾",
- cancelButtonText: "鍙栨秷",
- type: "warning"
- }).then(() => {
- this.saveMethod(sampleList)
- }).catch(() => {})
- }else{
- let isRTS = this.totalArr.find(a => a.ask != null && this.symbolList.find(b=>a.ask.includes(b)) && a.state == 1)
- if (isRTS) {
- this.editTable = this.handleData(sampleList,this.containsValue, 0)
- this.editTable.forEach(item => {
- item.value = item.modelNum
- })
- this.bsm3Dia = true;
- return
- }
- this.saveMethod(sampleList)
- }
- }
- },
- /**
- * 鏍￠獙濮旀墭瑕佹眰鐨勬楠岄」鐨勮姹傛弿杩板拰瑕佹眰鍊�
- *
- */
- checkRequiredValueAndRemark(data){
- //杩囨护瑕佹眰鍊间腑鍖呭惈鏁板瓧鐨勬墠鏍￠獙
- let filterData = data.filter(d=>/[0-9]/.test(d.ask))
- if(filterData.length===0){
- return false
- }
- let isTrue = true
- try{
- filterData.forEach(ele=>{
- //瑕佹眰鍊煎拰瑕佹眰鎻忚堪涓嶈兘涓虹┖
- if(!ele.ask || !ele.tell){
- isTrue = false
- }else{
- //鍒ゆ柇锛堚墹,鈮�,>,<,=锛夎繖鍑犵鎯呭喌
- //鍒ゆ柇瑕佹眰鍊间腑鐨勬暟瀛楁槸鍚﹀寘鍚湪瑕佹眰鎻忚堪涓�
- if(['鈮�','鈮�','>','<','='].includes(ele.ask[0])){
- const askVal = ele.ask.substring(1,ele.ask.length)
- if(isNaN(askVal) || ele.tell.indexOf(askVal)<0){
- 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){
- isTrue = false
- }else if(ele.tell.indexOf('-')==0){
- 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){
- isTrue = false
- }
- }
- }else{
- //鏍￠獙瑕佹眰鎻忚堪涓�10卤5杩欑鍐欐硶鐨勬儏鍐�
- let splitNums = ele.tell.split('卤')
- if(splitNums.length<2){
- isTrue = false
- }else{
- let minTell = Number(splitNums[0])-Number(splitNums[1])
- let maxTell = Number(splitNums[0])+Number(splitNums[1])
- if(minTell!=min || maxTell!=max){
- isTrue = false
- }
- }
- }
- }else{
- const splitTells = tell.split('-')
- if(splitTells[0].indexOf(min)<0 || splitTells[1].indexOf(max)<0){
- isTrue = false
- }
+ try {
+ this.sampleList.forEach(item => {
+ if (item.insulating){
+ let sampleListArr = []
+ let insulatingArr = []
+ // 鏈夌數缂嗛厤缃椂锛屾瘮杈冪數缂嗛厤缃殑妫�楠岄」鏄惁涓庡闈㈤噸澶�
+ item.insProduct.filter(a => a.state == 1).forEach(obj => {
+ sampleListArr.push(obj.id)
+ })
+ item.insulating.insProduct.filter(a => a.state == 1).forEach(obj => {
+ insulatingArr.push(obj.id)
+ })
+ const sameLength = sampleListArr.filter(id => insulatingArr.indexOf(id) > -1).length
+ if (sameLength > 0) {
+ this.$message.error('妫�楠岄」涓庣數缂嗛厤缃楠岄」涓嶈兘閲嶅')
}
+ throw sameLength > 0
}
- }else{
- isTrue = false
+ })
+ } catch (e) {
+ console.log('e---', e)
+ if (e === true) throw e
+ }
+ let sampleList = this.HaveJson(this.sampleList)
+ sampleList.forEach(a => {
+ if (a.insProduct.length > 0) {
+ a.insProduct.forEach(c => {
+ delete c.id
+ })
}
+ if (a.endModels) {
+ a.model = a.endModels
+ }
+ a.insProduct = a.insProduct.filter(b=>b.state === 1)
+ })
+ let projectNum = this.totalArr.filter(a => a.state == 1).length
+ if(projectNum==0){
+ this.$confirm('妫�楠岄」鐩负绌猴紝鏄惁纭鎻愪氦?', "鎻愮ず", {
+ confirmButtonText: "纭畾",
+ cancelButtonText: "鍙栨秷",
+ type: "warning"
+ }).then(() => {
+ this.saveMethod(sampleList)
+ }).catch(() => {})
+ }else{
+ let isRTS = this.totalArr.find(a => a.ask != null && this.symbolList.find(b=>a.ask.includes(b)) && a.state == 1)
+ if (isRTS) {
+ this.editTable = this.handleData(sampleList,this.containsValue, 0)
+ this.editTable.forEach(item => {
+ item.value = item.modelNum
+ })
+ this.bsm3Dia = true;
+ return
+ }
+ this.saveMethod(sampleList)
}
- // 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)){
let sampleList = this.handleData(this.HaveJson(this.sampleList),this.handleAsk,1)
sampleList.forEach(a => {
+ if (a.insProduct.length > 0) {
+ a.insProduct.forEach(c => {
+ delete c.id
+ })
+ }
if (a.endModels) {
a.model = a.endModels
}
@@ -1730,127 +1150,7 @@
this.$message.error('瑕佹眰鍊间负绌猴紝闇�瑕佸幓鏍囧噯搴撶淮鎶わ紒')
}
}
- // arr.forEach(f => {
- // if(a.ask){
- // if(a.ask.includes(f.symbolItem)){
- // let ask = calBack(a.ask, f.symbolItem,f.value)
- // if (ask) {
- // a.ask = ask
- // }
- // let tell = this.handleTell(a.tell, f.symbolItem,f.value)
- // if (tell) {
- // a.tell = tell
- // }
- // }
- // }else{}
- // })
}
- }
- })
- }
- // 鍏夌氦甯﹂」鐩�
- if (item.bushing && item.bushing.length > 0) {
- item.bushing.forEach(a => {
- if (a.fiber && a.fiber.length > 0) {
- a.fiber.forEach(b => {
- if (b.productList && b.productList.length > 0) {
- b.productList.forEach(c => {
- if (c.state == 1) {
- if(type==0){
- let str = calBack(c.ask)
- str&&obj.symbolList.push({
- symbolItem:str,
- inspectionItem:c.inspectionItem,
- })
- }else if(type==1){
- let arr = this.editTable.filter(b => b.sampleId == item.id)
- arr.forEach(f => {
- if(c.ask.includes(f.symbolItem)){
- let ask = calBack(c.ask, f.symbolItem,f.value)
- if (ask) {
- c.ask = ask
- }
- let tell = this.handleTell(c.tell, f.symbolItem,f.value)
- if (tell) {
- c.tell = tell
- }
- }
- })
- }
- }
- })
- }
- })
- }
- if (a.fibers && a.fibers.length > 0) {
- a.fibers.forEach(b => {
- if (b.productList && b.productList.length > 0) {
- b.productList.forEach(c => {
- if (c.state == 1) {
- if(type==0){
- let str = calBack(c.ask)
- str&&obj.symbolList.push({
- symbolItem:str,
- inspectionItem:c.inspectionItem,
- })
- }else if(type==1){
- // let ask = calBack(c.ask, c.rts)
- // if (ask && c.state == 1) {
- // c.ask = csk
- // }
- let arr = this.editTable.filter(b => b.sampleId == item.id)
- arr.forEach(f => {
- if(c.ask.includes(f.symbolItem)){
- let ask = calBack(c.ask, f.symbolItem,f.value)
- if (ask) {
- c.ask = ask
- }
- let tell = this.handleTell(c.tell, f.symbolItem,f.value)
- if (tell) {
- c.tell = tell
- }
- }
- })
- }
- }
- })
- }
- if (b.fiber && b.fiber.length > 0) {
- b.fiber.forEach(c => {
- if (c.productList && c.productList.length > 0) {
- c.productList.forEach(d => {
- if (d.state == 1) {
- if(type==0){
- let str = calBack(d.ask)
- str&&obj.symbolList.push({
- symbolItem:str,
- inspectionItem:d.inspectionItem,
- })
- }else if(type==1){
- // let ask = calBack(d.ask, d.rts)
- // if (ask && d.state == 1) {
- // d.ask = ask
- // }
- let arr = this.editTable.filter(b => b.sampleId == item.id)
- arr.forEach(f => {
- if(d.ask.includes(f.symbolItem)){
- let ask = calBack(d.ask, f.symbolItem,f.value)
- if (ask) {
- d.ask = ask
- }
- let tell = this.handleTell(d.tell, f.symbolItem,f.value)
- if (tell) {
- d.tell = tell
- }
- }
- })
- }
- }
- })
- }
- })
- }
- })
}
})
}
@@ -1904,40 +1204,23 @@
if (this.addObj.quarterItemId) {
this.addObj.quarterItemId = this.addObj.quarterItemId[1]
}
-
if(this.tabIndex==4&&this.active==2){
// 閫�鍥炲悗鎻愪氦
- this.$axios.post(this.$api.insOrder.updateInsOrder, {
- insOrder: this.addObj,
- sampleProduct: sampleList,
- },{
- headers: {
- 'Content-Type': 'application/json'
- },
- noQs:true
- }).then(res => {
+ updateInsOrder({insOrder: this.addObj, sampleList: sampleList}).then(res => {
this.saveLoad = false
- if (res.code == 201) return
this.$message.success('宸叉彁浜�')
this.bsm3Dia = false;
- this.$parent.playOrder(0)
+ this.goBack()
}).catch(e=>{
this.saveLoad = false
})
}else{
// 甯歌鎻愪氦
- this.$axios.post(this.$api.insOrder.addInsOrder, {
- str: JSON.stringify({
- insOrder: this.addObj,
- list: JSON.stringify(sampleList),
- pairing: JSON.stringify(this.bsm2Val2)
- })
- }).then(res => {
+ addInsOrder({insOrder: this.addObj, sampleList: sampleList}).then(res => {
this.saveLoad = false
- if (res.code == 201) return
this.$message.success('宸叉彁浜�')
this.bsm3Dia = false;
- this.$parent.playOrder(0)
+ this.goBack()
}).catch(e=>{
this.saveLoad = false
})
@@ -1947,35 +1230,17 @@
upInsOrderOfState(state) {
if (state == 1) {
this.saveLoad = true
- this.$axios.post(this.$api.insOrder.upInsOrderOfState, {
+ upInsOrderOfState({
state,
id: this.currentId,
companyId:this.addObj.companyId,
laboratory:this.addObj.laboratory,
company: this.addObj.company
- }, {
- headers: {
- 'Content-Type': 'application/json'
- }
}).then(res => {
this.saveLoad = false
if (res.code == 201) return
this.$message.success('鎻愪氦鎴愬姛')
- // this.$parent.multipleSelection = [{id: this.currentId}]
- // this.$parent.print()
- // 濡傛灉绱ф�ョ▼搴︿负绱ф�ワ紝闇�瑕佺洿鎺ヤ笅鍙戜汉鍛�
- // if (this.addObj.type == 2) {
- // this.issuedDialogVisible = true;
- // this.$axios.post(this.$api.insOrder.selectOrderManDay, {
- // id: this.currentId
- // }).then(ress => {
- // this.distributeData.orderId = this.currentId
- // this.distributeData.appointed = ress.data
- // })
- // } else {
- // this.$parent.playOrder(0)
- // }
- this.$axios.post(this.$api.insOrder.selectOrderManDay, {
+ selectOrderManDay({
id: this.currentId
}).then(ress => {
this.distributeData.orderId = this.currentId
@@ -2005,7 +1270,7 @@
return
}
this.upLoad = true;
- this.$axios.post(this.$api.insOrder.upInsOrder, {
+ upInsOrder({
orderId: this.distributeData.orderId,
appointed: this.distributeData.appointed,
userId: this.distributeData.userId,
@@ -2018,14 +1283,14 @@
this.$message.success('鎻愪氦鎴愬姛')
this.upLoad = false
this.issuedDialogVisible = false
- this.$parent.playOrder(0)
+ this.goBack()
}).catch(e => {
this.$message.error('鎻愪氦澶辫触')
this.upLoad = false
})
},
- getUserNow() {
- this.$axios.get(this.$api.user.getUserNow).then(res => {
+ getUserNowData() {
+ getUserNow().then(res => {
let selects = res.data
if (selects == null) return
this.addObj.userId = selects.id
@@ -2043,7 +1308,7 @@
},
getProNum() {
this.sampleSelectionList.forEach((m, i) => {
- Vue.set(this.sampleSelectionList[i], 'proNum', m.insProduct.filter(a => a.state == 1).length)
+ this.$set(this.sampleSelectionList[i], 'proNum', m.insProduct.filter(a => a.state == 1).length)
})
this.$refs.sampleTable.doLayout()
},
@@ -2108,7 +1373,7 @@
},
selectStandardTreeList() {
this.selectStandardTreeLoading = true
- this.$axios.get(this.$api.standardTree.selectStandardTreeList2).then(res => {
+ selectStandardTreeList2().then(res => {
this.list = res.data
this.list.forEach(a => {
this.expandedKeys.push(a.label)
@@ -2158,9 +1423,9 @@
this.$refs.sampleTable.doLayout()
// this.selectsStandardMethodByFLSSM()
},
- selectsStandardMethodByFLSSM() {
+ selectsStandardMethodByFLSSMList() {
this.methodLoad = true
- this.$axios.post(this.$api.standardTree.selectsStandardMethodByFLSSM, {
+ selectsStandardMethodByFLSSM({
tree: this.selectTree
}).then(res => {
this.methodLoad = false
@@ -2169,7 +1434,7 @@
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, {
+ selectsStandardMethodByFLSSM({
tree: selectTree
}).then(ress => {
this.methods = ress.data.standardMethodList
@@ -2200,8 +1465,6 @@
this.sampleList.push(this.HaveJson(this.sample))
// this.count++
}
- this.computationalPairing(this.sampleList.length)
- this.bsm2Val2 = this.HaveJson(this.bsm2Val3)
},
selectSample(val) {
this.sampleIds = []
@@ -2210,20 +1473,7 @@
})
this.sampleSelectionList = val
},
- delSample() {
- this.sampleIds.forEach(a => {
- for (var i = 0; i < this.sampleList.length; i++) {
- if (this.sampleList[i].id == a) {
- this.sampleList.splice(i, 1)
- i -= 1
- break
- }
- }
- })
- this.$refs.sampleTable.doLayout()
- },
selectProduct(val) {
- this.productListSelected = val
this.productIds = []
val.forEach(a => {
this.productIds.push(a.id)
@@ -2278,12 +1528,6 @@
if (row.tell.includes('[')) {
this.$set(row, 'tellCopy', row.tell)
}
- // if (row.manHour.includes('[')) {
- // this.$set(row, 'manHourCopy', row.manHour)
- // }
- // if (row.price.includes('[')) {
- // this.$set(row, 'priceCopy', row.price)
- // }
let arr = this.productList.filter(m=>m.state==1&&row.sectionCopy&&row.sectionCopy.includes(m.sectionCopy)&&m.ask&&m.sectionCopy.indexOf('[')==-1)
if (row.bsm === '1' && row.sectionCopy !== '' && row.sectionCopy !== null && row.sectionCopy !== undefined && row.state === 1&&arr.length==0) {
if (row.sectionCopy.indexOf('[') > -1) {
@@ -2300,14 +1544,10 @@
let sectionCopy = arr[0].sectionCopy
let arr0 = JSON.parse(row.sectionCopy)
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(sectionCopy)
row.sectionCopy = sectionCopy
row.ask = arr1[index]
- // row.manHour = arr2[index]
- // row.price = arr3[index]
row.tell = arr4[index]
} catch(e) {}
}
@@ -2329,13 +1569,6 @@
this.currentMethod.insProduct = this.productList0
this.getProNum()
},
- searchProject () {
- this.$axios.post(this.$api.enums.selectEnumByCategory, {
- category: "鍏夌氦椤圭洰"
- }).then(res => {
- this.opticalProject = res.data
- })
- },
permute(nums) {
const result = [];
@@ -2356,13 +1589,6 @@
backtrack([], nums);
return result;
},
- computationalPairing(n) {
- const nums = [];
- for (let i = 1; i <= n; i++) {
- nums.push(i);
- }
- this.bsm2Val3 = this.HaveJson(this.permute(nums))
- },
tableRowClassName({
row,
rowIndex
@@ -2373,8 +1599,7 @@
return 'warning-row';
},
selectInsOrderTemplate() {
- this.$axios.get(this.$api.insOrder.selectInsOrderTemplate+'?company='+this.addObj.company).then(res => {
- if (res.code == 201) return
+ selectInsOrderTemplate({company: this.addObj.company}).then(res => {
this.templates = res.data
})
},
@@ -2385,7 +1610,7 @@
cancelButtonText: "鍙栨秷",
type: "warning"
}).then(() => {
- this.$axios.post(this.$api.insOrder.delInsOrderTemplate, {
+ delInsOrderTemplate({
id: row.id
}).then(res => {
if (res.code === 201) {
@@ -2402,7 +1627,7 @@
addTemplateDia() {
if (this.templateName) {
this.templateLoading = true;
- this.$axios.post(this.$api.insOrder.addInsOrderTemplate, {
+ addInsOrderTemplate({
name: this.templateName,
thing: JSON.stringify({
addObj: this.addObj,
@@ -2427,8 +1652,7 @@
},
// 鏌ヨ妯℃澘
selectInsOrderTemplateById(e) {
- this.$axios.post(this.$api.insOrder.selectInsOrderTemplateById + '?id=' + e).then(res => {
- if (res.code == 201) return
+ selectInsOrderTemplateById({id: e}).then(res => {
let obj = JSON.parse(res.data)
//鍒跺崟浜鸿缃负褰撳墠鐧诲綍鐢ㄦ埛
let user = JSON.parse(localStorage.getItem('user'))
@@ -2442,43 +1666,6 @@
delSampleAndProduct() {
this.sampleList.splice(scope.$index, 1)
this.productList = []
- },
- selectEnumByCategoryForUnit() {
- this.$axios.post(this.$api.enums.selectEnumByCategory, {
- category: "鍗曚綅"
- }).then(res => {
- this.units = 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
- }
- })
- },
- selectEnumByCategoryForSampleForm() {
- this.$axios.post(this.$api.enums.selectEnumByCategory, {
- category: "鏉ユ牱鏂瑰紡"
- }).then(res => {
- this.formType = res.data
- if (this.formType.length > 0) {
- this.addObj.formType = this.formType[0].value
- }
- })
- },
- selectSampleStatus() {
- this.$axios.post(this.$api.enums.selectEnumByCategory, {
- category: "鏍峰搧鐘舵��"
- }).then(res => {
- this.sampleStatusList = res.data
- if (this.sampleStatusList.length > 0) {
- this.addObj.sampleStatus = this.sampleStatusList[0].value
- }
- })
},
spliceString (row, val, type) {
if (type === 'cores') {
@@ -2497,7 +1684,7 @@
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, {
+ selectStandardProductList({
model: this.addObj.model?this.addObj.model:row.model,
modelNum: row.modelNum,
standardMethodListId: val,
@@ -2505,10 +1692,6 @@
cores: row.cores,
conductorMaterial: row.conductorMaterial,
conductorType: row.conductorType,
- }, {
- headers: {
- 'Content-Type': 'application/json'
- }
}).then(res => {
res.data.forEach(a => {
a.state = 0
@@ -2561,16 +1744,12 @@
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, {
+ selectStandardProductList({
model: this.addObj.model?this.addObj.model:row.model,
modelNum: row.modelNum,
standardMethodListId: val,
cores: row.cores,
factory: selectTreeList.join(" - "),
- }, {
- headers: {
- 'Content-Type': 'application/json'
- }
}).then(res => {
res.data.forEach(a => {
a.state = 0
@@ -2585,21 +1764,6 @@
if (a.state == 1) this.toggleSelection(a)
})
}, 200)
- })
- this.searchProject()
- this.searchTemList()
- },
- 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() {
@@ -2620,7 +1784,7 @@
})
},
methodFocus() {
- this.selectsStandardMethodByFLSSM()
+ this.selectsStandardMethodByFLSSMList()
},
handleChangeModel(e) {
this.productList = []
@@ -2655,7 +1819,7 @@
})
},
selectStandardMethods() {
- this.$axios.get(this.$api.standardTree.selectStandardMethodEnum).then(res => {
+ selectStandardMethodEnum().then(res => {
this.methods = res.data
})
},
@@ -2687,7 +1851,6 @@
return m
})
}
- this.bsmRow3 = [];
this.bsm1DiaList = []
this.productList.forEach(p => {
if (p.sectionCopy === undefined && p.section) {
@@ -2757,7 +1920,7 @@
return
}
this.noLoading = true;
- this.$axios.post(this.$api.insOrder.upInsOrderOfState, {
+ upInsOrderOfState({
state: 2,
id: this.currentId,
tell: this.tell
@@ -2768,87 +1931,14 @@
}).then(res => {
this.noLoading = false;
this.tell = '';
- if (res.code == 201) return
this.$message.success('鎻愪氦鎴愬姛')
this.issuedDialogVisible = false;
- this.$parent.playOrder(0)
- })
- },
- selectEnumByCategoryForSonLaboratory() {
- this.$axios.post(this.$api.enums.selectEnumByCategory, {
- category: "瀛愬疄楠屽"
- }).then(res => {
- this.factory = []
- res.data.forEach(a => {
- this.filters.push({
- text: a.label,
- value: a.value
- })
- })
+ this.goBack()
})
},
filterHandler(value, row, column) {
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.sampleIds = [this.sampleId]
- 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) {
- this.$message.error("鏈�夋嫨鏍峰搧")
- return
- }
- this.equipConfigShow = true
- } else {
- if (this.sampleId === null) {
- this.$message.error('鏈�変腑鏍峰搧')
- return
- }
- // this.$axios.post(this.$api.insBushing.selectBushingBySampleId, {
- // sampleId: this.sampleId
- // }).then(res => {
- // if (res.data.length === 0) {
- // this.$message.error('璇ユ牱鍝佹病鏈夐厤缃厜绾�')
- // return
- // }
- // for (var i in this.sampleList) {
- // if (this.sampleList[i].id = this.sampleId) {
- // this.sampleList[i].bushing = res.data
- // break
- // }
- // }
- // this.configShow = true
- // })
- }
},
areObjectsValuesEqual (objects, property) {
if (!objects || objects.length === 0) return false;
@@ -2968,21 +2058,6 @@
}
done()
},
- beforeClose0(done) {
- if (!this.bsm3Val) {
- this.$message.error('RST蹇呴』濉啓')
- return
- } else {
- if (Array.isArray(this.bsmRow3)) {
- this.bsmRow3.forEach(item => {
- item.rts = this.bsm3Val
- })
- } else {
- this.bsmRow3.rts = this.bsm3Val
- }
- }
- done()
- },
getTotal() {
this.totalArr = []
// this.total = 0;
@@ -2990,37 +2065,6 @@
if (item.insProduct && item.insProduct.length > 0) {
item.insProduct.forEach(a => {
this.totalArr.push(a)
- })
- }
- if (item.bushing && item.bushing.length > 0) {
- item.bushing.forEach(a => {
- if (a.fiber && a.fiber.length > 0) {
- a.fiber.forEach(b => {
- if (b.productList && b.productList.length > 0) {
- b.productList.forEach(c => {
- this.totalArr.push(c)
- })
- }
- })
- }
- if (a.fibers && a.fibers.length > 0) {
- a.fibers.forEach(b => {
- if (b.productList && b.productList.length > 0) {
- b.productList.forEach(c => {
- this.totalArr.push(c)
- })
- }
- if (b.fiber && b.fiber.length > 0) {
- b.fiber.forEach(c => {
- if (c.productList && c.productList.length > 0) {
- c.productList.forEach(d => {
- this.totalArr.push(d)
- })
- }
- })
- }
- })
- }
})
}
})
@@ -3041,9 +2085,6 @@
}
}
})
- // arr0.forEach(item => {
- // this.total += Number(item.price)
- // })
let arr1 = this.totalArr.filter(item => item.state == 1)
let mySet0 = new Set();
this.sonLaboratoryList = []
@@ -3058,21 +2099,6 @@
})
}
})
- },
- bsm2Up(val) {
- let list = []
- for (let a = 1; a < this.bsm2Val3.length + 1; a++) {
- list.push(a)
- }
- let set = new Set()
- let size1 = set.length
- while (set.size < val) {
- set.add(Math.ceil(Math.random() * this.bsm2Val3.length))
- }
- this.bsm2Val2 = []
- for (let a of set) {
- this.bsm2Val2.push(this.HaveJson(this.bsm2Val3[a - 1]))
- }
},
changeUser(){
if(this.sonLaboratoryList.length>0){
@@ -3118,40 +2144,15 @@
this.productList0[index-1].delete=true
}
this.productList0.splice(index,1)
+ },
+ goBack () {
+ const obj = { path: "/business/productOrder" };
+ this.$tab.closeOpenPage(obj);
}
}
}
</script>
-<style scoped>
-.ins_order_add {
- width: 100%;
- height: 100%;
- overflow-y: auto;
- overflow-x: hidden;
-}
-
-.ins_order_add::-webkit-scrollbar {
- width: 0;
-}
-.circulateTable {
- display: flex;
- flex-direction: row;
- justify-content: space-between;
-}
-.opticalProject {
- width: 38%;
-}
-.temperatureList {
- width: 60%;
-}
-.temperatureListTitle {
- display: flex;
- flex-direction: row;
- justify-content: space-between;
- line-height: 30px;
-}
-</style>
<style scoped>
.ins_order_add .el-input-group__append,
.el-input-group__prepend {
--
Gitblit v1.9.3