From d7fe8ae3888c8e2b1eea3c1e3769be0d42a21cc9 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 16 十月 2023 09:03:47 +0800
Subject: [PATCH] Merge branch '1.0.3' of http://139.186.142.91:10010/r/productDev/dmMes into 1.0.3
---
minipro_standard/pages/index/index.vue | 258 ++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 212 insertions(+), 46 deletions(-)
diff --git a/minipro_standard/pages/index/index.vue b/minipro_standard/pages/index/index.vue
index 64e35c7..8930d13 100644
--- a/minipro_standard/pages/index/index.vue
+++ b/minipro_standard/pages/index/index.vue
@@ -2,19 +2,44 @@
<view class="index">
<!-- <web-view v-if="show" @onPostMessage="onMessage" :src="'https://dmtest.ahapp.net/doumeeplant_h5/#/appletLogin?code=' + code"></web-view> -->
<!-- {{$store.state.statusbarHeight}} -->
+<<<<<<< HEAD
+ <div class="content_search">
+ <v-Search @searchInput="searchForm.mixParam" @submit="search" @reset="reset" :isShow="true"
+ placeholder="鎼滅储鍏抽敭瀛�">
+ <template v-slot:content>
+ <div class="Search_item">
+ <div class="Search_item_label">璁″垝鏃ユ湡</div>
+ <div class="Search_item_content" @click="isOpenDate = true">
+ <div class="Search_item_content_a" :style="searchForm.startDate ? 'color: #000;' : ''">
+ {{ searchForm.startDate ? searchForm.startDate : '寮�濮嬫棩鏈�'}}
+ </div>
+ <span>-</span>
+ <div class="Search_item_content_a" :style="searchForm.endDate ? 'color: #000;' : ''">
+ {{ searchForm.endDate ? searchForm.endDate : '缁撴潫鏃ユ湡'}}
+ </div>
+ </div>
+ </div>
+ </template>
+ </v-Search>
+ <div class="content_search_x"></div>
+ <v-LableSelection :TagList="tagList" :isShow="true" @change="clickTag"></v-LableSelection>
+ </div>
+=======
+>>>>>>> 89d77a7cd7285feda993bffec2513892f8bd355f
<u-sticky>
- <view class="plr50 pb30 nav-style">
+ <view class="plr30 pb30 nav-style">
<view
- :style="{paddingTop: `${statusbarHeight}px`, height: `${navHeight}px`, lineHeight:`${navHeight}px`, textAlign: 'center'}">
+ :style="{background: '#fff', zIndex: '999', paddingTop: `${statusbarHeight}px`, height: `${navHeight}px`, lineHeight:`${navHeight}px`, textAlign: 'center'}">
寰呭姙</view>
<view class="cY">
- <u-search placeholder="鎼滅储鍏抽敭瀛�" bgColor="#f7f7f7" :showAction="false" @search="scrolltoupper"
+ <u-search placeholder="鎼滅储鍏抽敭瀛�" bgColor="#f7f7f7" :showAction="false" @search="search"
shape="square" v-model="searchForm.mixParam"></u-search>
<image src="../../static/filter@2x.png" class="img48 ml20" @click="filterAction" mode=""></image>
</view>
- <view class="cY mt30">
- <view v-for="item in tagList" :key="item.id" class="sbtn rd8 mr10"
+<<<<<<< HEAD
+ <view class="cY mt30 bg_w">
+ <view v-for="item in tagList" :key="item.id" class="tag_item mr10"
:class="searchForm.status==item.id?'sbtn_green':'sbtn_black_rim'" @click="selectType(item.id)">
{{`${item.name}(${item.num})`}}
</view>
@@ -25,6 +50,20 @@
@refresherrefresh="refresh"
>
<view v-for="(item, index) in projectList" :key="index">
+=======
+ <view class="cY mt30">
+ <view class="sbtn rd8" :class="searchForm.status==0?'sbtn_green':'sbtn_black_rim'"
+ @click="selectType(0)">寰呭姙</view>
+ <view class="sbtn rd8 ml20" :class="searchForm.status==1?'sbtn_green':'sbtn_black_rim'"
+ @click="selectType(1)">宸插姙</view>
+ </view>
+ </view>
+ </u-sticky>
+
+ <u-list :showScrollbar="false" @scrolltolower="scrolltolower" @scrolltoupper="scrolltoupper"
+ :height="windowHeight - (statusbarHeight + navHeight + 120) + 'px'">
+ <u-list-item v-for="(item, index) in projectList" :key="index">
+>>>>>>> 89d77a7cd7285feda993bffec2513892f8bd355f
<view class="box_list">
<view class="box_list_item" @click="jump(item)">
<view class="box_list_item_icon">
@@ -41,6 +80,7 @@
</view>
</view>
</view>
+<<<<<<< HEAD
</view>
</scroll-view>
<view v-else class="tc c6">鏆傛棤鏁版嵁...</view>
@@ -50,7 +90,7 @@
<view class="content">
<u-grid col="2" :border="false">
<u-grid-item v-for="item in types" :key="item.id">
- <view class="ptb20 c9 type-style tc rd10" :class="type===item.id?'sbtn_green':'sbtn_gray'"
+ <view class="ptb20 f26 c9 type-style tc rd10" :class="type===item.id?'sbtn_green':'sbtn_gray'"
@click="type=item.id">{{ item.name }}</view>
</u-grid-item>
</u-grid>
@@ -59,6 +99,17 @@
<view class="fx1 ptb20 sbtn_gray c9" @click="resetType">閲嶇疆</view>
<view class="fx1 ml20 ptb20 sbtn_green" @click="confirm">纭畾</view>
</view>
+=======
+ </u-list-item>
+ </u-list>
+ <u-popup :show="show" @close="close" :round="8" zIndex="20000">
+ <view class="rp p40 contanir">
+ <view class="c2 b">绫诲瀷</view>
+ <view class="flex ap tc bottom-view">
+ <view class="fx1 ptb20 sbtn_gray c9">閲嶇疆</view>
+ <view class="fx1 ml20 ptb20 sbtn_green">纭畾</view>
+ </view>
+>>>>>>> 89d77a7cd7285feda993bffec2513892f8bd355f
</view>
</u-popup>
<myTabbar :index="0" />
@@ -120,6 +171,7 @@
name: '瀹㈤��/杩斿搧鍥炲巶妫�楠�'
}
],
+<<<<<<< HEAD
tagList: [{
id: 0,
name: '寰呭姙',
@@ -145,6 +197,33 @@
triggered: false,
finished: false,
projectList: []
+=======
+ searchForm: {
+ name: '',
+ status: 0
+ },
+ projectList: [{
+ title: '212132',
+ createTime: '2023-08-28',
+ content: 'asdsadsax鎵嬫墦澶ц惃杈剧殑鍟婂疄鎵揳s'
+ },
+ {
+ title: '212132',
+ createTime: '2023-08-28',
+ content: 'asdsadsax鎵嬫墦澶ц惃杈剧殑鍟婂疄鎵揳s'
+ },
+ {
+ title: '212132',
+ createTime: '2023-08-28',
+ content: 'asdsadsax鎵嬫墦澶ц惃杈剧殑鍟婂疄鎵揳s'
+ },
+ {
+ title: '212132',
+ createTime: '2023-08-28',
+ content: 'asdsadsax鎵嬫墦澶ц惃杈剧殑鍟婂疄鎵揳s'
+ },
+ ]
+>>>>>>> 89d77a7cd7285feda993bffec2513892f8bd355f
}
},
computed: {
@@ -159,7 +238,6 @@
uni.getSystemInfo({
success: res => {
this.windowHeight = res.windowHeight
-
}
})
this.loadData()
@@ -186,6 +264,7 @@
this.triggered = false
})
},
+<<<<<<< HEAD
refresh() {
if (this.triggered) return
this.triggered = true;
@@ -198,26 +277,69 @@
},
selectType(status) {
if (this.searchForm.status == status) return
- this.searchForm.status = status
- this.scrolltolower()
+ this.searchForm.status = status
+ this.search()
},
jump(item) {
- console.log(item);
- if ((item.type === 0 || item.type === 2 || item.type === 5) && item.status === 0) { // 璺宠浆鍑哄簱(杞簱鍗�)
- console.log('鍑哄簱');
- uni.navigateTo({
- url: `/pages/OutOperation/OutOperation?id=${item.objId}&dbid=${item.id}&type=7`
- })
- } else if ((item.type === 0 || item.type === 2 || item.type === 5) && item.status === 1) {
- // router.push({
- // name: 'wTransferDetail',
- // query: {
- // id: item.objId,
- // status: item.status,
- // type: item.type,
- // dbid: item.id
- // }
- // })
+ switch(item.type) {
+ case 0: case 2: case 5: {
+ if (item.status === 0) {
+ uni.navigateTo({
+ url: `/pages/OutOperation/OutOperation?id=${item.objId}&dbid=${item.id}&type=7`
+ })
+ } else {
+ uni.navigateTo({
+ url: `/pages_adjust/pages/warehousingDetails/warehousingDetails?id=${item.objId}&status=${item.status}&type=${item.type}&dbid=${item.id}`
+ })
+ }
+ break
+ }
+ case 3: {
+ if (item.status==0) {
+
+ } else{
+ uni.navigateTo({
+ url: `/pages_adjust/pages/warehousingDetails/warehousingDetails?id=${item.objId}`
+ })
+ }
+ break
+ }
+ case 4: {
+ break
+ }
+ case 1: case 6: {
+ if (item.status === 0) {
+ uni.navigateTo({
+ url: `/pages/InOperation/InOperation?id=${item.objId}&dbid=${item.id}&type=7`
+ })
+ } else {
+ uni.navigateTo({
+ url: `/pages_adjust/pages/warehousingDetails/warehousingDetails?id=${item.objId}`
+ })
+ }
+ break
+ }
+ case 9: {
+ if (item.status === 0) {
+ uni.navigateTo({
+ url: `/pages/InOperation/InOperation?id=${item.objId}&dbid=${item.id}&type=9`
+ })
+ } else{
+ uni.navigateTo({
+ url: `/pages_adjust/pages_adjust/pages/warehousingDetails1/warehousingDetails1?id=${item.objId}`
+ })
+ }
+ }
+ default: {
+
+ }
+ }
+ /**
+ *
+ * if ((item.type === 0 || item.type === 2 || item.type === 5) && item.status === 0) { // 璺宠浆鍑哄簱(杞簱鍗�)
+
+ } else if ((item.type === 0 || item.type === 2 || item.type === 5) && item.status === 1) {
+
} else if ((item.type === 1 || item.type === 4 || item.type === 6) && item.status === 0) { // 璺宠浆鍏ュ簱(杞簱鍗�)
if (item.type === 4) { // 璺宠浆瀹屽伐鍏ュ簱璇︽儏
// router.push({
@@ -233,21 +355,9 @@
return
}
uni.navigateTo({
- url: '/pages/InOperation/InOperation',
- query: {
- id: item.objId,
- dbid: item.id,
- type: 7
- }
+ url: `/pages/InOperation/InOperation?id=${item.objId}&dbid=${item.id}&type=7`
})
- // router.push({
- // name: 'warehousing',
- // query: {
- // id: item.objId,
- // dbid: item.id,
- // type: 7
- // }
- // })
+
} else if ((item.type === 1 || item.type === 4 || item.type === 6) && item.status === 1) {
if (item.type === 4) { // 璺宠洓瀹屽伐鍏ュ簱璇︽儏
// router.push({
@@ -260,7 +370,10 @@
// }
// })
return
- }
+ }
+ uni.navigateTo({
+ url: `/pages/warehousingDetails/warehousingDetails?id=${item.objId}`
+ })
// router.push({
// name: 'wTransferDetail',
// query: {
@@ -276,14 +389,19 @@
// }
// })
} else if (item.type === 3 && item.status === 1) { // 澶囨枡锛堣浆搴撳崟璇︽儏锛�
- // router.push({ name: 'wInboundDetail', query: { id: item.objId } })
+ uni.navigateTo({
+ url: `/pages/warehousingDetails/warehousingDetails?id=${item.objId}`
+ })
// router.push({
// name: 'wTransferDetail',
// query: {
// id: item.objId
// }
// })
- } else if (item.type === 9 && item.status === 0) { // 璋冩暣鍏ュ簱(鍏ュ簱鍗�)
+ } else if (item.type === 9 && item.status === 0) { // 璋冩暣鍏ュ簱(鍏ュ簱鍗�)
+ uni.navigateTo({
+ url: `/pages/InOperation/InOperation?id=${item.objId}&dbid=${item.id}&type=9`
+ })
// router.push({
// name: 'warehousing',
// query: {
@@ -292,14 +410,22 @@
// type: 9
// }
// })
- } else if (item.type === 9 && item.status === 1) {
+ } else if (item.type === 9 && item.status === 1) {
+ uni.navigateTo({
+ url: `/pages_adjust/pages/warehousingDetails1/warehousingDetails1?id=${item.objId}`
+ })
// router.push({
// name: 'wInboundDetail',
// query: {
// id: item.objId
// }
// })
- }
+ }
+ *
+ *
+ * */
+
+
},
filterAction() {
this.show = true
@@ -314,8 +440,27 @@
},
confirm() {
this.searchForm.type = this.type
- this.show = false
+ this.show = false
+ this.search()
+ },
+ search() {
+ this.page.page = 1
+ this.loadData()
+=======
+ scrolltolower() {},
+ scrolltoupper() {},
+ selectType(status) {
+ if (this.searchForm.status == status) return
+ this.searchForm.status = status
this.scrolltoupper()
+ },
+ selectProject(item) {},
+ filterAction() {
+ this.show = true
+ },
+ close() {
+ this.show = false
+>>>>>>> 89d77a7cd7285feda993bffec2513892f8bd355f
}
}
}
@@ -416,6 +561,14 @@
}
}
}
+ }
+ .contanir {
+ min-height: calc(env(safe-area-inset-bottom) + 120rpx);
+ }
+ .bottom-view {
+ left: 40rpx;
+ right: 40rpx;
+ bottom: env(safe-area-inset-bottom);
}
.contanir {
@@ -434,6 +587,19 @@
.bottom-view {
left: 40rpx;
right: 40rpx;
- bottom: 0
+ bottom: 40rpx
+ }
+ .tag_item {
+ min-width: 120rpx;
+ // padding: 0 24rpx;
+ border-radius: 26rpx;
+ text-align: center;
+ flex-shrink: 0;
+ margin-right: 20rpx;
+ border: 1rpx solid #CCCCCC;
+ font-size: 26rpx;
+ font-weight: 400;
+ height: 52rpx;
+ line-height: 52rpx;
}
</style>
--
Gitblit v1.9.3