Merge branch 'hurx'

src/layout/components/header.vue

@@ -30,6 +30,8 @@
             </el-icon>
           </div>
           <div class="userInfo-box">姓名:{{ userInfo.user.nickName }}</div>
+          <div class="userInfo-box">部门:{{ userInfo.user.deptName || '' }}</div>
+
           <div class="userInfo-box" @click="onlogout">退出登录</div>
         </div>
         <div v-if="!userInfo.user" class="header-text end" @click="onPath('/login')" style="cursor: pointer">请登录</div>
@@ -219,7 +221,7 @@ const handleNavClick = (item: any) => {
         &.open {
           background-color: #ffffff;
           box-shadow: 0px 0px 6px rgba(0, 0, 0, 0.12);
-          height: 110px;
+          height: 130px;
           overflow: visible;
 
           .userInfo-customer {

src/views/order/orderManage/applyAfter.vue

@@ -529,7 +529,7 @@ const loadReturnDetail = async () => {
             productImage: p.productImage || '',
             name: p.productName || '',
             spec: `${p.productUnit || ''} ${p.productNo || ''}`.trim(),
-            unitPrice: Number(p.returnPrice) || Number(p.orderPrice) || 0,
+            unitPrice: Number(p.unitPrice) || Number(p.orderPrice) || 0,
             soldQty: Number(p.returnQuantity) || 0,
             availableQty: Number(p.returnQuantity) || 0,
             returnQuantity: Number(p.returnQuantity) || 0,