From 16cd5600efc6f94ed617cb09e1a2dd579017ddef Mon Sep 17 00:00:00 2001
From: Mr.Shi <1878285526@qq.com>
Date: 星期二, 05 九月 2023 16:02:01 +0800
Subject: [PATCH] Merge branch 'dev' of ssh://139.186.142.91:29418/productDev/dmMes into dev
---
minipro_standard/components/workOrderInfo.vue | 19 +++++++++++--------
1 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/minipro_standard/components/workOrderInfo.vue b/minipro_standard/components/workOrderInfo.vue
index 67548d6..6f904b5 100644
--- a/minipro_standard/components/workOrderInfo.vue
+++ b/minipro_standard/components/workOrderInfo.vue
@@ -2,7 +2,7 @@
<view class="p30 bg_w order-info">
<view class="bX">
<view class="cY">
- <view class="mr10 b">澧欎綋鐮栵綔鐮佸灈</view>
+ <view class="mr10 b">{{ `${orederMessage.mmodel.name} |${orederMessage.procedureName}`}}</view>
<u-tag size="mini" bgColor="#03AF76" text="姝ｅ父"></u-tag>
</view>
<view class="status" :class="orederMessage.status==0?'wc':orederMessage.status==1?'green':orederMessage.status==3?'blue':orederMessage.status==7?'green':'c6'">{{ stausToStr(1) }}</view>
@@ -11,28 +11,28 @@
<view class="mt20 bg_f7 ptb20 plr30 n">
<view class="c2 mb20">
<span class="c6">鐗╂枡缂栫爜锛�</span>
- {{ orederMessage.mmodel ? orederMessage.mmodel.code : '03K-0K-0-1' }}
+ {{ orederMessage.mmodel ? orederMessage.mmodel.code : '-' }}
</view>
<view class="c2 mb20">
<span class="c6">璁″垝寮�宸ワ細</span>
- {{ orederMessage.planDate || '2022/01/11' }}
+ {{ orederMessage.planDate || '-' }}
</view>
<view class="c2 mb20">
<span class="c6">鐢熶骇鎵规锛�</span>
- {{ orederMessage.batch || 'PH20221023001' }}
+ {{ orederMessage.batch || '-' }}
</view>
<view class="c2 mb20">
<span class="c6">璁″垝鏁伴噺锛�</span>
- {{ orederMessage.planNum || '1000' }}{{ orederMessage.umodel ? orederMessage.umodel.name : 'A1' }}
+ {{ orederMessage.planNum || '-' }}{{ orederMessage.umodel ? orederMessage.umodel.name : '-' }}
</view>
<view class="c2 mb20">
<span class="c6">鐢熶骇璁惧锛�</span>
- {{ orederMessage.pgmodel ? `${orederMessage.pgmodel.code} - ${orederMessage.pgmodel.name}` : 'A1' }}
+ {{ orederMessage.pgmodel ? `${orederMessage.pgmodel.code} - ${orederMessage.pgmodel.name}` : '-' }}
</view>
<view class="c2 flex">
<view class="c6" style="flex-shrink: 0;">鐢熶骇浜哄憳锛�</view>
<view class="flex1">
- {{ orederMessage.proUserList ? orederMessage.proUserList.map(item => item.proUserDepartName).join(' / ') : '渚辰鎱�-鍜屽幙椋為獜鏂板瀷寤烘潗' }}
+ {{ orederMessage.proUserList ? orederMessage.proUserList.map(item => item.proUserDepartName).join(' / ') : '-' }}
</view>
</view>
</view>
@@ -43,7 +43,10 @@
export default {
name: "workOrderInfo",
props: {
- orederMessage: {}
+ orederMessage: {
+ type: Object,
+ default: () => {}
+ }
},
data() {
return {
--
Gitblit v1.9.3