Commit d0308804 authored by xioln's avatar xioln

验收入库申请流程详情

parent cc8bc5f0
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
:data="tableData" :data="tableData"
:columns="columns" :columns="columns"
:options="optionsTree" :options="optionsTree"
:index-row="{ title: '序号', width: '70' , align: 'center'}" :index-row="{ title: '序号', width: '70', align: 'center' }"
> >
<div slot="header" class="table-title-wrap"> <div slot="header" class="table-title-wrap">
<dee-tools :tools="tools" mode="normal" /> <dee-tools :tools="tools" mode="normal" />
...@@ -326,6 +326,7 @@ export default { ...@@ -326,6 +326,7 @@ export default {
{ {
title: '物料类型', key: 'typeName', headerAlign: 'center', formatter: (row, column, cellValue, index) => { title: '物料类型', key: 'typeName', headerAlign: 'center', formatter: (row, column, cellValue, index) => {
const value = row.extMaterial ? row.extMaterial.resType2.typeName : row.materialTypeName const value = row.extMaterial ? row.extMaterial.resType2.typeName : row.materialTypeName
console.log('value', value)
return value return value
} }
}, },
...@@ -588,7 +589,46 @@ export default { ...@@ -588,7 +589,46 @@ export default {
] ]
}, },
'openProps': [{ 'name': 'extMaterial', 'openProps': [{ 'name': 'resType2' }, { 'name': 'extUnit' }] }, { 'name': 'extDxSipplier' }, { 'name': 'storageZone' }], 'openProps': [
{
'name': 'extMaterial',
'openProps': [
{ 'name': 'resType2' },
{ 'name': 'extUnit' }
]
},
{ 'name': 'extDxSipplier' },
{ 'name': 'storageZone' }
],
'sortItem': [
{
'fieldName': 'modifyTime',
'sortOrder': 'desc'
}
]
},
'childCondition': {
'pageFrom': 1,
'pageSize': 9999,
'searchItems': {
'children': [
],
'items': [
]
},
'openProps': [
{
'name': 'extMaterial',
'openProps': [
{ 'name': 'resType2' },
{ 'name': 'extUnit' }
]
},
{ 'name': 'extDxSipplier' },
{ 'name': 'storageZone' }
],
'sortItem': [ 'sortItem': [
{ {
'fieldName': 'modifyTime', 'fieldName': 'modifyTime',
...@@ -608,6 +648,7 @@ export default { ...@@ -608,6 +648,7 @@ export default {
children: item.children && item.children.map(child => { children: item.children && item.children.map(child => {
return { return {
...child, ...child,
rowId: child.id,
operator: 'NO_CHANGE' operator: 'NO_CHANGE'
// hasChildren: false // hasChildren: false
} }
......
/**
* @Description: 验收入库申请流程详情
* @author xioln
* @date 2023-07-14
* @FilePath: applications/dee-mes/src/privateComponents/components/PurchasingWarehousingProcess/index.vue
*/
<template>
<div class="purchasingwarehousing-process">
<dee-table
ref="treeTable"
:data="tableData"
:columns="columns"
:options="optionsTree"
:index-row="{ title: '序号', width: '70' , align: 'center'}"
/>
</div>
</template>
<script>
import { post } from '@/utils/http'
export default {
componentName: '验收入库申请流程详情',
name: 'PurchasingWarehousingProcess', // name写在组件的最前方,自定义组件为必填
components: {}, // name写在组件的最前方,自定义组件为必填
props: {
basicData: {
type: Object,
default: () => null
}
},
data() {
return {
tableData: [],
columns: [
{ title: '所属设备', key: 'subEquipment', headerAlign: 'center' },
{
title: '物料类型', key: 'typeName', headerAlign: 'center', formatter: (row, column, cellValue, index) => {
const value = row.extMaterial ? row.extMaterial.resType2.typeName : row.materialTypeName
return value
}
},
{
title: '编码', key: 'typeCode', headerAlign: 'center', formatter: (row, column, cellValue, index) => {
const value = row.resCode ? row.resCode : row.extMaterial ? row.extMaterial.resCode : ''
return value
}
},
{ title: '机型', key: 'airModel', headerAlign: 'center' },
{ title: '架次', key: 'sorties', headerAlign: 'center' },
{
title: '计量单位', key: 'unitName', headerAlign: 'center', formatter: (row, column, cellValue, index) => {
const value = row.reqUnit ? row.reqUnit : row.extMaterial ? row.extMaterial.extUnit.unitName : ''
return value
}
},
{ title: '入库数量', key: 'reqAmount', headerAlign: 'center' },
{
title: '供应商', key: 'supplierFullName', headerAlign: 'center', formatter: (row, column, cellValue, index) => {
const value = row.extDxSipplier ? row.extDxSipplier.supplierFullName : row.supplier
return value
}
},
// { title: '是否合格供应商', key: 'extDxSipplier.isValid', headerAlign: 'center' },
{ title: '制造商', key: 'manufacturer', headerAlign: 'center' },
{ title: '到货日期', key: 'arrivalDate', headerAlign: 'center' },
{ title: '生产日期', key: 'producedTime', headerAlign: 'center' },
{
title: '随产品资料', key: 'withProductMaterial', headerAlign: 'center', formatter: (row, column, cellValue, index) => {
return Array.isArray(row.withProductMaterial) ? row.withProductMaterial.join(';') : row.withProductMaterial
}
},
{ title: '紧急程度', key: 'urgency', headerAlign: 'center' },
{ title: '入库单价', key: 'stockUnitPrice', headerAlign: 'center' },
{ title: '入库金额', key: 'stockPrice', headerAlign: 'center' },
{ title: '含税单价', key: 'taxUnitPrice', headerAlign: 'center' },
{ title: '含税金额', key: 'taxPrice', headerAlign: 'center' },
{ title: '税率', key: 'taxRate', headerAlign: 'center' },
{ title: '报检人', key: 'applyUserName', headerAlign: 'center' },
{
title: '接受仓库', key: 'extname', headerAlign: 'center', formatter: (row, column, cellValue, index) => {
const value = row.storageZone ? row.storageZone.extname : row.storageZoneName
return value
}
},
{ title: '合同号', key: 'contractNo', headerAlign: 'center' },
{ title: '备注', key: 'remark', headerAlign: 'center' },
{ title: '状态', key: 'state', headerAlign: 'center' },
{ title: '创建时间', key: 'createTime', headerAlign: 'center' }
],
optionsTree: {
rowKey: 'id',
'tree-props': { children: 'children' }
}
}
},
computed: {},
watch: {
basicData: {
immediate: true,
deep: true,
handler: function(val) {
console.log('val', val)
if (val.businessObject.id) {
this.searchInStorageRequestItem(val.businessObject.id)
}
}
}
},
created() {
// 初始化数据
console.log('this.ba', this.basicData)
},
methods: {
// 编辑采购入库明细查询InStorageRequestItem/search
searchInStorageRequestItem(id) {
const param = {
'rootCondition': {
'pageFrom': 1,
'pageSize': 10,
'searchItems': {
'children': [
{
'items': [
{
'fieldName': 'id',
'operator': 'EQ',
'value': id
},
{
'fieldName': 'parentId',
'operator': 'ISNULL'
}
],
'operator': 'AND'
}
],
'items': [
]
},
'openProps': [{ 'name': 'extMaterial', 'openProps': [{ 'name': 'resType2' }, { 'name': 'extUnit' }] }, { 'name': 'extDxSipplier' }, { 'name': 'storageZone' }],
'sortItem': [
{
'fieldName': 'modifyTime',
'sortOrder': 'desc'
}
]
},
'childCondition': {
'pageFrom': 1,
'pageSize': 9999,
'searchItems': {
'children': [
],
'items': [
]
},
'openProps': [
{
'name': 'extMaterial',
'openProps': [
{ 'name': 'resType2' },
{ 'name': 'extUnit' }
]
},
{ 'name': 'extDxSipplier' },
{ 'name': 'storageZone' }
],
'sortItem': [
{
'fieldName': 'modifyTime',
'sortOrder': 'desc'
}
]
}
}
post('InStorageRequestItem/treeSearch', param).then(res => {
const data = res.items
this.tableData = data
}).catch((err) => {
console.log(err)
})
}
}
}
</script>
<style lang='scss'>
</style>
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