Compare commits
No commits in common. "5ccb88f4fc05e159bd87dfb98110e45e0dd078be" and "e7c7a50392a43069a7fd0b7744b431ddb2a7b714" have entirely different histories.
5ccb88f4fc
...
e7c7a50392
|
|
@ -2,23 +2,9 @@
|
||||||
<Mask :width="1200" :height="540" :is-show="isShow" @close="exit" title="新增盘点" :show-footer="true">
|
<Mask :width="1200" :height="540" :is-show="isShow" @close="exit" title="新增盘点" :show-footer="true">
|
||||||
<div class="body_wrapper">
|
<div class="body_wrapper">
|
||||||
<div class="top" style="width: 100%">
|
<div class="top" style="width: 100%">
|
||||||
<el-form :model="form" :inline=true style="width: 100%" label-width="auto" class="demo-ruleForm" label-position="top">
|
<el-form :model="form" style="width: 100%" label-width="auto" class="demo-ruleForm" label-position="top">
|
||||||
<el-form-item label="盘点人">
|
<el-form-item label="备注" style="width: 100%;margin-right: 0">
|
||||||
<el-select
|
<el-input v-model="form.remark" placeholder="请输入单据编号"></el-input>
|
||||||
v-model="form.checkUserId"
|
|
||||||
placeholder="选择盘点人"
|
|
||||||
style="width: 240px"
|
|
||||||
>
|
|
||||||
<el-option
|
|
||||||
v-for="item in managerUserList"
|
|
||||||
:key="item.id"
|
|
||||||
:label="item.name"
|
|
||||||
:value="item.id"
|
|
||||||
/>
|
|
||||||
</el-select>
|
|
||||||
</el-form-item>
|
|
||||||
<el-form-item label="备注" style="width: 50%;margin-right: 0">
|
|
||||||
<el-input v-model="form.remark"></el-input>
|
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-form>
|
</el-form>
|
||||||
</div>
|
</div>
|
||||||
|
|
@ -316,7 +302,7 @@ let addRow = (goodsId: number) => {
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
let save = () => {
|
let save = () => {
|
||||||
post("inventory/check/save", {list: list.value, remark: form.value.remark,checkUserId: form.value.checkUserId}).then((res: any) => {
|
post("inventory/check/save", {list: list.value, remark: form.value.remark}).then((res: any) => {
|
||||||
ElMessage.success('保存成功')
|
ElMessage.success('保存成功')
|
||||||
exit()
|
exit()
|
||||||
})
|
})
|
||||||
|
|
@ -332,24 +318,8 @@ let exit = () => {
|
||||||
const isShow = ref<any>(false)
|
const isShow = ref<any>(false)
|
||||||
const init = () => {
|
const init = () => {
|
||||||
isShow.value = true
|
isShow.value = true
|
||||||
getManagerUserList()
|
|
||||||
getUserInfo()
|
|
||||||
}
|
}
|
||||||
defineExpose({init})
|
defineExpose({init})
|
||||||
|
|
||||||
|
|
||||||
const managerUserList: any = ref([])
|
|
||||||
const getManagerUserList = () => {
|
|
||||||
post("manager/user/list", {}).then((res: any) => {
|
|
||||||
managerUserList.value = res
|
|
||||||
})
|
|
||||||
}
|
|
||||||
const getUserInfo = () => {
|
|
||||||
post("manager/user/verify", null).then((res: any) => {
|
|
||||||
form.value.useUserId = res.id;
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
</script>
|
</script>
|
||||||
<style scoped lang="scss">
|
<style scoped lang="scss">
|
||||||
.body_wrapper {
|
.body_wrapper {
|
||||||
|
|
|
||||||
|
|
@ -4,15 +4,10 @@
|
||||||
<div class="search">
|
<div class="search">
|
||||||
<div class="left">
|
<div class="left">
|
||||||
<el-form :inline="true" :model="searchModel">
|
<el-form :inline="true" :model="searchModel">
|
||||||
|
<el-form-item >
|
||||||
|
<el-input v-model="searchModel.code" placeholder="请输入单号" style="width: 180px;height: 42px" :prefix-icon="Search"></el-input>
|
||||||
|
</el-form-item>
|
||||||
<el-form-item>
|
<el-form-item>
|
||||||
<el-date-picker
|
|
||||||
v-model="selectedDate"
|
|
||||||
type="daterange"
|
|
||||||
range-separator="-"
|
|
||||||
@change="handleDateChange"
|
|
||||||
start-placeholder="开始时间"
|
|
||||||
end-placeholder="结束时间"
|
|
||||||
/>
|
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-form>
|
</el-form>
|
||||||
</div>
|
</div>
|
||||||
|
|
@ -67,7 +62,6 @@ import {nextTick, onMounted, ref} from "vue";
|
||||||
import {post} from "@/utils/request.ts";
|
import {post} from "@/utils/request.ts";
|
||||||
import DetailApply from "@/components/inventory/apply/DetailApply.vue";
|
import DetailApply from "@/components/inventory/apply/DetailApply.vue";
|
||||||
import {Refresh,Search} from "@element-plus/icons-vue";
|
import {Refresh,Search} from "@element-plus/icons-vue";
|
||||||
import {formatDateArray, getEndOfDay} from "@/utils/dateUtils.ts";
|
|
||||||
|
|
||||||
const is_add = ref(false)
|
const is_add = ref(false)
|
||||||
const is_detail = ref(false)
|
const is_detail = ref(false)
|
||||||
|
|
@ -76,7 +70,6 @@ const getList = () => {
|
||||||
const query = {
|
const query = {
|
||||||
pageNum: page.value,
|
pageNum: page.value,
|
||||||
pageSize: 20,
|
pageSize: 20,
|
||||||
...searchModel.value,
|
|
||||||
}
|
}
|
||||||
post("inventory/apply/list", {query: query}).then((res: any) => {
|
post("inventory/apply/list", {query: query}).then((res: any) => {
|
||||||
dataList.value = res.list
|
dataList.value = res.list
|
||||||
|
|
@ -118,26 +111,23 @@ const clickApply = () => {
|
||||||
addApplyRef.value?.init()
|
addApplyRef.value?.init()
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
const selectedDate = ref<any>([])
|
|
||||||
const handleDateChange = (date: any[]) => {
|
|
||||||
selectedDate.value = formatDateArray(date)
|
|
||||||
if (selectedDate.value[0] == selectedDate.value[1]) {
|
|
||||||
selectedDate.value[1] = getEndOfDay(selectedDate.value[1]); // 输出今天 23:59
|
|
||||||
}
|
|
||||||
searchModel.value.beginTime = selectedDate.value[0]
|
|
||||||
searchModel.value.endTime = selectedDate.value[1]
|
|
||||||
}
|
|
||||||
|
|
||||||
const searchModel= ref({
|
const searchModel= ref({
|
||||||
beginTime: null,
|
code: "",
|
||||||
endTime: null,
|
supplierIds: [],
|
||||||
|
managerUserIds: [],
|
||||||
|
startDate: "",
|
||||||
|
endDate: "",
|
||||||
})
|
})
|
||||||
const resetSearch= () => {
|
const resetSearch= () => {
|
||||||
searchModel.value = {
|
searchModel.value = {
|
||||||
beginTime: null,
|
code: "",
|
||||||
endTime: null,
|
supplierIds: [],
|
||||||
|
managerUserIds: [],
|
||||||
|
startDate: "",
|
||||||
|
endDate: "",
|
||||||
}
|
}
|
||||||
getList()
|
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -5,14 +5,10 @@
|
||||||
<div class="left">
|
<div class="left">
|
||||||
<el-form :inline="true" :model="searchModel">
|
<el-form :inline="true" :model="searchModel">
|
||||||
<el-form-item>
|
<el-form-item>
|
||||||
<el-date-picker
|
<el-input v-model="searchModel.code" placeholder="请输入单号" style="width: 180px;height: 42px"
|
||||||
v-model="selectedDate"
|
:prefix-icon="Search"></el-input>
|
||||||
type="daterange"
|
</el-form-item>
|
||||||
range-separator="-"
|
<el-form-item>
|
||||||
@change="handleDateChange"
|
|
||||||
start-placeholder="开始时间"
|
|
||||||
end-placeholder="结束时间"
|
|
||||||
/>
|
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-form>
|
</el-form>
|
||||||
</div>
|
</div>
|
||||||
|
|
@ -69,14 +65,12 @@ import Mask from "@/components/common/Mask.vue";
|
||||||
import Add from "@/components/inventory/check/Add.vue";
|
import Add from "@/components/inventory/check/Add.vue";
|
||||||
import Detail from "@/components/inventory/check/Detail.vue";
|
import Detail from "@/components/inventory/check/Detail.vue";
|
||||||
import {Plus, Refresh, Search} from "@element-plus/icons-vue";
|
import {Plus, Refresh, Search} from "@element-plus/icons-vue";
|
||||||
import {formatDateArray, getEndOfDay} from "@/utils/dateUtils.ts";
|
|
||||||
|
|
||||||
const tableData = ref([])
|
const tableData = ref([])
|
||||||
const getCheck = () => {
|
const getCheck = () => {
|
||||||
const query = {
|
const query = {
|
||||||
pageNum: page.value,
|
pageNum: page.value,
|
||||||
pageSize: 20,
|
pageSize: 20
|
||||||
...searchModel.value,
|
|
||||||
}
|
}
|
||||||
post("inventory/check/list", {query: query}).then(
|
post("inventory/check/list", {query: query}).then(
|
||||||
(res: any) => {
|
(res: any) => {
|
||||||
|
|
@ -118,24 +112,12 @@ const formatDate = (isoStr: any) => {
|
||||||
const date = new Date(isoStr);
|
const date = new Date(isoStr);
|
||||||
return `${date.getFullYear()}-${(date.getMonth() + 1).toString().padStart(2, '0')}-${date.getDate().toString().padStart(2, '0')}`;
|
return `${date.getFullYear()}-${(date.getMonth() + 1).toString().padStart(2, '0')}-${date.getDate().toString().padStart(2, '0')}`;
|
||||||
}
|
}
|
||||||
const selectedDate = ref<any>([])
|
|
||||||
const handleDateChange = (date: any[]) => {
|
|
||||||
selectedDate.value = formatDateArray(date)
|
|
||||||
if (selectedDate.value[0] == selectedDate.value[1]) {
|
|
||||||
selectedDate.value[1] = getEndOfDay(selectedDate.value[1]); // 输出今天 23:59
|
|
||||||
}
|
|
||||||
searchModel.value.beginTime = selectedDate.value[0]
|
|
||||||
searchModel.value.endTime = selectedDate.value[1]
|
|
||||||
}
|
|
||||||
|
|
||||||
const searchModel = ref({
|
const searchModel = ref({
|
||||||
beginTime: null,
|
code: ''
|
||||||
endTime: null,
|
|
||||||
})
|
})
|
||||||
const resetSearch = () => {
|
const resetSearch = () => {
|
||||||
searchModel.value = {
|
searchModel.value = {
|
||||||
beginTime: null,
|
code: ''
|
||||||
endTime: null,
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue