diff --git a/src/views/activiti/form/ProcessMaterialWarehousing.vue b/src/views/activiti/form/ProcessMaterialWarehousing.vue
index 0437351..fb52482 100644
--- a/src/views/activiti/form/ProcessMaterialWarehousing.vue
+++ b/src/views/activiti/form/ProcessMaterialWarehousing.vue
@@ -6,7 +6,7 @@
+ :isSourceCapital="isSourceCapital" :itemId="itemId"/>
@@ -15,6 +15,9 @@
+
+
+
@@ -23,10 +26,10 @@
import ProcessMaterialWarehousingForm from './ProcessMaterialWarehousingForm'
import historicPictrue from '../historicPictrue'
import historicDetail from '../historicDetail'
-
+ import ProcessMaterialWarehousingStatement from '../../accessrecords/statement/ProcessMaterialWarehousingStatement'
export default {
name: 'ProcessMaterialsReturn',
- components: { ProcessMaterialWarehousingForm, historicPictrue, historicDetail },
+ components: { ProcessMaterialWarehousingForm, historicPictrue, historicDetail ,ProcessMaterialWarehousingStatement},
data() {
return {}
},
@@ -34,10 +37,12 @@
/*流程数据*/
isNew: { type: Boolean, default: false, required: false },
task: { type: Boolean, default: false, required: false },
+ isTable:{type: Boolean, default: false, required: false},
/*采购类型*/
isPlanType: {type: Boolean, default: false, required: false},
/*资金来源*/
isSourceCapital:{type: Boolean, default: false, required: false},
+ itemId:{type:String,default:'',required: false},
processData: {
type: Object,
default: () => {
@@ -61,6 +66,10 @@
required: false
}
},
+ created() {
+ console.log(this.itemId,"this.itemId")
+ this.$route.query.item=this.itemId
+ },
methods: {
afterSub(formData) {
this.$emit('afterSubmit', formData)
diff --git a/src/views/activiti/form/ProcessMaterialsDelivery.vue b/src/views/activiti/form/ProcessMaterialsDelivery.vue
index 4e29f53..f55e93a 100644
--- a/src/views/activiti/form/ProcessMaterialsDelivery.vue
+++ b/src/views/activiti/form/ProcessMaterialsDelivery.vue
@@ -4,7 +4,7 @@
+ @backTask="backTask" @loadData="loadData" :itemId="itemId"/>
@@ -12,6 +12,9 @@
+
+
+
@@ -21,10 +24,10 @@
import ProcessMaterialsDeliveryForm from './ProcessMaterialsDeliveryForm'
import historicPictrue from '../historicPictrue'
import historicDetail from '../historicDetail'
-
+ import ProcessMaterialsDeliveryStatement from '../../accessrecords/statement/ProcessMaterialsDeliveryStatement'
export default {
name: 'ProcessMaterialsDelivery',
- components: { ProcessMaterialsDeliveryForm, historicPictrue, historicDetail },
+ components: { ProcessMaterialsDeliveryForm, historicPictrue, historicDetail,ProcessMaterialsDeliveryStatement },
data() {
return {
delivery: 1,
@@ -36,6 +39,8 @@
/*流程数据*/
isNew: { type: Boolean, default: false, required: false },
task: { type: Boolean, default: false, required: false },
+ isTable:{type: Boolean, default: false, required: false},
+ itemId:{type:String,default:'',required: false},
processData: {
type: Object,
default: () => {
@@ -76,6 +81,10 @@
this.delivery = 2
}
},
+ created() {
+ console.log(this.itemId,"this.itemId")
+ this.$route.query.item=this.itemId
+ },
methods: {
afterSub(formData) {
this.$emit('afterSubmit', formData)
diff --git a/src/views/activiti/form/ProcessUdgetPlan.vue b/src/views/activiti/form/ProcessUdgetPlan.vue
index 97331e8..f92f6d2 100644
--- a/src/views/activiti/form/ProcessUdgetPlan.vue
+++ b/src/views/activiti/form/ProcessUdgetPlan.vue
@@ -4,7 +4,7 @@
+ :isSourceCapital="isSourceCapital" :routePlanName="routePlanName" :itemId="itemId"/>
@@ -13,6 +13,9 @@
+
+
+
")
this.init()
// this.isSourceCapital=true;
// this.isPlanType=true;
diff --git a/src/views/activiti/todoManage.vue b/src/views/activiti/todoManage.vue
index fe94618..e9d3a67 100644
--- a/src/views/activiti/todoManage.vue
+++ b/src/views/activiti/todoManage.vue
@@ -154,6 +154,8 @@
:isSourceCapital="lcModa.isSourceCapital"
:task="true" :hieg="lcModa.hieg"
:routePlanName="lcModa.routePlanName"
+ :isTable="lcModa.isTable"
+ :itemId="lcModa.itemId"
@afterSubmit="afterSub"
@passTask="()=>passTask(lcModa.processData)"
@backTask="()=>backTask(lcModa.processData)" :procInstId="lcModa.procInstId"
@@ -294,7 +296,9 @@
hieg: true,
isSourceCapital: false,
isPlanType: false,
- routePlanName:''
+ routePlanName: '',
+ isTable:'',
+ itemId:''
},
tableName: '',
tableId: '',
@@ -479,6 +483,7 @@
this.lcModa.disabled = true
this.tableName = r.tableName
this.tableId = r.tableId
+ this.lcModa.itemId=r.tableId
//获取是不是第一个审核人和最后一个审核人(第一个审核人和最后一个审核人需要对表单进行操作)
if (r.processName === '预算计划采购流程') {
let userInfo = sessionStorage.getItem('USER_INFORMATION')
@@ -518,7 +523,7 @@
this.lcModa.isSourceCapital = true
this.lcModa.disabled = false
this.lcModa.hieg = false
- this.lcModa.routePlanName=res3.result.name
+ this.lcModa.routePlanName = res3.result.name
}
}
}
@@ -552,6 +557,7 @@
this.lcModa.task = true
this.lcModa.procInstId = r.procInstId
this.lcModa.visible = true
+ this.lcModa.isTable=true;
},
passTask(v) {
console.log(v.procInstId, '33333333333333333')