From 321370a82855d4b58d4eff2aee238672cdb8b865 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期四, 14 十一月 2024 10:06:49 +0800
Subject: [PATCH] 修改检验下单
---
src/components/do/b1-inspect-order-plan/Inspection.vue | 227 +++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 183 insertions(+), 44 deletions(-)
diff --git a/src/components/do/b1-inspect-order-plan/Inspection.vue b/src/components/do/b1-inspect-order-plan/Inspection.vue
index 2735646..2130739 100644
--- a/src/components/do/b1-inspect-order-plan/Inspection.vue
+++ b/src/components/do/b1-inspect-order-plan/Inspection.vue
@@ -259,8 +259,19 @@
<el-row class="title">
<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="versionDialogVisible=true" v-if="state==1&&tableLists.find(m=>m.templateId==currentTable)&&tableLists.find(m=>m.templateId==currentTable).templateName.includes('鐢佃矾璇曢獙')">妫�楠屾ā鏉垮垏鎹�</el-button>
+ <el-col :span="12" style="text-align: right;display: flex;align-items: center;justify-content: end">
+ <el-button size="small" type="primary" @click="versionDialogVisible=true" v-if="state==1&&tableLists.find(m=>m.templateId==currentTable)&&tableLists.find(m=>m.templateId==currentTable).templateName.includes('鐢佃矾璇曢獙')">鐢佃皟/闈炵數璋冩ā鏉垮垏鎹�</el-button>
+ <el-select v-model="template" size="medium" placeholder="鐢佃矾棰勮妯℃澘" style="margin-right: 10px;margin-left: 10px;" v-if="state==1&&tableLists.find(m=>m.templateId==currentTable)&&tableLists.find(m=>m.templateId==currentTable).templateName.includes('鐢佃矾璇曢獙')"
+ @change="selectInsProductTemplateById">
+ <el-option v-for="(a, ai) in templates" :key="ai" :value="a.id" :label="a.name">
+ <span style="float: left">{{ a.name }}</span>
+ <i class="el-icon-delete" style="float: right; color: #66b1ff; font-size: 16px;line-height: 34px;"
+ @click.stop="handleDelete(a)" v-if="addInsProductTemplatePower"></i>
+ </el-option>
+ </el-select>
+ <el-button size="medium" @click="templateDia=true" v-if="state==1&&tableLists.find(m=>m.templateId==currentTable)&&tableLists.find(m=>m.templateId==currentTable).templateName.includes('鐢佃矾璇曢獙')&&addInsProductTemplatePower">
+ <span style="color: #3A7BFA;">淇濆瓨妯℃澘</span>
+ </el-button>
<el-button size="small" type="primary" @click="sampleVisible=true;uploadSample()">鏍峰搧鍒囨崲</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"
@@ -726,8 +737,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" :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>
+ <CircuitParameters1 v-if="currentTableState==0" :insProduct="currentSample.insProduct" :orderId="id" :sampleId="currentSample.id" :state="state" :num="currentSample.num1" :isLook="isLook" :currentNum="currentNum" ref="CircuitParameters"></CircuitParameters1>
+ <CircuitParameters2 v-if="currentTableState==1" :insProduct="currentSample.insProduct" :orderId="id" :sampleId="currentSample.id" :state="state" :num="currentSample.num1" :isLook="isLook" :currentNum="currentNum" ref="CircuitParameters"></CircuitParameters2>
</div>
<!-- 娓╂箍搴﹁瘯楠� -->
<div v-else-if="tableLists.find(m=>m.templateId==currentTable).templateName.includes('娓╂箍搴﹁瘯楠�')">
@@ -735,11 +746,12 @@
</div>
<!-- 鍔熺巼璇曢獙 -->
<div v-else-if="tableLists.find(m=>m.templateId==currentTable).templateName.includes('鍔熺巼瀹归噺')">
- <PowerCapacity :insProduct="currentSample.insProduct" :orderId="id" :sampleId="currentSample.id" :state="state" :isLook="isLook" :num="currentSample.num1" />
+ <PowerCapacity :insProduct="currentSample.insProduct" :orderId="id" :sampleId="currentSample.id" :state="state" :isLook="isLook" :num="currentSample.num1"/>
</div>
<el-upload :action="action"
:data="{
- orderId:id
+ orderId:id,
+ sonLaboratory:sonLaboratory
}"
v-if="state==1&&fileAdd"
:on-success="handleSuccessUp" :show-file-list="false"
@@ -863,41 +875,43 @@
</span>
</el-dialog>
<el-dialog title="璇曢獙淇℃伅" :visible.sync="experimentDia" width="50%">
- <div class="body" style="display: flex;padding: 10px;align-items: center;" v-if="experimentDia0">
- <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 style="height: 80vh;overflow-y: auto;">
+ <div class="body" style="display: flex;padding: 10px;align-items: center;" v-if="experimentDia0">
+ <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>
- <div class="body" style="display: flex;padding: 10px;align-items: center;" v-if="experimentDia0">
- <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 class="body" style="display: flex;padding: 10px;align-items: center;" v-if="experimentDia0">
+ <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>
+ <table border="1" cellpadding="10" class="thermal-table">
+ <tr style="font-size: 18px;font-weight: 500;background-color: #F0F1F5;padding: 10px 0;box-sizing: border-box;">
+ <td>鏍峰搧</td>
+ <td>鏍峰搧缂栧彿</td>
+ <td>鍨嬪彿</td>
+ <td>妫�楠岄」</td>
+ <td>妫�楠屽瓙椤�</td>
+ <td>宸ユ椂</td>
+ </tr>
+ <template v-for="(item,index) in sampleProduct">
+ <tr>
+ <td :rowspan="item.insProduct.length+1">{{ item.sample }}</td>
+ <td :rowspan="item.insProduct.length+1">{{ item.sampleCode }}</td>
+ <td :rowspan="item.insProduct.length+1">{{ item.model }}</td>
+ </tr>
+ <tr v-for="(m,i) in item.insProduct" :key="item.id+i">
+ <td>{{ m.inspectionItem }}</td>
+ <td>{{ m.inspectionItemSubclass }}</td>
+ <td><el-input-number v-model="m.outputWorkTime" :min="0" :max="100" label="宸ユ椂" size="small"></el-input-number></td>
+ </tr>
+ </template>
+ </table>
</div>
- <table border="1" cellpadding="10" class="thermal-table">
- <tr style="font-size: 18px;font-weight: 500;background-color: #F0F1F5;padding: 10px 0;box-sizing: border-box;">
- <td>鏍峰搧</td>
- <td>鏍峰搧缂栧彿</td>
- <td>鍨嬪彿</td>
- <td>妫�楠岄」</td>
- <td>妫�楠屽瓙椤�</td>
- <td>宸ユ椂</td>
- </tr>
- <template v-for="(item,index) in sampleProduct">
- <tr>
- <td :rowspan="item.insProduct.length+1">{{ item.sample }}</td>
- <td :rowspan="item.insProduct.length+1">{{ item.sampleCode }}</td>
- <td :rowspan="item.insProduct.length+1">{{ item.model }}</td>
- </tr>
- <tr v-for="(m,i) in item.insProduct" :key="item.id+i">
- <td>{{ m.inspectionItem }}</td>
- <td>{{ m.inspectionItemSubclass }}</td>
- <td><el-input-number v-model="m.outputWorkTime" :min="0" :max="100" label="宸ユ椂" size="small"></el-input-number></td>
- </tr>
- </template>
- </table>
<span slot="footer" class="dialog-footer">
<el-button @click="experimentDia = false">鍙� 娑�</el-button>
<el-button type="primary" @click="submit0">纭� 瀹�</el-button>
@@ -906,16 +920,27 @@
<el-dialog
title="鏂囦欢棰勮"
:visible.sync="lookFileVisible"
- width="60%" fullscreen>
+ width="60%" fullscreen :modal="false">
<filePreview v-if="lookFileVisible" :fileUrl="currentFile.url"
:currentFile="currentFile" style="max-height: 87vh;overflow-y: auto;"/>
+ </el-dialog>
+ <el-dialog title="淇濆瓨妯℃澘" :visible.sync="templateDia" width="400px">
+ <div class="body" style="display: flex;align-items: center;" v-if="templateDia">
+ <div class="search_label" style="width: 90px;"><span class="required-span">* </span>妯℃澘鍚嶇О锛�</div>
+ <div class="search_input">
+ <el-input size="small" clearable v-model="templateName"></el-input>
+ </div>
+ </div>
+ <span slot="footer" class="dialog-footer">
+ <el-button @click="templateDia = false">鍙� 娑�</el-button>
+ <el-button type="primary" @click="addTemplateDia" :loading="templateLoading">纭� 瀹�</el-button>
+ </span>
</el-dialog>
</div>
</template>
<script>
import ValueTable from '../../tool/value-table.vue'
- import Circuit from './circuit.vue'
import file from '../../../util/file'
import excelFunction from '../../../util/excelFountion'
import CircuitParameters1 from './circuit-parameters1.vue'
@@ -927,7 +952,6 @@
props: ['sonLaboratory', 'orderId', 'state','inspectorList','version','orderStateId','isLook','num1','noBack'],
components: {
ValueTable,
- Circuit,
CircuitParameters1,
CircuitParameters2,
filePreview,
@@ -986,7 +1010,8 @@
},
componentData0: {
entity: {
- insOrderId:''
+ insOrderId:'',
+ sonLaboratory:this.sonLaboratory
},
isIndex: true,
showSelect: false,
@@ -1125,6 +1150,12 @@
humidity:''
},
currentFile:{},//褰撳墠鏂囦欢
+ templates:[],//鐢佃矾璇曢獙妯℃澘
+ templateDia:false,//鐢佃矾璇曢獙妯℃澘淇濆瓨妯℃澘寮规
+ template:null,
+ templateLoading:false,
+ templateName:'',
+ addInsProductTemplatePower:false,//閰嶇疆妯℃澘鏉冮檺
}
},
// 鐢ㄤ簬涓婁紶鏂囦欢鐨勪俊鎭�
@@ -1153,6 +1184,7 @@
this.scrollInit()
this.getPower()
this.startWorker()
+ this.selectInsProductTemplate()
},
watch: {
// 鐩戝惉浠诲姟id锛岃幏鍙栦换鍔′俊鎭�
@@ -2148,6 +2180,7 @@
let fileAdd = false
let collected = false
let temDataAcquisition = false
+ let addInsProductTemplatePower = false;
for (var i = 0; i < power.length; i++) {
if (power[i].menuMethod == 'uploadFile') {
fileAdd = true
@@ -2161,6 +2194,9 @@
if (power[i].menuMethod == 'temDataAcquisition') {
temDataAcquisition = true
}
+ if(power[i].menuMethod == 'addInsProductTemplate'){
+ addInsProductTemplatePower = true
+ }
}
if (!fileDel) {
this.componentData0.do.splice(1, 1)
@@ -2168,6 +2204,7 @@
this.fileAdd = fileAdd
this.collected = collected
this.temDataAcquisition = temDataAcquisition
+ this.addInsProductTemplatePower = addInsProductTemplatePower
},
uploadSample(){
this.$axios.post(this.$api.insOrderPlan.doInsOrder, {
@@ -2195,6 +2232,7 @@
this.param = {}
// 娓呯┖鍏夌氦閰嶇疆鐩稿叧鏁版嵁
this.fiberOpticTape = []
+ this.template = ''
this.currentFiberOpticTape = null;
this.fiberOptic = []
this.currentFiberOptic = null;
@@ -3264,8 +3302,15 @@
}
},
handleSubmit(){
+ if(!this.otherForm.temperature){
+ this.$message.error('璇疯緭鍏ユ俯搴�')
+ return
+ }
+ if(!this.otherForm.humidity){
+ this.$message.error('璇疯緭鍏ユ箍搴�')
+ return
+ }
this.experimentDia = true
- console.log(6666,this.sampleProduct)
if (this.sonLaboratory === '鐢佃矾璇曢獙') {
this.experimentDia0 = true
}
@@ -3743,7 +3788,8 @@
this.lookFileVisible = true
},
handleBack(){
- if(this.tableLists.find(m=>m.templateId==this.currentTable).templateName.includes('鐢佃矾璇曢獙')){
+ try {
+ if(!this.isLook&&this.state==1&&this.tableLists.find(m=>m.templateId==this.currentTable).templateName.includes('鐢佃矾璇曢獙')){
this.$confirm('璇风‘璁ゅ綋鍓嶆暟鎹槸鍚﹀叏閮ㄤ繚瀛橈紝鏄惁杩斿洖锛�', '鎻愮ず', {
confirmButtonText: '纭畾',
cancelButtonText: '鍙栨秷',
@@ -3754,6 +3800,99 @@
}else{
this.$emit('goback')
}
+ } catch (error) {
+ this.$emit('goback')
+ }
+ },
+ selectInsProductTemplate(){
+ this.$axios.post(this.$api.insProductTemplate.chooseInsProductTemplate).then(res => {
+ if (res.code == 201) return
+ this.templates = res.data
+ })
+ },
+ selectInsProductTemplateById(e){
+ if(e){
+ this.$axios.post(this.$api.insProductTemplate.getInsProductTemplate + '?id=' + e).then(res => {
+ if (res.code == 201) return
+ let obj = JSON.parse(res.data.message)
+ if(this.currentTableState!=res.data.version){
+ this.$message.error('鐢佃皟/闈炵數璋冩ā鏉跨増鏈笉涓�鑷达紝璇烽噸鏂伴�夋嫨')
+ this.template = null
+ return
+ }
+ // 褰撳墠妯℃澘涓湭鍖呭惈鎵�鏈夐」鐩�
+ let state = this.currentSample.insProduct.every(item=>{
+ if(obj.allBandList&&obj.allBandList.length>0&&obj.allBandList[0].projectList&&obj.allBandList[0].projectList.length>0&&item.inspectionItemSubclass&&obj.allBandList[0].projectList.find(m=>m.inspectionItemSubclass==item.inspectionItemSubclass)){
+ return true
+ }else{
+ return false
+ }
+ })
+ if(!state){
+ this.template = null
+ this.$message.error('褰撳墠妯℃澘涓湭鍖呭惈鎵�鏈夐」鐩紝璇烽噸鏂伴�夋嫨')
+ return
+ }
+ // 淇濆瓨鐗堟湰
+ // this.saveVersion()
+ // 濡傛灉妯℃澘鐨勬楠岄」澶氫簡锛屽垯鍒犻櫎澶氫綑鐨�
+ obj.allBandList.forEach(item=>{
+ item.projectList.forEach((m,i)=>{
+ if(!this.currentSample.insProduct.find(n=>m.inspectionItemSubclass==n.inspectionItemSubclass)){
+ item.projectList.splice(i,1)
+ }
+ })
+ })
+ this.$refs.CircuitParameters.upTemplate(obj)
+ })
+ }
+ },
+ addTemplateDia(){
+ let obj = {
+ allBandList:this.$refs.CircuitParameters.allBandList,
+ intermodulationNum:this.$refs.CircuitParameters.intermodulationNum,
+ angleList:this.$refs.CircuitParameters.angleList,
+ }
+ if (this.templateName) {
+ this.templateLoading = true;
+ this.$axios.post(this.$api.insProductTemplate.addInsProductTemplate, {
+ name: this.templateName,
+ version:this.currentTableState,
+ message:JSON.stringify(obj)
+ }, {
+ headers: {
+ 'Content-Type': 'application/json'
+ }
+ }).then(res => {
+ if (res.code == 201) return
+ this.templateLoading = false;
+ this.templateDia = false;
+ this.$message.success('淇濆瓨鎴愬姛')
+ this.selectInsProductTemplate()
+ this.templateName = ''
+ })
+ } else {
+ this.$message.error('璇峰～鍐欐ā鏉垮悕绉�')
+ }
+ },
+ handleDelete(row){
+ this.$confirm('鏄惁鍒犻櫎褰撳墠鏁版嵁?', "璀﹀憡", {
+ confirmButtonText: "纭畾",
+ cancelButtonText: "鍙栨秷",
+ type: "warning"
+ }).then(() => {
+ this.$axios.post(this.$api.insProductTemplate.delInsProductTemplate, {
+ id: row.id
+ }).then(res => {
+ if (res.code === 201) {
+ return
+ }
+ this.$message.success('鍒犻櫎鎴愬姛')
+ this.selectInsProductTemplate()
+ }).catch(e => {
+ this.$message.error('鍒犻櫎澶辫触')
+ })
+ }).catch(() => {})
}
}
}
--
Gitblit v1.9.3