From 6365ab0a976afdd247742c9b3dca15deb3a7a7a1 Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期四, 17 八月 2023 17:21:40 +0800 Subject: [PATCH] 初始化1.0.1 --- web_standard/src/components/ext/OperaPlansDetailExtWindow.vue | 70 ++++++++++++++++++----------------- 1 files changed, 36 insertions(+), 34 deletions(-) diff --git a/web_standard/src/components/ext/OperaPlansDetailExtWindow.vue b/web_standard/src/components/ext/OperaPlansDetailExtWindow.vue index aa9d891..039754f 100644 --- a/web_standard/src/components/ext/OperaPlansDetailExtWindow.vue +++ b/web_standard/src/components/ext/OperaPlansDetailExtWindow.vue @@ -49,10 +49,7 @@ <span v-else style="color: #03AF76;" class="status-log">{{ item.status==1 ? '宸插鏂�' : item.status==2 ? '宸插畬宸�' : item.status==3 ? '宸叉楠�' : '宸叉姤宸�' }}</span> </div> </div> - <div class="c3 mt10 mb10 f12" style="display: flex;"> - <div>璁″垝鏁伴噺锛歿{ form.num }}</div> - <div class="ml10">璁″垝寮�宸ユ棩鏈燂細{{ form.num }}</div> - </div> + <div style="color: #777; font-size: 11px; margin-bottom: 15px;">{{ '鐢熶骇浜哄憳锛�' + proUserStr(item) }}</div> <div v-if="item.produceDate" class="order-setup"> <!-- 鎶ュ伐淇℃伅 --> <div class="line-style"> @@ -62,20 +59,23 @@ </div> <div class="setup-content"> <div class="left-message"> - <div class="message-title-temp">浜у嚭</div> - </div> - <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 class="message-title-temp"> + 浜у嚭 </div> - <div style="display: flex;" class="mt10"> - <span style="color:#666;">浜у搧锛�</span> + <p class="time-style"> + {{ item.produceDate }} + </p> + </div> + <div class="right-message"> + <div style="margin-left: 30px"> + <span style="color:#666;">鐗╂枡锛�</span> + </div> + <div> <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" class="ml20"> + <div v-if="item.unqualifiedNum"> <span style="color:#F5A400">[涓嶈壇鍝乚 </span> <span style="color:#333333">{{ item.unqualifiedNum + (form.umodel && form.umodel.name) }}</span> </div> @@ -95,18 +95,17 @@ <div :class="item.produceDate ? 'message-title' : 'message-title-temp'"> 鎶曟枡 </div> + <p class="time-style"> + {{ item.materialDate }} + </p> </div> - <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 class="right-message"> + <div style="margin-left: 30px"> + <span style="color:#666;">鐗╂枡锛�</span> </div> - <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 v-for="(sItem, sIndex) in item.materialList" :key="sIndex"> + <span style="color:#333333">{{ sItem.name + ' / ' + sItem.num + sItem.unitName }}</span> </div> </div> </div> @@ -123,17 +122,17 @@ <div :class="item.materialDate ? 'message-title' : 'message-title-temp'"> 鍒嗛厤 </div> - + <p class="time-style"> + {{ item.distributeDate }} + </p> </div> - <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 class="right-message"> + <div style="margin-left: 30px"> + <span style="color:#666;">鍒嗛厤鏁伴噺锛�</span> </div> - <div class="mt10"> - <span style="color:#666;">鍒嗛厤鏁伴噺锛歿{ item.planNum + (form.umodel && form.umodel.name) }}</span> + <div> + <span style="color:#333333">{{ item.planNum + (form.umodel && form.umodel.name) }}</span> </div> - </div> </div> </div> @@ -342,9 +341,9 @@ flex: 1; // background-color: #f7f7f7; display: flex; + justify-content: space-between; .left-message { - display: flex; - line-height: 20px; + width: 62px; .message-title { color: #333; font-weight: 500; @@ -357,11 +356,14 @@ } .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