From 1f4e7d0f73a73e7350cf5a1df279d5f30904c5d5 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 06 十二月 2023 08:41:32 +0800
Subject: [PATCH] bug
---
minipro_standard/pages/index/index.vue | 354 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 338 insertions(+), 16 deletions(-)
diff --git a/minipro_standard/pages/index/index.vue b/minipro_standard/pages/index/index.vue
index e6335a7..8930d13 100644
--- a/minipro_standard/pages/index/index.vue
+++ b/minipro_standard/pages/index/index.vue
@@ -2,17 +2,55 @@
<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"
- shape="square" v-model="searchForm.name"></u-search>
+ <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>
+<<<<<<< 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>
+ </view>
+ </view>
+ </u-sticky>
+ <scroll-view v-if="projectList.length" scroll-y refresher-enabled="true" :refresher-triggered="triggered" @scrolltolower="loadMore"
+ @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>
@@ -25,6 +63,7 @@
<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,26 @@
</view>
</view>
</view>
+<<<<<<< HEAD
+ </view>
+ </scroll-view>
+ <view v-else class="tc c6">鏆傛棤鏁版嵁...</view>
+ <u-popup :show="show" @close="close" :round="8" zIndex="20000">
+ <view class="rp p40 contanir">
+ <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 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>
+ </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>
+=======
</u-list-item>
</u-list>
<u-popup :show="show" @close="close" :round="8" zIndex="20000">
@@ -50,6 +109,7 @@
<view class="fx1 ptb20 sbtn_gray c9">閲嶇疆</view>
<view class="fx1 ml20 ptb20 sbtn_green">纭畾</view>
</view>
+>>>>>>> 89d77a7cd7285feda993bffec2513892f8bd355f
</view>
</u-popup>
<myTabbar :index="0" />
@@ -58,6 +118,10 @@
<script>
import myTabbar from "@/components/myTabber.vue"
+ import {
+ getList,
+ pageCount
+ } from '@/util/api/agencyAPI'
import {
mapState
} from 'vuex'
@@ -107,6 +171,33 @@
name: '瀹㈤��/杩斿搧鍥炲巶妫�楠�'
}
],
+<<<<<<< HEAD
+ tagList: [{
+ id: 0,
+ name: '寰呭姙',
+ num: 0
+ },
+ {
+ id: 1,
+ name: '宸插姙',
+ num: 0
+ }
+ ],
+ type: '',
+ searchForm: {
+ mixParam: '',
+ status: 0,
+ type: ''
+ },
+ page: {
+ total: 0,
+ capacity: 10,
+ page: 1,
+ },
+ triggered: false,
+ finished: false,
+ projectList: []
+=======
searchForm: {
name: '',
status: 0
@@ -132,10 +223,16 @@
content: 'asdsadsax鎵嬫墦澶ц惃杈剧殑鍟婂疄鎵揳s'
},
]
+>>>>>>> 89d77a7cd7285feda993bffec2513892f8bd355f
}
},
computed: {
...mapState(['statusbarHeight', 'navHeight']),
+ },
+ async mounted() {
+ await this.$store.dispatch('getUpcomingNum')
+ this.tagList[0].num = this.$store.state.upcomingNum.d
+ this.tagList[1].num = this.$store.state.upcomingNum.y
},
onLoad() {
uni.getSystemInfo({
@@ -143,21 +240,213 @@
this.windowHeight = res.windowHeight
}
})
-
- var that = this
- uni.login({
- provider: 'weixin',
- success: function(loginRes) {
- // console.log(loginRes);
- that.code = loginRes.code
- that.show = true
- }
- });
+ this.loadData()
},
methods: {
- onMessage(e) {
- console.log('12345654321')
+ loadData() {
+ getList({
+ model: this.searchForm,
+ ...this.page
+ })
+ .then(res => {
+ let data = res.data
+ if (data.page == 1) {
+ this.projectList = []
+ }
+ this.page.page = data.page
+ this.page.total = data.total
+ this.projectList.push(...data.records)
+ })
+ .catch(err => {
+
+ })
+ .finally(() => {
+ this.triggered = false
+ })
},
+<<<<<<< HEAD
+ refresh() {
+ if (this.triggered) return
+ this.triggered = true;
+ this.page.page = 1
+ this.loadData()
+ },
+ loadMore() {
+ this.page.page += 1
+ this.loadData()
+ },
+ selectType(status) {
+ if (this.searchForm.status == status) return
+ this.searchForm.status = status
+ this.search()
+ },
+ jump(item) {
+ 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({
+ // name: 'completionDetails',
+ // query: {
+ // id: item.objId,
+ // dbid: item.id,
+ // type: 7,
+ // isShow: 1,
+ // Type: item.type
+ // }
+ // })
+ return
+ }
+ uni.navigateTo({
+ url: `/pages/InOperation/InOperation?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
+ }
+ uni.navigateTo({
+ url: `/pages/warehousingDetails/warehousingDetails?id=${item.objId}`
+ })
+ // 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) { // 澶囨枡锛堣浆搴撳崟璇︽儏锛�
+ 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) { // 璋冩暣鍏ュ簱(鍏ュ簱鍗�)
+ uni.navigateTo({
+ url: `/pages/InOperation/InOperation?id=${item.objId}&dbid=${item.id}&type=9`
+ })
+ // router.push({
+ // name: 'warehousing',
+ // query: {
+ // id: item.objId,
+ // dbid: item.id,
+ // type: 9
+ // }
+ // })
+ } 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
+ },
+ close() {
+ this.show = false
+ },
+ resetType() {
+ this.type = ''
+ this.searchForm.type = ''
+ this.confirm()
+ },
+ confirm() {
+ this.searchForm.type = this.type
+ this.show = false
+ this.search()
+ },
+ search() {
+ this.page.page = 1
+ this.loadData()
+=======
scrolltolower() {},
scrolltoupper() {},
selectType(status) {
@@ -171,6 +460,7 @@
},
close() {
this.show = false
+>>>>>>> 89d77a7cd7285feda993bffec2513892f8bd355f
}
}
}
@@ -280,4 +570,36 @@
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: 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