From c7c49be8b15e6355dc19e8705dc7bc2de603e398 Mon Sep 17 00:00:00 2001
From: Mr.Shi <1878285526@qq.com>
Date: 星期一, 04 九月 2023 12:00:05 +0800
Subject: [PATCH] Merge branch 'dev' of ssh://139.186.142.91:29418/productDev/dmMes into dev
---
minipro_standard/pages/index/index.vue | 169 ++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 146 insertions(+), 23 deletions(-)
diff --git a/minipro_standard/pages/index/index.vue b/minipro_standard/pages/index/index.vue
index e6335a7..9c02c28 100644
--- a/minipro_standard/pages/index/index.vue
+++ b/minipro_standard/pages/index/index.vue
@@ -45,11 +45,20 @@
</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>
+ <view class="c2 b">绫诲瀷</view>
+ <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'"
+ @click="type=item.id">{{ item.name }}</view>
+ </u-grid-item>
+ </u-grid>
+ </view>
+ <view class="flex ap tc bottom-view">
+ <view class="fx1 ptb20 sbtn_gray c9" @click="resetType">閲嶇疆</view>
+ <view class="fx1 ml20 ptb20 sbtn_green" @click="confirm">纭畾</view>
+ </view>
</view>
</u-popup>
<myTabbar :index="0" />
@@ -106,10 +115,12 @@
id: 8,
name: '瀹㈤��/杩斿搧鍥炲巶妫�楠�'
}
- ],
+ ],
+ type: '',
searchForm: {
name: '',
- status: 0
+ status: 0,
+ type: ''
},
projectList: [{
title: '212132',
@@ -150,14 +161,10 @@
success: function(loginRes) {
// console.log(loginRes);
that.code = loginRes.code
- that.show = true
}
});
},
methods: {
- onMessage(e) {
- console.log('12345654321')
- },
scrolltolower() {},
scrolltoupper() {},
selectType(status) {
@@ -165,12 +172,117 @@
this.searchForm.status = status
this.scrolltoupper()
},
- selectProject(item) {},
+ jump(item) {
+ if ((item.type === 0 || item.type === 2 || item.type === 5) && item.status === 0) { // 璺宠浆鍑哄簱(杞簱鍗�)
+ router.push({
+ name: 'issueOperation',
+ query: {
+ 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
+ }
+ })
+ // router.push({ name: 'wTransferDetail', query: { id: item.objId, status: 0, type: item.type, dbid: item.id } })
+ } else if ((item.type === 1 || item.type === 4 || item.type === 6) && item.status === 0) { // 璺宠浆鍏ュ簱(杞簱鍗�)
+ if (item.type === 4) { // 璺宠浆瀹屽伐鍏ュ簱璇︽儏
+ router.push({
+ name: 'completionDetails',
+ query: {
+ id: item.objId,
+ dbid: item.id,
+ type: 7,
+ isShow: 1,
+ Type: item.type
+ }
+ })
+ return
+ }
+ 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({
+ name: 'completionDetails',
+ query: {
+ id: item.objId,
+ dbid: item.id,
+ type: 7,
+ isShow: 2
+ }
+ })
+ return
+ }
+ router.push({
+ name: 'wTransferDetail',
+ query: {
+ id: item.objId
+ }
+ })
+ } else if (item.type === 3 && item.status === 0) { // 纭澶囨枡
+ router.push({
+ name: 'orderStock',
+ query: {
+ id: item.objId,
+ dbid: item.id
+ }
+ })
+ } else if (item.type === 3 && item.status === 1) { // 澶囨枡锛堣浆搴撳崟璇︽儏锛�
+ // router.push({ name: 'wInboundDetail', query: { id: item.objId } })
+ router.push({
+ name: 'wTransferDetail',
+ query: {
+ id: item.objId
+ }
+ })
+ } else if (item.type === 9 && item.status === 0) { // 璋冩暣鍏ュ簱(鍏ュ簱鍗�)
+ router.push({
+ name: 'warehousing',
+ query: {
+ id: item.objId,
+ dbid: item.id,
+ type: 9
+ }
+ })
+ } else if (item.type === 9 && item.status === 1) {
+ router.push({
+ name: 'wInboundDetail',
+ query: {
+ id: item.objId
+ }
+ })
+ }
+ },
filterAction() {
this.show = true
- },
- close() {
- this.show = false
+ },
+ close() {
+ this.show = false
+ },
+ resetType() {
+ this.type = ''
+ this.searchForm.type = ''
+ this.confirm()
+ },
+ confirm() {
+ this.searchForm.type = this.type
+ this.show = false
+ this.scrolltoupper()
}
}
}
@@ -271,13 +383,24 @@
}
}
}
- }
- .contanir {
- min-height: calc(env(safe-area-inset-bottom) + 120rpx);
- }
- .bottom-view {
- left: 40rpx;
- right: 40rpx;
- bottom: env(safe-area-inset-bottom);
+ }
+
+ .contanir {
+ height: calc(env(safe-area-inset-bottom) + 720rpx);
+
+ .content {
+ margin-top: 20rpx;
+
+ .type-style {
+ width: 325rpx;
+ margin-bottom: 20rpx;
+ }
+ }
+ }
+
+ .bottom-view {
+ left: 40rpx;
+ right: 40rpx;
+ bottom: 0
}
</style>
--
Gitblit v1.9.3