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

科室出库走总库

dev
long 2 years ago
parent
38215b5542
commit
463a49f236
1 changed files with 115 additions and 110 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. 225
      src/views/activiti/form/ProcessMaterialsDeliveryForm.vue

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

@ -45,14 +45,14 @@
date-format="YYYY-MM-DD HH:mm:ss" style="width: 100%" disabled/> date-format="YYYY-MM-DD HH:mm:ss" style="width: 100%" disabled/>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="8" v-if="this.deliveryType==1"> <a-col :span="8" v-if="this.deliveryType==1 || this.isOffice==1">
<a-form-item label="物资类型" :labelCol="labelCol" :wrapperCol="wrapperCol"> <a-form-item label="物资类型" :labelCol="labelCol" :wrapperCol="wrapperCol">
<j-dict-select-tag type="list" @change="isMaterialType" <j-dict-select-tag type="list" @change="isMaterialType"
v-decorator="['materialType',validatorRules.materialType]" :trigger-change="true" v-decorator="['materialType',validatorRules.materialType]" :trigger-change="true"
dictCode="stronger_material_type" placeholder="请选择物资类型"/> dictCode="stronger_material_type" placeholder="请选择物资类型"/>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="8" v-if="this.deliveryType==2"> <a-col :span="8" v-if="this.deliveryType==2 && this.isOffice==2">
<a-form-item label="物资类型" :labelCol="labelCol" :wrapperCol="wrapperCol"> <a-form-item label="物资类型" :labelCol="labelCol" :wrapperCol="wrapperCol">
<j-dict-select-tag type="list" @change="isMaterialType" <j-dict-select-tag type="list" @change="isMaterialType"
v-decorator="['materialType',validatorRules.materialType]" :trigger-change="true" v-decorator="['materialType',validatorRules.materialType]" :trigger-change="true"
@ -74,7 +74,8 @@
</a-form> </a-form>
</j-form-container> </j-form-container>
<!-- 子表单区域 --> <!-- 子表单区域 -->
<a-tabs v-model="activeKey" @change="handleChangeTabs" style="background-color: #eaf3ea;margin-top: 20px;padding: 0px 10px"> <a-tabs v-model="activeKey" @change="handleChangeTabs"
style="background-color: #eaf3ea;margin-top: 20px;padding: 0px 10px">
<a-tab-pane tab="物资出库流程出库清单" :key="refKeys[0]" :forceRender="true"> <a-tab-pane tab="物资出库流程出库清单" :key="refKeys[0]" :forceRender="true">
<c-editable-table <c-editable-table
ref="processMaterialsDeliveryList" ref="processMaterialsDeliveryList"
@ -96,7 +97,7 @@
<template v-slot:title="props"> <template v-slot:title="props">
<p>库存：{{ wateNumber}} </p> <p>库存：{{ wateNumber}} </p>
</template> </template>
<a-button @mouseenter="chaKan(props)" v-has="'stockRemoval:stock'">查看</a-button> <a-button @mouseenter="chaKan(props)" v-has="'stockRemoval:stock'">查看</a-button>
</a-tooltip> </a-tooltip>
<!-- <a-button @click="chaKan(props)">查看</a-button>--> <!-- <a-button @click="chaKan(props)">查看</a-button>-->
</template> </template>
@ -107,18 +108,18 @@
</c-editable-table> </c-editable-table>
</a-tab-pane> </a-tab-pane>
</a-tabs> </a-tabs>
<!-- <j-form-container > <!-- <j-form-container >
<a-form :form="form"> <a-form :form="form">
<a-row> <a-row>
<a-col :span="24" > <a-col :span="24" >
<a-form-item label="流程说明" > <a-form-item label="流程说明" >
<j-editor v-decorator="[ 'opinion', {} ]" triggerChange></j-editor> <j-editor v-decorator="[ 'opinion', {} ]" triggerChange></j-editor>
&lt;!&ndash;<a-input type="textarea" v-decorator="[ 'opinion' ]" :rows="4" />&ndash;&gt; &lt;!&ndash;<a-input type="textarea" v-decorator="[ 'opinion' ]" :rows="4" />&ndash;&gt;
</a-form-item> </a-form-item>
</a-col> </a-col>
</a-row> </a-row>
</a-form> </a-form>
</j-form-container>--> </j-form-container>-->
<div class="div_process"> <div class="div_process">
<a-form-item v-if="!disabled" :wrapperCol="{ span: 24 }" style="text-align: center"> <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 type="primary" :disabled="disabled||btndisabled" @click="handleSubmit">保存</a-button>
@ -232,7 +233,7 @@
placeholder: '请输入${title}', placeholder: '请输入${title}',
// defaultValue:'', // defaultValue:'',
options: [], options: [],
disabled: this.disabled, disabled: this.disabled
}, },
{ {
title: 'WBS', title: 'WBS',
@ -242,7 +243,7 @@
width: '200px', width: '200px',
placeholder: '请输入${title}', placeholder: '请输入${title}',
defaultValue: '', defaultValue: '',
disabled: this.disabled, disabled: this.disabled
}, },
{ {
title: '物料名称及规格型号', title: '物料名称及规格型号',
@ -252,7 +253,7 @@
width: '200px', width: '200px',
placeholder: '请输入${title}', placeholder: '请输入${title}',
defaultValue: '', defaultValue: '',
disabled: this.disabled, disabled: this.disabled
}, },
// { // {
// title: '规格', // title: '规格',
@ -279,7 +280,7 @@
width: '130px', width: '130px',
placeholder: '请输入${title}', placeholder: '请输入${title}',
defaultValue: '', defaultValue: '',
disabled: this.disabled, disabled: this.disabled
}, },
// { // {
// title: '批次', // title: '批次',
@ -296,7 +297,7 @@
width: '130px', width: '130px',
placeholder: '请输入${title}', placeholder: '请输入${title}',
defaultValue: '', defaultValue: '',
disabled: this.disabled, disabled: this.disabled
// slotName: 'qing' // slotName: 'qing'
}, },
{ {
@ -306,7 +307,7 @@
width: '130px', width: '130px',
placeholder: '请输入${title}', placeholder: '请输入${title}',
defaultValue: '', defaultValue: '',
disabled: this.actualNumber, disabled: this.actualNumber
}, },
{ {
title: '库存', title: '库存',
@ -316,7 +317,7 @@
// placeholder: '请输入${title}', // placeholder: '请输入${title}',
// defaultValue: '', // defaultValue: '',
slotName: 'repertory', slotName: 'repertory',
disabled: this.disabled, disabled: this.disabled
// scopedSlots: {customRender: 'fileSlot'} // scopedSlots: {customRender: 'fileSlot'}
}, },
{ {
@ -327,7 +328,7 @@
width: '200px', width: '200px',
placeholder: '请输入${title}', placeholder: '请输入${title}',
defaultValue: '', defaultValue: '',
disabled: this.disabled, disabled: this.disabled
}, },
{ {
title: '单价（元）', title: '单价（元）',
@ -411,7 +412,7 @@
describes: '', describes: '',
assignees: '', assignees: '',
deliveryType: '', deliveryType: '',
isOffice:'', isOffice: '',
validatorRules: { validatorRules: {
// 'blur'是鼠标失去焦点的时候会触发验证 // 'blur'是鼠标失去焦点的时候会触发验证
materialType: { rules: [{ required: true, message: '请选择物资类型!' }] }, materialType: { rules: [{ required: true, message: '请选择物资类型!' }] },
@ -420,7 +421,7 @@
}, },
materialGroupId: undefined, materialGroupId: undefined,
accountingAttributesVal: '', accountingAttributesVal: '',
hiegs:true, hiegs: true
} }
}, },
props: { props: {
@ -483,7 +484,7 @@
return true return true
} }
// console.log("============================",this.hiegs=this.hieg); // console.log("============================",this.hiegs=this.hieg);
console.log("2222222222222222",this.actualNumber) console.log('2222222222222222', this.actualNumber)
// if(this.disabled){ // if(this.disabled){
// this.isabled = false; // this.isabled = false;
// } // }
@ -526,17 +527,16 @@
}, },
methods: { methods: {
async chaKan(log){ async chaKan(log) {
let pas =await log.target.getValuesPromise(log.rowIds); let pas = await log.target.getValuesPromise(log.rowIds)
// console.log("执行了",pas); // console.log("执行了",pas);
if(!!pas[log.index].repertory){ if (!!pas[log.index].repertory) {
this.wateNumber = pas[log.index].repertory; this.wateNumber = pas[log.index].repertory
}else{ } else {
this.wateNumber = 0; this.wateNumber = 0
} }
}, },
//新增输入 //新增输入
async addid(val) { async addid(val) {
// this.addId = val.row.id // this.addId = val.row.id
@ -544,15 +544,19 @@
this.materialGroupId = undefined this.materialGroupId = undefined
// this.fetchData(this.accountingAttributesVal); // this.fetchData(this.accountingAttributesVal);
// this.fetchMerchandiseNews(); // this.fetchMerchandiseNews();
if (this.deliveryType !== 1 ) { if (this.deliveryType !== 1) {
// console.log("执行账外") // console.log("执行账外")
//账外 //账外
await this.fetchMerchandiseNewsZW() await this.fetchMerchandiseNewsZW()
} else { }else {
// console.log("执行总库") // console.log("执行总库")
//总库 //总库
await this.fetchMerchandiseNews() await this.fetchMerchandiseNews()
} }
if (this.isOffice == 1) {
//总库
await this.fetchMerchandiseNews()
}
}, },
//核算属性切换 //核算属性切换
async isMaterialType(val) { async isMaterialType(val) {
@ -560,7 +564,7 @@
this.accountingAttributesVal = val this.accountingAttributesVal = val
this.hiegs = false this.hiegs = false
this.isabled = false this.isabled = false
if (this.deliveryType !== 1 ) { if (this.deliveryType !== 1) {
// console.log("执行账外") // console.log("执行账外")
//账外 //账外
await this.fetchMerchandiseNewsZW() await this.fetchMerchandiseNewsZW()
@ -574,7 +578,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") {
@ -611,18 +615,18 @@
// 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.column.key == 'equipment' && isMA && record.row.materialGroup !== this.materialGroupId) { if (record.column.key == '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') {
//账外 //账外
await this.fetchMerchandiseNewsZW(record.row.equipment) await this.fetchMerchandiseNewsZW(record.row.equipment)
} else { } else {
@ -652,7 +656,7 @@
] ]
// console.log("sadf1111") // console.log("sadf1111")
this.$refs.processMaterialsDeliveryList.setValues(values) this.$refs.processMaterialsDeliveryList.setValues(values)
return ; return
} }
}) })
@ -694,18 +698,18 @@
'supplierId': materialName.supplierName, 'supplierId': materialName.supplierName,
'materialPrice': materialName.price, 'materialPrice': materialName.price,
// 'actualSendNumber': materialName.residueNumber, // 'actualSendNumber': materialName.residueNumber,
'repertory': materialName.residueNumber, 'repertory': materialName.residueNumber
// 'materialAmount': materialName.price * materialName.residueNumber // 'materialAmount': materialName.price * materialName.residueNumber
} }
} }
] ]
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.deliveryType) !== 1) { if (parseInt(this.deliveryType) !== 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)
@ -718,7 +722,7 @@
} }
// 根据请发数量计算 // 根据请发数量计算
if (record.column.key == 'pleaseSendNumber' && isMA || record.column.key == 'actualSendNumber' && isMA ) { if (record.column.key == 'pleaseSendNumber' && isMA || record.column.key == 'actualSendNumber' && isMA) {
// console.log("执行了333333333333") // console.log("执行了333333333333")
let res = record.row let res = record.row
let materialName = {} let materialName = {}
@ -829,7 +833,7 @@
let par = { let par = {
delFlag: 0, delFlag: 0,
accountingAttributes: this.accountingAttributesVal, accountingAttributes: this.accountingAttributesVal,
merchandiseNewsId:value merchandiseNewsId: value
} }
this.bigIdMerchandiseNewsList = [] this.bigIdMerchandiseNewsList = []
let qc = [] let qc = []
@ -894,19 +898,19 @@
let par = { let par = {
delFlag: 0, delFlag: 0,
merchandiseNewsId: value, merchandiseNewsId: value,
accountingAttributes: this.accountingAttributesVal, accountingAttributes: this.accountingAttributesVal
} }
let ue = sessionStorage.getItem('USER_INFORMATION') let ue = sessionStorage.getItem('USER_INFORMATION')
let res = JSON.parse(ue) let res = JSON.parse(ue)
let de= { let de = {
id: res.departIds id: res.departIds
} }
let data=await getAction(this.url.queryPageDepare,de) let data = await getAction(this.url.queryPageDepare, de)
// console.log(data.result); // console.log(data.result);
if(data.result.orgType === "3"){ if (data.result.orgType === '3') {
// 查询大品类数据 账外库 // 查询大品类数据 账外库
par.departId = data.result.parentId; par.departId = data.result.parentId
}else{ } else {
// 查询大品类数据 账外库 // 查询大品类数据 账外库
par.departId = res.departIds par.departId = res.departIds
} }
@ -1385,24 +1389,24 @@
this.$emit('close') this.$emit('close')
}, },
/*通过审批*/ /*通过审批*/
async passTask() { async passTask() {
let qing = false; let qing = false
if(!this.actualNumber){ if (!this.actualNumber) {
await this.getAllTable().then(tables => { await this.getAllTable().then(tables => {
return validateFormAndTables(this.form, tables) return validateFormAndTables(this.form, tables)
}).then(allValues => { }).then(allValues => {
let formData = this.classifyIntoFormData(allValues); let formData = this.classifyIntoFormData(allValues)
if(formData.processMaterialsDeliveryListList.length > 0){ if (formData.processMaterialsDeliveryListList.length > 0) {
formData.processMaterialsDeliveryListList.forEach(item => { formData.processMaterialsDeliveryListList.forEach(item => {
if(!item.actualSendNumber){ if (!item.actualSendNumber) {
qing = true; qing = true
} }
}) })
if(qing){ if (qing) {
console.log("============",qing); console.log('============', qing)
this.$message.warning("请填写实发数！！！") this.$message.warning('请填写实发数！！！')
}else{ } else {
let method = 'put' let method = 'put'
httpAction(this.url.edit, formData, method).then((res) => { httpAction(this.url.edit, formData, method).then((res) => {
if (res.success) { if (res.success) {
@ -1416,8 +1420,8 @@
console.log('所有数据========', formData) console.log('所有数据========', formData)
}) })
} }
if(!qing){ if (!qing) {
console.log("============",qing); console.log('============', qing)
this.$emit('passTask') this.$emit('passTask')
} }
@ -1428,7 +1432,7 @@
}, },
/*提交申请*/ /*提交申请*/
applySubmit(e) { applySubmit(e) {
this.getAllTable().then(tables => { this.getAllTable().then(tables => {
return validateFormAndTables(this.form, tables) return validateFormAndTables(this.form, tables)
}).then(allValues => { }).then(allValues => {
@ -1465,7 +1469,7 @@
formData.title = this.processData.description formData.title = this.processData.description
formData.targetLibrary = this.libraryAssociationIdInvisible formData.targetLibrary = this.libraryAssociationIdInvisible
formData.deliveryType = this.deliveryType formData.deliveryType = this.deliveryType
formData.isOffice= this.isOffice formData.isOffice = this.isOffice
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
@ -1480,26 +1484,26 @@
formData.title = this.processData.title formData.title = this.processData.title
formData.processInstanceId = this.processData.id formData.processInstanceId = this.processData.id
} }
if(formData.processMaterialsDeliveryListList.length > 0){ if (formData.processMaterialsDeliveryListList.length > 0) {
let qing = false; let qing = false
formData.processMaterialsDeliveryListList.forEach(item => { formData.processMaterialsDeliveryListList.forEach(item => {
if(!!item.equipment){ if (!!item.equipment) {
if(!item.pleaseSendNumber){ if (!item.pleaseSendNumber) {
qing = true; qing = true
} }
}else { } else {
this.$message.warning("请填写数据！！！") this.$message.warning('请填写数据！！！')
} }
}) })
if(qing){ if (qing) {
this.$message.warning("请填写请发数！！！") this.$message.warning('请填写请发数！！！')
return return
} }
} }
console.log('提交方法', method) console.log('提交方法', method)
if(this.btndisabled === false){ if (this.btndisabled === false) {
this.btndisabled = true this.btndisabled = true
httpAction(url, formData, method).then((res) => { httpAction(url, formData, method).then((res) => {
if (res.success) { if (res.success) {
@ -1557,7 +1561,7 @@
formData.title = this.processData.description formData.title = this.processData.description
formData.targetLibrary = this.libraryAssociationIdInvisible formData.targetLibrary = this.libraryAssociationIdInvisible
formData.deliveryType = this.deliveryType formData.deliveryType = this.deliveryType
formData.isOffice= this.isOffice formData.isOffice = this.isOffice
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
@ -1567,7 +1571,7 @@
method = 'put' method = 'put'
} }
console.log('提交方法', method) console.log('提交方法', method)
if (this.btndisabled === false){ if (this.btndisabled === false) {
this.btndisabled = true this.btndisabled = true
httpAction(url, formData, method).then((res) => { httpAction(url, formData, method).then((res) => {
if (res.success) { if (res.success) {
@ -1602,7 +1606,7 @@
} }
console.log('回显数据', this.data) console.log('回显数据', this.data)
let fieldval = pick(this.data, 'id', 'deliveryType', 'company', 'createTime', 'departId', 'createBy', 'materialType', 'deliveryTime', 'fileId', 'opinion','isOffice') let fieldval = pick(this.data, 'id', 'deliveryType', 'company', 'createTime', 'departId', 'createBy', 'materialType', 'deliveryTime', 'fileId', 'opinion', 'isOffice')
this.$nextTick(() => { this.$nextTick(() => {
this.form.setFieldsValue(fieldval) this.form.setFieldsValue(fieldval)
}) })
@ -1651,9 +1655,9 @@
}] }]
} }
}) })
if(this.actualNumber){ if (this.actualNumber) {
// console.log(item,"==========="); // console.log(item,"===========");
item.actualSendNumber = null; item.actualSendNumber = null
} }
}) })
tab.dataSource = dataSource tab.dataSource = dataSource
@ -1688,35 +1692,35 @@
}, },
popupCallback(company, row, puwwcid) { popupCallback(company, row, puwwcid) {
let res = JSON.parse(row) let res = JSON.parse(row)
if (puwwcid!=null){ if (puwwcid != null) {
let params = {} let params = {}
params.id = puwwcid params.id = puwwcid
this.getAction(this.url.puwwlist, params).then((rest) => { this.getAction(this.url.puwwlist, params).then((rest) => {
if (rest.success) { if (rest.success) {
this.libraryAssociationIdInvisible = rest.result.unit this.libraryAssociationIdInvisible = rest.result.unit
} }
}) })
} }
console.log('获取我的数据', res) console.log('获取我的数据', res)
if (res.orgType!=3){ if (res.orgType != 3) {
let isDepartId=res.departIds; let isDepartId = res.departIds
this.getAction('/officeConfig/queryByDepartId', { this.getAction('/officeConfig/queryByDepartId', {
id: isDepartId id: isDepartId
}).then((res) => { }).then((res) => {
if (res.success) { if (res.success) {
console.log(res.result.length,"***********************************************************") console.log(res.result.length, '***********************************************************')
if (res.result.length!=0){ if (res.result.length != 0) {
this.isOffice=1 this.isOffice = 1
this.deliveryType=2 this.deliveryType = 2
} }
} }
}) })
}else if (res.orgType==3){ } else if (res.orgType == 3) {
this.isOffice=2 this.isOffice = 2
this.deliveryType=2 this.deliveryType = 2
}else { } else {
this.deliveryType=1 this.deliveryType = 1
} }
let param = {} let param = {}
param.createBy = res.username param.createBy = res.username
@ -1757,7 +1761,8 @@
.div_process { .div_process {
margin-top: 30px; margin-top: 30px;
} }
.ant-col-8{
.ant-col-8 {
height: 50px; height: 50px;
} }
</style> </style>
Write Preview
Loading…
Cancel
Save