java_project
/
hy-vue
4
0
Fork 0
Code Issues Pull Requests Activity
Browse Source

修改出库from表单

dev
long 2 years ago
parent
32ef44c182
commit
936fe38919
1 changed files with 101 additions and 97 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 120
      src/views/activiti/form/ProcessMaterialsDeliveryForm.vue

120
src/views/activiti/form/ProcessMaterialsDeliveryForm.vue
Unescape View File

@ -324,8 +324,8 @@
]
},
url: {
queryByIdDescription: "/description/processDescription/queryById",
queryByIdMerchandiseNews: "/merchandisenews/processMerchandiseNews/queryById",
queryByIdDescription: '/description/processDescription/queryById',
queryByIdMerchandiseNews: '/merchandisenews/processMerchandiseNews/queryById',
getForm: '/actBusiness/getForm',
add: '/hy/processMaterialsDelivery/add',
edit: '/hy/processMaterialsDelivery/edit',
@ -354,7 +354,7 @@
processPlan: { rules: [{ required: true, message: '请选择流程计划!' }] }
},
materialGroupId: undefined,
hiegs:true,
hiegs: true
}
},
props: {
@ -411,7 +411,7 @@
return true
}
// console.log("============================",this.hiegs=this.hieg);
this.hiegs = this.hieg;
this.hiegs = this.hieg
return this.disabled
},
showFlowSubmitButton() {
@ -456,12 +456,12 @@
this.materialGroupId = undefined
// this.fetchData(this.accountingAttributesVal);
// this.fetchMerchandiseNews();
if (this.accountingAttributesVal === "1" ) {
console.log("执行账外")
if (this.accountingAttributesVal === '1') {
console.log('执行账外')
//账外
await this.fetchMerchandiseNewsZW()
} else {
console.log("执行总库")
console.log('执行总库')
//总库
await this.fetchMerchandiseNews()
}
@ -485,7 +485,7 @@
},
async onSelect(record) {
console.log(record)
let isMA = true;
let isMA = true
// if (!!record.row.materialGroup && !!record.row.materialGroup ) {
// // console.log("执行materialGroup111")
// if (!!record.row.id && record.row.materialGroup !== this.materialGroupId && record.column.key !== "allotNumber") {
@ -522,31 +522,31 @@
// isMA = false
// }
// }
let eAll = 0;
let eAll = 0
// if (!!record.row.materialGroup && !! record.row.equipment && isMA) {
let b = false;
let b = false
for (const res of this.bigIdMerchandiseNewsList) {
if (res.merchandiseNewsId === record.row.equipment) {
b = true;
b = true
}
}
if (!!record.row.equipment && isMA && record.row.materialGroup !== this.materialGroupId) {
// console.log("执行materialNumber")
if (!b) {
if (this.accountingAttributesVal === "1" ) {
console.log("执行账外")
if (this.accountingAttributesVal === '1') {
console.log('执行账外')
//账外
await this.fetchMerchandiseNewsZW(record.row.equipment)
} else {
console.log("执行总库")
console.log('执行总库')
//总库
await this.fetchMerchandiseNews()
}
}
await this.$refs.processMaterialsDeliveryList.getValues((a, b, c) => {
console.log("bbbbbbbbbbbbbb",b)
console.log('bbbbbbbbbbbbbb', b)
b.forEach(item => {
if (item.equipment === record.row.equipment && !!item.materialGroup && !record.row.materialGroup) {
let values = [
@ -566,16 +566,13 @@
]
// console.log("sadf1111")
this.$refs.processMaterialsDeliveryList.setValues(values)
return ;
return
}
})
})
let materialName = {}
this.bigIdMerchandiseNewsList.forEach(item => {
console.log(item)
@ -614,17 +611,17 @@
// console.log("this.data.materialType",this.data.materialType)
if (parseInt(this.data.materialType) === 1) {
//账外
await this.getEquipmentInvisible(record.row.equipment);
eAll = 2;
await this.getEquipmentInvisible(record.row.equipment)
eAll = 2
} else {
//总库
await this.getEquipmentAll(record.row.equipment);
await this.getEquipmentAll(record.row.equipment)
eAll = 1
}
}
this.materialGroupId = record.row.equipment;
this.materialGroupId = record.row.equipment
}
// 根据请发数量计算
@ -692,7 +689,7 @@
},
//查询总出库库存信息
getEquipmentAll(val,){
getEquipmentAll(val) {
return new Promise((resolve, reject) => {
let ue = sessionStorage.getItem('USER_INFORMATION')
let res = JSON.parse(ue)
@ -704,9 +701,9 @@
getAction(this.url.merchandiseNewsList, pam).then(res => {
// console.log("dsfgsdfgb",res);
if (res.success) {
this.equipmentAll =res.result ;
this.equipmentAll = res.result
}
resolve(this.equipmentAll);
resolve(this.equipmentAll)
})
})
@ -724,9 +721,9 @@
getAction(this.url.wasteMaterialsList, pam).then(res => {
// console.log("pppppppppppp",res);
if (res.success) {
this.equipmentAll =res.result ;
this.equipmentAll = res.result
}
resolve(this.equipmentAll);
resolve(this.equipmentAll)
})
})
@ -738,7 +735,7 @@
//你的逻辑代码
let par = {
delFlag: 0,
accountingAttributes: this.accountingAttributesVal,
accountingAttributes: this.accountingAttributesVal
}
this.bigIdMerchandiseNewsList = []
let qc = []
@ -808,9 +805,9 @@
let res = JSON.parse(ue)
// console.log("78979789",res);
// 查询大品类数据 账外库
par.departId = res.departIds;
par.departId = res.departIds
if (!res.departIds) {
this.$message.warn("当前账号没有物资库！！！");
this.$message.warn('当前账号没有物资库！！！')
}
this.bigIdMerchandiseNewsList = []
let qc = []
@ -1189,7 +1186,7 @@
accountingAttributes: value
}
getAction(this.url.descriptionRake, par).then((res) => {
console.log("1231234123",res)
console.log('1231234123', res)
if (res.success) {
if (this.processMaterialsDeliveryListTable.columns[0].options.length > 0) {
this.processMaterialsDeliveryListTable.columns[0].options = []
@ -1257,8 +1254,8 @@
/*回显数据*/
init() {
this.btndisabled = true
var r = this.processData;
this.getAssignees(r);
var r = this.processData
this.getAssignees(r)
if (!r.tableId) {
return
}
@ -1266,6 +1263,7 @@
id: r.tableId
}).then((res) => {
if (res.success) {
this.$emit('delivery', res.result.deliveryType)
let formData = res.result
formData.tableName = r.tableName
this.data = formData
@ -1327,22 +1325,23 @@
formData.procDeTitle = this.processData.name
formData.title = this.processData.description
formData.targetLibrary = this.libraryAssociationIdInvisible
formData.deliveryType = this.deliveryType
if (!formData.tableName) formData.tableName = this.processData.businessTable
console.log('格式化后的数据', formData)
var url = this.url.addDeliveryApply
let method = 'post'
if (!this.isNew) {
url = this.url.editDeliveryApply
method = 'put';
method = 'put'
formData.assignees = this.assignees
formData.tableName = this.processData.tableName;
formData.procDefId = this.processData.procDefId;
formData.procDeTitle = this.processData.processName;
formData.title=this.processData.title;
formData.processInstanceId=this.processData.id;
formData.tableName = this.processData.tableName
formData.procDefId = this.processData.procDefId
formData.procDeTitle = this.processData.processName
formData.title = this.processData.title
formData.processInstanceId = this.processData.id
if (!this.assignees) {
this.$message.error('审批节点未分配候选审批人员，请联系管理员！')
return;
return
}
}
console.log('提交方法', method)
@ -1352,7 +1351,7 @@
this.$message.success('提交申请成功！')
//todo 将表单的数据传给父组件
this.$emit('loadData')
this.close();
this.close()
} else {
this.$message.error(res.message)
}
@ -1401,6 +1400,7 @@
formData.procDeTitle = this.processData.name
formData.title = this.processData.description
formData.targetLibrary = this.libraryAssociationIdInvisible
formData.deliveryType = this.deliveryType
if (!formData.tableName) formData.tableName = this.processData.businessTable
console.log('格式化后的数据', formData)
var url = this.url.add
@ -1443,7 +1443,7 @@
}
console.log('回显数据', this.data)
let fieldval = pick(this.data, 'id', 'company', 'createTime', 'departId', 'createBy', 'materialType', 'deliveryTime', 'fileId', 'opinion')
let fieldval = pick(this.data, 'id', 'deliveryType', 'company', 'createTime', 'departId', 'createBy', 'materialType', 'deliveryTime', 'fileId', 'opinion')
this.$nextTick(() => {
this.form.setFieldsValue(fieldval)
})
@ -1468,31 +1468,33 @@
}
}
console.log("tab.dataSource",dataSource)
console.log('tab.dataSource', dataSource)
dataSource.forEach(item => {
let par = { id : item.materialGroup,}
let param = {id : item.equipment,}
let par = { id: item.materialGroup }
let param = { id: item.equipment }
getAction(this.url.queryByIdDescription, par).then(res => {
// console.log(res);
if (res.success) {
this.processMaterialsDeliveryListTable.columns[0].options = [{
title: res.result.materialClassify,
value: item.materialGroup,
disabled : true }];
disabled: true
}]
}
})
getAction(this.url.queryByIdMerchandiseNews, param).then(res => {
console.log(res);
console.log(res)
if (res.success) {
this.processMaterialsDeliveryListTable.columns[1].options = [{
title: res.result.materialsNumber,
value: item.equipment,
disabled : true }];
disabled: true
}]
}
})
})
tab.dataSource = dataSource;
tab.dataSource = dataSource
typeof success === 'function' ? success(res) : ''
}).finally(() => {
tab.loading = false
@ -1500,8 +1502,6 @@
},
/** 整理成formData */
classifyIntoFormData(allValues) {
let main = Object.assign(this.model, allValues.formValue)
@ -1546,19 +1546,23 @@
})
},
getAssignees(v) {
getAction(this.url.getFirstNode,{procDefId:v.procDefId,tableId:v.tableId,tableName:v.tableName}).then(res => {
getAction(this.url.getFirstNode, {
procDefId: v.procDefId,
tableId: v.tableId,
tableName: v.tableName
}).then(res => {
if (res.success) {
if (res.result.users && res.result.users.length > 0) {
// 默认勾选
let ids = [];
let ids = []
res.result.users.forEach(e => {
ids.push(e.username);
});
this.assignees = ids.join(",");
ids.push(e.username)
})
this.assignees = ids.join(',')
}
}
});
})
}
}

Write Preview
Loading…
Cancel
Save