bug

jiangping

2023-11-07 64b432916af9c9218ab3f3eca614e26c542142ae

 minipro_standard/pages/index/index.vue

@@ -1,44 +1,605 @@
<template>

   <view class="index">

      <web-view v-if="show" @onPostMessage="onMessage" :src="'https://dmtest.ahapp.net/doumeeplant_h5/#/appletLogin?code=' + code"></web-view>

      <!-- <myTabbar :index="0" /> -->

   </view>

</template>



<script>

   // import myTabbar from "@/components/myTabber.vue"	
   export default {

      // components: {

      //    myTabbar

      // },

      data() {

         return {

            code: '',

            show: false

         }

      },

      onLoad() {

         var that = this

         uni.login({

            provider: 'weixin',

            success: function (loginRes) {

               // console.log(loginRes);

               that.code = loginRes.code

               that.show = true

            }

         });

      },

      methods: {

         onMessage(e) {

            console.log('12345654321')

         }

      }

   }

</script>



<style lang="scss" scoped>

   .index {

      width: 100vw;

      height: 100vh;

   }

<template>
   <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="plr30 pb30 nav-style">
            <view
               :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="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>
               <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">
                     <image src="../../static/daiban_ic_daiban@2x.png" mode=""></image>
                  </view>
                  <view class="box_list_item_nr">
                     <view class="box_list_item_nr_top">
                        <span>{{item.title}}</span>
                        <span>{{item.createTime}}</span>
                     </view>
                     <view class="box_list_item_nr_bottom">
                        {{item.content}}
                     </view>
                  </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">
         <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" />
   </view>
</template>

<script>
   import myTabbar from "@/components/myTabber.vue"
   import {
      getList,
      pageCount
   } from '@/util/api/agencyAPI'
   import {
      mapState
   } from 'vuex'
   export default {
      components: {
         myTabbar
      },
      data() {
         return {
            code: '',
            windowHeight: '',
            show: false,
            types: [{
                  id: 0,
                  name: '车间领料-待发货'
               },
               {
                  id: 1,
                  name: '车间领料-待入库'
               },
               {
                  id: 2,
                  name: '机台备料-待发货'
               },
               {
                  id: 3,
                  name: '机台备料-待入库'
               },
               {
                  id: 4,
                  name: '完工入库-待接收'
               },
               {
                  id: 5,
                  name: '库存转库-待发货'
               },
               {
                  id: 6,
                  name: '库存转库-待入库'
               },
               {
                  id: 7,
                  name: '申请审批'
               },
               {
                  id: 8,
                  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
            },
            projectList: [{
                  title: '212132',
                  createTime: '2023-08-28',
                  content: 'asdsadsax手打大萨达的啊实打as'
               },
               {
                  title: '212132',
                  createTime: '2023-08-28',
                  content: 'asdsadsax手打大萨达的啊实打as'
               },
               {
                  title: '212132',
                  createTime: '2023-08-28',
                  content: 'asdsadsax手打大萨达的啊实打as'
               },
               {
                  title: '212132',
                  createTime: '2023-08-28',
                  content: 'asdsadsax手打大萨达的啊实打as'
               },
            ]
>>>>>>> 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({
            success: res => {
               this.windowHeight = res.windowHeight
            }
         })
         this.loadData()
      },
      methods: {
         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) {
            if (this.searchForm.status == status) return
            this.searchForm.status = status
            this.scrolltoupper()
         },
         selectProject(item) {},
         filterAction() {
            this.show = true
         },
         close() {
            this.show = false
>>>>>>> 89d77a7cd7285feda993bffec2513892f8bd355f
         }
      }
   }
</script>

<style lang="scss" scoped>
   .index {
      width: 100vw;
      height: 100vh;
   }

   .nav-style {
      border-bottom: 20rpx #f7f7f7 solid;
   }

   .box_list {
      width: 100%;
      padding: 0 30rpx;
      display: flex;
      flex-direction: column;
      box-sizing: border-box;

      .box_list_item {
         padding: 30rpx 0;
         display: flex;
         border-bottom: 1rpx solid #E5E5E5;

         &:last-child {
            border: none;
         }

         .box_list_item_icon {
            flex-shrink: 0;
            width: 64rpx;
            height: 64rpx;
            margin-right: 24rpx;
            position: relative;

            .box_list_item_icon_active {
               position: absolute;
               right: 0;
               top: 0;
               width: 18rpx;
               height: 18rpx;
               border-radius: 50%;
               background: #DE5243;
               border: 2rpx solid #FFFFFF;
            }

            image {
               width: 100%;
               height: 100%;
            }
         }

         .box_list_item_nr {
            flex: 1;
            display: flex;
            flex-direction: column;

            .box_list_item_nr_top {
               display: flex;
               align-items: center;
               justify-content: space-between;

               span {
                  &:first-child {
                     font-size: 30rpx;
                     font-weight: 500;
                     max-width: 450rpx;
                     color: #222222;
                     overflow: hidden;
                     white-space: nowrap;
                     text-overflow: ellipsis;
                     -o-text-overflow: ellipsis;
                  }

                  &:last-child {
                     flex-shrink: 0;
                     font-size: 24rpx;
                     font-weight: 400;
                     color: #999999;
                     margin-left: 10rpx;
                     overflow: hidden;
                     white-space: nowrap;
                     text-overflow: ellipsis;
                     -o-text-overflow: ellipsis;
                  }
               }
            }

            .box_list_item_nr_bottom {
               font-size: 28rpx;
               font-weight: 400;
               color: #666666;
               margin-top: 16rpx;
               word-break: break-all;
            }
         }
      }
   }
   .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: 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>