Browse Source

添加流程进行中可以查看制式表格

dev
long 2 years ago
parent
commit
8af50a6be5
  1. 15
      src/views/activiti/form/ProcessMaterialWarehousing.vue
  2. 15
      src/views/activiti/form/ProcessMaterialsDelivery.vue
  3. 14
      src/views/activiti/form/ProcessUdgetPlan.vue
  4. 1
      src/views/activiti/form/ProcessUdgetPlanForm.vue
  5. 10
      src/views/activiti/todoManage.vue

15
src/views/activiti/form/ProcessMaterialWarehousing.vue

@ -6,7 +6,7 @@
<process-material-warehousing-form :isNew="isNew" :processData="processData" :disabled="disabled" <process-material-warehousing-form :isNew="isNew" :processData="processData" :disabled="disabled"
@afterSubmit="afterSub" @close="close" :task="task" @passTask="passTask" @afterSubmit="afterSub" @close="close" :task="task" @passTask="passTask"
@backTask="backTask" @loadData="loadData" :isPlanType="isPlanType" @backTask="backTask" @loadData="loadData" :isPlanType="isPlanType"
:isSourceCapital="isSourceCapital"/> :isSourceCapital="isSourceCapital" :itemId="itemId"/>
</a-tab-pane> </a-tab-pane>
<a-tab-pane tab="流程节点图" key="2" forceRender> <a-tab-pane tab="流程节点图" key="2" forceRender>
@ -15,6 +15,9 @@
<a-tab-pane tab="审批历史" key="3" forceRender> <a-tab-pane tab="审批历史" key="3" forceRender>
<historic-detail :pictureId="pictureId" :procInstId="procInstId"/> <historic-detail :pictureId="pictureId" :procInstId="procInstId"/>
</a-tab-pane> </a-tab-pane>
<a-tab-pane tab="制式表格" key="4" forceRender v-if="isTable">
<process-material-warehousing-statement :isTable="isTable" :materWared="this.$route.query.item"/>
</a-tab-pane>
</a-tabs> </a-tabs>
</a-card> </a-card>
</template> </template>
@ -23,10 +26,10 @@
import ProcessMaterialWarehousingForm from './ProcessMaterialWarehousingForm' import ProcessMaterialWarehousingForm from './ProcessMaterialWarehousingForm'
import historicPictrue from '../historicPictrue' import historicPictrue from '../historicPictrue'
import historicDetail from '../historicDetail' import historicDetail from '../historicDetail'
import ProcessMaterialWarehousingStatement from '../../accessrecords/statement/ProcessMaterialWarehousingStatement'
export default { export default {
name: 'ProcessMaterialsReturn', name: 'ProcessMaterialsReturn',
components: { ProcessMaterialWarehousingForm, historicPictrue, historicDetail }, components: { ProcessMaterialWarehousingForm, historicPictrue, historicDetail ,ProcessMaterialWarehousingStatement},
data() { data() {
return {} return {}
}, },
@ -34,10 +37,12 @@
/*流程数据*/ /*流程数据*/
isNew: { type: Boolean, default: false, required: false }, isNew: { type: Boolean, default: false, required: false },
task: { 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}, isPlanType: {type: Boolean, default: false, required: false},
/*资金来源*/ /*资金来源*/
isSourceCapital:{type: Boolean, default: false, required: false}, isSourceCapital:{type: Boolean, default: false, required: false},
itemId:{type:String,default:'',required: false},
processData: { processData: {
type: Object, type: Object,
default: () => { default: () => {
@ -61,6 +66,10 @@
required: false required: false
} }
}, },
created() {
console.log(this.itemId,"this.itemId")
this.$route.query.item=this.itemId
},
methods: { methods: {
afterSub(formData) { afterSub(formData) {
this.$emit('afterSubmit', formData) this.$emit('afterSubmit', formData)

15
src/views/activiti/form/ProcessMaterialsDelivery.vue

@ -4,7 +4,7 @@
<a-tab-pane tab="流程正文" key="1" forceRender> <a-tab-pane tab="流程正文" key="1" forceRender>
<process-materials-delivery-form :dianshang="delivery" :isNew="isNew" :hieg="hieg" @delivery="showType" :processData="processData" :disabled="disabled" <process-materials-delivery-form :dianshang="delivery" :isNew="isNew" :hieg="hieg" @delivery="showType" :processData="processData" :disabled="disabled"
@afterSubmit="afterSub" @close="close" :task="task" @passTask="passTask" @afterSubmit="afterSub" @close="close" :task="task" @passTask="passTask"
@backTask="backTask" @loadData="loadData"/> @backTask="backTask" @loadData="loadData" :itemId="itemId"/>
</a-tab-pane> </a-tab-pane>
<a-tab-pane tab="流程节点图" key="2" forceRender> <a-tab-pane tab="流程节点图" key="2" forceRender>
<historic-pictrue :pictureId="pictureId" :procInstId="procInstId"/> <historic-pictrue :pictureId="pictureId" :procInstId="procInstId"/>
@ -12,6 +12,9 @@
<a-tab-pane tab="审批历史" key="3" forceRender> <a-tab-pane tab="审批历史" key="3" forceRender>
<historic-detail :pictureId="pictureId" :procInstId="procInstId"/> <historic-detail :pictureId="pictureId" :procInstId="procInstId"/>
</a-tab-pane> </a-tab-pane>
<a-tab-pane tab="制式表格" key="4" forceRender v-if="isTable">
<ProcessMaterialsDeliveryStatement :isTable="isTable" :materWared="this.$route.query.item"/>
</a-tab-pane>
</a-tabs> </a-tabs>
</a-card> </a-card>
@ -21,10 +24,10 @@
import ProcessMaterialsDeliveryForm from './ProcessMaterialsDeliveryForm' import ProcessMaterialsDeliveryForm from './ProcessMaterialsDeliveryForm'
import historicPictrue from '../historicPictrue' import historicPictrue from '../historicPictrue'
import historicDetail from '../historicDetail' import historicDetail from '../historicDetail'
import ProcessMaterialsDeliveryStatement from '../../accessrecords/statement/ProcessMaterialsDeliveryStatement'
export default { export default {
name: 'ProcessMaterialsDelivery', name: 'ProcessMaterialsDelivery',
components: { ProcessMaterialsDeliveryForm, historicPictrue, historicDetail }, components: { ProcessMaterialsDeliveryForm, historicPictrue, historicDetail,ProcessMaterialsDeliveryStatement },
data() { data() {
return { return {
delivery: 1, delivery: 1,
@ -36,6 +39,8 @@
/*流程数据*/ /*流程数据*/
isNew: { type: Boolean, default: false, required: false }, isNew: { type: Boolean, default: false, required: false },
task: { 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: { processData: {
type: Object, type: Object,
default: () => { default: () => {
@ -76,6 +81,10 @@
this.delivery = 2 this.delivery = 2
} }
}, },
created() {
console.log(this.itemId,"this.itemId")
this.$route.query.item=this.itemId
},
methods: { methods: {
afterSub(formData) { afterSub(formData) {
this.$emit('afterSubmit', formData) this.$emit('afterSubmit', formData)

14
src/views/activiti/form/ProcessUdgetPlan.vue

@ -4,7 +4,7 @@
<a-tabs style="text-align: center"> <a-tabs style="text-align: center">
<a-tab-pane tab="流程正文" key="1" forceRender> <a-tab-pane tab="流程正文" key="1" forceRender>
<process-udget-plan-form :isNew="isNew" :processData="processData" :disabled="disabled" @afterSubmit="afterSub" @close="close" :task="task" @passTask="passTask" @backTask="backTask" :hieg="hieg" @loadData="loadData" :isPlanType="isPlanType" <process-udget-plan-form :isNew="isNew" :processData="processData" :disabled="disabled" @afterSubmit="afterSub" @close="close" :task="task" @passTask="passTask" @backTask="backTask" :hieg="hieg" @loadData="loadData" :isPlanType="isPlanType"
:isSourceCapital="isSourceCapital" :routePlanName="routePlanName"/> :isSourceCapital="isSourceCapital" :routePlanName="routePlanName" :itemId="itemId"/>
</a-tab-pane> </a-tab-pane>
<a-tab-pane tab="流程节点图" key="2" forceRender> <a-tab-pane tab="流程节点图" key="2" forceRender>
@ -13,6 +13,9 @@
<a-tab-pane tab="审批历史" key="3" forceRender> <a-tab-pane tab="审批历史" key="3" forceRender>
<historic-detail :pictureId="pictureId" :procInstId="procInstId"/> <historic-detail :pictureId="pictureId" :procInstId="procInstId"/>
</a-tab-pane> </a-tab-pane>
<a-tab-pane tab="制式表格" key="4" forceRender v-if="isTable">
<ProcessMaterialsPlanList :isTable="isTable" :materWared="this.$route.query.item"/>
</a-tab-pane>
</a-tabs> </a-tabs>
<!-- <a-tabs style="text-align: center"> <!-- <a-tabs style="text-align: center">
@ -35,10 +38,11 @@
import ProcessUdgetPlanForm from './ProcessUdgetPlanForm' import ProcessUdgetPlanForm from './ProcessUdgetPlanForm'
import historicPictrue from '../historicPictrue' import historicPictrue from '../historicPictrue'
import historicDetail from '../historicDetail' import historicDetail from '../historicDetail'
import ProcessMaterialsPlanList from '../../accessrecords/plan/ProcessMaterialsPlanList'
var docxx = require("docx-preview"); var docxx = require("docx-preview");
export default { export default {
name: 'ProcessUdgetPlan', name: 'ProcessUdgetPlan',
components: {ProcessUdgetPlanForm,historicPictrue, historicDetail}, components: {ProcessUdgetPlanForm,historicPictrue, historicDetail,ProcessMaterialsPlanList},
data() { data() {
return { return {
tabKey:2, tabKey:2,
@ -50,11 +54,13 @@
/*流程数据*/ /*流程数据*/
isNew: {type: Boolean, default: false, required: false}, isNew: {type: Boolean, default: false, required: false},
task: {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}, isPlanType: {type: Boolean, default: false, required: false},
/*资金来源*/ /*资金来源*/
isSourceCapital:{type: Boolean, default: false, required: false}, isSourceCapital:{type: Boolean, default: false, required: false},
routePlanName:{type:String,default:'',required: false}, routePlanName:{type:String,default:'',required: false},
itemId:{type:String,default:'',required: false},
processData:{ processData:{
type:Object, type:Object,
default:()=>{return {}}, default:()=>{return {}},
@ -112,6 +118,10 @@
// required: false // required: false
// } // }
// }, // },
created() {
console.log(this.itemId,"this.itemId")
this.$route.query.item=this.itemId
},
methods: { methods: {
afterSub(formData){ afterSub(formData){
this.$emit('afterSubmit',formData) this.$emit('afterSubmit',formData)

1
src/views/activiti/form/ProcessUdgetPlanForm.vue

@ -648,7 +648,6 @@
let userInfo = sessionStorage.getItem('USER_INFORMATION') let userInfo = sessionStorage.getItem('USER_INFORMATION')
// userInfo.company=company; // userInfo.company=company;
if (!this.isNew) { if (!this.isNew) {
console.log(this.routePlanName,"---------------------->")
this.init() this.init()
// this.isSourceCapital=true; // this.isSourceCapital=true;
// this.isPlanType=true; // this.isPlanType=true;

10
src/views/activiti/todoManage.vue

@ -154,6 +154,8 @@
:isSourceCapital="lcModa.isSourceCapital" :isSourceCapital="lcModa.isSourceCapital"
:task="true" :hieg="lcModa.hieg" :task="true" :hieg="lcModa.hieg"
:routePlanName="lcModa.routePlanName" :routePlanName="lcModa.routePlanName"
:isTable="lcModa.isTable"
:itemId="lcModa.itemId"
@afterSubmit="afterSub" @afterSubmit="afterSub"
@passTask="()=>passTask(lcModa.processData)" @passTask="()=>passTask(lcModa.processData)"
@backTask="()=>backTask(lcModa.processData)" :procInstId="lcModa.procInstId" @backTask="()=>backTask(lcModa.processData)" :procInstId="lcModa.procInstId"
@ -294,7 +296,9 @@
hieg: true, hieg: true,
isSourceCapital: false, isSourceCapital: false,
isPlanType: false, isPlanType: false,
routePlanName:'' routePlanName: '',
isTable:'',
itemId:''
}, },
tableName: '', tableName: '',
tableId: '', tableId: '',
@ -479,6 +483,7 @@
this.lcModa.disabled = true this.lcModa.disabled = true
this.tableName = r.tableName this.tableName = r.tableName
this.tableId = r.tableId this.tableId = r.tableId
this.lcModa.itemId=r.tableId
// //
if (r.processName === '预算计划采购流程') { if (r.processName === '预算计划采购流程') {
let userInfo = sessionStorage.getItem('USER_INFORMATION') let userInfo = sessionStorage.getItem('USER_INFORMATION')
@ -518,7 +523,7 @@
this.lcModa.isSourceCapital = true this.lcModa.isSourceCapital = true
this.lcModa.disabled = false this.lcModa.disabled = false
this.lcModa.hieg = 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.task = true
this.lcModa.procInstId = r.procInstId this.lcModa.procInstId = r.procInstId
this.lcModa.visible = true this.lcModa.visible = true
this.lcModa.isTable=true;
}, },
passTask(v) { passTask(v) {
console.log(v.procInstId, '33333333333333333') console.log(v.procInstId, '33333333333333333')

Loading…
Cancel
Save