|
|
|
|
@ -20,14 +20,15 @@
|
|
|
|
|
</a-form-model-item> |
|
|
|
|
</a-col> |
|
|
|
|
|
|
|
|
|
<a-col :xs="24" :sm="8"> |
|
|
|
|
<a-form-model-item label="物资类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="deliveryType"> |
|
|
|
|
<!-- <a-input-number v-model="model.deliveryType" placeholder="请输入物资类型" style="width: 100%" />--> |
|
|
|
|
<j-dict-select-tag type="list" v-decorator="['deliveryType']" |
|
|
|
|
dictCode="explosive_type" |
|
|
|
|
placeholder="请选择物资类型" @change="elect"/> |
|
|
|
|
</a-form-model-item> |
|
|
|
|
</a-col> |
|
|
|
|
<a-col :xs="24" :sm="8"> |
|
|
|
|
<a-form-model-item label="物资类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="type"> |
|
|
|
|
<!-- <a-input v-model="model.type" placeholder="请输入物资类型"></a-input>--> |
|
|
|
|
<!-- <a-input v-model="model.type" placeholder="请输入物资类型" ></a-input>--> |
|
|
|
|
<j-dict-select-tag type="list" v-decorator="['type']" |
|
|
|
|
dictCode="explosive_type" :trigger-change="true" |
|
|
|
|
placeholder="请选择物资类型" @change="elect" /> |
|
|
|
|
</a-form-model-item> |
|
|
|
|
</a-col> |
|
|
|
|
<a-col :xs="24" :sm="8"> |
|
|
|
|
<a-form-model-item label="批次" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="batch"> |
|
|
|
|
<a-input v-decorator="['batch']" placeholder="请输入批次" ></a-input> |
|
|
|
|
@ -47,24 +48,29 @@
|
|
|
|
|
<!-- 子表单区域 --> |
|
|
|
|
<a-tabs v-model="activeKey" @change="handleChangeTabs"> |
|
|
|
|
<a-tab-pane tab="民爆物资出库详情表" :key="refKeys[0]" :forceRender="true"> |
|
|
|
|
<j-editable-table |
|
|
|
|
<m-b-c-k-editable-table |
|
|
|
|
ref="processIndustrialDeliveryMaterial" |
|
|
|
|
:ref="refKeys[0]" |
|
|
|
|
:loading="processIndustrialDeliveryMaterialTable.loading" |
|
|
|
|
:columns="processIndustrialDeliveryMaterialTable.columns" |
|
|
|
|
:dataSource="processIndustrialDeliveryMaterialTable.dataSource" |
|
|
|
|
:dragSortType="accounting" |
|
|
|
|
:maxHeight="300" |
|
|
|
|
:disabled="formDisabled" |
|
|
|
|
:isabled="isabled" |
|
|
|
|
@valueChange ="onSelect" |
|
|
|
|
@descriptionFetch = "searchInformation" |
|
|
|
|
:actionButton="!task" |
|
|
|
|
:rowNumber="true" |
|
|
|
|
:rowSelection="true" |
|
|
|
|
:actionButton="true"/> |
|
|
|
|
/> |
|
|
|
|
</a-tab-pane> |
|
|
|
|
</a-tabs> |
|
|
|
|
<div class="div_process"> |
|
|
|
|
<div v-if="isGetOneAndLast"> |
|
|
|
|
<a-form-item v-if="!disabled" :wrapperCol="{ span: 24 }" style="text-align: center"> |
|
|
|
|
<a-button type="primary" :disabled="disabled||btndisabled" @click="handleSubmit">保存</a-button> |
|
|
|
|
<a-button style="margin-left: 8px" type="primary" :disabled="disabled||btndisabled" @click="applySubmit">提交申请 |
|
|
|
|
</a-button> |
|
|
|
|
<a-button style="margin-left: 8px" type="primary" :disabled="disabled||btndisabled" @click="applySubmit">提交申请</a-button> |
|
|
|
|
<a-button style="margin-left: 8px" :disabled="disabled" @click="close">取消</a-button> |
|
|
|
|
</a-form-item> |
|
|
|
|
<a-form-item v-if="task" :wrapperCol="{ span: 24 }" style="text-align: center"> |
|
|
|
|
@ -94,7 +100,7 @@ import { FormTypes, getRefPromise, VALIDATE_NO_PASSED, validateFormAndTables } f
|
|
|
|
|
import JSelectUserByDep from '@/components/jeecgbiz/JSelectUserByDep' |
|
|
|
|
import JDictSelectTag from '@/components/dict/JDictSelectTag' |
|
|
|
|
import JSelectCompany from '../../../../components/jeecgbiz/JSelectCompany' |
|
|
|
|
import { getStringArry } from '@api/manage' |
|
|
|
|
import { getAction, getStringArry, httpAction } from '@api/manage' |
|
|
|
|
import pick from 'lodash.pick' |
|
|
|
|
|
|
|
|
|
export default { |
|
|
|
|
@ -111,6 +117,10 @@ import pick from 'lodash.pick'
|
|
|
|
|
}, |
|
|
|
|
data() { |
|
|
|
|
return { |
|
|
|
|
accounting: undefined, //类型 |
|
|
|
|
materialNature : null, //资产类型 |
|
|
|
|
isabled : true, |
|
|
|
|
qeihuan : true, //切换类型 |
|
|
|
|
isGetOneAndLast: true, //提交按钮显示 |
|
|
|
|
btndisabled: false, |
|
|
|
|
labelCol: { |
|
|
|
|
@ -202,19 +212,21 @@ import pick from 'lodash.pick'
|
|
|
|
|
placeholder: '请输入${title}', |
|
|
|
|
defaultValue:'', |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
title: '删除标识', |
|
|
|
|
key: 'delFlag', |
|
|
|
|
type: FormTypes.input, |
|
|
|
|
width:"200px", |
|
|
|
|
placeholder: '请输入${title}', |
|
|
|
|
defaultValue:'', |
|
|
|
|
}, |
|
|
|
|
// { |
|
|
|
|
// title: '删除标识', |
|
|
|
|
// key: 'delFlag', |
|
|
|
|
// type: FormTypes.input, |
|
|
|
|
// width:"200px", |
|
|
|
|
// placeholder: '请输入${title}', |
|
|
|
|
// defaultValue:'', |
|
|
|
|
// }, |
|
|
|
|
] |
|
|
|
|
}, |
|
|
|
|
url: { |
|
|
|
|
add: "/burst/processIndustrialDelivery/add", |
|
|
|
|
addApply: "/burst/processIndustrialDelivery/addApply", |
|
|
|
|
edit: "/burst/processIndustrialDelivery/edit", |
|
|
|
|
processIndustrialUrlList: '/burst/processIndustrial/list', //查询民爆物资表 |
|
|
|
|
processIndustrialDeliveryMaterial: { |
|
|
|
|
list: '/burst/processIndustrialDelivery/queryProcessIndustrialDeliveryMaterialByMainId' |
|
|
|
|
}, |
|
|
|
|
@ -236,6 +248,8 @@ import pick from 'lodash.pick'
|
|
|
|
|
default: false, |
|
|
|
|
required: false |
|
|
|
|
}, |
|
|
|
|
/*是否新增*/ |
|
|
|
|
isNew: { type: Boolean, default: false, required: false }, |
|
|
|
|
/*是否处理流程*/ |
|
|
|
|
task: { type: Boolean, default: false, required: false }, |
|
|
|
|
/*采购类型*/ |
|
|
|
|
@ -253,10 +267,136 @@ import pick from 'lodash.pick'
|
|
|
|
|
this.popupCallback(company, userInfo, puwwcid) |
|
|
|
|
}, |
|
|
|
|
methods: { |
|
|
|
|
//查询民爆 |
|
|
|
|
searchInformation(value){ |
|
|
|
|
|
|
|
|
|
return new Promise( (resolve, reject) => { |
|
|
|
|
let par = { |
|
|
|
|
type: this.accounting |
|
|
|
|
} |
|
|
|
|
let numberList = []; |
|
|
|
|
this.$refs.processIndustrialDeliveryMaterial.getValues((a, b, c) => { |
|
|
|
|
b.forEach(item => { |
|
|
|
|
if (!!item.equipment) { |
|
|
|
|
numberList.push(item.equipment) |
|
|
|
|
} |
|
|
|
|
}) |
|
|
|
|
}) |
|
|
|
|
//查询数据 |
|
|
|
|
console.log("=-=-=-",par); |
|
|
|
|
getAction(this.url.processIndustrialUrlList,par).then(res =>{ |
|
|
|
|
if(res.success){ |
|
|
|
|
console.log("res>>>>>>>>>>>>>>>>>>>>",res) |
|
|
|
|
this.equipmentList = res.result.records; |
|
|
|
|
let nu = res.result.records || res.result; |
|
|
|
|
let qc = []; |
|
|
|
|
// if (this.processIndustrialScrapMaterialTable.columns[1].options.length > 0) { |
|
|
|
|
// this.processIndustrialScrapMaterialTable.columns[1].options = [] |
|
|
|
|
// } |
|
|
|
|
nu.forEach(item =>{ |
|
|
|
|
qc.push({ |
|
|
|
|
title: item.materialNumber, |
|
|
|
|
value: item.merchandiseNewsId, |
|
|
|
|
disabled: false |
|
|
|
|
}) |
|
|
|
|
}) |
|
|
|
|
console.log("qc>>>>>>>>>>>>>>>",qc) |
|
|
|
|
numberList.forEach( it => { |
|
|
|
|
// console.log("000000",it); |
|
|
|
|
qc.forEach(item =>{ |
|
|
|
|
if( it == item.value ){ |
|
|
|
|
item.disabled = true; |
|
|
|
|
} |
|
|
|
|
}) |
|
|
|
|
}) |
|
|
|
|
// this.processSmaterialsScrapListTable.columns[1].options = qc; |
|
|
|
|
} |
|
|
|
|
resolve(); |
|
|
|
|
}) |
|
|
|
|
}) |
|
|
|
|
|
|
|
|
|
}, |
|
|
|
|
async onSelect(record){ |
|
|
|
|
console.log("record>>>>>>>>>>>>>>>>>>>>>>>>>",record) |
|
|
|
|
// //物料号 |
|
|
|
|
// if(record.column.key == "equipment" && !!record.row.id || record.column.key == "materialName" && !!record.row.id ){ |
|
|
|
|
// await this.pastSla(); |
|
|
|
|
// let l = false; |
|
|
|
|
// this.historyNumList.forEach( item =>{ |
|
|
|
|
// // console.log("111",item); |
|
|
|
|
// if(item.equipment == record.value){ |
|
|
|
|
// l =true; |
|
|
|
|
// } |
|
|
|
|
// }); |
|
|
|
|
// if(l){ |
|
|
|
|
// this.qingKong(record.row.id); |
|
|
|
|
// }else{ |
|
|
|
|
// let sous = false; |
|
|
|
|
// this.equipmentList.forEach( item =>{ |
|
|
|
|
// // console.log(item) |
|
|
|
|
// if(item.merchandiseNewsId == record.value){ |
|
|
|
|
// sous = true; |
|
|
|
|
// } |
|
|
|
|
// }) |
|
|
|
|
// if(!sous){ |
|
|
|
|
// //根据ID查询 |
|
|
|
|
// await this.searchInformation(record.value); |
|
|
|
|
// } |
|
|
|
|
// this.fuZhi(record.row.id,record.value); |
|
|
|
|
// } |
|
|
|
|
// await this.jinYong(); |
|
|
|
|
// } |
|
|
|
|
// //计算金额 |
|
|
|
|
// if(record.column.key = "actualNumber" && !!record.row.scrapNumber && !this.allotBaoNumber){ |
|
|
|
|
// let ase = 0; |
|
|
|
|
// let bao = false; |
|
|
|
|
// this.BaoFeiNumList.forEach(item =>{ |
|
|
|
|
// |
|
|
|
|
// if(item.merchandiseNewsId === record.row.equipment){ |
|
|
|
|
// // console.log("11-=-=",item); |
|
|
|
|
// |
|
|
|
|
// if(record.row.actualNumber > item.materialQuantity){ |
|
|
|
|
// this.$message.warning("实际报废数大于库存数！"); |
|
|
|
|
// bao = true; |
|
|
|
|
// let values = [ |
|
|
|
|
// { |
|
|
|
|
// rowKey: record.row.id, |
|
|
|
|
// values: { |
|
|
|
|
// 'actualNumber': null , |
|
|
|
|
// 'materialAmount': null, |
|
|
|
|
// } |
|
|
|
|
// } |
|
|
|
|
// ] |
|
|
|
|
// this.$refs.processSmaterialsScrapList.setValues(values); |
|
|
|
|
// } |
|
|
|
|
// } |
|
|
|
|
// }) |
|
|
|
|
// if(!bao){ |
|
|
|
|
// ase = accMul(record.row.actualNumber,record.row.materialPrice) > 0 ? accMul(record.row.actualNumber,record.row.materialPrice) : 1 * record.row.materialPrice; |
|
|
|
|
// let values = [ |
|
|
|
|
// { |
|
|
|
|
// rowKey: record.row.id, |
|
|
|
|
// values: { |
|
|
|
|
// // 'scrapNumber': record.row.scrapNumber > 0 ? record.row.scrapNumber : 1 , |
|
|
|
|
// 'materialAmount': ase, |
|
|
|
|
// } |
|
|
|
|
// } |
|
|
|
|
// ] |
|
|
|
|
// this.$refs.processSmaterialsScrapList.setValues(values); |
|
|
|
|
// } |
|
|
|
|
// } |
|
|
|
|
|
|
|
|
|
}, |
|
|
|
|
//物资类型切换 |
|
|
|
|
elect(val) { |
|
|
|
|
async elect(val) { |
|
|
|
|
console.log("val>>>>>>>>>>>",val) |
|
|
|
|
if (val != undefined) { |
|
|
|
|
this.assigneesText = val; |
|
|
|
|
this.accounting = val; |
|
|
|
|
this.isabled = false; |
|
|
|
|
this.qeihuan = val; |
|
|
|
|
//查询民爆物资 |
|
|
|
|
this.assigneesText = val |
|
|
|
|
await this.searchInformation(); |
|
|
|
|
} |
|
|
|
|
}, |
|
|
|
|
//通过 |
|
|
|
|
@ -300,10 +440,10 @@ import pick from 'lodash.pick'
|
|
|
|
|
// formData.materialPrice = 0; |
|
|
|
|
// } |
|
|
|
|
formData.describes = this.describes |
|
|
|
|
if (new Date(formData.createTime).getTime() / 100 > new Date(formData.needTime).getTime() / 100) { |
|
|
|
|
this.$message.error('需求时间不能小于当前流程发起时间') |
|
|
|
|
return |
|
|
|
|
} |
|
|
|
|
// if (new Date(formData.createTime).getTime() / 100 > new Date(formData.needTime).getTime() / 100) { |
|
|
|
|
// this.$message.error('需求时间不能小于当前流程发起时间') |
|
|
|
|
// return |
|
|
|
|
// } |
|
|
|
|
// console.log(this.opinion, '流程说明') |
|
|
|
|
this.form.validateFields((err, values) => { |
|
|
|
|
if (!err) { |
|
|
|
|
@ -314,10 +454,10 @@ import pick from 'lodash.pick'
|
|
|
|
|
//formData.sourceCapital |
|
|
|
|
// console.log('this.planType++', this.planType) |
|
|
|
|
if (!formData.tableName) formData.tableName = this.processData.businessTable |
|
|
|
|
var url = this.url.addFromTableApply |
|
|
|
|
var url = this.url.addApply |
|
|
|
|
let method = 'post' |
|
|
|
|
if (!this.isNew) { |
|
|
|
|
url = this.url.editFromTableApply |
|
|
|
|
url = this.url.edit |
|
|
|
|
method = 'put' |
|
|
|
|
formData.assignees = this.assignees |
|
|
|
|
formData.tableName = this.processData.tableName |
|
|
|
|
@ -343,18 +483,18 @@ import pick from 'lodash.pick'
|
|
|
|
|
console.log(formData, '表单数据') |
|
|
|
|
if (this.btndisabled === false) { |
|
|
|
|
this.btndisabled = true |
|
|
|
|
// httpAction(url, formData, method).then((res) => { |
|
|
|
|
// if (res.success) { |
|
|
|
|
// this.$message.success('提交申请成功！') |
|
|
|
|
// //todo 将表单的数据传给父组件 |
|
|
|
|
// this.$emit('loadData') |
|
|
|
|
// this.close() |
|
|
|
|
// } else { |
|
|
|
|
// this.$message.error(res.message) |
|
|
|
|
// } |
|
|
|
|
// }).finally(() => { |
|
|
|
|
// this.btndisabled = false |
|
|
|
|
// }) |
|
|
|
|
httpAction(url, formData, method).then((res) => { |
|
|
|
|
if (res.success) { |
|
|
|
|
this.$message.success('提交申请成功！') |
|
|
|
|
//todo 将表单的数据传给父组件 |
|
|
|
|
this.$emit('afterSubmit',formData) |
|
|
|
|
//this.close() |
|
|
|
|
} else { |
|
|
|
|
this.$message.error(res.message) |
|
|
|
|
} |
|
|
|
|
}).finally(() => { |
|
|
|
|
this.btndisabled = false |
|
|
|
|
}) |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
}) |
|
|
|
|
@ -445,19 +585,19 @@ import pick from 'lodash.pick'
|
|
|
|
|
if(!!formData.ifInspection) formData.ifInspection = parseInt(formData.ifInspection); |
|
|
|
|
console.log(formData, '格式化的数据'); |
|
|
|
|
if (this.btndisabled === false) { |
|
|
|
|
// this.btndisabled = true |
|
|
|
|
// httpAction(url, formData, method).then((res) => { |
|
|
|
|
// if (res.success) { |
|
|
|
|
// //todo 将表单的数据传给父组件 |
|
|
|
|
// if (e != true) { |
|
|
|
|
// this.$emit('afterSubmit', formData) |
|
|
|
|
// } |
|
|
|
|
// } else { |
|
|
|
|
// this.$message.error(res.message) |
|
|
|
|
// } |
|
|
|
|
// }).finally(() => { |
|
|
|
|
// this.btndisabled = false |
|
|
|
|
// }) |
|
|
|
|
this.btndisabled = true |
|
|
|
|
httpAction(url, formData, method).then((res) => { |
|
|
|
|
if (res.success) { |
|
|
|
|
//todo 将表单的数据传给父组件 |
|
|
|
|
if (e != true) { |
|
|
|
|
this.$emit('afterSubmit', formData) |
|
|
|
|
} |
|
|
|
|
} else { |
|
|
|
|
this.$message.error(res.message) |
|
|
|
|
} |
|
|
|
|
}).finally(() => { |
|
|
|
|
this.btndisabled = false |
|
|
|
|
}) |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
}) |
|
|
|
|
|
