From 3878c57a2bd710295931303ea85439a596838dfd Mon Sep 17 00:00:00 2001
From: Mr.Shi <1878285526@qq.com>
Date: 星期二, 05 九月 2023 16:01:31 +0800
Subject: [PATCH] 小程序
---
minipro_standard/pages_adjust/pages/warehousingList/warehousingList.vue | 463 ++++++++++++++++++++++++++++++++++-----------------------
1 files changed, 273 insertions(+), 190 deletions(-)
diff --git a/minipro_standard/pages_adjust/pages/warehousingList/warehousingList.vue b/minipro_standard/pages_adjust/pages/warehousingList/warehousingList.vue
index 0649278..8999981 100644
--- a/minipro_standard/pages_adjust/pages/warehousingList/warehousingList.vue
+++ b/minipro_standard/pages_adjust/pages/warehousingList/warehousingList.vue
@@ -1,17 +1,18 @@
<template>
<view class="content">
<view class="content_search">
- <Search @searchInput="searchInput" @submit="submit" @reset="reset" :isShow="true"
- placeholder="鎼滅储鍏ュ簱鍗曞彿/鍏ュ簱浠撳簱">
+ <Search @searchInput="searchInput" @submit="submit" @reset="reset" :isShow="true" placeholder="鎼滅储鍏ュ簱鍗曞彿/鍏ュ簱浠撳簱">
<template v-slot:content>
<view class="Search_item">
<view class="Search_item_label">璁″垝鏃ユ湡</view>
<view class="Search_item_content" @click="openDate">
- <view class="Search_item_content_a" :style="listData.startDate ? 'color: #000' : ''">
- {{ listData.startDate ? listData.startDate : '寮�濮嬫棩鏈�'}}</view>
+ <view class="Search_item_content_a" :style="listData.planDateStart ? 'color: #000' : ''">
+ {{ listData.planDateStart ? listData.planDateStart : '寮�濮嬫棩鏈�'}}
+ </view>
<text>-</text>
- <view class="Search_item_content_a" :style="listData.endDate ? 'color: #000' : ''">
- {{ listData.endDate ? listData.endDate : '缁撴潫鏃ユ湡'}}</view>
+ <view class="Search_item_content_a" :style="listData.planDateEnd ? 'color: #000' : ''">
+ {{ listData.planDateEnd ? listData.planDateEnd : '缁撴潫鏃ユ湡'}}
+ </view>
</view>
</view>
<view class="Search_item">
@@ -30,7 +31,14 @@
</view>
<view class="content_total" :style="{top: top}">鍏眥{listData.total}}鏉℃暟鎹�</view>
<view class="content_list">
- <scroll-view @scrolltolower="getLists" scroll-y :style="{height: height}">
+ <scroll-view
+ :refresher-enabled="true"
+ :refresher-triggered="isLoading"
+ @refresherrefresh="onRefresh"
+ refresher-background="#fff"
+ @scrolltolower="getLists"
+ scroll-y
+ :style="{height: height}">
<view class="content_list_item" v-for="(item, i) in lists" :key="i" @click="jump(item)">
<!-- item澶撮儴瑙嗗浘 -->
<view class="content_list_item_top">
@@ -49,7 +57,7 @@
<view class="content_list_item_content_item">
<view class="content_list_item_content_item_label">鍗曟嵁绫诲瀷锛�</view>
<view class="content_list_item_content_item_nr">
- {{ orderTyepToStr(item.billType) }}
+ {{ seeText(item.billType) }}
</view>
</view>
<view class="content_list_item_content_item">
@@ -81,14 +89,21 @@
</scroll-view>
</view>
<!-- 閫夋嫨鏃ユ湡 -->
- <u-calendar :show="timeShow" @close="timeShow = false" @confirm="timeConfirm"></u-calendar>
+ <u-calendar :show="timeShow" mode="range" :minDate="minDate" :maxDate="maxDate" @close="timeShow = false"
+ @confirm="timeConfirm"></u-calendar>
</view>
</template>
<script>
import Search from '@/components/Search.vue'
import LabelSelection from '@/components/LabelSelection.vue'
- import { orderTyepToStr } from '@/util/constData.js'
+ import {
+ orderTyepToStr
+ } from '@/util/constData.js'
+ import {
+ getBoundList,
+ pageCount
+ } from "@/util/api/materialStorage";
export default {
components: {
Search,
@@ -98,6 +113,9 @@
return {
height: '',
top: '',
+ minDate: new Date('2021-01-31'),
+ maxDate: new Date(),
+ isLoading: false,
listData: {
capacity: 10,
page: 0,
@@ -106,60 +124,146 @@
planDateStart: "",
code: "",
originType: "",
- status: ""
+ status: "",
},
- types: [
- { name: '杞﹂棿棰嗘枡', id: '1', isActive: false },
- { name: '鏈哄彴澶囨枡', id: '2', isActive: false },
- { name: '杞﹂棿杞簱', id: '3', isActive: false },
- { name: '瀹屽伐鍏ュ簱', id: '4', isActive: false },
- { name: '璁″垝棰嗘枡', id: '5', isActive: false },
- { name: '澶栧崗棰嗘枡', id: '6', isActive: false },
- { name: '澶栧崗瀹屽伐杞簱', id: '7', isActive: false },
- { name: '浜у搧鍏ュ簱', id: '8', isActive: false },
- { name: '浜у搧杞簱', id: '9', isActive: false },
- { name: '璁╂鏀捐鍏ュ簱', id: '10', isActive: false },
- { name: '璁╂鏀捐杞簱', id: '11', isActive: false },
- { name: '瀹㈣繑杩斾慨棰嗘枡', id: '12', isActive: false },
- { name: '瀹㈣繑杩斾慨鍏ュ簱', id: '13', isActive: false },
- { name: '璺ㄧ粍缁囪浆搴�', id: '14', isActive: false },
- { name: '宸ュ簭鎶ュ簾', id: '15', isActive: false },
- { name: '瀹㈤��杩斾慨棰嗘枡', id: '16', isActive: false },
- { name: '瀹㈤��杩斾慨鍏ュ簱', id: '17', isActive: false },
- { name: '閿�鍞嚭搴�', id: '18', isActive: false },
- { name: '璁╂閿�鍞�', id: '19', isActive: false },
- { name: '宸ュ崟鎶曟枡', id: '20', isActive: false },
- { name: '浠撳簱鎶ュ簾', id: '21', isActive: false },
- { name: '瀹㈤��妫�楠岄鏂�', id: '22', isActive: false },
- { name: '瀹㈣繑妫�楠岄鏂�', id: '23', isActive: false },
- { name: '搴撳瓨璋冩暣', id: '28', isActive: false },
- { name: '搴熷搧鍏ュ簱', id: '30', isActive: false }
- ],
- tagList: [
- {
- id: "",
- name: "鍏ㄩ儴",
- num: '0',
+ types: [{
+ name: '杞﹂棿棰嗘枡',
+ id: '1',
+ isActive: false
},
{
- id: "0",
- name: "寰呭嚭搴�",
- num: '0',
+ name: '鏈哄彴澶囨枡',
+ id: '2',
+ isActive: false
},
{
- id: "1",
- name: "宸插嚭搴�",
- num: "0",
+ name: '杞﹂棿杞簱',
+ id: '3',
+ isActive: false
},
{
- id: "2",
- name: "宸插彇娑�",
- num: "0",
+ name: '瀹屽伐鍏ュ簱',
+ id: '4',
+ isActive: false
+ },
+ {
+ name: '璁″垝棰嗘枡',
+ id: '5',
+ isActive: false
+ },
+ {
+ name: '澶栧崗棰嗘枡',
+ id: '6',
+ isActive: false
+ },
+ {
+ name: '澶栧崗瀹屽伐杞簱',
+ id: '7',
+ isActive: false
+ },
+ {
+ name: '浜у搧鍏ュ簱',
+ id: '8',
+ isActive: false
+ },
+ {
+ name: '浜у搧杞簱',
+ id: '9',
+ isActive: false
+ },
+ {
+ name: '璁╂鏀捐鍏ュ簱',
+ id: '10',
+ isActive: false
+ },
+ {
+ name: '璁╂鏀捐杞簱',
+ id: '11',
+ isActive: false
+ },
+ {
+ name: '瀹㈣繑杩斾慨棰嗘枡',
+ id: '12',
+ isActive: false
+ },
+ {
+ name: '瀹㈣繑杩斾慨鍏ュ簱',
+ id: '13',
+ isActive: false
+ },
+ {
+ name: '璺ㄧ粍缁囪浆搴�',
+ id: '14',
+ isActive: false
+ },
+ {
+ name: '宸ュ簭鎶ュ簾',
+ id: '15',
+ isActive: false
+ },
+ {
+ name: '瀹㈤��杩斾慨棰嗘枡',
+ id: '16',
+ isActive: false
+ },
+ {
+ name: '瀹㈤��杩斾慨鍏ュ簱',
+ id: '17',
+ isActive: false
+ },
+ {
+ name: '宸ュ崟浜у嚭',
+ id: '24',
+ isActive: false
+ },
+ {
+ name: '閲囪喘鍏ュ簱',
+ id: '25',
+ isActive: false
+ },
+ {
+ name: '瀹㈤��妫�楠屽叆搴�',
+ id: '26',
+ isActive: false
+ },
+ {
+ name: '瀹㈣繑妫�楠屽叆搴�',
+ id: '27',
+ isActive: false
+ },
+ {
+ name: '搴撳瓨璋冩暣',
+ id: '28',
+ isActive: false
+ },
+ {
+ name: '搴熷搧鍏ュ簱',
+ id: '30',
+ isActive: false
}
],
- data: [], // 宸ュ簭鏁版嵁
- factoryList: [],
- finished: true,
+ tagList: [{
+ id: "",
+ name: "鍏ㄩ儴",
+ num: "0",
+ },
+ {
+ id: "0",
+ name: "寰呭叆搴�",
+ num: "0",
+ },
+ {
+ id: "1",
+ name: "宸插叆搴�",
+ num: "0",
+ },
+ {
+ id: "2",
+ name: "宸插彇娑�",
+ num: "0",
+ }
+ ],
+ finished: false,
loading: false,
refreshing: false,
timeShow: false,
@@ -175,11 +279,25 @@
}).exec()
})
},
+ onLoad() {
+ this.getLists()
+ this.getPageCount()
+ },
methods: {
+ onRefresh() {
+ this.isLoading = true
+ this.listData.page = 0;
+ this.finished = false;
+ this.lists = [];
+ this.getLists()
+ this.getPageCount()
+ },
+ seeText(id) {
+ return orderTyepToStr(id)
+ },
tyepToStr(type) {
- // <!-- 1銆佽溅闂撮鏂欙紱2銆佽溅闂村鏂欙紱3銆佸叾浠栵紱4銆佸畬宸ュ叆搴� -->
- for (const item of this.orderType) {
- if (item.id == type) {
+ for (const item of this.types) {
+ if (parseInt(item.id) === type) {
return item.name
}
}
@@ -188,7 +306,7 @@
// 璺宠浆
jump(item) {
uni.navigateTo({
- url: `/pages/planDetails/planDetails?id=${item.id}`
+ url: `/pages_adjust/pages/warehousingDetails1/warehousingDetails1?id=${item.id}`
})
},
// 鑾峰彇澶撮儴缁勪欢楂樺害
@@ -197,41 +315,95 @@
},
// 閲嶇疆
reset() {
- this.listData.page = 0
- this.finished = false
- this.lists = []
- this.listData.mixParam = ''
- this.listData.startDate = ''
- this.listData.endDate = ''
- this.listData.procedureIds = []
- if (this.factoryList.length > 0) {
- this.listData.departIds = this.factoryList[0].id
- }
- if (this.data.length > 0) {
- this.data.forEach(item => {
- item.isActive = false
+ this.listData.code = '';
+ this.listData.page = 0;
+ this.finished = false;
+ this.lists = [];
+ this.types.forEach((item) => {
+ item.isActive = false
+ })
+ this.listData.originType = ''
+ this.listData.planDateEnd = ''
+ this.listData.planDateStart = ''
+ this.getLists();
+ this.getPageCount()
+ },
+ // 缁熻鏁版嵁
+ getPageCount() {
+ pageCount({
+ type: 1,
+ codeOrHouse: this.listData.code,
+ planDateEnd: this.listData.planDateEnd,
+ planDateStart: this.listData.planDateStart,
+ billType: this.listData.originType
+ }).then(res => {
+ if (res.code === 200) {
+ this.tagList[0].num = res.data.allNum.toString()
+ this.tagList[1].num = res.data.startNum.toString()
+ this.tagList[2].num = res.data.endNum.toString()
+ this.tagList[3].num = res.data.cancelNum.toString()
+ }
+ })
+ },
+ // 鑾峰彇璁″垝鍒楄〃鏁版嵁
+ getLists() {
+ if (!this.finished) {
+ this.loading = true;
+ this.listData.page = this.listData.page += 1;
+ getBoundList({
+ capacity: this.listData.capacity,
+ model: {
+ type: 1,
+ codeOrHouse: this.listData.code,
+ planDateEnd: this.listData.planDateEnd,
+ planDateStart: this.listData.planDateStart,
+ status: this.listData.status,
+ billType: this.listData.originType
+ },
+ page: this.listData.page,
+ sorts: [{
+ direction: "ASC",
+ property: "publishDate",
+ }]
})
+ .then((res) => {
+ this.loading = false;
+ this.listData.total = res.data.total;
+ if (res.code === 200) {
+ if (res.data.records.length < this.listData.capacity) {
+ this.finished = true;
+ }
+ if (this.listData.page === 1) {
+ this.lists = res.data.records;
+ } else {
+ this.lists.push(...res.data.records);
+ }
+ }
+ })
+ .finally(() => {
+ this.loading = false;
+ this.isLoading = false
+ })
+ } else {
+ this.isLoading = false
}
- // this.getLists()
- // this.pageCounts()
},
// 鏃ユ湡纭畾
timeConfirm(val) {
- this.listData.startDate = val[0]
- this.listData.endDate = val[val.length - 1]
+ this.listData.planDateStart = val[0]
+ this.listData.planDateEnd = val[val.length - 1]
this.timeShow = false
},
- // 鍒囨崲宸ュ巶
- changeTags(i, id) {
- this.listData.departIds = id
- this.getWorkingProcedures(id)
- this.factoryList.forEach((item, index) => {
- if (index === i) {
- item.isActive = true
- } else {
+ // 鍒囨崲鍗曟嵁绫诲瀷
+ changeTags(i) {
+ this.types[i].isActive = !this.types[i].isActive;
+ this.listData.originType = this.types[i].id
+ for (const index in this.types) {
+ if (index != i) {
+ const item = this.types[index]
item.isActive = false
}
- })
+ }
},
// 鎵撳紑鏃ユ湡鎻掍欢
openDate() {
@@ -239,19 +411,20 @@
},
// 鎼滅储
searchInput(val) {
- this.listData.mixParam = val
- this.listData.page = 0
- this.finished = false
- this.lists = []
- this.getLists()
+ this.listData.code = val;
+ this.listData.page = 0;
+ this.finished = false;
+ this.lists = [];
+ this.getLists();
+ this.getPageCount()
},
// 鐐瑰嚮鏍囩鎼滅储
clickTag(ids) {
- this.listData.cateIds = ids
- this.listData.page = 0
- this.finished = false
- this.lists = []
- // this.getLists()
+ this.listData.status = ids
+ this.listData.page = 0;
+ this.finished = false;
+ this.lists = [];
+ this.getLists()
},
// 鑾峰彇鍒楄〃缁熻
pageCounts() {
@@ -270,103 +443,13 @@
}
})
},
- // 鑾峰彇宸ュ巶鏁版嵁
- getOrganizations() {
- getOrganization({
- type: 1
- }).then(res => {
- if (res.code === 200 && res.data && res.data.length !== 0) {
- res.data.forEach((item, i) => {
- item.isActive = i === 0;
- })
- if (res.data.length > 0) {
- this.factoryList = res.data
- this.listData.departIds = this.factoryList[0].id
- this.listData.procedureIds = ''
- this.finished = false
- this.getWorkingProcedures(this.factoryList[0].id)
- this.getLists()
- this.pageCounts()
- }
- }
- })
- },
- // 鑾峰彇宸ュ簭鏁版嵁
- getWorkingProcedures(orgId) {
- this.data = []
- getWorkingProcedure({
- orgId
- })
- .then(res => {
- if (res.code === 200 && res.data && res.data.length !== 0) {
- res.data.forEach((item, i) => {
- item.isActive = false;
- })
- this.data = res.data
- }
- })
- },
// 鎼滅储寮规鎻愪氦
submit() {
- let pmodelOrgId = []
- this.data.forEach((item) => {
- if (item.isActive) {
- pmodelOrgId.push(item.id)
- }
- })
- this.listData.procedureIds = pmodelOrgId
- this.listData.page = 0
- this.finished = false
- this.lists = []
- // this.getLists()
- // this.pageCounts()
- },
- // 鑾峰彇璁″垝鍒楄〃鏁版嵁
- getLists() {
- console.log('getLists')
- if (!this.finished) {
- this.loading = true
- this.listData.page = this.listData.page++
- getList({
- capacity: this.listData.capacity,
- model: {
- mixParam: this.listData.mixParam,
- startDate: this.listData.startDate,
- endDate: this.listData.endDate,
- procedureIdList: this.listData.procedureIds ? this.listData.procedureIds : [],
- factoryId: this.listData.departIds,
- statusList: this.listData.cateIds
- },
- page: this.listData.page,
- sorts: [{
- direction: 'ASC',
- property: 'publishDate'
- }]
- }).then(res => {
- this.loading = false
- this.listData.total = res.data.total
- if (this.refreshing) {
- this.lists = []
- this.refreshing = false;
- }
- if (res.code === 200 && res.data.records.length !== 0) {
- if (this.lists.length === 0) {
- this.lists = res.data.records
- } else {
- this.lists.push(...res.data.records)
- }
- } else {
- this.finished = true
- }
- }).catch(err => {
- this.loading = false
- this.finished = true
- if (this.refreshing) {
- this.lists = []
- this.refreshing = false;
- }
- })
- }
+ this.listData.page = 0;
+ this.finished = false;
+ this.lists = [];
+ this.getLists();
+ this.getPageCount()
}
}
}
--
Gitblit v1.9.3