Commit 755e3742 authored by jingnan's avatar jingnan 👀

退库入库流程修改

parent b52beb2b
<template>
<div class="backItemEditWorehouse">
<el-select
:value="value"
:loading="loading"
filterable
clearable
:disabled="disabled"
:placeholder="options.length?'请选择':'暂无数据'"
@change="change"
@clear="clear"
>
<el-option
v-for="item in options"
:key="item.key"
:label="item.label"
:value="item.value"
/>
</el-select>
</div>
</template>
<script>
import { post } from '@/utils/http'
export default {
name: 'BackItemEditWorehouse',
componentName: '退库入库编辑库房',
props: {
value: {
type: [String, Number],
default: ''
},
form: {
type: Object,
default: () => ({})
},
disabled: {
type: Boolean,
default: false
}
},
data() {
return {
loading: false,
options: []
}
},
computed: {},
watch: {},
mounted() {
this.form.extMaterial && this.form.extMaterial.resType2Id && this.getOptions()
},
methods: {
getOptions() {
const params = [this.form.extMaterial.resType2Id]
if (this.form.extMaterial.resType2 && this.form.extMaterial.resType2.parentId) {
params.push(this.form.extMaterial.resType2.parentId)
}
this.options = []
this.loading = true
post('ExtCenterResourceTypeLink/searchExtCenterResourceType', params).then(res => {
this.options = res.items.map(row => {
return {
key: row.id,
value: row.id,
label: row.extname
}
})
}).finally(() => {
this.loading = false
})
},
change(val) {
this.$emit('input', val)
},
clear() {
this.$emit('input')
}
}
}
</script>
<style lang="scss">
</style>
...@@ -334,7 +334,7 @@ export default { ...@@ -334,7 +334,7 @@ export default {
}, },
mounted() { mounted() {
// 退库入库检验的验收单号使用原物料的验收单号不允许修改 // 退库入库检验的验收单号使用原物料的验收单号不允许修改
if (this.jobResponseInTestData && this.jobResponseInTestData.testNo && (this.jobResponseInTestData.subTypeName !== 'JobResponseInTest' || this.jobResponseInTestData.subTypeName === 'JobResponseInTest' && this.basicData.subTypeName.includes('BackItem'))) { if (this.jobResponseInTestData && this.jobResponseInTestData.testNo && this.jobResponseInTestData.subTypeName !== 'JobResponseInTest' || (this.jobResponseInTestData.subTypeName === 'JobResponseInTest' && this.basicData.subTypeName.includes('BackItem'))) {
this.subTypeNameDisabled = true this.subTypeNameDisabled = true
} }
}, },
......
...@@ -835,7 +835,7 @@ export default { ...@@ -835,7 +835,7 @@ export default {
}, },
mounted() { mounted() {
// 退库入库检验的验收单号使用原物料的验收单号不允许修改 // 退库入库检验的验收单号使用原物料的验收单号不允许修改
if (this.jobResponseInTestData && this.jobResponseInTestData.testNo && (this.jobResponseInTestData.subTypeName !== 'JobResponseInTest' || this.jobResponseInTestData.subTypeName === 'JobResponseInTest' && this.basicData.subTypeName.includes('BackItem'))) { if (this.jobResponseInTestData && this.jobResponseInTestData.testNo && this.jobResponseInTestData.subTypeName !== 'JobResponseInTest' || (this.jobResponseInTestData.subTypeName === 'JobResponseInTest' && this.basicData.subTypeName.includes('BackItem'))) {
this.subTypeNameDisabled = true this.subTypeNameDisabled = true
} }
}, },
......
...@@ -304,7 +304,7 @@ export default { ...@@ -304,7 +304,7 @@ export default {
}, },
mounted() { mounted() {
// 退库入库检验的验收单号使用原物料的验收单号不允许修改 // 退库入库检验的验收单号使用原物料的验收单号不允许修改
if (this.jobResponseInTestData && this.jobResponseInTestData.testNo && (this.jobResponseInTestData.subTypeName !== 'JobResponseInTest' || this.jobResponseInTestData.subTypeName === 'JobResponseInTest' && this.basicData.subTypeName.includes('BackItem'))) { if (this.jobResponseInTestData && this.jobResponseInTestData.testNo && this.jobResponseInTestData.subTypeName !== 'JobResponseInTest' || (this.jobResponseInTestData.subTypeName === 'JobResponseInTest' && this.basicData.subTypeName.includes('BackItem'))) {
this.subTypeNameDisabled = true this.subTypeNameDisabled = true
} }
}, },
......
...@@ -114,8 +114,13 @@ export default { ...@@ -114,8 +114,13 @@ export default {
if (!id) return if (!id) return
get(`InventoryRequest/${id}`).then(res => { get(`InventoryRequest/${id}`).then(res => {
const type = res.items.billType const type = res.items.billType
if (!type) return this.$utils.showMessageWarning('未查询到验收单信息!') if (!type && this.basicData.subTypeName && this.basicData.subTypeName.includes('BackItem')) {
this.initData(type) const findType = this.basicData.outStorage.inventory.jobResponse.jobOrder.inventoryReq.billType
this.initData(findType)
} else {
if (!type) return this.$utils.showMessageWarning('未查询到验收单信息!')
this.initData(type)
}
}).catch((err) => { }).catch((err) => {
console.log(err) console.log(err)
}) })
......
...@@ -52,6 +52,7 @@ export default { ...@@ -52,6 +52,7 @@ export default {
case 'InStorageUseBackItem': // 领用退库入库 case 'InStorageUseBackItem': // 领用退库入库
case 'InStorageMatchBackItem': // 配套退库入库 case 'InStorageMatchBackItem': // 配套退库入库
case 'InStorageOutBackItem': // 供外退库入库 case 'InStorageOutBackItem': // 供外退库入库
case 'InStorageTestFlyBackItem': // 试飞退库入库
this.cmpOptions = { this.cmpOptions = {
typeName: 'InStorageBack', typeName: 'InStorageBack',
layKey: 'InStorageBackApproved_apply' layKey: 'InStorageBackApproved_apply'
......
...@@ -85,6 +85,7 @@ export default { ...@@ -85,6 +85,7 @@ export default {
case 'InStorageUseBackItem': // 领用退库入库 case 'InStorageUseBackItem': // 领用退库入库
case 'InStorageMatchBackItem': // 配套退库入库 case 'InStorageMatchBackItem': // 配套退库入库
case 'InStorageOutBackItem': // 供外退库入库 case 'InStorageOutBackItem': // 供外退库入库
case 'InStorageTestFlyBackItem': // 试飞退库入库
this.cmpOptions = { this.cmpOptions = {
typeName: 'InStorageBack', typeName: 'InStorageBack',
layKey: 'InStorageBackApproved_confirm' layKey: 'InStorageBackApproved_confirm'
......
...@@ -33,7 +33,11 @@ export default { ...@@ -33,7 +33,11 @@ export default {
computed: {}, computed: {},
watch: {}, watch: {},
created() {}, created() {},
mounted() {}, mounted() {
this.$bus.$on('refreshUseItemConfirm', (data) => {
this.$refs.applyTable && this.$refs.applyTable.$refs.asCom.getData()
})
},
// 组件方法 // 组件方法
methods: { methods: {
selectionChange(val) { selectionChange(val) {
......
<!--
* @Author: gjn
* @Date: 2024-1-9 16:49:39
* @Description:领用/供外退库入库检验
-->
<template>
<div class="inStorageUseOutBackInTest">
<dee-as-com
ref="applyTable"
class="list-table"
:basic-data=" { selectData,selectionRows }"
:lay-config="{ typeName: 'InStorageBackItem', layKey: 'batchSign_InStorageMatchBackInTest'}"
@selectionChange="selectionChange"
/>
</div>
</template>
<script>
export default {
name: 'InStorageUseOutBackInTest',
components: {},
props: {
selectData: {
type: Object,
default: () => {}
}
},
data() {
return {
selectionRows: []
}
},
computed: {},
watch: {},
created() {},
mounted() {
},
// 组件方法
methods: {
selectionChange(val) {
this.selectionRows = val
}
}
}
</script>
<style lang='scss'>
.inStorageUseOutBackInTest{
width: 100%;
height: 100%;
box-sizing: border-box;
padding:0 4px;
}
</style>
...@@ -28,9 +28,10 @@ export default { ...@@ -28,9 +28,10 @@ export default {
InStorageMatchBackApply: () => import('./inStorageMatchBackApply'), // 配套退库申请 InStorageMatchBackApply: () => import('./inStorageMatchBackApply'), // 配套退库申请
InStorageMatchBackExamin: () => import('./inStorageMatchBackExamine'), // 配套退库审核 InStorageMatchBackExamin: () => import('./inStorageMatchBackExamine'), // 配套退库审核
InStorageMatchBackConfirm: () => import('./inStorageMatchBackConfirm'), // 配套退库确认 InStorageMatchBackConfirm: () => import('./inStorageMatchBackConfirm'), // 配套退库确认
InStorageUseOutBackApply: () => import('./inStorageUseOutBackApply'), // 领用/供外退库申请 InStorageUseOutBackApply: () => import('./inStorageUseOutBackApply'), // 领用/供外/试飞退库申请
InStorageUseOutBackExamine: () => import('./inStorageUseOutBackExamine'), // 领用/供外退库审核 InStorageUseOutBackExamine: () => import('./inStorageUseOutBackExamine'), // 领用/供外/试飞退库申请
InStorageUseOutBackConfirm: () => import('./inStorageUseOutBackConfirm'), // 领用/供外退库确认 InStorageUseOutBackInTest: () => import('./inStorageUseOutBackInTest'), // 领用/供外/试飞退库检验
InStorageUseOutBackConfirm: () => import('./inStorageUseOutBackConfirm'), // 领用/供外/试飞退库申请
WorkerConfirm: () => import('./workerConfirm'), // 工人确认 WorkerConfirm: () => import('./workerConfirm'), // 工人确认
WorkHourConfirm: () => import('./workHourConfirm'), // 工时确认 WorkHourConfirm: () => import('./workHourConfirm'), // 工时确认
StationMasteConfirm: () => import('./stationMasteConfirm'), // 站位长确认 StationMasteConfirm: () => import('./stationMasteConfirm'), // 站位长确认
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment