From 43946aca83334ac3e1c3929a2d6dcba3f2bf6446 Mon Sep 17 00:00:00 2001
From: yangan <yangan0921@163.com>
Date: 星期二, 17 十二月 2024 15:27:59 +0800
Subject: [PATCH] fix:小程序眼镜密码，h5历史收发单
---
pages/login/userPassword.vue | 23 +++++++++++++++++++----
pages/loadUnload-page/historyOrder/index.vue | 13 ++++++++++---
pages/loadUnload-page/selectTarget/selectTarget.vue | 3 ++-
3 files changed, 31 insertions(+), 8 deletions(-)
diff --git a/pages/loadUnload-page/historyOrder/index.vue b/pages/loadUnload-page/historyOrder/index.vue
index decc13d..dc63a64 100644
--- a/pages/loadUnload-page/historyOrder/index.vue
+++ b/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));
diff --git a/pages/loadUnload-page/selectTarget/selectTarget.vue b/pages/loadUnload-page/selectTarget/selectTarget.vue
index b760739..8e63656 100644
--- a/pages/loadUnload-page/selectTarget/selectTarget.vue
+++ b/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>
diff --git a/pages/login/userPassword.vue b/pages/login/userPassword.vue
index f145714..a9853cc 100644
--- a/pages/login/userPassword.vue
+++ b/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;
},
//鐧诲綍
--
Gitblit v1.9.1