Commit 45dc96a7 authored by xioln's avatar xioln

采购入库流程问题修改

parent 7d7db309
...@@ -65,10 +65,10 @@ export default { ...@@ -65,10 +65,10 @@ export default {
// { title: '是否合格供应商', key: 'extDxSipplier.isValid', headerAlign: 'center' }, // { title: '是否合格供应商', key: 'extDxSipplier.isValid', headerAlign: 'center' },
{ title: '制造商', key: 'manufacturer', align: 'center', headerAlign: 'center' }, { title: '制造商', key: 'manufacturer', align: 'center', headerAlign: 'center' },
{ title: '到货日期', key: 'arrivalDate', align: 'center', headerAlign: 'center', width: '120', formatter: (row, column, cellValue, index) => { { title: '到货日期', key: 'arrivalDate', align: 'center', headerAlign: 'center', width: '120', formatter: (row, column, cellValue, index) => {
return row.arrivalDate.split(' ')[0] return row.arrivalDate && row.arrivalDate.split(' ')[0]
} }, } },
{ title: '生产日期', key: 'producedTime', align: 'center', headerAlign: 'center', width: '120', formatter: (row, column, cellValue, index) => { { title: '生产日期', key: 'producedTime', align: 'center', headerAlign: 'center', width: '120', formatter: (row, column, cellValue, index) => {
return row.producedTime.split(' ')[0] return row.producedTime && row.producedTime.split(' ')[0]
} }, } },
{ {
title: '随产品资料', key: 'withProductMaterial', align: 'center', headerAlign: 'center', width: '120', formatter: (row, column, cellValue, index) => { title: '随产品资料', key: 'withProductMaterial', align: 'center', headerAlign: 'center', width: '120', formatter: (row, column, cellValue, index) => {
...@@ -92,7 +92,7 @@ export default { ...@@ -92,7 +92,7 @@ export default {
{ title: '备注', key: 'remark', align: 'center', headerAlign: 'center' }, { title: '备注', key: 'remark', align: 'center', headerAlign: 'center' },
{ title: '状态', key: 'state', align: 'center', headerAlign: 'center' }, { title: '状态', key: 'state', align: 'center', headerAlign: 'center' },
{ title: '创建时间', key: 'createTime', align: 'center', headerAlign: 'center', width: '120', formatter: (row, column, cellValue, index) => { { title: '创建时间', key: 'createTime', align: 'center', headerAlign: 'center', width: '120', formatter: (row, column, cellValue, index) => {
return row.createTime.split(' ')[0] return row.createTime && row.createTime.split(' ')[0]
} } } }
], ],
optionsTree: { optionsTree: {
...@@ -122,10 +122,7 @@ export default { ...@@ -122,10 +122,7 @@ export default {
// this.timerId = null // this.timerId = null
// } // }
// }, 200) // }, 200)
if (this.basicData.subTypeName === 'InStoragePurchase' || if (this.basicData.subTypeName === 'InStoragePurchase') {
this.basicData.subTypeName === 'InStorageExpire' ||
this.basicData.subTypeName === 'InStorageRecall'
) {
this.$nextTick(() => { this.$nextTick(() => {
if (this.basicData.inStorageRequestItems[0]) { if (this.basicData.inStorageRequestItems[0]) {
this.searchInStorageRequestItem(this.basicData.inStorageRequestItems[0].inventoryReqId, 'inventoryReq.id') this.searchInStorageRequestItem(this.basicData.inStorageRequestItems[0].inventoryReqId, 'inventoryReq.id')
......
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