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
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 194
      src/views/activiti/form/ProcessMaterialsDeliveryForm.vue

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

@ -324,8 +324,8 @@
] ]
}, },
url: { url: {
queryByIdDescription: "/description/processDescription/queryById", queryByIdDescription: '/description/processDescription/queryById',
queryByIdMerchandiseNews: "/merchandisenews/processMerchandiseNews/queryById", queryByIdMerchandiseNews: '/merchandisenews/processMerchandiseNews/queryById',
getForm: '/actBusiness/getForm', getForm: '/actBusiness/getForm',
add: '/hy/processMaterialsDelivery/add', add: '/hy/processMaterialsDelivery/add',
edit: '/hy/processMaterialsDelivery/edit', edit: '/hy/processMaterialsDelivery/edit',
@ -338,15 +338,15 @@
wasteMaterialsList: '/wastematerials/processWasteMaterials/merchandiseNewsName', //账外 wasteMaterialsList: '/wastematerials/processWasteMaterials/merchandiseNewsName', //账外
puwwlist: '/unitwaste/processUnitWasteWarehouseCode/queryById', puwwlist: '/unitwaste/processUnitWasteWarehouseCode/queryById',
unitWasteWarehouseList: '/unitwaste/processUnitWasteWarehouseCode/queryById', //查询目标库 unitWasteWarehouseList: '/unitwaste/processUnitWasteWarehouseCode/queryById', //查询目标库
getFirstNode:'/actProcessIns/getFirstNode', getFirstNode: '/actProcessIns/getFirstNode',
processMaterialsDeliveryList: { processMaterialsDeliveryList: {
list: '/hy/processMaterialsDelivery/queryProcessMaterialsDeliveryListByMainId' list: '/hy/processMaterialsDelivery/queryProcessMaterialsDeliveryListByMainId'
} }
}, },
btndisabled: false, btndisabled: false,
describes: '', describes: '',
assignees:'', assignees: '',
deliveryType:'', deliveryType: '',
validatorRules: { validatorRules: {
// 'blur'是鼠标失去焦点的时候会触发验证 // 'blur'是鼠标失去焦点的时候会触发验证
materialType: { rules: [{ required: true, message: '请选择物资类型!' }] }, materialType: { rules: [{ required: true, message: '请选择物资类型!' }] },
@ -354,7 +354,7 @@
processPlan: { rules: [{ required: true, message: '请选择流程计划!' }] } processPlan: { rules: [{ required: true, message: '请选择流程计划!' }] }
}, },
materialGroupId: undefined, materialGroupId: undefined,
hiegs:true, hiegs: true
} }
}, },
props: { props: {
@ -411,7 +411,7 @@
return true return true
} }
// console.log("============================",this.hiegs=this.hieg); // console.log("============================",this.hiegs=this.hieg);
this.hiegs = this.hieg; this.hiegs = this.hieg
return this.disabled return this.disabled
}, },
showFlowSubmitButton() { showFlowSubmitButton() {
@ -427,7 +427,7 @@
dianshang: { dianshang: {
immediate: true, immediate: true,
handler: function(val) { handler: function(val) {
if (val==1){ if (val == 1) {
} }
this.deliveryType = val this.deliveryType = val
@ -444,7 +444,7 @@
// userInfo.company=company; // userInfo.company=company;
if (!this.isNew) { if (!this.isNew) {
this.init() this.init()
}else { } else {
this.popupCallback(company, userInfo, puwwcid) this.popupCallback(company, userInfo, puwwcid)
} }
}, },
@ -456,12 +456,12 @@
this.materialGroupId = undefined this.materialGroupId = undefined
// this.fetchData(this.accountingAttributesVal); // this.fetchData(this.accountingAttributesVal);
// this.fetchMerchandiseNews(); // this.fetchMerchandiseNews();
if (this.accountingAttributesVal === "1" ) { if (this.accountingAttributesVal === '1') {
console.log("执行账外") console.log('执行账外')
//账外 //账外
await this.fetchMerchandiseNewsZW() await this.fetchMerchandiseNewsZW()
} else { } else {
console.log("执行总库") console.log('执行总库')
//总库 //总库
await this.fetchMerchandiseNews() await this.fetchMerchandiseNews()
} }
@ -485,7 +485,7 @@
}, },
async onSelect(record) { async onSelect(record) {
console.log(record) console.log(record)
let isMA = true; let isMA = true
// if (!!record.row.materialGroup && !!record.row.materialGroup ) { // if (!!record.row.materialGroup && !!record.row.materialGroup ) {
// // console.log("执行materialGroup111") // // console.log("执行materialGroup111")
// if (!!record.row.id && record.row.materialGroup !== this.materialGroupId && record.column.key !== "allotNumber") { // if (!!record.row.id && record.row.materialGroup !== this.materialGroupId && record.column.key !== "allotNumber") {
@ -522,31 +522,31 @@
// isMA = false // isMA = false
// } // }
// } // }
let eAll = 0; let eAll = 0
// if (!!record.row.materialGroup && !! record.row.equipment && isMA) { // if (!!record.row.materialGroup && !! record.row.equipment && isMA) {
let b = false; let b = false
for (const res of this.bigIdMerchandiseNewsList) { for (const res of this.bigIdMerchandiseNewsList) {
if(res.merchandiseNewsId === record.row.equipment ){ if (res.merchandiseNewsId === record.row.equipment) {
b = true; b = true
} }
} }
if ( !! record.row.equipment && isMA && record.row.materialGroup !== this.materialGroupId ) { if (!!record.row.equipment && isMA && record.row.materialGroup !== this.materialGroupId) {
// console.log("执行materialNumber") // console.log("执行materialNumber")
if(!b){ if (!b) {
if (this.accountingAttributesVal === "1" ) { if (this.accountingAttributesVal === '1') {
console.log("执行账外") console.log('执行账外')
//账外 //账外
await this.fetchMerchandiseNewsZW(record.row.equipment) await this.fetchMerchandiseNewsZW(record.row.equipment)
} else { } else {
console.log("执行总库") console.log('执行总库')
//总库 //总库
await this.fetchMerchandiseNews() await this.fetchMerchandiseNews()
} }
} }
await this.$refs.processMaterialsDeliveryList.getValues((a, b, c) => { await this.$refs.processMaterialsDeliveryList.getValues((a, b, c) => {
console.log("bbbbbbbbbbbbbb",b) console.log('bbbbbbbbbbbbbb', b)
b.forEach(item => { b.forEach(item => {
if (item.equipment === record.row.equipment && !!item.materialGroup && !record.row.materialGroup) { if (item.equipment === record.row.equipment && !!item.materialGroup && !record.row.materialGroup) {
let values = [ let values = [
@ -566,16 +566,13 @@
] ]
// console.log("sadf1111") // console.log("sadf1111")
this.$refs.processMaterialsDeliveryList.setValues(values) this.$refs.processMaterialsDeliveryList.setValues(values)
return ; return
} }
}) })
}) })
let materialName = {} let materialName = {}
this.bigIdMerchandiseNewsList.forEach(item => { this.bigIdMerchandiseNewsList.forEach(item => {
console.log(item) console.log(item)
@ -610,25 +607,25 @@
} }
] ]
this.$refs.processMaterialsDeliveryList.setValues(values) this.$refs.processMaterialsDeliveryList.setValues(values)
}else{ } else {
// console.log("this.data.materialType",this.data.materialType) // console.log("this.data.materialType",this.data.materialType)
if (parseInt(this.data.materialType) === 1) { if (parseInt(this.data.materialType) === 1) {
//账外 //账外
await this.getEquipmentInvisible(record.row.equipment); await this.getEquipmentInvisible(record.row.equipment)
eAll = 2; eAll = 2
} else { } else {
//总库 //总库
await this.getEquipmentAll(record.row.equipment); await this.getEquipmentAll(record.row.equipment)
eAll = 1 eAll = 1
} }
} }
this.materialGroupId = record.row.equipment; this.materialGroupId = record.row.equipment
} }
// 根据请发数量计算 // 根据请发数量计算
if (!! record.row.pleaseSendNumber && isMA) { if (!!record.row.pleaseSendNumber && isMA) {
// console.log("执行了333333333333") // console.log("执行了333333333333")
let res = record.row let res = record.row
let materialName = {} let materialName = {}
@ -639,7 +636,7 @@
} }
} }
}) })
if(eAll === 0){ if (eAll === 0) {
if (parseInt(res.pleaseSendNumber) > parseInt(materialName.residueNumber)) { if (parseInt(res.pleaseSendNumber) > parseInt(materialName.residueNumber)) {
this.$message.warn('输入请发数不能大于库存数') this.$message.warn('输入请发数不能大于库存数')
res.pleaseSendNumber = materialName.residueNumber res.pleaseSendNumber = materialName.residueNumber
@ -647,7 +644,7 @@
} else { } else {
res.actualSendNumber = res.pleaseSendNumber res.actualSendNumber = res.pleaseSendNumber
} }
}else if(eAll === 1){ } else if (eAll === 1) {
// console.log("000000000000000",this.equipmentAll); // console.log("000000000000000",this.equipmentAll);
if (parseInt(res.pleaseSendNumber) > parseInt(this.equipmentAll[0].materialQuantity)) { if (parseInt(res.pleaseSendNumber) > parseInt(this.equipmentAll[0].materialQuantity)) {
this.$message.warn('输入请发数不能大于库存数') this.$message.warn('输入请发数不能大于库存数')
@ -656,7 +653,7 @@
} else { } else {
res.actualSendNumber = res.pleaseSendNumber res.actualSendNumber = res.pleaseSendNumber
} }
}else if(eAll === 2) { } else if (eAll === 2) {
// console.log("00000000000022222",this.equipmentAll); // console.log("00000000000022222",this.equipmentAll);
if (parseInt(res.pleaseSendNumber) > parseInt(this.equipmentAll[0].residueNumber)) { if (parseInt(res.pleaseSendNumber) > parseInt(this.equipmentAll[0].residueNumber)) {
this.$message.warn('输入请发数不能大于库存数') this.$message.warn('输入请发数不能大于库存数')
@ -692,41 +689,41 @@
}, },
//查询总出库库存信息 //查询总出库库存信息
getEquipmentAll(val,){ getEquipmentAll(val) {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
let ue = sessionStorage.getItem('USER_INFORMATION') let ue = sessionStorage.getItem('USER_INFORMATION')
let res = JSON.parse(ue) let res = JSON.parse(ue)
let pam = { let pam = {
merchandiseNewsId: val, merchandiseNewsId: val,
departId : res.departIds departId: res.departIds
} }
getAction(this.url.merchandiseNewsList,pam).then(res=>{ getAction(this.url.merchandiseNewsList, pam).then(res => {
// console.log("dsfgsdfgb",res); // console.log("dsfgsdfgb",res);
if(res.success){ if (res.success) {
this.equipmentAll =res.result ; this.equipmentAll = res.result
} }
resolve(this.equipmentAll); resolve(this.equipmentAll)
}) })
}) })
}, },
//查询账外出库库存信息 //查询账外出库库存信息
getEquipmentInvisible(val){ getEquipmentInvisible(val) {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
let ue = sessionStorage.getItem('USER_INFORMATION') let ue = sessionStorage.getItem('USER_INFORMATION')
let res = JSON.parse(ue) let res = JSON.parse(ue)
let pam = { let pam = {
merchandiseNewsId: val, merchandiseNewsId: val,
departId : res.departIds departId: res.departIds
} }
getAction(this.url.wasteMaterialsList,pam).then(res=>{ getAction(this.url.wasteMaterialsList, pam).then(res => {
// console.log("pppppppppppp",res); // console.log("pppppppppppp",res);
if(res.success){ if (res.success) {
this.equipmentAll =res.result ; this.equipmentAll = res.result
} }
resolve(this.equipmentAll); resolve(this.equipmentAll)
}) })
}) })
@ -738,7 +735,7 @@
//你的逻辑代码 //你的逻辑代码
let par = { let par = {
delFlag: 0, delFlag: 0,
accountingAttributes: this.accountingAttributesVal, accountingAttributes: this.accountingAttributesVal
} }
this.bigIdMerchandiseNewsList = [] this.bigIdMerchandiseNewsList = []
let qc = [] let qc = []
@ -796,7 +793,7 @@
}) })
}, },
fetchMerchandiseNewsZW(value,did) { //查询账外物料清单信息 fetchMerchandiseNewsZW(value, did) { //查询账外物料清单信息
//查询大品类数据 //查询大品类数据
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
//你的逻辑代码 //你的逻辑代码
@ -808,9 +805,9 @@
let res = JSON.parse(ue) let res = JSON.parse(ue)
// console.log("78979789",res); // console.log("78979789",res);
// 查询大品类数据 账外库 // 查询大品类数据 账外库
par.departId = res.departIds; par.departId = res.departIds
if( !res.departIds){ if (!res.departIds) {
this.$message.warn("当前账号没有物资库！！！"); this.$message.warn('当前账号没有物资库！！！')
} }
this.bigIdMerchandiseNewsList = [] this.bigIdMerchandiseNewsList = []
let qc = [] let qc = []
@ -1189,7 +1186,7 @@
accountingAttributes: value accountingAttributes: value
} }
getAction(this.url.descriptionRake, par).then((res) => { getAction(this.url.descriptionRake, par).then((res) => {
console.log("1231234123",res) console.log('1231234123', res)
if (res.success) { if (res.success) {
if (this.processMaterialsDeliveryListTable.columns[0].options.length > 0) { if (this.processMaterialsDeliveryListTable.columns[0].options.length > 0) {
this.processMaterialsDeliveryListTable.columns[0].options = [] this.processMaterialsDeliveryListTable.columns[0].options = []
@ -1257,15 +1254,16 @@
/*回显数据*/ /*回显数据*/
init() { init() {
this.btndisabled = true this.btndisabled = true
var r = this.processData; var r = this.processData
this.getAssignees(r); this.getAssignees(r)
if (!r.tableId){ if (!r.tableId) {
return return
} }
this.getAction(this.url.queryById, { this.getAction(this.url.queryById, {
id: r.tableId id: r.tableId
}).then((res) => { }).then((res) => {
if (res.success) { if (res.success) {
this.$emit('delivery', res.result.deliveryType)
let formData = res.result let formData = res.result
formData.tableName = r.tableName formData.tableName = r.tableName
this.data = formData this.data = formData
@ -1327,22 +1325,23 @@
formData.procDeTitle = this.processData.name formData.procDeTitle = this.processData.name
formData.title = this.processData.description formData.title = this.processData.description
formData.targetLibrary = this.libraryAssociationIdInvisible formData.targetLibrary = this.libraryAssociationIdInvisible
formData.deliveryType = this.deliveryType
if (!formData.tableName) formData.tableName = this.processData.businessTable if (!formData.tableName) formData.tableName = this.processData.businessTable
console.log('格式化后的数据', formData) console.log('格式化后的数据', formData)
var url = this.url.addDeliveryApply var url = this.url.addDeliveryApply
let method = 'post' let method = 'post'
if (!this.isNew) { if (!this.isNew) {
url = this.url.editDeliveryApply url = this.url.editDeliveryApply
method = 'put'; method = 'put'
formData.assignees=this.assignees formData.assignees = this.assignees
formData.tableName = this.processData.tableName; formData.tableName = this.processData.tableName
formData.procDefId = this.processData.procDefId; formData.procDefId = this.processData.procDefId
formData.procDeTitle = this.processData.processName; formData.procDeTitle = this.processData.processName
formData.title=this.processData.title; formData.title = this.processData.title
formData.processInstanceId=this.processData.id; formData.processInstanceId = this.processData.id
if (!this.assignees){ if (!this.assignees) {
this.$message.error('审批节点未分配候选审批人员，请联系管理员！') this.$message.error('审批节点未分配候选审批人员，请联系管理员！')
return; return
} }
} }
console.log('提交方法', method) console.log('提交方法', method)
@ -1352,7 +1351,7 @@
this.$message.success('提交申请成功！') this.$message.success('提交申请成功！')
//todo 将表单的数据传给父组件 //todo 将表单的数据传给父组件
this.$emit('loadData') this.$emit('loadData')
this.close(); this.close()
} else { } else {
this.$message.error(res.message) this.$message.error(res.message)
} }
@ -1401,6 +1400,7 @@
formData.procDeTitle = this.processData.name formData.procDeTitle = this.processData.name
formData.title = this.processData.description formData.title = this.processData.description
formData.targetLibrary = this.libraryAssociationIdInvisible formData.targetLibrary = this.libraryAssociationIdInvisible
formData.deliveryType = this.deliveryType
if (!formData.tableName) formData.tableName = this.processData.businessTable if (!formData.tableName) formData.tableName = this.processData.businessTable
console.log('格式化后的数据', formData) console.log('格式化后的数据', formData)
var url = this.url.add var url = this.url.add
@ -1443,7 +1443,7 @@
} }
console.log('回显数据', this.data) 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.$nextTick(() => {
this.form.setFieldsValue(fieldval) this.form.setFieldsValue(fieldval)
}) })
@ -1468,31 +1468,33 @@
} }
} }
console.log("tab.dataSource",dataSource) console.log('tab.dataSource', dataSource)
dataSource.forEach(item =>{ dataSource.forEach(item => {
let par = { id : item.materialGroup,} let par = { id: item.materialGroup }
let param = {id : item.equipment,} let param = { id: item.equipment }
getAction(this.url.queryByIdDescription,par).then( res=>{ getAction(this.url.queryByIdDescription, par).then(res => {
// console.log(res); // console.log(res);
if(res.success){ if (res.success) {
this.processMaterialsDeliveryListTable.columns[0].options= [{ this.processMaterialsDeliveryListTable.columns[0].options = [{
title : res.result.materialClassify, title: res.result.materialClassify,
value : item.materialGroup, value: item.materialGroup,
disabled : true }]; disabled: true
}]
} }
}) })
getAction(this.url.queryByIdMerchandiseNews,param).then( res=>{ getAction(this.url.queryByIdMerchandiseNews, param).then(res => {
console.log(res); console.log(res)
if(res.success){ if (res.success) {
this.processMaterialsDeliveryListTable.columns[1].options= [{ this.processMaterialsDeliveryListTable.columns[1].options = [{
title : res.result.materialsNumber, title: res.result.materialsNumber,
value : item.equipment, value: item.equipment,
disabled : true }]; disabled: true
}]
} }
}) })
}) })
tab.dataSource = dataSource; tab.dataSource = dataSource
typeof success === 'function' ? success(res) : '' typeof success === 'function' ? success(res) : ''
}).finally(() => { }).finally(() => {
tab.loading = false tab.loading = false
@ -1500,8 +1502,6 @@
}, },
/** 整理成formData */ /** 整理成formData */
classifyIntoFormData(allValues) { classifyIntoFormData(allValues) {
let main = Object.assign(this.model, allValues.formValue) let main = Object.assign(this.model, allValues.formValue)
@ -1545,20 +1545,24 @@
this.form.setFieldsValue(fieldval) this.form.setFieldsValue(fieldval)
}) })
}, },
getAssignees(v){ 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.success) {
if (res.result.users && res.result.users.length > 0) { if (res.result.users && res.result.users.length > 0) {
// 默认勾选 // 默认勾选
let ids = []; let ids = []
res.result.users.forEach(e => { res.result.users.forEach(e => {
ids.push(e.username); ids.push(e.username)
}); })
this.assignees = ids.join(","); this.assignees = ids.join(',')
} }
} }
}); })
} }
} }

Write Preview
Loading…
Cancel
Save