From 813ae57caeeaaa7a9efe91fe3702430316900162 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期四, 12 九月 2024 09:53:04 +0800
Subject: [PATCH] 优化检验任务保存功能
---
src/components/do/b1-inspect-order-plan/Inspection.vue | 180 ++++++++++++++----------------------------------------------
1 files changed, 42 insertions(+), 138 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..7b94796 100644
--- a/src/components/do/b1-inspect-order-plan/Inspection.vue
+++ b/src/components/do/b1-inspect-order-plan/Inspection.vue
@@ -480,87 +480,6 @@
</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=='娓╁害寰幆妫�楠屽師濮嬭褰�'">
<el-divider></el-divider>
@@ -961,16 +880,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 +1242,7 @@
})
}
// 淇濆瓨鏁版嵁
- this.saveInsContext()
+ this.saveInsContext(this.currentSample.insProduct[0].id)
}
}
},
@@ -1343,22 +1252,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 +2740,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 +2784,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 +2801,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 +3228,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 +3309,7 @@
}
}
// 淇濆瓨鏁版嵁
- this.saveInsContext()
+ this.saveInsContext(n.i)
},
getAuthorizedPerson() {
this.$axios.get(this.$api.user.getUserMenu).then(res => {
--
Gitblit v1.9.3