Browse Source

重新修改申请功能

dev
long 2 years ago
parent
commit
858335e9b1
  1. 7
      src/views/activiti/applyList.vue
  2. 2
      src/views/activiti/form/ProcessMaterialBorrowing.vue
  3. 1
      src/views/activiti/form/ProcessMaterialBorrowingForm.vue
  4. 35
      src/views/activiti/form/ProcessMaterialWarehousing.vue
  5. 35
      src/views/activiti/form/ProcessMaterialWarehousingForm.vue
  6. 38
      src/views/activiti/form/ProcessMaterialsAllot.vue
  7. 35
      src/views/activiti/form/ProcessMaterialsAllotForm.vue
  8. 39
      src/views/activiti/form/ProcessMaterialsDelivery.vue
  9. 33
      src/views/activiti/form/ProcessMaterialsDeliveryForm.vue
  10. 34
      src/views/activiti/form/ProcessMaterialsReturn.vue
  11. 4
      src/views/activiti/form/ProcessMaterialsReturnForm.vue
  12. 36
      src/views/activiti/form/ProcessPermissionAuthorization.vue
  13. 35
      src/views/activiti/form/ProcessPermissionAuthorizationForm.vue
  14. 36
      src/views/activiti/form/ProcessSmaterialsScrap.vue
  15. 33
      src/views/activiti/form/ProcessSmaterialsScrapForm.vue
  16. 36
      src/views/activiti/form/ProcessSpecialMaterials.vue
  17. 5
      src/views/activiti/form/ProcessSpecialMaterialsForm.vue
  18. 5
      src/views/activiti/form/ProcessUdgetPlan.vue
  19. 43
      src/views/activiti/form/ProcessUdgetPlanForm.vue
  20. 2
      src/views/activiti/form/demoForm.vue

7
src/views/activiti/applyList.vue

@ -156,8 +156,8 @@
<a-modal :title="lcModa.title" v-model="lcModa.visible" :footer="null" :maskClosable="false" width="80%">
<component :disabled="lcModa.disabled" v-if="lcModa.visible" :is="lcModa.formComponent" :hieg ="lcModa.hieg"
:processData="lcModa.processData" :isNew = "lcModa.isNew" :procInstId="lcModa.procInstId" :pictureId="lcModa.pictureId"
@close="lcModa.visible=false,lcModa.disabled = false"></component>
<!-- @afterSubmit="afterSub"-->
@afterSubmit="afterSub" @loadData="reloadData" @close="lcModa.visible=false,lcModa.disabled = false"></component>
<!-- -->
</a-modal>
<!--提交申请表单-->
<a-modal title="提交申请" v-model="modalVisible" :mask-closable="false" :width="500" :footer="null">
@ -584,6 +584,9 @@
this.lcModa.visible = false;
this.$message.success("操作成功!请前往我的申请列表提交审批!")
},
reloadData(){
this.loadData();
}
}
}
</script>

2
src/views/activiti/form/ProcessMaterialBorrowing.vue

@ -3,7 +3,7 @@
<a-tabs>
<a-tab-pane tab="流程正文" key="1" forceRender>
<process-material-borrowing-form :isNew="isNew" :processData="processData" :disabled="disabled" @afterSubmit="afterSub" @close="close" :task="task" @passTask="passTask" @backTask="backTask"/>
<process-material-borrowing-form :isNew="isNew" :processData="processData" :disabled="disabled" @afterSubmit="afterSub" @close="close" :task="task" @passTask="passTask" @backTask="backTask" @loaddata="loaddata"/>
</a-tab-pane>
<a-tab-pane tab="流程节点图" key="2" forceRender>

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

