From 349bcef9a96391d22522a3409adf5a89e7e70a95 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 24 十月 2023 08:46:11 +0800
Subject: [PATCH] Merge branch 'dev' of http://139.186.142.91:10010/r/productDev/dmMes into dev
---
minipro_standard/pages_adjust/pages/workOrder/workOrder.vue | 233 +++++++++++++++++++++++++++++----------------------------
1 files changed, 119 insertions(+), 114 deletions(-)
diff --git a/minipro_standard/pages_adjust/pages/workOrder/workOrder.vue b/minipro_standard/pages_adjust/pages/workOrder/workOrder.vue
index d4c2b19..6cce09b 100644
--- a/minipro_standard/pages_adjust/pages/workOrder/workOrder.vue
+++ b/minipro_standard/pages_adjust/pages/workOrder/workOrder.vue
@@ -21,70 +21,72 @@
<div class="content_search_x"></div>
<v-LableSelection :TagList="tagList" :isShow="true" @change="clickTag"></v-LableSelection>
</div>
- <div class="content_total mt20">鍏眥{page.total}}鏉℃暟鎹�</div>
- <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>
- <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>
- </div>
- </scroll-view>
- <view class="fx1">
-
+ <div class="content_total mt20">鍏眥{page.total}}鏉℃暟鎹�</div>
+ <div class="content_list">
+ <scroll-view scroll-y="true" :style="{height:height}" refresher-enabled="true"
+ :refresher-triggered="triggered" @scrolltolower="getLists" @refresherrefresh="onRefresh">
+
+ <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>
+ <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>
+
+ </scroll-view>
+ </div>
+ <view class="fx1">
+
</view>
-
- <!-- <u-calendar :show="isOpenDate" mode="range" @confirm="dateConfirm"></u-calendar> -->
- <l-calendar :lunar="false" v-model="isOpenDate" @change="dateConfirm" :isRange="true" activeBgColor="#305ED5"
+
+ <!-- <u-calendar :show="isOpenDate" mode="range" @confirm="dateConfirm"></u-calendar> -->
+ <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>
@@ -95,8 +97,10 @@
import {
getList,
pageCount
- } from '@/util/api/WorkOrderAPI.js'
- import { gsdate } from '@/util/utils.js'
+ } from '@/util/api/WorkOrderAPI.js'
+ import {
+ gsdate
+ } from '@/util/utils.js'
export default {
components: {
vSearch,
@@ -120,7 +124,7 @@
name: '宸插畬鎴�',
num: '0'
}
- ],
+ ],
height: '',
triggered: false,
_freshing: false,
@@ -137,40 +141,40 @@
},
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()
- })
+ },
+ 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()
this.loadData()
},
- methods: {
- reset() {
- this.searchForm = {
- mixParam: '',
- startDate: '',
- // endDate: gsdate(new Date()),
- endDate: '',
- statusList: []
- }
- this.search()
- },
- searchInput(data) {
- this.searchForm.mixParam = data
- this.search()
+ methods: {
+ reset() {
+ this.searchForm = {
+ mixParam: '',
+ startDate: '',
+ // endDate: gsdate(new Date()),
+ endDate: '',
+ statusList: []
+ }
+ this.search()
+ },
+ searchInput(data) {
+ this.searchForm.mixParam = data
+ this.search()
},
loadData() {
getList({
@@ -202,7 +206,7 @@
endDate: this.searchForm.endDate || null,
statusList: this.searchForm.statusList.length === 0 ? this.tagList[0].id : this.searchForm
.statusList
- }).then(res => {
+ }).then(res => {
if (res.code === 200) {
this.tagList[0].num = String(res.data.startNum)
this.tagList[1].num = String(res.data.ingNum)
@@ -215,7 +219,7 @@
this.page.page = 1
this.loadData()
},
- dateConfirm(v) {
+ dateConfirm(v) {
console.log(v);
this.isOpenDate = false
this.searchForm.startDate = v.startDate
@@ -228,24 +232,24 @@
onRefresh() {
if (this.triggered) return
this.triggered = true;
- this.search()
- },
- search() {
- this.page.page = 1
- this.loadData()
- this.pageCounts()
+ this.search()
},
- jump(item) {
- // uni.navigateTo({
- // url: `/pages_adjust/pages/OrderDetail/OrderDetail?id=${item.id}`
+ search() {
+ this.page.page = 1
+ this.loadData()
+ this.pageCounts()
+ },
+ jump(item) {
+ // uni.navigateTo({
+ // url: `/pages_adjust/pages/OrderDetail/OrderDetail?id=${item.id}`
// })
if (item.status === 4 || item.status === 6 || item.paused === 1) {
- uni.navigateTo({
- url: `/pages_adjust/pages/OrderDetail/OrderDetail?id=${item.id}`
+ uni.navigateTo({
+ url: `/pages_adjust/pages/OrderDetail/OrderDetail?id=${item.id}`
})
- } else {
- uni.navigateTo({
- url: `/pages_adjust/pages/workOrderReporting/workOrderReporting?id=${item.id}`
+ } else {
+ uni.navigateTo({
+ url: `/pages_adjust/pages/workOrderReporting/workOrderReporting?id=${item.id}`
})
}
}
@@ -255,9 +259,10 @@
<style lang="scss" scoped>
.content {
- display: flex;
- flex-direction: column;
+ display: flex;
+ flex-direction: column;
height: 100vh;
+
.content_search {
background: white;
z-index: 9;
@@ -372,7 +377,7 @@
width: 80%;
span {
- font-size: 24rpx;
+ font-size: 32rpx;
font-weight: 500;
color: #333333;
overflow: hidden;
--
Gitblit v1.9.3