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