From d123ca35bb3ec4982af44aeb1ffffa8a3569a21b Mon Sep 17 00:00:00 2001
From: zjh <2207896513@qq.com>
Date: 星期五, 25 七月 2025 13:25:22 +0800
Subject: [PATCH] 代码提交
---
pages/QC/LLJ/ScanCode.vue | 87 +++++++++++++++++++----------
pages/QC/LLJ/List.vue | 24 +++++++
pages/QC/LLJ/yzxFrom.vue | 16 ++--
3 files changed, 88 insertions(+), 39 deletions(-)
diff --git a/pages/QC/LLJ/List.vue b/pages/QC/LLJ/List.vue
index 73ab441..2efb071 100644
--- a/pages/QC/LLJ/List.vue
+++ b/pages/QC/LLJ/List.vue
@@ -131,9 +131,15 @@
<view class="meta-info" v-if="item.activeTab==0">
<text class="meta-item"><uni-icons type="calendar" size="14" color="#95a5a6"></uni-icons>
- {{item.createDate}}</text>
+ 鍒涘缓锛歿{item.createDate}}</text>
+
<text class="meta-item"><uni-icons type="person" size="14" color="#95a5a6"></uni-icons>
{{item.userName}}</text>
+ </view>
+ <view class="meta-info" v-if="item.activeTab==0 && item.arrivalDate!=null">
+ <text class="meta-item"><uni-icons type="calendar" size="14" color="#95a5a6"></uni-icons>
+ 鍒拌揪锛歿{item.arrivalDate}}</text>
+
</view>
<!-- 鏌ョ湅鏃舵樉绀烘楠屽畬鎴愮殑鏁版嵁 -->
<view class="meta-info" v-if="item.activeTab==1">
@@ -320,6 +326,22 @@
url: 'Add?id=' + item.id + '&lotNo=' + item.lotNo + '&releaseNo=' + item.releaseNo +
'¤t=A'
})
+ // uni.showModal({
+ // title: '寮�濮嬫楠�',
+ // content: '寮�濮嬫楠屽皢璁板綍褰撳墠鏃堕棿涓哄紑濮嬫楠屾椂闂达紝纭畾寮�濮嬶紵',
+ // success: function(res) {
+ // if (res.confirm) {
+ // uni.navigateTo({
+ // url: 'Add?id=' + item.id + '&lotNo=' + item.lotNo + '&releaseNo=' + item.releaseNo +
+ // '¤t=A'
+ // })
+ // } else {
+
+ // }
+ // }
+ // })
+
+
}
},
diff --git a/pages/QC/LLJ/ScanCode.vue b/pages/QC/LLJ/ScanCode.vue
index e869a76..cb3e460 100644
--- a/pages/QC/LLJ/ScanCode.vue
+++ b/pages/QC/LLJ/ScanCode.vue
@@ -2,14 +2,14 @@
<view class="container">
<!-- 涓诲唴瀹瑰尯 -->
<!-- <view class="scan-container"> -->
- <text class="main-title">鏉ユ枡鎵爜妫�楠�</text>
- <text class="subtitle">璇峰鍑嗙墿鏂欐潯鐮侊紝淇濇寔10-15cm璺濈</text>
- <!-- 鎵弿妗� -->
- <view class="scan-box" @click="startScan">
- <view class="scan-line" :style="{top: linePosition + '%'}"></view>
- </view>
- <!-- 鎵嬪姩杈撳叆 -->
- <!-- <button class="manual-input" @click="showManualInput">鎵嬪姩杈撳叆鏉＄爜</button> -->
+ <text class="main-title">鏉ユ枡鎵爜妫�楠�</text>
+ <text class="subtitle">璇峰鍑嗙墿鏂欐潯鐮侊紝淇濇寔10-15cm璺濈</text>
+ <!-- 鎵弿妗� -->
+ <view class="scan-box" @click="startScan">
+ <view class="scan-line" :style="{top: linePosition + '%'}"></view>
+ </view>
+ <!-- 鎵嬪姩杈撳叆 -->
+ <!-- <button class="manual-input" @click="showManualInput">鎵嬪姩杈撳叆鏉＄爜</button> -->
<!-- </view> -->
<!-- 鎵嬪姩杈撳叆寮圭獥 -->
<!-- <uni-popup ref="inputPopup" type="dialog">
@@ -18,7 +18,7 @@
</uni-popup> -->
</view>
</template>
-
+
<script>
export default {
data() {
@@ -62,36 +62,63 @@
data: {
Barcode: code
}
- }).then(ress => {
- if (ress.data.tbBillList.length > 0) {
+ }).then(ress => {
+ if (ress.status == 0) {
+ if (ress.data.tbBillList.length > 0) {
- if (ress.data.tbBillList[0].fsubmit === 1) {
+ if (ress.data.tbBillList[0].fsubmit === 1) {
- uni.navigateTo({
- url: 'Add?id=' + ress.data.tbBillList[0].id + '&lotNo=' + ress.data
- .tbBillList[0].lotNo + '&releaseNo=' + ress.data.tbBillList[0]
- .releaseNo +
- '¤t=B'
- })
+ uni.navigateTo({
+ url: 'Add?id=' + ress.data.tbBillList[0].id + '&lotNo=' + ress.data
+ .tbBillList[0].lotNo + '&releaseNo=' + ress.data.tbBillList[0]
+ .releaseNo +
+ '¤t=B'
+ })
+ } else {
+ uni.navigateTo({
+ url: 'Add?id=' + ress.data.tbBillList[0].id + '&lotNo=' + ress.data
+ .tbBillList[0].lotNo + '&releaseNo=' + ress.data.tbBillList[0]
+ .releaseNo +
+ '¤t=A'
+ })
+
+
+ // uni.showModal({
+ // title: '寮�濮嬫楠�',
+ // content: '寮�濮嬫楠屽皢璁板綍褰撳墠鏃堕棿涓哄紑濮嬫楠屾椂闂达紝纭畾寮�濮嬶紵',
+ // success: function(res) {
+ // if (res.confirm) {
+ // uni.navigateTo({
+ // url: 'Add?id=' + ress.data.tbBillList[0].id + '&lotNo=' + ress.data
+ // .tbBillList[0].lotNo + '&releaseNo=' + ress.data.tbBillList[0]
+ // .releaseNo +
+ // '¤t=A'
+ // })
+ // } else {
+
+ // }
+ // }
+ // })
+ }
+
} else {
-
- uni.navigateTo({
- url: 'Add?id=' + ress.data.tbBillList[0].id + '&lotNo=' + ress.data
- .tbBillList[0].lotNo + '&releaseNo=' + ress.data.tbBillList[0]
- .releaseNo +
- '¤t=A'
+ uni.showModal({
+ title: '鎵爜閿欒',
+ content: '鏈煡璇㈠埌鏉＄爜銆�' + code + '銆戠浉鍏冲崟鎹唴瀹�',
+ showCancel: false
})
+ //showScanError('鎻愮ず锛氭湭鏌ヨ鍒版潯鐮併��' + res.result + '銆戠浉鍏冲崟鎹唴瀹�')
+ //this.msg = '鎻愮ず锛氭湭鏌ヨ鍒版潯鐮併��' + res.result + '銆戠浉鍏冲崟鎹唴瀹�'
}
-
} else {
+ console.log(ress.data.message);
uni.showModal({
- title: '鎵爜閿欒',
- content: '鏈煡璇㈠埌鏉＄爜銆�' + code + '銆戠浉鍏冲崟鎹唴瀹�',
+ title: '鎻愮ず',
+ content: ress.message,
showCancel: false
})
- //showScanError('鎻愮ず锛氭湭鏌ヨ鍒版潯鐮併��' + res.result + '銆戠浉鍏冲崟鎹唴瀹�')
- //this.msg = '鎻愮ず锛氭湭鏌ヨ鍒版潯鐮併��' + res.result + '銆戠浉鍏冲崟鎹唴瀹�'
}
+
})
},
@@ -102,7 +129,7 @@
// 纭鎵嬪姩杈撳叆
confirmManualInput(value) {
-
+
this.handleScanResult(value)
},
diff --git a/pages/QC/LLJ/yzxFrom.vue b/pages/QC/LLJ/yzxFrom.vue
index 9b41d5c..59fcbb9 100644
--- a/pages/QC/LLJ/yzxFrom.vue
+++ b/pages/QC/LLJ/yzxFrom.vue
@@ -181,14 +181,14 @@
}
},
validateForm() {
- for (const item of this.components) {
- if (item.selectedSpec === -1 || item.selectedMfg === -1) {
- return {
- valid: false,
- msg: `${item.name} 鏈畬鎴愰�夋嫨`
- }
- }
- }
+ // for (const item of this.components) {
+ // if (item.selectedSpec === -1 || item.selectedMfg === -1) {
+ // return {
+ // valid: false,
+ // msg: `${item.name} 鏈畬鎴愰�夋嫨`
+ // }
+ // }
+ // }
return { valid: true }
},
onLoad(options) {
--
Gitblit v1.9.3