|
|
@ -30,7 +30,7 @@
|
|
|
|
<el-form-item prop="whId" label="盘点仓库" required>
|
|
|
|
<el-form-item prop="whId" label="盘点仓库" required>
|
|
|
|
<el-select v-model="formData.whId" placeholder="下拉选择" clearable disabled class="!w-400px"
|
|
|
|
<el-select v-model="formData.whId" placeholder="下拉选择" clearable disabled class="!w-400px"
|
|
|
|
@change="handleWh">
|
|
|
|
@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-select>
|
|
|
|
</el-form-item>
|
|
|
|
</el-form-item>
|
|
|
|
</el-col>
|
|
|
|
</el-col>
|
|
|
@ -62,7 +62,7 @@
|
|
|
|
<el-row>
|
|
|
|
<el-row>
|
|
|
|
<el-col :span="24">
|
|
|
|
<el-col :span="24">
|
|
|
|
<el-form-item label="排除库存为0的物料?" prop="noZero">
|
|
|
|
<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"
|
|
|
|
<el-radio v-for="dict in getIntDictOptions(DICT_TYPE.HELI_COMMON_IS_OR_NOT)" :key="dict.value"
|
|
|
|
:label="dict.value">
|
|
|
|
:label="dict.value">
|
|
|
|
{{ dict.label }}
|
|
|
|
{{ dict.label }}
|
|
|
@ -74,7 +74,7 @@
|
|
|
|
<el-row>
|
|
|
|
<el-row>
|
|
|
|
<el-col :span="24">
|
|
|
|
<el-col :span="24">
|
|
|
|
<el-form-item label="盘点开始日期" prop="checkTime">
|
|
|
|
<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" />
|
|
|
|
class="!w-220px" />
|
|
|
|
</el-form-item>
|
|
|
|
</el-form-item>
|
|
|
|
</el-col>
|
|
|
|
</el-col>
|
|
|
@ -84,7 +84,7 @@
|
|
|
|
<el-row>
|
|
|
|
<el-row>
|
|
|
|
<el-col :span="20">
|
|
|
|
<el-col :span="20">
|
|
|
|
<el-form-item label="备注" prop="description">
|
|
|
|
<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-form-item>
|
|
|
|
</el-col>
|
|
|
|
</el-col>
|
|
|
|
</el-row>
|
|
|
|
</el-row>
|
|
|
@ -250,11 +250,11 @@
|
|
|
|
</el-form>
|
|
|
|
</el-form>
|
|
|
|
<div class="text-center hl-footer">
|
|
|
|
<div class="text-center hl-footer">
|
|
|
|
<el-button @click="() => router.go(-1)" size="large">取 消</el-button>
|
|
|
|
<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>
|
|
|
|
<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>
|
|
|
|
<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>
|
|
|
|
除</el-button>
|
|
|
|
</div>
|
|
|
|
</div>
|
|
|
|
</el-card>
|
|
|
|
</el-card>
|
|
|
@ -272,7 +272,6 @@ import * as CheckApi from '@/api/heli/storagecheck'
|
|
|
|
import * as CheckMatApi from '@/api/heli/storagecheckmat'
|
|
|
|
import * as CheckMatApi from '@/api/heli/storagecheckmat'
|
|
|
|
|
|
|
|
|
|
|
|
import * as UserApi from '@/api/system/user'
|
|
|
|
import * as UserApi from '@/api/system/user'
|
|
|
|
import * as MatApi from '@/api/heli/material'
|
|
|
|
|
|
|
|
import * as WhApi from '@/api/heli/warehouse'
|
|
|
|
import * as WhApi from '@/api/heli/warehouse'
|
|
|
|
import * as RgApi from '@/api/heli/rg'
|
|
|
|
import * as RgApi from '@/api/heli/rg'
|
|
|
|
import * as PnApi from '@/api/heli/pn'
|
|
|
|
import * as PnApi from '@/api/heli/pn'
|
|
|
@ -340,52 +339,6 @@ const handleStatus = async (num) => {
|
|
|
|
} catch (e) {
|
|
|
|
} catch (e) {
|
|
|
|
return
|
|
|
|
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()
|
|
|
|
reload()
|
|
|
|
}
|
|
|
|
}
|
|
|
|
const userList = ref<UserApi.UserVO[]>([]) // 用户列表
|
|
|
|
const userList = ref<UserApi.UserVO[]>([]) // 用户列表
|
|
|
@ -453,15 +406,26 @@ const saveFormData = async () => {
|
|
|
|
// 提交请求
|
|
|
|
// 提交请求
|
|
|
|
formLoading.value = true
|
|
|
|
formLoading.value = true
|
|
|
|
try {
|
|
|
|
try {
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
const data = formData.value as unknown as CheckApi.StorageCheckVO
|
|
|
|
|
|
|
|
await CheckApi.updateStorageCheck(data)
|
|
|
|
//物料信息保存
|
|
|
|
//物料信息保存
|
|
|
|
formData.value.matItemDOList.forEach((item) => {
|
|
|
|
if( formData.value.matItemDOList){
|
|
|
|
item.stockId = formData.value.id
|
|
|
|
formData.value.matItemDOList.forEach((item) => {
|
|
|
|
item.whId = formData.value.whId
|
|
|
|
item.stockId = formData.value.id
|
|
|
|
})
|
|
|
|
item.whId = formData.value.whId
|
|
|
|
|
|
|
|
})
|
|
|
|
|
|
|
|
}
|
|
|
|
const dataMats = formData.value.matItemDOList as unknown as CheckMatApi.StorageCheckMatVO[]
|
|
|
|
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
|
|
|
|
matUploadData.value.businessId = formData.value.id
|
|
|
|
matUploadRef.value!.submit()
|
|
|
|
matUploadRef.value!.submit()
|
|
|
@ -474,10 +438,10 @@ const saveFormData = async () => {
|
|
|
|
const submitForm = async () => {
|
|
|
|
const submitForm = async () => {
|
|
|
|
// 校验表单
|
|
|
|
// 校验表单
|
|
|
|
await formRef.value.validate()
|
|
|
|
await formRef.value.validate()
|
|
|
|
if (formData.value.matItemDOList.length === 0) {
|
|
|
|
// if (formData.value.matItemDOList ==undefined || formData.value.matItemDOList.length === 0) {
|
|
|
|
message.alertWarning('请添加物料信息!')
|
|
|
|
// message.alertWarning('请添加物料信息!')
|
|
|
|
return
|
|
|
|
// return
|
|
|
|
}
|
|
|
|
// }
|
|
|
|
// 校验子表单
|
|
|
|
// 校验子表单
|
|
|
|
try {
|
|
|
|
try {
|
|
|
|
await matSubFormRef.value.validate()
|
|
|
|
await matSubFormRef.value.validate()
|
|
|
@ -487,8 +451,6 @@ const submitForm = async () => {
|
|
|
|
//保存表单数据
|
|
|
|
//保存表单数据
|
|
|
|
await saveFormData()
|
|
|
|
await saveFormData()
|
|
|
|
// 成功后刷新
|
|
|
|
// 成功后刷新
|
|
|
|
query.id = formData.value.id
|
|
|
|
|
|
|
|
query.type = 'update'
|
|
|
|
|
|
|
|
reload()
|
|
|
|
reload()
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
@ -551,12 +513,24 @@ const handleRg = async (scope) => {
|
|
|
|
//-------------------
|
|
|
|
//-------------------
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
const isShowBtnGroup = ref(true)
|
|
|
|
|
|
|
|
const isShowBtnCancel = ref(false)
|
|
|
|
|
|
|
|
const isShowBtnOther = ref(false)
|
|
|
|
const isShowBtnOther = ref(false)
|
|
|
|
const isShowBtnDelete = ref(true)
|
|
|
|
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 () => {
|
|
|
|
onMounted(async () => {
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
await init_page_wh()
|
|
|
|
|
|
|
|
await init_page_rg()
|
|
|
|
|
|
|
|
formData.value = await CheckApi.getStorageCheck(query.id)
|
|
|
|
|
|
|
|
|
|
|
|
// 附件信息
|
|
|
|
// 附件信息
|
|
|
|
let attParams = {
|
|
|
|
let attParams = {
|
|
|
|
pageNo: 1,
|
|
|
|
pageNo: 1,
|
|
|
|