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/components/workOrderInfo.vue | 167 ++++++++++++++++++++++++++++++++++---------------------
1 files changed, 103 insertions(+), 64 deletions(-)
diff --git a/minipro_standard/components/workOrderInfo.vue b/minipro_standard/components/workOrderInfo.vue
index 6f904b5..31706ef 100644
--- a/minipro_standard/components/workOrderInfo.vue
+++ b/minipro_standard/components/workOrderInfo.vue
@@ -2,84 +2,123 @@
<view class="p30 bg_w order-info">
<view class="bX">
<view class="cY">
- <view class="mr10 b">{{ `${orederMessage.mmodel.name} |${orederMessage.procedureName}`}}</view>
- <u-tag size="mini" bgColor="#03AF76" text="姝ｅ父"></u-tag>
+ <view class="mr10 b">{{ `${orederMessage.mmodel.name || ''} | ${orederMessage.procedureName || ''}`}}
+ </view>
+ <!-- <u-tag size="mini" bgColor="#03AF76" text="姝ｅ父"></u-tag> -->
+ <div class="type bg_green" v-if="orederMessage.type === 0">姝ｅ父</div>
+ <div class="type bg_yellow" v-if="orederMessage.type === 2">杩斿伐杩斾慨</div>
</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>
- </view>
- <view class="f24 c6 mt20">宸ュ崟缂栧彿锛歿{ orederMessage.code || 'GD202111240001' }}</view>
- <view class="mt20 bg_f7 ptb20 plr30 n">
- <view class="c2 mb20">
- <span class="c6">鐗╂枡缂栫爜锛�</span>
- {{ orederMessage.mmodel ? orederMessage.mmodel.code : '-' }}
- </view>
- <view class="c2 mb20">
- <span class="c6">璁″垝寮�宸ワ細</span>
- {{ orederMessage.planDate || '-' }}
- </view>
- <view class="c2 mb20">
- <span class="c6">鐢熶骇鎵规锛�</span>
- {{ orederMessage.batch || '-' }}
- </view>
- <view class="c2 mb20">
- <span class="c6">璁″垝鏁伴噺锛�</span>
- {{ orederMessage.planNum || '-' }}{{ orederMessage.umodel ? orederMessage.umodel.name : '-' }}
- </view>
- <view class="c2 mb20">
- <span class="c6">鐢熶骇璁惧锛�</span>
- {{ 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(' / ') : '-' }}
- </view>
- </view>
+ <view class="status"
+ :class="orederMessage.status==0?'wc':orederMessage.status==1?'green':orederMessage.status==3?'blue':orederMessage.status==7?'green':'c6'">
+ {{ stausToStr(orederMessage.status) }}</view>
+ </view>
+ <view class="f24 c6 mt20">宸ュ崟缂栧彿锛歿{ orederMessage.code || '-' }}</view>
+ <view class="f24 mt20 bg_f7 ptb20 plr30 n">
+ <view class="c2 mb20">
+ <span class="c6">鐗╂枡缂栫爜锛�</span>
+ {{ orederMessage.mmodel ? orederMessage.mmodel.code : '-' }}
+ </view>
+ <view class="c2 mb20">
+ <span class="c6">璁″垝寮�宸ワ細</span>
+ {{ orederMessage.planDate || '-' }}
+ </view>
+ <view class="c2 mb20">
+ <span class="c6">鐢熶骇鎵规锛�</span>
+ {{ orederMessage.batch || '-' }}
+ </view>
+ <view class="c2 mb20">
+ <span class="c6">璁″垝鏁伴噺锛�</span>
+ {{ orederMessage.planNum || '-' }}{{ orederMessage.umodel ? orederMessage.umodel.name : '-' }}
+ </view>
+ <view class="c2 mb20">
+ <span class="c6">鐢熶骇璁惧锛�</span>
+ {{ 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(' / ') : '-' }}
+ </view>
+ </view>
</view>
</view>
</template>
<script>
export default {
- name: "workOrderInfo",
- props: {
- orederMessage: {
- type: Object,
- default: () => {}
- }
+ name: "workOrderInfo",
+ props: {
+ orederMessage: {
+ type: Object,
+ default: () => {}
+ }
},
data() {
return {
- status: [
- { status: 0, label: '宸插垱寤�' },
- { status: 1, label: '宸插鏂�' },
- { status: 2, label: '宸插畬宸ユ' },
- { status: 3, label: '宸叉楠�' },
- { status: 4, label: '宸叉姤宸�' },
- { status: 5, label: '宸插叆搴�' },
- { status: 6, label: '宸插彇娑�' },
- { status: 7, label: '杩涜涓�' }
+ status: [{
+ status: 0,
+ label: '宸插垱寤�'
+ },
+ {
+ status: 1,
+ label: '宸插鏂�'
+ },
+ {
+ status: 2,
+ label: '宸插畬宸ユ'
+ },
+ {
+ status: 3,
+ label: '宸叉楠�'
+ },
+ {
+ status: 4,
+ label: '宸叉姤宸�'
+ },
+ {
+ status: 5,
+ label: '宸插叆搴�'
+ },
+ {
+ status: 6,
+ label: '宸插彇娑�'
+ },
+ {
+ status: 7,
+ label: '鐢熶骇涓�'
+ }
]
};
- },
- methods: {
- stausToStr(status) {
- let temp = this.status.find(item => item.status == status)
- return temp ? temp.label : '-'
- }
+ },
+ methods: {
+ stausToStr(status) {
+ let temp = this.status.find(item => item.status == status)
+ return temp ? temp.label : '-'
+ }
}
}
</script>
-<style lang="scss">
-.status {
- height: 26rpx;
- font-size: 26rpx;
- font-weight: 400;
- color: #666666;
- line-height: 26rpx;
-}
-.order-info {
- border-bottom: 20rpx #f7f7f7 solid;
-}
+<style lang="scss" scoped>
+ .status {
+ height: 26rpx;
+ font-size: 26rpx;
+ font-weight: 400;
+ color: #666666;
+ line-height: 26rpx;
+ }
+
+ .type {
+ padding: 0 8rpx;
+ color: white;
+ margin-left: 10rpx;
+ height: 38rpx;
+ line-height: 38rpx;
+ font-size: 22rpx;
+ border: 8rpx;
+ }
+
+ .order-info {
+ border-bottom: 20rpx #f7f7f7 solid;
+ }
</style>
--
Gitblit v1.9.3