yunxi
/
mes-heli
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 6 Wiki Activity

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

Browse Source
pull/4/head
zengchenxi 8 months ago
parent b1725702a1 7f2edfe4e2
commit d65b99a05e
3 changed files with 65 additions and 64 deletions
Show Stats Download Patch File Download Diff File

121
mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/detail.vue
Unescape View File

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

4
mes-ui/mes-ui-admin-vue3/src/views/heli/purchaseorder/index.vue
Unescape View File

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

4
mes-ui/mes-ui-admin-vue3/src/views/heli/storage/index.vue
Unescape View File

@ -106,7 +106,7 @@
<!-- 列表 --> <!-- 列表 -->
<ContentWrap> <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 label="主键id" align="center" prop="id" /> -->
<el-table-column type="index" width="100" fixed label="序号" align="center" /> <el-table-column type="index" width="100" fixed label="序号" align="center" />
<el-table-column label="入库单号" align="center" prop="stockNo" min-width="210" fixed > <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 }} {{ warehouseList.find((tag) => tag.id === scope.row.whId)?.whName }}
</template> </template>
</el-table-column> </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"> <el-table-column label="创建人" align="center" prop="creator" min-width="120">
<template #default="scope"> <template #default="scope">
{{ userList.find((user) => user.id === scope.row.creator)?.nickname }} {{ userList.find((user) => user.id === scope.row.creator)?.nickname }}

Write Preview
Loading…
Cancel
Save