From d7fe8ae3888c8e2b1eea3c1e3769be0d42a21cc9 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 16 十月 2023 09:03:47 +0800
Subject: [PATCH] Merge branch '1.0.3' of http://139.186.142.91:10010/r/productDev/dmMes into 1.0.3
---
minipro_standard/pages_adjust/pages/workOrder/workOrder.vue | 139 +++++++++++++++++++++------------------------
1 files changed, 65 insertions(+), 74 deletions(-)
diff --git a/minipro_standard/pages_adjust/pages/workOrder/workOrder.vue b/minipro_standard/pages_adjust/pages/workOrder/workOrder.vue
index 3425d8c..95a9d39 100644
--- a/minipro_standard/pages_adjust/pages/workOrder/workOrder.vue
+++ b/minipro_standard/pages_adjust/pages/workOrder/workOrder.vue
@@ -1,5 +1,5 @@
<template>
- <view class="content p30">
+ <view class="content p30 bbox">
<div class="content_search">
<v-Search @searchInput="searchForm.mixParam" @submit="search" @reset="reset" :isShow="true"
placeholder="鎼滅储宸ュ崟缂栫爜/宸ュ簭鍚嶇О">
@@ -21,64 +21,67 @@
<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" 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>
+ <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>
+ </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>
+
<!-- <u-calendar :show="isOpenDate" mode="range" @confirm="dateConfirm"></u-calendar> -->
<l-calendar :lunar="false" v-model="isOpenDate" @change="onConfirm" :isRange="true" activeBgColor="#305ED5"
rangeColor="#305ED5" rangeBgColor="rgba(48, 80, 213, 0.1)"></l-calendar>
@@ -233,21 +236,9 @@
<style lang="scss" scoped>
.content {
- .content_code {
- position: fixed;
- right: 30rpx;
- bottom: 100rpx;
-
- img {
- width: 138rpx;
- height: 138rpx;
- }
- }
-
- .content_top {
- top: 0 !important;
- }
-
+ display: flex;
+ flex-direction: column;
+ height: 100vh;
.content_search {
background: white;
z-index: 9;
--
Gitblit v1.9.3