From 074f334d060ec7d33d39cdeaae5ed84a2a2dd3a3 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 22 八月 2023 18:20:59 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmMes
---
h5_standard/src/views/workOrder/processPlan.vue | 107 ++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 105 insertions(+), 2 deletions(-)
diff --git a/h5_standard/src/views/workOrder/processPlan.vue b/h5_standard/src/views/workOrder/processPlan.vue
index d23877b..f5d8672 100644
--- a/h5_standard/src/views/workOrder/processPlan.vue
+++ b/h5_standard/src/views/workOrder/processPlan.vue
@@ -1,5 +1,9 @@
<template>
<div class="content">
+ <div :class="{ 'content_top': status }" class="content_search">
+ <v-Search @searchInput="searchInput" @submit="submit" :isShow="false" placeholder="鎼滅储鐗╂枡鍚嶇О/缂栫爜/宸ュ簭鍚嶇О">
+ </v-Search>
+ </div>
<van-pull-refresh v-model="refreshing" @refresh="onRefresh">
<van-list
v-model:loading="loading"
@@ -48,12 +52,15 @@
</template>
<script setup lang="ts">
- import { reactive, ref, onBeforeUnmount, getCurrentInstance } from "vue"
+ import { reactive, ref, onBeforeUnmount, getCurrentInstance, onMounted } from "vue"
import { useRouter, useRoute } from "vue-router"
import { getList } from "@/apis/PlanningAPI"
+ import { judgmentPlatform } from '@/utils/utils'
const route = useRoute()
const router = useRouter()
+
+ let status = ref<boolean>(false) // 鏍规嵁骞冲彴鏄惁闇�瑕佽缃畉op
const { $Bus } = getCurrentInstance().appContext.config.globalProperties
@@ -61,7 +68,8 @@
const pageData = reactive({
capacity: 10,
page: 0,
- total: 0
+ total: 0,
+ name: ''
})
// 鍒楄〃鏁版嵁
@@ -75,6 +83,23 @@
router.go(-1)
}
+ // 鎼滅储鎻愪氦
+ const submit = (): void => {
+ pageData.page = 0
+ finished.value = false
+ listData.value = []
+ onLoad()
+ }
+
+ // 鎼滅储妗�
+ const searchInput = (data: any) => {
+ pageData.name = data
+ pageData.page = 0
+ finished.value = false
+ listData.value = []
+ onLoad()
+ }
+
// 鍒楄〃
const onLoad = () => {
if (!finished.value) {
@@ -84,6 +109,7 @@
capacity: pageData.capacity,
page: pageData.page,
model: {
+ mixParam: pageData.name,
statusList: [1, 4],
paused: 0
},
@@ -124,6 +150,10 @@
onBeforeUnmount(() => {
$Bus.all.delete("changeOdr")
})
+
+ onMounted(() => {
+ status.value = judgmentPlatform()
+ })
</script>
<style lang="scss" scoped>
@@ -132,6 +162,79 @@
// height: 100%;
position: absolute;
background: #F7F7F7;
+ .content_top {
+ top: 0 !important;
+ }
+ .content_search {
+ padding: 30px;
+ background: white;
+ box-sizing: border-box;
+ position: sticky;
+ top: 88px;
+ z-index: 9;
+ .Search_item {
+ margin-bottom: 40px;
+ .Search_item_label {
+ font-size: 30px;
+ font-weight: 500;
+ color: #222222;
+ }
+ .Search_item_content {
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ margin-top: 30px;
+ .tag {
+ display: flex;
+ flex-wrap: wrap;
+ align-items: center;
+ .tag_active {
+ background: $nav-color !important;
+ color: #ffffff !important;
+ }
+ .tag_item {
+ width: 156px;
+ height: 70px;
+ box-sizing: border-box;
+ background: #F2F2F2;
+ border-radius: 8px;
+ font-size: 26px;
+ font-weight: 400;
+ color: #333333;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ margin-right: 22px;
+ margin-bottom: 22px;
+ &:nth-child(4n) {
+ margin-right: 0;
+ }
+ }
+ }
+ span {
+ font-size: 26px;
+ font-weight: 400;
+ color: #333333;
+ }
+ .Search_item_content_a {
+ width: 308px;
+ height: 70px;
+ background: #F7F7F7;
+ border-radius: 8px;
+ border: 1px solid #EEEEEE;
+ font-size: 26px;
+ font-weight: 400;
+ color: #B2B2B2;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ }
+ }
+ }
+ .content_search_x {
+ height: 24px;
+ }
+ }
.content_list {
width: 100%;
height: 100%;
--
Gitblit v1.9.3