Merge branch 'devlop_wxxr' of http://47.97.1.152:5880/r/pda-master into dev...

skyouc

2025-11-06 8643df2e582ae46f9f2ff91efc2f14620e6c3837

Merge branch 'devlop_wxxr' of http://47.97.1.152:5880/r/pda-master into devlop_wxxr

# Conflicts:
#	pages/check/TempCheck.vue

 pages/check/TempCheck.vue

@@ -234,10 +234,11 @@
                    })
                    return;
                }
                this.list.push(...this.matnrList)
                this.matnrList = []
                this.isconfirm = !this.isconfirm
				
                this.confirmAddMatnr()
                this.matnrList = [];
            },
			
            remove(index) {
                this.matnrList.splice(index, 1);
            },
@@ -249,11 +250,7 @@
                    matnrs: this.matnrList
                })
                if (code === 200) {
                    uni.showToast({
                        title: msg,
                        icon: "none",
                        position: 'top'
                    })
                    that.search()
                } else {
                    uni.showToast({
                        title: msg,
@@ -261,6 +258,7 @@
                        position: 'top'
                    })
                }
                this.isconfirm = !this.isconfirm
            },
            async addMatnr() {
                const {
@@ -353,14 +351,9 @@
                    return;
                }
                this.repeatClick = true
                const {
                    code,
                    data,
                    msg
                } = await request('/saveCheckDiff', {
                    container: that.barcode,
                    checkId: that.check.id,
                    checkDiffItems: that.list
                const {code, data,    msg    } = await request('/temp/check/confirm', {
                    barcode: that.barcode,
                    items: that.list
                })
                if (code === 200) {
                    uni.showToast({
@@ -371,7 +364,7 @@
                } else {
                    uni.showToast({
                        title: msg,
                        icon: "none",
                        icon: "error",
                    })
                }
                this.repeatClick = false

 pages/rece/other.vue

@@ -13,10 +13,7 @@
                <text class='cuIcon-close text-gray margin-right-xs' v-show="barcode!==''" @click="clearBarcode"></text>

                <text class='cuIcon-search text-blue' @click="search"></text>

            </view>



        </form>





        <view class="padding-lr margin-top-sm">

            <block v-for="(item, index) in list" :key="index">

                <view class="cu-list det menu sm-border margin-bottom-sm " :class="[item.barcode===barcode&&'act']"