Commit 770cf44a authored by wangwenjie's avatar wangwenjie

修改

parent 87d832fc
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
<p class="info-row"> <p class="info-row">
<span class="Titles">机台号:</span> <span class="Titles">机台号:</span>
<span class="Conts">{{ item.boxBarProductLineDeviceCode }}</span> <span class="Conts">{{ item.boxBarProductLineDeviceName }}</span>
</p> </p>
<p class="info-row"> <p class="info-row">
<span class="Titles">关联时间:</span> <span class="Titles">关联时间:</span>
...@@ -79,9 +79,9 @@ export default { ...@@ -79,9 +79,9 @@ export default {
this.queryQrCode(qrCode); this.queryQrCode(qrCode);
}); });
ScanOverlay.show('请扫描二维码') ScanOverlay.show('请扫描二维码')
// this.queryQrCode("HTTPS://Y2WM.CN/99.1000.1/AC1018057002R0AX2ZLRVEL4EKAQ40D9M"); // this.queryQrCode("HTTPS://Y2WM.CN/99.1000.1/AC1018057002RZXHCOTISPLXZLXNEDGAC");
// setTimeout(()=>{ // setTimeout(()=>{
// this.queryQrCode("HTTPS://Y2WM.CN/99.1000.1/AC1018057002RZKUOKW5NJADMC7TXYK6R"); // this.queryQrCode("HTTPS://Y2WM.CN/99.1000.1/AC1018057002RCMCCET9NYLAYVIS6FIPX");
// },5000) // },5000)
}, },
data() { data() {
......
...@@ -215,6 +215,7 @@ export default { ...@@ -215,6 +215,7 @@ export default {
qrCode: resData.qrCode || "", qrCode: resData.qrCode || "",
relationTime: resData.relationTime || "", relationTime: resData.relationTime || "",
barPieceProductLineDeviceCode: resData.barPieceProductLineDeviceCode || "", barPieceProductLineDeviceCode: resData.barPieceProductLineDeviceCode || "",
barPieceProductLineDeviceName: resData.barPieceProductLineDeviceName || "",
barPieceProductLineName: resData.barPieceProductLineName || "", barPieceProductLineName: resData.barPieceProductLineName || "",
num: resData.childrenList.length || "", num: resData.childrenList.length || "",
childrenList: resData.childrenList || [] childrenList: resData.childrenList || []
...@@ -282,7 +283,7 @@ export default { ...@@ -282,7 +283,7 @@ export default {
// 检查条码是否属于当前选择的机台号 // 检查条码是否属于当前选择的机台号
const scannedItem = this.data.childrenList.find(item => const scannedItem = this.data.childrenList.find(item =>
item.qrCode === scannedQrCode && item.qrCode === scannedQrCode &&
item.boxBarProductLineDeviceCode === this.fieldValue item.boxBarProductLineDeviceName === this.fieldValue
); );
if (!scannedItem) { if (!scannedItem) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment