skyouc
2025-05-08 ed6433bc89d7be8169d6933882e6d5ac9e016a5d
Merge branch 'devlop' of http://47.97.1.152:5880/r/pda-master into devlop
4个文件已修改
137 ■■■■ 已修改文件
pages/listing/itemSelect.vue 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/listing/matnrPalletising.vue 53 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/listing/unPakin.vue 63 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/rece/other.vue 11 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/listing/itemSelect.vue
@@ -2,7 +2,7 @@
    <view>
        <!-- 搜索框 -->
        <view class="search-bar">
            <uni-search-bar v-model="condition" placeholder=" 输入批次" bgColor="#EEEEEE"  @confirm="search()"/>
            <uni-search-bar v-model="condition" placeholder=" 输入批次/编码/单号" bgColor="#EEEEEE"  @confirm="search()"/>
        </view>
        
         
@@ -44,6 +44,14 @@
                        </view>
                        <view class="cu-item">
                            <view class="content">
                                <text class="text-black">质检状态:</text>
                            </view>
                            <view class="action">
                                <text class="text-grey ">{{item.isptResult$}}</text>
                            </view>
                        </view>
                        <view class="cu-item">
                            <view class="content">
                                <text class="text-black">库存单位: <text class="text-grey ">{{item.stockUnit}}</text></text>
                            </view>
                            <view class="content">
pages/listing/matnrPalletising.vue
@@ -60,14 +60,14 @@
                            <text class="text-grey ">{{item.splrBatch}}</text>
                        </view>
                    </view>
                    <!-- <view class="cu-item">
                    <view class="cu-item">
                        <view class="content">
                            <text class="text-black">库存批次:</text>
                            <text class="text-black">质检状态:</text>
                        </view>
                        <view class="action">
                            <text class="text-grey ">{{item.batch}}</text>
                            <text class="text-grey ">{{item.isptResult$}}</text>
                        </view>
                    </view> -->
                    </view>
                    <!-- <view class="cu-item">
                        <view class="content">
                            <text class="text-black">平台行号: <text class="text-grey ">{{item.platformId}}</text></text>
