From 2e9370979f871bf47f6dc145c49d7bf32ffa4b51 Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期一, 03 六月 2024 09:08:02 +0800
Subject: [PATCH] 完成光纤配置进行检验
---
src/components/do/b1-ins-order/add.vue | 203 +++++++++++---------------------------------------
src/components/do/b1-ins-order/fiberoptic-config.vue | 32 +++++---
2 files changed, 66 insertions(+), 169 deletions(-)
diff --git a/src/components/do/b1-ins-order/add.vue b/src/components/do/b1-ins-order/add.vue
index 0a927ab..f1cfa3f 100644
--- a/src/components/do/b1-ins-order/add.vue
+++ b/src/components/do/b1-ins-order/add.vue
@@ -222,27 +222,31 @@
</div>
</el-col>
<el-col class="search_thing" :span="6">
- <div class="search_label"><span class="required-span">* </span>宸ョ▼鍚嶇О锛�</div>
+ <div class="search_label">宸ョ▼鍚嶇О锛�</div>
<div class="search_input">
- <el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="addObj.engineering" :readonly="active>1"></el-input>
+ <el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="addObj.engineering"
+ :readonly="active>1"></el-input>
</div>
</el-col>
<el-col class="search_thing" :span="6">
- <div class="search_label"><span class="required-span">* </span>宸ョ▼鍚嶇ОEN锛�</div>
+ <div class="search_label">宸ョ▼鍚嶇ОEN锛�</div>
<div class="search_input">
- <el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="addObj.engineeringEn" :readonly="active>1"></el-input>
+ <el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="addObj.engineeringEn"
+ :readonly="active>1"></el-input>
</div>
</el-col>
<el-col class="search_thing" :span="6">
<div class="search_label"><span class="required-span">* </span>鐢熶骇鍗曚綅锛�</div>
<div class="search_input">
- <el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="addObj.production" :readonly="active>1"></el-input>
+ <el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="addObj.production"
+ :readonly="active>1"></el-input>
</div>
</el-col>
<el-col class="search_thing" :span="6">
<div class="search_label"><span class="required-span">* </span>鐢熶骇鍗曚綅EN锛�</div>
<div class="search_input">
- <el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="addObj.productionEn" :readonly="active>1"></el-input>
+ <el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="addObj.productionEn"
+ :readonly="active>1"></el-input>
</div>
</el-col>
<el-col class="search_thing" :span="6">
@@ -362,7 +366,7 @@
<el-table-column prop="inspectionItemSubclass" label="妫�楠岄」瀛愰」" min-width="140"
show-overflow-tooltip></el-table-column>
<el-table-column prop="sonLaboratory" label="瀛愬疄楠屽" width="130" show-overflow-tooltip :filters="filters"
- :filter-method="filterHandler"></el-table-column>
+ :filter-method="filterHandler"></el-table-column>
<el-table-column prop="methodS" label="璇曢獙鏂规硶" min-width="120" show-overflow-tooltip>
</el-table-column>
<el-table-column prop="unit" label="璁￠噺鍗曚綅" width="100" show-overflow-tooltip></el-table-column>
@@ -374,8 +378,9 @@
<el-table-column prop="ask" label="瑕佹眰鍊�" min-width="220px">
<template slot-scope="scope">
<el-input size="small" placeholder="瑕佹眰鍊�" v-model="scope.row.ask" clearable type="textarea"
- :autosize="{ minRows: 1, maxRows: 3}" @change="e=>requestChange(e,scope.row)" v-if="active==1&&isAskOnlyRead"></el-input>
- <span v-else>{{ scope.row.ask }}</span>
+ :autosize="{ minRows: 1, maxRows: 3}" @change="e=>requestChange(e,scope.row)"
+ v-if="active==1&&isAskOnlyRead"></el-input>
+ <span v-else>{{ scope.row.ask }}</span>
</template>
</el-table-column>
</el-table>
@@ -415,71 +420,6 @@
<span slot="footer" class="dialog-footer">
<el-button @click="selectStandardTree = false">鍙� 娑�</el-button>
<el-button type="primary" @click="activeStandardTree">纭� 瀹�</el-button>
- </span>
- </el-dialog>
- <el-dialog title="娣诲姞鏍峰搧" :visible.sync="addSampleDia" width="400px">
- <div class="body" style="max-height: 60vh;">
- <el-row>
- <el-col class="search_thing" :span="22">
- <div class="search_label"><span class="required-span">* </span>鏍峰搧鍚嶇О锛�</div>
- <div class="search_input">
- <el-input readonly size="small" v-model="sample.sample">
- <template slot="append"><el-button slot="append" icon="el-icon-search"
- @click="selectStandardTree = true"></el-button></template>
- </el-input>
- </div>
- </el-col>
- <el-col class="search_thing" :span="22">
- <div class="search_label"><span class="required-span">* </span>宸ュ巶鍚嶇О锛�</div>
- <div class="search_input">
- <el-input size="small" clearable disabled v-model="sample.factory"></el-input>
- </div>
- </el-col>
- <el-col class="search_thing" :span="22">
- <div class="search_label"><span class="required-span">* </span>瀹為獙瀹ゅ悕绉帮細</div>
- <div class="search_input">
- <el-input size="small" clearable disabled v-model="sample.laboratory"></el-input>
- </div>
- </el-col>
- <el-col class="search_thing" :span="22">
- <div class="search_label"><span class="required-span">* </span>鏍峰搧绫诲瀷锛�</div>
- <div class="search_input">
- <el-input size="small" clearable disabled v-model="sample.sampleType"></el-input>
- </div>
- </el-col>
- <el-col class="search_thing" :span="22">
- <div class="search_label"><span class="required-span">* </span>瑙勬牸鍨嬪彿锛�</div>
- <div class="search_input">
- <el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="sample.model"></el-input>
- </div>
- </el-col>
- <el-col class="search_thing" :span="22">
- <div class="search_label">鏍峰搧缂栧彿锛�</div>
- <div class="search_input">
- <el-input v-model="sample.sampleCode" size="small" placeholder="璇疯緭鍏�" clearable></el-input>
- </div>
- </el-col>
- <el-col class="search_thing" :span="24">
- <div class="search_label">鏍峰搧鏁伴噺锛�</div>
- <div class="search_input">
- <el-input-number size="small" v-model="sample.sampleNum" :min="1" :max="100" :precision="0"
- style="width: 50%;"></el-input-number>
- </div>
- </el-col>
- <el-col class="search_thing" :span="22">
- <div class="search_label">鏍峰搧鐣欐牱锛�</div>
- <div class="search_input">
- <el-radio-group v-model="sample.isLeave">
- <el-radio :label="1">鐣欐牱</el-radio>
- <el-radio :label="0">涓嶇暀鏍�</el-radio>
- </el-radio-group>
- </div>
- </el-col>
- </el-row>
- </div>
- <span slot="footer" class="dialog-footer">
- <el-button @click="addSampleDia = false">鍙� 娑�</el-button>
- <el-button type="primary" @click="onSample()" :loading="getProductLoad">纭� 瀹�</el-button>
</span>
</el-dialog>
<el-dialog title="淇濆瓨妯℃澘" :visible.sync="templateDia" width="400px">
@@ -541,7 +481,7 @@
</el-row>
</span>
</el-dialog>
- <fiberOpticConfig :currentId="currentId" v-if="configShow" :active="active"/>
+ <fiberOpticConfig :currentId="currentId" v-if="configShow" :active="active" />
</div>
</template>
@@ -674,7 +614,7 @@
formType: [],
configShow: false,
currentMethod: null,
- isAskOnlyRead:false,
+ isAskOnlyRead: false,
sampleId: null
}
},
@@ -709,8 +649,8 @@
this.addObj.sampleNum = this.sampleList.length
this.$nextTick(() => {
this.$refs.sampleTable.doLayout()
- if(this.addObj.sampleNum>0){
- this.$refs.sampleTable.setCurrentRow(this.sampleList[0],true)
+ if (this.addObj.sampleNum > 0) {
+ this.$refs.sampleTable.setCurrentRow(this.sampleList[0], true)
this.rowClick(this.sampleList[0])
}
})
@@ -759,13 +699,9 @@
this.$message.error('璇疯緭鍏ユ潵鏍锋柟寮�')
} else if (!this.addObj.orderType) {
this.$message.error('璇烽�夋嫨妫�楠岀被鍒�')
- }else if (!this.addObj.engineering) {
- this.$message.error('璇疯緭鍏ュ伐绋嬪悕绉�')
- } else if (!this.addObj.engineeringEn) {
- this.$message.error('璇疯緭鍏ュ伐绋嬪悕绉癊N')
- }else if (!this.addObj.production) {
+ } else if (!this.addObj.production) {
this.$message.error('璇疯緭鍏ョ敓浜у崟浣�')
- }else if (!this.addObj.productionEn) {
+ } else if (!this.addObj.productionEn) {
this.$message.error('璇疯緭鍏ョ敓浜у崟浣岴N')
} else if (this.sampleList.length < 1) {
this.$message.error('璇锋坊鍔犱竴涓牱鍝�')
@@ -779,8 +715,9 @@
this.saveLoad = true
this.$axios.post(this.$api.insOrder.addInsOrder, {
insOrder: this.addObj,
- list: JSON.stringify(this.sampleList.map(a=>{
- a.model = a.model + ((a.modelNum==null||a.modelNum==''||a.modelNum=='null')?'':('-'+a.modelNum))
+ list: JSON.stringify(this.sampleList.map(a => {
+ a.model = a.model + ((a.modelNum == null || a.modelNum == '' || a.modelNum == 'null') ? '' : (
+ '-' + a.modelNum))
return a
}))
}, {
@@ -827,9 +764,9 @@
this.distributeData.orderId = this.currentId
this.distributeData.appointed = ress.data
})
- setTimeout(()=>{
+ setTimeout(() => {
this.issuedDialogVisible = true;
- },1000)
+ }, 1000)
})
} else {
// 涓嶉�氳繃
@@ -990,54 +927,6 @@
this.sampleIds.push(a.id)
})
},
- onSample() {
- if (this.sample.sample == null || this.sample.sample == '') {
- this.$message.error('璇烽�夋嫨鏍峰搧')
- return
- }
- if (this.sample.model == null || this.sample.model == '') {
- this.$message.error('璇疯緭鍏ユ牱鍝佸瀷鍙�')
- return
- }
- // this.getProductLoad = true
- /* this.$axios.post(this.$api.standardTree.selectStandardProductList, {
- factory: this.sample.factory,
- laboratory: this.sample.laboratory,
- sampleType: this.sample.sampleType,
- sample: this.sample.sample,
- model: this.sample.model
- }, {
- headers: {
- 'Content-Type': 'application/json'
- }
- }).then(res => {
- res.data.forEach(a => {
- a.state = 1
- })
- for (var i = 0; i < this.sample.sampleNum; i++) {
- this.sample.joinName = null
- this.sample.joinModel = null
- this.sample.joinNum = 1
- this.sample.insProduct = res.data
- this.sample.id = this.count
- this.sampleList.push(this.HaveJson(this.sample))
- this.count++
- }
- this.$refs.sampleTable.doLayout()
- this.getProductLoad = false
- this.addSampleDia = false
- this.sample = {
- sampleCode: null,
- laboratory: null,
- factory: null,
- sampleType: null,
- sample: null,
- model: null,
- sampleNum: 1,
- isLeave: 0,
- }
- }) */
- },
delSample() {
this.sampleIds.forEach(a => {
for (var i = 0; i < this.sampleList.length; i++) {
@@ -1058,14 +947,14 @@
},
rowClick(row, column, event) {
this.currentMethod = row
- let obj = this.methods.find(a=>a.id==this.currentMethod.standardMethodListId)
- if(obj&&obj.code=='濮旀墭瑕佹眰'){
+ let obj = this.methods.find(a => a.id == this.currentMethod.standardMethodListId)
+ if (obj && obj.code == '濮旀墭瑕佹眰') {
this.isAskOnlyRead = true
- }else{
+ } else {
this.isAskOnlyRead = false
}
this.sampleId = row.id
- if(this.active!==1){
+ if (this.active !== 1) {
this.sampleIds = []
this.sampleIds.push(row.id)
}
@@ -1179,7 +1068,7 @@
category: "妫�楠岀被鍒�"
}).then(res => {
this.orderType = res.data
- if(res.data.length > 0){
+ if (res.data.length > 0) {
this.addObj.orderType = res.data[0].value
}
})
@@ -1189,18 +1078,18 @@
category: "鏉ユ牱鏂瑰紡"
}).then(res => {
this.formType = res.data
- if(this.formType.length > 0){
+ if (this.formType.length > 0) {
this.addObj.formType = this.formType[0].value
}
})
},
methodChange(val, row) {
- if(val===null||val==='')return
+ if (val === null || val === '') return
this.currentMethod = row
- let obj = this.methods.find(a=>a.id==this.currentMethod.standardMethodListId)
- if(obj&&obj.code=='濮旀墭瑕佹眰'){
+ let obj = this.methods.find(a => a.id == this.currentMethod.standardMethodListId)
+ if (obj && obj.code == '濮旀墭瑕佹眰') {
this.isAskOnlyRead = true
- }else{
+ } else {
this.isAskOnlyRead = false
}
this.getProductLoad = true
@@ -1331,7 +1220,7 @@
category: "瀛愬疄楠屽"
}).then(res => {
this.factory = []
- res.data.forEach(a=>{
+ res.data.forEach(a => {
this.filters.push({
text: a.label,
value: a.value
@@ -1343,27 +1232,27 @@
const property = column['property'];
return row[property] === value;
},
- openConfig(){
- if(this.active===1){
- if(this.sampleIds.length===0){
+ openConfig() {
+ if (this.active === 1) {
+ if (this.sampleIds.length === 0) {
this.$message.error("鏈�夋嫨鏍峰搧")
return
}
this.configShow = true
- }else{
- if(this.sampleId === null){
+ } else {
+ if (this.sampleId === null) {
this.$message.error('鏈�変腑鏍峰搧')
return
}
- this.$axios.post(this.$api.insBushing.selectBushingBySampleId,{
+ this.$axios.post(this.$api.insBushing.selectBushingBySampleId, {
sampleId: this.sampleId
- }).then(res=>{
- if(res.data.length===0){
+ }).then(res => {
+ if (res.data.length === 0) {
this.$message.error('璇ユ牱鍝佹病鏈夐厤缃厜绾�')
return
}
- for(var i in this.sampleList){
- if(this.sampleList[i].id = this.sampleId){
+ for (var i in this.sampleList) {
+ if (this.sampleList[i].id = this.sampleId) {
this.sampleList[i].bushing = res.data
break
}
diff --git a/src/components/do/b1-ins-order/fiberoptic-config.vue b/src/components/do/b1-ins-order/fiberoptic-config.vue
index 98a4a92..359d6f1 100644
--- a/src/components/do/b1-ins-order/fiberoptic-config.vue
+++ b/src/components/do/b1-ins-order/fiberoptic-config.vue
@@ -546,19 +546,27 @@
})
},
rowClickFiber(row, column, event,type){
- if(type==0){
- let standard = this.miresStandards.find(a => a.id == this.miresStandard)
- if(standard&&standard.code=='濮旀墭瑕佹眰'){
- this.isAskOnlyRead = false;
+ if(this.active===1){
+ if(type==0){
+ let standard = null;
+ try{
+ standard = this.miresStandards.find(a => a.id == this.miresStandards)
+ }catch(e){}
+ if(standard&&standard.code=='濮旀墭瑕佹眰'){
+ this.isAskOnlyRead = false;
+ }else{
+ this.isAskOnlyRead = true;
+ }
}else{
- this.isAskOnlyRead = true;
- }
- }else{
- let standard = this.mireStandards.find(a => a.id == this.mireStandard)
- if(standard&&standard.code=='濮旀墭瑕佹眰'){
- this.isAskOnlyRead = false;
- }else{
- this.isAskOnlyRead = true;
+ let standard = null;
+ try{
+ standard = this.mireStandards.find(a => a.id == this.mireStandard)
+ }catch(e){}
+ if(standard&&standard.code=='濮旀墭瑕佹眰'){
+ this.isAskOnlyRead = false;
+ }else{
+ this.isAskOnlyRead = true;
+ }
}
}
this.currentDetectionItems = row
--
Gitblit v1.9.3