From c263fb316fc23d9db98ce711fda30d81c28d2d9c Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期四, 08 八月 2024 19:02:10 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/center-lims-before
---
src/components/do/b1-inspect-order-plan/Inspection.vue | 84 ++++++++++++++++++++++++++++++++++++-----
1 files changed, 73 insertions(+), 11 deletions(-)
diff --git a/src/components/do/b1-inspect-order-plan/Inspection.vue b/src/components/do/b1-inspect-order-plan/Inspection.vue
index a8be03c..cf1bc9f 100644
--- a/src/components/do/b1-inspect-order-plan/Inspection.vue
+++ b/src/components/do/b1-inspect-order-plan/Inspection.vue
@@ -254,18 +254,20 @@
</el-col>
</el-row>
<div class="search">
- <el-form :inline="true" :model="searchForm" class="form-inline" label-width="100px">
+ <el-form :inline="true" :model="searchForm" class="form-inline" label-width="100px" label-position="right">
<el-form-item label="濮旀墭缂栧彿:">
<el-input clearable v-model="insOrder.entrustCode" disabled size="small" placeholder="璇疯緭鍏�"></el-input>
</el-form-item>
<el-form-item label="鏍峰搧缂栧彿:">
- <el-input clearable v-model="currentSample.sampleCode" disabled size="small" placeholder="璇疯緭鍏�" style="width: 100px;"></el-input>
+ <el-tooltip :disabled="!currentSample.sampleCode" :content="currentSample.sampleCode">
+ <el-input clearable v-model="currentSample.sampleCode" disabled size="small" placeholder="璇疯緭鍏�" ></el-input>
+ </el-tooltip>
</el-form-item>
<el-form-item label="鏍峰搧鍚嶇О:">
<el-input clearable v-model="currentSample.sample" disabled size="small" placeholder="璇疯緭鍏�"></el-input>
</el-form-item>
<el-form-item label="鏍峰搧鏁伴噺:">
- <el-input clearable v-model="sampleProduct.length" disabled size="small" placeholder="璇疯緭鍏�" style="width: 70px;"></el-input>
+ <el-input clearable v-model="sampleProduct.length" disabled size="small" placeholder="璇疯緭鍏�" ></el-input>
</el-form-item>
<el-form-item label="涓嬪彂鏃堕棿:">
<el-input clearable v-model="insOrder.sendTime" disabled size="small" placeholder="璇疯緭鍏�"></el-input>
@@ -274,7 +276,7 @@
<el-input clearable v-model="insOrder.typeName" disabled size="small" placeholder="璇疯緭鍏�"></el-input>
</el-form-item>
<el-form-item label="绾﹀畾鏃堕棿:">
- <el-input clearable v-model="insOrder.appointed" disabled size="small" placeholder="璇疯緭鍏�" style="width: 100px;"></el-input>
+ <el-input clearable v-model="insOrder.appointed" disabled size="small" placeholder="璇疯緭鍏�"></el-input>
</el-form-item>
<el-form-item label="褰撳墠鏍峰搧浣嶆暟:">
<el-tag v-if="currentKey">{{ `NO.${currentKey}` }}</el-tag>
@@ -295,8 +297,19 @@
</el-radio-group>
</div>
<div style="display: flex;align-items: center;">
+ <span v-if="casing.length>0&&tableLists.find(m=>m.templateId==currentTable)&&tableLists.find(m=>m.templateId==currentTable).templateName=='鎴愬搧缂嗘楠屽師濮嬭褰�'"> 濂楃锛�</span>
+ <el-select v-model="currentTab" placeholder="璇烽�夋嫨" @change="m=>handleChange(m,3)" v-if="casing.length>0&&tableLists.find(m=>m.templateId==currentTable)&&tableLists.find(m=>m.templateId==currentTable).templateName=='鎴愬搧缂嗘楠屽師濮嬭褰�'" size="small" :loading="getReportModelLoading" @focus="getReportModel(currentSample.id)">
+ <el-option
+ v-for="item in casing"
+ :key="item.id"
+ :label="item.color"
+ :value="item.id">
+ <span style="float: left">{{ item.color}}</span>
+ <el-tag :type="item.state==1?'success':'danger'" style="float: right;margin-top: 5px;" size="small">{{ item.state==1?'宸叉':'鏈' }}</el-tag>
+ </el-option>
+ </el-select>
<span v-if="fibers.length>0&&tableLists.find(m=>m.templateId==currentTable)&&tableLists.find(m=>m.templateId==currentTable).templateName!='娓╁害寰幆妫�楠屽師濮嬭褰�'"> 鍏夌氦甯︼細</span>
- <el-select v-model="currentTab" placeholder="璇烽�夋嫨" @change="m=>handleChange(m,1)" v-if="fibers.length>0&&tableLists.find(m=>m.templateId==currentTable)&&tableLists.find(m=>m.templateId==currentTable).templateName!='娓╁害寰幆妫�楠屽師濮嬭褰�'" size="small">
+ <el-select v-model="currentTab" placeholder="璇烽�夋嫨" @change="m=>handleChange(m,1)" v-if="fibers.length>0&&tableLists.find(m=>m.templateId==currentTable)&&tableLists.find(m=>m.templateId==currentTable).templateName!='娓╁害寰幆妫�楠屽師濮嬭褰�'" size="small" :loading="getReportModelLoading" @focus="getReportModel(currentSample.id)">
<el-option
v-for="item in fibers"
:key="item.value"
@@ -307,7 +320,7 @@
</el-option>
</el-select>
<span v-if="fiber.length>0&&tableLists.find(m=>m.templateId==currentTable)&&tableLists.find(m=>m.templateId==currentTable).templateName!='娓╁害寰幆妫�楠屽師濮嬭褰�'"> 鍏夌氦锛�</span>
- <el-select v-model="currentTab" placeholder="璇烽�夋嫨" @change="m=>handleChange(m,2)" v-if="fiber.length>0&&tableLists.find(m=>m.templateId==currentTable)&&tableLists.find(m=>m.templateId==currentTable).templateName!='娓╁害寰幆妫�楠屽師濮嬭褰�'" size="small">
+ <el-select v-model="currentTab" placeholder="璇烽�夋嫨" @change="m=>handleChange(m,2)" v-if="fiber.length>0&&tableLists.find(m=>m.templateId==currentTable)&&tableLists.find(m=>m.templateId==currentTable).templateName!='娓╁害寰幆妫�楠屽師濮嬭褰�'" size="small" :loading="getReportModelLoading" @focus="getReportModel(currentSample.id)">
<el-option
v-for="item in fiber"
:label="item.bushColor+'-'+item.color"
@@ -751,6 +764,7 @@
size="medium" style="margin-right: 5px;">{{item.label}}</el-tag>
</template>
</el-table-column>
+ <el-table-column prop="checkName" label="妫�楠屼汉" min-width="80px" show-overflow-tooltip></el-table-column>
<el-table-column prop="isLeave" label="鏄惁鐣欐牱" width="95px" show-overflow-tooltip align="center">
<template slot-scope="scope">
<span>{{ scope.row.isLeave==0?'鍚�':'鏄�' }}</span>
@@ -929,6 +943,8 @@
requiredUp: []
},
upIndex: 0,
+ changeType:null,
+ getReportModelLoading:false,
insOrder: {},
sampleProduct: [],
typeList: [],
@@ -971,6 +987,7 @@
temptList:null,
fiber:[],
fibers:[],
+ casing:[],
currentTab:null,
wareForm:{
inspectionItem:1,
@@ -1126,7 +1143,16 @@
})
},
currentTable(val1, val0) {
- if (val0 != null && val1 != val0) {
+ if(val0 !=null && val1 != val0){
+ if(this.tableLists.find(m=>m.templateId==val1)&&(this.tableLists.find(m=>m.templateId==val1).templateName=='鎴愬搧缂嗘楠屽師濮嬭褰�')){
+ if(this.casing.length>0){
+ this.handleChange(this.casing[0].id,3)
+ }
+ return
+ }
+ if(this.changeType && this.changeType>0){
+ return
+ }
this.tableLists.forEach(async (m, i) => {
if (m.templateId == val1) {
let list = await this.getCurrentProduct(this.currentSample.id,0)
@@ -1166,11 +1192,9 @@
this.tableList = this.tableLists.filter(m => m.templateId == val1)
this.handleTableData()
}
- // this.$delete(this.tableList,0)
- // this.$set(this.tableList, 0, m)
- // this.handleTableData()
}
})
+ this.handleCasing()
}
},
equipForm:{
@@ -1276,6 +1300,32 @@
value:data[i][j].result,
frequency:data[i].frequency
}
+ let list = this.tableList[0].arr
+ list.forEach((item,index)=>{
+ let num0 = 0;
+ let str = ''
+ let str0 = i+','+j
+ item.forEach(m=>{
+ if(m.v.ps&&(m.v.ps.value=='妫�楠屽瓙椤�'||m.v.ps.value=='妫�楠岄」')){
+ if(m.v.ps&&m.v.ps.value=='妫�楠岄」'){
+ if(num0==0){
+ str = m.v.v+','
+ num0++
+ }
+ }
+ if(m.v.ps&&m.v.ps.value=='妫�楠屽瓙椤�'){
+ if(num0==1){
+ str = str+m.v.v
+ }
+ }
+ }
+ if(data[i][j].equipName&&data[i][j].equipValue&&m.v&&m.v.ps&&m.v.ps.value=='璁惧缂栫爜'&&str0==str){
+ if(!m.v.v){
+ this.changeEquip(data[i][j].equipValue,m,data[i][j].equipName)
+ }
+ }
+ })
+ })
}else if(j!='frequency'&&data[i][j]&&Array.isArray(data[i][j].result)){
let str0 = i+','+j
let list = this.tableList[0].arr
@@ -2003,6 +2053,7 @@
this.currentSample = this.HaveJson(row)
let list = await this.getCurrentProduct(row.id,0)
this.currentSample.insProduct = this.HaveJson(list)
+ this.handleCasing()
this.currentSample.insProduct.forEach(a => {
this.param[a.id] = {
insValue: [],
@@ -2029,16 +2080,25 @@
currentTable:this.currentTable
}));
},
+ handleCasing(){
+ if(this.tableLists.find(m=>m.templateId==this.currentTable)&&(this.tableLists.find(m=>m.templateId==this.currentTable).templateName!='鎴愬搧缂嗘楠屽師濮嬭褰�')){
+ this.currentSample.insProduct = this.currentSample.insProduct.filter(m=>!m.inspectionItem.includes('鏉惧绠�'))
+ }
+ },
getReportModel(id){
if(this.PROJECT!='妫�娴嬩腑蹇�'){
return
}
+ this.getReportModelLoading = true
this.$axios.post(this.$api.insOrderPlan.getReportModel+'?sampleId='+id, {}).then(res => {
+ this.getReportModelLoading = false
this.fibers = res.data['鍏夌氦甯�']
this.fiber = res.data['鍏夌氦']
+ this.casing = res.data['濂楃']
})
},
async handleChange(m,type){
+ this.changeType = type;
if(m){
let list = await this.getCurrentProduct(m,type)
if(list.length>0){
@@ -2058,7 +2118,8 @@
type: 'saveData',
tableList:this.tableList,
param:this.param,
- currentTable:this.currentTable
+ currentTable:this.currentTable,
+ bushing:m
}));
}else{
this.tableLists = []
@@ -3160,6 +3221,7 @@
this.currentSample = this.HaveJson(this.sampleProduct[index - 1])
let list = await this.getCurrentProduct(this.currentSample.id,0)
this.currentSample.insProduct = this.HaveJson(list)
+ this.handleCasing()
this.param = {}
this.currentSample.insProduct.forEach(a => {
this.param[a.id] = {
--
Gitblit v1.9.3