yangan
2024-12-17 43946aca83334ac3e1c3929a2d6dcba3f2bf6446
fix:小程序眼镜密码,h5历史收发单
3个文件已修改
39 ■■■■ 已修改文件
pages/loadUnload-page/historyOrder/index.vue 13 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/loadUnload-page/selectTarget/selectTarget.vue 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/login/userPassword.vue 23 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/loadUnload-page/historyOrder/index.vue
@@ -553,6 +553,7 @@
                    customerName: this.customerList.filter(v => v.active == true).map(item => item.name),
                    bunkerName:this.bunnkerList.filter(v => v.active == true).map(item => item.name),
                };
                console.log(this.coalList,this.bunnkerList,this.customerList,'list')
                const mapping = {
                    productName: validateFn('productName'),
@@ -581,9 +582,9 @@
                        return item;
                    })
                    console.log(tempArr,'temp')
                        this.totalLength =     tempArr.reduce((x, y) => x + y.carNum,0);
                        this.totalTon = tempArr.reduce((x, y) => new BigNumber(x).plus( y.weight),0).toFixed(2);
                        this.tmNum = tempArr.reduce((x, y) => x + y.number,0);
                        // this.totalLength =     tempArr.reduce((x, y) => x + y.carNum,0);
                        // this.totalTon = tempArr.reduce((x, y) => new BigNumber(x).plus( y.weight),0).toFixed(2);
                        // this.tmNum = tempArr.reduce((x, y) => x + y.number,0);
                    
                    // this.totalTon = this.filterList.map(v => 
                    //     v.taskCoalList.reduce((prev, cur) => {
@@ -591,6 +592,12 @@
                    //         return cleanvalue + prev
                    //     }, 0)
                    // );
                    this.totalLength = this.filterList.map(v => v.tmTaskCoalList.length).reduce((x, y) => x + y); // 车数
                    const tonList = this.filterList.map(item=>item.tmTaskCoalList.filter(item=>item.isWeight === 1)).flat(1);
                    const tmNumList = this.filterList.map(item=>item.tmTaskCoalList.filter(item=>item.isWeight !== 1)).flat(1);
                    this.totalTon = tonList.reduce((x,y)=>new BigNumber(x).plus(new BigNumber(y.clean)).toFixed(2),0)
                    this.tmNum = tmNumList.reduce((x,y)=>new BigNumber(x).plus(new BigNumber(y.productQuantity)),0)
                    console.log(this.filterList,this.totalTon,'totalTon')
                    // this.totalTon = this.filterList.map(item=>)
                    // this.totalTon = this.filterList.map(v=>v.tmTaskCoalList.filter(item=>item.isWeight === 1).reduce((x,y)=>x.weight + y.weight));
                    
pages/loadUnload-page/selectTarget/selectTarget.vue
@@ -350,10 +350,11 @@
                        <view v-if="activeObj.isContainerNum"><span>集装箱号: </span>
                                <u--input v-model="activeObj.containerNumber"
                                clearable
                                readonly
                                style="border: solid 1px #ccc;"
                                placeholder="输入集装箱号"
                                prefixIconStyle="color: #909399"></u--input>
                                <view><text style="color: red;">请认真核对集装箱号再提交!</text></view>
                                <!-- <view><text style="color: red;">请认真核对集装箱号再提交!</text></view> -->
                            </view>
                        <!-- <view v-if="/聚氯乙烯树脂/.test(activeObj.productName)">
                            <view>计划量:{{Number(activeObj.planMeasure)}}</view>
pages/login/userPassword.vue
@@ -34,15 +34,29 @@
            </view>
            <view class="list-call">
                <u-input v-model="password"
                    clearable
                   v-if="inpType"
                   clearable
                    maxlength="32"
                    :type="inpType ?  'password' : 'text'"
                    :type="'password'"
                    placeholder="请输入密码"
                    prefixIcon="lock"
                    style="padding:0;margin-left:8px;"
                    prefixIconStyle="font-size: 22px;color: #909399">
                    <template slot="suffix">
                        <u-icon  size="40" name="eye" @click="todoShow"></u-icon>
                        <u-icon  size="45" name="eye-off" @click.native.stop="todoShow"></u-icon>
                </template>
                </u-input>
                <u-input v-model="password"
                   v-if="!inpType"
                    maxlength="32"
                    clearable
                    :type="'text'"
                    placeholder="请输入密码"
                    prefixIcon="lock"
                    style="padding:0;margin-left:8px;"
                    prefixIconStyle="font-size: 22px;color: #909399">
                    <template slot="suffix">
                        <u-icon  size="45" name="eye" @click.native.stop="todoShow"></u-icon>
                </template>
                </u-input>
            </view>
@@ -121,7 +135,8 @@
            },
            todoShow(){
                console.log('点击')
                this.inpType = !this.inpType
                this.inpType = !this.inpType;
                this.password = this.password;
            },
            //登录