From 57e76b55709e8ea88a83ab6c3f665fd9ee7fd64c Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期三, 03 七月 2024 14:23:48 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/center-lims-before into master
---
src/components/do/b1-inspect-order-plan/Inspection.vue | 427 +++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 377 insertions(+), 50 deletions(-)
diff --git a/src/components/do/b1-inspect-order-plan/Inspection.vue b/src/components/do/b1-inspect-order-plan/Inspection.vue
index fbf847c..1b84f9a 100644
--- a/src/components/do/b1-inspect-order-plan/Inspection.vue
+++ b/src/components/do/b1-inspect-order-plan/Inspection.vue
@@ -143,6 +143,10 @@
>>>input[type=number] {
-moz-appearance: textfield !important; /* 閽堝 Firefox */
}
+ >>>.el-form-item__content{
+ display: inline-flex;
+ align-items: center;
+ }
</style>
<style>
.inspection .el-form-item__label {
@@ -204,15 +208,15 @@
<template>
<div v-loading="loading" class="inspection">
<el-row class="title">
- <el-col :span="12" style="padding-left: 20px;">妫�楠屽崟璇︽儏
- <span style="color: #3A7BFA;"> 鏍峰搧</span>
+ <el-col :span="12" style="padding-left: 20px;text-align: left;">妫�楠屽崟璇︽儏
+ <!-- <span style="color: #3A7BFA;"> 鏍峰搧</span>
<span v-if="currentFiberOpticTape" style="color: #3A7BFA;"> - 鍏夌氦甯�</span>
- <span v-if="currentFiberOptic" style="color: #3A7BFA;"> - 鍏夌氦</span>
+ <span v-if="currentFiberOptic" style="color: #3A7BFA;"> - 鍏夌氦</span> -->
</el-col>
<el-col :span="12" style="text-align: right;">
- <el-button size="small" type="primary" @click="fiberOpticVisible=true" v-if="fiberOptic.length>0">鍏夌氦鍒囨崲</el-button>
+ <!-- <el-button size="small" type="primary" @click="fiberOpticVisible=true" v-if="fiberOptic.length>0">鍏夌氦鍒囨崲</el-button>
<el-button size="small" type="primary" @click="fiberOpticTapeVisible=true" v-if="fiberOpticTape.length>0">鍏夌氦甯﹀垏鎹�</el-button>
- <el-button size="small" type="primary" @click="bushingVisible=true" v-if="bushing.length>0">濂楃鍒囨崲</el-button>
+ <el-button size="small" type="primary" @click="bushingVisible=true" v-if="bushing.length>0">濂楃鍒囨崲</el-button> -->
<el-button size="small" type="primary" @click="sampleVisible=true">鏍峰搧鍒囨崲</el-button>
<el-button size="small" type="primary" @click="taskVisible=true">浠诲姟鍒囨崲</el-button>
<el-button size="small" type="primary" @click="addVerifyDia = true" v-show="state==1"
@@ -253,13 +257,38 @@
</el-form>
</div>
<div class="center">
- <div class="search" style="text-align: left;">
- <el-radio-group v-model="currentTable" size="small">
- <el-radio-button :label="item.templateId" v-for="(item,index) in tableLists" :key="index"
- size="small">{{ item.templateName }}</el-radio-button>
- </el-radio-group>
+ <div class="search" style="text-align: left;display: flex;align-items: center;justify-content: space-between;overflow-x: auto;">
+ <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 :label="item.templateId" v-for="(item,index) in tableLists" :key="index"
+ size="small">{{ item.templateName }}</el-radio-button>
+ </el-radio-group>
+ </div>
+ <div style="display: flex;align-items: center;">
+ <span v-if="fibers.length>0"> 鍏夌氦甯︼細</span>
+ <el-radio-group v-model="currentTab" size="small" v-if="fibers.length>0" @input="m=>handleChange(m,1)">
+ <el-radio-button :label="item.id" v-for="(item,index) in fibers" :key="index"
+ size="small">{{ item.code }}</el-radio-button>
+ </el-radio-group>
+ <span v-if="fiber.length>0"> 鍏夌氦锛�</span>
+ <el-radio-group v-model="currentTab" size="small" v-if="fiber.length>0" @input="m=>handleChange(m,2)">
+ <el-radio-button :label="item.id" v-for="(item,index) in fiber" :key="index"
+ size="small">{{ item.color }}</el-radio-button>
+ </el-radio-group>
+ <el-form :inline="true" :model="otherForm" class="form-inline" label-width="50px" style="padding-top: 0;padding-left: 10px;">
+ <el-form-item label="娓╁害:" style="margin-bottom: 0;">
+ <el-input clearable v-model="otherForm.temperature" size="small" placeholder="" style="width: 50px;" @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 clearable v-model="otherForm.humidity" size="small" placeholder="" style="width: 50px;" @change="m=>subOtherForm(m,'humidity')"></el-input>
+ <span style="margin-left: 4px;">%</span>
+ </el-form-item>
+ </el-form>
+ </div>
</div>
- <div class="center-box" id="nav" v-loading="tableLoading">
+ <div class="center-box" id="nav" v-loading="tableLoading" v-if="!tableLists.find(m=>m.templateId==currentTable)||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">
@@ -364,6 +393,162 @@
</tr>
</tbody>
</table>
+ </div>
+ <div class="center-box" v-loading="tableLoading" v-else>
+ <el-divider></el-divider>
+ <h4 style="margin-bottom: 20px;">娓╁害寰幆妫�楠屽師濮嬭褰�</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="wareForm0.model" disabled size="small" placeholder=""></el-input>
+ </el-form-item>
+ <el-form-item label="璇曢獙鏂规硶:" style="margin-bottom: 0;">
+ <el-input clearable v-model="wareForm0.methodName" disabled size="small" placeholder=""></el-input>
+ </el-form-item>
+ <!-- <el-form-item label="妫�娴嬩緷鎹�:" style="margin-bottom: 0;">
+ <el-input clearable v-model="wareForm0.sample" disabled size="small" placeholder=""></el-input>
+ </el-form-item> -->
+ <el-form-item label="寰幆娆℃暟:" style="margin-bottom: 0;">
+ <el-select v-model="wareForm.inspectionItem" placeholder="璇烽�夋嫨" size="small" @change="m=>wareFormChange(m,'inspectionItem')">
+ <el-option
+ v-for="item in numOptions"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="娓╁害:" style="margin-bottom: 0;">
+ <el-select v-model="wareForm.inspectionItemSubclass" placeholder="璇烽�夋嫨" size="small" @change="m=>wareFormChange(m,'inspectionItemSubclass')">
+ <el-option
+ v-for="item in temperatureOptions"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value">
+ </el-option>
+ </el-select>
+ <span style="margin-left: 4px;">鈩�</span>
+ </el-form-item>
+ </el-form>
+ <el-divider></el-divider>
+ <el-form :inline="true" :model="wareForm0" label-width="100px" style="justify-content: flex-start;display: flex;align-items: center;width: 100%;">
+ <el-form-item label="浠櫒鍚嶇О:">
+ <el-select v-model="wareForm0.value" placeholder="璇烽�夋嫨" size="small">
+ <el-option
+ v-for="item in temperatureOptions"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="浠櫒缂栧彿:">
+ <el-select v-model="wareForm0.value" placeholder="璇烽�夋嫨" size="small">
+ <el-option
+ v-for="item in temperatureOptions"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="浠櫒鍚嶇О:" style="margin-left: 80px;">
+ <el-select v-model="wareForm0.value" placeholder="璇烽�夋嫨" size="small">
+ <el-option
+ v-for="item in temperatureOptions"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="浠櫒缂栧彿:">
+ <el-select v-model="wareForm0.value" placeholder="璇烽�夋嫨" size="small">
+ <el-option
+ v-for="item in temperatureOptions"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ </el-form>
+ <el-table
+ :data="wareTableData"
+ border
+ style="width: 100%;margin-bottom: 30px;" align="center">
+ <el-table-column
+ label="搴忓彿"
+ type="index"
+ width="65"
+ align="center"
+ >
+ </el-table-column>
+ <el-table-column
+ prop="bushColor"
+ label="绠¤壊鏍�"
+ width="120"
+ align="center">
+ </el-table-column>
+ <el-table-column
+ prop="code"
+ label="鍏夌氦甯︾紪鍙�"
+ width="150"
+ align="center">
+ </el-table-column>
+ <el-table-column
+ prop="color"
+ label="鍏夌氦鑹叉爣"
+ align="center"
+ width="120">
+ </el-table-column>
+ <el-table-column
+ prop="inspectionItemClass"
+ label="鍏夌氦椤圭洰"
+ align="center"
+ width="130">
+ </el-table-column>
+ <el-table-column
+ prop="value0"
+ label="澶栫"
+ align="center"
+ width="130">
+ <template slot-scope="scope">
+ <el-input size="small" v-model="scope.row.value0" placeholder="" @change="m=>changeItem(m,0)"></el-input>
+ </template>
+ </el-table-column>
+ <el-table-column
+ prop="value1"
+ label="鍐呯"
+ align="center"
+ width="130">
+ <template slot-scope="scope">
+ <el-input size="small" v-model="scope.row.value1" placeholder="" @change="m=>changeItem(m,1)"></el-input>
+ </template>
+ </el-table-column>
+ <el-table-column
+ prop="zip"
+ align="center"
+ label="骞冲潎鍊�"
+ min-width="150">
+ </el-table-column>
+ <el-table-column
+ prop="lastValue"
+ label="琛板噺宸�"
+ align="center"
+ min-width="150">
+ </el-table-column>
+ <el-table-column
+ prop="insResult"
+ label="缁撹"
+ align="center"
+ min-width="150">
+ <template slot-scope="scope">
+ <span v-if="scope.row.insResult===1" style="color: green;">鍚堟牸</span>
+ <span v-if="scope.row.insResult===0" style="color: red;">涓嶅悎鏍�</span>
+ <span v-else>寰呭畾</span>
+ </template>
+ </el-table-column>
+ </el-table>
</div>
<el-upload :action="action"
:data="{
@@ -610,7 +795,25 @@
currentFiberOptic:null,//褰撳墠鍏夌氦
currentBushing:null,//褰撳墠濂楃
tableLoading:false,
- upLoading:false
+ upLoading:false,
+ temptList:null,
+ fiber:[],
+ fibers:[],
+ currentTab:null,
+ wareForm:{
+ inspectionItem:1,
+ inspectionItemSubclass:20,
+ },
+ wareForm0:{},
+ numOptions:[],
+ temperatureOptions:[],
+ wareTableData:[
+ {}
+ ],
+ otherForm:{
+ humidity:null,
+ temperature:null,
+ },
}
},
computed: {
@@ -657,8 +860,17 @@
}
this.sampleProduct = res.data.sampleProduct
this.currentSample = this.HaveJson(this.sampleProduct[0])
+ let insProduct = this.HaveJson(this.currentSample.insProduct)
+ if(insProduct&&insProduct.length>0){
+ let {temperature,humidity} = insProduct[0];
+ this.otherForm = {
+ temperature:temperature?temperature:null,
+ humidity:humidity?humidity:null,
+ }
+ }
let list = await this.getCurrentProduct(this.currentSample.id,0)
this.currentSample.insProduct = this.HaveJson(list)
+ console.log(this.currentSample)
this.currentSample.insProduct.forEach(a => {
this.param[a.id] = {
insValue: [],
@@ -669,9 +881,9 @@
insResult: null
}
})
+ this.getReportModel(this.currentSample.id)
if (this.currentSample.index == undefined) this.currentSample['index'] = 1
let bushing = this.currentSample.bushing
- // this.handleTableData()
this.getTableLists();
this.componentData.currentId = val;
this.currentKey = 1;
@@ -683,6 +895,7 @@
this.currentFiberOptic = null;
this.bushing = []
this.currentBushing = null;
+ this.currentTab = null;
if(bushing&&bushing.length>0){
this.bushing = bushing
}
@@ -698,9 +911,48 @@
}
})
}
- }
+ },
},
methods: {
+ changeItem(m,index){},
+ wareFormChange(m,type){
+ if(m&&type){
+ this.wareForm[type] = Number(m)
+ }
+ let wareForm = {...this.wareForm}
+ wareForm.inspectionItemSubclass = wareForm.inspectionItemSubclass+'鈩�'
+ this.$axios.post(this.$api.insOrderPlan.temCycle,{
+ sampleId:this.currentSample.id,
+ ...wareForm
+ }).then(res => {
+ if (res.code == 201) return
+ let {productVos,sampleVo} = res.data
+ this.wareForm0 = sampleVo
+ productVos = productVos.map(m=>{
+ let obj = {...m,...m.insProduct}
+ return obj
+ })
+ this.wareTableData = productVos
+ })
+ },
+ subOtherForm(m,type){
+ let ids = []
+ for (let i in this.param) {
+ ids.push(i)
+ }
+ this.$axios.post(this.$api.insOrderPlan.write,{
+ [type]:Number(m),
+ ids
+ }, {
+ headers: {
+ 'Content-Type': 'application/json'
+ },
+ noQs:true
+ }).then(res => {
+ if (res.code == 201) return
+ this.$message.success('淇濆瓨鎴愬姛')
+ })
+ },
getPower(){
let power = JSON.parse(sessionStorage.getItem('power'))
let fileDel = false
@@ -804,14 +1056,43 @@
insResult: null
}
})
+ this.getReportModel(row.id)
let bushing = this.currentSample.bushing
if(bushing&&bushing.length>0){
this.bushing = bushing
- this.bushing.forEach(a => {})
}
// this.handleTableData()
this.getTableLists();
this.currentKey = row.index
+ this.currentTab = null;
+ },
+ getReportModel(id){
+ this.$axios.post(this.$api.insOrderPlan.getReportModel+'?sampleId='+id, {}).then(res => {
+ this.fibers = res.data['鍏夌氦甯�']
+ this.fiber = res.data['鍏夌氦']
+ })
+ },
+ async handleChange(m,type){
+ if(m){
+ let list = await this.getCurrentProduct(m,type)
+ if(list.length>0){
+ list.forEach(a => {
+ this.param[a.id] = {
+ insValue: [],
+ comValue: [],
+ resValue: null,
+ equipValue: [],
+ equipName: [],
+ insResult: null
+ }
+ })
+ this.getTableLists0(list)
+ }else{
+ this.tableLists = []
+ this.tableList = []
+ this.$message.error('妫�楠岄」涓虹┖')
+ }
+ }
},
handleChangeTask(row) {
if (row.length > 0) this.id = row[0].id;
@@ -928,6 +1209,33 @@
handleTableData() {
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!='娓╁害寰幆妫�楠屽師濮嬭褰�'){
+ let ask = this.currentSample.insProduct[0].ask
+ let askList = ask.split(';')
+ this.numOptions = []
+ for (let i = 1; i <= askList[askList.length-1]; i++) {
+ this.numOptions.push({
+ value:i,
+ label:i
+ })
+ }
+ let mySet1 = new Set();
+ askList.forEach((m,i) => {
+ if(i<askList.length-1){
+ mySet1.add(m.split(',')[0].replace('鈩�',''))
+ }
+ })
+ this.temperatureOptions = []
+ mySet1.forEach(m => {
+ this.temperatureOptions.push({
+ value:m,
+ label:m
+ })
+ })
+ this.wareFormChange()
+ }
+ // 娓╁害寰幆妫�楠屽師濮嬭褰�---缁撴潫
this.tableList.forEach(a => {
let mcList = []
a.template.forEach(b => {
@@ -956,6 +1264,7 @@
count++
})
})
+ // 闂寮�濮�
this.tableList.forEach(a => {
let dels = new Set()
let ids = []
@@ -1012,6 +1321,8 @@
}
}
})
+ console.log(5555,a.template)
+ // return
ids.forEach(id => {
for (let b = 0; b < a.template.length; b++) {
if (a.template[b].r === id.r) {
@@ -1046,6 +1357,7 @@
}
})
})
+ // 闂缁撴潫
this.tableList.forEach(a => {
let arrs = []
let set = new Set()
@@ -1200,7 +1512,8 @@
})
})
if (item.v.ps != undefined && item.v.ps.value == '缁撹') {
- if (this.currentSample.insProduct.find(m => m.id == item.i)) {
+ try {
+ if (this.currentSample.insProduct.find(m => m.id == item.i)) {
let ask = this.currentSample.insProduct.find(m => m.id == item.i).ask?this.currentSample.insProduct.find(m => m.id == item.i).ask.split('&'):null;
let res = Object.values(comValue)[0]
let comp = []
@@ -1212,31 +1525,31 @@
if (m.includes('=')) {
let str = m.split('=')[1]
if(typeof res == 'string'&&typeof str == 'string'){
- return res.trim() == str.trim()
+ return res.trim() == str.trim()
}else{
- return res == str
+ return eval(res) == eval(str)
}
} else if (m.includes('鈮�')) {
- return res >= m.split('鈮�')[1]
+ return eval(res) >= eval(m.split('鈮�')[1])
}else if (m.includes('鈮�')) {
- return res <= m.split('鈮�')[1]
+ return eval(res) <= eval(m.split('鈮�')[1])
}else if (m.includes('<')) {
- return res < m.split('<')[1]
+ return eval(res) < eval(m.split('<')[1])
}else if (m.includes('>')) {
- return res > m.split('>')[1]
+ return eval(res) > eval(m.split('>')[1])
}else if (m.includes('~')) {
let k = m.split('~')
- return res >= k[0] && res <= k[1]
+ return eval(res) >= eval(k[0]) && eval(res) <= eval(k[1])
}else if(m.includes('-')){
let k = m.split('-')
- return res >= k[0] && res <= k[1]
+ return eval(res) >= eval(k[0]) && eval(res) <= eval(k[1])
}else if(m.includes('卤')){
let k = m.split('卤')
- return res >= (k[0] - k[1]) && res <= (k[0] + k[1])
+ return eval(res) >= eval((k[0] - k[1])) && eval(res) <= eval((k[0] + k[1]))
}else if(m.includes('锛�')){
- return res > m.split('锛�')[1]
+ return eval(res) > eval(m.split('锛�')[1])
}else if(m.includes('锛�')){
- return res < m.split('锛�')[1]
+ return eval(res) < eval(m.split('锛�')[1])
}
})
}
@@ -1248,6 +1561,10 @@
}
this.saveInsContext()
}
+ } catch (error) {
+
+ }
+
} else {
let comResult = ''
try {
@@ -1354,26 +1671,34 @@
// }
// break;
// }
- list.forEach(a => {
- if (a[0].r == item.r && comResult !== '') {
- for (var b in a) {
- if (a[b].c == item.c) {
- try{
- let val = parseFloat(comResult.toFixed(3))
- a[b].v.v = isNaN(val) ? '' : val
- }catch(e){
- a[b].v.v = comResult
+ try {
+ list.forEach(a => {
+ if (a[0].r == item.r && comResult !== '') {
+ for (var b in a) {
+ if (a[b].c == item.c) {
+ try{
+ let val = parseFloat(comResult.toFixed(3))
+ a[b].v.v = isNaN(val) ? '' : val
+ }catch(e){
+ a[b].v.v = comResult
+ }
+ break
}
- break
}
}
- }
- })
- this.changeInput(comResult, `${id}-${item.r}-${item.c}-${pId}`) //鏀瑰彉鏈�缁堝��
+ })
+ this.changeInput(comResult, `${id}-${item.r}-${item.c}-${pId}`) //鏀瑰彉鏈�缁堝��
+ } catch (error) {
+
+ }
}
}
})
- this.getCurrentInsProduct(pId)
+ try {
+ this.getCurrentInsProduct(pId)
+ } catch (error) {
+
+ }
},
getCurrentInsProduct(pId) {
if (!this.tableList[0].insProductResult) {
@@ -1688,15 +2013,17 @@
return
},
saveInsContext() {
- this.$axios.post(this.$api.insOrderPlan.saveInsContext, {
- param: JSON.stringify(this.param)
- }).then(res => {
- if (res.code == 201) {
- this.$message.error('淇濆瓨澶辫触')
- return
- }
- this.$message.success('宸蹭繚瀛�')
- })
+ if(this.param){
+ this.$axios.post(this.$api.insOrderPlan.saveInsContext, {
+ param: JSON.stringify(this.param)
+ }).then(res => {
+ if (res.code == 201) {
+ this.$message.error('淇濆瓨澶辫触')
+ return
+ }
+ this.$message.success('宸蹭繚瀛�')
+ })
+ }
},
changeEquip(val, n) {
for (let i in this.equipOptions) {
--
Gitblit v1.9.3