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

修改流程人员配置问题

dev
long 2 years ago
parent
e5a2a94ffc
commit
c485ef6452
4 changed files with 96 additions and 42 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      src/components/jeecgbiz/JSelectUserByDep.vue
  2. 104
      src/views/activiti/ProcessModelList.vue
  3. 28
      src/views/activiti/form/ProcessUdgetPlanForm.vue
  4. 4
      src/views/activiti/mixins/activitiMixin.js

2
src/components/jeecgbiz/JSelectUserByDep.vue
Unescape View File

@ -95,8 +95,10 @@
// this.id = idmp.substring(1)
}
// this.$emit("orgCodeTxt",this.orgCodeTxt,this.id)
this.$emit("change", this.userIds)
this.$emit("submitUsers", this.userIds)
}
}
}

104
src/views/activiti/ProcessModelList.vue
Unescape View File

@ -15,7 +15,7 @@
<a-input placeholder="请输入搜索关键词" v-model="queryParam.lckey"></a-input>
</a-form-item>
</a-col>
<a-col :md="6" :sm="8">
<a-col :md="6" :sm="8" v-show="false">
<a-form-item label="是否最新">
<a-switch checkedChildren="是" unCheckedChildren="否" defaultChecked v-model="queryParam.zx"/>
</a-form-item>
@ -123,11 +123,11 @@
<a href="javascript:void(0);" v-if="r.status!=1" @click="editStatus(1,r)" style="color: rgb(144,96,255);">启用</a>
<a href="javascript:void(0);" v-if="r.status==1" @click="editStatus(0,r)" style="color: #cb892d">禁用</a>
<a-divider type="vertical" />
<a href="javascript:void(0);" @click="getNodeData(r)" >节点设置</a>
<a href="javascript:void(0);" @click="getNodeData(r)" >审批人员</a>
<a-divider type="vertical" />
<a href="javascript:void(0);" @click="convertToModel(r)" >转为模型</a>
<br>
<a href="javascript:void(0);" @click="edit(r)">编辑</a> <a-divider type="vertical" />
<!-- <a href="javascript:void(0);" @click="convertToModel(r)" >转为模型</a>-->
<!-- <br>-->
<a href="javascript:void(0);" @click="edit(r)">配置表单</a> <a-divider type="vertical" />
<a href="javascript:void(0);" style="color: red;" @click="remove(r)">删除</a>
@ -148,12 +148,12 @@
<component :is="LcDict" :trigger-change="true" v-decorator="[ 'categoryId', {initialValue:editObj.categoryId, rules: [{ required: true, message: '不能为空' }] },]"
placeholder="请选择流程分类" dictCode="bpm_process_type" ></component>
</a-form-item>
<a-form-item :label-col="labelCol" :wrapper-col="wrapperCol" label="流程类目(app使用)" >
<!-- <a-form-item :label-col="labelCol" :wrapper-col="wrapperCol" label="流程类目(app使用)" >
<j-tree-dict placeholder="请选择流程类目" parentCode="A01"
:trigger-change="true" v-decorator="[ 'typeId', {initialValue:editObj.typeId, rules: [{ required: true, message: '不能为空' }] },]"
>
</j-tree-dict>
</a-form-item>
</a-form-item>-->
<a-form-item :label-col="labelCol" :wrapper-col="wrapperCol" label="关联表单" >
<a-select @change="change_routeName" placeholder="请选择关联表单" :trigger-change="true" v-decorator="[ 'routeName', {initialValue:editObj.routeName, rules: [{ required: true, message: '不能为空' }] },]">
<a-select-option value="">请选择</a-select-option>
@ -163,7 +163,7 @@
</span>
</a-select-option>
</a-select>
<a href="javascrip:void(0)" @click="viewForm()">预览表单</a>
<!--<a href="javascrip:void(0)" @click="viewForm()">预览表单</a>-->
</a-form-item>
<!-- <a-form-item :label-col="labelCol" :wrapper-col="wrapperCol" label="关联打印报表" >
@ -178,9 +178,9 @@
&lt;!&ndash;<a href="javascrip:void(0)" @click="viewForm()">预览表单</a>&ndash;&gt;
</a-form-item>-->
<a-form-item :label-col="labelCol" :wrapper-col="wrapperCol" label="角色授权" >
<!-- <a-form-item :label-col="labelCol" :wrapper-col="wrapperCol" label="角色授权" >
<j-select-role placeholder="不选择则所有人可用" v-decorator="[ 'roles', {initialValue:editObj.roles, rules: []}]"/>
</a-form-item>
</a-form-item>-->
<a-form-item :label-col="labelCol" :wrapper-col="wrapperCol" label="排序" >
<a-input-number v-decorator="[ 'sort', {initialValue:editObj.sort, rules: []}]" placeholder="排序"/>
</a-form-item>
@ -191,7 +191,7 @@
</a-modal>
<!--节点设置-->
<a-modal
title="编辑流程节点" width="900px" :maskClosable="false"
title="编辑审批人员" width="900px" :maskClosable="false"
:confirmLoading="confirmLoading"
:visible="showProcessNodeEdit"
:footer="null"
@ -209,7 +209,8 @@
</a-steps>
</a-col>
<a-col :md="20" :sm="20">
<a-alert message="温馨提示：若流程运行至未分配审批人员的审批节点时，流程将自动中断取消！" banner />
<a-form :form="nodeForm" v-if="showProcessNodeEdit">
<!--<a-alert message="温馨提示：若流程运行至未分配审批人员的审批节点时，流程将自动中断取消！" banner />
<span></span>
<a-form :form="nodeForm" v-if="showProcessNodeEdit">
<a-form-item :label-col="labelCol" :wrapper-col="wrapperCol" label="节点名称" >
@ -220,9 +221,10 @@
</a-form-item>
<a-alert type="info" message="每个节点设置，如有修改都请保存一次，跳转节点后数据不会自动保存！" banner />
<br/>
<a-form-item :label-col="labelCol" :wrapper-col="wrapperCol" label="审批人员" v-show="editNode.type==1">
<a-form-item
:label-col="labelCol" :wrapper-col="wrapperCol" label="审批人员" v-show="editNode.type==1">
<a-checkbox-group @change="spryType" v-model="spryTypes" >
<!-- 0角色 1用户 2部门 3发起人 4发起人的部门负责人-->
&lt;!&ndash; 0角色 1用户 2部门 3发起人 4发起人的部门负责人&ndash;&gt;
<a-checkbox value="0"> 根据角色选择 </a-checkbox>
<a-checkbox value="1"> 直接选择人员 </a-checkbox>
<a-checkbox value="2"> 部门 </a-checkbox>
@ -246,17 +248,17 @@
</a-tooltip>
</a-checkbox>
</a-checkbox-group>
</a-form-item>
</a-checkbox-group>-->
<!--</a-form-item>-->
<!-- 0角色 1用户 2部门 3发起人 4发起人的部门负责人-->
<a-form-item :label-col="labelCol" :wrapper-col="wrapperCol" label="选择角色" v-if="spryTypes.indexOf('0')>-1" >
<!-- <a-form-item :label-col="labelCol" :wrapper-col="wrapperCol" label="选择角色" v-if="spryTypes.indexOf('0')>-1" >
<j-select-role v-model="spry.roleIds"/>
</a-form-item>
<a-form-item :label-col="labelCol" :wrapper-col="wrapperCol" label="选择人员" v-if="spryTypes.indexOf('1')>-1" >
</a-form-item>-->
<a-form-item :label-col="labelCol" :wrapper-col="wrapperCol" label="选择人员" >
<!-- 通过部门选择用户控件 -->
<j-select-user-by-dep v-model="spry.userIds" :multi="true"></j-select-user-by-dep>
<j-select-user-by-dep v-model="spry.userIds" :multi="false" @submitUsers="submitUsers"></j-select-user-by-dep>
</a-form-item>
<a-form-item :label-col="labelCol" :wrapper-col="wrapperCol" label="选择部门" v-if="spryTypes.indexOf('2')>-1" >
<!-- <a-form-item :label-col="labelCol" :wrapper-col="wrapperCol" label="选择部门" v-if="spryTypes.indexOf('2')>-1" >
<j-select-depart v-model="spry.departmentIds" :multi="true"></j-select-depart>
</a-form-item>
<a-form-item :label-col="labelCol" :wrapper-col="wrapperCol" label="选择部门负责人" v-if="spryTypes.indexOf('5')>-1" >
@ -264,7 +266,7 @@
</a-form-item>
<a-form-item :label-col="labelCol" :wrapper-col="wrapperCol" label="输入表单变量" v-if="spryTypes.indexOf('6')>-1" >
<a-input v-model="spry.formVariables" :multi="true"></a-input>
</a-form-item>
</a-form-item>-->
<!--btn-->
<a-form-item :wrapper-col="{ span: 12, offset: 5 }">
<a-button @click="sprySubmit" type="primary" html-type="submit" :disabled="editNode.type==0||editNode.type==2||confirmLoading">
@ -388,6 +390,8 @@
visible:false,
formComponent : null
},
isClose:false,
isIndex:0,
lcTypeF:[],
dataList: [],
updateRow: {}
@ -440,10 +444,12 @@
this.current=0,
this.spryTypes=[],
this.spry={}
this.isIndex=0;
},
/*编辑流程节点*/
change_steps(node,index){
this.isIndex=index+1;
this.spryTypes = [];
console.log('onChange:', node);
this.current = index;
@ -483,8 +489,10 @@
if (this.spry.formVariables) this.spryTypes.push('6');
},
spryType(types){
/* alert(types)*/
/* 0角色 1用户 2部门 3发起人 4发起人的部门负责人 5部门负责人*/
// this.spryTypes = types;
alert(this.spryTypes.indexOf('0'))
if (this.spryTypes.indexOf('0')==-1) this.spry.roleIds = '';
if (this.spryTypes.indexOf('1')==-1) this.spry.userIds = '';
if (this.spryTypes.indexOf('2')==-1) this.spry.departmentIds = '';
@ -497,24 +505,37 @@
console.log("this.spry",this.spry)
},
sprySubmit() {
submitUsers(val){
this.spry.userIds=val;
console.log(val,"-=-=-=-=-=-=-=-=>")
var _this = this;
if (this.spryTypes.length==0){
if (!this.spry.userIds){
_this.$message.error("必须选择审批人！");
return;
}
_this.confirmLoading = true;
// _this.confirmLoading = true;
this.spry.nodeId = this.editNode.id;
this.spry.procDefId = this.editNode.procDefId;
this.postFormAction(_this.url.editNodeUser,this.spry).then(res => {
if (res.success) {
_this.$message.success("操作成功");
/*保存成功后回显数据*/
_this.getNodeData(_this.updateRow);
_this.getNodeData(_this.updateRow);
}else {
_this.$message.error(res.message);
}
}).finally(() => _this.confirmLoading = false);
});
},
//提交并保存
sprySubmit() {
console.log(this.nodeList.length,this.isIndex,"---------------->")
if(this.nodeList.length==this.isIndex){
this.$message.success("操作成功");
this.closeNode();
this.loadData(1);
}
console.log("最后的操作",this.spry)
},
/*节点设置*/
getNodeData(row){
@ -525,9 +546,26 @@
}).then(res => {
if (res.success) {
// 转换null为""
_this.nodeList = res.result||[];
console.log("_this.nodeList",_this.nodeList);
if (_this.nodeList.length>0){
console.log("res.result",res.result);
let arry=[];
for (let i = 0; i < res.result.length; i++) {
if (i!=0&&i!=res.result.length-1){
arry.push(res.result[i])
}
}
_this.nodeList=arry;
if (arry.length==this.isIndex){
console.log(this.isIndex,"我想要的")
}
if (arry.length>0){
console.log(_this.nodeList[0])
if(!this.nodeList.length==this.isIndex){
if (_this.nodeList[0].users[0]){
console.log(_this.nodeList[0].users[0])
this.spry.userIds=_this.nodeList[0].users[0].username;
}
}
_this.editNode = _this.nodeList[_this.current];
console.log(_this.current,_this.editNode)
_this.showProcessNodeEdit = true;
@ -724,6 +762,7 @@
var logType = that.queryParam.logType;
that.queryParam = {}; //清空查询区域参数
that.queryParam.logType = logType;
that.queryParam.zx=true;
that.loadData(this.ipagination.current);
},
onDateChange: function (value, dateString) {
@ -738,7 +777,8 @@
filter_categoryId(v,r) {
// console.log(v,r)
return r.categoryId == v;
}
},
}
}
</script>

28
src/views/activiti/form/ProcessUdgetPlanForm.vue
Unescape View File

@ -157,7 +157,7 @@
<div class="div_process">
<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">
@ -489,7 +489,7 @@
url: {
add: '/hy/processUdgetPlan/add',
edit: '/hy/processUdgetPlan/edit',
fromTableApply:'/actBusiness/fromTableApply',
addFromTableApply:'/hy/processUdgetPlan/addFromTableApply',
queryById: '/hy/processUdgetPlan/queryById',
selectdeparment:'/sys/selectByUser',
descriptionRakeUrl: "/description/processDescription/list",
@ -1016,17 +1016,23 @@
//计算总价
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) => {
if (!err) {
@ -1034,13 +1040,19 @@
formData.procDeTitle = this.processData.name;
formData.title=this.processData.description;
if (!formData.tableName)formData.tableName = this.processData.businessTable;
var url = this.url.addFromTableApply;
let method='post';
if (!this.isNew){
url = this.url.fromTableApply;
method='put';
}
this.btndisabled = true;
console.log(formData,'申请数据')
httpAction(this.url.fromTableApply,formData,'post').then((res)=>{
console.log(formData,'表单数据')
httpAction(url,formData,method).then((res)=>{
if (res.success){
this.$message.success("申请成功！")
//this.$message.success("保存成功！")
//todo 将表单的数据传给父组件
this.$emit('close',formData)
this.$emit('afterSubmit',formData)
}else {
this.$message.error(res.message)
}

4
src/views/activiti/mixins/activitiMixin.js
Unescape View File

@ -18,12 +18,12 @@ export const activitiMixin = {
/*todo 所有的流程表单，组件化注册，在此维护*/
allFormComponent:function(){
return [
{
/* {
text:'测试流程表单',
routeName:'@/views/activiti/form/demoForm',
component:() => import(`@/views/activiti/form/demoForm`),
businessTable:'test_demo'
},
},*/
{
text:'预算计划采购流程',
routeName:'@/views/activiti/form/ProcessUdgetPlan',

Write Preview
Loading…
Cancel
Save