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

库存盘点编辑

Browse Source 
库存盘点编辑
pull/2/head
siontion 9 months ago
parent bb7dd102aa
commit 66bb7d5959
4 changed files with 59 additions and 72 deletions
Show Stats Download Patch File Download Diff File

2
mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageForm.vue
Unescape View File

@ -667,7 +667,7 @@ const saveFormData = async () => {
const dataMats = formData.value.matItemDOList as unknown as StorageMatApi.StorageMatVO[]
await StorageMatApi.createStorageMatBatch(dataMats, storageid.value)
if (formData.value.matItemDOList.length > 0) {
if (formData.value.attachments!=undefined && formData.value.attachments.length > 0) {
//附件信息保存
matUploadData.value.businessId = storageid
matUploadRef.value!.submit()

2
mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageOut.vue
Unescape View File

@ -662,7 +662,7 @@ const saveFormData = async () => {
const dataMats = formData.value.matItemDOList as unknown as StorageMatApi.StorageMatVO[]
await StorageMatApi.createStorageMatBatch(dataMats, storageid.value)
if (formData.value.matItemDOList.length > 0) {
if (formData.value.attachments!=undefined && formData.value.attachments.length > 0) {
//附件信息保存
matUploadData.value.businessId = storageid
matUploadRef.value!.submit()

110
mes-ui/mes-ui-admin-vue3/src/views/heli/storagecheck/checkdetail.vue
Unescape View File

@ -30,7 +30,7 @@
<el-form-item prop="whId" label="盘点仓库" required>
<el-select v-model="formData.whId" placeholder="下拉选择" clearable disabled class="!w-400px"
@change="handleWh">
<el-option v-for="dict in whList" :key="dict.id" :label="dict.whName" :value="dict.id" />
<el-option v-for="dict in whList" :key="dict.id" :label="dict.wh_name" :value="dict.id" />
</el-select>
</el-form-item>
</el-col>
@ -62,7 +62,7 @@
<el-row>
<el-col :span="24">
<el-form-item label="排除库存为0的物料?" prop="noZero">
<el-radio-group v-model="formData.noZero" disabled>
<el-radio-group v-model="formData.noZero" >
<el-radio v-for="dict in getIntDictOptions(DICT_TYPE.HELI_COMMON_IS_OR_NOT)" :key="dict.value"
:label="dict.value">
{{ dict.label }}
@ -74,7 +74,7 @@
<el-row>
<el-col :span="24">
<el-form-item label="盘点开始日期" prop="checkTime">
<el-date-picker v-model="formData.checkTime" value-format="YYYY-MM-DD" type="date" disabled
<el-date-picker v-model="formData.checkTime" value-format="x" placeholder="盘点开始时间"
class="!w-220px" />
</el-form-item>
</el-col>
@ -84,7 +84,7 @@
<el-row>
<el-col :span="20">
<el-form-item label="备注" prop="description">
<el-input type="textarea" v-model="formData.description" show-word-limit maxlength="200" disabled />
<el-input type="textarea" v-model="formData.description" show-word-limit maxlength="200" />
</el-form-item>
</el-col>
</el-row>
@ -250,11 +250,11 @@
</el-form>
<div class="text-center hl-footer">
<el-button @click="() => router.go(-1)" size="large">取 消</el-button>
<el-button @click="submitForm" v-if="isShowBtnGroup" type="success" :disabled="formLoading" size="large">保
<el-button @click="submitForm" type="success" :disabled="formLoading" size="large">保
存</el-button>
<el-button @click="handleStatus(2)" v-if="isShowBtnGroup" type="primary" :disabled="formLoading" size="large">提
<el-button @click="handleStatus(2)" type="primary" :disabled="formLoading" size="large">提
交</el-button>
<el-button @click="handleStatus(3)" v-if="isShowBtnCancel" type="danger" :disabled="formLoading" size="large">删
<el-button @click="handleStatus(3)" type="danger" :disabled="formLoading" size="large">删
除</el-button>
</div>
</el-card>
@ -272,7 +272,6 @@ import * as CheckApi from '@/api/heli/storagecheck'
import * as CheckMatApi from '@/api/heli/storagecheckmat'
import * as UserApi from '@/api/system/user'
import * as MatApi from '@/api/heli/material'
import * as WhApi from '@/api/heli/warehouse'
import * as RgApi from '@/api/heli/rg'
import * as PnApi from '@/api/heli/pn'
@ -340,52 +339,6 @@ const handleStatus = async (num) => {
} catch (e) {
return
}
//保存表单数据
await saveFormData()
formData.value.status = num
const dataUpdate = formData.value as unknown as CheckApi.StorageVO
if (num == 2) {
dataUpdate.outbound = useUserStore().getUser.id
} else {
dataUpdate.cancel = useUserStore().getUser.id
}
await CheckApi.updateStorageStatus(dataUpdate)
message.success(t('common.updateSuccess'))
switch (num) {
case 1:
isShowBtnGroup.value = true
isShowBtnCancel.value = false
isShowBtnOther.value = true
isShowBtnDelete.value = true
break
case 2:
isShowBtnGroup.value = false
isShowBtnCancel.value = true
isShowBtnOther.value = false
isShowBtnDelete.value = false
break
case 3:
isShowBtnGroup.value = false
isShowBtnCancel.value = false
isShowBtnOther.value = false
isShowBtnDelete.value = false
break
default:
break
}
//查看页面不可以编辑
if (query.type === 'review') {
isShowBtnGroup.value = false
isShowBtnCancel.value = false
isShowBtnOther.value = false
isShowBtnDelete.value = false
}
query.id = formData.value.id
query.type = 'update'
reload()
}
const userList = ref<UserApi.UserVO[]>([]) // 用户列表
@ -453,15 +406,26 @@ const saveFormData = async () => {
// 提交请求
formLoading.value = true
try {
const data = formData.value as unknown as CheckApi.StorageCheckVO
await CheckApi.updateStorageCheck(data)
//物料信息保存
formData.value.matItemDOList.forEach((item) => {
item.stockId = formData.value.id
item.whId = formData.value.whId
})
if( formData.value.matItemDOList){
formData.value.matItemDOList.forEach((item) => {
item.stockId = formData.value.id
item.whId = formData.value.whId
})
}
const dataMats = formData.value.matItemDOList as unknown as CheckMatApi.StorageCheckMatVO[]
await CheckMatApi.createStorageMatBatch(dataMats, formData.value.id)
//await CheckMatApi.createStorageMatBatch(dataMats, formData.value.id)
if (formData.value.matItemDOList.length > 0) {
if (formData.value.matItemDOList !=undefined &&formData.value.matItemDOList.length > 0) {
//附件信息保存
matUploadData.value.businessId = formData.value.id
matUploadRef.value!.submit()
}
if (formData.value.attachments!=undefined && formData.value.attachments.length > 0) {
//附件信息保存
matUploadData.value.businessId = formData.value.id
matUploadRef.value!.submit()
@ -474,10 +438,10 @@ const saveFormData = async () => {
const submitForm = async () => {
// 校验表单
await formRef.value.validate()
if (formData.value.matItemDOList.length === 0) {
message.alertWarning('请添加物料信息!')
return
}
// if (formData.value.matItemDOList ==undefined || formData.value.matItemDOList.length === 0) {
// message.alertWarning('请添加物料信息!')
// return
// }
// 校验子表单
try {
await matSubFormRef.value.validate()
@ -487,8 +451,6 @@ const submitForm = async () => {
//保存表单数据
await saveFormData()
// 成功后刷新
query.id = formData.value.id
query.type = 'update'
reload()
}
@ -551,12 +513,24 @@ const handleRg = async (scope) => {
//-------------------
}
const isShowBtnGroup = ref(true)
const isShowBtnCancel = ref(false)
const isShowBtnOther = ref(false)
const isShowBtnDelete = ref(true)
//仓库列表
const init_page_wh = (async ()=>{
whList.value = await WhApi.getSimpList()
})
//库区列表
const init_page_rg = (async ()=>{
rgList.value = await RgApi.getSimpList()
})
/** 初始化 **/
onMounted(async () => {
await init_page_wh()
await init_page_rg()
formData.value = await CheckApi.getStorageCheck(query.id)
// 附件信息
let attParams = {
pageNo: 1,

17
mes-ui/mes-ui-admin-vue3/src/views/heli/storagecheck/index.vue
Unescape View File

@ -59,9 +59,17 @@
</template>
</el-table-column>
<el-table-column label="备注" align="center" prop="description" />
<el-table-column label="创建人" align="center" prop="creator" />
<el-table-column label="创建人" align="center" prop="creator">
<template #default="scope">
{{ userList.find((user) => user.id == scope.row.creator)?.nickname }}
</template>
</el-table-column>
<el-table-column label="创建时间" align="center" prop="createTime" :formatter="dateFormatter" width="180px" />
<el-table-column label="提交人" align="center" prop="keeper" />
<el-table-column label="提交人" align="center" prop="keeper" >
<template #default="scope">
{{ userList.find((user) => user.id == scope.row.keeper)?.nickname }}
</template>
</el-table-column>
<el-table-column label="提交时间" align="center" prop="keeperTime" :formatter="dateFormatter" width="180px" />
<el-table-column label="单据状态" align="center" prop="status">
<template #default="scope">
@ -95,6 +103,7 @@ import download from '@/utils/download'
import * as StorageCheckApi from '@/api/heli/storagecheck'
import StorageCheckForm from './StorageCheckForm.vue'
import * as WarehouseApi from '@/api/heli/warehouse'
import * as UserApi from '@/api/system/user'
defineOptions({ name: 'StorageCheck' })
@ -128,6 +137,7 @@ const queryParams = reactive({
})
const queryFormRef = ref() // 搜索的表单
const exportLoading = ref(false) // 导出的加载中
const userList = ref<UserApi.UserVO[]>([]) // 用户列表
const whList = ref([])
//仓库列表
const init_page_wh = (async () => {
@ -137,6 +147,8 @@ const init_page_wh = (async () => {
const getList = async () => {
loading.value = true
try {
//用户信息
userList.value = await UserApi.getSimpleUserList()
const data = await StorageCheckApi.getStorageCheckPage(queryParams)
list.value = data.list
total.value = data.total
@ -198,6 +210,7 @@ const handleExport = async () => {
/** 初始化 **/
onMounted(async () => {
await init_page_wh()
await getList()
})

Write Preview
Loading…
Cancel
Save