From dabcfed1aab6c5c2397ce7c51492eb3c1a923662 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期六, 10 八月 2024 15:02:10 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/center-lims-before into master
---
src/components/do/b1-ins-order/fiberoptic-config-two.vue | 2
src/components/do/b1-inspect-order-plan/Inspection.vue | 30 ++++++-
src/components/view/b1-inspect-order-plan.vue | 4
src/components/do/b1-ins-order/fiberoptic-config.vue | 179 ++++++++++++++++++++++++++++++++++++--------
src/components/view/b1-inspection-order.vue | 1
5 files changed, 177 insertions(+), 39 deletions(-)
diff --git a/src/components/do/b1-ins-order/fiberoptic-config-two.vue b/src/components/do/b1-ins-order/fiberoptic-config-two.vue
index d5dfea7..4e8b4b0 100644
--- a/src/components/do/b1-ins-order/fiberoptic-config-two.vue
+++ b/src/components/do/b1-ins-order/fiberoptic-config-two.vue
@@ -100,6 +100,8 @@
<span v-else>{{ scope.row.ask }}</span>
</template>
</el-table-column>
+ <el-table-column prop="tell" label="瑕佹眰鎻忚堪" show-overflow-tooltip width="150">
+ </el-table-column>
</el-table>
</div>
</el-col>
diff --git a/src/components/do/b1-ins-order/fiberoptic-config.vue b/src/components/do/b1-ins-order/fiberoptic-config.vue
index 17c6272..7ae348a 100644
--- a/src/components/do/b1-ins-order/fiberoptic-config.vue
+++ b/src/components/do/b1-ins-order/fiberoptic-config.vue
@@ -35,7 +35,7 @@
</div>
<div class="search-item" style="margin-right: 10px;">
<label style="width: 100px">姣忔牴绠℃娊妫�鏍囧噯閲�</label>
- <el-input v-model="packageInfo.standNum" placeholder="璇疯緭鍏�" size="small" @blur="addStandNum" :disabled="active!=1" style="width:70px"></el-input>
+ <el-input v-model="packageInfo.standNum" placeholder="璇疯緭鍏�" size="small" @blur="addStandNum" :disabled="packageInfo.radio===0||active!=1" style="width:100px"></el-input>
</div>
<div class="search-item">
<label style="width: 100px">姣忔牴绠℃娊妫�妫�娴嬮噺</label>
@@ -95,8 +95,14 @@
</el-table-column> -->
<el-table-column prop="ask" label="妫�娴嬭姹�" show-overflow-tooltip width="200px">
<template slot-scope="scope">
- <el-input v-model="scope.row.ask" placeholder="璇疯緭鍏�" size="small" :disabled="active!=1" v-if="!isAskOnlyRead"></el-input>
+ <el-input v-model="scope.row.ask" placeholder="璇疯緭鍏�" size="small" :disabled="active!=1" v-if="!isAskOnlyRead" @change="changeASk(scope.row)"></el-input>
<span v-else>{{ scope.row.ask }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column prop="tell" label="瑕佹眰鎻忚堪" show-overflow-tooltip width="150">
+ <template slot-scope="scope">
+ <el-input v-model="scope.row.tell" placeholder="璇疯緭鍏�" size="small" :disabled="active!=1" v-if="!isAskOnlyRead" @change="changeASk(scope.row)"></el-input>
+ <span v-else>{{ scope.row.tell }}</span>
</template>
</el-table-column>
</el-table>
@@ -152,8 +158,11 @@
</div>
</div>
- <el-table ref="table2" :data="fibersList" tooltip-effect="dark" style="width: 100%" height="270px"
+ <!-- <el-table ref="table2" :data="fibersList" tooltip-effect="dark" style="width: 100%" height="270px"
size="small" @selection-change="handleSelectionChange" highlight-current-row @row-click="(row, column, event)=>rowClickFiber(row, column, event,1)"
+ :header-cell-class-name="setClassName0"> -->
+ <el-table ref="table2" :data="fibersList" tooltip-effect="dark" style="width: 100%" height="270px"
+ size="small" @selection-change="handleSelectionChange" highlight-current-row
:header-cell-class-name="setClassName0">
<el-table-column
type="selection"
@@ -227,9 +236,12 @@
</el-select>
</div>
</div>
- <el-table ref="table3" :data="fiberList" tooltip-effect="dark" style="width: 100%" height="270px"
+ <!-- <el-table ref="table3" :data="fiberList" tooltip-effect="dark" style="width: 100%" height="270px"
size="small" highlight-current-row @selection-change="handleSelectionChange4"
@row-click="(row, column, event)=>rowClickFiber(row, column, event,0)"
+ :header-cell-class-name="setClassName0"> -->
+ <el-table ref="table3" :data="fiberList" tooltip-effect="dark" style="width: 100%" height="270px"
+ size="small" highlight-current-row @selection-change="handleSelectionChange4"
:header-cell-class-name="setClassName0">
<el-table-column
type="selection"
@@ -506,7 +518,7 @@
this.detectionSelect = val
// 璧嬪�兼娴嬮」淇℃伅 鍏夌氦甯�
if(this.detectionItems.type == 1) {
- this.multiFiberList.forEach(item => {
+ this.multiFiberList.forEach(item => {
this.fibersList.forEach(a => {
if(a.ident == item.ident){
a.productList = []
@@ -514,8 +526,10 @@
}
})
})
-
}
+ console.log(this.fibersList);
+
+
if(this.detectionItems.type == 0) {
// 璧嬪�兼娴嬮」淇℃伅 鍏夌氦
this.selectFiberList.forEach(item => {
@@ -526,9 +540,9 @@
}
})
})
-
// 閫夋嫨鐨勬椂鍊欏氨灏唂iberList鐨勫�艰祴鍊肩粰瀵瑰簲鐨刦iberList
- if(this.multiFiberList.length > 0) {
+ setTimeout(() => {
+ if(this.multiFiberList.length > 0) {
this.multiFiberList.forEach(item => {
this.fibersList.forEach(a => {
if(a.ident == item.ident){
@@ -537,6 +551,7 @@
})
})
}
+ },100)
}
},
handleSelectionChange4(val){
@@ -544,6 +559,46 @@
if(val != 0) {
this.rowClickFiber(val[val.length-1],null,null,0)
}
+ },
+
+ changeASk(row) {
+ // 鍏堝嬀閫夌殑鎯呭喌涓�
+ this.detectionSelect.forEach(item => {
+ if(item.id == row.id) {
+ item.ask = row.ask
+ item.tell = row.tell
+ // 鍏夌氦 0 鍏夌氦甯� 1
+ if(item.isFibers == 0) {
+ this.selectFiberList.forEach(a => {
+ this.fiberList.forEach(b => {
+ if(b.ident == a.ident){
+ b.productList.forEach(item => {
+ if(item.id == row.id) {
+ item.ask = row.ask
+ item.tell = row.tell
+ }
+ })
+ }
+ })
+ })
+ }
+ if(item.isFibers == 1) {
+ this.multiFiberList.forEach(a => {
+ this.fibersList.forEach(b => {
+ if(b.ident == a.ident){
+ b.productList.forEach(item => {
+ if(item.id == row.id) {
+ item.ask = row.ask
+ item.tell = row.tell
+ }
+ })
+ }
+ })
+ })
+
+ }
+ }
+ })
},
outConfig() {
this.$parent.configShow = false
@@ -572,6 +627,11 @@
},
// 濂楃鏍囧噯閲忚祴鍊�
addStandNum() {
+ if(this.packageInfo.testNum > this.packageInfo.standNum) {
+ this.$message.error('妫�娴嬮噺涓嶈兘澶т簬鏍囧噯閲�')
+ this.packageInfo.testNum = this.packageInfo.standNum
+ }
+
if(this.selectBushing.length > 0) {
this.bushing.forEach(item => {
this.selectBushing.forEach(a => {
@@ -603,24 +663,32 @@
this.fiberList = []
this.fibersList = []
this.detectionItems = []
-
// 椤甸潰鏄惁鍚湁鍏夌氦甯�
if(this.packageInfo.ismiers) {
// 鍏ㄦ
if (this.packageInfo.radio == 0) {
+ if(this.packageInfo.standNum == null || this.packageInfo.standNum == '') {
+ this.$message.error('璇峰厛杈撳叆鏍囧噯閲�')
+ return
+ }
// 鏍规嵁鏍囧噯閲忚祴鍊兼娴嬮噺
if(parseInt(this.packageInfo.standNum) > 0 ) {
- // 缁欏厜绾ゅ甫璧嬪��
this.packageInfo.testNum = this.packageInfo.standNum
- this.selectBushing = this.bushing
+ // 缁欏厜绾ゅ甫璧嬪��
+ this.bushing.forEach(item => {
+ item.testNum = this.packageInfo.testNum
+ item.standNum = this.packageInfo.standNum
+ this.$refs.table0.toggleRowSelection(item, true)
+ })
+
this.addFibers()
this.multiFiberList = this.fibersList
// 榛樿鍕鹃��
setTimeout(() => {
- this.selectBushing.forEach(item =>{
- let rowToSelect = this.bushing.find(a => a.ident == item.ident)
- this.$refs.table0.toggleRowSelection(rowToSelect, true)
- })
+ // this.selectBushing.forEach(item =>{
+ // let rowToSelect = this.bushing.find(a => a.ident == item.ident)
+ // this.$refs.table0.toggleRowSelection(rowToSelect, true)
+ // })
this.multiFiberList.forEach(item =>{
let rowToSelect = this.fibersList.find(a => a.ident == item.ident)
@@ -631,15 +699,29 @@
}
}else {
if(this.packageInfo.radio == 0) {
+ if(this.packageInfo.standNum == null || this.packageInfo.standNum == '') {
+ this.$message.error('璇峰厛杈撳叆鏍囧噯閲�')
+ return
+ }
if(parseInt(this.packageInfo.standNum) > 0 ) {
- this.packageInfo.testNum = this.packageInfo.standNum
+ this.packageInfo.testNum = this.packageInfo.standNum
+ this.bushing.forEach(item => {
+ item.testNum = this.packageInfo.testNum
+ item.standNum = this.packageInfo.standNum
+ this.$refs.table0.toggleRowSelection(item, true)
+ })
+ console.log(this.bushing);
this.selectBushing = this.bushing
this.addFiber()
// 榛樿鍕鹃��
setTimeout(() => {
- this.selectBushing.forEach(item =>{
- let rowToSelect = this.bushing.find(a => a.ident == item.ident)
- this.$refs.table0.toggleRowSelection(rowToSelect, true)
+ // this.selectBushing.forEach(item =>{
+ // let rowToSelect = this.bushing.find(a => a.ident == item.ident)
+ // this.$refs.table0.toggleRowSelection(rowToSelect, true)
+ // })
+
+ this.fiberList.forEach(item =>{
+ this.$refs.table3.toggleRowSelection(item, true)
})
}, 200)
}
@@ -788,17 +870,7 @@
this.$message.error('璇烽�夋嫨鏁版嵁')
return
}
- this.selectFiberList.forEach(item => {
- this.fiberList.forEach(a => {
- if(a.ident == item.ident){
- a.model = this.mireModel.split(' - ')[1] // 鍏夌氦瑙勬牸
- a.noSplitModel = this.mireModel // 鍏夌氦瑙勬牸
- if(this.mireStandards != null) {
- a.standard = this.mireStandards.find(a => a.id == this.mireStandard).code // 鍙傝�冩爣鍑�
- }
- }
- })
- })
+
if (val === null || val === '') return
if(this.mireStandards == null ) return
this.$axios.post(this.$api.standardTree.selectStandardProductList, {
@@ -819,6 +891,18 @@
this.detectionType = 0
this.$set(this.detectionItems,'type',0)
}
+ this.mireStandards.find(a => a.id == val).code == '濮旀墭瑕佹眰'?this.isAskOnlyRead = false:this.isAskOnlyRead = true
+ this.selectFiberList.forEach(item => {
+ this.fiberList.forEach(a => {
+ if(a.ident == item.ident){
+ a.model = this.mireModel.split(' - ')[1] // 鍏夌氦瑙勬牸
+ a.noSplitModel = this.mireModel // 鍏夌氦瑙勬牸
+ if(this.mireStandards != null) {
+ a.standard = this.mireStandards.find(a => a.id == this.mireStandard).code // 鍙傝�冩爣鍑�
+ }
+ }
+ })
+ })
})
},
@@ -868,6 +952,8 @@
this.detectionItems = res.data
this.detectionType = 1
this.$set(this.detectionItems,'type',1)
+ // 鍒ゆ柇鏄惁涓哄鎵樿姹�
+ this.miresStandards.find(a => a.id == val).code == '濮旀墭瑕佹眰'?this.isAskOnlyRead = false:this.isAskOnlyRead = true
}
// 缁欓�変腑鐨勫厜绾ゅ甫璧嬪��
@@ -1181,6 +1267,21 @@
// 灏嗚幏鍙栫殑妫�娴嬮」淇℃伅璧嬪��
this.detectionItems = []
if(res.data != null && res.data.length != 0){
+ res.data.forEach(a => {
+ this.$set(a,'isFibers',1)
+ })
+ // 鍒ゆ柇鏄惁涓哄鎵樿姹�
+ this.miresStandards.find(a => a.id == this.miresStandard).code == '濮旀墭瑕佹眰'?this.isAskOnlyRead = false:this.isAskOnlyRead = true
+ if(!this.isAskOnlyRead){
+ row.productList.forEach(a => {
+ res.data.forEach(b => {
+ if(a.id == b.id){
+ b.ask = a.ask
+ b.tell = a.tell
+ }
+ })
+ })
+ }
this.detectionItems = res.data
this.detectionType = 1
this.$set(this.detectionItems,'type',1)
@@ -1197,7 +1298,7 @@
}
}
})
- },1000)
+ },500)
}else if(type == 0) {
if((row.noSplitModel == null || row.noSplitModel == '') && (row.standard == null || row.standard == '')){
this.detectionItems = []
@@ -1224,10 +1325,24 @@
if(res.data != null && res.data.length != 0){
res.data.forEach(a => {
a.state = 0
+ this.$set(a,'isFibers',0)
})
+ // 鍒ゆ柇鏄惁涓哄鎵樿姹�
+ this.mireStandards.find(a => a.id == this.mireStandard).code == '濮旀墭瑕佹眰'?this.isAskOnlyRead = false:this.isAskOnlyRead = true
+ if(!this.isAskOnlyRead){
+ row.productList.forEach(a => {
+ res.data.forEach(b => {
+ if(a.id == b.id){
+ b.ask = a.ask
+ b.tell = a.tell
+ }
+ })
+ })
+ }
this.detectionItems = res.data
this.detectionType = 0
this.$set(this.detectionItems,'type',0)
+
if (row.productList != null && row.productList.length > 0) {
let product = JSON.parse(JSON.stringify(row.productList))
@@ -1242,7 +1357,7 @@
}
}
})
- },1000);
+ },500);
}
},
toggleSelection(row) {
diff --git a/src/components/do/b1-inspect-order-plan/Inspection.vue b/src/components/do/b1-inspect-order-plan/Inspection.vue
index 795a6f6..1d42ae2 100644
--- a/src/components/do/b1-inspect-order-plan/Inspection.vue
+++ b/src/components/do/b1-inspect-order-plan/Inspection.vue
@@ -828,7 +828,7 @@
<td style="text-align: left;">
<el-checkbox-group
v-model="getDataIndex" :max="item.child[0].maxNum">
- <el-checkbox v-for="(n,j) in item.child[0].arr" :label="j" :key="j+'ppppppppp'">{{n}}</el-checkbox>
+ <el-checkbox v-for="(n,j) in item.child[0].arr" :label="j" :key="j">{{n}}</el-checkbox>
</el-checkbox-group>
</td>
</tr>
@@ -837,7 +837,7 @@
<td style="text-align: left;">
<el-checkbox-group
v-model="getDataIndex" :max="m.maxNum">
- <el-checkbox v-for="(n,j) in m.arr" :label="j" :key="j+'bbbbbbbbbbbbbb'">{{n}}</el-checkbox>
+ <el-checkbox v-for="(n,j) in m.arr" :label="j" :key="j">{{n}}</el-checkbox>
</el-checkbox-group>
</td>
</tr>
@@ -1310,8 +1310,14 @@
child:[]
}
for(let j in data[i]){
+ let str0 = ''
+ if(i==j){
+ str0 = i+','
+ }else{
+ str0 = i+','+j
+ }
if(j!='frequency'&&data[i][j]&&typeof data[i][j].result == 'string'){
- this.dataAcquisitionInfo[i+','+j] = {
+ this.dataAcquisitionInfo[str0] = {
value:data[i][j].result,
frequency:data[i].frequency
}
@@ -1319,7 +1325,6 @@
list.forEach((item,index)=>{
let num0 = 0;
let str = ''
- let str0 = i+','+j
item.forEach(m=>{
if(m.v.ps&&(m.v.ps.value=='妫�楠屽瓙椤�'||m.v.ps.value=='妫�楠岄」')){
if(m.v.ps&&m.v.ps.value=='妫�楠岄」'){
@@ -1342,7 +1347,12 @@
})
})
}else if(j!='frequency'&&data[i][j]&&Array.isArray(data[i][j].result)){
- let str0 = i+','+j
+ let str0 = ''
+ if(i==j){
+ str0 = i+','
+ }else{
+ str0 = i+','+j
+ }
let list = this.tableList[0].arr
let maxNum = 0
list.forEach((item,index)=>{
@@ -1378,6 +1388,13 @@
}
})
})
+ // let arr3 = []
+ // for (let l=0 ;i<data[i][j].result.length;i++){
+ // arr3.push({
+ // id:,
+ // value:
+ // })
+ // }
let obj0 = {
name:j,
arr:data[i][j].result,
@@ -1387,7 +1404,7 @@
if(data[i][j].result&&Array.isArray(data[i][j].result)&&data[i][j].result.length>maxNum){
obj.child.push(obj0)
}else{
- this.dataAcquisitionInfo[i+','+j] = {
+ this.dataAcquisitionInfo[str0] = {
value:data[i][j].result
}
}
@@ -1399,6 +1416,7 @@
}
if(this.getData.length>0){
this.dataGetDia = true
+ this.getDataIndex = []
}else{
try {
// 鍚� Worker 鍙戦�佹秷鎭紝寮�濮嬪鐞嗛�昏緫
diff --git a/src/components/view/b1-inspect-order-plan.vue b/src/components/view/b1-inspect-order-plan.vue
index ea39299..998a99d 100644
--- a/src/components/view/b1-inspect-order-plan.vue
+++ b/src/components/view/b1-inspect-order-plan.vue
@@ -200,7 +200,7 @@
</span>
</el-dialog>
<div style="width: 100%;height: 100%;" v-if="activeFace >0">
- <Add :active="activeFace" :currentId="currentId"/>
+ <Add :active="activeFace" :currentId="currentId" :examine="examine"/>
</div>
<Inspection v-if="state>0" @goback="goback" :orderId="orderId" :sonLaboratory="componentData.entity.sonLaboratory" :state="state"/>
<el-dialog title="鏁版嵁鏌ョ湅" :visible.sync="dataDialogVisible" width="80%">
@@ -228,6 +228,7 @@
},
data() {
return {
+ examine: null,
alone: false,
sampleUserForm: {
entrustCode: null,
@@ -580,6 +581,7 @@
},
selectAllByOne(row) {
this.activeFace = 2;
+ this.examine = 1;
this.currentId = parseInt(row.id)
},
playOrder(num) {
diff --git a/src/components/view/b1-inspection-order.vue b/src/components/view/b1-inspection-order.vue
index 9dc3b69..50d48fb 100644
--- a/src/components/view/b1-inspection-order.vue
+++ b/src/components/view/b1-inspection-order.vue
@@ -929,6 +929,7 @@
// //澶嶅埗缁檉ormData
// this.formData = this.HaveJson(row);
this.currentId = row.id
+ this.examine = 1
},
// 鏁版嵁鏌ョ湅
handleDataLook(row) {
--
Gitblit v1.9.3