From f9e93380e5192b35943769950c698c50b86febb6 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期五, 13 九月 2024 08:41:21 +0800
Subject: [PATCH] #
---
pages/pakin/pakin.vue | 146 ++++++++++++++++++++----------------------------
1 files changed, 60 insertions(+), 86 deletions(-)
diff --git a/pages/pakin/pakin.vue b/pages/pakin/pakin.vue
index f5b5a30..ff6b206 100644
--- a/pages/pakin/pakin.vue
+++ b/pages/pakin/pakin.vue
@@ -2,18 +2,13 @@
<view>
<view class="code">
<view class="item">
- <view class="code-decs">鎵樼洏鐮�:</view>
+ <view class="code-decs">绠辩爜:</view>
<input type="text" placeholder=" 鎵爜 / 杈撳叆" v-model="barcode" :focus="barcodeFocus"
@input="barcodeInput()">
</view>
<view class="item">
- <view class="code-decs">鐗╂枡鐮�:</view>
- <input type="text" placeholder=" 鎵爜 / 杈撳叆" v-model="matnr" :focus="matFocus" @input="findMat()">
- <view class="item-right">
- <button></button>
- <text style="text-align: right;color: #409EFF;" @click="selectMat()">鎻愬彇+</text>
- <uni-icons type="right" color="#c1c1c1"></uni-icons>
- </view>
+ <view class="code-decs">鍝佺暘浜岀淮鐮�:</view>
+ <input type="text" placeholder=" 鎵爜 / 杈撳叆" v-model="matnr" :focus="matFocus" @input="findMat()" maxlength="600">
</view>
</view>
<view class="mat-list-title">
@@ -29,10 +24,10 @@
<view class="list-left-item">
<view class="desc">缂栫爜锛�</view>
<view class="left-item">
- <uni-tag :text="item.matnr" type="primary"></uni-tag>
+ <uni-tag :text="item.threeCode" type="primary"></uni-tag>
</view>
</view>
- <view class="list-left-item">
+ <!-- <view class="list-left-item">
<view class="desc">鍝佸悕锛�</view>
<view class="left-item">{{item.maktx}}</view>
</view>
@@ -45,17 +40,17 @@
<view class="left-item">
<uni-tag :text="item.batch" type="warning"></uni-tag>
</view>
- </view>
- <view class="list-left-item">
+ </view> -->
+ <!-- <view class="list-left-item">
<view class="desc">閲嶉噺锛�</view>
<view class="left-item">
<uni-tag :text="item.weight" type="warning"></uni-tag>
</view>
- </view>
- <view class="list-left-item">
+ </view> -->
+ <!-- <view class="list-left-item">
<view class="desc">鏁伴噺锛�</view>
<view class="left-item">{{item.anfme}}</view>
- </view>
+ </view> -->
</view>
<view class="list-right">
<uni-icons type="compose" color="#9add8b" size="24" @click="revise(item,i)"></uni-icons>
@@ -66,7 +61,7 @@
<!-- 搴曢儴鎿嶄綔鎸夐挳 -->
<view class="buttom">
<button size="mini" @click="reset('warn')">閲嶇疆</button>
- <button size="mini" type="primary" @click="combConfirm('warn')">缁勬墭</button>
+ <button size="mini" type="primary" @click="comb()">缁勬墭</button>
</view>
<!-- 寮圭獥 -->
<!-- 淇敼鏁伴噺 -->
@@ -82,14 +77,14 @@
style="background-color: #f7f7f7;padding: 0;color: #d5d5d5;">
</view>
</view>
- <!-- <view class="popup-item">
+ <view class="popup-item">
<view class="popup-item-left">鎵瑰彿:</view>
<view class="popup-item-right"><input type="text" v-model="batch"></view>
- </view> -->
- <view class="popup-item">
+ </view>
+ <!-- <view class="popup-item">
<view class="popup-item-left">閲嶉噺:</view>
<view class="popup-item-right"><input type="text" v-model="weight"></view>
- </view>
+ </view> -->
<view class="popup-item">
<view class="popup-item-left">鏁伴噺:</view>
<view class="popup-item-right" style="border: none;justify-content: center;">
@@ -135,6 +130,8 @@
</template>
<script>
+ import {setCurrentDeviceAction} from '../../static/js/PresetsPda.js'
+ import {initScan,startScan,stopScan} from '../../static/js/scanModule.js'
export default {
data() {
return {
@@ -173,23 +170,25 @@
// barcode input 浜嬩欢
barcodeInput() {
// 涓嶈缃畾鏃跺櫒 浼氬嚭鐜版壂鍏ョ殑瀛楃涓蹭笉鍏�
- setTimeout(() => {
- var len = this.barcode.length
- if (len != 8) {
- uni.showToast({
- title: '鎵樼洏鐮佹湁璇閲嶈瘯',
- icon: "none",
- position: 'top'
- });
- this.barcodeFocuss()
- return;
- }
- this.focuss()
- }, 200)
+ // setTimeout(() => {
+ // var len = this.barcode.length
+ // if (len != 8) {
+ // uni.showToast({
+ // title: '鎵樼洏鐮佹湁璇閲嶈瘯',
+ // icon: "none",
+ // position: 'top'
+ // });
+ // this.barcodeFocuss()
+ // return;
+ // }
+ // this.focuss()
+ // }, 200)
+ this.focuss()
},
// 鎵樼洏鐮佹湁璇噸缃�
barcodeFocuss() {
let that = this;
+ this.matFocus = false;
that.barcodeFocus = false;
setTimeout(() => {
that.barcode = '';
@@ -198,7 +197,7 @@
},
// 鍟嗗搧鍏夋爣娓呯┖閲嶇疆
focuss() {
- this.focus = false;
+ this.matFocus = false;
setTimeout(() => {
this.matnr = '';
this.matFocus = true;
@@ -206,59 +205,32 @@
},
// 鎼滅储鐗╂枡
findMat() {
- let that = this
- uni.request({
- url: that.baseUrl + '/mat/auth',
- data: {
- matnr: that.matnr
- },
- header: {
- 'token': uni.getStorageSync('token')
- },
- success(result) {
- result = result.data
- if (result.code === 200 && result.data) {
- that.matData = result.data
- that.matnr = ''
- that.matData['batch'] = ''
- uni.navigateTo({
- url: "../mat/matSelected",
- // 閫氳繃eventChannel鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹�
- success: function(res) {
- res.eventChannel.emit('mat', {
- data: result.data
- })
- },
- // 涓烘寚瀹氫簨浠舵坊鍔犱竴涓洃鍚櫒锛岃幏鍙栬鎵撳紑椤甸潰浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹�
- events: {
- matList: function(data) {
- that.checkMat(data.data)
- that.focuss()
- },
- },
- });
- } else if (result.code == 403) {
- uni.showToast({
- title: result.msg,
- icon: "none",
- position: 'top'
- })
- setTimeout(() => {
- uni.reLaunch({
- url: '../login/login'
- });
- }, 1000);
- } else {
- uni.showToast({
- title: result.msg,
- icon: "none",
- position: 'top'
- })
+ let _this = this
+ initScan();
+ startScan();
+ let item = {}
+ uni.$on("SCAN_CODE", ({code}) => {
+ console.log(code);
+ item['threeCode'] = code
+ if (_this.dataList.length > 0) {
+ let add = false
+ for (let k of _this.dataList) {
+ if (code == k.threeCode) {
+ add = false
+ } else {
+ add = true
+ }
}
-
+ if (add) {
+ _this.dataList.unshift(item)
+ }
+ } else {
+ _this.dataList.unshift(item)
}
+ _this.focuss()
+ // code灏辨槸鎵爜鐨勭粨鏋� 鎺ヤ笅鏉ュ啓涓氬姟闇�姹�
});
-
+
},
selectMat() {
let that = this
@@ -431,8 +403,10 @@
// 纭閲嶇疆
resetConfirm() {
this.dataList = []
+ this.barcode = ''
this.messageText = "閲嶇疆瀹屾垚"
this.messageToggle('success')
+ this.barcodeFocuss()
},
// 鍙栨秷閲嶇疆
resetClose() {
@@ -479,7 +453,7 @@
.code-decs {
width: 20vw;
- font-size: 18px;
+ font-size: 14px;
color: #303133;
}
@@ -500,4 +474,4 @@
text-align: center;
box-shadow: 0px 0px 10px 0px rgba(0, 0, 0, 0.2);
}
-</style>
+</style>
\ No newline at end of file
--
Gitblit v1.9.1