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

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

@@ -283,7 +283,7 @@
                 <el-button class="hl-addbutton" type="primary" size="large" @click="onAddItem">新增</el-button>
               </el-col>
               <el-form ref="projectOrderSubFormRef" :model="formData.projectOrderSubs" :rules="subFormRules" v-loading="subFormLoading" label-width="0">
-                <el-table  :data="formData.projectOrderSubs" class="hl-table" :row-class-name="({row,rowIndex}) => { return fieldHasAlterInRow('NEW', row) ? 'alter-class1' : ''}">
+                <el-table :data="formData.projectOrderSubs" class="hl-table" :row-class-name="({row,rowIndex}) => { return fieldHasAlterInRow('NEW', row) ? 'alter-class1' : ''}">
                   <el-table-column label="序号" type="index" width="80" />
                   <el-table-column min-width="150" align="center">
                     <template #header> <span class="hl-table_header">*</span>子项目名称 </template>
@@ -559,25 +559,25 @@ const fieldHasAlterInRow = (fieldName, row) => {
 
 const deptList = ref<Tree[]>([]) // 树形结构
 const userList = ref<UserApi.UserVO[]>([]) // 用户列表
-const userSelectList = ref<UserApi.UserVO[]>([])
-const userSelectLoading = ref(false)
-
-const remoteUserSearch = (query: string) => {
-  if (query) {
-    userSelectLoading.value = true
-    setTimeout(() => {
-      userSelectLoading.value = false
-      userSelectList.value = userList.value.filter((item) => {
-        return (
-          item.nickname.toLowerCase().includes(query.toLowerCase()) ||
-          item.username.toLowerCase().includes(query.toLowerCase())
-        )
-      })
-    }, 200)
-  } else {
-    userSelectList.value = userList.value
-  }
-}
+// const userSelectList = ref<UserApi.UserVO[]>([])
+// const userSelectLoading = ref(false)
+
+// const remoteUserSearch = (query: string) => {
+//   if (query) {
+//     userSelectLoading.value = true
+//     setTimeout(() => {
+//       userSelectLoading.value = false
+//       userSelectList.value = userList.value.filter((item) => {
+//         return (
+//           item.nickname.toLowerCase().includes(query.toLowerCase()) ||
+//           item.username.toLowerCase().includes(query.toLowerCase())
+//         )
+//       })
+//     }, 200)
+//   } else {
+//     userSelectList.value = userList.value
+//   }
+// }
 
 const customerList = ref<CustomerApi.CustomerVO[]>([])
 const customerSelectList = ref<CustomerApi.CustomerVO[]>([])
@@ -646,15 +646,15 @@ const queryData = async (type: string, id?: number) => {
     // 加载部门树
     deptList.value = handleTree(await DeptApi.getSimpleDeptList())
 
-    // 获得用户列表
-    let userParams = {
-      pageNo: 1,
-      pageSize: 10,
-      status: '0'
-    }
-    const data = await UserApi.getUserPage(userParams)
-    userList.value = data.list
-    userSelectList.value = data.list
+    // // 获得用户列表
+    // let userParams = {
+    //   pageNo: 1,
+    //   pageSize: 10,
+    //   status: '0'
+    // }
+    // const data = await UserApi.getUserPage(userParams)
+    // userList.value = data.list
+    // userSelectList.value = data.list
 
     // 获得客户列表
     let customerParams = {
@@ -666,27 +666,25 @@ const queryData = async (type: string, id?: number) => {
     customerList.value = customerData.list
     customerSelectList.value = customerData.list
 
-    // 绑定默认部门与业务员
-    if (!formData.value.businessMan) {
-      formData.value.businessMan = useUserStore().getUser.id // 当前登录的编码
-    }
+    // // 绑定默认部门
+
     const userProfile = await getUserProfile(formData.value.businessMan)
     if (userProfile.dept) {
       formData.value.businessDeptId = userProfile.dept.id
     }
-    // 判断远程查询中是否存在当前默认人 如无则手动设置
-    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, {
-          id: userProfile.id,
-          username: userProfile.username,
-          nickname: userProfile.nickname
-        })
-      }
-    }
+    // // 判断远程查询中是否存在当前默认人 如无则手动设置
+    // 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, {
+    //       id: userProfile.id,
+    //       username: userProfile.username,
+    //       nickname: userProfile.nickname
+    //     })
+    //   }
+    // }
   } finally {
     formLoading.value = false
   }
