Merge remote-tracking branch 'origin/dev' into dev

mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/detail.vue

@@ -514,7 +514,8 @@
               >
                 <el-table :data="formData.projectOrderSubs" class="hl-table">
                   <el-table-column label="序号" type="index" width="100" />
-                  <el-table-column label="子项目名称" min-width="150">
+                  <el-table-column min-width="150" align="center">
+                    <template #header> <span class="hl-table_header">*</span>子项目名称 </template>
                     <template #default="{ row, $index }">
                       <el-form-item
                         :prop="`${$index}.name`"
@@ -544,7 +545,8 @@
                       </el-form-item>
                     </template>
                   </el-table-column>
-                  <el-table-column label="数量" min-width="150">
+                  <el-table-column min-width="150">
+                    <template #header> <span class="hl-table_header">*</span>数量 </template>
                     <template #default="{ row, $index }">
                       <el-form-item
                         :prop="`${$index}.amount`"
@@ -562,7 +564,8 @@
                       </el-form-item>
                     </template>
                   </el-table-column>
-                  <el-table-column label="单位" min-width="150">
+                  <el-table-column min-width="150">
+                    <template #header> <span class="hl-table_header">*</span>单位 </template>
                     <template #default="{ row, $index }">
                       <el-form-item
                         :prop="`${$index}.unit`"
@@ -585,7 +588,8 @@
                       </el-form-item>
                     </template>
                   </el-table-column>
-                  <el-table-column label="材质" min-width="150">
+                  <el-table-column min-width="150">
+                    <template #header> <span class="hl-table_header">*</span>材质 </template>
                     <template #default="{ row, $index }">
                       <el-form-item
                         :prop="`${$index}.compositionId`"
@@ -1090,15 +1094,17 @@ const queryData = async (type: string, id?: number) => {
       formData.value.businessDeptId = userProfile.dept.id
     }
     // 判断远程查询中是否存在当前默认人 如无则手动设置
-    const hasContainMe = userSelectList.value.some(user => {
+    const hasContainMe = userSelectList.value.some((user) => {
       return user.id == formData.value.businessMan
     })
     if (!hasContainMe) {
       if (userSelectList.value.length == userParams.pageSize) {
-        userSelectList.value.splice(userSelectList.value.length-1,1,
+        userSelectList.value.splice(userSelectList.value.length - 1, 1, {
-          {id: userProfile.id, username: userProfile.username, nickname: userProfile.nickname})
+          id: userProfile.id,
+          username: userProfile.username,
+          nickname: userProfile.nickname
+        })
       }
-
     }
   } finally {
     formLoading.value = false