2 Commits 03bcfcbefc ... 4d36e017b1

Auteur SHA1 Message Date
  jxq 4d36e017b1 Merge remote-tracking branch 'origin/qingban' into qingban il y a 1 semaine
  jxq 59aaab1ce4 修改工单、。 il y a 1 semaine
1 fichiers modifiés avec 18 ajouts et 22 suppressions
  1. 18 22
      src/views/process/components/order.vue

+ 18 - 22
src/views/process/components/order.vue

@@ -4,30 +4,25 @@
     <div class="topArea">
       <div class="productName">{{ item.materialName }}</div>
       <div class="productMsg">
-        <span :class="hoverStatus ? 'msgName msgNameHover' : 'msgName'"
-          >产品型号</span
-        >
+        <span :class="hoverStatus ? 'msgName msgNameHover' : 'msgName'">产品型号</span>
         <span class="msgValue">{{ item.materialModel }}</span>
       </div>
       <div class="productMsg">
-        <span :class="hoverStatus ? 'msgName msgNameHover' : 'msgName'"
-          >生产批号</span
-        >
+        <span :class="hoverStatus ? 'msgName msgNameHover' : 'msgName'">生产批号</span>
         <span class="msgValue">{{ item.workOrderCode }}</span>
       </div>
       <div class="productMsg">
-        <span :class="hoverStatus ? 'msgName msgNameHover' : 'msgName'"
-          >计划编号</span
-        >
+        <span :class="hoverStatus ? 'msgName msgNameHover' : 'msgName'">计划编号</span>
         <span class="msgValue">{{ item.orderCode }}</span>
       </div>
+      <div class="productMsg" v-if="item?.remark">
+        <span class="remark-text">{{ item?.remark }}</span>
+      </div>
     </div>
     <div class="bottomArea">
       <div class="bottomBox">
         <div class="boxNum">{{ parseInt(item.planNum) }}</div>
-        <div :class="hoverStatus ? 'boxText boxTextHover' : 'boxText'">
-          产品数量
-        </div>
+        <div :class="hoverStatus ? 'boxText boxTextHover' : 'boxText'">产品数量</div>
       </div>
       <!-- <div class="textDivider">
         <div class="dividerBox">
@@ -42,10 +37,7 @@
       </div> -->
     </div>
     <!-- 右下角状态盒子 -->
-    <div
-      class="statusBox"
-      :style="`background-color:${planStyle(item.workOrderState).bgColor};`"
-    >
+    <div class="statusBox" :style="`background-color:${planStyle(item.workOrderState).bgColor};`">
       {{ dictS.getLableByValue("plan_work_order_state", item.workOrderState) }}
     </div>
     <div class="water-box" v-if="item?.waterVapor == '1'">水汽</div>
@@ -122,11 +114,11 @@ const planStyle = (val) => {
 }
 
 .productName {
-  font-size: $f24;
+  font-size: $f20;
 }
 
 .msgName {
-  font-size: $f20;
+  font-size: $f14;
   color: $font-default-60;
 }
 
@@ -136,7 +128,11 @@ const planStyle = (val) => {
 
 .msgValue {
   margin-left: 5px;
-  font-size: $f20;
+  font-size: $f14;
+}
+
+.remark-text {
+  font-size: $f14;
 }
 
 .bottomArea {
@@ -160,12 +156,12 @@ const planStyle = (val) => {
 .boxNum {
   text-align: center;
   line-height: 38px;
-  font-size: $f38;
+  font-size: $f24;
 }
 
 .boxText {
   text-align: center;
-  font-size: $f20;
+  font-size: $f16;
   line-height: 20px;
   color: $font-default-60;
 }
@@ -181,7 +177,7 @@ const planStyle = (val) => {
   align-items: center;
   justify-content: center;
   background-color: $select-hover;
-  font-size: $f20;
+  font-size: $f16;
 }
 .water-box {
   position: absolute;