From 622382942e20d2e17e3e2502131cbd4fe69103c9 Mon Sep 17 00:00:00 2001
From: Mr.Zhang <710666463@qq.com>
Date: 星期五, 11 八月 2023 18:13:58 +0800
Subject: [PATCH] 08.11
---
web_standard/src/components/ext/OperaPlansDetailExtWindow.vue | 68 ++++++++++++++++-----------------
1 files changed, 33 insertions(+), 35 deletions(-)
diff --git a/web_standard/src/components/ext/OperaPlansDetailExtWindow.vue b/web_standard/src/components/ext/OperaPlansDetailExtWindow.vue
index 039754f..aa9d891 100644
--- a/web_standard/src/components/ext/OperaPlansDetailExtWindow.vue
+++ b/web_standard/src/components/ext/OperaPlansDetailExtWindow.vue
@@ -49,7 +49,10 @@
<span v-else style="color: #03AF76;" class="status-log">{{ item.status==1 ? '宸插鏂�' : item.status==2 ? '宸插畬宸�' : item.status==3 ? '宸叉楠�' : '宸叉姤宸�' }}</span>
</div>
</div>
- <div style="color: #777; font-size: 11px; margin-bottom: 15px;">{{ '鐢熶骇浜哄憳锛�' + proUserStr(item) }}</div>
+ <div class="c3 mt10 mb10 f12" style="display: flex;">
+ <div>璁″垝鏁伴噺锛歿{ form.num }}</div>
+ <div class="ml10">璁″垝寮�宸ユ棩鏈燂細{{ form.num }}</div>
+ </div>
<div v-if="item.produceDate" class="order-setup">
<!-- 鎶ュ伐淇℃伅 -->
<div class="line-style">
@@ -59,23 +62,20 @@
</div>
<div class="setup-content">
<div class="left-message">
- <div class="message-title-temp">
- 浜у嚭
- </div>
- <p class="time-style">
- {{ item.produceDate }}
- </p>
+ <div class="message-title-temp">浜у嚭</div>
</div>
- <div class="right-message">
- <div style="margin-left: 30px">
- <span style="color:#666;">鐗╂枡锛�</span>
+ <div class="right-message ml30">
+ <div style="display: flex;">
+ <div class="time-style">鎿嶄綔浜猴細{{ item.createUserName }}</div>
+ <div class="time-style ml50">鎿嶄綔鏃堕棿锛歿{ item.produceDate }}</div>
</div>
- <div>
+ <div style="display: flex;" class="mt10">
+ <span style="color:#666;">浜у搧锛�</span>
<div v-if="item.qualifiedNum">
<span style="color:#03AF76">[鍚堟牸鍝乚 </span>
<span style="color:#333333">{{ item.qualifiedNum + (form.umodel && form.umodel.name) }}</span>
</div>
- <div v-if="item.unqualifiedNum">
+ <div v-if="item.unqualifiedNum" class="ml20">
<span style="color:#F5A400">[涓嶈壇鍝乚 </span>
<span style="color:#333333">{{ item.unqualifiedNum + (form.umodel && form.umodel.name) }}</span>
</div>
@@ -95,17 +95,18 @@
<div :class="item.produceDate ? 'message-title' : 'message-title-temp'">
鎶曟枡
</div>
- <p class="time-style">
- {{ item.materialDate }}
- </p>
</div>
- <div class="right-message">
- <div style="margin-left: 30px">
- <span style="color:#666;">鐗╂枡锛�</span>
+ <div class="right-message ml30">
+ <div style="display: flex;">
+ <div class="time-style">鎿嶄綔浜猴細{{ item.createUserName }}</div>
+ <div class="time-style ml50">鎿嶄綔鏃堕棿锛歿{ item.materialDate }}</div>
</div>
- <div>
- <div v-for="(sItem, sIndex) in item.materialList" :key="sIndex">
- <span style="color:#333333">{{ sItem.name + ' / ' + sItem.num + sItem.unitName }}</span>
+ <div style="display: flex" class="mt10">
+ <div style="color:#666;">鐗╂枡锛�</div>
+ <div>
+ <div v-for="(sItem, sIndex) in item.materialList" :key="sIndex">
+ <span style="color:#333333">{{ sItem.name + ' / ' + sItem.num + sItem.unitName }}</span>
+ </div>
</div>
</div>
</div>
@@ -122,17 +123,17 @@
<div :class="item.materialDate ? 'message-title' : 'message-title-temp'">
鍒嗛厤
</div>
- <p class="time-style">
- {{ item.distributeDate }}
- </p>
+
</div>
- <div class="right-message">
- <div style="margin-left: 30px">
- <span style="color:#666;">鍒嗛厤鏁伴噺锛�</span>
+ <div class="right-message ml30">
+ <div style="display: flex;">
+ <div class="time-style">鎿嶄綔浜猴細{{ item.createUserName }}</div>
+ <div class="time-style ml50">鎿嶄綔鏃堕棿锛歿{ item.distributeDate }}</div>
</div>
- <div>
- <span style="color:#333333">{{ item.planNum + (form.umodel && form.umodel.name) }}</span>
+ <div class="mt10">
+ <span style="color:#666;">鍒嗛厤鏁伴噺锛歿{ item.planNum + (form.umodel && form.umodel.name) }}</span>
</div>
+
</div>
</div>
</div>
@@ -341,9 +342,9 @@
flex: 1;
// background-color: #f7f7f7;
display: flex;
- justify-content: space-between;
.left-message {
- width: 62px;
+ display: flex;
+ line-height: 20px;
.message-title {
color: #333;
font-weight: 500;
@@ -356,14 +357,11 @@
}
.time-style {
color: #999999;
- font-size: 11px;
- max-lines: 2;
}
}
.right-message {
- flex: 1;
font-size: 13px;
- display: flex;
+ // display: flex;
flex-direction: row;
}
}
--
Gitblit v1.9.3