Browse Source

Merge branch 'qin_v10_master'

yjf_v4
超级管理员 1 year ago
parent
commit
1f5571622d
  1. 2
      src/components/DesignForm/app/index.vue
  2. 2
      src/components/workflow/drwer/approverDrawer.vue
  3. 2
      src/components/workflow/drwer/promoterDrawer.vue
  4. 2
      src/views/sysworkflow/lowcodepage/appPage/appPageForm/openAppFormPage.vue
  5. 8
      src/views/taskplatform/taskmanagement/flowStep.vue

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

@ -727,7 +727,7 @@ const editFormSendFlow = (val:any) => {
</el-col>
<el-col :span="24" style="display:none">
{{ tableDataList}}
{{ props.data}}
</el-col>
<el-col :span="24" style="display:none">
<el-button-group>

2
src/components/workflow/drwer/approverDrawer.vue

@ -532,7 +532,7 @@ const nodeSetUp = ref("first")
<QuillEditor v-model="approverConfig.helpTips" height="400px" />
</div>
</el-tab-pane>
{{approverConfig.helpTips}}
</el-tabs>
</div>

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

@ -246,7 +246,7 @@ const contentpage = ref("")
</div>
</el-tab-pane>
</el-tabs>
{{props.nodeConfig.helpTips}}
</div>
<div class="demo-drawer__footer clear">

2
src/views/sysworkflow/lowcodepage/appPage/appPageForm/openAppFormPage.vue

@ -164,6 +164,8 @@ const gainAppFormPageInit = () =>{
versionTitle.value = data.data.appForm.name
if(data.data.pageList){
let stateData = string2json(data.data.appForm.listjson)
console.log("列表数据---》",stateData)
console.log("列表数据-2--》",data.data.appForm.listjson)
stateList.tableData = stateData.tableData
stateList.searchData = stateData.searchData
stateList.loading = stateData.loading

8
src/views/taskplatform/taskmanagement/flowStep.vue

@ -131,6 +131,14 @@ const updateNode = (val:any) =>{
<el-step v-for="item in flowList" :key="item.step">
<template #title>
{{ item.nodeName }}
<el-tooltip
v-if="item.helpTips!=''&&item.helpTips!='<p><br></p>'"
:content="item.helpTips"
raw-content
effect="light"
>
<i class="fa fa-question-circle-o"></i>
</el-tooltip>
</template>
<template #description>

Loading…
Cancel
Save