From 40475c63a8dc78b31e5104ac03b03934a6a6e9e1 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期五, 13 九月 2024 17:00:18 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/tx-lims-before into master
---
src/components/do/b1-inspect-order-plan/Inspection.vue | 191 ++++++++++++-----------------------------------
1 files changed, 49 insertions(+), 142 deletions(-)
diff --git a/src/components/do/b1-inspect-order-plan/Inspection.vue b/src/components/do/b1-inspect-order-plan/Inspection.vue
index f6ee9fe..9f76b1c 100644
--- a/src/components/do/b1-inspect-order-plan/Inspection.vue
+++ b/src/components/do/b1-inspect-order-plan/Inspection.vue
@@ -185,6 +185,9 @@
display: flex;
align-items: center;
}
+ .noShow{
+ opacity: 0;
+ }
</style>
<style>
.inspection .el-form-item__label {
@@ -254,7 +257,7 @@
<template>
<div v-loading="loading" class="inspection">
<el-row class="title">
- <el-col :span="12" style="padding-left: 20px;text-align: left;" >妫�楠屽崟璇︽儏
+ <el-col :span="12" style="padding-left: 20px;text-align: left;" :class="{noShow:noBack}">妫�楠屽崟璇︽儏
</el-col>
<el-col :span="12" style="text-align: right;">
<el-button size="small" type="primary" @click="sampleVisible=true;uploadSample()">鏍峰搧鍒囨崲</el-button>
@@ -266,7 +269,7 @@
v-if="state>1&&!isLook">缁х画璇曢獙</el-button>
<el-button size="small" @click="upInsReview(0)" v-if="state>1&&!isLook" type="danger">鍐嶆璇曢獙</el-button>
<el-button size="small" @click="upInsReview(2)" v-if="state>1&&!isLook">缁撴潫璇曢獙</el-button>
- <el-button size="small" @click="$emit('goback')">杩斿洖</el-button>
+ <el-button size="small" @click="$emit('goback')" v-if="!noBack">杩斿洖</el-button>
</el-col>
</el-row>
<div class="search" v-show="!isLook">
@@ -479,87 +482,6 @@
</tr>
</tbody>
</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="sagForm" class="form-inline" label-width="120px" 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="sagForm.sampleCode" disabled size="small" placeholder=""></el-input>
- </el-form-item>
- <el-form-item label="鍨嬪彿" style="margin-bottom: 0;">
- <el-input clearable v-model="sagForm.model" disabled size="small" placeholder=""></el-input>
- </el-form-item>
- <el-form-item label="妫�楠屼緷鎹�" style="margin-bottom: 0;">
- <el-input clearable v-model="sagForm.inspection" disabled size="small" placeholder=""></el-input>
- </el-form-item>
- <el-form-item label="璁惧缂栧彿" style="margin-bottom: 0;">
- <el-input clearable v-model="sagForm.methodName" disabled size="small" placeholder=""></el-input>
- </el-form-item>
- <el-form-item label="棰濆畾鎷夋柇鍔�/kN" style="margin-bottom: 0;">
- <el-input clearable v-model="sagForm.tensileForce" disabled size="small" placeholder=""></el-input>
- </el-form-item>
- <el-form-item label="璺ㄨ窛闀垮害/m" style="margin-bottom: 0;">
- <el-input clearable v-model="sagForm.spanLength" disabled size="small" placeholder=""></el-input>
- </el-form-item>
- <el-form-item label="杞借嵎/kN" style="margin-bottom: 0;">
- <el-input clearable v-model="sagForm.load" disabled size="small" placeholder=""></el-input>
- </el-form-item>
- </el-form>
- <el-divider></el-divider>
- <div class="container">
- <el-button class="right-button" type="primary" size="small" @click="addSag">娣� 鍔�</el-button>
- </div>
- <el-table :data="sagData" class="custom-table" border>
- <el-table-column label="楂樺害 h mm" prop="height" align="center">
- </el-table-column>
- <el-table-column label="寮у瀭 mm" prop="sag" align="center">
- </el-table-column>
- <el-table-column label="瀵肩嚎娓╁害鈩�" align="center">
- <el-table-column label="1" prop="one" align="center">
- <template slot-scope="scope">
- <el-input v-model="scope.row.one" style="width: 100%;"></el-input>
- </template>
- </el-table-column>
- <el-table-column label="2" prop="two" align="center">
- <template slot-scope="scope">
- <el-input v-model="scope.row.two" style="width: 100%;"></el-input>
- </template>
- </el-table-column>
- <el-table-column label="3" prop="three" align="center">
- <template slot-scope="scope">
- <el-input v-model="scope.row.three" style="width: 100%;"></el-input>
- </template>
- </el-table-column>
- <el-table-column label="4" prop="four" align="center">
- <template slot-scope="scope">
- <el-input v-model="scope.row.four" style="width: 100%;"></el-input>
- </template>
- </el-table-column>
- <el-table-column label="5" prop="five" align="center">
- <template slot-scope="scope">
- <el-input v-model="scope.row.five" style="width: 100%;"></el-input>
- </template>
- </el-table-column>
- <el-table-column label="6" prop="six" align="center">
- <template slot-scope="scope">
- <el-input v-model="scope.row.six" style="width: 100%;"></el-input>
- </template>
- </el-table-column>
- </el-table-column>
- <el-table-column label="骞冲潎娓╁害鈩�" prop="average" align="center">
- </el-table-column>
- <el-table-column label="瀹ゆ俯鈩�" prop="temperature" align="center">
- </el-table-column>
- <el-table-column label="寮犲姏kN" prop="remark" align="center">
- </el-table-column>
- <el-table-column label="鎿嶄綔" align="center">
- <template slot-scope="scope">
- <el-button type="text" size="small" @click="deleteSag(scope.$index)"><span style="color:red">鍒犻櫎</span></el-button>
- </template>
- </el-table-column>
- </el-table>
</div>
<!-- 娓╁害寰幆妫�楠屽師濮嬭褰� -->
<div v-loading="tableLoading" v-else-if="tableLists.find(m=>m.templateId==currentTable).templateName=='娓╁害寰幆妫�楠屽師濮嬭褰�'">
@@ -827,7 +749,7 @@
:delUrl="$api.insOrderPlan.delfile"
:key="upIndex" style="height: 100%;margin-top: 16px;"/>
</div>
- <el-drawer title="鏍峰搧鍒囨崲" :visible.sync="sampleVisible" :size="500">
+ <el-drawer title="鏍峰搧鍒囨崲" :visible.sync="sampleVisible" :size="500" :modal="!noBack">
<el-table class="el-table" ref="productTable" :data="sampleProduct" height="100%" tooltip-effect="dark" border
highlight-current-row @row-click="handleChangeSample" :row-class-name="tableRowClassName"
:current-row-key="currentKey" :row-key="record=>record.index" v-if="sampleVisible">
@@ -948,7 +870,7 @@
import CircuitParameters1 from './circuit-parameters1.vue'
import CircuitParameters2 from './circuit-parameters2.vue'
export default {
- props: ['sonLaboratory', 'orderId', 'state','inspectorList','version','orderStateId','isLook','num1'],
+ props: ['sonLaboratory', 'orderId', 'state','inspectorList','version','orderStateId','isLook','num1','noBack'],
components: {
ValueTable,
Circuit,
@@ -961,16 +883,6 @@
versionLoading:false,
versionDialogVisible:false,
currentTableState:0,
- sagData: [],
- sagForm: {
- sampleCode: null,
- model: null,
- inspection: null,
- methodName: null,
- tensileForce: null,
- spanLength: null,
- load: null
- },
dataGetDia:false,
wareTableDataLoading:false,
fileAdd:false,
@@ -1333,7 +1245,7 @@
})
}
// 淇濆瓨鏁版嵁
- this.saveInsContext()
+ this.saveInsContext(this.currentSample.insProduct[0].id)
}
}
},
@@ -1343,22 +1255,6 @@
this.stopWorker();
},
methods: {
- // 鍒犻櫎琛�
- deleteSag(index) {
- this.sagData.splice(index, 1)
- },
- // 娣诲姞寮у瀭妫�娴�
- addSag() {
- this.sagData.push({
- sampleCode: null,
- model: null,
- inspection: null,
- methodName: null,
- tensileForce: null,
- spanLength: null,
- load: null
- })
- },
// 鏁版嵁閲囬泦
getDataAcquisitionDevice(){
if(this.tableLists.find(m=>m.templateId==this.currentTable)&&this.tableLists.find(m=>m.templateId==this.currentTable).templateName=='娓╁害寰幆妫�楠屽師濮嬭褰�'){
@@ -2847,7 +2743,9 @@
if(getDataType=='getDataType'){
this.getDataType = 2;
}
+ let currentInsItemId = null//褰撳墠妫�楠岄」id
if (n) {
+ currentInsItemId = JSON.parse(JSON.stringify(n.i))
// 闇�瑕佺瀛﹁鏁版硶鐨勫彲浠ヨ蛋杩欓噷
if (this.PROJECT === '妫�娴嬩腑蹇�') {
if(this.tableList.find(ele=>ele.inspectionItem=='浣撶Н鐢甸樆鐜�')){
@@ -2889,11 +2787,13 @@
this.result = JSON.parse(event.data);
switch (this.result.method){
case 'saveInsContext':
- console.log(`output->`,11111111111111)
this.$nextTick(()=>{
// this.$delete(this.tableList[0],'arr')
this.$set(this.tableList[0],'arr',this.result.value.tableList[0].arr)
this.param = this.result.value.param
+ if(this.result.value.currentInsItemId){
+ currentInsItemId = this.result.value.currentInsItemId
+ }
// 鐗规畩澶勭悊涓�涓嬬粨璁�,浼氭湁杩欑鐗规畩鎯呭喌
for (var i in this.param){
if(this.param[i].insResult&&this.param[i].insResult.v&&this.param[i].insResult.v.v){
@@ -2904,33 +2804,34 @@
}
}
}
+ this.saveInsContext(currentInsItemId)
// 濡傛灉鏄暟閲囧彲缂栬緫杈撳叆鐨勬儏鍐�,鍙互鐩存帴淇濆瓨鏁版嵁
- if(this.getDataType==2){
- this.saveInsContext()
- }else{
- if(this.isGet&&!this.dataAcquisitionEidtAble){
- if(this.result.value.getDataTypeId==''){
- // 濡傛灉鏄暟閲囦笉鍙紪杈戣緭鍏ョ殑鎯呭喌,涓旀渶鍚庝竴涓暟閲囨病鏈夊畬鎴�,鍒欎笉淇濆瓨鏁版嵁
- return
- }
- // 淇濆瓨鏁版嵁
- setTimeout(()=>{
- this.saveInsContext()
- },2000)
- }else if(this.isGet&&this.dataAcquisitionEidtAble){
- if(this.getDataType==1){
- if(this.result.value.getDataTypeId==''){
- // 濡傛灉鏄暟閲囧彲缂栬緫杈撳叆鐨勬儏鍐�,涓旀渶鍚庝竴涓暟閲囨病鏈夊畬鎴�,鍒欎笉淇濆瓨鏁版嵁
- return
- }
- this.saveInsContext()
- }else{
- this.saveInsContext()
- }
- }else{
- this.saveInsContext()
- }
- }
+ // if(this.getDataType==2){
+ // this.saveInsContext(currentInsItemId)
+ // }else{
+ // if(this.isGet&&!this.dataAcquisitionEidtAble){
+ // if(this.result.value.getDataTypeId==''){
+ // // 濡傛灉鏄暟閲囦笉鍙紪杈戣緭鍏ョ殑鎯呭喌,涓旀渶鍚庝竴涓暟閲囨病鏈夊畬鎴�,鍒欎笉淇濆瓨鏁版嵁
+ // return
+ // }
+ // // 淇濆瓨鏁版嵁
+ // setTimeout(()=>{
+ // this.saveInsContext(currentInsItemId)
+ // },2000)
+ // }else if(this.isGet&&this.dataAcquisitionEidtAble){
+ // if(this.getDataType==1){
+ // if(this.result.value.getDataTypeId==''){
+ // // 濡傛灉鏄暟閲囧彲缂栬緫杈撳叆鐨勬儏鍐�,涓旀渶鍚庝竴涓暟閲囨病鏈夊畬鎴�,鍒欎笉淇濆瓨鏁版嵁
+ // return
+ // }
+ // this.saveInsContext(currentInsItemId)
+ // }else{
+ // this.saveInsContext(currentInsItemId)
+ // }
+ // }else{
+ // this.saveInsContext(currentInsItemId)
+ // }
+ // }
})
break;
case 'tableList':
@@ -3330,12 +3231,18 @@
}
},
// 缁熶竴鍦ㄨ繖閲屼繚瀛樻暟鎹�
- saveInsContext() {
+ saveInsContext(currentInsItemId) {
try {
console.log(1111,this.param)
if(this.param){
+ let param = null
+ if(currentInsItemId){
+ param = {[currentInsItemId] : this.param[currentInsItemId]}
+ }else{
+ param = this.param
+ }
this.$axios.post(this.$api.insOrderPlan.saveInsContext, {
- param: JSON.stringify(this.param),
+ param: JSON.stringify(param),
currentTable:this.currentTable,
num:this.currentSample.num1
}).then(res => {
@@ -3405,7 +3312,7 @@
}
}
// 淇濆瓨鏁版嵁
- this.saveInsContext()
+ this.saveInsContext(n.i)
},
getAuthorizedPerson() {
this.$axios.get(this.$api.user.getUserMenu).then(res => {
--
Gitblit v1.9.3