From 860c08388adb4196f30851d23ef652deaef26ffc Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期六, 10 八月 2024 15:32:48 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/center-lims-before
---
src/components/do/b1-ins-order/fiberoptic-config-two.vue | 56 +++++++++++++++++++++++++++++---------------------------
1 files changed, 29 insertions(+), 27 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 a45fbcf..4e8b4b0 100644
--- a/src/components/do/b1-ins-order/fiberoptic-config-two.vue
+++ b/src/components/do/b1-ins-order/fiberoptic-config-two.vue
@@ -35,12 +35,12 @@
</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:100px"></el-input>
+ <el-input v-model="packageInfo.standNum" placeholder="璇疯緭鍏�" size="small" @blur="addStandNum" :disabled="active!=1" style="width:70px"></el-input>
</div>
<div class="search-item">
<label style="width: 100px">姣忔牴绠℃娊妫�妫�娴嬮噺</label>
<el-input v-model="packageInfo.testNum" placeholder="璇疯緭鍏�" size="small" @blur="addTestNum"
- style="width:100px"
+ style="width:70px"
:disabled="packageInfo.radio===0||active!=1"></el-input>
</div>
</div>
@@ -99,6 +99,8 @@
<el-input v-model="scope.row.ask" placeholder="璇疯緭鍏�" size="small" :disabled="active!=1" v-if="!isAskOnlyRead"></el-input>
<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>
@@ -478,7 +480,7 @@
this.fiberList.push(b)
})
}
-
+
}else{
this.fiberList = []
a.fiber.forEach(b=>{
@@ -487,7 +489,7 @@
}
})
}
-
+
this.getTypeDicts1()
this.getStandTreeBySampleType()
this.getStandTreeBySampleType2()
@@ -513,7 +515,7 @@
}
})
})
-
+
}
if(this.detectionItems.type == 0) {
// 璧嬪�兼娴嬮」淇℃伅 鍏夌氦
@@ -584,7 +586,7 @@
this.fiberList = []
this.fibersList = []
this.detectionItems = []
-
+
// 椤甸潰鏄惁鍚湁鍏夌氦甯�
if(this.packageInfo.ismiers) {
// 鍏ㄦ
@@ -627,8 +629,8 @@
}
}
-
-
+
+
},
upNum() {
this.fiberList = []
@@ -689,7 +691,7 @@
}
a.fibers.push(fibers)
this.fibersList.push(fibers)
- }
+ }
})
} else {
this.bushing = []
@@ -763,7 +765,7 @@
// this.addFiber()
// }, 200)
// })
-
+
// 灏嗕笅鎷夋鍊艰祴鍊肩粰鍏夌氦 鐩戝惉鍘婚櫎
if(this.selectFiberList.length == 0) {
this.$message.error('璇烽�夋嫨鏁版嵁')
@@ -800,7 +802,7 @@
this.detectionType = 0
this.$set(this.detectionItems,'type',0)
}
-
+
})
},
methodChange2(val) {
@@ -897,7 +899,7 @@
fibersIdent: a.ident,
productList: []
}
- this.fiberList.push(fiber)
+ this.fiberList.push(fiber)
}
})
} else {
@@ -918,7 +920,7 @@
})
}
}else {
- this.fiberList = []
+ this.fiberList = []
let flag = true
// 鎸夌収椤哄簭鐢熸垚鍏夌氦鑹叉爣
let colors2 = []
@@ -960,7 +962,7 @@
// this.$message.error('鏈�夋嫨濂楃')
// return
// }
- // this.fiberList = []
+ // this.fiberList = []
// let flag = true
// // 鎸夌収椤哄簭鐢熸垚鍏夌氦鑹叉爣
// let colors2 = []
@@ -1111,7 +1113,7 @@
}else if (type == 0){
this.detectionItems = []
this.detectionItems = row.productList
- }
+ }
// if(type == 1) {
// if((row.model == null || row.model == '') && (row.standard == null || row.standard == '')){
// this.detectionItems = []
@@ -1144,11 +1146,11 @@
// let product = JSON.parse(JSON.stringify(row.productList))
// setTimeout(() => {
// product.forEach(p => {
- // let rowToSelect = this.detectionItems.find(item => item.id === p.id);
- // if (rowToSelect) {
+ // let rowToSelect = this.detectionItems.find(item => item.id === p.id);
+ // if (rowToSelect) {
// this.toggleSelection(rowToSelect);
// }
- // });
+ // });
// },200)
// }
// }
@@ -1169,7 +1171,7 @@
// }
// this.$axios.post(this.$api.standardTree.selectStandardProductList, {
// model: this.mireModel.split(' - ')[1],
- // standardMethodListId: this.mireStandard,
+ // standardMethodListId: this.mireStandard,
// factory: ''
// }, {
// headers: {
@@ -1184,16 +1186,16 @@
// 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))
+
+ // if (row.productList != null && row.productList.length > 0) {
+ // let product = JSON.parse(JSON.stringify(row.productList))
// setTimeout(() => {
- // product.forEach(p => {
- // let rowToSelect = this.detectionItems.find(item => item.id === p.id);
- // if (rowToSelect) {
+ // product.forEach(p => {
+ // let rowToSelect = this.detectionItems.find(item => item.id === p.id);
+ // if (rowToSelect) {
// this.toggleSelection(rowToSelect);
- // }
- // });
+ // }
+ // });
// },200)
// }
// }
--
Gitblit v1.9.3