@@ -945,6 +943,10 @@ onMounted(() => {
     detailDisabled.value = true
   }
   queryData(query.active, query.id)
+  // 绑定默认业务员
+  if (!formData.value.businessMan) {
+    formData.value.businessMan = useUserStore().getUser.id // 当前登录的编码
+  }
 })
 
 // 材质传递的值
@@ -983,22 +985,21 @@ a {
 } */
 </style>
 <style scoped>
-.hl-card /deep/ .el-table__body tr.alter-class1{
-	position:relative;/*重点*/
-	z-index:2;/*重点*/
-	width:100%;
-	overflow:hidden;
-	text-overflow:ellipsis;
-   --el-table-row-hover-bg-color:transparent;
+.hl-card /deep/ .el-table__body tr.alter-class1 {
+  position: relative; /*重点*/
+  z-index: 2; /*重点*/
+  width: 100%;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  --el-table-row-hover-bg-color: transparent;
 }
 .hl-card /deep/ .el-table__body tr.alter-class1::after {
- position:absolute;
-	content:" ";
-	width:calc(100% - 6px);/*改动处*/
-	height:calc(100% - 6px);
-	left:2px;/*改动处*/
-	background:transparent;
+  position: absolute;
+  content: ' ';
+  width: calc(100% - 6px); /*改动处*/
+  height: calc(100% - 6px);
+  left: 2px; /*改动处*/
+  background: transparent;
   border: 3px solid orange !important;
 }
-
 </style>

mes-ui/mes-ui-admin-vue3/src/views/heli/purchaseorder/index.vue

@@ -64,8 +64,8 @@
     <ContentWrap>
       <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true" class="hl-table"
         @selection-change="handleSelectionChange" @row-click="clickRow" selection>
-        <el-table-column type="selection" align="center" fixed width="70" />
-        <el-table-column fixed label="序号" type="index" width="60" />
+        <el-table-column type="selection"  fixed width="60" />
+        <el-table-column fixed label="序号" type="index" align="center" width="60" />
         <el-table-column label="采购单号" align="center" prop="purchaseNo" fixed min-width="190">
           <template #default="scope">
             <el-button link type="primary" @click="openForm('detail', scope.row.id)">

mes-ui/mes-ui-admin-vue3/src/views/heli/storage/index.vue

@@ -106,7 +106,7 @@
 
     <!-- 列表 -->
     <ContentWrap>
-      <el-table v-loading="loading" :data="list" :stripe="true"  class="hl-table">
+      <el-table v-loading="loading" :data="list" :show-overflow-tooltip="true" :stripe="true"  class="hl-table">
         <!-- <el-table-column label="主键id" align="center" prop="id" /> -->
           <el-table-column type="index" width="100" fixed label="序号" align="center" />
         <el-table-column label="入库单号" align="center" prop="stockNo" min-width="210" fixed >
@@ -127,7 +127,7 @@
             {{ warehouseList.find((tag) => tag.id === scope.row.whId)?.whName }}
           </template>
         </el-table-column>
-        <el-table-column label="备注" align="center" prop="description" min-width="120" />
+        <el-table-column label="备注" align="center" prop="description" min-width="160" />
         <el-table-column label="创建人" align="center" prop="creator" min-width="120">
           <template #default="scope">
             {{ userList.find((user) => user.id === scope.row.creator)?.nickname }}