- {{item.employeeName}}
+ {{item.employeeName}}(No.{{item.number}} AD:{{item.departmentname}})
diff --git a/src/store/workflow/index.js b/src/store/workflow/index.js
index 9513f53..e6be68e 100644
--- a/src/store/workflow/index.js
+++ b/src/store/workflow/index.js
@@ -1,5 +1,5 @@
/**
- * 缓存工作流节点内容
+ * 缓存工作流节点内容
*/
import { defineStore } from 'pinia';
export const useStore = defineStore('store', {
diff --git a/src/utils/workflow/index.ts b/src/utils/workflow/index.ts
index 7b972f8..a61dfef 100644
--- a/src/utils/workflow/index.ts
+++ b/src/utils/workflow/index.ts
@@ -137,7 +137,7 @@ All.prototype = {
}
}
- }else if (nodeConfig.settype == 9){
+ }else if (nodeConfig.settype == 10){
return "指定部门负责人"
}
},
diff --git a/src/views/sysworkflow/flow/flowDrawingBoard.vue b/src/views/sysworkflow/flow/flowDrawingBoard.vue
index 017114c..198d4c2 100644
--- a/src/views/sysworkflow/flow/flowDrawingBoard.vue
+++ b/src/views/sysworkflow/flow/flowDrawingBoard.vue
@@ -450,7 +450,7 @@ const clickOpenOrClose = () => {
-
diff --git a/src/views/sysworkflow/flow/flowcanvas.vue b/src/views/sysworkflow/flow/flowcanvas.vue
index 2ce5043..ae802b8 100644
--- a/src/views/sysworkflow/flow/flowcanvas.vue
+++ b/src/views/sysworkflow/flow/flowcanvas.vue
@@ -114,7 +114,7 @@ const zoomSize = (type:number) => {
流程结束
+ 4
-
diff --git a/src/views/sysworkflow/lowcodepage/appCardPage.vue b/src/views/sysworkflow/lowcodepage/appCardPage.vue
index e338cf4..80ec9b2 100644
--- a/src/views/sysworkflow/lowcodepage/appCardPage.vue
+++ b/src/views/sysworkflow/lowcodepage/appCardPage.vue
@@ -353,6 +353,16 @@ const refreshPage = (pageType:string) =>{
addFormIsShow.value = false;
getFormAppList(props.searchQuery);
}
+/**
+@ 作者: 秦东
+@ 时间: 2024-08-09 11:28:39
+@ 功能: 翻页
+*/
+const handleCurrentChange = (val:any) =>{
+ // console.log("翻页",val)
+ props.searchQuery.page = val
+ getFormAppList(props.searchQuery);
+}
流程结束
+ 流程结束1
diff --git a/src/views/sysworkflow/lowcodepage/appFormList.vue b/src/views/sysworkflow/lowcodepage/appFormList.vue
index 025458f..80e7f6a 100644
--- a/src/views/sysworkflow/lowcodepage/appFormList.vue
+++ b/src/views/sysworkflow/lowcodepage/appFormList.vue
@@ -340,7 +340,8 @@ const editAppCont = (val:string) => {
@ 时间: 2024-04-24 10:44:42
@ 功能: 翻页
*/
-const fanyePage = (val: number) =>{
+const fanyePage = (val: any) =>{
+ console.log("翻页",val)
pageApp.value = val
getFormAppList()
}
diff --git a/src/views/sysworkflow/lowcodepage/appListPage.vue b/src/views/sysworkflow/lowcodepage/appListPage.vue
index 1ff34b0..6727413 100644
--- a/src/views/sysworkflow/lowcodepage/appListPage.vue
+++ b/src/views/sysworkflow/lowcodepage/appListPage.vue
@@ -345,6 +345,16 @@ const setOften = (val:any) => {
defineExpose({
getFormAppList
})
+/**
+@ 作者: 秦东
+@ 时间: 2024-08-09 11:28:39
+@ 功能: 翻页
+*/
+const handleCurrentChange = (val:any) =>{
+ // console.log("翻页",val)
+ props.searchQuery.page = val
+ getFormAppList(props.searchQuery);
+}
diff --git a/src/views/sysworkflow/lowcodepage/appPage/appPageForm/pageList.vue b/src/views/sysworkflow/lowcodepage/appPage/appPageForm/pageList.vue
index a267ae0..5267d75 100644
--- a/src/views/sysworkflow/lowcodepage/appPage/appPageForm/pageList.vue
+++ b/src/views/sysworkflow/lowcodepage/appPage/appPageForm/pageList.vue
@@ -271,7 +271,7 @@ const jieForm = () => {
if(props.appPageKey != ""){
gainFormTableField({id:props.appPageKey.toString()})
.then((data)=>{
- console.log('解析表单--->',data)
+ // console.log('解析表单--->',data)
formTableField.masterTable=data.data.masterTable
formTableField.sunTable=data.data.sunTable
})
@@ -408,7 +408,7 @@ const getListInfo = () => {
zhuDaunIsTrue.value = false
- console.log("========>",state.tableData)
+ // console.log("========>",state.tableData)
if(state.searchData && state.searchData.length>0) {
if(formTableField.masterTable && formTableField.masterTable.length > 0){
state.searchData.forEach((itemCol:any)=>{
@@ -600,6 +600,7 @@ const tableListFieldClick = (val:any[]) => {
}
}
}
+ console.log("state.tableData.columns",state.tableData.columns)
}
/**
@ 作者: 秦东
@@ -782,6 +783,48 @@ const tabsView = (val:any) => {
*/
const showCollapse = () => {
+}
+// 弹窗确认
+const dialogConfirm = (editVal: string) => {
+ // 生成脚本预览和导入json，都是将编辑器内容更新至state.formData
+ try {
+ if (typeof drawer.callback === 'function') {
+ // callback
+ const newObj =
+ drawer.codeType === 'json'? string2json(editVal): stringToObj(editVal)
+ drawer.callback(newObj)
+ } else {
+ switch (drawer.type) {
+ case 'css':
+ // 表单属性－编辑表单样式
+ if (!state.value.formData.config) {
+ state.value.formData.config = {}
+ }
+ state.value.formData.config.style = editVal
+ break
+ case 'dict':
+ state.value.formDict = string2json(editVal)
+ break
+ case 'beforeRequest':
+ case 'beforeSubmit':
+ case 'afterResponse':
+ case 'afterSubmit':
+ case 'closeSubmit':
+ case 'change':
+ if (!state.value.formData.events) {
+ state.value.formData.events = {}
+ }
+ state.value.formData.events[drawer.type] = stringToObj(editVal)
+ break
+ default:
+ state.value.formData = stringToObj(editVal)
+ }
+ }
+ dialogCancel()
+ } catch (res) {
+ // console.log(res.message)
+ //ElMessage.error(res.message)
+ }
}
diff --git a/src/views/sysworkflow/lowcodepage/index.vue b/src/views/sysworkflow/lowcodepage/index.vue
index 0c239ce..a077f02 100644
--- a/src/views/sysworkflow/lowcodepage/index.vue
+++ b/src/views/sysworkflow/lowcodepage/index.vue
@@ -80,7 +80,10 @@ const gainFormGroup = () => {
})
}
- }
+ }
+ nextTick(()=>{
+ searchSub()
+ })
})
}
@@ -161,6 +164,7 @@ const handleCommand = (command: string,groupId: string) => {
})
}else{
+ groupKey.value = ""
addFormGroupIsShow.value = true
drawerGroupWith.value = 400
}
@@ -187,6 +191,7 @@ const refreshPage = (pageType:string) =>{
addFormGroupIsShow.value = false;
}
gainFormGroup()
+
}
/**
diff --git a/src/views/sysworkflow/lowcodepage/pageList.vue b/src/views/sysworkflow/lowcodepage/pageList.vue
index da410bf..b6ec4c4 100644
--- a/src/views/sysworkflow/lowcodepage/pageList.vue
+++ b/src/views/sysworkflow/lowcodepage/pageList.vue
@@ -413,60 +413,61 @@ const tableListFieldClick = (val:any[]) => {
// console.log("列表字段处理-->",val)
// zhuDaunIsTrue.value = true
if(zhuDaunIsTrue.value == true){
- if(val.length > 0){
- if(state.tableData.columns.length > 0){ //判断列表是否有数据
- val.forEach((item:tableButton)=>{
- let isTrue = true;
- state.tableData.columns.forEach((itemTab:tableButton)=>{
- if(item.id == itemTab.id){
- // console.log("列表字段处理-111->",val)
- isTrue = false;
+ if(val.length > 0){
+ if(state.tableData.columns.length > 0){ //判断列表是否有数据
+ val.forEach((item:tableButton)=>{
+ let isTrue = true;
+ state.tableData.columns.forEach((itemTab:tableButton)=>{
+ if(item.id == itemTab.id){
+ // console.log("列表字段处理-111->",val)
+ isTrue = false;
+ }
+ });
+ if(isTrue){
+ state.tableData.columns.push(item)
}
- });
- if(isTrue){
+ })
+ }else{ //列表无数据,直接新增
+ val.forEach((item:any)=>{
state.tableData.columns.push(item)
- }
- })
- }else{ //列表无数据,直接新增
- val.forEach((item:any)=>{
- state.tableData.columns.push(item)
- })
- }
- //此处往下是处理列表中有为选中的字段
- let delField = []
- formTableField.masterTable.forEach((item:tableButton)=>{
- let isTrue = true;
- val.forEach((itemVal:tableButton)=>{
- if(item.id == itemVal.id){
- isTrue = false
- }
- })
- if(isTrue){
- delField.push(item.id)
+ })
}
- });
- if(delField.length > 0){
- state.tableData.columns.forEach((itemTab:tableButton,index:number)=>{
- delField.forEach((item:string)=>{
- if(item == itemTab.id){
- state.tableData.columns.splice(index,1) //删除列表中已经存在的字段
+ //此处往下是处理列表中有为选中的字段
+ let delField = []
+ formTableField.masterTable.forEach((item:tableButton)=>{
+ let isTrue = true;
+ val.forEach((itemVal:tableButton)=>{
+ if(item.id == itemVal.id){
+ isTrue = false
}
})
-
+ if(isTrue){
+ delField.push(item.id)
+ }
});
- }
- }else{
- if(state.tableData.columns.length > 0){
- formTableField.masterTable.forEach((item:tableButton)=>{
+ if(delField.length > 0){
state.tableData.columns.forEach((itemTab:tableButton,index:number)=>{
- if(item.id == itemTab.id){
- state.tableData.columns.splice(index,1) //删除列表中已经存在的字段
- }
+ delField.forEach((item:string)=>{
+ if(item == itemTab.id){
+ state.tableData.columns.splice(index,1) //删除列表中已经存在的字段
+ }
+ })
+
});
- });
+ }
+ }else{
+ if(state.tableData.columns.length > 0){
+ formTableField.masterTable.forEach((item:tableButton)=>{
+ state.tableData.columns.forEach((itemTab:tableButton,index:number)=>{
+ if(item.id == itemTab.id){
+ state.tableData.columns.splice(index,1) //删除列表中已经存在的字段
+ }
+ });
+ });
+ }
}
}
-}
+ console.log("state.tableData.columns",state.tableData.columns)
}
const container = ref()
@@ -874,7 +875,48 @@ const getListInfo = () => {
}
const showCollapse = () => {}
-
+// 弹窗确认
+const dialogConfirm = (editVal: string) => {
+ // 生成脚本预览和导入json，都是将编辑器内容更新至state.formData
+ try {
+ if (typeof drawer.callback === 'function') {
+ // callback
+ const newObj =
+ drawer.codeType === 'json'? string2json(editVal): stringToObj(editVal)
+ drawer.callback(newObj)
+ } else {
+ switch (drawer.type) {
+ case 'css':
+ // 表单属性－编辑表单样式
+ if (!state.value.formData.config) {
+ state.value.formData.config = {}
+ }
+ state.value.formData.config.style = editVal
+ break
+ case 'dict':
+ state.value.formDict = string2json(editVal)
+ break
+ case 'beforeRequest':
+ case 'beforeSubmit':
+ case 'afterResponse':
+ case 'afterSubmit':
+ case 'closeSubmit':
+ case 'change':
+ if (!state.value.formData.events) {
+ state.value.formData.events = {}
+ }
+ state.value.formData.events[drawer.type] = stringToObj(editVal)
+ break
+ default:
+ state.value.formData = stringToObj(editVal)
+ }
+ }
+ dialogCancel()
+ } catch (res) {
+ // console.log(res.message)
+ //ElMessage.error(res.message)
+ }
+}
diff --git a/src/views/sysworkflow/lowcodepage/appPage/appMenus.vue b/src/views/sysworkflow/lowcodepage/appPage/appMenus.vue
index 91ae663..3670492 100644
--- a/src/views/sysworkflow/lowcodepage/appPage/appMenus.vue
+++ b/src/views/sysworkflow/lowcodepage/appPage/appMenus.vue
@@ -319,9 +319,10 @@ const openAppPage = (val:any) =>{
+
+ {{node.label}}
diff --git a/src/views/sysworkflow/lowcodepage/appPage/appPageForm/pageFlow.vue b/src/views/sysworkflow/lowcodepage/appPage/appPageForm/pageFlow.vue
index d251a47..7f91ff1 100644
--- a/src/views/sysworkflow/lowcodepage/appPage/appPageForm/pageFlow.vue
+++ b/src/views/sysworkflow/lowcodepage/appPage/appPageForm/pageFlow.vue
@@ -167,6 +167,7 @@ const getFlowVerList = ()=>{
}
}
+ // console.log("获取工作流版本列表---4-->",isRead.value);
// console.log("获取工作流版本列表---1-->",activeTabs.value);
// console.log("获取工作流版本列表---2-->",enableFlow.value);
// console.log("获取工作流版本列表---3-->",enableVersion.value);
@@ -226,7 +227,7 @@ const clearCanvas = (isOk?:any) =>{
*/
const initWorkFlowData = async() => {
let { data } = await initializeWorkFlow({name:state.value.formData.form.formName})
- // console.log("data-=------>",data)
+ console.log("data-=------>",data)
processConfig.value = data;
let {
nodeConfig:nodes,
@@ -579,7 +580,7 @@ const closwFormFlow = () => {
diff --git a/src/views/sysworkflow/lowcodepage/appPage/appPageForm/pageForm.vue b/src/views/sysworkflow/lowcodepage/appPage/appPageForm/pageForm.vue
index 4993ccd..22689cc 100644
--- a/src/views/sysworkflow/lowcodepage/appPage/appPageForm/pageForm.vue
+++ b/src/views/sysworkflow/lowcodepage/appPage/appPageForm/pageForm.vue
@@ -369,7 +369,7 @@ const saveAppFormData = () => {
createAppForm(sendData)
.then((data:any) => {
state.value.loading = false
- console.log("写入自建应用App表单--->",data)
+ // console.log("写入自建应用App表单--->",data)
// appPageKey.value = data.data.customerFormCont.id
// appPageKey.set(data.data.customerFormCont.id.toString())
versionId.value = data.data.formVersion.id.toString()
@@ -543,7 +543,48 @@ function optionsValue3Get3(data: any,fieldName: string){
}
}
-
+// 弹窗确认
+const dialogConfirm = (editVal: string) => {
+ // 生成脚本预览和导入json，都是将编辑器内容更新至state.formData
+ try {
+ if (typeof drawer.callback === 'function') {
+ // callback
+ const newObj =
+ drawer.codeType === 'json'? string2json(editVal): stringToObj(editVal)
+ drawer.callback(newObj)
+ } else {
+ switch (drawer.type) {
+ case 'css':
+ // 表单属性－编辑表单样式
+ if (!state.value.formData.config) {
+ state.value.formData.config = {}
+ }
+ state.value.formData.config.style = editVal
+ break
+ case 'dict':
+ state.value.formDict = string2json(editVal)
+ break
+ case 'beforeRequest':
+ case 'beforeSubmit':
+ case 'afterResponse':
+ case 'afterSubmit':
+ case 'closeSubmit':
+ case 'change':
+ if (!state.value.formData.events) {
+ state.value.formData.events = {}
+ }
+ state.value.formData.events[drawer.type] = stringToObj(editVal)
+ break
+ default:
+ state.value.formData = stringToObj(editVal)
+ }
+ }
+ dialogCancel()
+ } catch (res) {
+ // console.log(res.message)
+ //ElMessage.error(res.message)
+ }
+}
-
流程结束
+ 流程结束3
-
流程结束
+ 流程结束5
diff --git a/src/views/sysworkflow/lowcodepage/workFlow.vue b/src/views/sysworkflow/lowcodepage/workFlow.vue
index 409cd1e..2c6bf98 100644
--- a/src/views/sysworkflow/lowcodepage/workFlow.vue
+++ b/src/views/sysworkflow/lowcodepage/workFlow.vue
@@ -527,7 +527,7 @@ onMounted(()=>{
diff --git a/src/widget/systemunit/deptOrgPage.vue b/src/widget/systemunit/deptOrgPage.vue
index a578772..51e4cf4 100644
--- a/src/widget/systemunit/deptOrgPage.vue
+++ b/src/widget/systemunit/deptOrgPage.vue
@@ -215,7 +215,7 @@ onMounted(()=>{
{{ getLabel(data.item) }}
-
-
流程结束
+ 流程结束2
+
{
node-key="id"
clearable
check-strictly
- :disabled="type == 4"
- style="width: 240px"
+
+ disabled
/>
-
+