Commit 06ea74d7 authored by xioln's avatar xioln

三期出库流程表格修改

parent 03c50f25
<template> <template>
<div> <div>
<DeeAsCom <DeeAsCom
v-if="basicData"
ref="list"
:basic-data="basicData"
:lay-config="{
typeName: 'OutStorageExpire',
layKey: 'flowTable'
}"
@tb-printCode="tbPrintCode"
/>
<!-- <DeeAsCom
v-if="basicData" v-if="basicData"
ref="list" ref="list"
:basic-data="basicData" :basic-data="basicData"
...@@ -9,7 +19,7 @@ ...@@ -9,7 +19,7 @@
layKey: 'OutStorageExpireFlow' layKey: 'OutStorageExpireFlow'
}" }"
@tb-printCode="tbPrintCode" @tb-printCode="tbPrintCode"
/> /> -->
<PrintTag ref="print" :config="printConfig" /> <PrintTag ref="print" :config="printConfig" />
</div> </div>
</template> </template>
...@@ -32,13 +42,25 @@ export default { ...@@ -32,13 +42,25 @@ export default {
printConfig: { printConfig: {
visible: false, visible: false,
width: 300, width: 300,
prints: [] prints: [],
dic: []
} }
} }
}, },
mounted() { mounted() {
this.$utils.getDicListByCode('ObjStatus').then(res => {
this.dic = res
})
// defaultQueryParams = [{
// items: [{
// 'fieldName': 'id',
// 'operator': 'EQ',
// 'value': obtainedParams.basicData.id
// }],
// operator: 'AND'
// }]
}, },
methods: { methods: {
...@@ -50,24 +72,30 @@ export default { ...@@ -50,24 +72,30 @@ export default {
this.printConfig = Object.assign({}, this.printConfig, { this.printConfig = Object.assign({}, this.printConfig, {
visible: true visible: true
}) })
const state = this.dic.find(item => item.value === row.state)
this.printConfig.prints.push({ this.printConfig.prints.push({
text: row.id, text: row.id,
propertys: [ propertys: [
{ label: '编码', value: row.extMaterial.resCode }, { label: '状态', value: state ? state.label : row.state },
{ label: '名称', value: row.extMaterial.resName }, { label: '申请单编号', value: row.reqNo },
{ label: '型号/牌号/件号', value: row.extMaterial.modelNo }, { label: '申请依据', value: row.reqBill },
{ label: '规格', value: row.extMaterial.spec }, { label: '申请部门', value: row.reqDept },
{ label: '批号', value: row.lotNo }, { label: '创建人', value: row.creator.userName },
{ label: '系列号/序列号', value: row.serialNo }, { label: '创建时间', value: row.createTime }
{ label: '机型', value: row.airModel }, // { label: '名称', value: row.extMaterial.resName },
{ label: '验收单号', value: row.purchaseOrderNo }, // { label: '型号/牌号/件号', value: row.extMaterial.modelNo },
{ label: '保证保管期', value: '' }, // { label: '规格', value: row.extMaterial.spec },
{ label: '出库数量', value: row.reqAmount }, // { label: '批号', value: row.lotNo },
{ label: '贮存期', value: '' }, // { label: '系列号/序列号', value: row.serialNo },
{ label: '库位号', value: '' }, // { label: '机型', value: row.airModel },
{ label: '计量单位', value: row.extMaterial.extUnit.unitName }, // { label: '验收单号', value: row.purchaseOrderNo },
{ label: 'AO号', value: '' }, // { label: '保证保管期', value: '' },
{ label: '备注', value: row.remark || '' } // { label: '出库数量', value: row.reqAmount },
// { label: '贮存期', value: '' },
// { label: '库位号', value: '' },
// { label: '计量单位', value: row.extMaterial.extUnit.unitName },
// { label: 'AO号', value: '' },
// { label: '备注', value: row.remark || '' }
] ]
}) })
}) })
......
...@@ -311,7 +311,7 @@ export default { ...@@ -311,7 +311,7 @@ export default {
if (!this.header) return if (!this.header) return
this.$set(this.form, 'supplier', this.header.supplierFullName.label || '') this.$set(this.form, 'supplier', this.header.supplierFullName.label || '')
this.$set(this.form, 'arrivalDate', this.header.arrivalDate) this.$set(this.form, 'arrivalDate', this.header.arrivalDate)
const childrenAddOrEdit = this.operateType === 'ADD' || (this.operateType === 'MODIFY' && !this.form.isRoot) const childrenAddOrEdit = this.header.materialTypeName.label === '外购成品' && (this.operateType === 'ADD' || (this.operateType === 'MODIFY' && !this.form.isRoot))
switch (this.header.billType) { switch (this.header.billType) {
case '器材': case '器材':
case 'Material': case 'Material':
......
...@@ -548,6 +548,7 @@ export default { ...@@ -548,6 +548,7 @@ export default {
if (targetItem) { if (targetItem) {
targetItem.component.options = res.items.content.map(row => ({ value: row.id, label: row.typeName })) targetItem.component.options = res.items.content.map(row => ({ value: row.id, label: row.typeName }))
} }
this.form.materialTypeId = ''
}).catch((err) => { }).catch((err) => {
console.log(err) console.log(err)
}) })
......
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