@@ -226,7 +226,7 @@
            //     }
            // },
            async getList() {
                if(this.barcode === '' || this.barcode === null){
                if(this.container === '' || this.container === null){
                    uni.showToast({
                        title: "容器码为空",
                        icon: "none",
@@ -251,16 +251,35 @@
                    })
                }
            },
            showBackData(data){
            showBackData(data){
                let status ;
                data.map(item => {                    
                    this.list.push(item)
                })
                })
                let oldLength = this.list.length
                this.list = this.list.filter((item, index, self) =>
                    self.findIndex(i => (
                        i.id === item.id // 根据id去重
                    )) === index
                    )) === index && item.isptResult === self[0].isptResult
                );
                let newLength = this.list.length
                if(oldLength > newLength){
                    this.showMsg("新明细被过滤,请检查状态")
                }
                                
            },
            showMsg(msg){
                setTimeout(function() {
                 uni.showToast({
                     icon: "none",
                     position: 'top',
                     title: msg,
                     duration:2000,
                 })
                }, 200);
            },
            scrollTo() {
                const ref = this.$refs[`${this.barcode}ref`][0];
@@ -290,7 +309,23 @@
                this.isconfirm = false
            },
            async confirm() {
                this.repeatClick = true
                if(this.container === '' || this.container === null){
                    uni.showToast({
                        title: "容器码为空",
                        icon: "none",
                        position: 'top'
                    })
                    return ;
                }
                if(this.list.length ===0 || this.list === null){
                    uni.showToast({
                        title: "未添加明细",
                        icon: "none",
                        position: 'top'
                    })
                    return ;
                }
                this.repeatClick = true
                const newArr = this.list.map(item => {
                    
                    return {
pages/listing/unPakin.vue
@@ -34,53 +34,32 @@
                    <view class="cu-item">
                        <view class="content">
                            <text class="text-black">ASN:</text>
                        </view>
                        <view class="action">
                            <text class="text-grey ">{{item.asnCode}}</text>
                        </view>
                        </view>
                    </view>
                    <view class="cu-item">
                        <view class="content">
                            <text class="text-black">物料编码:</text>
                        </view>
                        <view class="action">
                            <text class="text-grey ">{{item.matnrCode}}</text>
                        </view>
                    </view>
                    <view class="cu-item">
                        <view class="content">
                            <text class="text-black">供应商批次:</text>
                        </view>
                        <view class="action">
                            <text class="text-grey ">{{item.splrBatch}}</text>
                        </view>
                        </view>
                    </view>
                    <view class="cu-item">
                        <view class="content">
                            <text class="text-black">质检状态:</text>
                        </view>
                        <view class="action">
                            <text class="text-grey ">{{item.isptResult$}}</text>
                        </view>
                        </view>
                    </view>
                    <view class="cu-item">
                        <view class="content">
                            <text class="text-black">库存批次:</text>
                        </view>
                        <view class="action">
                            <text class="text-grey ">{{item.batch}}</text>
                        </view>
                        <view class="content">
                            <text class="text-black">库存单位: <text class="text-grey ">{{item.stockUnit}}</text></text>
                        </view>
                    </view>
                    <!-- <view class="cu-item">
                        <view class="content">
                            <text class="text-black">平台行号: <text class="text-grey ">{{item.platformId}}</text></text>
                        </view>
                        <view class="content">
                            <text class="text-black">质检结果: <text class="text-grey ">{{item.inspect}}</text></text>
                        </view>
                    </view> -->
                    </view>
                    <view class="cu-item">
                        <view class="content">
@@ -100,7 +79,7 @@
                        <view class="content">
                            <view class="cu-form-group padding-lr-0">
                                <view class="title text-blue"><text
                                        class="text-red text-xl vertical-middle">*</text>组盘数量:
                                        class="text-red text-xl vertical-middle">*</text>解绑数量:
                                </view>
                                <uni-number-box style="width: 70%;" :max="max" v-model="item.receiptQty"
                                    :step='1'></uni-number-box>
@@ -164,30 +143,9 @@
                    matnrCode: this.matnrCode,
                    asnCode: this.asnCode
                }, "post")
                if (code === 200) {
                    // if(data !== [] || data !== null){
                    // uni.navigateTo({
                    //         url: "../listing/itemSelect",
                    //         success: function(res) {
                    //             // 通过eventChannel向被打开页面传送数据   向另外一个页面传递值的
                    //             res.eventChannel.emit('data', {
                    //                 item: data
                    //             })
                    //         },
                    //         events: {
                    //             // 为指定事件添加一个监听器,获取被打开页面传送到当前页面的数据  另外一个页面传过来的
                    //             acceptDataFromOpenedPage: function(data) {
                    //                 that.matnr = data.data
                    //                 that.findMat(that.matnr)
                    //             },
                    //         },
                    //     });
                    // }
                if (code === 200) {
                    for (var i = 0; i < data.length; i++) {
                        data[i].receiptQty = 1;
                        data[i].receiptQty = 0;
                        data[i].selected = false;
                    }
                    this.list = data
@@ -209,6 +167,9 @@
                    type: 'unbind'
                })
                if (code === 200) {
                    for (var i = 0; i < data.length; i++) {
                        data[i].receiptQty = 0;
                    }
                    this.list = data
                } else {
                    uni.showToast({
pages/rece/other.vue
@@ -108,14 +108,9 @@
                        </view>
                    </view>
                    <view class="cu-item">
                        <view class="content" v-if="!isconfirm">
                            <view class="cu-form-group padding-lr-0">
                                <view class="title text-blue">供应商批次:</view>
                                {{item.splrBatch}}
                            </view>
                        </view>
                        <view class="content" v-else>
                            <text class="text-black">供应商批次:<text class="text-grey ">{{item.splrBatch}}</text></text>
                        <view class="content" >
                            <text class="text-black">批次:<text class="text-grey ">{{item.splrBatch}}</text></text>
                        </view>
                    </view>