From 282e032b5771da13d224214d3b0b71f3efde9a42 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 25 八月 2023 18:45:42 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmMes
---
h5_standard/src/views/plannedProgress/details.vue | 57 +++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 45 insertions(+), 12 deletions(-)
diff --git a/h5_standard/src/views/plannedProgress/details.vue b/h5_standard/src/views/plannedProgress/details.vue
index 29d7c25..e4d9b0a 100644
--- a/h5_standard/src/views/plannedProgress/details.vue
+++ b/h5_standard/src/views/plannedProgress/details.vue
@@ -53,7 +53,7 @@
</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">{{info.createTime}}</div>
+ <div class="content_list_item_content_item_nr" v-if="info.umodel">{{info.distributNum}}{{info.umodel.name}}</div>
</div>
<div class="content_list_item_content_item">
<div class="content_list_item_content_item_label">瀹屽伐鏁伴噺锛�</div>
@@ -64,20 +64,22 @@
</div>
<NotFound info="鏆傛湭鍒嗛厤宸ュ崟" v-if="info.workorderList && info.workorderList.length === 0" />
<template v-else>
- <div class="details_list">
- <div class="details_list_item" v-for="(item, i) in info.workorderList" :key="i" @click="jump(item.id)">
+ <!-- <div class="details_list">
+ <div class="details_list_item" v-for="(item, i) in info.workorderList" :key="i" @click="jump(item)">
<div class="details_list_item_top">
- <span>{{ item.createUserName }}</span><span>{{ item.code }}</span>
+ <span>{{ item.createUserName }}</span>
+ <span>{{ item.code }}</span>
</div>
<div class="details_list_item_center">
- <span>鑹搧鏁帮細{{ item.qualifiedNum }}</span><span>涓嶈壇鏁帮細<span class="red">{{ item.unqualifiedNum }}</span></span>
+ <span>鑹搧鏁帮細{{ item.qualifiedNum }}</span>
+ <span>涓嶈壇鏁帮細<span class="red">{{ item.unqualifiedNum }}</span></span>
</div>
<div class="details_list_item_bottom">
<span>{{ item.createTime }}</span>
</div>
</div>
- </div>
- <!-- <div class="details_timeline" v-for="(item, i) in info.workorderList" :key="i">
+ </div> -->
+ <div class="details_timeline" v-for="(item, i) in info.workorderList" :key="i">
<div class="details_timeline_header">
<div class="details_timeline_header_code">
<span>宸ュ崟缂栧彿锛歿{item.code}}</span>
@@ -89,10 +91,10 @@
<span v-if="item.status === 3" class="purple">宸叉楠�</span>
<span v-if="item.status === 4">宸叉姤宸�</span>
<span v-if="item.status === 5">宸插叆搴�</span>
- <span v-if="item.status === 6">宸插彇娑�</span> -->
+ <span v-if="item.status === 6">宸插彇娑�</span>
<!-- <span v-if="item.status === 7">宸插彇娑�</span>-->
<!-- <span v-if="item.status === 8">宸插叧闂�</span>-->
- <!-- </div>
+ </div>
<div class="details_timeline_item" v-if="item.produceDate">
<div class="activedian"></div>
<div class="dian active"></div>
@@ -153,8 +155,10 @@
</div>
</div>
</div>
- </div> -->
+ </div>
</template>
+ <!-- <div class="details_zw"></div> -->
+ <!-- <div class="details_btn" @click="toJump">鍘绘姤宸�</div> -->
</div>
</template>
@@ -182,8 +186,17 @@
})
}
- const jump = (id: any) => {
- router.push({ name: 'workOrderReporting', query: { id } })
+ const toJump = () => {
+ router.push({ name: 'reportingForWork' })
+ }
+
+ const jump = (item: any) => {
+ if (item.status === 4 || item.status === 6 || item.paused === 1) {
+ router.push({ name: 'afterWorkReport', query: { id: item.id } })
+ } else {
+ router.push({ name: 'workOrderReporting', query: { id: item.id } })
+ }
+ // router.push({ name: 'workOrderReporting', query: { id } })
}
const proUserStr = (item: any) => {
@@ -210,6 +223,26 @@
height: 100%;
position: absolute;
background: #F7F7F7;
+ .details_zw {
+ width: 100%;
+ height: 148px;
+ }
+ .details_btn {
+ position: fixed;
+ bottom: 60px;
+ left: 30px;
+ width: calc(100% - 60px);
+ height: 88px;
+ line-height: 88px;
+ text-align: center;
+ background: #305ED5;
+ box-shadow: 0px 0px 12px 0px rgba(0,0,0,0.08);
+ border-radius: 8px;
+ font-size: 30px;
+ font-family: PingFangSC-Medium, PingFang SC;
+ font-weight: 500;
+ color: #FFFFFF;
+ }
.van-skeleton {
padding: 0 !important;
}
--
Gitblit v1.9.3