Skip to content

T
TF-MOM-WEB
Commit 55e2dd8f authored by xioln's avatar xioln
Browse files
Options

入库明细新增

parent d936e274
Show whitespace changes
Inline Side-by-side
Showing with 59 additions and 28 deletions
applications/dee-mes/src/privateComponents/components/PurchasingWarehousingNewOrEdit/component/storageDetailsCreateCom.vue
View file @ 55e2dd8f
......@@ -36,10 +36,10 @@ export default {
name: 'StorageDetailsCreate', // name写在组件的最前方,自定义组件为必填
components: {},
props: {
basicData: {
type: Object,
default: () => { }
}
// basicData: {
// type: Object,
// default: () => { }
// }
},
data() {
return {
......@@ -212,6 +212,12 @@ export default {
// this.resetMaterial(v)
// }
// }
'basicData': {
handler: function(v) {
console.log('vvv', v)
},
deep: true
}
},
created() {
// 初始化数据
......@@ -221,7 +227,8 @@ export default {
// this.form.arrivalDate = this.basicData.arrivalDate || ''
},
methods: {
handleOpen(type, row) {
handleOpen(type, basicData, row) {
this.basicData = basicData
this.form = {}
this.dialogVisible = true
this.operateType = type
......@@ -231,11 +238,11 @@ export default {
this.$set(this.form, 'operator', 'ADD')
} else if (type === 'ADD') {
this.parentId = row.rowId
} else if (type === 'MODITY') {
} else if (type === 'MODIFY') {
console.log('row', row)
console.log('this.basicData', this.basicData.operator)
this.form = row
this.$set(this.form, 'operator', row.id && this.basicData.operator !== 'ADD' ? 'MODITY' : 'ADD')
this.$set(this.form, 'operator', row.id && this.basicData.operator !== 'ADD' ? 'MODIFY' : 'ADD')
row.billType === 'AirEquipment' && this.$set(this.form, 'reqAmount', 1)
this.$set(this.form, 'resCode', row.extMaterial.resCode || '')
this.$set(this.form, 'resName', row.extMaterial.resName || '')
......@@ -243,7 +250,7 @@ export default {
this.$set(this.form, 'modelNo', row.extMaterial.modelNo || '')
this.$set(this.form, 'extMaterialId', row.extMaterialId || '')
this.$set(this.form, 'supplier', row.extDxSipplier.supplierFullName || '')
this.$set(this.form, 'withProductMaterial', row.withProductMaterial.split(';'))
this.$set(this.form, 'withProductMaterial', Array.isArray(row.withProductMaterial) ? row.withProductMaterial : row.withProductMaterial.split(';'))
this.resetMaterial(row.extMaterial.resCode)
this.changeMaterial(row.extMaterial.resCode)
}
......@@ -593,6 +600,15 @@ export default {
name: 'el-select',
placeholder: '请输入接收仓库',
options: []
},
handler: {
change: (v) => {
const STORAGE = this.formFileds[0].data.find(
(item) => item.key === 'storageZone'
)
const label = STORAGE.component.options.find(item => item.value === v).label
this.form.storageZoneName = label
}
}
},
{
......@@ -943,6 +959,15 @@ export default {
name: 'el-select',
placeholder: '请输入接收仓库',
options: []
},
handler: {
change: (v) => {
const STORAGE = this.formFileds[0].data.find(
(item) => item.key === 'storageZone'
)
const label = STORAGE.component.options.find(item => item.value === v).label
this.form.storageZoneName = label
}
}
},
{
......@@ -1255,6 +1280,15 @@ export default {
name: 'el-select',
placeholder: '请输入接收仓库',
options: []
},
handler: {
change: (v) => {
const STORAGE = this.formFileds[0].data.find(
(item) => item.key === 'storageZone'
)
const label = STORAGE.component.options.find(item => item.value === v).label
this.form.storageZoneName = label
}
}
},
{
......@@ -1548,7 +1582,6 @@ export default {
value: item.id
}
})
// this.form.storageZone = row.storageZoneId
})
.catch((err) => {
console.log(err)
......@@ -1558,7 +1591,6 @@ export default {
changeMaterial(v) {
// 带出物料相关默认值
const SELECT_MATERIAL = this.material.find((item) => item.resCode === v)
console.log('SELECT_MATERIAL', SELECT_MATERIAL)
if (SELECT_MATERIAL) {
this.form.modelNo = SELECT_MATERIAL.modelNo || ''
this.form.techSpec = SELECT_MATERIAL.techSpec || ''
......@@ -1672,7 +1704,6 @@ export default {
}
},
save() {
console.log('this.form', this.form)
this.$refs.form.validate((isok) => {
if (isok) {
console.log('this.form.operator', this.form.operator)
......@@ -1686,14 +1717,14 @@ export default {
'hasParent': this.form.hasParent ? this.form.hasParent : !!this.parentId,
'extMaterialId': this.extMaterialId ? this.extMaterialId : this.form.extMaterialId,
'extMaterialIdType': 'ExtDxProcessMaterial',
'materialTypeName': this.basicData.materialTypeName.label,
'materialTypeName': this.basicData.materialType.typeName || '',
'purchaseUnitId': this.extUnitId,
'purchaseUnitIdType': 'ExtUnit',
'lotNo': this.form.lotNo,
'airModel': this.form.airModel,
'sorties': this.form.sorties,
'reqAmount': this.form.reqAmount,
'extDxSipplierId': this.basicData.extDxSipplierId,
'extDxSipplierId': this.basicData.extDxSipplierId || '',
'extDxSipplierIdType': 'ExtDxSipplier',
'manufacturer': this.form.manufacturer,
'arrivalDate': this.form.arrivalDate ? this.form.arrivalDate : null,
......@@ -1708,6 +1739,7 @@ export default {
'stockPrice': this.form.stockPrice,
'taxUnitPrice': this.form.taxUnitPrice,
'taxPrice': this.form.taxPrice,
'storageZoneName': this.form.storageZoneName,
'storageZoneId': this.form.storageZone,
'storageZoneIdType': 'ExtDxProductWorkCenter',
'inventoryReqId': this.basicData.id,
......
applications/dee-mes/src/privateComponents/components/PurchasingWarehousingNewOrEdit/index.vue
View file @ 55e2dd8f
......@@ -197,7 +197,7 @@ export default {
this.$refs.form.validate((isok) => {
if (isok) {
// 校验通过
this.$refs.storageDetailsCreatOrEdit.handleOpen('NEW')
this.$refs.storageDetailsCreatOrEdit.handleOpen('NEW', this.detailsPropData)
} else {
this.$utils.showMessageWarning('请填写基本信息！')
}
......@@ -220,7 +220,7 @@ export default {
operation: '新增',
handleClick: (row, index) => {
row.operator = 'ADD'
this.$refs.storageDetailsCreatOrEdit.handleOpen('ADD', row)
this.$refs.storageDetailsCreatOrEdit.handleOpen('ADD', this.detailsPropData, row)
},
icon: '/icons/components/new/add.png',
showFun: (row) => {
......@@ -233,7 +233,7 @@ export default {
{
operation: '编辑',
handleClick: (row, index) => {
this.$refs.storageDetailsCreatOrEdit.handleOpen('MODITY', row)
this.$refs.storageDetailsCreatOrEdit.handleOpen('MODIFY', this.detailsPropData, row)
},
icon: '/icons/components/new/edit.png',
showFun: (row) => {
......@@ -298,12 +298,13 @@ export default {
{ title: '机型', key: 'airModel', headerAlign: 'center' },
{ title: '架次', key: 'sorties', headerAlign: 'center' },
{ title: '计量单位', key: 'unitName', headerAlign: 'center', formatter: (row, column, cellValue, index) => {
const value = row.extMaterial ? row.extMaterial.resType2.unitName : row.reqUnit
console.log('2123123123', { ...row })
const value = row.extMaterial ? row.extMaterial.extUnit.unitName : row.reqUnit
return value
} },
{ title: '入库数量', key: 'reqAmount', headerAlign: 'center' },
{ title: '供应商', key: 'supplierFullName', headerAlign: 'center', formatter: (row, column, cellValue, index) => {
const value = row.extMaterial ? row.extMaterial.resType2.supplierFullName : row.supplier
const value = row.extDxSipplier ? row.extDxSipplier.supplierFullName : row.supplier
return value
} },
// { title: '是否合格供应商', key: 'extDxSipplier.isValid', headerAlign: 'center' },
......@@ -317,12 +318,9 @@ export default {
{ title: '含税单价', key: 'taxUnitPrice', headerAlign: 'center' },
{ title: '含税金额', key: 'taxPrice', headerAlign: 'center' },
{ title: '税率', key: 'taxRate', headerAlign: 'center' },
{ title: '报检人', key: 'applyUserName', headerAlign: 'center', formatter: (row, column, cellValue, index) => {
const value = row.extMaterial ? row.extMaterial.resType2.applyUserName : row.supplier
return value
} },
{ title: '报检人', key: 'applyUserName', headerAlign: 'center' },
{ title: '接受仓库', key: 'extname', headerAlign: 'center', formatter: (row, column, cellValue, index) => {
const value = row.extMaterial ? row.extMaterial.resType2.extname : row.storageZone
const value = row.storageZone ? row.storageZone.extname : row.storageZoneName
return value
} },
{ title: '合同号', key: 'contractNo', headerAlign: 'center' },
......@@ -339,7 +337,6 @@ export default {
return {
materialTypeName: this.formData[0].data.find(item => item.key === 'materialTypeId').component.options.find(item => item.value === this.form.materialTypeId),
supplierFullName: this.formData[0].data.find(item => item.key === 'extDxSipplierId').component.options.find(item => item.value === this.form.extDxSipplierId),
operator: this.operator,
...this.form
}
}
......@@ -347,13 +344,15 @@ export default {
created() {
// 初始化数据
this.initData()
console.log('this.basicData', this.basicData)
this.operator = 'ADD'
this.form.operator = 'ADD'
if (Object.keys(this.basicData).length !== 0) {
this.form = this.basicData
this.searchInStorageRequestItem()
this.operator = 'MODITY'
this.operator = 'MODIFY'
this.form.operator = 'MODIFY'
}
console.log('this.basicData', this.basicData)
},
methods: {
initData() {
......@@ -431,7 +430,7 @@ export default {
],
'items': []
},
'openProps': [{ 'name': 'extMaterial', 'openProps': [{ 'name': 'resType2' }, { 'name': 'extUnit' }] }, { 'name': 'extDxSipplier' }],
'openProps': [{ 'name': 'extMaterial', 'openProps': [{ 'name': 'resType2' }, { 'name': 'extUnit' }] }, { 'name': 'extDxSipplier' }, { 'name': 'storageZone' }],
'sortItem': [
{
'fieldName': 'modifyTime',
......@@ -492,7 +491,7 @@ export default {
}
}
}
if (tableDataItem.operateType === 'MODITY') {
if (tableDataItem.operateType === 'MODIFY') {
for (const item of this.tableData) {
// 父类修改
if (item.id === tableDataItem.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