Browse Source

权限控制

lwx_v4
超级管理员 1 year ago
parent
commit
3c07e5b61c
  1. 2
      src/components/DesignForm/app/formPage.vue
  2. 2
      src/components/DesignForm/app/index.vue
  3. 2
      src/components/DesignForm/tableListPage/index.vue
  4. 19
      src/components/workflow/drwer/promoterDrawer.vue
  5. 2
      src/views/sysworkflow/lowcodepage/pageFlow/appTableFlow.vue

2
src/components/DesignForm/app/formPage.vue

@ -174,7 +174,7 @@ watch(()=>props.isWorkFlow,(val:number)=>{
const getFlowInitSwps = () => { const getFlowInitSwps = () => {
gainRunFlowStart({id:props.flowkey}) gainRunFlowStart({id:props.flowkey})
.then(({data})=>{ .then(({data})=>{
// console.log("",data) console.log("获取流程",data)
flowMap.value = data.flowList flowMap.value = data.flowList
nextStep.value = data.nextStep nextStep.value = data.nextStep
currentProgress.value = data.Step currentProgress.value = data.Step

2
src/components/DesignForm/app/index.vue

@ -1028,7 +1028,7 @@ const judgeListTitle = (val:any,viewConfig:any) => {
:key="item.id || item.label" :key="item.id || item.label"
> >
<el-table-column v-if="['-'].includes(item.fieldClass)" :type="item.type" :prop="item.field" :label="item.label" config="" width="60"> <el-table-column v-if="['-'].includes(item.fieldClass)" :type="item.type" :prop="item.field" :label="item.label" config="" width="60" fixed>
<template v-if="item.help" #header="scope"> <template v-if="item.help" #header="scope">
{{ scope.column.label }} {{ scope.column.label }}
<tooltip :content="item.help" /> <tooltip :content="item.help" />

2
src/components/DesignForm/tableListPage/index.vue

@ -1018,7 +1018,7 @@ const judgeListTitle = (val:any,viewConfig:any) => {
:key="item.id || item.label" :key="item.id || item.label"
> >
<el-table-column v-if="['-'].includes(item.fieldClass)" :type="item.type" :prop="item.field" :label="item.label" config="" width="60"> <el-table-column v-if="['-'].includes(item.fieldClass)" :type="item.type" :prop="item.field" :label="item.label" config="" width="60" fixed>
<template v-if="item.help" #header="scope"> <template v-if="item.help" #header="scope">
{{ scope.column.label }} {{ scope.column.label }}
<tooltip :content="item.help" /> <tooltip :content="item.help" />

19
src/components/workflow/drwer/promoterDrawer.vue

@ -87,6 +87,7 @@ const savePromoter = () => {
flag: true, flag: true,
id: flowPermission1.value.id id: flowPermission1.value.id
}) })
// console.log(1);
let powerAry = []; let powerAry = [];
if(powerUnitAry.value.recUnitAry.masterUnitList && powerUnitAry.value.recUnitAry.masterUnitList.length > 0){ if(powerUnitAry.value.recUnitAry.masterUnitList && powerUnitAry.value.recUnitAry.masterUnitList.length > 0){
@ -96,6 +97,7 @@ const savePromoter = () => {
}) })
} }
// console.log(2);
if(powerUnitAry.value.recUnitAry.sunUnitList && powerUnitAry.value.recUnitAry.sunUnitList.length > 0){ if(powerUnitAry.value.recUnitAry.sunUnitList && powerUnitAry.value.recUnitAry.sunUnitList.length > 0){
powerUnitAry.value.recUnitAry.sunUnitList.forEach((item:any)=>{ powerUnitAry.value.recUnitAry.sunUnitList.forEach((item:any)=>{
if(item.masterUnitList && item.masterUnitList.length > 0){ if(item.masterUnitList && item.masterUnitList.length > 0){
@ -114,20 +116,20 @@ const savePromoter = () => {
let isNew = true let isNew = true
formData.value.purview.forEach((item:any)=>{ formData.value.purview.forEach((item:any)=>{
// console.log("---->",item.nodeKey) // console.log("---->",item.nodeKey)
if(item.nodeKey == "begin"){ if(item.nodeKey == props.nodeConfig.nodeNumber){
item.powerAry=powerAry item.powerAry=powerAry
isNew = false isNew = false
} }
}); });
if(isNew){ if(isNew){
formData.value.purview.push({ formData.value.purview.push({
nodeKey: "begin", nodeKey: props.nodeConfig.nodeNumber,
powerAry:powerAry powerAry:powerAry
}) })
} }
}else{ }else{
formData.value.purview = [{ formData.value.purview = [{
nodeKey: "begin", nodeKey: props.nodeConfig.nodeNumber,
powerAry:powerAry powerAry:powerAry
}] }]
} }
@ -136,6 +138,11 @@ const savePromoter = () => {
// nodeKey: "begin", // nodeKey: "begin",
// powerAry:powerAry // powerAry:powerAry
// }) {{props.formKey}}=>{{props.formVersion}} // }) {{props.formKey}}=>{{props.formVersion}}
// console.log(4);
// console.log("formKey--->",props.formKey.toString());
// console.log("formVersion--->",props.formVersion.toString());
// console.log("value--->",formData.value);
console.log("purview--->",formData.value.purview);
let sendInfo: any = { let sendInfo: any = {
formKey:props.formKey.toString(), formKey:props.formKey.toString(),
@ -239,8 +246,8 @@ const lookOpenOrClose = (val: boolean) => {
*/ */
const oneLookSet = (val: any) => { const oneLookSet = (val: any) => {
if(!val.isLook){ if(!val.isLook){
val.isEdit = val val.isEdit = val.isLook
isEditAll.value = val isEditAll.value = val.isLook
} }
if(powerUnitAry.value.recUnitAry.masterUnitList){ if(powerUnitAry.value.recUnitAry.masterUnitList){
let lookAll = 0 let lookAll = 0
@ -280,7 +287,7 @@ const oneEditSet = (val: any) => {
<template> <template>
<el-drawer v-model="visible" :append-to-body="true" title="发起人" class="set_promoter" :show-close="false" :size="550" :before-close="closeDrawer"> <el-drawer v-model="visible" :append-to-body="true" title="发起人" class="set_promoter" :show-close="false" :size="550" :before-close="closeDrawer">
<div class="demo-drawer__content"> <div class="demo-drawer__content">
{{props.nodeConfig}}
<div class="promoter_content drawer_content"> <div class="promoter_content drawer_content">
<el-tabs v-model="nodeSetUp" class="demo-tabs"> <el-tabs v-model="nodeSetUp" class="demo-tabs">
<el-tab-pane name="first"> <el-tab-pane name="first">

2
src/views/sysworkflow/lowcodepage/pageFlow/appTableFlow.vue

@ -445,7 +445,7 @@ const initLoadData = () => {
// appFormTitle.value = props.pickAppMenu.label // appFormTitle.value = props.pickAppMenu.label
gainAppPageInfo({id:props.pickAppMenu.id}) gainAppPageInfo({id:props.pickAppMenu.id})
.then((data)=>{ .then((data)=>{
// console.log("",data) console.log("获取初始化表单数据",data)
appInitData.value = data.data appInitData.value = data.data
// console.log("---!",appInitData.value) // console.log("---!",appInitData.value)
mastesformjson.value = data.data.appForm.mastesformjson mastesformjson.value = data.data.appForm.mastesformjson

Loading…
Cancel
Save