From 25f23d0761c7949068176db038cea74c4401fc04 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期四, 25 七月 2024 18:25:49 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/center-lims-before into master
---
src/components/do/b1-inspect-order-plan/Inspection.vue | 569 ++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 527 insertions(+), 42 deletions(-)
diff --git a/src/components/do/b1-inspect-order-plan/Inspection.vue b/src/components/do/b1-inspect-order-plan/Inspection.vue
index b27d4eb..498b892 100644
--- a/src/components/do/b1-inspect-order-plan/Inspection.vue
+++ b/src/components/do/b1-inspect-order-plan/Inspection.vue
@@ -63,6 +63,24 @@
word-wrap: break-word;
white-space: normal;
}
+ .thermal-table{
+ min-width: calc(100% - 10px);
+ margin: 5px 5px 0;
+ table-layout: fixed;
+ }
+ .thermal-table td {
+ min-width: 70px;
+ text-align: center;
+ font-size: 14px;
+ word-wrap: break-word;
+ white-space: normal;
+ padding: 5px;
+ }
+ .table-container {
+ overflow-x: auto; /* 浣垮鍣ㄦ敮鎸佹í鍚戞粴鍔� */
+ max-width: 100%; /* 闄愬埗瀹瑰櫒鐨勬渶澶у搴� */
+ margin-bottom: 16px;
+ }
.content {
display: flex;
@@ -204,6 +222,10 @@
display: flex;
align-items: center;
}
+ .thermal-table .el-input{
+ display: flex;
+ align-items: center;
+ }
</style>
<template>
<div v-loading="loading" class="inspection">
@@ -287,19 +309,19 @@
</el-select>
<el-form :inline="true" :model="otherForm" class="form-inline" label-width="50px" style="padding-top: 0;padding-left: 10px;" v-if="PROJECT=='妫�娴嬩腑蹇�'">
<el-form-item label="娓╁害:" style="margin-bottom: 0;">
- <el-input v-model="otherForm.temperature" size="small" placeholder="" style="width: 90px;" @change="m=>subOtherForm(m,'temperature')"></el-input>
+ <el-input v-model="otherForm.temperature" :disabled="state>1" size="small" placeholder="" style="width: 90px;" @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" size="small" placeholder="" style="width: 90px;" @change="m=>subOtherForm(m,'humidity')"></el-input>
+ <el-input v-model="otherForm.humidity" :disabled="state>1" size="small" placeholder="" style="width: 90px;" @change="m=>subOtherForm(m,'humidity')"></el-input>
<span style="margin-left: 4px;">%</span>
</el-form-item>
</el-form>
- <el-button type="primary" size="small" v-if="dataAcquisitionEidt>0&&PROJECT=='妫�娴嬩腑蹇�'" @click="getDataAcquisitionDevice" :loading="dataAcquisitionLoading">鏁版嵁閲囬泦</el-button>
- <el-button :type="dataAcquisitionEidtAble?'':'primary'" size="small" v-if="dataAcquisitionEidt>0&&PROJECT=='妫�娴嬩腑蹇�'" @click="dataAcquisitionEidtAble=!dataAcquisitionEidtAble">{{dataAcquisitionEidtAble?'鍏抽棴缂栬緫':'缂栬緫鏁伴噰'}}</el-button>
+ <el-button type="primary" size="small" v-if="dataAcquisitionEidt>0&&PROJECT=='妫�娴嬩腑蹇�'&&state==1" @click="getDataAcquisitionDevice" :loading="dataAcquisitionLoading">鏁版嵁閲囬泦</el-button>
+ <el-button :type="dataAcquisitionEidtAble?'':'primary'" size="small" v-if="dataAcquisitionEidt>0&&PROJECT=='妫�娴嬩腑蹇�'&&collected&&state==1" @click="dataAcquisitionEidtAble=!dataAcquisitionEidtAble">{{dataAcquisitionEidtAble?'鍏抽棴缂栬緫':'缂栬緫鏁伴噰'}}</el-button>
</div>
</div>
- <div class="center-box" id="nav" v-loading="tableLoading" v-if="!tableLists.find(m=>m.templateId==currentTable)||tableLists.find(m=>m.templateId==currentTable).templateName!='娓╁害寰幆妫�楠屽師濮嬭褰�'">
+ <div class="center-box" id="nav" v-loading="tableLoading" v-if="!tableLists.find(m=>m.templateId==currentTable)||(tableLists.find(m=>m.templateId==currentTable).templateName!='娓╁害寰幆妫�楠屽師濮嬭褰�'&&tableLists.find(m=>m.templateId==currentTable).templateName!='鐑惊鐜楠屽師濮嬭褰�')">
<table border="1" class="tables" cellpadding="10" v-for="(item,index) in tableList" :key="index">
<tbody>
<tr v-for="(m,i) in item.arr" :key="i">
@@ -347,7 +369,6 @@
<el-option v-for="item in equipOptions" :key="item.value" :label="item.value" :value="item.value">
</el-option>
</el-select>
- <!-- <el-button type="primary" icon="el-icon-document-copy" size="small" circle title="鏁伴噰" v-if="n.isItADataAcquisitionDevice&&PROJECT=='妫�娴嬩腑蹇�'" @click="getDataAcquisitionDevice(n.v.v)"></el-button> -->
</template>
<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>
@@ -407,7 +428,7 @@
</tbody>
</table>
</div>
- <div v-loading="tableLoading" v-else>
+ <div v-loading="tableLoading" v-else-if="tableLists.find(m=>m.templateId==currentTable).templateName=='娓╁害寰幆妫�楠屽師濮嬭褰�'">
<el-divider></el-divider>
<h4 style="margin-bottom: 20px;font-size: 24px;font-weight: 400;text-align: center;">娓╁害寰幆妫�楠屽師濮嬭褰�</h4>
<el-form :inline="true" :model="wareForm" class="form-inline" label-width="100px" style="justify-content: flex-start;display: flex;align-items: center;width: 100%;">
@@ -448,7 +469,7 @@
<el-input clearable v-model="equipForm.value0" disabled size="small" placeholder=""></el-input>
</el-form-item>
<el-form-item label="浠櫒缂栧彿:">
- <el-select v-model="equipForm.code0" placeholder="璇烽�夋嫨" size="small">
+ <el-select v-model="equipForm.code0" :disabled="state>1" placeholder="璇烽�夋嫨" size="small">
<el-option
v-for="item in equipOptions"
:key="item.value"
@@ -461,7 +482,7 @@
<el-input clearable v-model="equipForm.value1" disabled size="small" placeholder=""></el-input>
</el-form-item>
<el-form-item label="浠櫒缂栧彿:">
- <el-select v-model="equipForm.code1" placeholder="璇烽�夋嫨" size="small">
+ <el-select v-model="equipForm.code1" :disabled="state>1" placeholder="璇烽�夋嫨" size="small">
<el-option
v-for="item in equipOptions"
:key="item.value"
@@ -476,7 +497,7 @@
ref="wareTableData"
border
v-loading="wareTableDataLoading"
- style="width: 100%;margin-bottom: 30px;" align="center">
+ style="width: 100%;margin-bottom: 30px;" align="center" v-show="wareForm.inspectionItemSubclass!='20(甯告俯)'&&wareForm.inspectionItemSubclass!='20'||(wareForm.inspectionItemSubclass=='20(甯告俯)'&&wareForm.inspectionItem==1)||(wareForm.inspectionItemSubclass=='20'&&wareForm.inspectionItem==numOptions.length)">
<el-table-column
label="搴忓彿"
type="index"
@@ -512,7 +533,7 @@
{{ '澶栫'+(index+1) }}
</template>
<template slot-scope="scope">
- <el-input size="small" v-model="scope.row.arr[index].value0" placeholder="" @change="m=>changeItem(scope.row.arr[index])"></el-input>
+ <el-input size="small" v-model="scope.row.arr[index].value0" placeholder="" :disabled="state>1" @change="m=>changeItem(scope.row.arr[index])"></el-input>
</template>
</el-table-column>
<el-table-column
@@ -524,7 +545,7 @@
{{ '鍐呯'+(index+1) }}
</template>
<template slot-scope="scope">
- <el-input size="small" v-model="scope.row.arr[index].value1" placeholder="" @change="m=>changeItem(scope.row.arr[index])"></el-input>
+ <el-input size="small" :disabled="state>1" v-model="scope.row.arr[index].value1" placeholder="" @change="m=>changeItem(scope.row.arr[index])"></el-input>
</template>
</el-table-column>
<el-table-column
@@ -568,6 +589,86 @@
</template>
</el-table>
</div>
+ <div v-loading="tableLoading" v-else-if="tableLists.find(m=>m.templateId==currentTable).templateName=='鐑惊鐜楠屽師濮嬭褰�'">
+ <el-divider></el-divider>
+ <h4 style="margin-bottom: 20px;font-size: 24px;font-weight: 400;text-align: center;">鐑惊鐜楠屽師濮嬭褰�</h4>
+ <el-form :inline="true" :model="wareForm" class="form-inline" label-width="100px" style="justify-content: flex-start;display: flex;align-items: center;width: 100%;">
+ <el-form-item label="浠櫒鍚嶇О:" style="margin-bottom: 0;">
+ <el-input clearable v-model="equipForm.value0" disabled size="small" placeholder=""></el-input>
+ </el-form-item>
+ <el-form-item label="浠櫒鍚嶇О:" style="margin-bottom: 0;">
+ <el-input clearable v-model="equipForm.value1" disabled size="small" placeholder=""></el-input>
+ </el-form-item>
+ <el-form-item label="鍨嬪彿:" style="margin-bottom: 0;">
+ <el-input clearable v-model="thermalCyclingInfo.model" disabled size="small" placeholder=""></el-input>
+ </el-form-item>
+ <el-form-item label="璇曢獙鏂规硶:" style="margin-bottom: 0;">
+ <el-input clearable v-model="thermalCyclingInfo.methodName" disabled size="small" placeholder=""></el-input>
+ </el-form-item>
+ </el-form>
+ <el-divider></el-divider>
+ <el-form :inline="true" :model="equipForm" label-width="100px" style="justify-content: flex-start;display: flex;align-items: center;width: 100%;">
+ <el-form-item label="浠櫒缂栧彿:">
+ <el-select v-model="equipForm.code0" :disabled="state>1" placeholder="璇烽�夋嫨" size="small">
+ <el-option
+ v-for="item in equipOptions"
+ :key="item.value"
+ :label="item.value"
+ :value="item.value">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="浠櫒缂栧彿:">
+ <el-select v-model="equipForm.code1" :disabled="state>1" placeholder="璇烽�夋嫨" size="small">
+ <el-option
+ v-for="item in equipOptions"
+ :key="item.value"
+ :label="item.value"
+ :value="item.value">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="寰幆娆℃暟:" v-if="thermalCyclingInfo.inspectionItemClass=='鐩存祦鐢甸樆'">
+ <el-input-number v-model="thermalCyclingInfo.inspectionItem" :min="1" :max="thermalCyclingInfo.max" label="" style="margin-top:4px;width: 190px;" size="small" @change="thermalCyclingChange"></el-input-number>
+ </el-form-item>
+ <el-button type="primary" size="small" style="margin-bottom: 22px;margin-left: 30px;" @click="handleAddThermal" v-if="state==1">鏂板</el-button>
+ <el-button size="small" style="margin-bottom: 22px;" @click="handleDeleteThermal" v-if="state==1">鍒犻櫎</el-button>
+ </el-form>
+ <div class="table-container" v-loading="thermalCyclingLoading">
+ <table border="1" cellpadding="10" class="thermal-table">
+ <tr>
+ <td>妫�楠岄」鐩�</td>
+ <td :colspan="thermalCyclingInfo.length">妫�楠岃繃绋嬪��</td>
+ <td style="width: 100px;">缁撹</td>
+ </tr>
+ <tr v-for="(item,index) in thermalCyclingInfo.arr">
+ <td style="width: 100px;text-align: center;">{{ item.name }}</td>
+ <td v-for="(m,i) in thermalCyclingInfo.length" style="min-width: 150px;">
+ <div style="display: flex;align-items: center;margin-bottom: 5px;">
+ <label style="width: 100px;white-space: nowrap;font-size: 12px;">娓╁害:</label>
+ <el-input clearable size="small" placeholder="" v-model="item.arr[i].value0" :disabled="state>1" @change="m=>saveThermalCycling(m,item,'value0')"></el-input>
+ <span style="font-size: 12px;margin-left: 13px;margin-right: 13px;"> 鈩�</span>
+ </div>
+ <div style="display: flex;align-items: center;" v-if="item.name!='鐜娓╁害'&&thermalCyclingInfo.inspectionItemClass=='鐩存祦鐢甸樆'">
+ <label style="width: 100px;white-space: nowrap;font-size: 12px;">鐩存祦鐢甸樆:</label>
+ <el-input clearable size="small" :disabled="state>1" placeholder="" v-model="item.arr[i].value1" @change="saveThermalCycling"></el-input>
+ <span style="margin-left: 5px;font-size: 12px;"> 惟/km</span>
+ </div>
+ </td>
+ <td>
+ <template v-if="item.name=='鐜娓╁害'||item.name=='瀵肩嚎娓╁害'">
+ <span>/</span>
+ </template>
+ <template v-else>
+ <span v-if="item.insResult===1" style="color: green;">鍚堟牸</span>
+ <span v-else-if="item.insResult===0" style="color: red;">涓嶅悎鏍�</span>
+ <span v-else>寰呭畾</span>
+ </template>
+ </td>
+ </tr>
+ </table>
+ </div>
+ </div>
<el-upload :action="action"
:data="{
orderId:id
@@ -577,7 +678,7 @@
accept='.jpg,.jpeg,.png,.gif,.doc,.docx,.xls,.xlsx,.ppt,.pptx,.pdf,.zip,.rar' :headers="headers" :on-change="beforeUpload"
style="width: 80px !important;"
:on-error="onError" ref='upload'>
- <el-button size="small" type="primary">闄勪欢涓婁紶</el-button></el-upload>
+ <el-button size="small" type="primary" v-if="state==1">闄勪欢涓婁紶</el-button></el-upload>
<ValueTable class="value-table" ref="fileList" :url="$api.insOrderPlan.getFileList"
:componentData="componentData0"
:delUrl="$api.insOrderPlan.delfile"
@@ -686,7 +787,6 @@
import ValueTable from '../../tool/value-table.vue'
import file from '../../../util/file'
import excelFunction from '../../../util/excelFountion'
-import { number } from 'echarts'
export default {
props: ['sonLaboratory', 'orderId', 'state'],
components: {
@@ -844,7 +944,17 @@
dataAcquisitionInfo:{},
dataAcquisitionEidt:0,
dataAcquisitionEidtAble:false,
- dataAcquisitionLoading:false
+ dataAcquisitionLoading:false,
+ collected:false,
+ // 鐑惊鐜�---寮�濮�
+ thermalCyclingInfo:{
+ max:0,
+ inspectionItem:1,
+ arr:[],
+ length:1,
+ inspectionItemClass:null,
+ },
+ thermalCyclingLoading:false,
}
},
computed: {
@@ -947,7 +1057,7 @@
equipForm:{
deep:true,
handler(val){
- if(this.tableLists.find(m=>m.templateId==this.currentTable)&&this.tableLists.find(m=>m.templateId==this.currentTable).templateName=='娓╁害寰幆妫�楠屽師濮嬭褰�'&&this.equipOptions&&this.equipOptions.length>0){
+ if(this.tableLists.find(m=>m.templateId==this.currentTable)&&(this.tableLists.find(m=>m.templateId==this.currentTable).templateName=='娓╁害寰幆妫�楠屽師濮嬭褰�'||this.tableLists.find(m=>m.templateId==this.currentTable).templateName=='鐑惊鐜楠屽師濮嬭褰�')&&this.equipOptions&&this.equipOptions.length>0){
this.param[this.currentSample.insProduct[0].id].equipValue = []
this.param[this.currentSample.insProduct[0].id].equipName = []
if(this.equipForm.code0){
@@ -1005,6 +1115,7 @@
this.stopWorker();
},
methods: {
+ // 鏁版嵁閲囬泦
getDataAcquisitionDevice(){
this.dataAcquisitionLoading = true
this.$axios.get(this.$api.deviceScope.dataCollection+'?entrustCode='+this.insOrder.entrustCode+'&sampleCode='+this.currentSample.sampleCode + '&id=' + this.currentSample.id).then(res=>{
@@ -1015,9 +1126,22 @@
this.dataAcquisitionInfo = res.data
let list = this.tableList[0].arr
list.forEach((item,index)=>{
+ let num = 0;
+ let str = ''
item.forEach(m=>{
if(m.v.ps&&(m.v.ps.value=='妫�楠屽瓙椤�'||m.v.ps.value=='妫�楠岄」')){
- if(this.dataAcquisitionInfo[m.v.m]){
+ if(m.v.ps&&m.v.ps.value=='妫�楠岄」'){
+ if(num==0){
+ str = m.v.v+','
+ num++
+ }
+ }
+ if(m.v.ps&&m.v.ps.value=='妫�楠屽瓙椤�'){
+ if(num==1){
+ str = str+m.v.v
+ }
+ }
+ if(this.dataAcquisitionInfo[str]){
let num = 0;
list[index].forEach(n=>{
if(n.v.ps&&n.v.ps.value&&typeof n.v.ps.value == 'string'&&n.v.ps.value.includes('妫�楠屽��')){
@@ -1026,17 +1150,18 @@
})
list[index].forEach((n,i)=>{
if(n.v.ps&&n.v.ps.value&&typeof n.v.ps.value == 'string'&&n.v.ps.value.includes('妫�楠屽��')){
- if(n.v.ps.value.includes(this.dataAcquisitionInfo.frequency)&&!n.v.ps.value.includes(this.dataAcquisitionInfo.frequency+'0')){
+ let arr = n.v.ps.value.split('鍊�')
+ if(arr[1] ==this.dataAcquisitionInfo.frequency){
setTimeout(()=>{
this.$delete(n.v,'v')
- this.$set(n.v,'v',this.dataAcquisitionInfo[m.v.m])
+ this.$set(n.v,'v',this.dataAcquisitionInfo[str])
this.changeInput('',`${this.currentSample.insProduct[0].templateId}-${n.r}-${n.c}-${n.i}`,n)
},1000)
}else if(Number(this.dataAcquisitionInfo.frequency)>num){
if(n.v.ps.value.includes(num)){
setTimeout(()=>{
this.$delete(n.v,'v')
- this.$set(n.v,'v',this.dataAcquisitionInfo[m.v.m])
+ this.$set(n.v,'v',this.dataAcquisitionInfo[str])
this.changeInput('',`${this.currentSample.insProduct[0].templateId}-${n.r}-${n.c}-${n.i}`,n)
},1000)
}
@@ -1049,6 +1174,7 @@
})
})
},
+ // 澶氱嚎绋�
startWorker() {
if (this.worker) {
this.stopWorker(); // 纭繚涔嬪墠鐨� Worker 宸插仠姝�
@@ -1062,6 +1188,7 @@
this.worker = null;
}
},
+ // 娓╁害寰幆---寮�濮�
changeItem(row){
if(row.value0&&row.value1){
this.$set(row,'comValue',((Number(row.value0)+Number(row.value1))/2).toFixed(3))
@@ -1115,7 +1242,6 @@
if(this.PROJECT!='妫�娴嬩腑蹇�'||!this.tableLists.find(m=>m.templateId==this.currentTable)||this.tableLists.find(m=>m.templateId==this.currentTable).templateName!='娓╁害寰幆妫�楠屽師濮嬭褰�'){
return
}
- // this.$refs.wareTableData&&this.$refs.wareTableData.doLayout()
if(m&&type){
this.wareForm[type] = m
}
@@ -1261,6 +1387,268 @@
this.getEquipOptions(true,this.currentSample.insProduct[0].id)
// this.$refs.wareTableData&&this.$refs.wareTableData.doLayout()
},
+ // 娓╁害寰幆---缁撴潫
+ // 鐑惊鐜�---寮�濮�
+ thermalCyclingChange(){
+ this.thermalCyclingLoading = true
+ this.$axios.post(this.$api.insOrderPlan.temCycle,{
+ sampleId:this.currentSample.id,
+ inspectionItem:this.thermalCyclingInfo.inspectionItem
+ }).then(res => {
+ this.thermalCyclingLoading = false
+ if (res.code == 201) return
+ let {productVos,sampleVo} = res.data
+ this.thermalCyclingInfo = {...this.thermalCyclingInfo,...sampleVo}
+ if(this.thermalCyclingInfo.inspectionItem>1){
+ for(let i in this.param){
+ if(this.param[i].inspectionItemSubclass){
+ delete this.param[i]
+ }
+ }
+ }
+ if(productVos.length>0){
+ this.thermalCyclingInfo.inspectionItemClass = productVos[0].insProduct.inspectionItemClass
+ productVos.forEach(item=>{
+ this.param[item.insProduct.id] = {
+ insValue: [],
+ comValue: [],
+ resValue: {
+ i:item.insProduct.id,
+ r:0,
+ c:0,
+ v:{
+ v:null
+ }
+ },
+ equipValue: [],
+ equipName: [],
+ insResult: {
+ i:item.insProduct.id,
+ v:{
+ v:null
+ }
+ },
+ inspectionItemSubclass: item.insProduct.inspectionItemSubclass,
+ }
+ let obj = {...item,...item.insProduct}
+ let insProductResult = obj.insProductResult
+ if(insProductResult){
+ for(let i in insProductResult){
+ switch (i) {
+ case 'insValue':
+ let insValue = JSON.parse(insProductResult[i])
+ if(insValue&&insValue.length>0){
+ this.thermalCyclingInfo.length = 0
+ this.thermalCyclingInfo.arr.forEach(a=>{
+ if(a.name==obj.inspectionItemSubclass){
+ a.arr = []
+ for(let i=0;i<insValue.length;i++){
+ a.arr.push({
+ value0:insValue[i].v,
+ value1:insValue[i].w,
+ })
+ this.thermalCyclingInfo.length++
+ }
+ a.insResult = obj.insResult
+ }
+ })
+ this.param[obj.id].insValue = []
+ insValue.forEach(m=>{
+ this.param[obj.id].insValue.push({
+ i:obj.id,
+ r:0,
+ c:0,
+ w:m.w,
+ v:{
+ v:m.v
+ }
+ })
+ })
+ }
+ break;
+ }
+ }
+ this.param[obj.id].insResult = {
+ i:obj.id,
+ v:{
+ v:obj.insResult
+ }
+ }
+ }else{
+ this.thermalCyclingInfo.arr.forEach(a=>{
+ a.insResult = null
+ a.arr = []
+ a.arr.push(
+ {
+ value0:'',
+ value1:''
+ }
+ )
+ })
+ this.thermalCyclingInfo.length = 1
+ }
+ })
+ }
+ this.getEquipOptions(true,this.currentSample.insProduct[0].id)
+ })
+ },
+ handleAddThermal(){
+ this.thermalCyclingInfo.length++
+ this.thermalCyclingInfo.arr.forEach(item=>{
+ item.arr.push({
+ value0:'',
+ value1:''
+ })
+ })
+ },
+ handleDeleteThermal(){
+ if(this.thermalCyclingInfo.length==1){
+ this.$message.error('鏈�鍚庝竴鏉℃暟鎹笉鑳藉垹闄�')
+ return
+ }else{
+ this.thermalCyclingInfo.length--
+ this.thermalCyclingInfo.arr.forEach(item=>{
+ item.arr.pop()
+ })
+ this.saveThermalCycling(true,{name:'瀵肩嚎娓╁害'},true)
+ }
+ },
+ saveThermalCycling(m,item,type){
+ // 缁撴灉鍒ゆ柇
+ if(m&&item&&type){
+ if(item.name=='瀵肩嚎娓╁害'||item.name=='鑰愬紶娓╁害'||item.name=='鎺ョ画娓╁害'){
+ this.thermalCyclingInfo.arr.forEach(a=>{
+ if(a.name=='鑰愬紶娓╁害'){
+ a.arr.forEach((b,i)=>{
+ // 鑾峰彇瀵瑰簲鐨勫绾挎俯搴�
+ let num0 = 0
+ this.thermalCyclingInfo.arr.forEach(c=>{
+ if(c.name=='瀵肩嚎娓╁害'){
+ num0 = c.arr[i].value0
+ }
+ })
+ if(!num0||!b.value0){
+ b.state = null
+ }else if(Number(num0)>Number(b.value0)){
+ b.state = 1
+ }else{
+ b.state = 0
+ }
+ })
+ let state = a.arr.filter(b=>b.state==null).length
+ let state0 = a.arr.filter(b=>b.state==0).length
+ let state1 = a.arr.filter(b=>b.state==1).length
+ if(state>0){
+ a.insResult = null
+ }else if(state0>0){
+ a.insResult = 0
+ }else if(state1==a.arr.length){
+ a.insResult = 1
+ }
+ }
+ if(a.name=='鎺ョ画娓╁害'){
+ a.arr.forEach((b,i)=>{
+ // 鑾峰彇瀵瑰簲鐨勫绾挎俯搴�
+ let num0 = 0
+ this.thermalCyclingInfo.arr.forEach(c=>{
+ if(c.name=='瀵肩嚎娓╁害'){
+ num0 = c.arr[i].value0
+ }
+ })
+ if(!num0||!b.value0){
+ b.state = null
+ }else if(Number(num0)>Number(b.value0)){
+ b.state = 1
+ }else{
+ b.state = 0
+ }
+ })
+ let state = a.arr.filter(b=>b.state==null).length
+ let state0 = a.arr.filter(b=>b.state==0).length
+ let state1 = a.arr.filter(b=>b.state==1).length
+ if(state>0){
+ a.insResult = null
+ }else if(state0>0){
+ a.insResult = 0
+ }else if(state1==a.arr.length){
+ a.insResult = 1
+ }
+ }
+ })
+ }
+ }
+ // 璧嬪��
+ this.thermalCyclingInfo.arr.forEach(item=>{
+ for (let i in this.param){
+ if(this.param[i].inspectionItemSubclass==item.name){
+ switch (item.name){
+ case '鐜娓╁害':
+ this.param[i].insResult.v.v = 1
+ this.param[i].insValue = []
+ item.arr.forEach(insValue=>{
+ this.param[i].insValue.push({
+ i:i,
+ r:0,
+ c:0,
+ v:{
+ v:insValue.value0
+ }
+ })
+ })
+ break;
+ case '瀵肩嚎娓╁害':
+ this.param[i].insResult.v.v = 1
+ this.param[i].insValue = []
+ item.arr.forEach(insValue=>{
+ this.param[i].insValue.push({
+ i:i,
+ r:0,
+ c:0,
+ w:insValue.value1,
+ v:{
+ v:insValue.value0
+ }
+ })
+ })
+ break;
+ case '鑰愬紶娓╁害':
+ this.param[i].insValue = []
+ item.arr.forEach(insValue=>{
+ this.param[i].insValue.push({
+ i:i,
+ r:0,
+ c:0,
+ w:insValue.value1,
+ v:{
+ v:insValue.value0
+ }
+ })
+ })
+ this.param[i].insResult.v.v = item.insResult
+ break;
+ case '鎺ョ画娓╁害':
+ this.param[i].insValue = []
+ item.arr.forEach(insValue=>{
+ this.param[i].insValue.push({
+ i:i,
+ r:0,
+ c:0,
+ w:insValue.value1,
+ v:{
+ v:insValue.value0
+ }
+ })
+ })
+ this.param[i].insResult.v.v = item.insResult
+ break;
+ }
+ }
+ }
+ })
+ // console.log(1111,this.param)
+ this.saveInsContext()
+ },
+ // 鐑惊鐜�---缁撴潫
subOtherForm(m,type){
let ids = []
for (let i in this.param) {
@@ -1283,6 +1671,7 @@
let power = JSON.parse(sessionStorage.getItem('power'))
let fileDel = false
let fileAdd = false
+ let collected = false
for (var i = 0; i < power.length; i++) {
if (power[i].menuMethod == 'uploadFile') {
fileAdd = true
@@ -1290,11 +1679,15 @@
if (power[i].menuMethod == 'delfile') {
fileDel = true
}
+ if (power[i].menuMethod == 'isItAllowedToModifyTheCollectedValues') {
+ collected = true
+ }
}
if (!fileDel) {
this.componentData0.do.splice(1, 1)
}
this.fileAdd = fileAdd
+ this.collected = collected
},
async getCurrentProduct(id,type){
this.tableLoading = true;
@@ -1540,7 +1933,7 @@
this.excelMethodList = []
this.widthList = this.tableList[0].style.columnlen;
// 娓╁害寰幆妫�楠屽師濮嬭褰�--寮�濮�
- if(this.tableLists.find(m=>m.templateId==this.currentTable)||this.tableLists.find(m=>m.templateId==this.currentTable).templateName!='娓╁害寰幆妫�楠屽師濮嬭褰�'){
+ if(this.tableLists.find(m=>m.templateId==this.currentTable)&&this.tableLists.find(m=>m.templateId==this.currentTable).templateName=='娓╁害寰幆妫�楠屽師濮嬭褰�'){
let ask = this.currentSample.insProduct[0].ask
let askList = ask.split(';')
this.numOptions = []
@@ -1566,6 +1959,34 @@
this.wareFormChange()
}
// 娓╁害寰幆妫�楠屽師濮嬭褰�---缁撴潫
+ // 鐑惊鐜楠屽師濮嬭褰�---寮�濮�
+ if(this.tableLists.find(m=>m.templateId==this.currentTable)&&this.tableLists.find(m=>m.templateId==this.currentTable).templateName=='鐑惊鐜楠屽師濮嬭褰�'){
+ let ask = this.currentSample.insProduct[0].ask
+ let askList = ask.split(';')
+ this.thermalCyclingInfo.max = Number(askList[askList.length-1])
+ let arr = []
+ for (let i = 0; i < askList.length-1; i++) {
+ arr.push(askList[i].split(',')[0])
+ }
+ arr = arr.map(item=>{
+ let obj = {}
+ obj.name = item;
+ if(obj.insResult==null||obj.insResult==undefined){
+ obj.arr = [
+ {
+ value0:'',
+ value1:'',
+ }
+ ]
+ obj.insResult = null;
+ }
+ return obj
+ })
+ this.thermalCyclingInfo.arr = arr;
+ // console.log(this.thermalCyclingInfo)
+ this.thermalCyclingChange()
+ }
+ // 鐑惊鐜楠屽師濮嬭褰�---缁撴潫
this.tableList.forEach(a => {
let mcList = []
a.template.forEach(b => {
@@ -1604,22 +2025,44 @@
if (size1 < size2) {
let str = ''
let count4 = 0
+ let isThree = 0
a.template.forEach(c => {
if (b.r === c.r) {
- if (c.v.ps != undefined && c.v.ps.value === '妫�楠岄」') {
- if (count4 === 0) {
- str += c.v.v
- count4 += 1
+ if(c.v.ps != undefined && c.v.ps.value === '妫�楠岄」鍒嗙被'&&count4 === 0){
+ // 涓夌骇鍒嗙被
+ isThree = 1
+ }else if(c.v.ps != undefined && c.v.ps.value === '妫�楠岄」'&&count4 === 0){
+ // 浜岀骇鍒嗙被
+ isThree = 0
+ }
+ if(isThree==0){
+ if (c.v.ps != undefined && c.v.ps.value === '妫�楠岄」') {
+ if (count4 === 0) {
+ str += c.v.v
+ count4 += 1
+ }
+ } else if (c.v.ps != undefined && c.v.ps.value === '妫�楠屽瓙椤�') {
+ if (count4 === 1) {
+ str += c.v.v
+ count4 += 1
+ }
}
- } else if (c.v.ps != undefined && c.v.ps.value === '妫�楠屽瓙椤�') {
- if (count4 === 1) {
- str += c.v.v
- count4 += 1
- }
- }else if (c.v.ps != undefined && c.v.ps.value === '妫�楠屽瓙瀛愰」'&&this.PROJECT=='瑁呭鐢电紗') {
- if (count4 === 2) {
- str += c.v.v
- count4 += 1
+ }else if(isThree==1){
+ if (c.v.ps != undefined && c.v.ps.value === '妫�楠岄」鍒嗙被') {
+ if (count4 === 0) {
+ str += c.v.v
+ count4 += 1
+ }
+ }else if (c.v.ps != undefined && c.v.ps.value === '妫�楠岄」') {
+ if (count4 === 1) {
+ str += c.v.v
+ count4 += 1
+ }
+ } else if (c.v.ps != undefined && c.v.ps.value === '妫�楠屽瓙椤�') {
+ if (count4 === 2) {
+ str += c.v.v
+ count4 += 1
+ }
}
}
}
@@ -1627,8 +2070,16 @@
if (str != '') {
let count2 = 0
for (let i in this.currentSample.insProduct) {
- if (this.currentSample.insProduct[i].templateId === a.templateId && this.currentSample
- .insProduct[i].inspectionItem +(this.currentSample.insProduct[i].inspectionItemSubclass == null ? '' : this.currentSample.insProduct[i].inspectionItemSubclass)+(this.currentSample.insProduct[i].inspectionItemClass==null||this.PROJECT!='瑁呭鐢电紗'?'':this.currentSample.insProduct[i].inspectionItemClass) ===
+ let inspectionItemClass = this.currentSample.insProduct[i].inspectionItemClass==null||this.currentSample.insProduct[i].inspectionItemClass==undefined?'':this.currentSample.insProduct[i].inspectionItemClass
+ let inspectionItem = this.currentSample
+ .insProduct[i].inspectionItem==null||this.currentSample
+ .insProduct[i].inspectionItem==undefined?'':this.currentSample
+ .insProduct[i].inspectionItem
+ let inspectionItemSubclass = this.currentSample
+ .insProduct[i].inspectionItemSubclass==null||this.currentSample
+ .insProduct[i].inspectionItemSubclass==undefined?'':this.currentSample
+ .insProduct[i].inspectionItemSubclass
+ if (this.currentSample.insProduct[i].templateId === a.templateId && inspectionItemClass +inspectionItem+inspectionItemSubclass ===
str) {
ids.push({
r: b.r,
@@ -1786,10 +2237,21 @@
} catch (e) {}
try {
let equipValue = JSON.parse(a.insProductResult.equipValue)
+ if(this.tableLists.find(m=>m.templateId==this.currentTable)&&(this.tableLists.find(m=>m.templateId==this.currentTable).templateName=='娓╁害寰幆妫�楠屽師濮嬭褰�'||this.tableLists.find(m=>m.templateId==this.currentTable).templateName=='鐑惊鐜楠屽師濮嬭褰�')){
+ this.param[a.id].equipValue = []
+ for (let i = 0; i < equipValue.length; i++) {
+ this.param[a.id].equipValue.push({
+ v:{
+ v:''
+ }
+ })
+ }
+ }
for (let i = 0; i < equipValue.length; i++) {
- if(this.tableLists.find(m=>m.templateId==this.currentTable)&&this.tableLists.find(m=>m.templateId==this.currentTable).templateName=='娓╁害寰幆妫�楠屽師濮嬭褰�'){
- // 娓╁害寰幆璧嬪��
+ if(this.tableLists.find(m=>m.templateId==this.currentTable)&&(this.tableLists.find(m=>m.templateId==this.currentTable).templateName=='娓╁害寰幆妫�楠屽師濮嬭褰�'||this.tableLists.find(m=>m.templateId==this.currentTable).templateName=='鐑惊鐜楠屽師濮嬭褰�')){
+ // 娓╁害寰幆璁惧璧嬪��
this.$set(this.equipForm,`code`+i,equipValue[i].v)
+ this.param[a.id].equipValue[i].v.v = equipValue[i].v
}else{
this.param[a.id].equipValue[i].v.v = equipValue[i].v
if(equipValue[i].v){
@@ -1814,10 +2276,21 @@
} catch (e) {}
try {
let equipName = JSON.parse(a.insProductResult.equipName)
+ if(this.tableLists.find(m=>m.templateId==this.currentTable)&&(this.tableLists.find(m=>m.templateId==this.currentTable).templateName=='娓╁害寰幆妫�楠屽師濮嬭褰�'||this.tableLists.find(m=>m.templateId==this.currentTable).templateName=='鐑惊鐜楠屽師濮嬭褰�')){
+ this.param[a.id].equipName = []
+ for (let i = 0; i < equipName.length; i++) {
+ this.param[a.id].equipName.push({
+ v:{
+ v:''
+ }
+ })
+ }
+ }
for (let i = 0; i < equipName.length; i++) {
- if(this.tableLists.find(m=>m.templateId==this.currentTable)&&this.tableLists.find(m=>m.templateId==this.currentTable).templateName=='娓╁害寰幆妫�楠屽師濮嬭褰�'){
+ if(this.tableLists.find(m=>m.templateId==this.currentTable)&&(this.tableLists.find(m=>m.templateId==this.currentTable).templateName=='娓╁害寰幆妫�楠屽師濮嬭褰�'||this.tableLists.find(m=>m.templateId==this.currentTable).templateName=='鐑惊鐜楠屽師濮嬭褰�')){
// 娓╁害寰幆璧嬪��
this.$set(this.equipForm,`value`+i,equipName[i].v)
+ this.param[a.id].equipName[i].v.v = equipName[i].v
}else{
this.param[a.id].equipName[i].v.v = equipName[i].v
}
@@ -1863,7 +2336,7 @@
switch (this.result.method){
case 'saveInsContext':
this.$nextTick(()=>{
- this.$delete(this.tableList[0],'arr')
+ // this.$delete(this.tableList[0],'arr')
this.$set(this.tableList[0],'arr',this.result.value.tableList[0].arr)
this.param = this.result.value.param
for (var i in this.param){
@@ -1875,6 +2348,18 @@
}
}
}
+ // let obj = this.param[code.split('-')[3]]
+ // this.tableList[0].arr.forEach(item=>{
+ // item.forEach(m=>{
+ // if(obj&&obj.insResult&&m.c==obj.insResult.c&&m.r==obj.insResult.r){
+ // m.v.v = obj.insResult.v.v
+ // }
+ // if(obj&&obj.resValue&&m.c==obj.resValue.c&&m.r==obj.resValue.r){
+ // m.v.v = obj.resValue.v.v
+ // }
+ // })
+ // })
+ // console.log(this.tableList,this.param)
this.saveInsContext()
})
break;
@@ -2088,7 +2573,6 @@
this.equipOptions = res.data.map(m => {
m.value = m.managementNumber
m.label = m.deviceName
- m.isItADataAcquisitionDevice = m.isItADataAcquisitionDevice
return m
})
}
@@ -2266,6 +2750,7 @@
})
}
}
+ console.log(this.param)
this.saveInsContext()
},
getAuthorizedPerson() {
--
Gitblit v1.9.3