Skip to content

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

采购入库申请创建编辑

parent 5e406f18
Show whitespace changes
Inline Side-by-side
Showing with 56 additions and 7 deletions
applications/dee-mes/src/privateComponents/components/PurchasingWarehousingNewOrEdit/component/storageDetailsCreateCom.vue
View file @ b942e565
...@@ -711,6 +711,7 @@ export default { ...@@ -711,6 +711,7 @@ export default {
component: { component: {
clearable: true, clearable: true,
name: 'el-input', name: 'el-input',
disabled: this.operateType !== 'NEW',
placeholder: '请输入系列号' placeholder: '请输入系列号'
} }
}, },
...@@ -719,6 +720,7 @@ export default { ...@@ -719,6 +720,7 @@ export default {
key: 'airModel', key: 'airModel',
component: { component: {
clearable: true, clearable: true,
disabled: this.operateType !== 'NEW',
name: 'el-select', name: 'el-select',
placeholder: '请输入机型', placeholder: '请输入机型',
options: [] options: []
...@@ -732,6 +734,7 @@ export default { ...@@ -732,6 +734,7 @@ export default {
key: 'sorties', key: 'sorties',
component: { component: {
clearable: true, clearable: true,
disabled: this.operateType !== 'NEW',
name: 'el-select', name: 'el-select',
placeholder: '请输入架次', placeholder: '请输入架次',
options: [] options: []
...@@ -802,6 +805,7 @@ export default { ...@@ -802,6 +805,7 @@ export default {
key: 'producedTime', key: 'producedTime',
component: { component: {
clearable: true, clearable: true,
disabled: this.operateType !== 'NEW',
name: 'el-date-picker', name: 'el-date-picker',
format: 'yyyy-MM-dd', format: 'yyyy-MM-dd',
valueFormat: 'yyyy-MM-dd hh:mm:ss', valueFormat: 'yyyy-MM-dd hh:mm:ss',
...@@ -813,6 +817,7 @@ export default { ...@@ -813,6 +817,7 @@ export default {
key: 'productDwawVer', key: 'productDwawVer',
component: { component: {
clearable: true, clearable: true,
disabled: this.operateType !== 'NEW',
name: 'el-input', name: 'el-input',
placeholder: '请输入产品图号/版本' placeholder: '请输入产品图号/版本'
} }
...@@ -822,6 +827,7 @@ export default { ...@@ -822,6 +827,7 @@ export default {
key: 'atpName', key: 'atpName',
component: { component: {
clearable: true, clearable: true,
disabled: this.operateType !== 'NEW',
name: 'el-input', name: 'el-input',
placeholder: '请输入ATP名称' placeholder: '请输入ATP名称'
} }
...@@ -831,6 +837,7 @@ export default { ...@@ -831,6 +837,7 @@ export default {
key: 'atpNo', key: 'atpNo',
component: { component: {
clearable: true, clearable: true,
disabled: this.operateType !== 'NEW',
name: 'el-input', name: 'el-input',
placeholder: '请输入ATP编号及版次' placeholder: '请输入ATP编号及版次'
} }
...@@ -840,6 +847,7 @@ export default { ...@@ -840,6 +847,7 @@ export default {
key: 'softConfPieceNo', key: 'softConfPieceNo',
component: { component: {
clearable: true, clearable: true,
disabled: this.operateType !== 'NEW',
name: 'el-input', name: 'el-input',
placeholder: '请输入软件构型件号/版次', placeholder: '请输入软件构型件号/版次',
type: 'textarea', type: 'textarea',
...@@ -851,6 +859,7 @@ export default { ...@@ -851,6 +859,7 @@ export default {
key: 'elecHardwareConfPieceNo', key: 'elecHardwareConfPieceNo',
component: { component: {
clearable: true, clearable: true,
disabled: this.operateType !== 'NEW',
name: 'el-input', name: 'el-input',
placeholder: '请输入电子硬件构型件号/版本', placeholder: '请输入电子硬件构型件号/版本',
type: 'textarea', type: 'textarea',
...@@ -862,6 +871,7 @@ export default { ...@@ -862,6 +871,7 @@ export default {
key: 'approvalCert', key: 'approvalCert',
component: { component: {
clearable: true, clearable: true,
disabled: this.operateType !== 'NEW',
name: 'el-input', name: 'el-input',
placeholder: '请输入适航批准标签/批准放行证书' placeholder: '请输入适航批准标签/批准放行证书'
} }
...@@ -871,6 +881,7 @@ export default { ...@@ -871,6 +881,7 @@ export default {
key: 'withProductMaterial', key: 'withProductMaterial',
component: { component: {
clearable: true, clearable: true,
disabled: this.operateType !== 'NEW',
name: 'el-select', name: 'el-select',
multiple: true, multiple: true,
placeholder: '请选择随产品资料', placeholder: '请选择随产品资料',
...@@ -882,6 +893,7 @@ export default { ...@@ -882,6 +893,7 @@ export default {
key: 'urgency', key: 'urgency',
component: { component: {
clearable: true, clearable: true,
disabled: this.operateType !== 'NEW',
name: 'el-select', name: 'el-select',
placeholder: '请选择紧急程度', placeholder: '请选择紧急程度',
options: [ options: [
...@@ -895,6 +907,7 @@ export default { ...@@ -895,6 +907,7 @@ export default {
key: 'isNewlyProduct', key: 'isNewlyProduct',
component: { component: {
clearable: true, clearable: true,
disabled: this.operateType !== 'NEW',
name: 'el-select', name: 'el-select',
placeholder: '请选择是否新研产品', placeholder: '请选择是否新研产品',
options: [ options: [
...@@ -918,6 +931,7 @@ export default { ...@@ -918,6 +931,7 @@ export default {
key: 'taxRate', key: 'taxRate',
component: { component: {
clearable: true, clearable: true,
disabled: this.operateType !== 'NEW',
name: 'el-input-number', name: 'el-input-number',
min: 0, min: 0,
placeholder: '请输入税率' placeholder: '请输入税率'
...@@ -941,6 +955,7 @@ export default { ...@@ -941,6 +955,7 @@ export default {
key: 'taxUnitPrice', key: 'taxUnitPrice',
component: { component: {
clearable: true, clearable: true,
disabled: this.operateType !== 'NEW',
name: 'el-input-number', name: 'el-input-number',
placeholder: '请输入含税单价' placeholder: '请输入含税单价'
}, },
...@@ -964,6 +979,7 @@ export default { ...@@ -964,6 +979,7 @@ export default {
key: 'storageZone', key: 'storageZone',
component: { component: {
clearable: true, clearable: true,
disabled: this.operateType !== 'NEW',
name: 'el-select', name: 'el-select',
placeholder: '请输入接收仓库', placeholder: '请输入接收仓库',
options: [] options: []
...@@ -983,6 +999,7 @@ export default { ...@@ -983,6 +999,7 @@ export default {
key: 'contractNo', key: 'contractNo',
component: { component: {
clearable: true, clearable: true,
disabled: this.operateType !== 'NEW',
name: 'el-input', name: 'el-input',
placeholder: '请输入合同号/框架协议号' placeholder: '请输入合同号/框架协议号'
} }
...@@ -1010,6 +1027,7 @@ export default { ...@@ -1010,6 +1027,7 @@ export default {
clearable: true, clearable: true,
name: 'el-select', name: 'el-select',
placeholder: '请输入物料关键词', placeholder: '请输入物料关键词',
disabled: this.operateType !== 'NEW',
remote: true, remote: true,
filterable: true, filterable: true,
'remote-method': this.resetMaterial, 'remote-method': this.resetMaterial,
...@@ -1069,6 +1087,7 @@ export default { ...@@ -1069,6 +1087,7 @@ export default {
key: 'serialNo', key: 'serialNo',
component: { component: {
clearable: true, clearable: true,
disabled: this.operateType !== 'NEW',
name: 'el-input', name: 'el-input',
placeholder: '请输入生产序列号' placeholder: '请输入生产序列号'
} }
...@@ -1078,6 +1097,7 @@ export default { ...@@ -1078,6 +1097,7 @@ export default {
key: 'airModel', key: 'airModel',
component: { component: {
clearable: true, clearable: true,
disabled: this.operateType !== 'NEW',
name: 'el-select', name: 'el-select',
placeholder: '请输入机型', placeholder: '请输入机型',
options: [] options: []
...@@ -1091,6 +1111,7 @@ export default { ...@@ -1091,6 +1111,7 @@ export default {
key: 'sorties', key: 'sorties',
component: { component: {
clearable: true, clearable: true,
disabled: this.operateType !== 'NEW',
name: 'el-select', name: 'el-select',
placeholder: '请输入架次', placeholder: '请输入架次',
options: [] options: []
...@@ -1101,6 +1122,7 @@ export default { ...@@ -1101,6 +1122,7 @@ export default {
key: 'reqAmount', key: 'reqAmount',
component: { component: {
name: 'el-input-number', name: 'el-input-number',
disabled: this.operateType !== 'NEW',
min: 0, min: 0,
placeholder: '请输入入库数量' placeholder: '请输入入库数量'
}, },
...@@ -1138,6 +1160,7 @@ export default { ...@@ -1138,6 +1160,7 @@ export default {
key: 'manufacturer', key: 'manufacturer',
component: { component: {
clearable: true, clearable: true,
disabled: this.operateType !== 'NEW',
name: 'el-input', name: 'el-input',
placeholder: '请输入制造商' placeholder: '请输入制造商'
} }
...@@ -1159,6 +1182,7 @@ export default { ...@@ -1159,6 +1182,7 @@ export default {
key: 'producedTime', key: 'producedTime',
component: { component: {
clearable: true, clearable: true,
disabled: this.operateType !== 'NEW',
name: 'el-date-picker', name: 'el-date-picker',
format: 'yyyy-MM-dd', format: 'yyyy-MM-dd',
valueFormat: 'yyyy-MM-dd hh:mm:ss', valueFormat: 'yyyy-MM-dd hh:mm:ss',
...@@ -1170,6 +1194,7 @@ export default { ...@@ -1170,6 +1194,7 @@ export default {
key: 'arrivedDrawNo', key: 'arrivedDrawNo',
component: { component: {
clearable: true, clearable: true,
disabled: this.operateType !== 'NEW',
name: 'el-input', name: 'el-input',
placeholder: '请输入到货图号' placeholder: '请输入到货图号'
} }
...@@ -1179,6 +1204,7 @@ export default { ...@@ -1179,6 +1204,7 @@ export default {
key: 'arrivalVer', key: 'arrivalVer',
component: { component: {
clearable: true, clearable: true,
disabled: this.operateType !== 'NEW',
name: 'el-input', name: 'el-input',
placeholder: '请输入到货版次' placeholder: '请输入到货版次'
} }
...@@ -1188,6 +1214,7 @@ export default { ...@@ -1188,6 +1214,7 @@ export default {
key: 'deliverySpec', key: 'deliverySpec',
component: { component: {
clearable: true, clearable: true,
disabled: this.operateType !== 'NEW',
name: 'el-input', name: 'el-input',
placeholder: '请输入交付规范及版次' placeholder: '请输入交付规范及版次'
} }
...@@ -1197,6 +1224,7 @@ export default { ...@@ -1197,6 +1224,7 @@ export default {
key: 'approvalCert', key: 'approvalCert',
component: { component: {
name: 'el-input', name: 'el-input',
disabled: this.operateType !== 'NEW',
placeholder: '请输入适航批准标签/批准放行证书' placeholder: '请输入适航批准标签/批准放行证书'
} }
}, },
...@@ -1205,6 +1233,7 @@ export default { ...@@ -1205,6 +1233,7 @@ export default {
key: 'withProductMaterial', key: 'withProductMaterial',
component: { component: {
clearable: true, clearable: true,
disabled: this.operateType !== 'NEW',
name: 'el-select', name: 'el-select',
multiple: true, multiple: true,
placeholder: '请选择随产品资料', placeholder: '请选择随产品资料',
...@@ -1216,6 +1245,7 @@ export default { ...@@ -1216,6 +1245,7 @@ export default {
key: 'urgency', key: 'urgency',
component: { component: {
clearable: true, clearable: true,
disabled: this.operateType !== 'NEW',
name: 'el-select', name: 'el-select',
placeholder: '请选择紧急程度', placeholder: '请选择紧急程度',
options: [ options: [
...@@ -1239,6 +1269,7 @@ export default { ...@@ -1239,6 +1269,7 @@ export default {
key: 'taxRate', key: 'taxRate',
component: { component: {
clearable: true, clearable: true,
disabled: this.operateType !== 'NEW',
name: 'el-input-number', name: 'el-input-number',
min: 0, min: 0,
placeholder: '请输入税率' placeholder: '请输入税率'
...@@ -1262,6 +1293,7 @@ export default { ...@@ -1262,6 +1293,7 @@ export default {
key: 'taxUnitPrice', key: 'taxUnitPrice',
component: { component: {
clearable: true, clearable: true,
disabled: this.operateType !== 'NEW',
name: 'el-input-number', name: 'el-input-number',
placeholder: '请输入含税单价' placeholder: '请输入含税单价'
}, },
...@@ -1285,6 +1317,7 @@ export default { ...@@ -1285,6 +1317,7 @@ export default {
key: 'storageZone', key: 'storageZone',
component: { component: {
clearable: true, clearable: true,
disabled: this.operateType !== 'NEW',
name: 'el-select', name: 'el-select',
placeholder: '请输入接收仓库', placeholder: '请输入接收仓库',
options: [] options: []
...@@ -1304,6 +1337,7 @@ export default { ...@@ -1304,6 +1337,7 @@ export default {
key: 'contractNo', key: 'contractNo',
component: { component: {
clearable: true, clearable: true,
disabled: this.operateType !== 'NEW',
name: 'el-input', name: 'el-input',
placeholder: '请输入合同号' placeholder: '请输入合同号'
} }
...@@ -1314,6 +1348,7 @@ export default { ...@@ -1314,6 +1348,7 @@ export default {
key: 'remark', key: 'remark',
component: { component: {
clearable: true, clearable: true,
disabled: this.operateType !== 'NEW',
name: 'el-input', name: 'el-input',
placeholder: '请输入备注' placeholder: '请输入备注'
} }
...@@ -1715,6 +1750,7 @@ export default { ...@@ -1715,6 +1750,7 @@ export default {
this.$refs.form.validate((isok) => { this.$refs.form.validate((isok) => {
if (isok) { if (isok) {
console.log('this.form.operator', this.form.operator) console.log('this.form.operator', this.form.operator)
console.log('this.basicData', this.basicData)
// 校验通过 // 校验通过
const newTableData = { const newTableData = {
...this.form, ...this.form,
...@@ -1725,7 +1761,7 @@ export default { ...@@ -1725,7 +1761,7 @@ export default {
'hasParent': this.form.hasParent ? this.form.hasParent : !!this.parentId, 'hasParent': this.form.hasParent ? this.form.hasParent : !!this.parentId,
'extMaterialId': this.extMaterialId ? this.extMaterialId : this.form.extMaterialId, 'extMaterialId': this.extMaterialId ? this.extMaterialId : this.form.extMaterialId,
'extMaterialIdType': 'ExtDxProcessMaterial', 'extMaterialIdType': 'ExtDxProcessMaterial',
'materialTypeName': this.basicData.materialType.typeName || (this.basicData.materialTypeName || {}).label, 'materialTypeName': this.basicData.materialTypeName.label,
'purchaseUnitId': this.extUnitId, 'purchaseUnitId': this.extUnitId,
'purchaseUnitIdType': 'ExtUnit', 'purchaseUnitIdType': 'ExtUnit',
'lotNo': this.form.lotNo, 'lotNo': this.form.lotNo,
......
applications/dee-mes/src/privateComponents/components/PurchasingWarehousingNewOrEdit/index.vue
View file @ b942e565
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
*/ */
<template> <template>
<div class="className"> <div class="className">
<dee-tools :tools="topTools" mode="normal" style="justify-content: end;" /> <!-- <dee-tools :tools="topTools" mode="normal" style="justify-content: end;" /> -->
<dee-form <dee-form
ref="form" ref="form"
label-width="120" label-width="120"
...@@ -254,7 +254,7 @@ export default { ...@@ -254,7 +254,7 @@ export default {
icon: '/icons/components/new/add.png', icon: '/icons/components/new/add.png',
showFun: (row) => { showFun: (row) => {
const value = row.extMaterial ? row.extMaterial.resType2.typeName : '' const value = row.extMaterial ? row.extMaterial.resType2.typeName : ''
if (!row.isRoot || row.parentId || value !== '外购成品') { if (!row.isRoot || row.parentId || value === '外购成品') {
return false return false
} }
return true return true
...@@ -414,7 +414,8 @@ export default { ...@@ -414,7 +414,8 @@ export default {
}, },
methods: { methods: {
back() { back() {
this.$router.push({ this.$store.dispatch('tagsView/delView', this.$route)
this.$router.replace({
path: '/page/86a5fa19-e245-4732-aff6-c48b18e2b5c7', path: '/page/86a5fa19-e245-4732-aff6-c48b18e2b5c7',
query: { title: '采购入库', menuRootAppId: '1626781924331' } query: { title: '采购入库', menuRootAppId: '1626781924331' }
}) })
...@@ -560,12 +561,23 @@ export default { ...@@ -560,12 +561,23 @@ export default {
'fieldName': 'isRoot', 'fieldName': 'isRoot',
'operator': 'EQ', 'operator': 'EQ',
'value': 'true' 'value': 'true'
},
{
'fieldName': 'parentId',
'operator': 'ISNULL'
},
{
'fieldName': 'state',
'operator': 'EQ',
'value': 'Apply'
} }
], ],
'operator': 'AND' 'operator': 'AND'
} }
], ],
'items': [] 'items': [
]
}, },
'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': [ 'sortItem': [
...@@ -576,7 +588,7 @@ export default { ...@@ -576,7 +588,7 @@ export default {
] ]
} }
post('InStorageRequestItem/search', param).then(res => { post('InStorageRequestItem/treeSearch', param).then(res => {
console.log('res.items.content', res.items.content) console.log('res.items.content', res.items.content)
const data = res.items.content.map(item => { const data = res.items.content.map(item => {
return { return {
...@@ -599,7 +611,7 @@ export default { ...@@ -599,7 +611,7 @@ export default {
console.log('formData', formData) console.log('formData', formData)
const tableDataItem = { const tableDataItem = {
...formData, ...formData,
subEquipment: formData.materialTypeName, // subEquipment: formData.materialTypeName,
// extMaterial: { // extMaterial: {
// resType2: { // resType2: {
// typeCode: formData.materialTypeName, // typeCode: formData.materialTypeName,
...@@ -686,6 +698,7 @@ export default { ...@@ -686,6 +698,7 @@ export default {
// }) // })
post('/InventoryRequest/batch/recursionAdd', param).then(res => { post('/InventoryRequest/batch/recursionAdd', param).then(res => {
this.$utils.showMessageSuccess('保存成功') this.$utils.showMessageSuccess('保存成功')
this.back()
}).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