From 1f478b4b033d518f6de21f931d828d2a175b2a3e Mon Sep 17 00:00:00 2001
From: wzp <2880584989@qq.com>
Date: 星期二, 08 三月 2022 13:40:51 +0800
Subject: [PATCH] 最新版本，修复bug
---
assetMgtH5/pages/assets/return.vue | 183 ++++++++++++++++++++++++++-------------------
1 files changed, 105 insertions(+), 78 deletions(-)
diff --git a/assetMgtH5/pages/assets/return.vue b/assetMgtH5/pages/assets/return.vue
index 1ada9a6..bd0cea6 100644
--- a/assetMgtH5/pages/assets/return.vue
+++ b/assetMgtH5/pages/assets/return.vue
@@ -2,14 +2,14 @@
<!-- mescroll-body鏈川鏄師鐢焢age鐨勬粴鍔�,鏃犳硶鍍弇escroll-uni閭ｆ牱鐢╢lex甯冨眬宓屽湪鏌愪釜view涓娇鐢ㄥ眬閮ㄥ尯鍩熸粴鍔�, 浣嗘槸鍙互閫氳繃fixed瀹氫綅鍏朵粬鍏冪礌鏉ュ疄鐜�"灞�閮ㄥ尯鍩熸粴鍔�"-->
<view>
<!-- 椤堕儴 fixed瀹氫綅 -->
- <view class="top-warp">
+ <view class="top-warp">
<view class="">
<cu-custom bgColor="bg-gradual-blue" :isBack="true">
<block slot="backText">杩斿洖</block>
<block slot="content">璧勪骇褰掕繕</block>
</cu-custom>
</view>
-
+
</view>
<view class="search-box">
<view class="item">
@@ -18,32 +18,35 @@
</u-search>
</view>
</view>
-
-
-
+
+
+
<!-- mescroll-body璺熼殢page婊氬姩, 涓嶅彲fixed瀹氫綅, 鍙缃� top, bottom, topbar, bottombar, safearea鐨勫亸绉婚噺-->
- <mescroll-body ref="mescrollRef" top="176" bottom="300" @init="mescrollInit" @down="downCallback" @up="upCallback">
+ <mescroll-body ref="mescrollRef" top="176" bottom="300" @init="mescrollInit" @down="downCallback"
+ @up="upCallback">
<view class="cu-list menu-avatar ">
<view class="cu-item" v-for="(item,index) in assetsList" :key="index">
- <view class="cu-avatar radius lg bg-white"
- style="background-image:url(../../static/device.png)">
+ <view class="cu-avatar radius lg bg-white" style="background-image:url(../../static/device.png)">
</view>
<view class="content">
<view>
<view class="text-cut text-bold text-xl">{{item.assets.name}}</view>
- <view class="cu-tag radius bg-orange sm">鍙綊杩橈細{{item.quantity}}</view>
+ <view class="cu-tag radius bg-orange sm">鍙綊杩橈細{{item.availableQuantity}}</view>
<view class="numbox">
- <u-number-box v-model="valueList[index]" :min="0" :max="item.quantity"
+ <u-number-box v-model="valueList[index]" :min="0" :max="item.availableQuantity"
:showMinus="valueList[index] > 0">
<view slot="minus" class="minus">
<u-icon name="minus" size="12"></u-icon>
</view>
- <input slot="input" style="width: 38px;text-align: center; " class="input"
- :value="valueList[index]?valueList[index]:0"></input>
+ <input slot="input" style="width: 38px;text-align: center; " class="input" @blur="inputChange(index)"
+ :value="valueList[index] ? valueList[index] : 0" @input="valueList[index] = $event.detail.value" ></input>
+
<view slot="plus" class="plus">
<u-icon name="plus" color="#FFFFFF" size="12"></u-icon>
</view>
</u-number-box>
+
+
</view>
</view>
<!-- <view class="text-gray text-sm flex">
@@ -53,7 +56,7 @@
</view>
</view>
</mescroll-body>
-
+
<!-- 搴曢儴 fixed瀹氫綅 -->
<view class="bottom-warp">
<view class="margin-top">
@@ -62,13 +65,14 @@
</view>
<view class="flex justify-center align-center" style="margin-top: 10rpx;">
<view class="" style="width: 95%; ">
- <u--textarea height="50" v-model="reason" placeholder="璇疯緭鍏ュ唴瀹�" placeholderStyle="font-size: 15rpx;">
+ <u--textarea height="50" v-model="reason" placeholder="璇疯緭鍏ュ唴瀹�"
+ placeholderStyle="font-size: 15rpx;">
</u--textarea>
</view>
-
+
</view>
</view>
-
+
<view class="padding-left padding-top border-title " style="padding-bottom: 10rpx;">
<view class="action">
鐢宠浜轰俊鎭�
@@ -85,11 +89,12 @@
</view>
</view>
</view>
-
+
<view class="margin-top" style="margin-bottom: 30rpx;">
- <u-button style="width: 40%;" type="primary" text="鎻愪氦鐢宠" @click="submit" :disabled="isDisabled"></u-button>
+ <u-button style="width: 40%;" type="primary" text="鎻愪氦鐢宠" @click="submit" :disabled="isDisabled">
+ </u-button>
</view>
-
+
<u-toast ref="uToast"></u-toast>
</view>
</view>
@@ -99,7 +104,7 @@
<script>
import MescrollMixin from "@/uni_modules/mescroll-uni/components/mescroll-uni/mescroll-mixins.js";
-
+
export default {
mixins: [MescrollMixin], // 浣跨敤mixin
data() {
@@ -107,26 +112,26 @@
keyword: '',
value: 0,
reason: '',
- total:0,
+ total: 0,
assetsList: [],
listFlag: false,
-
+
valueList: [],
applicant: "", //鐢宠浜�
-
+
applicationTime: '', //鐢宠鏃堕棿
templateId: '', //妯℃澘ID
isDisabled: false,
-
-
+ approvalAssetsId: [], //闈炲繀浼� 鎴戠殑璧勪骇鎶ヤ慨銆佹姤搴熴�佸綊杩樻椂濉啓 瀹℃壒璧勪骇ID
+ productCode: [], //闈炲繀浼� 鎶ヤ慨鎶ュ簾鏃� 濉啓
page: 1,
pageSize: 10,
status: 'loadmore',
- user:null
+ user: null
}
},
onLoad() {
- this.user =uni.getStorageSync('user');
+ this.user = uni.getStorageSync('user');
this.applicant = this.user.userName;
this.applicationTime = this.$dayjs().format("YYYY-MM-DD HH:mm:ss")
},
@@ -134,42 +139,60 @@
this.initTemplateData();
},
methods: {
+ inputChange(index){
+ // console.log('寮�濮�:',this.valueList[index]);
+ this.valueList[index] = this.valueList[index];
+ // console.log('缁撴潫:',this.valueList[index]);
+
+ console.log('鍒楄〃',this.valueList)
+ },
+
/*涓婃媺鍔犺浇鐨勫洖璋�: 鍏朵腑page.num:褰撳墠椤� 浠�1寮�濮�, page.size:姣忛〉鏁版嵁鏉℃暟,榛樿10 */
onSearch(e) {
console.log("鎼滅储锛�" + this.keyword)
this.page = 1;
- let page ={};
- page.num =1;
+ let page = {};
+ page.num = 1;
this.upCallback(page);
},
-
+
upCallback(page) {
-
+
let pageNum = page.num; //椤电爜锛岄粯璁や粠1寮�濮�
let pageSize = 10; //椤甸暱锛岄粯璁ゆ瘡椤�10鏉�
-
+
console.log(pageNum)
this.$http.get('/assets/approval/myAssets', {
params: {
pageNum: pageNum,
pageSize: pageSize,
- keyStr: this.keyword
+ keyStr: this.keyword,
+ approvalType:2
}
})
.then(res => {
// debugger;
if (res.data.code === 0) {
let data = res.data.data;
- console.log('鎬昏祫浜�'+ data.length)
- if (page.num == 1) this.assetsList = []; //濡傛灉鏄涓�椤碉紝闇�鎵嬪姩缃┖鍒楄〃
+
+ if (page.num == 1) {
+ this.assetsList = []; //濡傛灉鏄涓�椤碉紝闇�鎵嬪姩缃┖鍒楄〃
+ this.approvalAssetsId = [];
+ }
+
+ for (let i = 0; i < data.length; i++) {
+ this.approvalAssetsId.push(data[i].id)
+ // console.log(data[i].assets.id)
+ }
+
+ // console.log('id=',this.approvalAssetsId)
this.assetsList = this.assetsList.concat(data); //杩藉姞鏂版暟鎹�
- console.log(this.assetsList.length)
+
this.mescroll.endBySize(this.assetsList.length, res.data.total);
- }
- else{
+ } else {
this.mescroll.endBySize(0, 0);
}
-
+
})
.catch(err => {
this.mescroll.endErr();
@@ -186,21 +209,21 @@
let data = res.data.data;
//鑾峰彇棰嗙敤鐨勬ā鏉縄D
for (let i = 0; i < data.length; i++) {
- if (data[i].type === 2) {
+ if (data[i].type === 3) {
this.templateId = data[i].templateId;
break;
}
}
console.log('妯℃澘ID=' + this.templateId)
}
-
-
+
+
}).catch(err => {
-
+
console.log(err.data)
})
},
-
+
submit() {
this.isDisabled = true;
if (this.reason.length <= 0) {
@@ -215,42 +238,46 @@
this.isDisabled = false;
this.$refs.uToast.show({
type: 'error',
- message: "璇烽�夋嫨涓�涓垨澶氫釜棰嗙敤璧勪骇锛�"
+ message: "璇烽�夋嫨涓�涓垨澶氫釜鍊熺敤璧勪骇锛�"
});
-
+
return;
}
-
+
this.submitApply();
},
-
+
submitApply() {
let assets = [];
for (let i = 0; i < this.valueList.length; i++) {
if (this.valueList[i] > 0) {
let item = this.assetsList[i];
assets.push({
- "id": item.id,
- "name": item.name,
- "serialNumber": item.serialNumber,
- "quantity": this.valueList[i]
+ "id": 31377,
+ "name": item.assets.name,
+ "serialNumber": item.assets.serialNumber,
+ "quantity": this.valueList[i],
+ "approvalAssetsId":this.approvalAssetsId[i]==="0"?"":this.approvalAssetsId[i]
})
}
}
-
- // console.log(assets);
+
+ console.log(assets);
let data = {
"assets": assets,
"templateId": this.templateId,
- "reason": this.reason
+ "reason": this.reason,
+ "approvalAssetsId":140
}
-
+
+ console.log('data=',data)
+
this.$http.post('/assets/approval/submit', data)
.then(res => {
- // debugger;
+ debugger;
if (res.data.code === 0) {
console.log("鎴愬姛浜�");
- this.reason="";
+ this.reason = "";
this.$refs.uToast.show({
type: 'success',
message: "鎻愪氦鎴愬姛"
@@ -262,7 +289,7 @@
});
}
this.isDisabled = false;
-
+
}).catch(err => {
this.isDisabled = false;
console.log(err.data)
@@ -275,7 +302,7 @@
<style lang="scss">
/* 椤堕儴 fixed瀹氫綅*/
- .top-warp{
+ .top-warp {
z-index: 200;
position: fixed;
top: var(--window-top);
@@ -285,17 +312,17 @@
padding-top: 10rpx;
font-size: 28rpx;
text-align: center;
- background-color: #CFE0DA;
+ background-color: #FFFFFF;
}
-
+
// 璁剧疆padding
.mescroll-body,
- /deep/.mescroll-body{
+ /deep/.mescroll-body {
padding-left: 0rpx;
}
-
+
/* 搴曢儴 fixed瀹氫綅*/
- .bottom-warp{
+ .bottom-warp {
z-index: 200;
position: fixed;
left: 0;
@@ -303,13 +330,13 @@
width: 100%;
background-color: #FFFFFF;
}
-
+
.itembox {
/* 鐖跺鍣ㄨ缃搴�, 骞惰秴鍑洪儴鍒嗕笉鏄剧ず */
width: 100%;
height: 100%;
overflow: scroll;
-
+
.item {
/* 瀛愬鍣ㄦ瘮鐖跺鍣ㄧ殑瀹藉害澶� 17 px, 缁忔祴姝ｅソ鏄粴鍔ㄦ潯鐨勯粯璁ゅ搴� */
// width: 5517px;
@@ -318,33 +345,33 @@
text-align: center;
overflow-y: scroll;
}
-
+
}
-
+
.content-box {
position: relative;
// border: 1rpx red solid;
height: 50vh;
}
-
+
.search-box {
background-color: #FFFFFF;
// margin-top: 88rpx;
z-index: 200;
- top:88rpx;
+ top: 88rpx;
width: 100%;
position: fixed;
padding: 10rpx 30rpx 0rpx 30rpx;
// border: 1rpx red solid;
}
-
-
+
+
.numbox {
margin-left: 20rpx;
}
-
+
.minus {
-
+
width: 15px;
height: 15px;
border-width: 1px;
@@ -357,11 +384,11 @@
justify-content: center;
align-items: center;
}
-
+
.input {
padding: 0 5px;
}
-
+
.plus {
width: 15px;
height: 15px;
@@ -373,4 +400,4 @@
justify-content: center;
align-items: center;
}
-</style>
\ No newline at end of file
+</style>
--
Gitblit v1.9.1