@#
whycq
2024-10-18 0d37bbe276032742252bd5a96a0bbad93dd148ec
@#
2个文件已修改
130 ■■■■ 已修改文件
pages/pakin/confirmPakin.vue 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/pakin/repairPakin.vue 116 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/pakin/confirmPakin.vue
@@ -6,10 +6,11 @@
                <input type="text" placeholder=" 扫码 / 输入" v-model="barcode" :focus="barcodeFocus"
                    @input="barcodeInput()">
            </view>
            <view class="item">
            <view class="item" style="padding: 8rpx;">
                <view class="code-decs">码垛位:</view>
                <input type="text" placeholder=" 扫码 / 输入" v-model="bomCode" :focus="bomCodeFocus"
                    @confirm="bomInput()">
                <uni-combox style="height:30rpx;" emptyTips="暂无数据" :candidates="stas" v-model="sta" placeholder="站台号"></uni-combox>
                <!-- <input type="text" placeholder=" 扫码 / 输入" v-model="bomCode" :focus="bomCodeFocus"
                    @confirm="bomInput()"> -->
            </view>
            <view class="item">
                <view class="code-decs">物料码:</view>
@@ -37,7 +38,7 @@
        <scroll-view>
            <view class="list" v-for="(item,i) in dataList" :key="i">
                <view class="list-left">
                    <view style="display: flex; flex-wrap: wrap;color: #3a3a3a;">
                    <view style="display: flex;flex-direction: column;color: #3a3a3a;">
                        <view style="margin-right: 20rpx;">
                            <text style="font-weight: 600;">包装组号:</text>
                            <text>{{item.packageGroupNo}}</text>
@@ -190,7 +191,8 @@
                bomCode: '',
                bomCodeFocus: false,
                maxAn: 0,
                stas: [3092,3102,3095],
                sta: ''
            }
        },
        onLoad() {
@@ -723,7 +725,7 @@
                uni.request({
                    url: that.baseUrl + '/mobile/pdtz/auth',
                    data: JSON.stringify({
                        palletizingNo: that.bomCode,
                        palletizingNo: that.sta,
                        barcode: that.barcode,
                        matList: that.dataList
                    }),
pages/pakin/repairPakin.vue
@@ -23,19 +23,64 @@
        <scroll-view>
            <view class="list" v-for="(item,i) in dataList" :key="i">
                <view class="list-left">
                    <!-- <view class="list-left-item">
                        <view class="desc">No:</view>
                        <view class="left-item">{{i + 1}}</view>
                    </view> -->
                    <view class="list-left-item">
                        <view class="left-item">包装组号:</view>
                    <view style="display: flex;align-items: center;">
                        <text style="font-weight: 600;">包装组号:</text>
                        <text>{{item.packageGroupNo}}</text>
                    </view>
                    <view class="list-left-item">
                        <view class="left-item">
                            {{item.packageGroupNo}}
                    <view style="display: flex;align-items: center;">
                        <text style="font-weight: 600;">木箱类型:</text>
                        <text>{{item.boxType}}</text>
                    </view>
                    <view style="display: flex;align-items: center;">
                        <text style="font-weight: 600;">管芯类型:</text>
                        <text>{{item.rollType}}</text>
                    </view>
                    <view style="display: flex;align-items: center;">
                        <text style="font-weight: 600;">宽幅:</text>
                        <text>{{item.wideInWidth}}</text>
                    </view>
                    <view style="display: flex;align-items: center;">
                        <text style="font-weight: 600;">生箔厚度:</text>
                        <text>{{item.thickness}}</text>
                    </view>
                    <view v-for="(roll,i) in item.rolls" style="font-size: 14px;padding: 8px;">
                        <view style="display: flex;align-items: center;">
                            <text style="font-weight: 600;">序号:</text>
                            <text>{{i + 1}}</text>
                        </view>
                    </view>
                        <view style="display: flex;align-items: center;">
                            <text style="font-weight: 600;">卷号:</text>
                            <text>{{roll.rollNo}}</text>
                        </view>
                        <view style="display: flex;align-items: center;">
                            <text style="font-weight: 600;">箱号:</text>
                            <text>{{roll.boxNo}}</text>
                        </view>
                        <view style="display: flex;align-items: center;">
                            <text style="font-weight: 600;">规格:</text>
                            <text>{{roll.specs}}</text>
                        </view>
                        <view style="display: flex;align-items: center;">
                            <text style="font-weight: 600;">长度:</text>
                            <text>{{roll.length}}</text>
                        </view>
                        <view style="display: flex;align-items: center;">
                            <text style="font-weight: 600;">接头:</text>
                            <text>{{roll.splices}}</text>
                        </view>
                        <view style="display: flex;align-items: center;">
                            <text style="font-weight: 600;">净重:</text>
                            <text>{{roll.netWeight}}</text>
                        </view>
                        <view style="display: flex;align-items: center;">
                            <text style="font-weight: 600;">毛重:</text>
                            <text>{{roll.grossWeight}}</text>
                        </view>
                        <view style="display: flex;align-items: center;">
                            <text style="font-weight: 600;">分切下料时间:</text>
                            <text>{{roll.fqTime}}</text>
                        </view>
                    </view>
                </view>
                <view class="list-right">
                    <picker mode="selector" :range="list" @change="onChange($event, i)">
@@ -250,16 +295,48 @@
                
                const result = parseData(data);
                // console.log(result);
                // this.secAnalysis(result)
                if (this.dataList.length > 0) this.checkAdd(result)
                else this.dataList.push(result);
                this.focuss()
                this.secAnalysis(result)
                // if (this.dataList.length > 0) this.checkAdd(result)
                // else this.dataList.push(result);
                // this.focuss()
            
            },
            oo() {
                let pp = {
                    palletizingNo: 3050,
                    barcode: 80009991,
                    boxList: {
                        boxPos: '左',
                        packageGroupNo: data.packageGroupNo,
                        rollType: data.rollType,
                        boxType: data.boxType,
                        thickness: data.thickness,
                        wideInWidth: data.wideInWidth,
                        totalGrossWeight: data.totalGrossWeight,
                        totalNetWeight: data.totalNetWeight,
                        rolls: [
                            {
                                rollNo: '',
                                boxNo: '',
                                specs: '',
                                length: '',
                                splices: '',
                                netWeight: '',
                                grossWeight: '',
                                fqTime: '',
                            },
                            {}
                        ],
                    }
                }
            },
            // 二次解析
            secAnalysis(data) {
                let rolls = data.rolls
                let nedata = {
                    boxPos: '左',
                    packageGroupNo: data.packageGroupNo,
                    rollType: data.rollType,
                    boxType: data.boxType,
@@ -267,6 +344,7 @@
                    wideInWidth: data.wideInWidth,
                    totalGrossWeight: data.totalGrossWeight,
                    totalNetWeight: data.totalNetWeight,
                    rolls: [],
                }
                
                
@@ -291,11 +369,10 @@
                        else if (key.startsWith('接头')) roll.splices = item[key];
                        else if (key.startsWith('分切时间')) roll.fqTime = item[key];
                    })
                    let newObj = {...nedata,...roll}
                    if (this.dataList.length > 0) this.checkAdd(newObj)
                    else this.dataList.push(newObj);
                    nedata.rolls.push(roll)
                }
                if (this.dataList.length > 0) this.checkAdd(nedata)
                else this.dataList.push(nedata);
                this.focuss()
            },
            // 确认添加
@@ -315,6 +392,7 @@
                    }
                }
                if (add) {
                    if (this.dataList.length == 2) return
                    this.dataList.unshift(newMat)
                }
                if (this.dataList.length == 2) {