|
|
|
@ -53,7 +53,7 @@ |
|
|
|
:loading="processIndustrialScrapMaterialTable.loading" |
|
|
|
:loading="processIndustrialScrapMaterialTable.loading" |
|
|
|
:columns="processIndustrialScrapMaterialTable.columns" |
|
|
|
:columns="processIndustrialScrapMaterialTable.columns" |
|
|
|
:dataSource="processIndustrialScrapMaterialTable.dataSource" |
|
|
|
:dataSource="processIndustrialScrapMaterialTable.dataSource" |
|
|
|
:dragSortType="accounting" |
|
|
|
:dragSortType=this.assigneesText |
|
|
|
:maxHeight="300" |
|
|
|
:maxHeight="300" |
|
|
|
:disabled="formDisabled" |
|
|
|
:disabled="formDisabled" |
|
|
|
:isabled="isabled" |
|
|
|
:isabled="isabled" |
|
|
|
@ -63,8 +63,10 @@ |
|
|
|
:rowSelection="true" |
|
|
|
:rowSelection="true" |
|
|
|
:qeihuan = this.qeihuan |
|
|
|
:qeihuan = this.qeihuan |
|
|
|
:actionButton="!task" |
|
|
|
:actionButton="!task" |
|
|
|
@descriptionFetch = "searchInformation" |
|
|
|
@descriptionFetch = "getMBShuJu" |
|
|
|
/> |
|
|
|
/> |
|
|
|
|
|
|
|
<!-- --> |
|
|
|
|
|
|
|
<!-- --> |
|
|
|
</a-tab-pane> |
|
|
|
</a-tab-pane> |
|
|
|
</a-tabs> |
|
|
|
</a-tabs> |
|
|
|
<div class="div_process"> |
|
|
|
<div class="div_process"> |
|
|
|
@ -103,6 +105,7 @@ import JDictSelectTag from '@/components/dict/JDictSelectTag' |
|
|
|
import JSelectCompany from '../../../../components/jeecgbiz/JSelectCompany' |
|
|
|
import JSelectCompany from '../../../../components/jeecgbiz/JSelectCompany' |
|
|
|
import { getAction, getCurrentTime, getStringArry, httpAction } from '@api/manage' |
|
|
|
import { getAction, getCurrentTime, getStringArry, httpAction } from '@api/manage' |
|
|
|
import pick from 'lodash.pick' |
|
|
|
import pick from 'lodash.pick' |
|
|
|
|
|
|
|
import { accMul } from '../../../../../common/common' |
|
|
|
|
|
|
|
|
|
|
|
export default { |
|
|
|
export default { |
|
|
|
name: 'ProcessIndustrialScrapsForm', |
|
|
|
name: 'ProcessIndustrialScrapsForm', |
|
|
|
@ -121,7 +124,7 @@ export default { |
|
|
|
isGetOneAndLast: true, //提交按钮显示 |
|
|
|
isGetOneAndLast: true, //提交按钮显示 |
|
|
|
btndisabled: false, |
|
|
|
btndisabled: false, |
|
|
|
materialNature : null, //资产类型 |
|
|
|
materialNature : null, //资产类型 |
|
|
|
accounting: undefined, //类型 |
|
|
|
assigneesText: undefined, //类型 |
|
|
|
isabled : true, |
|
|
|
isabled : true, |
|
|
|
qeihuan : '' ,//切换类型 |
|
|
|
qeihuan : '' ,//切换类型 |
|
|
|
labelCol: { |
|
|
|
labelCol: { |
|
|
|
@ -150,7 +153,7 @@ export default { |
|
|
|
{ required: true, message: '请输入流程发起部门!' } |
|
|
|
{ required: true, message: '请输入流程发起部门!' } |
|
|
|
], |
|
|
|
], |
|
|
|
materialType: { rules:[ |
|
|
|
materialType: { rules:[ |
|
|
|
{ required: true, message: '请输入物资类型!'}, |
|
|
|
{ required: true, message: '请选择物资类型!'}, |
|
|
|
]}, |
|
|
|
]}, |
|
|
|
}, |
|
|
|
}, |
|
|
|
// 新增时子表默认添加几行空数据 |
|
|
|
// 新增时子表默认添加几行空数据 |
|
|
|
@ -286,12 +289,20 @@ export default { |
|
|
|
add: '/burst/processIndustrialScraps/add', |
|
|
|
add: '/burst/processIndustrialScraps/add', |
|
|
|
addApply:'/burst/processIndustrialScraps/addApply', |
|
|
|
addApply:'/burst/processIndustrialScraps/addApply', |
|
|
|
edit: '/burst/processIndustrialScraps/edit', |
|
|
|
edit: '/burst/processIndustrialScraps/edit', |
|
|
|
processIndustrialUrlList: '/burst/processIndustrial/list', //查询民爆物资表 |
|
|
|
ownList: "/burst/processIndustrialScraps/ownList", |
|
|
|
|
|
|
|
processIndustrialUrlList: '/burst/processIndustrialScraps/list', //查询民爆物资表 |
|
|
|
processIndustrialScrapMaterial: { |
|
|
|
processIndustrialScrapMaterial: { |
|
|
|
list: '/burst/processIndustrialScraps/queryProcessIndustrialScrapMaterialByMainId' |
|
|
|
list: '/burst/processIndustrialScraps/queryProcessIndustrialScrapMaterialByMainId' |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
}, |
|
|
|
|
|
|
|
isShifu: false, //是否搜过 |
|
|
|
|
|
|
|
MBShuJuList: [], //表格数据 |
|
|
|
|
|
|
|
MBShuJu: {}, //民爆对象 |
|
|
|
|
|
|
|
historyNumList: [], //列表里面的值 |
|
|
|
|
|
|
|
qeihuan : '' ,//切换类型 |
|
|
|
|
|
|
|
describes: '',//流程名称标识 |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
}, |
|
|
|
}, |
|
|
|
props: { |
|
|
|
props: { |
|
|
|
/*流程数据*/ |
|
|
|
/*流程数据*/ |
|
|
|
@ -335,12 +346,177 @@ export default { |
|
|
|
this.isabled = false; |
|
|
|
this.isabled = false; |
|
|
|
this.qeihuan = val; |
|
|
|
this.qeihuan = val; |
|
|
|
//查询民爆物资 |
|
|
|
//查询民爆物资 |
|
|
|
this.assigneesText = val |
|
|
|
// this.assigneesText = val |
|
|
|
await this.searchInformation(); |
|
|
|
// await this.searchInformation(); |
|
|
|
} |
|
|
|
} |
|
|
|
}, |
|
|
|
}, |
|
|
|
|
|
|
|
//获取列表值 |
|
|
|
|
|
|
|
async getMBShuJu(v){ |
|
|
|
|
|
|
|
let par ={}; |
|
|
|
|
|
|
|
let url = ''; |
|
|
|
|
|
|
|
console.log("v>>>>>>>>>",v) |
|
|
|
|
|
|
|
//判断是否存在 |
|
|
|
|
|
|
|
if(!!v){ |
|
|
|
|
|
|
|
par.id = v; |
|
|
|
|
|
|
|
url = this.url.queryById; |
|
|
|
|
|
|
|
} else { |
|
|
|
|
|
|
|
url = this.url.ownList; |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
//构建报废民爆物资类型 |
|
|
|
|
|
|
|
par.materialType = this.assigneesText; |
|
|
|
|
|
|
|
await getAction(url,par).then(res => { |
|
|
|
|
|
|
|
if(res.success){ |
|
|
|
|
|
|
|
if(!!v){ |
|
|
|
|
|
|
|
this.MBShuJu = res.result; |
|
|
|
|
|
|
|
}else{ |
|
|
|
|
|
|
|
this.MBShuJuList = res.result.records; |
|
|
|
|
|
|
|
this.initialData(this.MBShuJuList); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
}) |
|
|
|
|
|
|
|
}, |
|
|
|
|
|
|
|
//初始列表数据 |
|
|
|
|
|
|
|
async initialData(newList){ |
|
|
|
|
|
|
|
console.log("-=-=-=",newList); |
|
|
|
|
|
|
|
await this.getSurface(); |
|
|
|
|
|
|
|
if (this.processIndustrialScrapMaterialTable.columns[1].options.length > 0) { |
|
|
|
|
|
|
|
this.processIndustrialScrapMaterialTable.columns[1].options = []; |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
// if (this.processIndustrialPurchaseMaterialTable.columns[2].options.length > 0) { |
|
|
|
|
|
|
|
// this.processIndustrialPurchaseMaterialTable.columns[2].options = []; |
|
|
|
|
|
|
|
// } |
|
|
|
|
|
|
|
let qc = []; |
|
|
|
|
|
|
|
newList.forEach(item => { |
|
|
|
|
|
|
|
console.log(item.pyrotechnics) |
|
|
|
|
|
|
|
qc.push({ |
|
|
|
|
|
|
|
title: item.pyrotechnics, |
|
|
|
|
|
|
|
value: item.id, |
|
|
|
|
|
|
|
disabled: false |
|
|
|
|
|
|
|
}) |
|
|
|
|
|
|
|
}) |
|
|
|
|
|
|
|
this.historyNumList.forEach( item => { |
|
|
|
|
|
|
|
qc.forEach(it =>{ |
|
|
|
|
|
|
|
if(it.value == item.materialNumber){ |
|
|
|
|
|
|
|
it.disabled = true; |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
}) |
|
|
|
|
|
|
|
}); |
|
|
|
|
|
|
|
this.processIndustrialScrapMaterialTable.columns[1].options = qc; |
|
|
|
|
|
|
|
}, |
|
|
|
|
|
|
|
getSurface(){ |
|
|
|
|
|
|
|
//取列表值 |
|
|
|
|
|
|
|
return new Promise(async(resolve, reject) => { |
|
|
|
|
|
|
|
await this.$refs.processIndustrialScrapMaterial.getValuesPromise().then(re => { |
|
|
|
|
|
|
|
this.historyNumList = re; |
|
|
|
|
|
|
|
}) |
|
|
|
|
|
|
|
resolve(this.historyNumList); |
|
|
|
|
|
|
|
}) |
|
|
|
|
|
|
|
}, |
|
|
|
|
|
|
|
//清空 |
|
|
|
|
|
|
|
qingKong(id){ |
|
|
|
|
|
|
|
let values = [ |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
rowKey: id, |
|
|
|
|
|
|
|
values: { |
|
|
|
|
|
|
|
'materialGroup': null, |
|
|
|
|
|
|
|
'industrialName': '', |
|
|
|
|
|
|
|
'unit': undefined, |
|
|
|
|
|
|
|
'materialPrice': '', |
|
|
|
|
|
|
|
'quantity': '', |
|
|
|
|
|
|
|
'amount': '', |
|
|
|
|
|
|
|
'money': '', |
|
|
|
|
|
|
|
'scrapCause': '', |
|
|
|
|
|
|
|
'remarks': '', |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
] |
|
|
|
|
|
|
|
this.$refs.processIndustrialScrapMaterial.setValues(values); |
|
|
|
|
|
|
|
}, |
|
|
|
|
|
|
|
//列表赋值 |
|
|
|
|
|
|
|
fuZhi(id,v){ |
|
|
|
|
|
|
|
console.log("vvv",v); |
|
|
|
|
|
|
|
let values = [ |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
rowKey: id, |
|
|
|
|
|
|
|
values: { |
|
|
|
|
|
|
|
'materialGroup': v.materialClassify, |
|
|
|
|
|
|
|
'equipment': v.id, |
|
|
|
|
|
|
|
'materialSeries': v.pyrotechnics , |
|
|
|
|
|
|
|
'industrialName': v.pyrotechnicsName, |
|
|
|
|
|
|
|
'unit': v.unit, |
|
|
|
|
|
|
|
'materialPrice': v.manufacturer, |
|
|
|
|
|
|
|
'quantity': v.number, |
|
|
|
|
|
|
|
'amount': '', |
|
|
|
|
|
|
|
'money': '', |
|
|
|
|
|
|
|
'scrapCause': null, |
|
|
|
|
|
|
|
'remarks': null |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
] |
|
|
|
|
|
|
|
// console.log(values); |
|
|
|
|
|
|
|
this.$refs.processIndustrialScrapMaterial.setValues(values) |
|
|
|
|
|
|
|
}, |
|
|
|
async onSelect(record){ |
|
|
|
async onSelect(record){ |
|
|
|
console.log("record>>>>>>>>>>>>>>>>>>>>>>>>>",record) |
|
|
|
console.log("record>>>>>>>>>>>>>>>>>>>>>>>>>",record) |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// console.log("列表值=-",record); |
|
|
|
|
|
|
|
await this.getSurface(); |
|
|
|
|
|
|
|
if(!!record.row.id){ |
|
|
|
|
|
|
|
let same = false; |
|
|
|
|
|
|
|
this.historyNumList.forEach( item =>{ |
|
|
|
|
|
|
|
// console.log("列表值=-",record); |
|
|
|
|
|
|
|
// console.log("====",item); |
|
|
|
|
|
|
|
if(!!item.equipment && !!item.equipment && item.equipment == record.value ){ |
|
|
|
|
|
|
|
this.qingKong(record.row.id); |
|
|
|
|
|
|
|
same = true; |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
}); |
|
|
|
|
|
|
|
if(same){ |
|
|
|
|
|
|
|
return ; |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
if ( record.column.key == "equipment" && !!record.row.equipment |
|
|
|
|
|
|
|
|| record.column.key =="equipment" && !!record.row.equipment ) { |
|
|
|
|
|
|
|
// console.log("select==清空数据",record.row); |
|
|
|
|
|
|
|
this.qingKong(record.row.id); |
|
|
|
|
|
|
|
return |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
if(this.isShifu && !!record.row.id){ |
|
|
|
|
|
|
|
//查询民爆数据 |
|
|
|
|
|
|
|
await this.getMBShuJu(record.value); |
|
|
|
|
|
|
|
this.isShifu = false; |
|
|
|
|
|
|
|
this.fuZhi(record.row.id,this.MBShuJu); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
if(record.column.key === "materialNumber" && !!record.row.id ){ |
|
|
|
|
|
|
|
this.MBShuJuList.forEach(item =>{ |
|
|
|
|
|
|
|
if(item.id === record.value){ |
|
|
|
|
|
|
|
this.fuZhi(record.row.id,item); |
|
|
|
|
|
|
|
return |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
}) |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
//计算金额 |
|
|
|
|
|
|
|
if (!!record.row.materialQuantity && !!record.row.materialPrice && !!record.row.id ) { |
|
|
|
|
|
|
|
// record.row.materialAmount = record.row.materialQuantity * record.row.materialPrice; |
|
|
|
|
|
|
|
console.log("3出发了"); |
|
|
|
|
|
|
|
//回填数据 |
|
|
|
|
|
|
|
if (record.row.id !== undefined) { |
|
|
|
|
|
|
|
let values = [ |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
rowKey: record.row.id, |
|
|
|
|
|
|
|
values: { |
|
|
|
|
|
|
|
'materialQuantity': record.row.materialQuantity, |
|
|
|
|
|
|
|
'materialAmount': accMul(record.row.materialQuantity,record.row.materialPrice), |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
] |
|
|
|
|
|
|
|
this.$refs.processIndustrialScrapMaterial.setValues(values) |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// //物料号 |
|
|
|
// //物料号 |
|
|
|
// if(record.column.key == "equipment" && !!record.row.id || record.column.key == "materialName" && !!record.row.id ){ |
|
|
|
// if(record.column.key == "equipment" && !!record.row.id || record.column.key == "materialName" && !!record.row.id ){ |
|
|
|
// await this.pastSla(); |
|
|
|
// await this.pastSla(); |
|
|
|
@ -421,54 +597,55 @@ export default { |
|
|
|
passTask() { |
|
|
|
passTask() { |
|
|
|
}, |
|
|
|
}, |
|
|
|
//查询民爆 |
|
|
|
//查询民爆 |
|
|
|
searchInformation(value){ |
|
|
|
// searchInformation(value){ |
|
|
|
|
|
|
|
// console.log("开始查询民爆报废物资列表》》》》》》》》》》》》》》》》》》") |
|
|
|
return new Promise( (resolve, reject) => { |
|
|
|
// return new Promise( (resolve, reject) => { |
|
|
|
let par = { |
|
|
|
// console.log("this.accounting>>>>>>>>>>>>>>"+this.accounting); |
|
|
|
materialType: this.accounting, |
|
|
|
// let par = { |
|
|
|
pageNo: 1, |
|
|
|
// materialType: this.accounting, |
|
|
|
pageSize: 50 |
|
|
|
// pageNo: 1, |
|
|
|
} |
|
|
|
// pageSize: 50 |
|
|
|
let numberList = []; |
|
|
|
// } |
|
|
|
this.$refs.processIndustrialScrapMaterial.getValues((a, b, c) => { |
|
|
|
// let numberList = []; |
|
|
|
b.forEach(item => { |
|
|
|
// this.$refs.processIndustrialScrapMaterial.getValues((a, b, c) => { |
|
|
|
if (!!item.equipment) { |
|
|
|
// b.forEach(item => { |
|
|
|
numberList.push(item.equipment) |
|
|
|
// if (!!item.equipment) { |
|
|
|
} |
|
|
|
// numberList.push(item.equipment) |
|
|
|
}) |
|
|
|
// } |
|
|
|
}) |
|
|
|
// }) |
|
|
|
//查询数据 |
|
|
|
// }) |
|
|
|
console.log("par=-=-=-",par); |
|
|
|
// //查询数据 |
|
|
|
getAction(this.url.processIndustrialUrlList,par).then(res =>{ |
|
|
|
// console.log("par=-=-=-",par); |
|
|
|
if(res.success){ |
|
|
|
// getAction(this.url.ownList,par).then(res =>{ |
|
|
|
this.equipmentList = res.result.records; |
|
|
|
// if(res.success){ |
|
|
|
let nu = res.result.records || res.result; |
|
|
|
// this.equipmentList = res.result.records; |
|
|
|
let qc = []; |
|
|
|
// let nu = res.result.records || res.result; |
|
|
|
if (this.processIndustrialScrapMaterialTable.columns[1].options.length > 0) { |
|
|
|
// let qc = []; |
|
|
|
this.processIndustrialScrapMaterialTable.columns[1].options = [] |
|
|
|
// if (this.processIndustrialScrapMaterialTable.columns[1].options.length > 0) { |
|
|
|
} |
|
|
|
// this.processIndustrialScrapMaterialTable.columns[1].options = [] |
|
|
|
nu.forEach(item =>{ |
|
|
|
// } |
|
|
|
qc.push({ |
|
|
|
// nu.forEach(item =>{ |
|
|
|
title: item.coding, |
|
|
|
// qc.push({ |
|
|
|
value: item.id, |
|
|
|
// title: item.coding, |
|
|
|
disabled: false |
|
|
|
// value: item.id, |
|
|
|
}) |
|
|
|
// disabled: false |
|
|
|
}) |
|
|
|
// }) |
|
|
|
numberList.forEach( it => { |
|
|
|
// }) |
|
|
|
// console.log("000000",it); |
|
|
|
// numberList.forEach( it => { |
|
|
|
qc.forEach(item =>{ |
|
|
|
// // console.log("000000",it); |
|
|
|
if( it == item.value ){ |
|
|
|
// qc.forEach(item =>{ |
|
|
|
item.disabled = true; |
|
|
|
// if( it == item.value ){ |
|
|
|
} |
|
|
|
// item.disabled = true; |
|
|
|
}) |
|
|
|
// } |
|
|
|
}) |
|
|
|
// }) |
|
|
|
this.processIndustrialScrapMaterialTable.columns[1].options = qc; |
|
|
|
// }) |
|
|
|
} |
|
|
|
// this.processIndustrialScrapMaterialTable.columns[1].options = qc; |
|
|
|
resolve(); |
|
|
|
// } |
|
|
|
}) |
|
|
|
// resolve(); |
|
|
|
}) |
|
|
|
// }) |
|
|
|
|
|
|
|
// }) |
|
|
|
|
|
|
|
|
|
|
|
}, |
|
|
|
// }, |
|
|
|
//提交申请 |
|
|
|
//提交申请 |
|
|
|
applySubmit(e) { |
|
|
|
applySubmit(e) { |
|
|
|
this.getAllTable().then(tables => { |
|
|
|
this.getAllTable().then(tables => { |
|
|
|
|
