Compare commits
No commits in common. "0c2957ce043650fac47a2e3601cc22e506254af7" and "acb47d04ce90271e03bb3a343e77d6e144190c1c" have entirely different histories.
0c2957ce04
...
acb47d04ce
|
|
@ -4,18 +4,7 @@
|
|||
<div class="top">
|
||||
<el-form :inline=true label-position="top" :model="formData" label-width="auto">
|
||||
<el-form-item label="领用人">
|
||||
<el-select
|
||||
v-model="formData.useUserId"
|
||||
placeholder="选择领用人"
|
||||
style="width: 240px"
|
||||
>
|
||||
<el-option
|
||||
v-for="item in managerUserList"
|
||||
:key="item.id"
|
||||
:label="item.name"
|
||||
:value="item.id"
|
||||
/>
|
||||
</el-select>
|
||||
<el-input v-model="formData.name" disabled></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="备注" style="width: 50%">
|
||||
<el-input v-model="formData.remark"></el-input>
|
||||
|
|
@ -50,7 +39,7 @@
|
|||
multiple
|
||||
@change="addLine(item)"
|
||||
:teleported="false"
|
||||
style="width: 200px;"
|
||||
style="width: 100px;"
|
||||
collapse-tags
|
||||
popper-class="table-select">
|
||||
<div class="select-header">
|
||||
|
|
@ -265,25 +254,16 @@ const save = () => {
|
|||
})
|
||||
|
||||
|
||||
}
|
||||
const init = () => {
|
||||
isShow.value = true
|
||||
getManagerUserList()
|
||||
getUserInfo()
|
||||
}
|
||||
const getUserInfo = () => {
|
||||
isShow.value = true
|
||||
post("manager/user/verify", null).then((res: any) => {
|
||||
formData.value.useUserId = res.id;
|
||||
formData.value.name = res.name;
|
||||
formData.value.username = res.username;
|
||||
})
|
||||
}
|
||||
const managerUserList: any = ref([])
|
||||
const getManagerUserList = () => {
|
||||
post("manager/user/list", {}).then((res: any) => {
|
||||
managerUserList.value = res
|
||||
})
|
||||
}
|
||||
|
||||
defineExpose({init})
|
||||
defineExpose({getUserInfo})
|
||||
</script>
|
||||
<style scoped lang="scss">
|
||||
.simple-table {
|
||||
|
|
|
|||
|
|
@ -112,11 +112,9 @@ const rowClick = (row: any) => {
|
|||
const addApplyRef = ref()
|
||||
const clickApply = () => {
|
||||
nextTick(() => {
|
||||
addApplyRef.value?.init()
|
||||
addApplyRef.value?.getUserInfo()
|
||||
})
|
||||
}
|
||||
|
||||
|
||||
const searchModel= ref({
|
||||
code: "",
|
||||
supplierIds: [],
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
<div class="search">
|
||||
<div class="left">
|
||||
<el-form :inline="true" :model="searchModel">
|
||||
<el-form-item>
|
||||
<el-form-item >
|
||||
<el-date-picker
|
||||
v-model="selectedDate"
|
||||
type="daterange"
|
||||
|
|
@ -23,14 +23,6 @@
|
|||
>
|
||||
</el-input>
|
||||
</el-form-item>
|
||||
<el-form-item>
|
||||
<el-input
|
||||
v-model="searchModel.goodsName"
|
||||
placeholder="商品名称"
|
||||
style="width: 200px;height: 42px"
|
||||
>
|
||||
</el-input>
|
||||
</el-form-item>
|
||||
<el-form-item>
|
||||
<el-select
|
||||
v-model="searchModel.supplierIds"
|
||||
|
|
@ -86,8 +78,7 @@
|
|||
</div>
|
||||
<div class="content_list">
|
||||
<el-scrollbar>
|
||||
<el-table :data="tableData" style="width: 100%" @row-click="open_edit"
|
||||
:header-cell-style="{ backgroundColor: '#F1F5FB' }">
|
||||
<el-table :data="tableData" style="width: 100%" @row-click="open_edit" :header-cell-style="{ backgroundColor: '#F1F5FB' }">
|
||||
<el-table-column fixed label="采购单号" show-overflow-tooltip>
|
||||
<template #default="scope">
|
||||
<div class="link">{{ scope.row.code }}</div>
|
||||
|
|
@ -109,11 +100,11 @@
|
|||
{{ formatDate(scope.row.purchaseDate) }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<!-- <el-table-column prop="createDatetime" label="入库时间">-->
|
||||
<!-- <template #default="scope">-->
|
||||
<!-- {{ formatDate(scope.row.purchaseDate) }}-->
|
||||
<!-- </template>-->
|
||||
<!-- </el-table-column>-->
|
||||
<!-- <el-table-column prop="createDatetime" label="入库时间">-->
|
||||
<!-- <template #default="scope">-->
|
||||
<!-- {{ formatDate(scope.row.purchaseDate) }}-->
|
||||
<!-- </template>-->
|
||||
<!-- </el-table-column>-->
|
||||
<el-table-column label="备注" prop="remark">
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
|
|
@ -223,26 +214,25 @@ const getSupplierList = () => {
|
|||
}
|
||||
const managerUserList: any = ref([])
|
||||
const getManagerUserList = () => {
|
||||
post("manager/user/list", {}).then((res: any) => {
|
||||
post("manager/user/list", {
|
||||
}).then((res: any) => {
|
||||
managerUserList.value = res
|
||||
})
|
||||
}
|
||||
const searchModel = ref({
|
||||
code: "",
|
||||
managerUserIds: [],
|
||||
managerUserIds: [],
|
||||
supplierIds: [],
|
||||
beginTime: null,
|
||||
endTime: null,
|
||||
goodsName: null
|
||||
endTime:null
|
||||
})
|
||||
const resetSearch = () => {
|
||||
searchModel.value = {
|
||||
code: "",
|
||||
managerUserIds: [],
|
||||
managerUserIds: [],
|
||||
supplierIds: [],
|
||||
beginTime: null,
|
||||
endTime: null,
|
||||
goodsName: null
|
||||
endTime:null
|
||||
}
|
||||
init()
|
||||
}
|
||||
|
|
@ -333,7 +323,6 @@ const resetSearch = () => {
|
|||
}
|
||||
|
||||
}
|
||||
|
||||
.top {
|
||||
height: 110px;
|
||||
background: #fff;
|
||||
|
|
@ -343,21 +332,17 @@ const resetSearch = () => {
|
|||
.search {
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
|
||||
.left {
|
||||
flex: 1;
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
margin-right: 24px;
|
||||
|
||||
.el-form-item {
|
||||
margin-right: 5px;
|
||||
}
|
||||
}
|
||||
|
||||
.right {
|
||||
display: flex;
|
||||
|
||||
.btn {
|
||||
width: 120px;
|
||||
height: 42px;
|
||||
|
|
@ -369,7 +354,6 @@ const resetSearch = () => {
|
|||
align-items: center;
|
||||
margin-left: 24px;
|
||||
cursor: pointer;
|
||||
|
||||
&:hover {
|
||||
background: #4D6DE4;
|
||||
color: #fff;
|
||||
|
|
@ -395,7 +379,6 @@ const resetSearch = () => {
|
|||
text-align: center;
|
||||
line-height: 42px;
|
||||
cursor: pointer;
|
||||
|
||||
&:hover {
|
||||
background: #4D6DE4;
|
||||
color: #fff;
|
||||
|
|
@ -404,11 +387,9 @@ const resetSearch = () => {
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
:deep(.el-range-editor.el-input__wrapper) {
|
||||
height: 42px;
|
||||
}
|
||||
|
||||
:deep(.el-select__wrapper) {
|
||||
height: 42px;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue