From 9382f2c611581996c9b015abeb079891acbddde4 Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期四, 11 十二月 2025 17:56:19 +0800
Subject: [PATCH] Merge branch 'jsxswms-app' of http://47.97.1.152:5880/r/wms_app into jsxswms-app
---
pages/AGV/CollectionPakin.vue | 1053 ++++++++++++++++++++++++++++++++-------------------------
1 files changed, 592 insertions(+), 461 deletions(-)
diff --git a/pages/AGV/CollectionPakin.vue b/pages/AGV/CollectionPakin.vue
index b10ebfb..60f7ce6 100644
--- a/pages/AGV/CollectionPakin.vue
+++ b/pages/AGV/CollectionPakin.vue
@@ -2,528 +2,659 @@
<view>
<view class="code">
<view class="item">
- <view class="code-decs">鎵樼洏鐮�:</view>
- <input type="text" placeholder=" 鎵爜 / 杈撳叆" v-model="barcode" :focus="barcodeFocus"
- @input="barcodeInput()">
+ <view class="code-decs">婧愭墭鐩�:</view>
+ <input
+ type="text"
+ placeholder=" 鎵爜 / 杈撳叆"
+ v-model="orgBarcode"
+ :focus="orgBarcodeFocus"
+ @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="tarBarcode"
+ :focus="tarBarcodeFocus"
+ />
</view>
- <!-- <view class="item">
- <view class="code-decs">婊℃墭:</view>
- <radio-group @change="isFrozen">
- <label>
- <radio :checked="ck1" style="margin-left: 10rpx;"/><text>鏄�</text>
- </label>
- <label>
- <radio :checked="ck2" style="margin-left: 50rpx;"/><text>鍚�</text>
- </label>
- </radio-group>
- </view> -->
+ <view class="item">
+ <view class="code-decs">绔欑偣鍙�:</view>
+ <input
+ type="text"
+ placeholder=" 鎵爜 / 杈撳叆"
+ v-model="devNo"
+ />
+ </view>
</view>
- <view class="mat-list-title">
- 鍟嗗搧鍒楄〃
- </view>
- <scroll-view>
- <view class="list" v-for="(item,i) in dataList" :key="i">
+ <view class="mat-list-title">鍟嗗搧鍒楄〃</view>
+ <scroll-view scroll-y>
+ <view
+ class="list"
+ v-for="(item, index) in dataList"
+ :key="index"
+ >
<view class="list-left">
<view class="list-left-item">
<view class="desc">No锛�</view>
- <view class="left-item">{{i + 1}}</view>
+ <view class="left-item">{{ index + 1 }}</view>
</view>
<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.matnr"
+ type="primary"
+ ></uni-tag>
</view>
</view>
<view class="list-left-item">
<view class="desc">鍝佸悕锛�</view>
- <view class="left-item" style="word-break: break-all;">{{item.maktx}}</view>
+ <uni-tooltip
+ class="left-item"
+ :content="item.maktx"
+ placement="bottom"
+ >
+ <view
+ class="left-item tip"
+ style=""
+ >
+ {{ item.maktx }}
+ </view>
+ </uni-tooltip>
</view>
<view class="list-left-item">
<view class="desc">瑙勬牸锛�</view>
- <view class="left-item">{{item.specs}}</view>
+ <view class="left-item">{{ item.specs }}</view>
</view>
<view class="list-left-item">
<view class="desc">渚涘簲鍟嗭細</view>
<view class="left-item">
- <uni-tag :text="item.standby1" type="warning"></uni-tag>
+ <uni-tag
+ :text="item.standby1"
+ type="warning"
+ ></uni-tag>
</view>
</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 class="desc">鏁伴噺锛�</view>
- <view class="left-item">{{item.anfme}}</view>
+ <view class="left-item">{{ item.anfme }}</view>
+ </view>
+ <view class="list-left-item">
+ <view class="desc">鎷ｈ揣鏁伴噺:</view>
+ <view
+ class="left-item"
+ style="border: none; justify-content: center"
+ >
+ <uni-number-box
+ v-model="item.workQty"
+ :max="item.anfme"
+ color="#747474"
+ />
+ </view>
</view>
</view>
<view class="list-right">
- <uni-icons type="compose" color="#9add8b" size="24" @click="revise(item,i)"></uni-icons>
- <uni-icons type="trash" color="#f58a8a" size="24" @click="remove(item,i,'warn')"></uni-icons>
+ <uni-icons
+ type="trash"
+ color="#f58a8a"
+ size="24"
+ @click="remove(index)"
+ ></uni-icons>
</view>
+ </view>
+ <!-- 绌虹姸鎬佹彁绀� -->
+ <view
+ v-if="dataList.length === 0"
+ class="empty-tips"
+ >
+ 鏆傛棤鍟嗗搧锛岃鎵爜娣诲姞
</view>
</scroll-view>
<!-- 搴曢儴鎿嶄綔鎸夐挳 -->
<view class="buttom">
- <button size="mini" @click="reset('warn')">閲嶇疆</button>
- <button size="mini" type="primary" @click="combConfirm('warn')">缁勬墭</button>
+ <button
+ size="mini"
+ @click="reset"
+ >
+ 閲嶇疆
+ </button>
+ <button
+ size="mini"
+ type="primary"
+ @click="combConfirm"
+ >
+ 缁勬墭
+ </button>
</view>
- <!-- 寮圭獥 -->
- <!-- 淇敼鏁伴噺 -->
- <view>
- <uni-popup ref="revise" type="dialog">
- <view class="popup">
- <!-- 鏍囬 -->
- <view class="title">淇敼</view>
- <view class="popup-item">
- <view class="popup-item-left">缂栫爜:</view>
- <view class="popup-item-right">
- <input type="text" v-model="matnr" disabled="true"
- style="background-color: #f7f7f7;padding: 0;color: #d5d5d5;">
- </view>
- </view>
- <view class="popup-item">
- <view class="popup-item-left">浠ｇ爜:</view>
- <view class="popup-item-right"><input type="text" v-model="standby1"></view>
- </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 class="popup-item">
- <view class="popup-item-left">鏁伴噺:</view>
- <view class="popup-item-right" style="border: none;justify-content: center;">
- <uni-number-box :value="count" :step='0.01' :max="9999999" color="#747474"
- @change="changeValue" />
- </view>
- </view>
- <view class="btn">
- <view class="btn-left" @click="reviseClose">鍙栨秷</view>
- <view class="btn-right" @click="reviseConfirm()">淇敼</view>
+
+ <!-- 淇敼鏁伴噺寮圭獥 -->
+ <uni-popup
+ ref="revisePopup"
+ type="dialog"
+ >
+ <view class="popup">
+ <view class="title">淇敼</view>
+ <view class="popup-item">
+ <view class="popup-item-left">缂栫爜:</view>
+ <view class="popup-item-right">
+ <input
+ type="text"
+ v-model="editForm.matnr"
+ disabled
+ style="
+ background-color: #f7f7f7;
+ padding: 0;
+ color: #d5d5d5;
+ "
+ />
</view>
</view>
- </uni-popup>
- </view>
- <!-- 绉婚櫎纭 -->
- <view>
- <!-- 鎻愮ず绐楃ず渚� -->
- <uni-popup ref="alertDialog" type="dialog">
- <uni-popup-dialog :type="msgType" confirmText="绉婚櫎" :title="title" :content="content"
- @confirm="removeConfirm()" @close="removeClose"></uni-popup-dialog>
- </uni-popup>
- </view>
- <view>
- <!-- 鎻愮ず淇℃伅寮圭獥 -->
- <uni-popup ref="message" type="message">
- <uni-popup-message :type="msgType1" :message="messageText" :duration="2000"></uni-popup-message>
- </uni-popup>
- </view>
- <!-- 纭缁勬墭 -->
- <view>
- <uni-popup ref="combConfirm" type="dialog">
- <uni-popup-dialog :type="msgType" cancelText="鍙栨秷" confirmText="纭" :title="title" :content="content"
- @confirm="comb" @close="combClose"></uni-popup-dialog>
- </uni-popup>
- </view>
- <!-- 纭閲嶇疆 -->
- <view>
- <uni-popup ref="resetConfirm" type="dialog">
- <uni-popup-dialog :type="msgType" cancelText="鍙栨秷" confirmText="纭" :title="title" :content="content"
- @confirm="resetConfirm" @close="resetClose"></uni-popup-dialog>
- </uni-popup>
- </view>
+ <view class="popup-item">
+ <view class="popup-item-left">浠ｇ爜:</view>
+ <view class="popup-item-right">
+ <input
+ type="text"
+ v-model="editForm.standby1"
+ />
+ </view>
+ </view>
+ <view class="popup-item">
+ <view class="popup-item-left">鏁伴噺:</view>
+ <view
+ class="popup-item-right"
+ style="border: none; justify-content: center"
+ >
+ <uni-number-box
+ :value="editForm.count"
+ :step="0.01"
+ :max="9999999"
+ color="#747474"
+ @change="changeValue"
+ />
+ </view>
+ </view>
+ <view class="btn">
+ <view
+ class="btn-left"
+ @click="reviseClose"
+ >
+ 鍙栨秷
+ </view>
+ <view
+ class="btn-right"
+ @click="reviseConfirm"
+ >
+ 淇敼
+ </view>
+ </view>
+ </view>
+ </uni-popup>
+
+ <!-- 绉婚櫎纭寮圭獥 -->
+ <uni-popup
+ ref="removeDialog"
+ type="dialog"
+ >
+ <uni-popup-dialog
+ type="warn"
+ confirmText="绉婚櫎"
+ title="璀﹀憡"
+ content="鏄惁绉婚櫎褰撳墠鍟嗗搧!"
+ @confirm="removeConfirm"
+ @close="removeClose"
+ ></uni-popup-dialog>
+ </uni-popup>
+
+ <!-- 娑堟伅鎻愮ず -->
+ <uni-popup
+ ref="message"
+ type="message"
+ >
+ <uni-popup-message
+ :type="msgType"
+ :message="messageText"
+ :duration="2000"
+ ></uni-popup-message>
+ </uni-popup>
+
+ <!-- 纭缁勬墭寮圭獥 -->
+ <uni-popup
+ ref="combDialog"
+ type="dialog"
+ >
+ <uni-popup-dialog
+ type="warn"
+ cancelText="鍙栨秷"
+ confirmText="纭"
+ title="璀﹀憡"
+ content="鏄惁鐜板湪缁勬墭!"
+ @confirm="comb"
+ @close="combClose"
+ ></uni-popup-dialog>
+ </uni-popup>
+
+ <!-- 纭閲嶇疆寮圭獥 -->
+ <uni-popup
+ ref="resetDialog"
+ type="dialog"
+ >
+ <uni-popup-dialog
+ type="warn"
+ cancelText="鍙栨秷"
+ confirmText="纭"
+ title="璀﹀憡"
+ content="鏄惁閲嶇疆!"
+ @confirm="resetConfirm"
+ @close="resetClose"
+ ></uni-popup-dialog>
+ </uni-popup>
</view>
</template>
<script>
- export default {
- data() {
- return {
- baseUrl: '',
- token: '',
- barcode: '',
- dataList: [],
- count: 0,
- rowNum: '',
+export default {
+ data() {
+ return {
+ baseUrl: '',
+ token: '',
+ orgBarcode: '',
+ tarBarcode: '',
+ dataList: [],
+ orgBarcodeFocus: true,
+ tarBarcodeFocus: false,
+ devNo: '',
+ // 缂栬緫琛ㄥ崟
+ editForm: {
+ index: -1,
matnr: '',
- batch: '',
+ standby1: '',
weight: '',
- msgType1: 'success',
- msgType: 'success',
- messageText: '',
- title: '',
- content: '',
- barcodeFocus: true,
- matFocus: false,
- matData: '',
- removeNum: 0,
- ck1: true,
- ck2: false,
- isFull: true,
- standby1: ''
+ count: 0
+ },
+ // 寰呯Щ闄ら」绱㈠紩
+ removeIndex: -1,
+ // 娑堟伅鎻愮ず
+ msgType: 'success',
+ messageText: '',
+ // 缁勬墭鎸夐挳闃叉姈
+ isCombing: false
+ }
+ },
+
+ onShow() {
+ this.baseUrl = uni.getStorageSync('baseUrl')
+ this.token = uni.getStorageSync('token')
+ },
+
+ methods: {
+ itemWorkQtyChange(item) {},
+ // 鏄剧ず娑堟伅鎻愮ず
+ showMessage(text, type = 'success') {
+ this.msgType = type
+ this.messageText = text
+ this.$refs.message.open()
+ },
+
+ // 閲嶇疆鍏夋爣鐒︾偣
+ resetFocus(field) {
+ this[field] = false
+ setTimeout(() => {
+ this[field] = true
+ }, 100)
+ },
+
+ // 澶勭悊鎺堟潈閿欒
+ handleAuthError(msg) {
+ this.showMessage(msg, 'error')
+ setTimeout(() => {
+ uni.reLaunch({ url: '../login/login' })
+ }, 1000)
+ },
+
+ // 婧愭墭鐩樿緭鍏ヤ簨浠�
+ barcodeInput() {
+ setTimeout(() => {
+ const len = this.orgBarcode.length
+ if (len > 0 && len < 8) {
+ uni.showToast({
+ title: '鎵樼洏鐮佹湁璇閲嶈瘯',
+ icon: 'none',
+ position: 'top'
+ })
+ this.orgBarcode = ''
+ this.resetFocus('orgBarcodeFocus')
+ return
+ }
+ this.resetFocus('tarBarcodeFocus')
+ }, 200)
+ this.search()
+ },
+ search() {
+ let that = this
+ uni.request({
+ url: that.baseUrl + '/mobile/agv/collectionPakin/view',
+ header: {
+ token: uni.getStorageSync('token')
+ },
+ data: JSON.stringify({
+ orgBarcode: that.orgBarcode
+ }),
+ method: 'POST',
+ success(res) {
+ res = res.data
+ if (res.code === 200) {
+ that.dataList = res.data.map((item) => ({
+ ...item,
+ workQty: item.anfme
+ }))
+ } else if (res.code == 403) {
+ that.messageText = res.msg
+ that.messageToggle('error')
+ setTimeout(() => {
+ uni.reLaunch({
+ url: '../login/login'
+ })
+ }, 1000)
+ } else {
+ that.showMessage(res.msg, 'error')
+ }
+ }
+ })
+ },
+ // 鎼滅储鐗╂枡
+ findMat() {
+ if (!this.tarBarcode) return
+
+ setTimeout(() => {
+ uni.request({
+ url: `${this.baseUrl}/mat/auth`,
+ data: { matnr: this.tarBarcode },
+ header: { token: this.token },
+ success: (result) => {
+ const res = result.data
+ if (res.code === 200 && res.data) {
+ this.navigateToMatSelect(res.data)
+ } else if (res.code === 403) {
+ this.handleAuthError(res.msg)
+ } else {
+ uni.showToast({
+ title: res.msg,
+ icon: 'none',
+ position: 'top'
+ })
+ }
+ }
+ })
+ }, 200)
+ },
+
+ // 璺宠浆鐗╂枡閫夋嫨椤�
+ navigateToMatSelect(matData) {
+ matData.batch = ''
+ uni.navigateTo({
+ url: '../mat/matSelected',
+ success: (res) => {
+ res.eventChannel.emit('mat', { data: [matData] })
+ },
+ events: {
+ matList: (data) => {
+ this.checkMat(data.data)
+ this.tarBarcode = ''
+ this.resetFocus('tarBarcodeFocus')
+ }
+ }
+ })
+ },
+
+ // 閫夋嫨鐗╂枡
+ selectMat() {
+ uni.navigateTo({
+ url: '../mat/matQuery',
+ success: (res) => {
+ res.eventChannel.emit('commonUrl', { commonUrl: '' })
+ },
+ events: {
+ acceptDataFromOpenedPage: (data) => {
+ this.tarBarcode = data.data
+ this.findMat()
+ }
+ }
+ })
+ },
+
+ // 妫�鏌ュ苟娣诲姞鐗╂枡
+ checkMat(mat) {
+ const existIndex = this.dataList.findIndex(
+ (item) => item.matnr === mat.matnr && item.batch === mat.batch
+ )
+
+ if (existIndex > -1) {
+ // 鐩稿悓鐗╂枡鐩稿悓鎵瑰彿锛屾暟閲忕疮鍔�
+ this.dataList[existIndex].anfme += mat.anfme
+ this.$forceUpdate()
+ } else {
+ // 鏂板鍒板垪琛ㄥご閮�
+ this.dataList.unshift(mat)
}
},
- onLoad() {
+ // 鎵撳紑淇敼寮圭獥
+ revise(index) {
+ const item = this.dataList[index]
+ this.editForm = {
+ index,
+ matnr: item.matnr,
+ standby1: item.standby1,
+ weight: item.weight,
+ count: item.anfme
+ }
+ this.$refs.revisePopup.open()
},
- onShow() {
- this.baseUrl = uni.getStorageSync('baseUrl');
- this.token = uni.getStorageSync('token');
+
+ // 鏁伴噺鍙樻洿
+ changeValue(value) {
+ this.editForm.count = value
},
- methods: {
- isFrozen() {
- this.isFull = !this.isFull
- console.log(this.isFull);
- },
- messageToggle(type) {
- this.msgType1 = type
- this.$refs.message.open()
- },
- // barcode input 浜嬩欢
- barcodeInput() {
- // 涓嶈缃畾鏃跺櫒 浼氬嚭鐜版壂鍏ョ殑瀛楃涓蹭笉鍏�
- setTimeout(() => {
- var len = this.barcode.length
- if (len >= 9 && len <= 8) {
- uni.showToast({
- title: '鎵樼洏鐮佹湁璇閲嶈瘯',
- icon: "none",
- position: 'top'
- });
- this.barcodeFocuss()
- return;
+
+ // 纭淇敼
+ reviseConfirm() {
+ const { index, count, standby1, weight } = this.editForm
+ this.dataList[index].anfme = count
+ this.dataList[index].standby1 = standby1
+ this.dataList[index].weight = weight
+ this.$refs.revisePopup.close()
+ this.showMessage('淇敼鎴愬姛')
+ },
+
+ // 鍏抽棴淇敼寮圭獥
+ reviseClose() {
+ this.$refs.revisePopup.close()
+ },
+
+ // 鎵撳紑绉婚櫎纭寮圭獥
+ remove(index) {
+ this.removeIndex = index
+ this.$refs.removeDialog.open()
+ },
+
+ // 纭绉婚櫎
+ removeConfirm() {
+ this.dataList.splice(this.removeIndex, 1)
+ this.showMessage('绉婚櫎鎴愬姛')
+ },
+
+ // 鍏抽棴绉婚櫎寮圭獥
+ removeClose() {
+ this.$refs.removeDialog.close()
+ },
+
+ // 鎵撳紑缁勬墭纭寮圭獥
+ combConfirm() {
+ if (!this.orgBarcode) {
+ this.showMessage('璇锋壂鎻忔簮鎵樼洏鏉＄爜', 'error')
+ return
+ }
+ if (this.dataList.length === 0) {
+ this.showMessage('璇锋坊鍔犲晢鍝佸垪琛�', 'error')
+ return
+ }
+ if (!this.tarBarcode) {
+ this.showMessage('璇锋壂鎻忕洰鏍囨墭鐩樻潯鐮�', 'error')
+ return
+ }
+ const invalidItem = this.dataList.find(
+ (item) => !item.anfme || item.anfme === 0
+ )
+ if (invalidItem) {
+ this.showMessage(
+ `${invalidItem.matnr} 缁勬墭鏁伴噺涓嶈兘涓�0`,
+ 'error'
+ )
+ return
+ }
+ this.$refs.combDialog.open()
+ },
+
+ // 鍏抽棴缁勬墭寮圭獥
+ combClose() {
+ this.$refs.combDialog.close()
+ },
+
+ // 鎵ц缁勬墭
+ comb() {
+ if (this.isCombing) return
+ this.isCombing = true
+ uni.vibrateShort()
+
+ uni.request({
+ url: `${this.baseUrl}/mobile/agv/collectionPakin/auth`,
+ method: 'POST',
+ data: JSON.stringify({
+ orgBarcode: this.orgBarcode,
+ tarBarcode: this.tarBarcode,
+ devNo: this.devNo,
+ combMats: this.dataList
+ }),
+ header: { token: this.token },
+ success: (result) => {
+ const res = result.data
+ if (res.code === 200) {
+ this.clearAll()
+ this.showMessage(res.msg, 'success')
+ // this.showMessage('缁勬墭鎴愬姛')
+ // // 鎾斁鎴愬姛鎻愮ず闊�
+ // const audio = uni.createInnerAudioContext()
+ // audio.src = '/static/music/pakinOk.mp3'
+ // audio.play()
+ } else if (res.code === 403) {
+ this.handleAuthError(res.msg)
+ } else {
+ this.showMessage(res.msg, 'error')
}
- this.focuss()
- }, 200)
- },
- // 鎵樼洏鐮佹湁璇噸缃�
- barcodeFocuss() {
- let that = this;
- that.barcodeFocus = false;
- setTimeout(() => {
- that.barcode = '';
- that.barcodeFocus = true;
- }, 100);
- },
- // 鍟嗗搧鍏夋爣娓呯┖閲嶇疆
- focuss() {
- this.focus = false;
- setTimeout(() => {
- this.matnr = '';
- this.matFocus = true;
- }, 100);
- },
- // 鎼滅储鐗╂枡
- 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'
- })
- }
-
- }
- });
-
- },
- selectMat() {
- let that = this
- uni.navigateTo({
- url: "../mat/matQuery",
- success: function(res) {
- // 閫氳繃eventChannel鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹� 鍚戝彟澶栦竴涓〉闈紶閫掑�肩殑
- res.eventChannel.emit('commonUrl', {
- commonUrl: ''
- })
- },
- events: {
- // 涓烘寚瀹氫簨浠舵坊鍔犱竴涓洃鍚櫒锛岃幏鍙栬鎵撳紑椤甸潰浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹� 鍙﹀涓�涓〉闈紶杩囨潵鐨�
- acceptDataFromOpenedPage: function(data) {
- that.matnr = data.data
- that.findMat(that.matnr)
- },
- },
-
-
- });
- that.matnr = ''
- },
- checkMat(mat) {
- var len = this.dataList.length
- var add = true,
- sameItem = false
- for (var i = 0; i < len; i++) {
- if (mat.matnr == this.dataList[i].matnr) {
- for (var j = 0; j < len; j++) {
- if (mat.batch == this.dataList[j].batch) {
- sameItem = true
- }
- }
- // 鐩稿悓鐗╂枡 涓嶅悓鎵瑰彿 鏂板姞鍒楄〃
- if (mat.batch != this.dataList[i].batch) {
- this.$forceUpdate() // 寮哄埗鍒锋柊
- if (sameItem) {
- add = false
- } else {
- add = true
- }
-
- } else {
- // 鐩稿悓鐗╂枡鐩稿悓鎵瑰彿 鏁伴噺绱姞
- this.dataList[i].anfme += mat.anfme
- this.$forceUpdate() // 寮哄埗鍒锋柊
- add = false
- }
- }
+ },
+ complete: () => {
+ // 璇锋眰瀹屾垚鍚庤В闄ら槻鎶栭攣瀹�
+ setTimeout(() => {
+ this.isCombing = false
+ }, 500)
}
- if (add) {
- this.dataList.unshift(mat)
- }
- },
- // 淇敼鎵瑰彿
- revise(item, i) {
- this.matnr = this.dataList[i].matnr
- this.count = this.dataList[i].anfme
- this.standby1 = this.dataList[i].standby1
- this.weight = this.dataList[i].weight
- this.rowNum = i
- this.eject()
- },
- eject(type) {
- this.type = type
- this.$refs.revise.open(type)
- },
- // 鍒楄〃绉婚櫎鎸夐挳
- remove(item, i, type) {
- this.removeNum = i
- this.msgType = type
- this.title = '璀﹀憡'
- this.content = '鏄惁绉婚櫎褰撳墠鍟嗗搧!'
- this.$refs.alertDialog.open(i)
- },
- // 纭绉婚櫎
- removeConfirm() {
- this.messageText = "绉婚櫎鎴愬姛"
- this.messageToggle('success')
- this.dataList.splice(this.removeNum, 1)
- },
- // 鍙栨秷绉婚櫎
- removeClose() {
- this.$refs.alertDialog.close()
- },
- reviseConfirm() {
- this.dataList[this.rowNum].anfme = this.count
- this.dataList[this.rowNum].standby1 = this.standby1
- this.dataList[this.rowNum].weight = this.weight
- this.matnr = ''
- this.messageText = "淇敼鎴愬姛"
- this.messageToggle('success')
- this.$refs.revise.close()
- },
- reviseClose() {
- this.$refs.revise.close()
- },
- changeValue(value) {
- this.count = value
- },
- combConfirm(type) {
- this.msgType = type
- this.title = '璀﹀憡'
- this.content = '鏄惁鐜板湪缁勬墭!'
- this.$refs.combConfirm.open()
- },
- combClose() {
- this.$refs.combConfirm.close()
- },
- comb() {
- uni.vibrateShort();
- let that = this;
- if (that.barcode === '') {
- this.messageText = "璇锋壂鎻忔墭鐩樻潯鐮�"
- this.messageToggle('error')
- return;
- }
- if (that.dataList.length === 0) {
- this.messageText = "璇锋坊鍔犲晢鍝佸垪琛�"
- this.messageToggle('error')
- return;
- }
- for (var i = 0; i < that.dataList.length; i++) {
- if (that.dataList[i].anfme == 0 || that.dataList[i].anfme == '') {
- this.messageText = that.dataList[i].matnr + '缁勬墭鏁伴噺涓嶈兘涓�0'
- this.messageToggle('error')
- return;
- }
- }
- uni.request({
- url: that.baseUrl + '/mobile/comb/auth',
- data: JSON.stringify({
- barcode: that.barcode,
- combMats: that.dataList
- }),
- method: 'POST',
- header: {
- 'token': uni.getStorageSync('token')
- },
- success(result) {
- var res = result.data
- if (res.code === 200) {
- that.resst();
- that.messageText = "缁勬墭鎴愬姛"
- that.messageToggle('success')
- const innerAudioContext = uni.createInnerAudioContext();
- innerAudioContext.src = '/static/music/pakinOk.mp3';
- innerAudioContext.play()
- } else if (res.code == 403) {
- that.messageText = res.msg
- that.messageToggle('error')
- setTimeout(() => {
- uni.reLaunch({
- url: '../login/login'
- });
- }, 1000);
- } else {
- that.messageText = res.msg
- that.messageToggle('error')
- }
- }
- });
- },
- reset(type) {
- this.msgType = type
- this.title = '璀﹀憡'
- this.content = '鏄惁閲嶇疆!'
- this.$refs.resetConfirm.open()
- },
- // 纭閲嶇疆
- resetConfirm() {
- this.dataList = []
- this.messageText = "閲嶇疆瀹屾垚"
- this.messageToggle('success')
- },
- // 鍙栨秷閲嶇疆
- resetClose() {
+ })
+ },
- },
- // 娓呯┖
- resst() {
- this.dataList = []
- this.barcode = ''
- this.barcodeFocuss()
- },
+ // 鎵撳紑閲嶇疆纭寮圭獥
+ reset() {
+ this.$refs.resetDialog.open()
+ },
+
+ // 纭閲嶇疆
+ resetConfirm() {
+ this.clearAll()
+ this.showMessage('閲嶇疆瀹屾垚')
+ },
+
+ // 鍏抽棴閲嶇疆寮圭獥
+ resetClose() {
+ this.$refs.resetDialog.close()
+ },
+
+ // 娓呯┖鎵�鏈夋暟鎹�
+ clearAll() {
+ this.dataList = []
+ this.orgBarcode = ''
+ this.tarBarcode = ''
+ this.devNo = ''
+ this.resetFocus('orgBarcodeFocus')
}
}
+}
</script>
<style>
- @import url('../../static/css/wms.css/wms.css');
+@import url('../../static/css/wms.css/wms.css');
- .code {
- width: 100%;
- position: fixed;
- min-height: 200rpx;
- background-color: #FFF;
- z-index: 10;
- }
+.code {
+ width: 100%;
+ position: fixed;
+ min-height: 200rpx;
+ background-color: #fff;
+ z-index: 10;
+}
- .item {
- display: flex;
- align-items: center;
- height: 100rpx;
- margin-left: 20rpx;
- border-bottom: 1px solid #DCDFE6;
- }
+.item {
+ display: flex;
+ align-items: center;
+ height: 100rpx;
+ margin-left: 20rpx;
+ border-bottom: 1px solid #dcdfe6;
+}
- .item input {
- height: 50rpx;
- line-height: 50rpx;
- /* font-family: PingFang SC; uniapp 榛樿瀛椾綋涓嶅眳涓� */
- font-size: 36upx;
- font-family: PingFang SC;
- width: 55vw;
+.item input {
+ height: 50rpx;
+ line-height: 50rpx;
+ font-size: 36upx;
+ font-family: PingFang SC;
+ width: 55vw;
+}
- }
+.code-decs {
+ width: 20vw;
+ font-size: 18px;
+ color: #303133;
+}
- .code-decs {
- width: 20vw;
- font-size: 18px;
- color: #303133;
- }
+.item-right {
+ margin-left: auto;
+ margin-right: 20rpx;
+}
- .item-right {
- margin-left: auto;
- margin-right: 20rpx;
- }
+.mat-list-title {
+ height: 80rpx;
+ line-height: 80rpx;
+ width: 100%;
+ background-color: white;
+ position: fixed;
+ margin-top: 300rpx;
+ z-index: 9;
+ text-align: center;
+ box-shadow: 0px 0px 30px 0px rgba(0, 0, 0, 0.5);
+}
- .mat-list-title {
- height: 80rpx;
- line-height: 80rpx;
- width: 100%;
- background-color: white;
- position: fixed;
- margin-top: 200rpx;
- z-index: 9;
- /* border-top: 1px solid #DCDFE6; */
- text-align: center;
- box-shadow: 0px 0px 30px 0px rgba(0, 0, 0, 0.5);
- }
+.list:first-child {
+ margin-top: 400rpx;
+}
- .list:first-child {
- margin-top: 300rpx;
- }
-</style>
\ No newline at end of file
+.empty-tips {
+ text-align: center;
+ color: #909399;
+ padding: 100rpx 0;
+ margin-top: 300rpx;
+}
+.tip {
+ white-space: nowrap;
+ overflow: hidden;
+ text-overflow: ellipsis;
+}
+</style>
--
Gitblit v1.9.1