From 2667d6931e0f85f3dda26238330d9c45385025cf Mon Sep 17 00:00:00 2001
From: wzp <2880584989@qq.com>
Date: 星期一, 21 二月 2022 17:51:57 +0800
Subject: [PATCH] 最新版本
---
assetMgtH5/pages/assets/list.vue | 166 +++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 130 insertions(+), 36 deletions(-)
diff --git a/assetMgtH5/pages/assets/list.vue b/assetMgtH5/pages/assets/list.vue
index d16e7ea..2f4210e 100644
--- a/assetMgtH5/pages/assets/list.vue
+++ b/assetMgtH5/pages/assets/list.vue
@@ -9,7 +9,7 @@
</view>
<view class="search-box">
<view class="item">
- <u-search placeholder="璇疯緭鍏ュ叧閿瓧" v-model="keyword" :clearabled="true" :show-action="false"></u-search>
+ <u-search placeholder="璇疯緭鍏ュ叧閿瓧" v-model="keyword" :clearabled="true" :show-action="false" @search="onSearch"></u-search>
</view>
</view>
<view class="">
@@ -19,56 +19,62 @@
mode="widthFix"></image>
</u-cell>
</u-cell-group>
- <u-picker :show="show" ref="uPicker" :columns="columns" @confirm="confirm" @cancel="cancel"
+ <u-picker :show="show" ref="uPicker" :columns="columns" keyName="name" @confirm="confirm" @cancel="cancel"
@change="changeHandler">
</u-picker>
</view>
- <!-- 鎼滅储缁撴灉 -->
- <view class="cu-list menu-avatar">
- <view class="cu-item">
- <view class="cu-avatar radius lg"
- style="background-image:url(https://ossweb-img.qq.com/images/lol/web201310/skin/big81007.jpg);">
- </view>
- <view class="content">
- <view>
- <view class="text-cut text-bold text-xl">璇炬</view>
- <view class="cu-tag radius bg-orange sm">鏁伴噺锛�100</view>
+
+ <mescroll-body ref="mescrollRef" @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>
- <view class="text-gray text-sm flex">
- <view class="text-cut">瑙勬牸锛�120*120 鐧借壊 缂栫爜锛�1234533333</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>
+ <view class="text-gray text-sm flex">
+ <view class="text-cut">瑙勬牸锛歿{item.model?item.model:'鏃�'}} 缂栫爜锛歿{item.serialNumber}}</view>
+ </view>
</view>
</view>
-
</view>
- </view>
+ </mescroll-body>
- <view class="">
+ <!-- <view class="">
<u-empty mode="search" icon="http://cdn.uviewui.com/uview/empty/search.png">
</u-empty>
- </view>
+ </view> -->
</view>
</template>
<script>
+ import MescrollMixin from "@/uni_modules/mescroll-uni/components/mescroll-uni/mescroll-mixins.js";
+
export default {
+ mixins: [MescrollMixin], // 浣跨敤mixin
data() {
return {
keyword: '',
show: false,
- columns: [
- ['涓浗', '缇庡浗'],
- ['娣卞湷', '鍘﹂棬', '涓婃捣', '鎷夎惃']
- ],
+ columns: [],
columnData: [
- ['娣卞湷', '鍘﹂棬', '涓婃捣', '鎷夎惃'],
- ['寰楀窞', '鍗庣洓椤�', '绾界害', '闃挎媺鏂姞']
- ]
+ ],
+ newColumnData:[],
+ assetsList: [],
+ flag:false
}
},
- onShow() {
- this.getAssetList();
+ async onLoad() {
+ await this.getAssetsCategoryList();
},
+ onReady() {
+ },
+
methods: {
changeHandler(e) {
const {
@@ -97,22 +103,110 @@
showPicker() {
this.show = true;
},
-
- //璇锋眰
- getAssetList() {
- this.$http.get('/assets/approval/search',{params:{pageNum:"1",pageSize:"10",keyStr:''}})
+
+ onSearch(e) {
+ console.log("鎼滅储锛�" + this.keyword)
+ this.page = 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
+ }
+ })
.then(res => {
- debugger;
- let data = res.data;
- console.log(JSON.stringify(data.data))
- let tt = data.data;
- console.log(tt.length)
+ // debugger;
+ if (res.data.code === 0) {
+ let data = res.data.data;
+ console.log('鎬昏祫浜�'+ data.length)
+ if (page.num == 1) this.assetsList = []; //濡傛灉鏄涓�椤碉紝闇�鎵嬪姩缃┖鍒楄〃
+ this.assetsList = this.assetsList.concat(data); //杩藉姞鏂版暟鎹�
+ console.log(this.assetsList.length)
+ this.mescroll.endBySize(this.assetsList.length, res.data.total);
+ }
+ else{
+ this.mescroll.endBySize(0, 0);
+ }
+
+ })
+ .catch(err => {
+ this.mescroll.endErr();
+ console.log('寮傚父', err);
+ });
+ },
+
+
+ //璧勪骇绫诲埆
+ async getAssetsCategoryList() {
+ await this.$http.get('/assets/approval/getAssetsCategory')
+ .then(res => {
+ // debugger;
+ let tt=[]
+ if(res.data.code===0){
+ let data = res.data.data;
+ for(let i=0;i<data.length;i++){
+ let jsonData={
+ id:data[i].id,
+ name:data[i].name
+ }
+ tt.push(jsonData);
+
+ this.getAssetsTypes(data[i].id);
+ }
+ }
+
+ let newCloumns=[];
+ newCloumns.push(tt);
+ // newCloumns.push(this.newColumnData[0]);
+
+ this.columns = newCloumns;
+
}).catch(err => {
console.log(err.data)
})
+ },
+
+ async getAssetsTypes(id) {
+ await this.$http.get('/assets/approval/getAssetsTypes',{params:{parentId:id}})
+ .then(res => {
+ // debugger;
+ let typeData=[]
+ if(res.data.code===0){
+ let data = res.data.data;
+ for(let i=0;i<data.length;i++){
+ let jsonData={
+ id:data[i].id,
+ name:data[i].name
+ }
+ typeData.push(jsonData);
+ }
+ }
+ // console.log('typeData=',typeData)
+ this.columnData.push(typeData);
+
+ if(!this.flag){
+ this.columns.push(typeData);
+ this.flag=true;
+ }
+
+ }).catch(err => {
+ console.log('閿欒',err)
+ })
}
+
+
}
--
Gitblit v1.9.1