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

修改采购表单

dev
long 2 years ago
parent
3f4b0f096e
commit
9440c854fa
3 changed files with 87 additions and 73 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. 16
      src/views/activiti/form/ProcessUdgetPlan.vue
  2. 57
      src/views/activiti/form/ProcessUdgetPlanForm.vue
  3. 87
      src/views/activiti/todoManage.vue

16
src/views/activiti/form/ProcessUdgetPlan.vue
Unescape View File

@ -3,7 +3,8 @@
<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 :dianshang="planType" :isNew="isNew" :processData="processData" :disabled="disabled" @planType="showType" @afterSubmit="afterSub" @close="close" :task="task" @passTask="passTask" @backTask="backTask" :hieg="hieg" @loadData="loadData"/> <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"/>
</a-tab-pane> </a-tab-pane>
<a-tab-pane tab="流程节点图" key="2" forceRender> <a-tab-pane tab="流程节点图" key="2" forceRender>
@ -40,7 +41,6 @@
components: {ProcessUdgetPlanForm,historicPictrue, historicDetail}, components: {ProcessUdgetPlanForm,historicPictrue, historicDetail},
data() { data() {
return { return {
planType:1,
tabKey:2, tabKey:2,
noDisabled:true, noDisabled:true,
onlineDisabled:true onlineDisabled:true
@ -50,6 +50,10 @@
/*流程数据*/ /*流程数据*/
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},
/*采购类型*/
isPlanType: {type: Boolean, default: false, required: false},
/*资金来源*/
isSourceCapital:{type: Boolean, default: false, required: false},
processData:{ processData:{
type:Object, type:Object,
default:()=>{return {}}, default:()=>{return {}},
@ -129,14 +133,6 @@
changeTables(val){ changeTables(val){
this.planType=Number(val); this.planType=Number(val);
}, },
showType(val){
if (val==2){
this.onlineDisabled=false
}
if (val==1){
this.noDisabled=false
}
}
}, },
} }
</script> </script>

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

@ -129,15 +129,22 @@
</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"> <div v-if="isGetOneAndLast">
<a-button type="primary" :disabled="disabled||btndisabled" @click="handleSubmit">保存</a-button> <a-form-item v-if="!disabled" :wrapperCol="{ span: 24 }" style="text-align: center">
<a-button style="margin-left: 8px" type="primary" :disabled="disabled||btndisabled" @click="applySubmit">提交申请 <a-button type="primary" :disabled="disabled||btndisabled" @click="handleSubmit">保存</a-button>
</a-button> <a-button style="margin-left: 8px" type="primary" :disabled="disabled||btndisabled" @click="applySubmit">提交申请
<a-button style="margin-left: 8px" :disabled="disabled" @click="close">取消</a-button> </a-button>
</a-form-item> <a-button style="margin-left: 8px" :disabled="disabled" @click="close">取消</a-button>
<a-form-item v-if="task" :wrapperCol="{ span: 24 }" style="text-align: center"> </a-form-item>
<a-button type="primary" @click="passTask">通过</a-button> <a-form-item v-if="task" :wrapperCol="{ span: 24 }" style="text-align: center">
<!-- <a-button type="primary" @click="ewrold">下载</a-button>--> <a-button type="primary" @click="passTask">通过</a-button>
<!-- <a-button type="primary" @click="ewrold">下载</a-button>-->
<a-button style="margin-left: 8px" @click="backTask">驳回</a-button>
</a-form-item>
</div>
<a-form-item v-if="isPlanType" :wrapperCol="{ span: 24 }" style="text-align: center">
<a-button type="primary" @click="saveAndpassTask">保存并通过</a-button>
<!-- <a-button type="primary" @click="ewrold">下载</a-button>-->
<a-button style="margin-left: 8px" @click="backTask">驳回</a-button> <a-button style="margin-left: 8px" @click="backTask">驳回</a-button>
</a-form-item> </a-form-item>
</div> </div>
@ -219,8 +226,7 @@
// columns, // columns,
// editingKey: '', // editingKey: '',
isabled: true, isabled: true,
isPlanType: false, isGetOneAndLast:false,
isSourceCapital: false,
bigId: [], bigId: [],
opinion: '', opinion: '',
bigIdRake: [], bigIdRake: [],
@ -509,7 +515,6 @@
} }
}, },
isBu: undefined, isBu: undefined,
planType: '',
isShifu:false isShifu:false
} }
}, },
@ -526,6 +531,10 @@
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 },
/*采购类型*/
isPlanType: {type: Boolean, default: false, required: false},
/*资金来源*/
isSourceCapital:{type: Boolean, default: false, required: false},
//流程表单data //流程表单data
formData: { formData: {
type: Object, type: Object,
@ -579,18 +588,12 @@
return false return false
} }
}, },
watch: {
dianshang: {
immediate: true,
handler: function(val) {
this.planType = val
console.log("this.planType---",this.planType)
}
}
},
created() { created() {
//如果是流程中表单，则需要加载流程表单data //如果是流程中表单，则需要加载流程表单data
//this.showFlowData() //this.showFlowData()
if (!this.isPlanType){
this.isGetOneAndLast=true;
}
this.getAllTable() this.getAllTable()
let company = sessionStorage.getItem('PARENT_ID') let company = sessionStorage.getItem('PARENT_ID')
@ -605,7 +608,7 @@
}, },
mounted() { mounted() {
// console.log( this.$refs.processUdgetPlanMaterial); // console.log( isPlanType);
// this.form.setFieldsValue("materialGroup",123123); // this.form.setFieldsValue("materialGroup",123123);
}, },
methods: { methods: {
@ -1078,8 +1081,6 @@
id: r.tableId id: r.tableId
}).then((res) => { }).then((res) => {
if (res.success) { if (res.success) {
console.log("res.result.planType--",res.result.planType)
this.$emit('planType',res.result.planType)
this.planType = res.result.planType this.planType = res.result.planType
let formData = res.result let formData = res.result
formData.tableName = r.tableName formData.tableName = r.tableName
@ -1164,7 +1165,7 @@
formData.procDefId = this.processData.id formData.procDefId = this.processData.id
formData.procDeTitle = this.processData.name formData.procDeTitle = this.processData.name
formData.title = this.processData.description formData.title = this.processData.description
formData.planType=this.planType; //formData.sourceCapital
console.log("this.planType++",this.planType) console.log("this.planType++",this.planType)
if (!formData.tableName) formData.tableName = this.processData.businessTable if (!formData.tableName) formData.tableName = this.processData.businessTable
var url = this.url.addFromTableApply var url = this.url.addFromTableApply
@ -1219,7 +1220,7 @@
} }
console.log(this.data, '数据回显') console.log(this.data, '数据回显')
let fieldval = pick(this.data, 'id','planType', 'company', 'createTime', 'departId', 'createBy', 'materialType', 'processPlan', 'needTime','sort', 'orderNumber', 'fileId', 'opinion') let fieldval = pick(this.data, 'id','planType', 'company', 'createTime', 'departId', 'createBy', 'materialType', 'processPlan', 'needTime','sort', 'orderNumber', 'fileId', 'opinion','sourceCapital')
this.$nextTick(() => { this.$nextTick(() => {
this.form.setFieldsValue(fieldval) this.form.setFieldsValue(fieldval)
}) })
@ -1322,6 +1323,10 @@
this.form.setFieldsValue(fieldval) this.form.setFieldsValue(fieldval)
}) })
}, },
saveAndpassTask(){
this.handleSubmit();
this.passTask();
},
// handler // handler
handleSubmit(e) { handleSubmit(e) {
this.getAllTable().then(tables => { this.getAllTable().then(tables => {

87
src/views/activiti/todoManage.vue
Unescape View File

@ -149,7 +149,7 @@
<!--流程表单--> <!--流程表单-->
<a-modal :title="lcModa.title" v-model="lcModa.visible" :footer="null" :maskClosable="false" width="80%" height="93%"> <a-modal :title="lcModa.title" v-model="lcModa.visible" :footer="null" :maskClosable="false" width="80%" height="93%">
<component :disabled="lcModa.disabled" v-if="lcModa.visible" :is="lcModa.formComponent" <component :disabled="lcModa.disabled" v-if="lcModa.visible" :is="lcModa.formComponent"
:processData="lcModa.processData" :isNew="lcModa.isNew" :processData="lcModa.processData" :isNew="lcModa.isNew" :isPlanType="lcModa.isPlanType" :isSourceCapital="lcModa.isSourceCapital"
:task="true" :task="true"
@passTask="()=>passTask(lcModa.processData)" @passTask="()=>passTask(lcModa.processData)"
@backTask="()=>backTask(lcModa.processData)" :procInstId="lcModa.procInstId" @backTask="()=>backTask(lcModa.processData)" :procInstId="lcModa.procInstId"
@ -286,7 +286,9 @@
disabled: false, disabled: false,
visible: false, visible: false,
formComponent: null, formComponent: null,
isNew: false isNew: false,
isSourceCapital:false,
isPlanType: false
}, },
url: { url: {
todoList: '/actTask/todoList', todoList: '/actTask/todoList',
@ -459,7 +461,7 @@
}) })
} }
}, },
detail(r) { async detail(r) {
if (!r.routeName) { if (!r.routeName) {
this.$message.warning( this.$message.warning(
'该流程信息未配置表单，请联系开发人员！' '该流程信息未配置表单，请联系开发人员！'
@ -467,41 +469,52 @@
return return
} }
this.lcModa.disabled = true this.lcModa.disabled = true
//获取是不是第一个审核人和最后一个审核人（第一个审核人和最后一个审核人需要对表单进行操作）
if (r.processName === '预算计划采购流程') {
let userInfo = sessionStorage.getItem('USER_INFORMATION')
let res = JSON.parse(userInfo) //获取是不是第一个审核人和最后一个审核人（第一个审核人和最后一个审核人需要对表单进行操作）
let param = {} if (r.processName === '预算计划采购流程') {
param.id = r.procDefId let userInfo = sessionStorage.getItem('USER_INFORMATION')
param.tableName = r.tableName let res = JSON.parse(userInfo)
param.tableId = r.tableId let param = {}
param.username = res.username param.id = r.procDefId
this.getAction('/hy/processMaterialsAllot/getOne', param).then(res => { param.tableName = r.tableName
console.log('res>>>>>>>>>>>>>>>>>>', res) param.tableId = r.tableId
if (res.success) { param.username = res.username
if (res.result) { let res2 =await this.getAction('/hy/processMaterialsAllot/getOne', param)
this.lcModa.disabled = false console.log('res>>>>>>>>>>>>>>>>>>', res2)
} if (res2.success) {
} if (res2.result) {
}) /* if (param.username==res2.result.relateId) {*/
// this.getAction('/activiti_process/getNextNode', param).then(res => { console.log("/////////**************>")
// console.log('res>>>>>>>>>>>>>>>>>>', res) this.lcModa.isPlanType = true;
// if (res.success) { this.lcModa.isSourceCapital = true;
// if (res.result) { this.lcModa.disabled = false;
// this.lcModa.disabled = false // }
// } }
// } }
// }) let res1=await this.getAction('/hy/processMaterialsAllot/getLast', param)
} console.log('res>>>>>>>>>>>>>>fdsafdsaf>>>>', res1)
this.lcModa.title = '查看流程业务信息：' + r.processName if (res1.success) {
this.lcModa.formComponent = this.getFormComponent(r.routeName).component if (res1.result) {
this.lcModa.processData = r if (param.username==res1.result.relateId){
this.lcModa.isNew = false this.lcModa.isPlanType = true;
this.lcModa.task = true this.lcModa.isSourceCapital = true;
this.lcModa.procInstId = r.procInstId this.lcModa.disabled = false;
this.lcModa.visible = true }
}
}
}
this.lcModa.title = '查看流程业务信息：' + r.processName
this.lcModa.formComponent = this.getFormComponent(r.routeName).component
this.lcModa.processData = r
this.lcModa.isNew = false
this.lcModa.task = true
this.lcModa.procInstId = r.procInstId
this.lcModa.visible = true
}, },
passTask(v) { passTask(v) {
console.log(v.procInstId,"33333333333333333")
this.modalTaskTitle = '审批通过' this.modalTaskTitle = '审批通过'
this.form.id = v.id this.form.id = v.id
this.form.procInstId = v.procInstId this.form.procInstId = v.procInstId
@ -509,7 +522,7 @@
this.form.type = 0 this.form.type = 0
this.modalTaskVisible = true this.modalTaskVisible = true
this.userLoading = true this.userLoading = true
this.getAction(this.url.getNextNode, { procDefId: v.procDefId, currActId: v.key }).then(res => { this.getAction(this.url.getNextNode, { procDefId: v.procDefId, currActId: v.key ,procInstId:v.procInstId}).then(res => {
this.userLoading = false this.userLoading = false
if (res.success) { if (res.success) {
if (res.result.type == 4) { if (res.result.type == 4) {

Write Preview
Loading…
Cancel
Save