@ -319,6 +319,7 @@
init(){
this.btndisabled = true;
var r = this.processData;
this.getAssignees(r);
this.getAction(this.url.getForm,{
tableId:r.tableId,
tableName:r.tableName,

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

@ -3,7 +3,9 @@
<a-tabs>
<a-tab-pane tab="流程正文" key="1" forceRender>
<process-material-warehousing-form :isNew="isNew" :processData="processData" :disabled="disabled" @afterSubmit="afterSub" @close="close" :task="task" @passTask="passTask" @backTask="backTask"/>
<process-material-warehousing-form :isNew="isNew" :processData="processData" :disabled="disabled"
@afterSubmit="afterSub" @close="close" :task="task" @passTask="passTask"
@backTask="backTask" @loadData="loadData"/>
</a-tab-pane>
<a-tab-pane tab="流程节点图" key="2" forceRender>
@ -20,21 +22,23 @@
import ProcessMaterialWarehousingForm from './ProcessMaterialWarehousingForm'
import historicPictrue from '../historicPictrue'
import historicDetail from '../historicDetail'
export default {
name: 'ProcessMaterialsReturn',
components: {ProcessMaterialWarehousingForm,historicPictrue, historicDetail},
components: { ProcessMaterialWarehousingForm, historicPictrue, historicDetail },
data() {
return {
}
return {}
},
props: {
/*流程数据*/
isNew: {type: Boolean, default: false, required: false},
task: {type: Boolean, default: false, required: false},
processData:{
type:Object,
default:()=>{return {}},
required:false
isNew: { type: Boolean, default: false, required: false },
task: { type: Boolean, default: false, required: false },
processData: {
type: Object,
default: () => {
return {}
},
required: false
},
pictureId: {
type: String,
@ -52,9 +56,9 @@
required: false
}
},
methods: {
afterSub(formData){
this.$emit('afterSubmit',formData)
methods: {
afterSub(formData) {
this.$emit('afterSubmit', formData)
},
close() {
//todo
@ -68,7 +72,10 @@
backTask() {
this.$emit('backTask')
},
},
loadData() {
this.$emit('loadData')
}
}
}
</script>

35
src/views/activiti/form/ProcessMaterialWarehousingForm.vue

@ -306,12 +306,14 @@ import JSelectUserByDep from '@/components/jeecgbiz/JSelectUserByDep'
queryById: "/hy/processMaterialWarehousing/queryById",
list: "/hy/processUdgetPlan/queryProcessUdgetPlanMaterialByMainIds",
puwwlist: "/unitwaste/processUnitWasteWarehouseCode/queryById",
getFirstNode:'/actProcessIns/getFirstNode',
processMaterialWarehousingList: {
list: '/hy/processMaterialWarehousing/queryProcessMaterialWarehousingListByMainId'
},
},
btndisabled: false,
describes:'',
assignees:'',
validatorRules: {
// 'blur'
processUdgetPlanId: {rules: [{ required: true, message: '关联预算流程不能为空!' }]},
@ -411,7 +413,8 @@ import JSelectUserByDep from '@/components/jeecgbiz/JSelectUserByDep'
/*回显数据*/
init() {
this.btndisabled = true
var r = this.processData
var r = this.processData;
this.getAssignees(r);
this.getAction(this.url.queryById, {
id: r.tableId
}).then((res) => {
@ -469,13 +472,24 @@ import JSelectUserByDep from '@/components/jeecgbiz/JSelectUserByDep'
let method = 'post'
if (!this.isNew) {
url = this.url.editWarehousingApply
method = 'put'
method = 'put';
formData.assignees=this.assignees
formData.tableName = this.processData.tableName;
formData.procDefId = this.processData.procDefId;
formData.procDeTitle = this.processData.processName;
formData.title=this.processData.title;
formData.processInstanceId=this.processData.id;
if (!this.assignees){
this.$message.error('审批节点未分配候选审批人员,请联系管理员!')
return;
}
}
this.btndisabled = true
httpAction(url,formData,method).then((res)=>{
if (res.success){
this.$message.success("提交申请成功!")
this.$message.success('提交申请成功!')
//todo
this.$emit('loadData')
this.close();
}else {
this.$message.error(res.message)
@ -634,6 +648,21 @@ import JSelectUserByDep from '@/components/jeecgbiz/JSelectUserByDep'
this.form.setFieldsValue(fieldval)
})
})
},
getAssignees(v){
getAction(this.url.getFirstNode,{procDefId:v.procDefId,tableId:v.tableId,tableName:v.tableName}).then(res => {
if (res.success) {
if (res.result.users && res.result.users.length > 0) {
//
let ids = [];
res.result.users.forEach(e => {
ids.push(e.username);
});
this.assignees = ids.join(",");
}
}
});
}
}

38
src/views/activiti/form/ProcessMaterialsAllot.vue

@ -3,11 +3,13 @@
<a-tabs>
<a-tab-pane tab="流程正文" key="1" forceRender>
<process-materials-allot-form :isNew="isNew" :processData="processData" :disabled="disabled" @afterSubmit="afterSub" @close="close" :task="task" @passTask="passTask" @backTask="backTask"/>
<process-materials-allot-form :isNew="isNew" :processData="processData" :disabled="disabled"
@afterSubmit="afterSub" @close="close" :task="task" @passTask="passTask"
@backTask="backTask" @loadData="loadData"/>
</a-tab-pane>
<a-tab-pane tab="流程节点图" key="2" forceRender>
<historic-pictrue :pictureId="pictureId" :procInstId="procInstId" />
<historic-pictrue :pictureId="pictureId" :procInstId="procInstId"/>
</a-tab-pane>
<a-tab-pane tab="审批历史" key="3" forceRender>
<historic-detail :pictureId="pictureId" :procInstId="procInstId"/>
@ -20,22 +22,23 @@
import ProcessMaterialsAllotForm from './ProcessMaterialsAllotForm'
import historicPictrue from '../historicPictrue'
import historicDetail from '../historicDetail'
export default {
name: 'ProcessMaterialsAllot',
components: {ProcessMaterialsAllotForm,historicPictrue, historicDetail},
components: { ProcessMaterialsAllotForm, historicPictrue, historicDetail },
data() {
return {
}
return {}
},
props: {
/*流程数据*/
isNew: {type: Boolean, default: false, required: false},
task: {type: Boolean, default: false, required: false},
processData:{
type:Object,
default:()=>{return {}},
required:false
isNew: { type: Boolean, default: false, required: false },
task: { type: Boolean, default: false, required: false },
processData: {
type: Object,
default: () => {
return {}
},
required: false
},
pictureId: {
type: String,
@ -53,9 +56,9 @@
required: false
}
},
methods: {
afterSub(formData){
this.$emit('afterSubmit',formData)
methods: {
afterSub(formData) {
this.$emit('afterSubmit', formData)
},
close() {
//todo
@ -69,7 +72,10 @@
backTask() {
this.$emit('backTask')
},
},
loadData() {
this.$emit('loadData')
}
}
}
</script>

35
src/views/activiti/form/ProcessMaterialsAllotForm.vue

@ -291,12 +291,14 @@
merchandiseNewsList: '/wastematerials/processWasteMaterials/merchandiseNewsName',
unitWasteNameUrl: '/unitwaste/processUnitWasteWarehouseCode/unitWasteName',
puwwlistByuntil:'/unitwaste/processUnitWasteWarehouseCode/list',
getFirstNode:'/actProcessIns/getFirstNode',
processMaterialsAllotList: {
list: '/hy/processMaterialsAllot/queryProcessMaterialsAllotListByMainId'
}
},
btndisabled: false,
describes:'',
assignees:'',
validatorRules: {
// 'blur'
materialType: { rules: [{ required: true, message: '请选择物资类型!' }] },
@ -596,7 +598,8 @@
/*回显数据*/
init() {
this.btndisabled = true
var r = this.processData
var r = this.processData;
this.getAssignees(r);
// console.log("2323232323232323232323232323232323232323",r)
this.getAction(this.url.queryById, {
id: r.tableId,
@ -665,14 +668,25 @@
let method = 'post'
if (!this.isNew) {
url = this.url.editAlloApply
method = 'put'
method = 'put';
formData.assignees=this.assignees
formData.tableName = this.processData.tableName;
formData.procDefId = this.processData.procDefId;
formData.procDeTitle = this.processData.processName;
formData.title=this.processData.title;
formData.processInstanceId=this.processData.id;
if (!this.assignees){
this.$message.error('审批节点未分配候选审批人员,请联系管理员!')
return;
}
}
console.log('提交方法', method)
this.btndisabled = true
httpAction(url,formData,method).then((res)=>{
if (res.success){
this.$message.success("提交申请成功!")
this.$message.success('提交申请成功!')
//todo
this.$emit('loadData')
this.close();
}else {
this.$message.error(res.message)
@ -821,6 +835,21 @@
this.$nextTick(() => {
this.form.setFieldsValue(fieldval)
})
},
getAssignees(v){
getAction(this.url.getFirstNode,{procDefId:v.procDefId,tableId:v.tableId,tableName:v.tableName}).then(res => {
if (res.success) {
if (res.result.users && res.result.users.length > 0) {
//
let ids = [];
res.result.users.forEach(e => {
ids.push(e.username);
});
this.assignees = ids.join(",");
}
}
});
}
}

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

@ -1,13 +1,15 @@
<template>
<a-card :bordered="false">
<a-tabs style="text-align: center">
<a-tabs style="text-align: center">
<a-tab-pane tab="流程正文" key="1" forceRender>
<process-materials-delivery-form :isNew="isNew" :hieg="hieg" :processData="processData" :disabled="disabled" @afterSubmit="afterSub" @close="close" :task="task" @passTask="passTask" @backTask="backTask"/>
<process-materials-delivery-form :isNew="isNew" :hieg="hieg" :processData="processData" :disabled="disabled"
@afterSubmit="afterSub" @close="close" :task="task" @passTask="passTask"
@backTask="backTask" @loadData="loadData"/>
</a-tab-pane>
<a-tab-pane tab="流程节点图" key="2" forceRender>
<historic-pictrue :pictureId="pictureId" :procInstId="procInstId" />
<historic-pictrue :pictureId="pictureId" :procInstId="procInstId"/>
</a-tab-pane>
<a-tab-pane tab="审批历史" key="3" forceRender>
<historic-detail :pictureId="pictureId" :procInstId="procInstId"/>
@ -20,21 +22,23 @@
import ProcessMaterialsDeliveryForm from './ProcessMaterialsDeliveryForm'
import historicPictrue from '../historicPictrue'
import historicDetail from '../historicDetail'
export default {
name: 'ProcessMaterialsDelivery',
components: {ProcessMaterialsDeliveryForm,historicPictrue, historicDetail},
components: { ProcessMaterialsDeliveryForm, historicPictrue, historicDetail },
data() {
return {
}
return {}
},
props: {
/*流程数据*/
isNew: {type: Boolean, default: false, required: false},
task: {type: Boolean, default: false, required: false},
processData:{
type:Object,
default:()=>{return {}},
required:false
isNew: { type: Boolean, default: false, required: false },
task: { type: Boolean, default: false, required: false },
processData: {
type: Object,
default: () => {
return {}
},
required: false
},
pictureId: {
type: String,
@ -57,9 +61,9 @@
required: false
}
},
methods: {
afterSub(formData){
this.$emit('afterSubmit',formData)
methods: {
afterSub(formData) {
this.$emit('afterSubmit', formData)
},
close() {
//todo
@ -73,7 +77,10 @@
backTask() {
this.$emit('backTask')
},
},
loadData() {
this.$emit('loadData')
}
}
}
</script>

33
src/views/activiti/form/ProcessMaterialsDeliveryForm.vue

@ -323,12 +323,14 @@
wasteMaterialsList: '/wastematerials/processWasteMaterials/merchandiseNewsName', //
puwwlist: '/unitwaste/processUnitWasteWarehouseCode/queryById',
unitWasteWarehouseList: '/unitwaste/processUnitWasteWarehouseCode/queryById', //
getFirstNode:'/actProcessIns/getFirstNode',
processMaterialsDeliveryList: {
list: '/hy/processMaterialsDelivery/queryProcessMaterialsDeliveryListByMainId'
}
},
btndisabled: false,
describes: '',
assignees:'',
validatorRules: {
// 'blur'
materialType: { rules: [{ required: true, message: '请选择物资类型!' }] },
@ -1070,7 +1072,8 @@
/*回显数据*/
init() {
this.btndisabled = true
var r = this.processData
var r = this.processData;
this.getAssignees(r);
this.getAction(this.url.queryById, {
id: r.tableId
}).then((res) => {
@ -1142,7 +1145,17 @@
let method = 'post'
if (!this.isNew) {
url = this.url.editDeliveryApply
method = 'put'
method = 'put';
formData.assignees=this.assignees
formData.tableName = this.processData.tableName;
formData.procDefId = this.processData.procDefId;
formData.procDeTitle = this.processData.processName;
formData.title=this.processData.title;
formData.processInstanceId=this.processData.id;
if (!this.assignees){
this.$message.error('审批节点未分配候选审批人员,请联系管理员!')
return;
}
}
console.log('提交方法', method)
this.btndisabled = true
@ -1150,6 +1163,7 @@
if (res.success) {
this.$message.success('提交申请成功!')
//todo
this.$emit('loadData')
this.close();
} else {
this.$message.error(res.message)
@ -1293,6 +1307,21 @@
this.$nextTick(() => {
this.form.setFieldsValue(fieldval)
})
},
getAssignees(v){
getAction(this.url.getFirstNode,{procDefId:v.procDefId,tableId:v.tableId,tableName:v.tableName}).then(res => {
if (res.success) {
if (res.result.users && res.result.users.length > 0) {
//
let ids = [];
res.result.users.forEach(e => {
ids.push(e.username);
});
this.assignees = ids.join(",");
}
}
});
}
}

34
src/views/activiti/form/ProcessMaterialsReturn.vue

@ -3,11 +3,13 @@
<a-tabs>
<a-tab-pane tab="流程正文" key="1" forceRender>
<process-materials-return-form :isNew="isNew" :processData="processData" :disabled="disabled" @afterSubmit="afterSub" @close="close" :task="task" @passTask="passTask" @backTask="backTask"/>
<process-materials-return-form :isNew="isNew" :processData="processData" :disabled="disabled"
@afterSubmit="afterSub" @close="close" :task="task" @passTask="passTask"
@backTask="backTask" @loadData="loadData"/>
</a-tab-pane>
<a-tab-pane tab="流程节点图" key="2" forceRender>
<historic-pictrue :pictureId="pictureId" :procInstId="procInstId" />
<historic-pictrue :pictureId="pictureId" :procInstId="procInstId"/>
</a-tab-pane>
<a-tab-pane tab="审批历史" key="3" forceRender>
<historic-detail :pictureId="pictureId" :procInstId="procInstId"/>
@ -20,21 +22,24 @@
import ProcessMaterialsReturnForm from './ProcessMaterialsReturnForm'
import historicPictrue from '../historicPictrue'
import historicDetail from '../historicDetail'
export default {
name: 'ProcessMaterialsReturn',
components: {ProcessMaterialsReturnForm,historicPictrue, historicDetail},
components: { ProcessMaterialsReturnForm, historicPictrue, historicDetail },
data() {
return {
isNew:''
isNew: ''
}
},
props: {
/*流程数据*/
isNew: {type: Boolean, default: false, required: false},
processData:{
type:Object,
default:()=>{return {}},
required:false
isNew: { type: Boolean, default: false, required: false },
processData: {
type: Object,
default: () => {
return {}
},
required: false
},
pictureId: {
type: String,
@ -52,9 +57,9 @@
required: false
}
},
methods: {
afterSub(formData){
this.$emit('afterSubmit',formData)
methods: {
afterSub(formData) {
this.$emit('afterSubmit', formData)
},
close() {
//todo
@ -68,7 +73,10 @@
backTask() {
this.$emit('backTask')
},
},
loadData() {
this.$emit('loadData')
}
}
}
</script>

4
src/views/activiti/form/ProcessMaterialsReturnForm.vue

@ -247,6 +247,7 @@
},
},
btndisabled: false,
assignees:'',
validatorRules: {
// 'blur'
materialType: {rules: [{ required: true, message: '请选择物资类型!' }]},
@ -320,7 +321,8 @@
/*回显数据*/
init(){
this.btndisabled = true;
var r = this.processData;
var r = this.processData;
this.getAssignees(r);
this.getAction(this.url.getForm,{
tableId:r.tableId,
tableName:r.tableName,

36
src/views/activiti/form/ProcessPermissionAuthorization.vue

@ -3,11 +3,13 @@
<a-tabs>
<a-tab-pane tab="流程正文" key="1" forceRender>
<process-permission-authorization-form :isNew="isNew" :processData="processData" :disabled="disabled" @afterSubmit="afterSub" @close="close" :task="task" @passTask="passTask" @backTask="backTask"/>
<process-permission-authorization-form :isNew="isNew" :processData="processData" :disabled="disabled"
@afterSubmit="afterSub" @close="close" :task="task" @passTask="passTask"
@backTask="backTask" @loadData="loadData"/>
</a-tab-pane>
<a-tab-pane tab="流程节点图" key="2" forceRender>
<historic-pictrue :pictureId="pictureId" :procInstId="procInstId" />
<historic-pictrue :pictureId="pictureId" :procInstId="procInstId"/>
</a-tab-pane>
<a-tab-pane tab="审批历史" key="3" forceRender>
<historic-detail :pictureId="pictureId" :procInstId="procInstId"/>
@ -20,22 +22,25 @@
import ProcessPermissionAuthorizationForm from './ProcessPermissionAuthorizationForm'
import historicPictrue from '../historicPictrue'
import historicDetail from '../historicDetail'
export default {
name: 'ProcessPermissionAuthorization',
components: {ProcessPermissionAuthorizationForm,historicPictrue, historicDetail},
components: { ProcessPermissionAuthorizationForm, historicPictrue, historicDetail },
data() {
return {
isNew:''
isNew: ''
}
},
props: {
/*流程数据*/
isNew: {type: Boolean, default: false, required: false},
task: {type: Boolean, default: false, required: false},
processData:{
type:Object,
default:()=>{return {}},
required:false
isNew: { type: Boolean, default: false, required: false },
task: { type: Boolean, default: false, required: false },
processData: {
type: Object,
default: () => {
return {}
},
required: false
},
pictureId: {
type: String,
@ -53,9 +58,9 @@
required: false
}
},
methods: {
afterSub(formData){
this.$emit('afterSubmit',formData)
methods: {
afterSub(formData) {
this.$emit('afterSubmit', formData)
},
close() {
//todo
@ -69,7 +74,10 @@
backTask() {
this.$emit('backTask')
},
},
loadData() {
this.$emit('loadData')
}
}
}
</script>

35
src/views/activiti/form/ProcessPermissionAuthorizationForm.vue

@ -177,9 +177,11 @@
edit: "/hy/processPermissionAuthorization/edit",
addAuthorizationApply: "/hy/processPermissionAuthorization/addAuthorizationApply",
editAuthorizationApply: "/hy/processPermissionAuthorization/editAuthorizationApply",
getFirstNode:'/actProcessIns/getFirstNode',
queryById: "/hy/processPermissionAuthorization/queryById"
},
btndisabled: false,
assignees:'',
validatorRules: {
// 'blur'
authorizedPerson: {rules: [{ required: true, message: '被授权人不能为空!' }]},
@ -223,7 +225,8 @@
/*回显数据*/
init(){
this.btndisabled = true;
var r = this.processData;
var r = this.processData;
this.getAssignees(r);
this.getAction(this.url.queryById,{
id:r.tableId
}).then((res)=>{
@ -319,14 +322,25 @@
if (!this.isNew){
url = this.url.editAuthorizationApply;
method='put';
formData.assignees=this.assignees
formData.tableName = this.processData.tableName;
formData.procDefId = this.processData.procDefId;
formData.procDeTitle = this.processData.processName;
formData.title=this.processData.title;
formData.processInstanceId=this.processData.id;
if (!this.assignees){
this.$message.error('审批节点未分配候选审批人员,请联系管理员!')
return;
}
}
this.btndisabled = true;
console.log(formData,'表单数据')
httpAction(url,formData,method).then((res)=>{
if (res.success){
//this.$message.success("")
this.$message.success('提交申请成功!')
//todo
this.$emit('afterSubmit',formData)
this.$emit('loadData')
this.close();
}else {
this.$message.error(res.message)
}
@ -445,6 +459,21 @@
}
},
getAssignees(v){
getAction(this.url.getFirstNode,{procDefId:v.procDefId,tableId:v.tableId,tableName:v.tableName}).then(res => {
if (res.success) {
if (res.result.users && res.result.users.length > 0) {
//
let ids = [];
res.result.users.forEach(e => {
ids.push(e.username);
});
this.assignees = ids.join(",");
}
}
});
}
}
}
</script>

36
src/views/activiti/form/ProcessSmaterialsScrap.vue

@ -3,11 +3,13 @@
<a-tabs>
<a-tab-pane tab="流程正文" key="1" forceRender>
<process-smaterials-scrap-form :isNew="isNew" :processData="processData" :disabled="disabled" @afterSubmit="afterSub" @close="close" :task="task" @passTask="passTask" @backTask="backTask"/>
<process-smaterials-scrap-form :isNew="isNew" :processData="processData" :disabled="disabled"
@afterSubmit="afterSub" @close="close" :task="task" @passTask="passTask"
@backTask="backTask" @loadData="loadData"/>
</a-tab-pane>
<a-tab-pane tab="流程节点图" key="2" forceRender>
<historic-pictrue :pictureId="pictureId" :procInstId="procInstId" />
<historic-pictrue :pictureId="pictureId" :procInstId="procInstId"/>
</a-tab-pane>
<a-tab-pane tab="审批历史" key="3" forceRender>
<historic-detail :pictureId="pictureId" :procInstId="procInstId"/>
@ -20,22 +22,25 @@
import ProcessSmaterialsScrapForm from './ProcessSmaterialsScrapForm'
import historicPictrue from '../historicPictrue'
import historicDetail from '../historicDetail'
export default {
name: 'ProcessSmaterialsScrap',
components: {ProcessSmaterialsScrapForm,historicPictrue, historicDetail},
components: { ProcessSmaterialsScrapForm, historicPictrue, historicDetail },
data() {
return {
isNew:''
isNew: ''
}
},
props: {
/*流程数据*/
isNew: {type: Boolean, default: false, required: false},
task: {type: Boolean, default: false, required: false},
processData:{
type:Object,
default:()=>{return {}},
required:false
isNew: { type: Boolean, default: false, required: false },
task: { type: Boolean, default: false, required: false },
processData: {
type: Object,
default: () => {
return {}
},
required: false
},
pictureId: {
type: String,
@ -53,9 +58,9 @@
required: false
}
},
methods: {
afterSub(formData){
this.$emit('afterSubmit',formData)
methods: {
afterSub(formData) {
this.$emit('afterSubmit', formData)
},
close() {
//todo
@ -69,7 +74,10 @@
backTask() {
this.$emit('backTask')
},
},
loadData() {
this.$emit('loadData')
}
}
}
</script>

33
src/views/activiti/form/ProcessSmaterialsScrapForm.vue

@ -272,11 +272,13 @@
editScrapApply: '/hy/processSmaterialsScrap/editScrapApply',
queryById: '/hy/processSmaterialsScrap/queryById',
list:"/hy/processMaterialsDelivery/queryProcessMaterialsDeliveryListByMainIds",
getFirstNode:'/actProcessIns/getFirstNode',
processSmaterialsScrapList: {
list: '/hy/processSmaterialsScrap/queryProcessSmaterialsScrapListByMainId'
}
},
btndisabled: false,
assignees:'',
validatorRules: {
// 'blur'
processOutflowId: {rules: [{ required: true, message: '关联出库流程不能为空!' }]},
@ -383,7 +385,8 @@
/*回显数据*/
init() {
this.btndisabled = true
var r = this.processData
var r = this.processData;
this.getAssignees(r);
this.getAction(this.url.queryById, {
id: r.tableId
}).then((res) => {
@ -456,7 +459,17 @@
let method = 'post'
if (!this.isNew) {
url = this.url.editScrapApply
method = 'put'
method = 'put';
formData.assignees=this.assignees
formData.tableName = this.processData.tableName;
formData.procDefId = this.processData.procDefId;
formData.procDeTitle = this.processData.processName;
formData.title=this.processData.title;
formData.processInstanceId=this.processData.id;
if (!this.assignees){
this.$message.error('审批节点未分配候选审批人员,请联系管理员!')
return;
}
}
console.log('提交方法', method)
this.btndisabled = true
@ -464,6 +477,7 @@
if (res.success) {
this.$message.success('提交申请成功!')
//todo
this.$emit('loadData')
this.close();
} else {
this.$message.error(res.message)
@ -596,6 +610,21 @@
this.$nextTick(() => {
this.form.setFieldsValue(fieldval)
})
},
getAssignees(v){
getAction(this.url.getFirstNode,{procDefId:v.procDefId,tableId:v.tableId,tableName:v.tableName}).then(res => {
if (res.success) {
if (res.result.users && res.result.users.length > 0) {
//
let ids = [];
res.result.users.forEach(e => {
ids.push(e.username);
});
this.assignees = ids.join(",");
}
}
});
}
}

36
src/views/activiti/form/ProcessSpecialMaterials.vue

@ -3,11 +3,13 @@
<a-tabs>
<a-tab-pane tab="流程正文" key="1" forceRender>
<process-smaterials-scrap-form :isNew="isNew" :processData="processData" :disabled="disabled" @afterSubmit="afterSub" @close="close" :task="task" @passTask="passTask" @backTask="backTask"/>
<process-smaterials-scrap-form :isNew="isNew" :processData="processData" :disabled="disabled"
@afterSubmit="afterSub" @close="close" :task="task" @passTask="passTask"
@backTask="backTask" @loadData="loadData"/>
</a-tab-pane>
<a-tab-pane tab="流程节点图" key="2" forceRender>
<historic-pictrue :pictureId="pictureId" :procInstId="procInstId" />
<historic-pictrue :pictureId="pictureId" :procInstId="procInstId"/>
</a-tab-pane>
<a-tab-pane tab="审批历史" key="3" forceRender>
<historic-detail :pictureId="pictureId" :procInstId="procInstId"/>
@ -20,22 +22,25 @@
import ProcessSmaterialsScrapForm from './ProcessSmaterialsScrapForm'
import historicPictrue from '../historicPictrue'
import historicDetail from '../historicDetail'
export default {
name: 'ProcessSpecialMaterials',
components: {ProcessSmaterialsScrapForm,historicPictrue, historicDetail},
components: { ProcessSmaterialsScrapForm, historicPictrue, historicDetail },
data() {
return {
isNew:''
isNew: ''
}
},
props: {
/*流程数据*/
isNew: {type: Boolean, default: false, required: false},
task: {type: Boolean, default: false, required: false},
processData:{
type:Object,
default:()=>{return {}},
required:false
isNew: { type: Boolean, default: false, required: false },
task: { type: Boolean, default: false, required: false },
processData: {
type: Object,
default: () => {
return {}
},
required: false
},
pictureId: {
type: String,
@ -53,9 +58,9 @@
required: false
}
},
methods: {
afterSub(formData){
this.$emit('afterSubmit',formData)
methods: {
afterSub(formData) {
this.$emit('afterSubmit', formData)
},
close() {
//todo
@ -69,7 +74,10 @@
backTask() {
this.$emit('backTask')
},
},
loadData() {
this.$emit('loadData')
}
}
}
</script>

5
src/views/activiti/form/ProcessSpecialMaterialsForm.vue

@ -240,6 +240,7 @@
},
},
btndisabled: false,
assignees:'',
//
validatorRules: {
// 'blur'
@ -314,7 +315,9 @@
/*回显数据*/
init(){
this.btndisabled = true;
var r = this.processData;
var r = this.processData;
this.getAssignees(r);
this.getAction(this.url.getForm,{
id:r.tableId
}).then((res)=>{

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

@ -3,7 +3,7 @@
<a-tabs style="text-align: center">
<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"/>
<process-udget-plan-form :isNew="isNew" :processData="processData" :disabled="disabled" @afterSubmit="afterSub" @close="close" :task="task" @passTask="passTask" @backTask="backTask" :hieg="hieg" @loadData="loadData"/>
</a-tab-pane>
<a-tab-pane tab="流程节点图" key="2" forceRender>
@ -104,6 +104,9 @@
backTask() {
this.$emit('backTask')
},
loadData(){
this.$emit('loadData')
}
},
}
</script>

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

@ -250,6 +250,7 @@
bigIdRakeList:[],
materialPrice:0,
materialAmount:0,
getMaterialAmount:0,
describes:'',
hiegs:true,
historyBigId:[],
@ -506,12 +507,14 @@
descriptionRake: "/description/processDescription/descriptionName",
merchandiseNewsList: "/merchandisenews/processMerchandiseNews/merchandiseNewsList",
historyUrl: '/suppliesstronger/processSuppliesStronger/list',
getFirstNode:'/actProcessIns/getFirstNode',
processUdgetPlanMaterial: {
list: '/hy/processUdgetPlan/queryProcessUdgetPlanMaterialByMainId'
}
},
btndisabled: false,
isShowInput: '',
assignees:'',
//
validatorRules: {
// 'blur'
@ -986,6 +989,7 @@
init(){
this.btndisabled = true;
var r = this.processData;
this.getAssignees(r);
this.getAction(this.url.queryById,{
id:r.tableId
}).then((res)=>{
@ -1026,29 +1030,25 @@
throw this.throwNotFunction('classifyIntoFormData')
}
let formData = this.classifyIntoFormData(allValues)
//
for (let i = 0; i < formData.processUdgetPlanMaterialList.length; i++) {
this.materialAmount=this.materialAmount+ formData.processUdgetPlanMaterialList[i].materialAmount;
if (i==0){
this.describes=formData.processUdgetPlanMaterialList[i].materialName
}else {
this.describes=this.describes+"---"+formData.processUdgetPlanMaterialList[i].materialName
}
}
formData.fileId = getStringArry(formData.fileId)
formData.materialPrice=this.materialPrice;
formData.materialAmount=this.materialAmount;
formData.describes=this.describes;
if (new Date(formData.createTime).getTime()/100>new Date(formData.needTime).getTime()/100){
this.$message.error("需求时间不能小于当前流程发起时间")
return;
}
console.log(this.materialAmount,'采购总价')
console.log(this.opinion,'流程说明')
this.form.validateFields((err, values) => {
if (!err) {
console.log(this.processData,"申请列表传值数据")
formData.procDefId = this.processData.id;
formData.procDeTitle = this.processData.name;
formData.title=this.processData.description;
@ -1058,6 +1058,16 @@
if (!this.isNew){
url = this.url.editFromTableApply;
method='put';
formData.assignees=this.assignees
formData.tableName = this.processData.tableName;
formData.procDefId = this.processData.procDefId;
formData.procDeTitle = this.processData.processName;
formData.title=this.processData.title;
formData.processInstanceId=this.processData.id;
if (!this.assignees){
this.$message.error('审批节点未分配候选审批人员,请联系管理员!')
return;
}
}
this.btndisabled = true;
console.log(formData,'表单数据')
@ -1065,6 +1075,7 @@
if (res.success){
this.$message.success("提交申请成功!")
//todo
this.$emit('loadData')
this.close();
}else {
this.$message.error(res.message)
@ -1157,25 +1168,20 @@
throw this.throwNotFunction('classifyIntoFormData')
}
let formData = this.classifyIntoFormData(allValues)
//
for (let i = 0; i < formData.processUdgetPlanMaterialList.length; i++) {
this.materialAmount=this.materialAmount+ formData.processUdgetPlanMaterialList[i].materialAmount;
if (i==0){
this.describes=formData.processUdgetPlanMaterialList[i].materialName
}else {
this.describes=this.describes+"---"+formData.processUdgetPlanMaterialList[i].materialName
}
}
formData.fileId = getStringArry(formData.fileId)
formData.materialPrice=this.materialPrice;
formData.materialAmount=this.materialAmount;
formData.describes=this.describes;
if (new Date(formData.createTime).getTime()/100>new Date(formData.needTime).getTime()/100){
this.$message.error("需求时间不能小于当前流程发起时间")
return;
}
console.log(this.materialAmount,'采购总价')
console.log(formData,'表单数据')
console.log(this.opinion,'流程说明')
this.form.validateFields((err, values) => {
@ -1207,6 +1213,21 @@
})
},
getAssignees(v){
getAction(this.url.getFirstNode,{procDefId:v.procDefId,tableId:v.tableId,tableName:v.tableName}).then(res => {
if (res.success) {
if (res.result.users && res.result.users.length > 0) {
//
let ids = [];
res.result.users.forEach(e => {
ids.push(e.username);
});
this.assignees = ids.join(",");
}
}
});
}
}
}

2
src/views/activiti/form/demoForm.vue

@ -82,7 +82,7 @@
/*回显数据*/
init(){
this.btndisabled = true;
var r = this.processData;
var r = this.processData;this.getAssignees(r);
this.getAction(this.url.getForm,{
tableId:r.tableId,
tableName:r.tableName,

Loading…
Cancel
Save