From f030d4e89acc8dfca8bf2b9df9ac24ad8f66d06c Mon Sep 17 00:00:00 2001
From: gaoluyang <gaoluyang@rengu.cc>
Date: 星期三, 25 九月 2024 17:32:04 +0800
Subject: [PATCH] 1.编辑模板弹框添加取消按钮
---
src/components/do/b1-inspect-order-plan/Inspection.vue | 419 +++++++++++++++++++++++++++++------------------------------
1 files changed, 209 insertions(+), 210 deletions(-)
diff --git a/src/components/do/b1-inspect-order-plan/Inspection.vue b/src/components/do/b1-inspect-order-plan/Inspection.vue
index 2806de1..94985fc 100644
--- a/src/components/do/b1-inspect-order-plan/Inspection.vue
+++ b/src/components/do/b1-inspect-order-plan/Inspection.vue
@@ -181,6 +181,13 @@
display: inline-flex;
align-items: center;
}
+ .history-btn{
+ display: flex;
+ align-items: center;
+ }
+ .noShow{
+ opacity: 0;
+ }
</style>
<style>
.inspection .el-form-item__label {
@@ -250,22 +257,22 @@
<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>
- <el-button size="small" type="primary" @click="taskVisible=true">浠诲姟鍒囨崲</el-button>
+ <el-button size="small" type="primary" @click="taskVisible=true" v-show="!isLook">浠诲姟鍒囨崲</el-button>
<el-button size="small" type="primary" @click="handleSubmit" v-if="state==1"
:loading="submitLoading">鎻愪氦</el-button>
<!-- 澶嶆牳 -->
<el-button size="small" type="primary" @click="upInsReview(1)" :loading="reviewLoading"
- v-if="state>1">缁х画璇曢獙</el-button>
- <el-button size="small" @click="upInsReview(0)" v-if="state>1" type="danger">鍐嶆璇曢獙</el-button>
- <el-button size="small" @click="upInsReview(2)" v-if="state>1">缁撴潫璇曢獙</el-button>
- <el-button size="small" @click="$emit('goback')">杩斿洖</el-button>
+ 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')" v-if="!noBack">杩斿洖</el-button>
</el-col>
</el-row>
- <div class="search">
+ <div class="search" v-show="!isLook">
<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>
@@ -316,42 +323,24 @@
</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" :loading="getReportModelLoading" @focus="getReportModel(currentSample.id)">
- <el-option
- v-for="item in fibers"
- :key="item.value"
- :label="item.code"
- :value="item.id">
- <span style="float: left">{{ item.code}}</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="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" :loading="getReportModelLoading" @focus="getReportModel(currentSample.id)">
- <el-option
- v-for="item in fiber"
- :label="item.bushColor+'-'+item.color"
- :key="item.id"
- :value="item.id">
- <span style="float: left">{{ item.bushColor+'-'+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>
+ <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" :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" :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="(isGet||tableLists.find(m=>m.templateId==currentTable)&&tableLists.find(m=>m.templateId==currentTable).templateName=='娓╁害寰幆妫�楠屽師濮嬭褰�'&&temDataAcquisition)&&PROJECT=='妫�娴嬩腑蹇�'&&state==1" @click="getDataAcquisitionDevice" :loading="dataAcquisitionLoading">鏁版嵁閲囬泦</el-button>
<el-button :type="dataAcquisitionEidtAble?'':'primary'" size="small" v-if="(isGet||(tableLists.find(m=>m.templateId==currentTable)&&tableLists.find(m=>m.templateId==currentTable).templateName=='娓╁害寰幆妫�楠屽師濮嬭褰�'))&&PROJECT=='妫�娴嬩腑蹇�'&&collected&&state==1" @click="dataAcquisitionEidtAble=!dataAcquisitionEidtAble">{{dataAcquisitionEidtAble?'鍏抽棴缂栬緫':'缂栬緫鏁伴噰'}}</el-button>
</div>
+ <!-- <div class="history-btn" v-if="isLook">
+ <el-button type="primary" icon="el-icon-arrow-left" size="small" @click="goHistory(-1)">涓婁竴鏉¤褰�</el-button>
+ <span style="font-size: 14px;margin: 0 10px;">褰撳墠绗瑊{num}}鏉�</span>
+ <el-button type="primary" size="small" @click="goHistory(1)">涓嬩竴鏉¤褰�<i class="el-icon-arrow-right el-icon--right"></i></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.includes('鐢佃矾璇曢獙'))">
@@ -470,87 +459,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=='娓╁害寰幆妫�楠屽師濮嬭褰�'">
@@ -800,8 +708,8 @@
<!-- 鐢佃矾璇曢獙 -->
<div v-else-if="tableLists.find(m=>m.templateId==currentTable).templateName.includes('鐢佃矾璇曢獙')" style="width: 100%;overflow-x: auto;overflow-y: visible;">
<!-- <Circuit></Circuit> -->
- <CircuitParameters1 v-if="currentTableState==0" :insProduct="currentSample.insProduct" :orderId="id" :sampleId="currentSample.id" :state="state" :num="currentSample.num1"></CircuitParameters1>
- <CircuitParameters2 v-if="currentTableState==1" :insProduct="currentSample.insProduct" :orderId="id" :sampleId="currentSample.id" :state="state" :num="currentSample.num1"></CircuitParameters2>
+ <CircuitParameters1 v-if="currentTableState==0" :insProduct="currentSample.insProduct" :orderId="id" :sampleId="currentSample.id" :state="state" :num="currentSample.num1" :isLook="isLook" :currentNum="currentNum"></CircuitParameters1>
+ <CircuitParameters2 v-if="currentTableState==1" :insProduct="currentSample.insProduct" :orderId="id" :sampleId="currentSample.id" :state="state" :num="currentSample.num1" :isLook="isLook" :currentNum="currentNum"></CircuitParameters2>
</div>
<el-upload :action="action"
:data="{
@@ -809,7 +717,7 @@
}"
v-if="state==1&&fileAdd"
:on-success="handleSuccessUp" :show-file-list="false"
- accept='.jpg,.jpeg,.png,.gif,.doc,.docx,.xls,.xlsx,.ppt,.pptx,.pdf,.zip,.rar' :headers="headers" :on-change="beforeUpload"
+ accept='.jpg,.jpeg,.png,.gif,.docx,.xls,.xlsx,.pdf,.zip,.rar,.csv' :headers="headers" :on-change="beforeUpload"
style="width: 80px !important;"
:on-error="onError" ref='upload'>
<el-button size="small" type="primary" v-if="state==1">闄勪欢涓婁紶</el-button></el-upload>
@@ -818,7 +726,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">
@@ -928,6 +836,32 @@
<el-button type="primary" :loading="versionLoading" @click="saveVersion">纭� 瀹�</el-button>
</span>
</el-dialog>
+ <el-dialog title="璇曢獙淇℃伅" :visible.sync="experimentDia" width="400px">
+ <div class="body" style="display: flex;padding: 10px;align-items: center;">
+ <div class="search_label" style="width: 150px;"><span class="required-span">*</span>瀹為獙闃舵</div>
+ <div class="search_input" style="width: 100%;">
+ <el-input clearable v-model="experimentInfo.term" size="small" placeholder=""></el-input>
+ </div>
+ </div>
+ <div class="body" style="display: flex;padding: 10px;align-items: center;">
+ <div class="search_label" style="width: 150px;"><span class="required-span">*</span>瀹為獙鎿嶄綔</div>
+ <div class="search_input" style="width: 100%;">
+ <el-input clearable v-model="experimentInfo.note" size="small" placeholder="" type="textarea"
+ :rows="2"></el-input>
+ </div>
+ </div>
+ <span slot="footer" class="dialog-footer">
+ <el-button @click="experimentDia = false">鍙� 娑�</el-button>
+ <el-button type="primary" @click="submit0">纭� 瀹�</el-button>
+ </span>
+ </el-dialog>
+ <el-dialog
+ title="鏂囦欢棰勮"
+ :visible.sync="lookFileVisible"
+ width="60%" fullscreen>
+ <filePreview v-if="lookFileVisible" :fileUrl="currentFile.url"
+ :currentFile="currentFile" style="max-height: 87vh;overflow-y: auto;"/>
+ </el-dialog>
</div>
</template>
@@ -938,29 +872,28 @@
import excelFunction from '../../../util/excelFountion'
import CircuitParameters1 from './circuit-parameters1.vue'
import CircuitParameters2 from './circuit-parameters2.vue'
+ import filePreview from '../../tool/file-preview.vue'
export default {
- props: ['sonLaboratory', 'orderId', 'state','inspectorList','version','orderStateId'],
+ props: ['sonLaboratory', 'orderId', 'state','inspectorList','version','orderStateId','isLook','num1','noBack'],
components: {
ValueTable,
Circuit,
CircuitParameters1,
- CircuitParameters2
+ CircuitParameters2,
+ filePreview
},
data() {
return {
+ lookFileVisible:false,//棰勮鏂囦欢
+ experimentDia:false,
+ experimentInfo:{
+ note:'',
+ term:''
+ },
+ currentNum:0,
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,
@@ -1021,6 +954,12 @@
disabFun: (row, index) => {
return this.state!=1
}
+ },
+ {
+ id: '1',
+ font: '棰勮',
+ type: 'text',
+ method: 'lookFile',
}
],
isPage: false,
@@ -1046,7 +985,6 @@
},
upIndex: 0,
changeType:null,
- getReportModelLoading:false,
insOrder: {},
sampleProduct: [],
typeList: [],
@@ -1128,6 +1066,12 @@
changeType:null,
getDataTypeId:'',
getDataType:null,
+ num:0,
+ otherForm:{
+ temperature:'',
+ humidity:''
+ },
+ currentFile:{},//褰撳墠鏂囦欢
}
},
// 鐢ㄤ簬涓婁紶鏂囦欢鐨勪俊鎭�
@@ -1144,6 +1088,8 @@
created() {
this.componentData.entity.sonLaboratory = this.sonLaboratory;
this.id = this.orderId;
+ this.currentTableState = this.version
+ this.num = this.num1
this.getUserInfo()
},
mounted() {
@@ -1154,7 +1100,6 @@
this.scrollInit()
this.getPower()
this.startWorker()
- this.currentTableState = this.version
},
watch: {
// 鐩戝惉浠诲姟id锛岃幏鍙栦换鍔′俊鎭�
@@ -1180,6 +1125,14 @@
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)
@@ -1200,7 +1153,6 @@
}
})
this.determineWhetherToCollectData()//鏄惁闇�瑕佹暟閲�
- this.getReportModel(this.currentSample.id)//鑾峰彇濂楃銆佸厜绾ゅ甫銆佸厜绾や俊鎭�
if (this.currentSample.index == undefined) this.currentSample['index'] = 1
let bushing = this.currentSample.bushing
this.getTableLists();//澶勭悊妯℃澘鍒楄〃淇℃伅
@@ -1250,7 +1202,6 @@
}
}
})
- this.getReportModel(this.currentSample.id)//鑾峰彇濂楃銆佸厜绾ゅ甫銆佸厜绾や俊鎭�
// 鍘婚噸妯℃澘锛岃繑鍥炴湁鍑犱釜妯℃澘
const mySet1 = new Set();
this.tableLists = this.currentSample.insProduct.filter(m => {
@@ -1321,7 +1272,7 @@
})
}
// 淇濆瓨鏁版嵁
- this.saveInsContext()
+ this.saveInsContext(this.currentSample.insProduct[0].id)
}
}
},
@@ -1331,22 +1282,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=='娓╁害寰幆妫�楠屽師濮嬭褰�'){
@@ -2132,6 +2067,25 @@
this.saveInsContext()
},
// 鐑惊鐜�---缁撴潫
+ // 淇濆瓨婀垮害銆佹俯搴︽暟鎹�
+ 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'))
@@ -2171,7 +2125,12 @@
// 鏍规嵁绫诲瀷銆佷换鍔d銆佸疄楠屽鏉ヨ幏鍙栨牱鍝佺殑妫�楠岄」淇℃伅
async getCurrentProduct(id,type){
this.tableLoading = true;
- let res = await this.$axios.post(this.$api.insOrderPlan.getInsProduct+'?id='+id+'&type='+type+'&laboratory='+this.sonLaboratory)
+ let res = null;
+ if(!this.isLook){
+ res = await this.$axios.post(this.$api.insOrderPlan.getInsProduct+'?id='+id+'&type='+type+'&laboratory='+this.sonLaboratory)
+ }else{
+ res = await this.$axios.post(this.$api.insOrderPlan.getInsProduct2+'?id='+id+'&type='+type+'&laboratory='+this.sonLaboratory+'&num='+this.num)
+ }
this.tableLoading = false;
return res.data
},
@@ -2207,15 +2166,13 @@
}
}
})
- // 鑾峰彇濂楃,鍏夌氦甯�,鍏夌氦鏁版嵁
- this.getReportModel(row.id)
let bushing = this.currentSample.bushing
if(bushing&&bushing.length>0){
this.bushing = bushing
}
// 澶勭悊椤甸潰鍒楄〃鏁版嵁
this.getTableLists();
- this.currentKey = row.index
+ this.currentKey = row.index?row.index:0
this.currentTab = null;
// 鍚戝绾跨▼鍘讳繚瀛橀〉闈㈠垪琛ㄦ暟鎹�,鍚庣浼犲弬,褰撳墠妯℃澘淇℃伅
this.worker.postMessage(JSON.stringify({
@@ -2236,19 +2193,6 @@
}else{
return true
}
- },
- // 鑾峰彇濂楃,鍏夌氦甯�,鍏夌氦鏁版嵁
- 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){
@@ -2271,8 +2215,6 @@
})
// 椤甸潰鍒楄〃鏁版嵁澶勭悊
this.getTableLists0(list)
- // 鑾峰彇濂楃,鍏夌氦甯�,鍏夌氦鏁版嵁
- this.getReportModel(this.currentSample.id)
// 鍚戝绾跨▼淇濆瓨鏁版嵁
this.worker.postMessage(JSON.stringify({
type: 'saveData',
@@ -2830,7 +2772,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=='浣撶Н鐢甸樆鐜�')){
@@ -2872,11 +2816,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){
@@ -2887,33 +2833,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':
@@ -3221,12 +3168,33 @@
this.$message.error('鏈緭鍏ヤ笉閫氳繃鍘熷洜')
}
},
- handleSubmit(){
+ submit0(){
+ if(!this.experimentInfo.term){
+ this.$message.error('璇疯緭鍏ュ疄楠岄樁娈�')
+ return
+ }
+ if(!this.experimentInfo.note){
+ this.$message.error('璇疯緭鍏ュ疄楠屾搷浣�')
+ return
+ }
+ this.experimentDia = false
if(this.insOrder.orderType=='C'){
this.verifyUser = this.insOrder.prepareUserId
this.submit()
}else{
this.addVerifyDia = true
+ }
+ },
+ handleSubmit(){
+ if (this.sonLaboratory === '鐢佃矾璇曢獙') {
+ this.experimentDia = true
+ } else {
+ if(this.insOrder.orderType=='C'){
+ this.verifyUser = this.insOrder.prepareUserId
+ this.submit()
+ }else{
+ this.addVerifyDia = true
+ }
}
},
submit() {
@@ -3246,7 +3214,8 @@
orderId: this.orderId,
laboratory: this.sonLaboratory,
verifyUser: this.verifyUser,
- entrustCode: this.insOrder.entrustCode
+ entrustCode: this.insOrder.entrustCode,
+ ...this.experimentInfo
}).then(res => {
if (res.code === 200) {
this.$message.success("鎿嶄綔鎴愬姛")
@@ -3278,7 +3247,8 @@
this.$axios.post(this.$api.insOrderPlan.submitPlan, {
orderId: this.orderId,
laboratory: this.sonLaboratory,
- verifyUser: this.verifyUser
+ verifyUser: this.verifyUser,
+ ...this.experimentInfo
}).then( res => {
if (res.code === 200) {
this.submitLoading = false;
@@ -3313,12 +3283,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 => {
@@ -3388,7 +3364,7 @@
}
}
// 淇濆瓨鏁版嵁
- this.saveInsContext()
+ this.saveInsContext(n.i)
},
getAuthorizedPerson() {
this.$axios.get(this.$api.user.getUserMenu).then(res => {
@@ -3632,6 +3608,29 @@
}
this.versionDialogVisible = false
})
+ },
+ async goHistory(num){
+ if(this.num==1&&num==-1){
+ this.$message.error('褰撳墠鏄涓�鏉¤褰�')
+ return
+ }else if(this.num1==this.num&&num==1){
+ this.$message.error('褰撳墠鏄渶鍚庝竴鏉¤褰�')
+ return
+ }
+ this.num = this.num + num
+ this.tableLoading = true
+ await this.handleChangeSample(this.currentSample)
+ this.currentNum++
+ this.tableLoading = false
+ },
+ lookFile(row){
+ this.currentFile = row;
+ if(row.type==1){
+ this.currentFile.url = this.javaApi+'/img/'+row.fileUrl
+ }else{
+ this.currentFile.url = this.javaApi+'/word/'+row.fileUrl
+ }
+ this.lookFileVisible = true
}
}
}
--
Gitblit v1.9.3