From 2359a38efc2a90a2776e2a45afcecda1fb0065a3 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期一, 18 九月 2023 16:31:35 +0800
Subject: [PATCH] 111
---
minipro_standard/pages_adjust/pages/workOrder/workOrder.vue | 155 +++++++++++++++++++++++++++++----------------------
1 files changed, 87 insertions(+), 68 deletions(-)
diff --git a/minipro_standard/pages_adjust/pages/workOrder/workOrder.vue b/minipro_standard/pages_adjust/pages/workOrder/workOrder.vue
index 95a9d39..d4c2b19 100644
--- a/minipro_standard/pages_adjust/pages/workOrder/workOrder.vue
+++ b/minipro_standard/pages_adjust/pages/workOrder/workOrder.vue
@@ -1,7 +1,7 @@
<template>
<view class="content p30 bbox">
<div class="content_search">
- <v-Search @searchInput="searchForm.mixParam" @submit="search" @reset="reset" :isShow="true"
+ <v-Search @searchInput="searchInput" @submit="search" @reset="reset" :isShow="true"
placeholder="鎼滅储宸ュ崟缂栫爜/宸ュ簭鍚嶇О">
<template v-slot:content>
<div class="Search_item">
@@ -22,68 +22,69 @@
<v-LableSelection :TagList="tagList" :isShow="true" @change="clickTag"></v-LableSelection>
</div>
<div class="content_total mt20">鍏眥{page.total}}鏉℃暟鎹�</div>
- <view class="fx1">
- <scroll-view scroll-y="true" refresher-enabled="true" :refresher-triggered="triggered" @scrolltolower="getLists"
- @refresherrefresh="onRefresh">
- <div class="content_list">
- <div class="content_list_item" v-for="(item, i) in list" :key="i" @click="jump(item)">
- <div class="content_list_item_top">
- <div class="content_list_item_top_left">
- <span class="f32" v-if="item.mmodel">{{item.mmodel.name}} | {{item.procedureName}}</span>
- <div class="content_list_item_top_left_tag" v-if="item.urgent">浼樺厛{{item.urgent}}</div>
- <div class="content_list_item_top_left_tag backgreen" v-if="item.type === 0">姝ｅ父</div>
- <div class="content_list_item_top_left_tag backyellow" v-if="item.type === 2">杩斿伐杩斾慨</div>
- <div class="content_list_item_top_left_tagW" v-if="item.paused === 1">鍋�</div>
- </div>
- <div class="content_list_item_top_right">
- <span class="yellow" v-if="item.status === 0">宸插垱寤�</span>
- <span class="green" v-if="item.status === 1">宸插鏂�</span>
- <span v-if="item.status === 2">宸插畬宸ユ</span>
- <span class="purple" v-if="item.status === 3">宸叉楠�</span>
- <span v-if="item.status === 4">宸叉姤宸�</span>
- <span v-if="item.status === 5">宸插叆搴�</span>
- <span v-if="item.status === 6">宸插彇娑�</span>
- <span class="green" v-if="item.status === 7">杩涜涓�</span>
+ <scroll-view scroll-y="true" :style="{height:height}" refresher-enabled="true" :refresher-triggered="triggered" @scrolltolower="getLists"
+ @refresherrefresh="onRefresh">
+ <div class="content_list">
+ <div class="content_list_item" v-for="(item, i) in list" :key="i" @click="jump(item)">
+ <div class="content_list_item_top">
+ <div class="content_list_item_top_left">
+ <span class="f32" v-if="item.mmodel">{{item.mmodel.name}} | {{item.procedureName}}</span>
+ <div class="content_list_item_top_left_tag" v-if="item.urgent">浼樺厛{{item.urgent}}</div>
+ <div class="content_list_item_top_left_tag backgreen" v-if="item.type === 0">姝ｅ父</div>
+ <div class="content_list_item_top_left_tag backyellow" v-if="item.type === 2">杩斿伐杩斾慨</div>
+ <div class="content_list_item_top_left_tagW" v-if="item.paused === 1">鍋�</div>
+ </div>
+ <div class="content_list_item_top_right">
+ <span class="yellow" v-if="item.status === 0">宸插垱寤�</span>
+ <span class="green" v-if="item.status === 1">宸插鏂�</span>
+ <span v-if="item.status === 2">宸插畬宸ユ</span>
+ <span class="purple" v-if="item.status === 3">宸叉楠�</span>
+ <span v-if="item.status === 4">宸叉姤宸�</span>
+ <span v-if="item.status === 5">宸插叆搴�</span>
+ <span v-if="item.status === 6">宸插彇娑�</span>
+ <span class="green" v-if="item.status === 7">鐢熶骇涓�</span>
+ </div>
+ </div>
+ <span class="f24">宸ュ崟缂栧彿: {{item.code}}</span>
+ <div class="content_list_item_content">
+ <div class="content_list_item_content_item">
+ <div class="content_list_item_content_item_label">鐗╂枡缂栫爜锛�</div>
+ <div class="content_list_item_content_item_nr" v-if="item.mmodel">{{item.mmodel.code}}</div>
+ </div>
+ <div class="content_list_item_content_item">
+ <div class="content_list_item_content_item_label">璁″垝寮�宸ワ細</div>
+ <div class="content_list_item_content_item_nr">{{item.planDate}}</div>
+ </div>
+ <div class="content_list_item_content_item">
+ <div class="content_list_item_content_item_label">鐢熶骇鎵规锛�</div>
+ <div class="content_list_item_content_item_nr">{{item.batch}}</div>
+ </div>
+ <div class="content_list_item_content_item">
+ <div class="content_list_item_content_item_label">璁″垝鏁伴噺锛�</div>
+ <div class="content_list_item_content_item_nr" v-if="item.umodel">
+ {{item.planNum}}{{item.umodel.name}}
</div>
</div>
- <span class="f24">宸ュ崟缂栧彿: {{item.code}}</span>
- <div class="content_list_item_content">
- <div class="content_list_item_content_item">
- <div class="content_list_item_content_item_label">鐗╂枡缂栫爜锛�</div>
- <div class="content_list_item_content_item_nr" v-if="item.mmodel">{{item.mmodel.code}}</div>
+ <div class="content_list_item_content_item">
+ <div class="content_list_item_content_item_label">鐢熶骇璁惧锛�</div>
+ <div class="content_list_item_content_item_nr" v-if="item.pgmodel">{{item.pgmodel.code}}
</div>
- <div class="content_list_item_content_item">
- <div class="content_list_item_content_item_label">璁″垝寮�宸ワ細</div>
- <div class="content_list_item_content_item_nr">{{item.planDate}}</div>
- </div>
- <div class="content_list_item_content_item">
- <div class="content_list_item_content_item_label">鐢熶骇鎵规锛�</div>
- <div class="content_list_item_content_item_nr">{{item.batch}}</div>
- </div>
- <div class="content_list_item_content_item">
- <div class="content_list_item_content_item_label">璁″垝鏁伴噺锛�</div>
- <div class="content_list_item_content_item_nr" v-if="item.umodel">
- {{item.planNum}}{{item.umodel.name}}
- </div>
- </div>
- <div class="content_list_item_content_item">
- <div class="content_list_item_content_item_label">鐢熶骇璁惧锛�</div>
- <div class="content_list_item_content_item_nr" v-if="item.pgmodel">{{item.pgmodel.code}}
- </div>
- </div>
-
- <div class="content_list_item_content_item" v-if="item.status === 5">
- <div class="content_list_item_content_item_label">瀹屽伐鏁伴噺锛�</div>
- <div class="content_list_item_content_item_nr">{{item.proNum}}</div>
- </div>
+ </div>
+
+ <div class="content_list_item_content_item" v-if="item.status === 5">
+ <div class="content_list_item_content_item_label">瀹屽伐鏁伴噺锛�</div>
+ <div class="content_list_item_content_item_nr">{{item.proNum}}</div>
</div>
</div>
</div>
- </scroll-view>
+ </div>
+ </scroll-view>
+ <view class="fx1">
+
</view>
<!-- <u-calendar :show="isOpenDate" mode="range" @confirm="dateConfirm"></u-calendar> -->
- <l-calendar :lunar="false" v-model="isOpenDate" @change="onConfirm" :isRange="true" activeBgColor="#305ED5"
+ <l-calendar :lunar="false" v-model="isOpenDate" @change="dateConfirm" :isRange="true" activeBgColor="#305ED5"
rangeColor="#305ED5" rangeBgColor="rgba(48, 80, 213, 0.1)"></l-calendar>
</view>
</template>
@@ -119,7 +120,8 @@
name: '宸插畬鎴�',
num: '0'
}
- ],
+ ],
+ height: '',
triggered: false,
_freshing: false,
searchForm: {
@@ -135,6 +137,21 @@
},
list: [],
}
+ },
+ onReady() {
+ var that = this
+
+ this.$nextTick(() => {
+ uni.createSelectorQuery()
+ .in(this)
+ .select('.content_search')
+ .boundingClientRect((rect) => {
+ console.log('-----',rect);
+ that.height = `calc(100vh - ${rect.height + 80}px)`
+ that.top = `${rect.height}px`
+ })
+ .exec()
+ })
},
onLoad() {
this.pageCounts()
@@ -145,15 +162,17 @@
this.searchForm = {
mixParam: '',
startDate: '',
- endDate: gsdate(new Date()),
+ // endDate: gsdate(new Date()),
+ endDate: '',
statusList: []
}
- this.page.page = 1
- this.pageCounts()
- this.loadData()
+ this.search()
+ },
+ searchInput(data) {
+ this.searchForm.mixParam = data
+ this.search()
},
loadData() {
-
getList({
...this.page,
model: {
@@ -180,11 +199,10 @@
pageCounts() {
pageCount({
...this.searchForm,
- endDate: this.searchForm.endDate || '',
+ endDate: this.searchForm.endDate || null,
statusList: this.searchForm.statusList.length === 0 ? this.tagList[0].id : this.searchForm
.statusList
}).then(res => {
- console.log(res);
if (res.code === 200) {
this.tagList[0].num = String(res.data.startNum)
this.tagList[1].num = String(res.data.ingNum)
@@ -197,10 +215,11 @@
this.page.page = 1
this.loadData()
},
- dateConfirm(v) {
+ dateConfirm(v) {
+ console.log(v);
this.isOpenDate = false
- this.searchForm.startDate = v[0]
- this.searchForm.endDate = v[v.length - 1]
+ this.searchForm.startDate = v.startDate
+ this.searchForm.endDate = v.endDate
},
getLists() {
this.page.page += 1
@@ -209,12 +228,12 @@
onRefresh() {
if (this.triggered) return
this.triggered = true;
- this.page.page = 1
- this.loadData()
+ this.search()
},
search() {
this.page.page = 1
this.loadData()
+ this.pageCounts()
},
jump(item) {
// uni.navigateTo({
@@ -353,7 +372,7 @@
width: 80%;
span {
- font-size: 32rpx;
+ font-size: 24rpx;
font-weight: 500;
color: #333333;
overflow: hidden;
--
Gitblit v1.9.3