b6c44345b43433a9e28aab4fc33dedfb5ab16efe..8cf2ffeb8e6f3c35369058817288ef39a5d9fe39
2025-05-08 skyouc
no message
8cf2ff 对比 | 目录
2025-05-08 skyouc
Merge branch 'devlop' of http://47.97.1.152:5880/r/pda-master into devlop
ed6433 对比 | 目录
2025-05-08 skyouc
no message
5908d9 对比 | 目录
2025-05-08 zjj
#
028d63 对比 | 目录
2025-05-08 zjj
#组托不允许合格不合格混绑
1f931d 对比 | 目录
2025-05-08 zjj
#解绑
2a6c5b 对比 | 目录
2025-05-08 zjj
#pici
a9d99f 对比 | 目录
4个文件已修改
173 ■■■■ 已修改文件
pages/listing/itemSelect.vue 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/listing/matnrPalletising.vue 53 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/listing/unPakin.vue 63 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/rece/other.vue 47 ●●●● 补丁 | 查看 | 原始文档 | 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
@@ -81,9 +81,9 @@
                        <view class="content">
                            <text class="text-black">采购单位:<text class="text-grey ">{{item.purUnit}}</text></text>
                        </view>
                        <view class="content">
            <!--             <view class="content">
                            <text class="text-black">库存单位: <text class="text-grey ">{{item.stockUnit}}</text></text>
                        </view>
                        </view> -->
                    </view>
                    <view class="cu-item">
                        <view class="content">
@@ -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>
@@ -135,18 +130,18 @@
                            <text class="text-black">生产日期:<text class="text-grey ">{{item.prodTime}}</text></text>
                        </view>
                    </view>
                    <view class="cu-item grid  col-1" v-if="!isconfirm">
                    <!-- <view class="cu-item grid  col-1" v-if="!isconfirm">
                        <view v-for="el in dynamicFields" :key="el.id">
                            <view class="cu-form-group padding-lr-0">
                                <view class="title text-blue">{{el.fieldsAlise}}:</view>
                                <input :placeholder='`请输入${el.fieldsAlise}`' v-model="item[el.fields]"></input>
                            </view>
                        </view>
                    </view>
                    <view class="cu-item grid  col-2" v-if="isconfirm">
                    </view> -->
                    <view class="cu-item grid  col-2">
                        <view class="item" v-for="el in dynamicFields" :key="el.id">
                            <text class="text-black">{{el.fieldsAlise}}:
                                <text class="text-grey ">{{item[el.fields]}}</text></text>
                                <text class="text-grey ">{{item.extendFields[el.fields]}}</text></text>
                        </view>
                    </view>
                </view>
@@ -160,8 +155,8 @@
        <view class="cu-form-group margin-bottom">
            <view class="title">收货区</view>
            <view style="width: 80%;">
                <uni-data-select style="min-width: 90%; max-width: 90%;" v-model="whAreaId" :localdata="range" placement="top"
                    @change="selChange"></uni-data-select>
                <uni-data-select style="min-width: 90%; max-width: 90%;" v-model="whAreaId" :localdata="range"
                    placement="top" @change="selChange"></uni-data-select>
            </view>
        </view>
@@ -202,16 +197,17 @@
            }
        },
        computed: {
            ...mapState('user', ['dynamicFields']),
            ...mapState('user', ['dynamicFields']),
            ...mapState('user', {
                dynFields: state => state.dynamicFields
            }),
            allCount() {
                return this.list.reduce((acc, row) => +row.receiptQty + acc, 0)
            }
        },
        mounted() {
            this.getRece()
            console.log(dynamicFields)
            this.getRece()
            this.whAreaId = uni.getStorageSync('whAreaId')
        },
        methods: {
@@ -270,8 +266,6 @@
                this.isconfirm = false
            },
            selChange(val) {
                console.log('-------->')
                console.log(val)
                uni.setStorageSync('whAreaId', val)
            },
            async complete(id) {
@@ -301,13 +295,18 @@
                        title: '请选择收货区'
                    })
                } else {
                    console.log(this.dynFields)
                    const newArr = this.list.map(item => {
                        return {
                            ...item,
                            receiptQty: item.receiptQty === null ? 0 : +item.receiptQty
                            receiptQty: item.receiptQty === null ? 0 : +item.receiptQty,
                            // extendFields: this.dynFields.filter(el => el.unique == 1).map(exf => {
                            //     return {
                            //         [`${exf.fields}`]: item[exf.fields]
                            //     }
                            // }).filter(field => Object.values(field)[0] != undefined)
                        };
                    }).filter(el => el.receiptQty !== 0);
                    const {
                        code,