From b0d4df5f39525ae7fe252e8ee65d85fd71dca721 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期四, 07 五月 2026 14:53:32 +0800
Subject: [PATCH] 手动下单：检验中订单撤销报错问题修复
---
src/views/business/inspectionTask/inspection.vue | 2142 +++++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 1,554 insertions(+), 588 deletions(-)
diff --git a/src/views/business/inspectionTask/inspection.vue b/src/views/business/inspectionTask/inspection.vue
index 697a551..ef65f7e 100644
--- a/src/views/business/inspectionTask/inspection.vue
+++ b/src/views/business/inspectionTask/inspection.vue
@@ -1,155 +1,452 @@
<template>
- <div v-loading="loading" class="inspection" style="background-color: rgb(245, 247, 251);">
+ <div
+ v-loading="loading"
+ class="inspection"
+ style="background-color: rgb(245, 247, 251)"
+ >
<el-row class="title">
- <el-col :span="8" style="text-align: left">
- <el-form :inline="true" :model="otherForm" class="form-inline" label-width="50px"
- style="text-align: right; padding-top: 0; display: inline">
+ <el-col
+ v-if="insOrder.ifsOrderType !== '02wg'"
+ :span="8"
+ style="text-align: left"
+ >
+ <el-form
+ :inline="true"
+ :model="otherForm"
+ class="form-inline"
+ label-width="50px"
+ style="text-align: right; padding-top: 0; display: inline"
+ >
<el-form-item label="娓╁害:" style="margin-bottom: 0">
- <el-input v-model="otherForm.temperature" :disabled="state > 1" placeholder="" size="small"
- style="width: 90px; line-height: 60px" @change="(m) => subOtherForm(m, 'temperature')"></el-input>
+ <el-input
+ v-model="otherForm.temperature"
+ :disabled="state > 1"
+ placeholder=""
+ size="small"
+ style="width: 90px; line-height: 60px"
+ @change="(m) => subOtherForm(m, 'temperature')"
+ ></el-input>
<span style="margin-left: 4px">鈩�</span>
</el-form-item>
<el-form-item label="婀垮害:" style="margin-bottom: 0">
- <el-input v-model="otherForm.humidity" :disabled="state > 1" placeholder="" size="small"
- style="width: 90px; line-height: 60px" @change="(m) => subOtherForm(m, 'humidity')"></el-input>
+ <el-input
+ v-model="otherForm.humidity"
+ :disabled="state > 1"
+ placeholder=""
+ size="small"
+ style="width: 90px; line-height: 60px"
+ @change="(m) => subOtherForm(m, 'humidity')"
+ ></el-input>
<span style="margin-left: 4px">%</span>
</el-form-item>
</el-form>
</el-col>
- <el-col :span="16" style="text-align: right">
- <el-button size="small" type="primary" @click="refreshView">鍒锋柊</el-button>
- <el-button v-if="typeSource == 1" size="small" type="primary" @click="openPurchase">杩涜揣楠岃瘉</el-button>
- <el-button v-if="state == 1 && typeSource == 1" size="small" type="primary" @click="openUnPassDialog('add')">涓嶅悎鏍煎鐞�</el-button>
- <el-button size="small" type="primary" @click="sampleVisible = true;uploadSample();">鏍峰搧鍒囨崲</el-button>
-<!-- <el-button v-if="state == 1" size="small" type="primary" @click="taskVisible = true">浠诲姟鍒囨崲</el-button>-->
- <el-button v-if="state == 1" size="small" type="primary" @click="addVerifyDia = true">鎻愪氦</el-button>
+ <el-col
+ :span="insOrder.ifsOrderType !== '02wg' ? 16 : 24"
+ style="text-align: right"
+ >
+ <el-button
+ v-if="insOrder.ifsOrderType && insOrder.ifsOrderType === '02wg'"
+ size="small"
+ type="primary"
+ @click="showMaterialPropsDialog"
+ >IFS鐗╂枡灞炴�ф洿鏂�</el-button
+ >
+ <el-button size="small" type="primary" @click="refreshView"
+ >鍒锋柊</el-button
+ >
+ <el-button
+ v-if="typeSource == 1"
+ size="small"
+ type="primary"
+ @click="openPurchase"
+ >杩涜揣楠岃瘉</el-button
+ >
+ <el-button
+ v-if="state == 1 && [0, 1].includes(Number(typeSource))"
+ size="small"
+ type="primary"
+ @click="openUnPassDialog('add')"
+ >涓嶅悎鏍煎鐞�</el-button
+ >
+ <el-button
+ size="small"
+ type="primary"
+ @click="
+ sampleVisible = true;
+ uploadSample();
+ "
+ >鏍峰搧鍒囨崲</el-button
+ >
+ <el-button
+ v-if="state == 1"
+ size="small"
+ type="primary"
+ @click="addVerifyDia = true"
+ >鎻愪氦</el-button
+ >
<!-- 澶嶆牳 -->
- <el-button v-if="state == 2" size="medium" type="primary" @click="openAddCheck">閫氳繃</el-button>
- <el-button v-if="state == 2" size="medium" @click="upInsReview(0)">涓嶉�氳繃</el-button>
- <el-button type="primary" size="small" @click="exportTable('myTable')">涓嬭浇鍘熷璁板綍</el-button>
+ <el-button
+ v-if="state == 2"
+ size="medium"
+ type="primary"
+ @click="openAddCheck"
+ >閫氳繃</el-button
+ >
+ <el-button v-if="state == 2" size="medium" @click="upInsReview(0)"
+ >涓嶉�氳繃</el-button
+ >
+ <el-button type="primary" size="small" @click="exportTable('myTable')"
+ >涓嬭浇鍘熷璁板綍</el-button
+ >
<el-button size="small" @click="goback">杩斿洖</el-button>
</el-col>
</el-row>
<div class="search">
- <el-form :inline="true" :model="searchForm" class="form-inline" label-position="right" label-width="100px">
- <el-form-item label="濮旀墭缂栧彿:">
- <el-input v-model="insOrder.entrustCode" clearable disabled placeholder="璇疯緭鍏�" size="small"></el-input>
- </el-form-item>
- <el-form-item label="鏍峰搧缂栧彿:">
- <el-tooltip :content="currentSample.sampleCode" :disabled="!currentSample.sampleCode">
- <el-input v-model="currentSample.sampleCode" clearable disabled placeholder="璇疯緭鍏�" size="small"></el-input>
- </el-tooltip>
- </el-form-item>
- <el-form-item label="鏍峰搧鍚嶇О:">
- <el-input v-model="currentSample.sample" clearable disabled placeholder="璇疯緭鍏�" size="small"></el-input>
- </el-form-item>
- <el-form-item label="鏍峰搧鏁伴噺:">
- <el-input v-model="sampleProduct.length" clearable disabled placeholder="璇疯緭鍏�" size="small"></el-input>
- </el-form-item>
- <el-form-item label="鏍峰搧鍨嬪彿:">
- <el-input v-model="currentSample.model" clearable disabled placeholder="璇疯緭鍏�" size="small"></el-input>
- </el-form-item>
- <el-form-item label="涓嬪彂鏃堕棿:">
- <el-input v-model="insOrder.sendTime" clearable disabled placeholder="璇疯緭鍏�" size="small"></el-input>
- </el-form-item>
- <el-form-item label="绱ф�ョ▼搴�:">
- <el-input v-model="insOrder.typeName" clearable disabled placeholder="璇疯緭鍏�" size="small"></el-input>
- </el-form-item>
- <el-form-item label="绾﹀畾鏃堕棿:">
- <el-input v-model="insOrder.appointed" clearable disabled placeholder="璇疯緭鍏�" size="small"></el-input>
- </el-form-item>
- <el-form-item v-if="typeSource === 1" label="鎶芥鏁伴噺:">
- <el-input v-model="insOrder.testQuantity" clearable disabled placeholder="璇疯緭鍏�" size="small"></el-input>
- </el-form-item>
- <el-form-item v-if="typeSource === 1" label="鍘傚瀵嗗害:">
- <el-input v-model="supplierDensity" clearable disabled placeholder="璇疯緭鍏�" size="small"></el-input>
- </el-form-item>
- <el-form-item label="褰撳墠鏍峰搧浣嶆暟:" label-width="120px">
- <el-tag v-if="currentKey">{{ `NO.${currentKey}` }}</el-tag>
- </el-form-item>
- <el-form-item label="澶囨敞:">
- <!-- <span style="color:red">{{ insOrder.remark?insOrder.remark:'-' }}</span>-->
- <el-input v-model="insOrder.remark" :disabled="state != 1" clearable placeholder="璇疯緭鍏�" size="small"
- @blur="subOtherForm(insOrder.remark, 'remark')"></el-input>
- <!-- <el-tag v-if="currentKey">{{ insOrder.remark }}</el-tag> -->
- </el-form-item>
- </el-form>
+ <!-- <el-form :inline="true" :model="searchForm" class="form-inline" label-position="right" label-width="100px">-->
+ <!-- <el-form-item label="濮旀墭缂栧彿:">-->
+ <!-- <el-input v-model="insOrder.entrustCode" clearable disabled placeholder="璇疯緭鍏�" size="small"></el-input>-->
+ <!-- </el-form-item>-->
+ <!-- <el-form-item label="鏍峰搧缂栧彿:">-->
+ <!-- <el-tooltip :content="currentSample.sampleCode" :disabled="!currentSample.sampleCode">-->
+ <!-- <el-input v-model="currentSample.sampleCode" clearable disabled placeholder="璇疯緭鍏�" size="small"></el-input>-->
+ <!-- </el-tooltip>-->
+ <!-- </el-form-item>-->
+ <!-- <el-form-item label="鏍峰搧鍚嶇О:">-->
+ <!-- <el-input v-model="currentSample.sample" clearable disabled placeholder="璇疯緭鍏�" size="small"></el-input>-->
+ <!-- </el-form-item>-->
+ <!-- <el-form-item label="鏍峰搧鏁伴噺:">-->
+ <!-- <el-input v-model="sampleProduct.length" clearable disabled placeholder="璇疯緭鍏�" size="small"></el-input>-->
+ <!-- </el-form-item>-->
+ <!-- <el-form-item label="鏍峰搧鍨嬪彿:">-->
+ <!-- <el-input v-model="currentSample.model" clearable disabled placeholder="璇疯緭鍏�" size="small"></el-input>-->
+ <!-- </el-form-item>-->
+ <!-- <el-form-item label="涓嬪彂鏃堕棿:">-->
+ <!-- <el-input v-model="insOrder.sendTime" clearable disabled placeholder="璇疯緭鍏�" size="small"></el-input>-->
+ <!-- </el-form-item>-->
+ <!-- <el-form-item label="绱ф�ョ▼搴�:">-->
+ <!-- <el-input v-model="insOrder.typeName" clearable disabled placeholder="璇疯緭鍏�" size="small"></el-input>-->
+ <!-- </el-form-item>-->
+ <!-- <el-form-item label="绾﹀畾鏃堕棿:">-->
+ <!-- <el-input v-model="insOrder.appointed" clearable disabled placeholder="璇疯緭鍏�" size="small"></el-input>-->
+ <!-- </el-form-item>-->
+ <!-- <el-form-item v-if="typeSource === 1" label="鎶芥鏁伴噺:">-->
+ <!-- <el-input v-model="insOrder.testQuantity" clearable disabled placeholder="璇疯緭鍏�" size="small"></el-input>-->
+ <!-- </el-form-item>-->
+ <!-- <el-form-item v-if="typeSource === 1" label="鍘傚瀵嗗害:">-->
+ <!-- <el-input v-model="supplierDensity" clearable disabled placeholder="璇疯緭鍏�" size="small"></el-input>-->
+ <!-- </el-form-item>-->
+ <!-- <el-form-item label="褰撳墠鏍峰搧浣嶆暟:" label-width="120px">-->
+ <!-- <el-tag v-if="currentKey">{{ `NO.${currentKey}` }}</el-tag>-->
+ <!-- </el-form-item>-->
+ <!-- <el-form-item label="澶囨敞:">-->
+ <!-- <!– <span style="color:red">{{ insOrder.remark?insOrder.remark:'-' }}</span>–>-->
+ <!-- <el-input v-model="insOrder.remark" :disabled="state != 1" clearable placeholder="璇疯緭鍏�" size="small"-->
+ <!-- @blur="subOtherForm(insOrder.remark, 'remark')"></el-input>-->
+ <!-- <!– <el-tag v-if="currentKey">{{ insOrder.remark }}</el-tag> –>-->
+ <!-- </el-form-item>-->
+ <!-- <template v-if="insOrder.isSplitOrder && insOrder.isSplitOrder===1">-->
+ <!-- <el-form-item label="澶栨姢棰滆壊:">-->
+ <!-- <el-input v-model="insOrder.outerColor" clearable disabled placeholder="" size="small"></el-input>-->
+ <!-- </el-form-item>-->
+ <!-- <el-form-item label="缁濈紭棰滆壊:">-->
+ <!-- <el-input v-model="insOrder.insulationColor" clearable disabled placeholder="" size="small"></el-input>-->
+ <!-- </el-form-item>-->
+ <!-- <el-form-item label="鐩樺彿:">-->
+ <!-- <el-input v-model="insOrder.drumNo" clearable disabled placeholder="" size="small"></el-input>-->
+ <!-- </el-form-item>-->
+ <!-- </template>-->
+ <!-- </el-form>-->
+ <!-- -->
+ <el-descriptions title="妫�楠屽崟姒傚喌" :column="4" border>
+ <template v-if="insOrder.ifsOrderType">
+ <el-descriptions-item label="闆朵欢鍙�">{{
+ insOrder.partNo
+ }}</el-descriptions-item>
+ <el-descriptions-item label="闆朵欢鍚嶇О">{{
+ insOrder.partDetail
+ }}</el-descriptions-item>
+ <el-descriptions-item label="鎵规鍙�">{{
+ insOrder.lotBatchNo
+ }}</el-descriptions-item>
+ <el-descriptions-item label="鏍峰搧鍨嬪彿">{{
+ currentSample.model
+ }}</el-descriptions-item>
+ <el-descriptions-item label="鎶芥鏁伴噺">{{
+ insOrder.testQuantity
+ }}</el-descriptions-item>
+ <el-descriptions-item label="鍘傚瀵嗗害">{{
+ supplierDensity
+ }}</el-descriptions-item>
+ <template
+ v-if="insOrder.ifsOrderType && insOrder.ifsOrderType === '02wg'"
+ >
+ <el-descriptions-item label="杞藉叿缂栧彿">{{
+ insOrder.drumNo
+ }}</el-descriptions-item>
+ <el-descriptions-item label="璧峰绫虫爣(km)">{{
+ insOrder.startMeterMark
+ }}</el-descriptions-item>
+ <el-descriptions-item label="鎴绫虫爣(km)">{{
+ insOrder.endMeterMark
+ }}</el-descriptions-item>
+ <el-descriptions-item label="鍏ュ簱闀垮害(km)">{{
+ calcInbondLength(insOrder.startMeterMark, insOrder.endMeterMark)
+ }}</el-descriptions-item>
+ <el-descriptions-item label="缁濈紭棰滆壊">{{
+ insOrder.insulationColor
+ }}</el-descriptions-item>
+ <el-descriptions-item label="澶栨姢棰滆壊">{{
+ insOrder.outerColor
+ }}</el-descriptions-item>
+ <el-descriptions-item label="鍗板瓧淇℃伅">{{
+ insOrder.letteringInfo
+ }}</el-descriptions-item>
+ </template>
+ </template>
+ <template v-else>
+ <el-descriptions-item label="濮旀墭缂栧彿">{{
+ insOrder.entrustCode
+ }}</el-descriptions-item>
+ <el-descriptions-item label="鏍峰搧缂栧彿">{{
+ currentSample.sampleCode
+ }}</el-descriptions-item>
+ <el-descriptions-item label="鏍峰搧鍚嶇О">{{
+ currentSample.sample
+ }}</el-descriptions-item>
+ <el-descriptions-item label="鏍峰搧鏁伴噺">{{
+ sampleProduct.length
+ }}</el-descriptions-item>
+ <el-descriptions-item label="鏍峰搧鍨嬪彿">{{
+ currentSample.model
+ }}</el-descriptions-item>
+ <el-descriptions-item label="涓嬪彂鏃堕棿">{{
+ insOrder.sendTime
+ }}</el-descriptions-item>
+ <el-descriptions-item label="绱ф�ョ▼搴�">{{
+ insOrder.typeName
+ }}</el-descriptions-item>
+ <el-descriptions-item label="绾﹀畾鏃堕棿">{{
+ insOrder.appointed
+ }}</el-descriptions-item>
+ </template>
+ <el-descriptions-item label="褰撳墠鏍峰搧浣嶆暟"
+ ><el-tag v-if="currentKey">{{
+ `NO.${currentKey}`
+ }}</el-tag></el-descriptions-item
+ >
+ <el-descriptions-item label="澶囨敞">
+ <el-input
+ v-model="insOrder.remark"
+ :disabled="state != 1"
+ clearable
+ placeholder="璇疯緭鍏�"
+ size="small"
+ @blur="subOtherForm(insOrder.remark, 'remark')"
+ ></el-input>
+ </el-descriptions-item>
+ </el-descriptions>
</div>
<div class="center">
- <div class="search" style="
+ <div
+ class="search"
+ style="
text-align: left;
display: flex;
align-items: center;
justify-content: space-between;
- ">
+ "
+ >
<div style="display: flex; align-items: center">
<span v-if="tableList.length > 0">妫�楠屾ā鏉匡細</span>
<el-radio-group v-model="currentTable" size="small">
- <el-radio-button v-for="(item, index) in tableLists" :key="index" :label="item.templateId" size="small">{{
- item.templateName }}</el-radio-button>
+ <el-radio-button
+ v-for="(item, index) in tableLists"
+ :key="index"
+ :label="item.templateId"
+ size="small"
+ >{{ item.templateName }}</el-radio-button
+ >
</el-radio-group>
</div>
<div style="display: flex; align-items: center">
- <el-button v-if="state == 1" size="small" type="primary" @click="openAddUnpass">鏂板涓嶅悎鏍煎娴�</el-button>
- <el-button v-if="state == 1" size="small" type="primary" @click="unpassCheck">涓嶅悎鏍煎娴�</el-button>
- <el-button v-if="state > 1" size="small" type="primary" @click="viewUnpassCheck">鏌ョ湅涓嶅悎鏍煎娴�</el-button>
+ <el-button
+ v-if="state == 1"
+ size="small"
+ type="primary"
+ @click="openAddUnpass"
+ >鏂板涓嶅悎鏍煎娴�</el-button
+ >
+ <el-button
+ v-if="state == 1"
+ size="small"
+ type="primary"
+ @click="unpassCheck"
+ >涓嶅悎鏍煎娴�</el-button
+ >
+ <el-button
+ v-if="state > 1"
+ size="small"
+ type="primary"
+ @click="viewUnpassCheck"
+ >鏌ョ湅涓嶅悎鏍煎娴�</el-button
+ >
<span v-if="cableTagList.length > 0"> 鐢电紗閰嶇疆锛�</span>
- <el-select v-if="cableTagList.length > 0" v-model="currentTab" clearable placeholder="璇烽�夋嫨" size="small"
- @change="(m) => handleChangeCableTag(currentSample.id, 0, 'cableTag', m)
- " @focus="getCableTag(currentSample.id)">
- <el-option v-for="item in cableTagList" :key="item.cableTag" :label="item.cableTag" :value="item.cableTag">
+ <el-select
+ v-if="cableTagList.length > 0"
+ v-model="currentTab"
+ clearable
+ placeholder="璇烽�夋嫨"
+ size="small"
+ @change="
+ (m) => handleChangeCableTag(currentSample.id, 0, 'cableTag', m)
+ "
+ @focus="getCableTag(currentSample.id)"
+ >
+ <el-option
+ v-for="item in cableTagList"
+ :key="item.cableTag"
+ :label="item.cableTag"
+ :value="item.cableTag"
+ >
<span style="float: left">{{ item.cableTag }}</span>
- <el-tag v-if="item.status == 0" size="small" style="float: right; margin-top: 5px"
- type="danger">鏈</el-tag>
- <el-tag v-if="item.status == 1" size="small" style="float: right; margin-top: 5px"
- type="warning">妫�楠屼腑</el-tag>
- <el-tag v-if="item.status == 2" size="small" style="float: right; margin-top: 5px"
- type="success">宸叉</el-tag>
+ <el-tag
+ v-if="item.status == 0"
+ size="small"
+ style="float: right; margin-top: 5px"
+ type="danger"
+ >鏈</el-tag
+ >
+ <el-tag
+ v-if="item.status == 1"
+ size="small"
+ style="float: right; margin-top: 5px"
+ type="warning"
+ >妫�楠屼腑</el-tag
+ >
+ <el-tag
+ v-if="item.status == 2"
+ size="small"
+ style="float: right; margin-top: 5px"
+ type="success"
+ >宸叉</el-tag
+ >
</el-option>
</el-select>
- <span v-if="repetitionTagList.length > 0"> 閲嶅妫�楠岄」锛�</span>
- <el-select v-if="repetitionTagList.length > 0" v-model="repetitionTag" clearable placeholder="璇烽�夋嫨"
- size="small" @change="(m) =>
- handleChangeCableTag(currentSample.id, 0, 'repetitionTag', m)
- " @focus="getRepetitionTag(currentSample.id)">
- <el-option v-for="item in repetitionTagList" :key="item.repetitionTag" :label="item.radius"
- :value="item.repetitionTag">
+ <span v-if="repetitionTagList.length > 0"
+ > 閲嶅妫�楠岄」锛�</span
+ >
+ <el-select
+ v-if="repetitionTagList.length > 0"
+ v-model="repetitionTag"
+ clearable
+ placeholder="璇烽�夋嫨"
+ size="small"
+ @change="
+ (m) =>
+ handleChangeCableTag(currentSample.id, 0, 'repetitionTag', m)
+ "
+ @focus="getRepetitionTag(currentSample.id)"
+ >
+ <el-option
+ v-for="item in repetitionTagList"
+ :key="item.repetitionTag"
+ :label="item.radius"
+ :value="item.repetitionTag"
+ >
<span style="float: left">{{ item.radius }}</span>
- <el-tag v-if="item.status == 0" size="small" style="float: right; margin-top: 5px"
- type="danger">鏈</el-tag>
- <el-tag v-if="item.status == 1" size="small" style="float: right; margin-top: 5px"
- type="warning">妫�楠屼腑</el-tag>
- <el-tag v-if="item.status == 2" size="small" style="float: right; margin-top: 5px"
- type="success">宸叉</el-tag>
+ <el-tag
+ v-if="item.status == 0"
+ size="small"
+ style="float: right; margin-top: 5px"
+ type="danger"
+ >鏈</el-tag
+ >
+ <el-tag
+ v-if="item.status == 1"
+ size="small"
+ style="float: right; margin-top: 5px"
+ type="warning"
+ >妫�楠屼腑</el-tag
+ >
+ <el-tag
+ v-if="item.status == 2"
+ size="small"
+ style="float: right; margin-top: 5px"
+ type="success"
+ >宸叉</el-tag
+ >
</el-option>
</el-select>
<span v-if="typeSource == '1'"> 寰呮楠屾暟閲忥細</span>
- <el-select v-if="typeSource == '1'" v-model="rawMaterialTag" placeholder="璇烽�夋嫨" size="small" @change="(m) => handleChangeCableTag(currentSample.id, 4, 'cableTag', m)
- " @focus="getRawMaterialTag(currentSample.id)">
- <el-option v-for="item in rawMaterialTagList" :key="item.rawMaterialTag" :label="item.rawMaterialTag"
- :value="item.rawMaterialTag">
+ <el-select
+ v-if="typeSource == '1'"
+ v-model="rawMaterialTag"
+ placeholder="璇烽�夋嫨"
+ size="small"
+ @change="
+ (m) => handleChangeCableTag(currentSample.id, 4, 'cableTag', m)
+ "
+ @focus="getRawMaterialTag(currentSample.id)"
+ >
+ <el-option
+ v-for="item in rawMaterialTagList"
+ :key="item.rawMaterialTag"
+ :label="item.rawMaterialTag"
+ :value="item.rawMaterialTag"
+ >
<span style="float: left">{{ item.rawMaterialTag }}</span>
- <el-tag v-if="item.status == 0" size="small" style="float: right; margin-top: 5px"
- type="danger">鏈</el-tag>
- <el-tag v-if="item.status == 1" size="small" style="float: right; margin-top: 5px"
- type="warning">妫�楠屼腑</el-tag>
- <el-tag v-if="item.status == 2" size="small" style="float: right; margin-top: 5px"
- type="success">宸叉</el-tag>
+ <el-tag
+ v-if="item.status == 0"
+ size="small"
+ style="float: right; margin-top: 5px"
+ type="danger"
+ >鏈</el-tag
+ >
+ <el-tag
+ v-if="item.status == 1"
+ size="small"
+ style="float: right; margin-top: 5px"
+ type="warning"
+ >妫�楠屼腑</el-tag
+ >
+ <el-tag
+ v-if="item.status == 2"
+ size="small"
+ style="float: right; margin-top: 5px"
+ type="success"
+ >宸叉</el-tag
+ >
</el-option>
</el-select>
- <el-button :loading="dataAcquisitionLoading" v-if="state == 1" size="small" type="primary"
- @click="getDataAcquisitionDevice">鏁版嵁閲囬泦</el-button>
- <el-button :type="dataAcquisitionEidtAble ? '' : 'primary'" v-if="state == 1" size="small"
- @click="dataAcquisitionEidtAble = !dataAcquisitionEidtAble">{{ dataAcquisitionEidtAble ? "鍏抽棴缂栬緫" : "缂栬緫鏁伴噰"
- }}</el-button>
+ <el-button
+ :loading="dataAcquisitionLoading"
+ v-if="state == 1"
+ size="small"
+ type="primary"
+ @click="getDataAcquisitionDevice"
+ >鏁版嵁閲囬泦</el-button
+ >
+ <el-button
+ :type="dataAcquisitionEidtAble ? '' : 'primary'"
+ v-if="state == 1"
+ size="small"
+ @click="dataAcquisitionEidtAble = !dataAcquisitionEidtAble"
+ >{{ dataAcquisitionEidtAble ? "鍏抽棴缂栬緫" : "缂栬緫鏁伴噰" }}</el-button
+ >
</div>
</div>
<!-- 甯歌妫�楠屽師濮嬭褰� -->
<div id="nav" v-loading="tableLoading" class="center-box">
- <template v-if="
- tableLists.find((m) => m.templateId == currentTable)">
- <table v-for="(item, index) in tableList" :key="index + currentTable + currentSample.id" border="1"
- cellpadding="10" class="tables" id="myTable">
+ <template v-if="tableLists.find((m) => m.templateId == currentTable)">
+ <table
+ v-for="(item, index) in tableList"
+ :key="index + currentTable + currentSample.id"
+ border="1"
+ cellpadding="10"
+ class="tables"
+ id="myTable"
+ >
<tbody>
<tr style="white-space: nowrap">
濮旀墭缂栧彿锛歿{
@@ -157,51 +454,86 @@
}}
</tr>
<tr v-for="(m, i) in item.arr" :key="i">
- <td v-for="(n, j) in m" v-if="n.v.mc == undefined || Object.keys(n.v.mc).length === 4"
- :id="item.templateId + '-' + n.i + '-' + n.r + '-' + n.c" :key="j"
- :colspan="n.v.mc && n.v.mc.cs ? n.v.mc.cs : 1" :rowspan="n.v.mc && n.v.mc.rs ? n.v.mc.rs : 1" :style="`background:${n.v.bg ? n.v.bg : ''};color:${n.v.fc
- };font-size:${n.v.fs}px;width:${handleWidth(
- n
- )}px !important;height:${item.style.rowlen[n.r]}px;font-wight:${n.v.bl ? 'bold' : ''
- };`">
- <div :class="`content-h-${n.v.ht} content-v-${n.v.vt}`" :style="`width:${handleWidth(n)}px !important;min-height:${item.style.rowlen[n.r]
- }px;`" class="content">
- <template v-if="
- n.v.ps != undefined &&
- typeof n.v.ps.value === 'string' &&
- n.v.ps.value.includes('妫�楠屽��') &&
- state == 1
- ">
- <el-input v-if="getInspectionValueType(n.i) == 1"
- :key="'abc-' + '000' + index + '000' + i + '000' + j" v-model="n.v.v" :disabled="(getInspectionItemType(n.i) == 1 &&
- !dataAcquisitionEidtAble) ||
+ <td
+ v-for="(n, j) in m"
+ v-if="n.v.mc == undefined || Object.keys(n.v.mc).length === 4"
+ :id="item.templateId + '-' + n.i + '-' + n.r + '-' + n.c"
+ :key="j"
+ :colspan="n.v.mc && n.v.mc.cs ? n.v.mc.cs : 1"
+ :rowspan="n.v.mc && n.v.mc.rs ? n.v.mc.rs : 1"
+ :style="`background:${n.v.bg ? n.v.bg : ''};color:${
+ n.v.fc
+ };font-size:${n.v.fs}px;width:${handleWidth(
+ n
+ )}px !important;height:${
+ item.style.rowlen[n.r]
+ }px;font-wight:${n.v.bl ? 'bold' : ''};`"
+ >
+ <div
+ :class="`content-h-${n.v.ht} content-v-${n.v.vt}`"
+ :style="`width:${handleWidth(n)}px !important;min-height:${
+ item.style.rowlen[n.r]
+ }px;`"
+ class="content"
+ >
+ <template
+ v-if="
+ n.v.ps != undefined &&
+ typeof n.v.ps.value === 'string' &&
+ n.v.ps.value.includes('妫�楠屽��') &&
+ state == 1
+ "
+ >
+ <el-input
+ v-if="getInspectionValueType(n.i) == 1"
+ :key="'abc-' + '000' + index + '000' + i + '000' + j"
+ v-model="n.v.v"
+ :disabled="
+ (getInspectionItemType(n.i) == 1 &&
+ !dataAcquisitionEidtAble) ||
(n.u != userId && n.u != undefined && n.u != '')
- " class="table_input" @change="(m) =>
+ "
+ class="table_input"
+ @change="
+ (m) =>
changeInput(
m,
`${item.templateId}-${n.r}-${n.c}-${n.i}`,
n,
'getDataType'
)
- " @input="handleInput(n)" @mousewheel.native.prevent @keydown.enter="
- changeInput(
- '',
- `${item.templateId}-${n.r}-${n.c}-${n.i}`,
- n,
- 'getDataType'
- )
- ">
- </el-input>
- <el-input v-else-if="getInspectionValueType(n.i) == 2" v-model="n.v.v" :disabled="getInspectionItemType(n.i) == 1 ||
- (n.u != userId && n.u != undefined && n.u != '')
- " class="table_input" type="textarea" @change="(m) =>
+ "
+ @input="handleInput(n)"
+ @mousewheel.native.prevent
+ @keydown.enter="
changeInput(
- m,
+ '',
`${item.templateId}-${n.r}-${n.c}-${n.i}`,
n,
'getDataType'
)
- " />
+ "
+ >
+ </el-input>
+ <el-input
+ v-else-if="getInspectionValueType(n.i) == 2"
+ v-model="n.v.v"
+ :disabled="
+ getInspectionItemType(n.i) == 1 ||
+ (n.u != userId && n.u != undefined && n.u != '')
+ "
+ class="table_input"
+ type="textarea"
+ @change="
+ (m) =>
+ changeInput(
+ m,
+ `${item.templateId}-${n.r}-${n.c}-${n.i}`,
+ n,
+ 'getDataType'
+ )
+ "
+ />
<!-- <el-select v-else-if="getInspectionValueType(n.i) == 5" v-model="n.v.v" :disabled="state > 1 ||
getInspectionItemType(n.i) == 1 ||
(n.u != userId && n.u != undefined && n.u != '')
@@ -215,116 +547,204 @@
" @visible-change="(e) => getDic(e, n.i)">
<el-option v-for="(e, i) in enumList" :key="i" :label="e.label" :value="e.value"></el-option>
</el-select> -->
- <span v-else-if="getInspectionValueType(n.i) == 4"
- :style="`font-family:${n.v.ff} !important;`">/</span>
+ <span
+ v-else-if="getInspectionValueType(n.i) == 4"
+ :style="`font-family:${n.v.ff} !important;`"
+ >/</span
+ >
</template>
- <template v-else-if="n.v.ps != undefined && n.v.ps.value === '缁撹'">
- <el-select v-if="
- (getInspectionValueType(n.i) == 2 ||
- getInspectionValueType(n.i) == 5) &&
- state == 1
- " v-model="n.v.v" class="table_input" @change="(m) =>
- changeInput(
- m,
- `${item.templateId}-${n.r}-${n.c}-${n.i}`,
- n,
- 'getDataType',
- 'changeSelect'
- )
- ">
+ <template
+ v-else-if="n.v.ps != undefined && n.v.ps.value === '缁撹'"
+ >
+ <el-select
+ v-if="
+ (getInspectionValueType(n.i) == 2 ||
+ getInspectionValueType(n.i) == 5) &&
+ state == 1
+ "
+ v-model="n.v.v"
+ class="table_input"
+ @change="
+ (m) =>
+ changeInput(
+ m,
+ `${item.templateId}-${n.r}-${n.c}-${n.i}`,
+ n,
+ 'getDataType',
+ 'changeSelect'
+ )
+ "
+ >
<el-option :value="1" label="鍚堟牸"></el-option>
<el-option :value="0" label="涓嶅悎鏍�"></el-option>
<el-option :value="3" label="涓嶅垽瀹�"></el-option>
<el-option :value="2" label="寰呭畾"></el-option>
</el-select>
<template v-if="state > 1">
- <span v-if="n.v.v === 1" :style="`font-family:${n.v.ff} !important;color: green;`">鍚堟牸</span>
- <span v-else-if="n.v.v === 0" :style="`font-family:${n.v.ff} !important;color: red;`">涓嶅悎鏍�</span>
- <span v-else-if="n.v.v === 3"
- :style="`font-family:${n.v.ff} !important;color: #3A7BFA;`">涓嶅垽瀹�</span>
- <span v-else :style="`font-family:${n.v.ff} !important;`">寰呭畾</span>
+ <span
+ v-if="n.v.v === 1"
+ :style="`font-family:${n.v.ff} !important;color: green;`"
+ >鍚堟牸</span
+ >
+ <span
+ v-else-if="n.v.v === 0"
+ :style="`font-family:${n.v.ff} !important;color: red;`"
+ >涓嶅悎鏍�</span
+ >
+ <span
+ v-else-if="n.v.v === 3"
+ :style="`font-family:${n.v.ff} !important;color: #3A7BFA;`"
+ >涓嶅垽瀹�</span
+ >
+ <span
+ v-else
+ :style="`font-family:${n.v.ff} !important;`"
+ >寰呭畾</span
+ >
</template>
- <template v-if="getInspectionValueType(n.i) != 2 &&
- state == 1">
- <span v-if="n.v.v === 1" :style="`font-family:${n.v.ff} !important;color: green;`">鍚堟牸</span>
- <span v-else-if="n.v.v === 0" :style="`font-family:${n.v.ff} !important;color: red;`">涓嶅悎鏍�</span>
- <span v-else-if="n.v.v === 3"
- :style="`font-family:${n.v.ff} !important;color: #3A7BFA;`">涓嶅垽瀹�</span>
- <span v-else :style="`font-family:${n.v.ff} !important;`">寰呭畾</span>
+ <template
+ v-if="getInspectionValueType(n.i) != 2 && state == 1"
+ >
+ <span
+ v-if="n.v.v === 1"
+ :style="`font-family:${n.v.ff} !important;color: green;`"
+ >鍚堟牸</span
+ >
+ <span
+ v-else-if="n.v.v === 0"
+ :style="`font-family:${n.v.ff} !important;color: red;`"
+ >涓嶅悎鏍�</span
+ >
+ <span
+ v-else-if="n.v.v === 3"
+ :style="`font-family:${n.v.ff} !important;color: #3A7BFA;`"
+ >涓嶅垽瀹�</span
+ >
+ <span
+ v-else
+ :style="`font-family:${n.v.ff} !important;`"
+ >寰呭畾</span
+ >
</template>
</template>
- <template v-else-if="
- n.v.ps != undefined &&
- n.v.ps.value === '璁惧缂栫爜' &&
- state == 1
- ">
+ <template
+ v-else-if="
+ n.v.ps != undefined &&
+ n.v.ps.value === '璁惧缂栫爜' &&
+ state == 1
+ "
+ >
<span>{{ n.v.v }}</span>
</template>
- <template v-else-if="
- n.v.ps != undefined && n.v.ps.value === '璁惧鍚嶇О'
- ">
- <el-select v-model="n.v.v" :disabled="state > 1" class="table_input" filterable multiple
- placeholder="璁惧" remote @change="(val) => changeEquip(val, n)"
- @visible-change="(e) => getEquipOptions(e, n.i)">
- <el-option v-for="item in equipOptions" :key="item.value" :label="item.label"
- :value="item.value">
+ <template
+ v-else-if="
+ n.v.ps != undefined && n.v.ps.value === '璁惧鍚嶇О'
+ "
+ >
+ <el-select
+ v-model="n.v.v"
+ :disabled="state > 1"
+ class="table_input"
+ filterable
+ multiple
+ placeholder="璁惧"
+ remote
+ @change="(val) => changeEquip(val, n)"
+ @visible-change="(e) => getEquipOptions(e, n.i)"
+ >
+ <el-option
+ v-for="item in equipOptions"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value"
+ >
{{ item.label + "--" + item.value }}
</el-option>
</el-select>
</template>
- <template v-else-if="
- n.v.ps != undefined &&
- n.v.ps.value === '瑕佹眰鍊�' &&
- state == 1
- ">
+ <template
+ v-else-if="
+ n.v.ps != undefined &&
+ n.v.ps.value === '瑕佹眰鍊�' &&
+ state == 1
+ "
+ >
<span :style="`font-family:${n.v.ff} !important;`">{{
getTell(n.i)
}}</span>
</template>
- <template v-else-if="
- n.v.ps != undefined &&
- n.v.ps.value === '璁＄畻鍊�' &&
- state == 1
- "><span :style="`font-family:${n.v.ff} !important;`">{{
- toFixed(n.v.v, n.v.ct)
- }}</span></template>
- <template v-else-if="
- n.v.ps != undefined &&
- n.v.ps.value === '鏈�缁堝��' &&
- state == 1
- ">
+ <template
+ v-else-if="
+ n.v.ps != undefined &&
+ n.v.ps.value === '璁＄畻鍊�' &&
+ state == 1
+ "
+ ><span :style="`font-family:${n.v.ff} !important;`">{{
+ toFixed(n.v.v, n.v.ct)
+ }}</span></template
+ >
+ <template
+ v-else-if="
+ n.v.ps != undefined &&
+ n.v.ps.value === '鏈�缁堝��' &&
+ state == 1
+ "
+ >
<span :style="`font-family:${n.v.ff} !important;`">{{
toFixed(n.v.v, n.v.ct)
}}</span>
</template>
- <template v-else-if="
- n.v.ps != undefined && n.v.ps.value === '鏍峰搧缂栧彿'
- ">
- <div :title="currentSample.sampleCode" style="
- display: flex;
- flex-wrap: nowrap;
- align-items: center;
- width: 100%;
- ">
- <i class="el-icon-caret-left table_caret" style="width: 16px" @click="caretSample(-1)"></i>
+ <template
+ v-else-if="
+ n.v.ps != undefined && n.v.ps.value === '鏍峰搧缂栧彿'
+ "
+ >
+ <div
+ :title="currentSample.sampleCode"
+ style="
+ display: flex;
+ flex-wrap: nowrap;
+ align-items: center;
+ width: 100%;
+ "
+ >
+ <i
+ class="el-icon-caret-left table_caret"
+ style="width: 16px"
+ @click="caretSample(-1)"
+ ></i>
<div
- :style="`font-family:${n.v.ff} !important;overflow: hidden;white-space: nowrap;width: calc(100% - 32px);`">
+ :style="`font-family:${n.v.ff} !important;overflow: hidden;white-space: nowrap;width: calc(100% - 32px);`"
+ >
{{ currentSample.sampleCode }}
</div>
- <i class="el-icon-caret-right table_caret" style="width: 16px" @click="caretSample(1)"></i>
+ <i
+ class="el-icon-caret-right table_caret"
+ style="width: 16px"
+ @click="caretSample(1)"
+ ></i>
</div>
</template>
- <template v-else-if="
- n.v.ps != undefined && n.v.ps.value === '鏍峰搧鍨嬪彿'
- ">
- <div v-if="
- currentSample.model !== undefined &&
- currentSample.model !== null
- " :style="`font-family:${n.v.ff} !important;`">
+ <template
+ v-else-if="
+ n.v.ps != undefined && n.v.ps.value === '鏍峰搧鍨嬪彿'
+ "
+ >
+ <div
+ v-if="
+ currentSample.model !== undefined &&
+ currentSample.model !== null
+ "
+ :style="`font-family:${n.v.ff} !important;`"
+ >
{{ currentSample.model }}
</div>
</template>
- <span v-else :style="`font-family:${n.v.ff} !important;`" v-html="getValue(n.v)"></span>
+ <span
+ v-else
+ :style="`font-family:${n.v.ff} !important;`"
+ v-html="getValue(n.v)"
+ ></span>
</div>
</td>
</tr>
@@ -332,80 +752,211 @@
</table>
</template>
</div>
- <el-upload v-if="state == 1" ref="upload" :action="action" :before-upload="beforeUpload" :data="{
- orderId: id,
- }" :headers="uploadHeader" :on-error="onError" :on-success="handleSuccessUp" :show-file-list="false"
+ <el-upload
+ v-if="state == 1"
+ ref="upload"
+ :action="action"
+ :before-upload="beforeUpload"
+ :data="{
+ orderId: id,
+ }"
+ :headers="uploadHeader"
+ :on-error="onError"
+ :on-success="handleSuccessUp"
+ :show-file-list="false"
accept=".jpg,.jpeg,.png,.gif,.doc,.docx,.xls,.xlsx,.ppt,.pptx,.pdf,.zip,.rar"
- style="width: 80px !important;margin-top: 10px;">
- <el-button v-if="state == 1" size="small" type="primary">闄勪欢涓婁紶</el-button></el-upload>
- <lims-table :tableData="tableData" :column="column" :page="page" :tableLoading="tableLoading"
- :height="'calc(100vh - 290px)'" @pagination="pagination" style="height: 100%; margin-top: 16px"></lims-table>
+ style="width: 80px !important; margin-top: 10px"
+ >
+ <el-button v-if="state == 1" size="small" type="primary"
+ >闄勪欢涓婁紶</el-button
+ ></el-upload
+ >
+ <lims-table
+ :tableData="tableData"
+ :column="column"
+ :page="page"
+ :tableLoading="tableLoading"
+ :height="700"
+ @pagination="pagination"
+ style="height: 100%; margin-top: 16px"
+ ></lims-table>
</div>
<el-drawer :size="550" :visible.sync="sampleVisible" title="鏍峰搧鍒囨崲">
- <el-table v-if="sampleVisible" ref="productTable" :current-row-key="currentKey" :data="sampleProduct"
- :row-class-name="tableRowClassName" :row-key="(record) => record.index" border class="el-table" height="100%"
- highlight-current-row tooltip-effect="dark" @row-click="handleChangeSample">
- <el-table-column :key="Math.random()" align="center" label="搴忓彿" type="index" width="70px">
+ <el-table
+ v-if="sampleVisible"
+ ref="productTable"
+ :current-row-key="currentKey"
+ :data="sampleProduct"
+ :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }"
+ border
+ :row-class-name="tableRowClassName"
+ :row-key="(record) => record.index"
+ border
+ class="el-table"
+ height="100%"
+ highlight-current-row
+ tooltip-effect="dark"
+ @row-click="handleChangeSample"
+ >
+ <el-table-column
+ :key="Math.random()"
+ align="center"
+ label="搴忓彿"
+ type="index"
+ width="70px"
+ >
</el-table-column>
- <el-table-column label="鏍峰搧缂栧彿" min-width="100px" prop="sampleCode" show-overflow-tooltip></el-table-column>
- <el-table-column label="鏍峰搧鍨嬪彿" min-width="100px" prop="model" show-overflow-tooltip></el-table-column>
- <el-table-column label="妫�娴嬬姸鎬�" prop="insState" show-overflow-tooltip width="100px">
+ <el-table-column
+ label="鏍峰搧缂栧彿"
+ min-width="100px"
+ prop="sampleCode"
+ show-overflow-tooltip
+ ></el-table-column>
+ <el-table-column
+ label="鏍峰搧鍨嬪彿"
+ min-width="100px"
+ prop="model"
+ show-overflow-tooltip
+ ></el-table-column>
+ <el-table-column
+ label="妫�娴嬬姸鎬�"
+ prop="insState"
+ show-overflow-tooltip
+ width="100px"
+ >
<template slot-scope="scope">
- <el-tag v-for="(item, i) in typeList" v-if="item.value == scope.row.insState" :key="i" :type="item.type"
- size="medium" style="margin-right: 5px">{{ item.label }}</el-tag>
+ <el-tag
+ v-for="(item, i) in typeList"
+ v-if="item.value == scope.row.insState"
+ :key="i"
+ :type="item.type"
+ size="medium"
+ style="margin-right: 5px"
+ >{{ item.label }}</el-tag
+ >
</template>
</el-table-column>
- <el-table-column align="center" label="鏄惁鐣欐牱" prop="isLeave" show-overflow-tooltip width="95px">
+ <el-table-column
+ align="center"
+ label="鏄惁鐣欐牱"
+ prop="isLeave"
+ show-overflow-tooltip
+ width="95px"
+ >
<template slot-scope="scope">
<span>{{ scope.row.isLeave == 0 ? "鍚�" : "鏄�" }}</span>
</template>
</el-table-column>
<!-- 妫�楠屽崟浼氭湁涓�涓槸鍚︽湁閰嶅鏍峰搧瀛楁鎺у埗鏄剧ず -->
- <el-table-column v-if="insOrder.mating > 0" label="閰嶅鏍峰搧鍨嬪彿" min-width="130px" prop="joinModel"
- show-overflow-tooltip></el-table-column>
- <el-table-column v-if="insOrder.mating > 0" label="閰嶅鏍峰搧鍚嶇О" min-width="130px" prop="joinName"
- show-overflow-tooltip></el-table-column>
- <el-table-column v-if="insOrder.mating > 0" label="閰嶅鏍峰搧鏁伴噺" min-width="130px" prop="joinNum"
- show-overflow-tooltip></el-table-column>
+ <el-table-column
+ v-if="insOrder.mating > 0"
+ label="閰嶅鏍峰搧鍨嬪彿"
+ min-width="130px"
+ prop="joinModel"
+ show-overflow-tooltip
+ ></el-table-column>
+ <el-table-column
+ v-if="insOrder.mating > 0"
+ label="閰嶅鏍峰搧鍚嶇О"
+ min-width="130px"
+ prop="joinName"
+ show-overflow-tooltip
+ ></el-table-column>
+ <el-table-column
+ v-if="insOrder.mating > 0"
+ label="閰嶅鏍峰搧鏁伴噺"
+ min-width="130px"
+ prop="joinNum"
+ show-overflow-tooltip
+ ></el-table-column>
</el-table>
</el-drawer>
- <el-drawer :size="500" :visible.sync="taskVisible" title="浠诲姟鍒囨崲">
- <lims-table :tableData="tableData0" :column="column0" :page="page0" :tableLoading="tableLoading0"
- :height="'calc(100vh - 90px)'" :currentChange="handleChangeTask"></lims-table>
- </el-drawer>
+ <el-dialog
+ title="鍝戦搩鐗囪澶囪瘯鏍风被鍨�"
+ :visible.sync="dialogVisible"
+ :before-close="handleDialogCancel"
+ width="30%"
+ >
+ <el-select
+ v-model="deviceDbTableName"
+ placeholder="璇烽�夋嫨璇曟牱绫诲瀷"
+ style="width: 100%"
+ size="small"
+ >
+ <el-option label="鐗囩姸" value="TestData"></el-option>
+ <el-option label="绠＄姸" value="TestData2"></el-option>
+ </el-select>
+ <span slot="footer" class="dialog-footer">
+ <el-button type="primary" @click="handleDialogConfirm">纭� 瀹�</el-button>
+ </span>
+ </el-dialog>
<el-dialog :visible.sync="reviewDia" title="妫�楠屽鏍�" width="500px">
<div v-if="reviewDia" class="body" style="display: flex; padding: 10px">
<div class="search_label" style="width: 150px">
<span class="required-span">* </span>涓嶉�氳繃鐨勭悊鐢憋細
</div>
<div class="search_input" style="width: 100%">
- <el-input v-model="noReason" :autosize="{ minRows: 4 }" clearable size="small" type="textarea"></el-input>
+ <el-input
+ v-model="noReason"
+ :autosize="{ minRows: 4 }"
+ clearable
+ size="small"
+ type="textarea"
+ ></el-input>
</div>
</div>
<span slot="footer" class="dialog-footer">
<el-button @click="reviewDia = false">鍙� 娑�</el-button>
- <el-button :loading="reviewLoading" type="primary" @click="handleReviewDia">纭� 瀹�</el-button>
+ <el-button
+ :loading="reviewLoading"
+ type="primary"
+ @click="handleReviewDia"
+ >纭� 瀹�</el-button
+ >
</span>
</el-dialog>
<el-dialog :visible.sync="addVerifyDia" title="鎸囧畾澶嶆牳浜哄憳" width="400px">
- <div class="body" style="display: flex; padding: 10px; align-items: center">
+ <div
+ class="body"
+ style="display: flex; padding: 10px; align-items: center"
+ >
<div class="search_label" style="width: 150px">
<span class="required-span">*</span>澶嶆牳浜�
</div>
<div class="search_input" style="width: 100%">
- <el-select v-model="verifyUser" clearable filterable placeholder="璇烽�夋嫨" size="small" style="width: 100%">
- <el-option v-for="(item, i) in personList" :key="i" :label="item.label" :value="item.value">
+ <el-select
+ v-model="verifyUser"
+ clearable
+ filterable
+ placeholder="璇烽�夋嫨"
+ size="small"
+ style="width: 100%"
+ >
+ <el-option
+ v-for="(item, i) in personList"
+ :key="i"
+ :label="item.label"
+ :value="item.value"
+ >
</el-option>
</el-select>
</div>
</div>
<span slot="footer" class="dialog-footer">
<el-button @click="addVerifyDia = false">鍙� 娑�</el-button>
- <el-button :loading="submitLoading" type="primary" @click="submit()">纭� 瀹�</el-button>
+ <el-button :loading="submitLoading" type="primary" @click="submit()"
+ >纭� 瀹�</el-button
+ >
</span>
</el-dialog>
- <el-dialog :close-on-click-modal="false" :close-on-press-escape="false" :show-close="false"
- :visible.sync="dataGetDia" title="鏁版嵁閲囬泦" width="80%">
+ <el-dialog
+ :close-on-click-modal="false"
+ :close-on-press-escape="false"
+ :show-close="false"
+ :visible.sync="dataGetDia"
+ title="鏁版嵁閲囬泦"
+ width="80%"
+ >
<div>
<table border="1" cellpadding="10" class="thermal-table">
<tr>
@@ -420,57 +971,115 @@
<td :rowspan="item.child.length">{{ item.faName }}</td>
<td>{{ item.child[0].name }}</td>
<td style="text-align: left">
- <el-select v-if="item.child[0].isShowSelect" v-model="item.child[0].getDataIndex1"
- :multiple-limit="item.child[0].maxNum" clearable filterable multiple placeholder="璇烽�夋嫨"
- @change="setData(item)">
- <el-option v-for="(item, index) in item.child[0].arr" :key="index" :filter-method="filterMethod"
- :label="index + 1 + '^' + item.result" :value="index + '^' + item.result">
- <span>{{
- "搴忓彿锛�" +
- (index + 1) +
- "锛�" +
- "缁撴灉锛�" +
- item.result +
- "锛�" +
- "鍘氬害锛�" +
- item.thickness +
- "锛�" +
- "鏃堕棿锛�" +
- item.mergedDateTime
- }}</span>
- </el-option>
- </el-select>
- <el-checkbox-group v-if="!item.child[0].isShowSelect" v-model="item.child[0].getDataIndex1"
- :max="item.child[0].maxNum">
- <el-checkbox v-for="(n, j) in item.child[0].arr" :key="j" :label="j + '^' + n">{{ n }}</el-checkbox>
- </el-checkbox-group>
+ <!-- 娣诲姞瀹瑰櫒 div -->
+ <div class="data-collection-items">
+ <el-select
+ v-if="item.child[0].isShowSelect"
+ v-model="item.child[0].getDataIndex1"
+ :multiple-limit="item.child[0].maxNum"
+ clearable
+ filterable
+ multiple
+ placeholder="璇烽�夋嫨"
+ @change="setData(item)"
+ >
+ <el-option
+ v-for="(subItem, subIndex) in item.child[0].arr"
+ :key="index + '-' + subIndex"
+ :filter-method="filterMethod"
+ :label="subIndex + 1 + '^' + subItem.result"
+ :value="subIndex + '^' + subItem.result"
+ >
+ <span>{{
+ "搴忓彿锛�" +
+ (subIndex + 1) +
+ "锛�" +
+ "缁撴灉锛�" +
+ subItem.result +
+ "锛�" +
+ "鍘氬害锛�" +
+ subItem.thickness +
+ "锛�" +
+ "鏃堕棿锛�" +
+ subItem.mergedDateTime
+ }}</span>
+ </el-option>
+ </el-select>
+ <el-checkbox-group
+ v-if="!item.child[0].isShowSelect"
+ v-model="item.child[0].getDataIndex1"
+ :max="item.child[0].maxNum"
+ >
+ <el-checkbox
+ v-for="(n, j) in item.child[0].arr"
+ :key="index + '-' + j + 'aaaaaa'"
+ :label="j + '^' + n"
+ @change="
+ handleGroupSelect(
+ item.child[0],
+ j,
+ item.child[0].arr.length
+ )
+ "
+ >{{ n }}</el-checkbox
+ >
+ </el-checkbox-group>
+ </div>
</td>
</tr>
- <tr v-for="(m, i) in item.child" v-show="i > 0" :key="i + 'bbbbbbbbbbbbbb'">
+ <tr
+ v-for="(m, i) in item.child"
+ v-show="i > 0"
+ :key="index + '-' + i + 'bbbbbbbbbbbbbb'"
+ >
<td>{{ m.name }}</td>
<td style="text-align: left">
- <el-select v-if="m.isShowSelect" v-model="m.getDataIndex1" :multiple-limit="m.maxNum" clearable
- filterable multiple placeholder="璇烽�夋嫨">
- <el-option v-for="(item, index1) in m.arr" :key="index1" :label="index + 1 + '^' + item.result"
- :value="index1 + '^' + item.result">
- <span>{{
- "搴忓彿锛�" +
- (index1 + 1) +
- "锛�" +
- "缁撴灉锛�" +
- item.result +
- "锛�" +
- "鍘氬害锛�" +
- item.thickness +
- "锛�" +
- "鏃堕棿锛�" +
- item.mergedDateTime
- }}</span>
- </el-option>
- </el-select>
- <el-checkbox-group v-if="!m.isShowSelect" v-model="m.getDataIndex1" :max="m.maxNum">
- <el-checkbox v-for="(n, j) in m.arr" :key="j" :label="j + '^' + n">{{ n }}</el-checkbox>
- </el-checkbox-group>
+ <!-- 娣诲姞瀹瑰櫒 div -->
+ <div class="data-collection-items">
+ <el-select
+ v-if="m.isShowSelect"
+ v-model="m.getDataIndex1"
+ :multiple-limit="m.maxNum"
+ clearable
+ filterable
+ multiple
+ placeholder="璇烽�夋嫨"
+ >
+ <el-option
+ v-for="(subItem, index1) in m.arr"
+ :key="index + '-' + index1 + 'cccccccc'"
+ :label="index1 + 1 + '^' + subItem.result"
+ :value="index1 + '^' + subItem.result"
+ >
+ <span>{{
+ "搴忓彿锛�" +
+ (index1 + 1) +
+ "锛�" +
+ "缁撴灉锛�" +
+ subItem.result +
+ "锛�" +
+ "鍘氬害锛�" +
+ subItem.thickness +
+ "锛�" +
+ "鏃堕棿锛�" +
+ subItem.mergedDateTime
+ }}</span>
+ </el-option>
+ </el-select>
+ <el-checkbox-group
+ v-if="!m.isShowSelect"
+ v-model="m.getDataIndex1"
+ :max="m.maxNum"
+ >
+ <el-checkbox
+ v-for="(n, j) in m.arr"
+ :key="index + '-' + j + 'dddddddd'"
+ :label="j + '^' + n"
+ @change="handleGroupSelect(m, j, m.arr.length)"
+ >{{ n }}</el-checkbox
+ >
+ </el-checkbox-group>
+ </div>
</td>
</tr>
</template>
@@ -478,43 +1087,185 @@
</div>
<span slot="footer" class="dialog-footer">
<el-button @click="dataGetDia = false">鍙� 娑�</el-button>
- <el-button :loading="getDataIndexLoading" type="primary" @click="submitDataGet()">纭� 瀹�</el-button>
+ <el-button
+ :loading="getDataIndexLoading"
+ type="primary"
+ @click="submitDataGet()"
+ >纭� 瀹�</el-button
+ >
</span>
</el-dialog>
- <el-dialog :close-on-click-modal="false" :visible.sync="addCheck" title="鎸囧畾鎶ュ憡瀹℃牳浜哄憳" width="400px"
- @close="closeAddVerifyDia">
- <div class="body" style="display: flex; padding: 10px; align-items: center">
+
+ <el-dialog
+ :close-on-click-modal="false"
+ :visible.sync="addCheck"
+ title="鎸囧畾鎶ュ憡瀹℃牳浜哄憳"
+ width="400px"
+ @close="closeAddVerifyDia"
+ >
+ <div
+ class="body"
+ style="display: flex; padding: 10px; align-items: center"
+ >
<div class="search_label" style="width: 150px">
<span class="required-span">*</span>瀹℃牳浜猴細
</div>
<div class="search_input" style="width: 100%">
- <el-select v-model="checkUser" clearable filterable placeholder="璇烽�夋嫨" size="small" style="width: 100%">
- <el-option v-for="(item, i) in personList" :key="i" :label="item.label" :value="item.value">
+ <el-select
+ v-model="checkUser"
+ clearable
+ filterable
+ placeholder="璇烽�夋嫨"
+ size="small"
+ style="width: 100%"
+ >
+ <el-option
+ v-for="(item, i) in personList"
+ :key="i"
+ :label="item.label"
+ :value="item.value"
+ >
</el-option>
</el-select>
</div>
</div>
<span slot="footer" class="dialog-footer">
<el-button @click="closeAddVerifyDia">鍙� 娑�</el-button>
- <el-button :loading="reviewLoading" type="primary" @click="upInsReview(1)">纭� 瀹�</el-button>
+ <el-button
+ :loading="reviewLoading"
+ type="primary"
+ @click="upInsReview(1)"
+ >纭� 瀹�</el-button
+ >
</span>
</el-dialog>
- <add-un-pass v-if="addUnPassDialog" ref="addUnPassDialog" :addUnPassDialog="addUnPassDialog"
- @resetAddUnPass="resetAddUnPass"></add-un-pass>
- <UnPassDialog v-if="unPassDialog" ref="unPassDialog" :orderId="orderId" :unPassDialog="unPassDialog"
- @resetForm="resetForm"></UnPassDialog>
- <InspectionWord v-if="unPassCheck" :inspectorList="inspectorList" :orderId="orderId"
- :rawMaterialTag="rawMaterialTag" :sonLaboratory="sonLaboratory" :state="state" :typeSource="typeSource"
- :unPassCheck="unPassCheck" @closeUnPassCheckDialog="closeUnPassCheckDialog" @refreshView="refreshView" />
- <purchase-verification v-if="purchaseDialog" ref="purchaseDialog" :orderId="orderId"
- :purchaseDialog="purchaseDialog" @resetPurchaseDialog="resetPurchaseDialog"></purchase-verification>
+ <!-- 娣诲姞涓嶅悎鏍煎娴嬪脊妗�-->
+ <add-un-pass
+ v-if="addUnPassDialog"
+ ref="addUnPassDialog"
+ :addUnPassDialog="addUnPassDialog"
+ @resetAddUnPass="resetAddUnPass"
+ ></add-un-pass>
+ <!-- 涓嶅悎鏍煎鐞嗗脊妗�-->
+ <UnPassDialog
+ v-if="unPassDialog"
+ ref="unPassDialog"
+ :orderId="orderId"
+ :unPassDialog="unPassDialog"
+ @resetForm="resetForm"
+ ></UnPassDialog>
+ <!-- 涓嶅悎鏍煎娴嬪脊妗�-->
+ <InspectionWord
+ v-if="unPassCheck"
+ :inspectorList="inspectorList"
+ :orderId="orderId"
+ :cableTag="temCableTag"
+ :repetitionTag="repetitionTag"
+ :rawMaterialTag="rawMaterialTag"
+ :sonLaboratory="sonLaboratory"
+ :state="state"
+ :typeSource="typeSource"
+ :unPassCheck="unPassCheck"
+ @closeUnPassCheckDialog="closeUnPassCheckDialog"
+ @refreshView="refreshView"
+ />
+ <!-- 杩涜揣楠岃瘉寮规-->
+ <purchase-verification
+ v-if="purchaseDialog"
+ ref="purchaseDialog"
+ :orderId="orderId"
+ :purchaseDialog="purchaseDialog"
+ @resetPurchaseDialog="resetPurchaseDialog"
+ ></purchase-verification>
+ <!-- IFS鐗╂枡灞炴�х紪杈戝脊妗�-->
+ <el-dialog
+ title="鏇存柊IFS搴撳瓨鐗╂枡鎵规灞炴��"
+ :visible.sync="ifsMaterialPropsVisible"
+ width="20%"
+ >
+ <el-form style="width: 100%" :model="ifsMaterialPropsForm">
+ <el-form-item label="杞藉叿缂栧彿(Attr1):">
+ <el-input
+ placeholder="杞藉叿缂栧彿"
+ size="small"
+ v-model="ifsMaterialPropsForm.drumNo"
+ ></el-input>
+ </el-form-item>
+ <el-form-item label="璧峰绫虫爣(Attr2):">
+ <el-input
+ @blur="validateQuality()"
+ placeholder="璧峰绫虫爣"
+ size="small"
+ v-model="ifsMaterialPropsForm.startMeterMark"
+ >
+ <span slot="suffix">km</span>
+ </el-input>
+ </el-form-item>
+ <el-form-item label="鎴绫虫爣(Attr3):">
+ <el-input
+ @blur="validateQuality()"
+ placeholder="鎴绫虫爣"
+ size="small"
+ v-model="ifsMaterialPropsForm.endMeterMark"
+ >
+ <span slot="suffix">km</span>
+ </el-input>
+ </el-form-item>
+ <!-- <el-form-item label="鍏ュ簱闀垮害">-->
+ <!-- <el-input v-model="ifsMaterialPropsForm.inboundLength"></el-input>-->
+ <!-- </el-form-item>-->
+ <el-form-item label="澶栨姢棰滆壊(Attr4):">
+ <el-select size="small" v-model="ifsMaterialPropsForm.outerColor">
+ <el-option
+ v-for="(item, index) in outerColorList"
+ :label="item.dictLabel"
+ :value="item.dictValue"
+ :key="index"
+ ></el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="缁濈紭棰滆壊(Attr5):">
+ <el-select
+ size="small"
+ v-model="ifsMaterialPropsForm.insulationColor"
+ >
+ <el-option
+ v-for="(item, index) in insulationColorList"
+ :label="item.dictLabel"
+ :value="item.dictValue"
+ :key="index"
+ ></el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="鍗板瓧淇℃伅(Attr8):">
+ <el-select
+ size="small"
+ v-model="ifsMaterialPropsForm.letteringInfo"
+ placeholder="璇烽�夋嫨"
+ >
+ <el-option
+ v-for="(item, index) in letteringInfoList"
+ :label="item.dictLabel"
+ :value="item.dictValue"
+ :key="index"
+ ></el-option>
+ </el-select>
+ </el-form-item>
+ </el-form>
+ <span slot="footer" class="dialog-footer">
+ <el-button @click="closePartPropDialog()">鍙� 娑�</el-button>
+ <el-button type="primary" @click="saveOrUpdatePartProp()"
+ >纭� 瀹�</el-button
+ >
+ </span>
+ </el-dialog>
</div>
</template>
<script>
import excelFunction from "@/utils/excelFountion";
import limsTable from "@/components/Table/lims-table.vue";
-import UnPassDialog from "../unpass/components/addUnPass.vue";
+import UnPassDialog from "../unpass/components/unPassDialog.vue";
import AddUnPass from "../unpass/components/addUnPass.vue";
import InspectionWord from "./components/InspectionWord.vue";
import PurchaseVerification from "../unpass/components/PurchaseVerification.vue";
@@ -535,14 +1286,19 @@
downFile,
getFileList,
delfile,
- inspectionOrderDetailsTaskSwitching
+ inspectionOrderDetailsTaskSwitching,
} from "@/api/business/inspectionTask.js";
-import InspectionWorker from '../../../InspectionWorker.worker';
-import DataWorker from '../../../DataWorker.worker';
+import InspectionWorker from "@/workers/InspectionWorker.worker.js";
+import DataWorker from "@/workers/DataWorker.worker.js";
import html2canvas from "html2canvas";
import { mapGetters } from "vuex";
+import {
+ getOneByIfsId,
+ saveOrUpdateProps,
+} from "@/api/business/ifsPartProps.js";
+import { getDicts } from "@/api/system/dict/data";
export default {
- name: 'inspection',
+ name: "Inspection",
components: {
PurchaseVerification,
AddUnPass,
@@ -552,6 +1308,26 @@
},
data() {
return {
+ // 瀛樺偍 Promise 鐨� resolve/reject锛岀敤浜庡脊妗嗙‘璁�/鍙栨秷鏃惰皟鐢�
+ dialogResolve: null,
+ dialogReject: null,
+ dialogVisible: false,
+ deviceDbTableName: "",
+ outerColorList: [],
+ insulationColorList: [],
+ letteringInfoList: [],
+ ifsMaterialPropsForm: {
+ id: null,
+ ifsInventoryId: null,
+ drumNo: "", // 杞藉叿缂栧彿
+ startMeterMark: "", // 璧峰绫虫爣
+ endMeterMark: "", // 鎴绫虫爣
+ insulationColor: "", // 缁濈紭棰滆壊
+ outerColor: "", // 澶栨姢棰滆壊
+ inboundLength: "", // 鍏ュ簱闀垮害
+ letteringInfo: "", // 鍗板瓧淇℃伅
+ },
+ ifsMaterialPropsVisible: false,
sonLaboratory: null,
orderId: null,
state: null,
@@ -570,7 +1346,6 @@
dataGetDia: false,
fileAdd: false,
sampleVisible: false,
- taskVisible: false,
submitLoading: false,
searchForm: {
sampleName: null,
@@ -682,14 +1457,16 @@
tableData: [],
column: [
{
- label: "绫诲瀷", prop: "type", dataType: "tag",
+ label: "绫诲瀷",
+ prop: "type",
+ dataType: "tag",
formatData: (params) => {
if (params == 1) {
- return '鍥剧墖'
+ return "鍥剧墖";
} else {
- return '鏂囦欢'
+ return "鏂囦欢";
}
- }
+ },
},
{ label: "闄勪欢鍚嶇О", prop: "fileName" },
{ label: "涓婁紶浜�", prop: "name" },
@@ -724,33 +1501,36 @@
size: 10,
current: 0,
},
- tableLoading: false,
// 鏂囦欢鍒楄〃鐩稿叧--缁撴潫
// 浠诲姟鍒囨崲鍒楄〃--寮�濮�
tableData0: [],
column0: [
- { label: "濮旀墭缂栧彿", prop: "entrustCode", width: '160px' },
- { label: "妫�楠屽璞�", prop: "sampleType", width: '140px' },
+ { label: "濮旀墭缂栧彿", prop: "entrustCode", width: "160px" },
+ { label: "妫�楠屽璞�", prop: "sampleType", width: "140px" },
{
- label: "绱ф�ョ▼搴�", prop: "type", dataType: "tag",
+ label: "绱ф�ョ▼搴�",
+ prop: "type",
+ dataType: "tag",
formatData: (params) => {
- return this.urgentList.find(m => m.value == params).label
+ return this.urgentList.find((m) => m.value == params).label;
},
formatType: (params) => {
- return this.urgentList.find(m => m.value == params).type
- }
+ return this.urgentList.find((m) => m.value == params).type;
+ },
},
{
- label: "鐘舵��", prop: "insState", dataType: "tag",
+ label: "鐘舵��",
+ prop: "insState",
+ dataType: "tag",
formatData: (params) => {
- return this.typeList.find(m => m.value == params).label
+ return this.typeList.find((m) => m.value == params).label;
},
formatType: (params) => {
- return this.typeList.find(m => m.value == params).type
- }
+ return this.typeList.find((m) => m.value == params).type;
+ },
},
- { label: "绾﹀畾鏃堕棿", prop: "appointed", width: '140px' },
- { label: "涓嬪彂鏃堕棿", prop: "sendTime", width: '140px' },
+ { label: "绾﹀畾鏃堕棿", prop: "appointed", width: "140px" },
+ { label: "涓嬪彂鏃堕棿", prop: "sendTime", width: "140px" },
],
page0: {
total: 0,
@@ -759,6 +1539,7 @@
},
tableLoading0: false,
// 浠诲姟鍒囨崲鍒楄〃--缁撴潫
+ isSplit: 0, // 鏄惁鏄媶鍗曡繃鏉ョ殑
};
},
// 鐢ㄤ簬涓婁紶鏂囦欢鐨勪俊鎭�
@@ -769,7 +1550,7 @@
},
},
created() {
- let { sonLaboratory, orderId, state, inspectorList, typeSource } =
+ let { sonLaboratory, orderId, state, inspectorList, typeSource, isSplit } =
this.$route.query;
this.sonLaboratory = sonLaboratory;
this.orderId = orderId;
@@ -777,13 +1558,22 @@
this.state = state;
this.inspectorList = inspectorList;
this.typeSource = typeSource;
+ this.isSplit = isSplit;
},
mounted() {
this.getTypeDicts(); // 鑾峰彇绱ф�ョ▼搴︿笅鎷夋閫夐」
this.getInsStateDicts();
this.getComparisonList();
this.getAuthorizedPerson();
- // this.getPower();
+ this.startWorker();
+ // this.getList0() // 浠诲姟鍒囨崲
+ this.scrollInit();
+ },
+ activated() {
+ this.getTypeDicts(); // 鑾峰彇绱ф�ョ▼搴︿笅鎷夋閫夐」
+ this.getInsStateDicts();
+ this.getComparisonList();
+ this.getAuthorizedPerson();
this.startWorker();
// this.getList0() // 浠诲姟鍒囨崲
this.scrollInit();
@@ -791,7 +1581,7 @@
watch: {
// 鐩戝惉浠诲姟id锛岃幏鍙栦换鍔′俊鎭�
id(val) {
- this.refreshView()
+ this.refreshView();
},
// 鐩戝惉褰撳墠妯℃澘鍙樺寲
currentTable(val1, val0) {
@@ -851,7 +1641,7 @@
// 鐗规畩妫�楠岄」--鐩戝惉璁惧淇℃伅鏀瑰彉
equipForm: {
deep: true,
- handler(val) { },
+ handler(val) {},
},
},
beforeDestroy() {
@@ -859,6 +1649,100 @@
this.stopWorker();
},
methods: {
+ validateQuality() {
+ let inboundLength = Number(
+ this.calcInbondLength(
+ this.ifsMaterialPropsForm.startMeterMark,
+ this.ifsMaterialPropsForm.endMeterMark
+ )
+ );
+ let testQuantity = Number(this.insOrder.testQuantity);
+ if (inboundLength != null && testQuantity !== inboundLength) {
+ this.$message.warning(
+ `鍏ュ簱闀垮害(${inboundLength}km)涓庢楠屾暟閲�(${testQuantity}km)涓嶇锛岃纭锛乣
+ );
+ }
+ },
+ calcInbondLength(startMeterMark, endMeterMark) {
+ let inboundLength = null;
+ if (
+ startMeterMark != null &&
+ startMeterMark !== "" &&
+ endMeterMark != null &&
+ endMeterMark !== ""
+ ) {
+ let minus = this.$Big(endMeterMark).minus(this.$Big(startMeterMark));
+ inboundLength = Math.abs(minus);
+ }
+ return inboundLength;
+ },
+ getLetteringInfoDicts() {
+ getDicts("lettering_info_type").then((res) => {
+ if (res.code == 200) {
+ this.letteringInfoList = res.data;
+ }
+ });
+ },
+ getInsulationColorDicts() {
+ getDicts("insulation_color_type").then((res) => {
+ if (res.code == 200) {
+ this.insulationColorList = res.data;
+ }
+ });
+ },
+ getOuterColorDicts() {
+ getDicts("outer_color_type").then((res) => {
+ if (res.code == 200) {
+ this.outerColorList = res.data;
+ }
+ });
+ },
+ closePartPropDialog() {
+ this.ifsMaterialPropsForm = {
+ id: null,
+ ifsInventoryId: null,
+ drumNo: "", // 杞藉叿缂栧彿
+ startMeterMark: "", // 璧峰绫虫爣
+ endMeterMark: "", // 鎴绫虫爣
+ insulationColor: "", // 缁濈紭棰滆壊
+ outerColor: "", // 澶栨姢棰滆壊
+ inboundLength: "", // 鍏ュ簱闀垮害
+ letteringInfo: "", // 鍗板瓧淇℃伅
+ };
+ this.ifsMaterialPropsVisible = false;
+ },
+ getPartProps(ifsId) {
+ getOneByIfsId(ifsId).then((res) => {
+ if (res.code == 200 && res.data) {
+ this.ifsMaterialPropsForm = res.data;
+ }
+ });
+ },
+ saveOrUpdatePartProp() {
+ this.ifsMaterialPropsForm.ifsInventoryId = this.insOrder.ifsInventoryId;
+ saveOrUpdateProps({
+ ...this.ifsMaterialPropsForm,
+ partNo: this.insOrder.partNo,
+ lotBatchNo: this.insOrder.lotBatchNo,
+ contract: this.insOrder.contract,
+ }).then((res) => {
+ if (res.code == 200) {
+ this.$message.success("淇濆瓨鎴愬姛");
+ this.ifsMaterialPropsVisible = false;
+ this.refreshView();
+ }
+ });
+ },
+ //鎵撳紑IFS鐗╂枡灞炴�у脊妗�
+ showMaterialPropsDialog() {
+ this.getPartProps(this.insOrder.ifsInventoryId);
+ this.getOuterColorDicts();
+ this.getInsulationColorDicts();
+ this.getLetteringInfoDicts();
+ this.$nextTick(() => {
+ this.ifsMaterialPropsVisible = true;
+ });
+ },
// 鏂囦欢绠＄悊--寮�濮�
getList() {
this.tableLoading = true;
@@ -889,19 +1773,42 @@
})
.then(() => {
delfile({ id: row.id }).then((res) => {
- if (res.code == 201) return;
this.$message.success("鍒犻櫎鎴愬姛");
- this.refresh();
+ this.getList();
});
})
- .catch(() => { });
+ .catch(() => {});
},
// 鏂囦欢绠＄悊--缁撴潫
+ // 澶勭悊鏁寸粍鍕鹃�夐�昏緫鐨勬柟娉�
+ handleGroupSelect(childItem, clickedIndex, groupSize = 5) {
+ if (groupSize == 6) {
+ groupSize = 6;
+ } else {
+ groupSize = 5;
+ }
+ // 璁＄畻鎵�鍦ㄧ粍鐨勮捣濮嬬储寮�
+ const groupStartIndex = Math.floor(clickedIndex / groupSize) * groupSize;
+ // 娓呯┖褰撳墠宸查��
+ childItem.getDataIndex1 = [];
+ // 閬嶅巻褰撳墠缁勭殑 groupSize 涓厓绱狅紝娣诲姞鍒伴�変腑鍒楄〃
+ for (
+ let i = groupStartIndex;
+ i < groupStartIndex + groupSize && i < childItem.arr.length;
+ i++
+ ) {
+ childItem.getDataIndex1.push(i + "^" + childItem.arr[i]);
+ }
+ },
// 浠诲姟鍒囨崲--寮�濮�
getList0() {
this.tableLoading0 = true;
- let param = { userId: this.userId, sonLaboratory: this.sonLaboratory, ...this.page0 };
+ let param = {
+ userId: this.userId,
+ sonLaboratory: this.sonLaboratory,
+ ...this.page0,
+ };
delete param.total;
inspectionOrderDetailsTaskSwitching({ ...param })
.then((res) => {
@@ -928,8 +1835,12 @@
laboratory: this.sonLaboratory,
}).then(async (res) => {
this.insOrder = res.data.insOrder;
+ if (res.data.insOrder.ifsOrderType === "02wg") {
+ //鏌ヨ闆朵欢灞炴��
+ this.getPartProps(res.data.insOrder.ifsInventoryId);
+ }
this.supplierDensity = res.data.supplierDensity;
- this.getList()
+ this.getList();
this.urgentList.forEach((m) => {
if (m.value == this.insOrder.type) {
this.insOrder.typeName = m.label;
@@ -1027,8 +1938,9 @@
id: this.currentSample.id,
type: this.type,
laboratory: this.sonLaboratory,
- cableTag: "",
+ cableTag: this.temCableTag,
rawMaterialTag: this.rawMaterialTag,
+ repetitionTag: this.repetitionTag,
};
this.$nextTick(() => {
this.$refs.addUnPassDialog.getInsOrder(info);
@@ -1077,32 +1989,84 @@
this.$refs.purchaseDialog.$refs["purchaseForm"].resetFields();
this.purchaseDialog = false;
},
+ openDialog() {
+ this.dialogVisible = true;
+ this.deviceDbTableName = ""; // 閲嶇疆琛ㄥ崟
+ // 杩斿洖 Promise锛岀瓑寰呯敤鎴锋搷浣�
+ return new Promise((resolve, reject) => {
+ this.dialogResolve = resolve;
+ this.dialogReject = reject;
+ });
+ },
+ // 寮规纭鎻愪氦
+ handleDialogConfirm() {
+ // 鍏抽棴寮规
+ this.dialogVisible = false;
+ // 璋冪敤 resolve锛屼紶閫掕〃鍗曟暟鎹紝鎭㈠鎵ц鍚庣画浠ｇ爜
+ this.dialogResolve(this.deviceDbTableName);
+ },
+
+ // 寮规鍙栨秷/鍏抽棴
+ handleDialogCancel() {
+ console.log(111);
+ this.dialogVisible = false;
+ // 璋冪敤 reject锛岀粓姝㈠悗缁唬鐮�
+ this.dialogReject();
+ },
// 鏁版嵁閲囬泦
- getDataAcquisitionDevice() {
- let itemIds = [];
- this.currentSample.insProduct.forEach((item) => {
- if (item.inspectionItemType === "1") {
- itemIds.push(item.id);
+ async getDataAcquisitionDevice() {
+ //杩囨护閫変腑鐨勮澶囧垪琛�
+ let deviceList = [];
+ for (let item in this.param) {
+ let val1 = this.param[item];
+ for (let item2 in val1) {
+ if (item2 === "equipName") {
+ let equipName = val1[item2];
+ equipName.forEach((item) => {
+ if (item.v.v && Array.isArray(item.v.v)) {
+ deviceList.push(...item.v.v);
+ }
+ });
+ }
}
- });
- const params = {
- entrustCode: this.insOrder.entrustCode,
- sampleCode: this.currentSample.sampleCode,
- id: this.currentSample.id,
- itemIds: itemIds,
- };
- this.dataAcquisitionLoading = true;
- dataCollection(params).then((res) => {
- this.dataAcquisitionLoading = false;
- if (res.code != 200) {
- return;
+ }
+ //鏁扮粍鍘婚噸
+ let deviceSetList = [...new Set(deviceList)];
+ try {
+ if (deviceSetList.includes("NS-YL3141") && !this.deviceDbTableName) {
+ await this.openDialog();
}
- this.dataAcquisitionInfoNew = this.HaveJson(res.data);
- // 瀵规暟閲囧洖鏉ョ殑鍊艰繘琛屽鐞�
- this.handleDataAcquisition(res.data);
- }).catch(err => {
- this.dataAcquisitionLoading = false;
- });
+ let itemIds = [];
+ this.currentSample.insProduct.forEach((item) => {
+ if (item.inspectionItemType === "1") {
+ itemIds.push(item.id);
+ }
+ });
+ const params = {
+ entrustCode: this.insOrder.entrustCode,
+ lotBatchNo: this.insOrder.lotBatchNo,
+ sampleCode: this.currentSample.sampleCode,
+ id: this.currentSample.id,
+ itemIds: itemIds,
+ dbTable: this.deviceDbTableName,
+ };
+ this.dataAcquisitionLoading = true;
+ dataCollection(params)
+ .then((res) => {
+ this.dataAcquisitionLoading = false;
+ if (res.code != 200) {
+ return;
+ }
+ this.dataAcquisitionInfoNew = this.HaveJson(res.data);
+ // 瀵规暟閲囧洖鏉ョ殑鍊艰繘琛屽鐞�
+ this.handleDataAcquisition(res.data);
+ })
+ .catch((err) => {
+ this.dataAcquisitionLoading = false;
+ });
+ } catch (error) {
+ console.error("鏁版嵁閲囬泦璁惧鍒楄〃澶勭悊澶辫触", error);
+ }
},
objectOrder(obj) {
let newkey = Object.keys(obj).sort();
@@ -1122,7 +2086,6 @@
this.dataAcquisitionInfo = {};
this.getData = [];
for (let i in this.objectOrder(data)) {
- console.log("i---", i);
let obj = {};
if (i.includes("@")) {
obj = {
@@ -1234,6 +2197,7 @@
}
let list = this.tableList[0].arr;
let maxNum = 0;
+ let itemNum = 0; //鍖呭惈妫�楠屽�兼壒娉ㄧ殑涓暟
list.forEach((item, index) => {
let num0 = 0;
let str = "";
@@ -1271,11 +2235,16 @@
n.v.ps.value.includes("妫�楠屽��")
) {
num++;
- if (str0 == str) {
- maxNum = num;
+ const matchArray = n.v.ps.value.match(/\d+/g);
+ if (matchArray) {
+ const no = Number(matchArray[0]);
+ itemNum = itemNum >= no ? itemNum : no;
}
}
});
+ if (str0 == str) {
+ maxNum = num === itemNum ? num : itemNum;
+ }
}
// 缁戝畾璁惧
if (
@@ -1293,6 +2262,7 @@
});
});
// 鑾峰彇鍒版渶澶ф楠屽�艰緭鍏ヤ釜鏁板悗閲嶇粍鏁版嵁
+ console.log("鏈�澶т釜鏁帮細", maxNum);
let obj0 = {
name: j,
arr: data[i][j].result,
@@ -1465,12 +2435,10 @@
},
// 淇濆瓨婀垮害銆佹俯搴︽暟鎹�
subOtherForm(m, type) {
- console.log("m---", m);
write({
[type]: type === "remark" ? m : Number(m),
id: this.insOrder.id,
}).then((res) => {
- if (res.code == 201) return;
this.$message.success("淇濆瓨鎴愬姛");
});
},
@@ -1489,34 +2457,6 @@
a.download = "table.png";
a.click();
});
- },
- // 鏉冮檺鑾峰彇
- getPower() {
- let power = JSON.parse(sessionStorage.getItem("power"));
- let fileDel = false;
- let fileAdd = false;
- let collected = false;
- let temDataAcquisition = false;
- for (var i = 0; i < power.length; i++) {
- if (power[i].menuMethod == "uploadFile") {
- fileAdd = true;
- }
- if (power[i].menuMethod == "delfile") {
- fileDel = true;
- }
- if (power[i].menuMethod == "isItAllowedToModifyTheCollectedValues") {
- collected = true;
- }
- if (power[i].menuMethod == "temDataAcquisition") {
- temDataAcquisition = true;
- }
- }
- if (!fileDel) {
- // this.componentData0.do.splice(1, 1);
- }
- this.fileAdd = fileAdd;
- this.collected = collected;
- this.temDataAcquisition = temDataAcquisition;
},
uploadSample() {
doInsOrder({
@@ -1538,9 +2478,9 @@
id: id,
type: type,
laboratory: this.sonLaboratory,
- cableTag: (cableTag ? cableTag : this.temCableTag),
+ cableTag: cableTag ? cableTag : this.temCableTag,
rawMaterialTag: this.rawMaterialTag,
- repetitionTag: this.repetitionTag
+ repetitionTag: this.repetitionTag,
});
this.tableLoading = false;
if (res.data.length > 0) {
@@ -1632,11 +2572,6 @@
}
}
},
- // 鏀瑰彉浠诲姟
- handleChangeTask(row) {
- if (row) this.id = row.id;
- this.taskVisible = false;
- },
// 瀛楀吀鑾峰彇淇℃伅
getTypeDicts() {
this.getDicts("urgency_level").then((response) => {
@@ -1655,20 +2590,6 @@
this.comparisonList = this.dictToValue(response.data);
});
},
- // 鑾峰彇妫�楠屽�间负涓嬫媺鏃剁殑涓嬫媺鍒楄〃
- // selectEnumByCategoryOfSelect(val) {
- // this.enumList = [];
- // if (val === undefined || val === null) {
- // return;
- // }
- // this.$axios
- // .post(this.$api.enums.selectEnumByCategory, {
- // category: val,
- // })
- // .then((res) => {
- // this.enumList = res.data;
- // });
- // },
tableRowClassName({ row, rowIndex }) {
row.index = rowIndex + 1;
},
@@ -1808,7 +2729,7 @@
if (c.v.ps != undefined && c.v.ps.value === "妫�楠岄」") {
if (count4 === 0) {
if (c.v.v) {
- c.v.v = c.v.v.replace(/\s*/g, "");
+ c.v.v = c.v.v.replace(/[\n\r\s]*/g, "");
}
str += c.v.v;
count4 += 1;
@@ -1819,7 +2740,7 @@
) {
if (count4 === 1) {
if (c.v.v) {
- c.v.v = c.v.v.replace(/\s*/g, "");
+ c.v.v = c.v.v.replace(/[\n\r\s]*/g, "");
}
str += c.v.v;
count4 += 1;
@@ -1829,7 +2750,7 @@
if (c.v.ps != undefined && c.v.ps.value === "妫�楠岄」鍒嗙被") {
if (count4 === 0) {
if (c.v.v) {
- c.v.v = c.v.v.replace(/\s*/g, "");
+ c.v.v = c.v.v.replace(/[\n\r\s]*/g, "");
}
str += c.v.v;
count4 += 1;
@@ -1837,7 +2758,7 @@
} else if (c.v.ps != undefined && c.v.ps.value === "妫�楠岄」") {
if (count4 === 1) {
if (c.v.v) {
- c.v.v = c.v.v.replace(/\s*/g, "");
+ c.v.v = c.v.v.replace(/[\n\r\s]*/g, "");
}
str += c.v.v;
count4 += 1;
@@ -1848,7 +2769,7 @@
) {
if (count4 === 2) {
if (c.v.v) {
- c.v.v = c.v.v.replace(/\s*/g, "");
+ c.v.v = c.v.v.replace(/[\n\r\s]*/g, "");
}
str += c.v.v;
count4 += 1;
@@ -1858,7 +2779,7 @@
if (str === "鏈烘鎬ц兘骞叉�佹媺浼稿己搴�(绾靛悜)") {
if (c.v.ps != undefined && c.v.ps.value === "鍗曚綅") {
if (c.v.v) {
- c.v.v = c.v.v.replace(/\s*/g, "");
+ c.v.v = c.v.v.replace(/[\n\r\s]*/g, "");
}
str2 = str + c.v.v;
unit2 = c.v.v;
@@ -1866,32 +2787,35 @@
}
}
});
- if (str != "") {
+ if (str !== "") {
let count2 = 0;
for (let i in this.currentSample.insProduct) {
let inspectionItemClass =
this.currentSample.insProduct[i].inspectionItemClass ==
null ||
- this.currentSample.insProduct[i].inspectionItemClass ==
+ this.currentSample.insProduct[i].inspectionItemClass ==
undefined
? ""
: this.currentSample.insProduct[i].inspectionItemClass;
- inspectionItemClass = inspectionItemClass.replace(/\s*/g, "");
+ inspectionItemClass = inspectionItemClass.replace(
+ /[\n\r\s]*/g,
+ ""
+ );
let inspectionItem =
this.currentSample.insProduct[i].inspectionItem == null ||
- this.currentSample.insProduct[i].inspectionItem == undefined
+ this.currentSample.insProduct[i].inspectionItem == undefined
? ""
: this.currentSample.insProduct[i].inspectionItem;
- inspectionItem = inspectionItem.replace(/\s*/g, "");
+ inspectionItem = inspectionItem.replace(/[\n\r\s]*/g, "");
let inspectionItemSubclass =
this.currentSample.insProduct[i].inspectionItemSubclass ==
null ||
- this.currentSample.insProduct[i].inspectionItemSubclass ==
+ this.currentSample.insProduct[i].inspectionItemSubclass ==
undefined
? ""
: this.currentSample.insProduct[i].inspectionItemSubclass;
inspectionItemSubclass = inspectionItemSubclass.replace(
- /\s*/g,
+ /[\n\r\s]*/g,
""
);
if (inspectionItemSubclass === "骞叉�佹媺浼稿己搴�(绾靛悜)") {
@@ -1901,17 +2825,17 @@
(this.currentSample.insProduct[i].templateId ===
a.templateId &&
inspectionItemClass +
- inspectionItem +
- inspectionItemSubclass +
- unit ===
- str2) ||
+ inspectionItem +
+ inspectionItemSubclass +
+ unit ===
+ str2) ||
(this.currentSample.insProduct[i].templateId ===
a.templateId &&
!unit2.includes("/") &&
inspectionItemClass +
- inspectionItem +
- inspectionItemSubclass ===
- str)
+ inspectionItem +
+ inspectionItemSubclass ===
+ str)
) {
ids.push({
r: b.r,
@@ -1922,13 +2846,17 @@
}
} else {
// 濡傛灉鐩哥瓑,閭ｄ箞璇存槑鎵惧埌浜�,骞朵笖鎶奿d瀛樿捣鏉�,鍚庣画妫�楠岄」涔熶細鍦ㄩ〉闈腑鏄剧ず鍑烘潵
- if (
- this.currentSample.insProduct[i].templateId ===
- a.templateId &&
+ let aa =
inspectionItemClass +
inspectionItem +
- inspectionItemSubclass ===
- str
+ inspectionItemSubclass;
+ if (
+ this.currentSample.insProduct[i].templateId ===
+ a.templateId &&
+ inspectionItemClass +
+ inspectionItem +
+ inspectionItemSubclass ===
+ str
) {
ids.push({
r: b.r,
@@ -2071,9 +2999,10 @@
this.param[b.i].insResult = b;
conclusionList.forEach((n, i) => {
if (n.r == b.r && n.c == b.c) {
- b.v.f = `(${this.comparisonList.find((j) => j.value == finalList[i].c)
- .label
- }${finalList[i].r + 1})`;
+ b.v.f = `(${
+ this.comparisonList.find((j) => j.value == finalList[i].c)
+ .label
+ }${finalList[i].r + 1})`;
}
});
}
@@ -2085,7 +3014,7 @@
}
});
// 浠ヤ笅鏄牱寮忓鐞嗛�昏緫
- set = [...set]
+ set = [...set];
// set = set.sort();
set.forEach((b) => {
let arr = [];
@@ -2129,7 +3058,7 @@
);
}
}
- } catch (e) { }
+ } catch (e) {}
try {
// 妫�楠屽�艰祴鍊�
let insValue = JSON.parse(a.insProductResult.insValue);
@@ -2154,7 +3083,7 @@
// this.param[a.id].insValue[i].u = insValue[i].u
}
}
- } catch (e) { }
+ } catch (e) {}
try {
// 璁惧缂栧彿璧嬪��
let equipValue = JSON.parse(a.insProductResult.equipValue);
@@ -2162,7 +3091,7 @@
// 鏅�氳澶囪祴鍊�
this.param[a.id].equipValue[i].v.v = equipValue[i].v;
}
- } catch (e) { }
+ } catch (e) {}
try {
// 璁惧鍚嶇О璧嬪��
let equipName = JSON.parse(a.insProductResult.equipName);
@@ -2193,7 +3122,7 @@
);
// 缁撹璧嬪��
this.param[a.id].insResult.v.v = a.insResult;
- } catch (e) { }
+ } catch (e) {}
});
// 瀵筫xcel鍑芥暟杩涜澶勭悊
this.handleExcelMethod();
@@ -2408,13 +3337,13 @@
let str = v.v
? v.v
: v.v === 0
- ? v.v
- : v.ct && v.ct.s
- ? v.ct.s.length > 0 &&
- v.ct.s[0].v
- .replace(new RegExp("\n", "g"), "<br/>")
- .replace(new RegExp("@", "g"), "<br/>")
- : "";
+ ? v.v
+ : v.ct && v.ct.s
+ ? v.ct.s.length > 0 &&
+ v.ct.s[0].v
+ .replace(new RegExp("\n", "g"), "<br/>")
+ .replace(new RegExp("@", "g"), "<br/>")
+ : "";
// 瀵规暟鎹繚鐣欏皬鏁扮偣杩涜澶勭悊
if (v.ct && v.ct.fa && v.ct.fa.includes(".") && str) {
let num = 0;
@@ -2495,15 +3424,16 @@
getEquipOptions(e, id) {
if (e) {
this.equipOptions = [];
- search({ status: 0 }).then((res) => {
- if (res.code === 200 && res.data) {
- this.equipOptions = res.data.map((m) => {
- m.value = m.managementNumber;
- m.label = m.deviceName;
- return m;
- });
- }
- })
+ search({ status: 0 })
+ .then((res) => {
+ if (res.code === 200 && res.data) {
+ this.equipOptions = res.data.map((m) => {
+ m.value = m.managementNumber;
+ m.label = m.deviceName;
+ return m;
+ });
+ }
+ })
.catch((error) => {
console.error(error);
});
@@ -2534,14 +3464,15 @@
laboratory: this.sonLaboratory,
tell: null,
userId: this.checkUser,
- }).then((res) => {
- if (res.code === 200) {
- this.$message.success("鎿嶄綔鎴愬姛");
- this.goback();
- this.addCheck = false;
- }
- this.reviewLoading = false;
})
+ .then((res) => {
+ if (res.code === 200) {
+ this.$message.success("鎿嶄綔鎴愬姛");
+ this.goback();
+ this.addCheck = false;
+ }
+ this.reviewLoading = false;
+ })
.catch((error) => {
console.error(error);
this.reviewLoading = false;
@@ -2559,13 +3490,14 @@
type: 0,
laboratory: this.sonLaboratory,
tell: this.noReason,
- }).then((res) => {
- if (res.code === 200) {
- this.$message.success("鎿嶄綔鎴愬姛");
- this.goback();
- }
- this.reviewLoading = false;
})
+ .then((res) => {
+ if (res.code === 200) {
+ this.$message.success("鎿嶄綔鎴愬姛");
+ this.goback();
+ }
+ this.reviewLoading = false;
+ })
.catch((error) => {
console.error(error);
this.reviewLoading = false;
@@ -2574,100 +3506,123 @@
this.$message.error("鏈緭鍏ヤ笉閫氳繃鍘熷洜");
}
},
+ openAddVerifyDia() {
+ this.addVerifyDia = true;
+ },
+ confirmSubmit(registerInsResults) {
+ submitPlan({
+ orderId: this.orderId,
+ laboratory: this.sonLaboratory,
+ verifyUser: this.verifyUser,
+ entrustCode: this.insOrder.entrustCode,
+ registerInsResults: registerInsResults,
+ })
+ .then((res) => {
+ if (res.code === 200) {
+ this.$message.success("鎿嶄綔鎴愬姛");
+ this.goback();
+ this.submitLoading = false;
+ this.addVerifyDia = false;
+ }
+ })
+ .catch((error) => {
+ console.error(error);
+ this.submitLoading = false;
+ });
+ },
submit() {
if (this.verifyUser === null || this.verifyUser === "") {
this.$message.error("璇锋寚瀹氬鏍镐汉鍛�");
return;
}
- if (!this.otherForm.humidity) {
+ if (!this.otherForm.humidity && this.insOrder.ifsOrderType !== "02wg") {
this.$message.error("璇疯緭鍏ユ箍搴�");
return;
}
- if (!this.otherForm.temperature) {
+ if (
+ !this.otherForm.temperature &&
+ this.insOrder.ifsOrderType !== "02wg"
+ ) {
this.$message.error("璇疯緭鍏ユ俯搴�");
+ return;
+ }
+ if (!this.insOrder.lotPartId && this.insOrder.ifsOrderType === "02wg") {
+ this.$message.error("璇峰～鍐橧FS搴撳瓨鐗╂枡鎵规灞炴��");
return;
}
this.submitLoading = true;
checkSubmitPlan({
orderId: this.orderId,
laboratory: this.sonLaboratory,
- }).then((res) => {
- if (res.code === 200) {
- if (!res.data || res.data.length == 0) {
- this.submitLoading = true;
- submitPlan({
- orderId: this.orderId,
- laboratory: this.sonLaboratory,
- verifyUser: this.verifyUser,
- entrustCode: this.insOrder.entrustCode,
- }).then((res) => {
- if (res.code === 200) {
- this.$message.success("鎿嶄綔鎴愬姛");
- this.goback();
- this.submitLoading = false;
- this.addVerifyDia = false;
+ })
+ .then((res) => {
+ if (res.code === 200) {
+ if (!res.data || res.data.errorMsg.length == 0) {
+ this.submitLoading = true;
+ //妫�楠岀被鍨嬩负鍘熸潗鏂�
+ if (
+ this.typeSource == 1 &&
+ res.data.unInsOrderCount == 0 &&
+ this.isSplit == 1
+ ) {
+ const htmlStr =
+ "鏄惁鐧昏IFS閲囪喘妫�楠岀粨鏋滃苟绉诲簱锛熻鎿嶄綔浼氱櫥璁�<span style='color:#ff4949'>鍚屼竴闆朵欢鍚屼竴璁㈠崟鐨勬墍鏈夋媶鍒嗘壒娆�</span>锛岃璋ㄦ厧閫夋嫨銆�";
+ this.$confirm(htmlStr, "鎻愮ず", {
+ confirmButtonText: "鏄�",
+ cancelButtonText: "鍚�",
+ type: "warning",
+ dangerouslyUseHTMLString: true,
+ })
+ .then(() => {
+ this.confirmSubmit(true);
+ })
+ .catch(() => {
+ this.confirmSubmit(false);
+ });
+ } else {
+ this.confirmSubmit(true);
}
- })
- .catch((error) => {
- console.error(error);
- this.submitLoading = false;
- });
- } else {
- let newData = [];
- const h = this.$createElement;
- for (let i in res.data) {
- const lastChar = res.data[i].slice(-1);
- if (lastChar == "-") {
- res.data[i] = res.data[i].slice(0, -1);
+ } else {
+ let newData = [];
+ const h = this.$createElement;
+ for (let i in res.data.errorMsg) {
+ const lastChar = res.data.errorMsg[i].slice(-1);
+ if (lastChar == "-") {
+ res.data.errorMsg[i] = res.data.errorMsg[i].slice(0, -1);
+ }
+ newData.push(
+ h(
+ "p",
+ { style: "font-size: 14px;color: red;" },
+ Number(i) + 1 + "銆�" + res.data.errorMsg[i]
+ )
+ );
}
newData.push(
h(
"p",
- { style: "font-size: 14px;color: red;" },
- Number(i) + 1 + "銆�" + res.data[i]
+ {
+ style:
+ "font-size: 16px;color:#000;margin-top:12px;overflow-y: auto;max-height:80vh",
+ },
+ "浠ヤ笂椤圭洰涓嶅悎鏍硷紝纭畾鎻愪氦锛�"
)
);
- }
- newData.push(
- h(
- "p",
- {
- style:
- "font-size: 16px;color:#000;margin-top:12px;overflow-y: auto;max-height:80vh",
- },
- "浠ヤ笂椤圭洰涓嶅悎鏍硷紝纭畾鎻愪氦锛�"
- )
- );
- this.$confirm("鎻愮ず", {
- title: "鎻愮ず",
- message: h("div", null, newData),
- confirmButtonText: "纭畾",
- cancelButtonText: "鍙栨秷",
- type: "",
- })
- .then(() => {
- this.submitLoading = true;
- submitPlan({
- orderId: this.orderId,
- laboratory: this.sonLaboratory,
- verifyUser: this.verifyUser,
- }).then((res) => {
- if (res.code === 200) {
- this.$message.success("鎿嶄綔鎴愬姛");
- this.addVerifyDia = false;
- this.goback();
- }
- this.submitLoading = false;
- })
- .catch((error) => {
- console.error(error);
- this.submitLoading = false;
- });
+ this.$confirm("鎻愮ず", {
+ title: "鎻愮ず",
+ message: h("div", null, newData),
+ confirmButtonText: "纭畾",
+ cancelButtonText: "鍙栨秷",
+ type: "",
})
- .catch(() => { });
+ .then(() => {
+ this.submitLoading = true;
+ this.confirmSubmit(false);
+ })
+ .catch(() => {});
+ }
}
- }
- })
+ })
.catch((error) => {
console.error(error);
this.submitLoading = false;
@@ -2684,17 +3639,24 @@
} else {
param = this.param;
}
+ let isNoTestValue = "";
+ for (let key in param) {
+ if (param[key]) {
+ if (param[key].insValue?.length === 0) {
+ isNoTestValue = 1;
+ } else {
+ isNoTestValue = "";
+ }
+ }
+ }
saveInsContext({
param: JSON.stringify(param),
currentTable: this.currentTable,
sampleId: this.currentSample.id,
orderId: this.orderId,
- sonLaboratory: this.sonLaboratory
+ sonLaboratory: this.sonLaboratory,
+ isNoTestValue: isNoTestValue,
}).then((res) => {
- if (res.code == 201) {
- this.$message.error("淇濆瓨澶辫触");
- return;
- }
this.$message.success("宸蹭繚瀛�");
});
// 鍚� Worker 鍙戦�佹秷鎭紝寮�濮嬪鐞嗛�昏緫
@@ -2762,7 +3724,7 @@
}
},
getAuthorizedPerson() {
- selectUserCondition({ type: 0 }).then((res) => {
+ selectUserCondition({ type: 1 }).then((res) => {
let data = [];
res.data.forEach((a) => {
data.push({
@@ -2846,7 +3808,7 @@
this.upLoading = false;
if (response.code == 200) {
this.$message.success("涓婁紶鎴愬姛");
- this.$refs.fileList.selectList();
+ this.getList();
}
},
beforeUpload(file) {
@@ -2864,19 +3826,11 @@
this.$refs.upload.clearFiles();
},
handleDown(row) {
- downFile({ id: row.id }).then((res) => {
- if (res.code === 200) {
- let url = "";
- if (res.data.type == 1) {
- url = this.javaApi + "/img/" + res.data.fileUrl;
- this.$download.saveAs(url, row.fileName)
- } else {
- url = this.javaApi + "/word/" + res.data.fileUrl;
- this.$download.saveAs(url, row.fileName)
- }
- }
- })
- .catch((error) => { });
+ downFile({ id: row.id })
+ .then((res) => {
+ this.$download.saveAs(res.data.fileUrl, row.fileName);
+ })
+ .catch((error) => {});
},
/**
* 灏嗘暟鍊紇淇濈暀ct.fa涓�'##'鍚庣殑鎸囧畾灏忔暟浣嶆暟锛屽苟杩斿洖鏍煎紡鍖栧悗鐨勫瓧绗︿覆銆�
@@ -2899,8 +3853,8 @@
}
},
goback() {
- this.$tab.closeOpenPage({ path: "/business/inspectionTask" });
- }
+ this.$router.go(-1);
+ },
},
};
</script>
@@ -2941,6 +3895,7 @@
background-color: #fff;
border-radius: 3px;
margin-bottom: 10px;
+ padding: 10px;
}
.search .form-inline {
@@ -3036,7 +3991,7 @@
}
.content-h-2 {
- justify-content: end;
+ justify-content: flex-end;
}
.content-v-0 {
@@ -3056,7 +4011,7 @@
height: 100%;
}
-.table_input>>>.el-input__inner {
+.table_input >>> .el-input__inner {
border-color: rgba(0, 0, 0, 0.5) !important;
}
@@ -3090,19 +4045,19 @@
opacity: 0.8;
}
->>>input::-webkit-inner-spin-button {
+>>> input::-webkit-inner-spin-button {
-webkit-appearance: none !important;
/* 闅愯棌寰皟鎸夐挳 */
margin: 0 !important;
/* 绉婚櫎寰皟鎸夐挳鐨勮竟璺� */
}
->>>input[type="number"] {
+>>> input[type="number"] {
-moz-appearance: textfield !important;
/* 閽堝 Firefox */
}
->>>.el-form-item__content {
+>>> .el-form-item__content {
display: inline-flex;
align-items: center;
}
@@ -3174,4 +4129,15 @@
max-width: 1000px;
/* 璁剧疆鏈�澶у搴� */
}
+
+.data-collection-items {
+ display: flex;
+ flex-wrap: wrap;
+}
+.data-collection-items .el-select,
+.data-collection-items .el-checkbox {
+ flex-basis: 20%;
+ box-sizing: border-box;
+ padding: 5px 2%;
+}
</style>
--
Gitblit v1.9.3