diff --git a/src/api/matrixapi/type.ts b/src/api/matrixapi/type.ts index 8716705..7b4e696 100644 --- a/src/api/matrixapi/type.ts +++ b/src/api/matrixapi/type.ts @@ -48,7 +48,10 @@ export interface martixFieldStruct{ pinyin:string; //拼音(标识使用) isedit:boolean; //是否可更改 pyedit:boolean; //拼音是否可更改 + } + + /** * 矩阵字段列表 */ @@ -117,4 +120,10 @@ export interface matrixInfo{ factorName:string; outcomeid:number; outcomeName:string; + list:martOpter[], //多选矩阵 +} +//矩阵列表 +export interface martOpter{ + outcomeid:number; + outcomeName:string; } diff --git a/src/components/workflow/dialog/matrix.vue b/src/components/workflow/dialog/matrix.vue index 2599304..e939f94 100644 --- a/src/components/workflow/dialog/matrix.vue +++ b/src/components/workflow/dialog/matrix.vue @@ -3,221 +3,302 @@ @ 时间: 2023-10-28 13:56:34 @ 备注: 矩阵选项 --> - - diff --git a/src/components/workflow/nodeWrap.vue b/src/components/workflow/nodeWrap.vue index 1e10abe..ec47630 100644 --- a/src/components/workflow/nodeWrap.vue +++ b/src/components/workflow/nodeWrap.vue @@ -44,11 +44,10 @@ let defaultText = computed(() => { return placeholderList[props.nodeConfig.type]; }); let showText = computed(() => { - // console.log("props.nodeConfig.type===>",props.nodeConfig,props.nodeConfig.type); - if (props.nodeConfig.type == 0) - return $func.arrToStr(props.flowPermission) || "所有人"; + console.log("props.nodeConfig.type===>", props.nodeConfig); + if (props.nodeConfig.type == 0) return $func.arrToStr(props.flowPermission) || "所有人"; if (props.nodeConfig.type == 1) return $func.setApproverStr(props.nodeConfig); - if (props.nodeConfig.type == 3) return $func.setApproverStr(props.nodeConfig); + if (props.nodeConfig.type == 3) return $func.setApproverStr(props.nodeConfig); // console.log("props.nodeConfig.type",props.nodeConfig); return $func.copyerStr(props.nodeConfig); }); @@ -104,7 +103,7 @@ const addTerm = () => { const delTerm = (index: any) => { // eslint-disable-next-line vue/no-mutating-props props.nodeConfig.conditionNodes.splice(index, 1); - props.nodeConfig.conditionNodes.map((item:any, index:any) => { + props.nodeConfig.conditionNodes.map((item: any, index: any) => { item.priorityLevel = index + 1; item.nodeName = `条件${index + 1}`; }); @@ -113,14 +112,10 @@ const delTerm = (index: any) => { if (props.nodeConfig.conditionNodes.length == 1) { if (props.nodeConfig.childNode) { if (props.nodeConfig.conditionNodes[0].childNode) { - reData( - props.nodeConfig.conditionNodes[0].childNode, - props.nodeConfig.childNode - ); + reData(props.nodeConfig.conditionNodes[0].childNode, props.nodeConfig.childNode); } else { // eslint-disable-next-line vue/no-mutating-props - props.nodeConfig.conditionNodes[0].childNode = - props.nodeConfig.childNode; + props.nodeConfig.conditionNodes[0].childNode = props.nodeConfig.childNode; } } emits("update:nodeConfig", props.nodeConfig.conditionNodes[0].childNode); @@ -136,8 +131,7 @@ const reData = (data: any, addData: any) => { const setPerson = (priorityLevel: any) => { var { type } = props.nodeConfig; -// console.log("选中节点--->",type,props.nodeConfig) - + // console.log("选中节点--->",type,props.nodeConfig) if (type == 0) { setPromoter(true); @@ -183,7 +177,7 @@ const arrTransfer = (index: any, type = 1) => { 1, props.nodeConfig.conditionNodes[index] )[0]; - props.nodeConfig.conditionNodes.map((item:any, index:any) => { + props.nodeConfig.conditionNodes.map((item: any, index: any) => { item.priorityLevel = index + 1; }); resetConditionNodesErr(); @@ -234,10 +228,7 @@ onMounted(() => { " > -
+
{{ nodeConfig.nodeName }} @@ -252,18 +243,26 @@ onMounted(() => { > - + - {{nodeConfig.nodeName}} + {{ + nodeConfig.nodeName + }}
- 请选择{{ defaultText }} + 请选择{{ defaultText }} {{ showText }}
@@ -292,11 +291,7 @@ onMounted(() => { class="auto-judge" :class="isTried && item.error ? 'error active' : ''" > -
+
<
@@ -309,15 +304,10 @@ onMounted(() => { @blur="blurEvent(index)" @focus="$event.currentTarget.select()" /> - {{ item.nodeName }} - {{ + item.nodeName + }} + 优先级{{ item.priorityLevel }} @@ -336,10 +326,7 @@ onMounted(() => {
- +
@@ -354,12 +341,15 @@ onMounted(() => { - + - + diff --git a/src/views/sysworkflow/lowcodepage/appPage/appPageForm/pageFlow.vue b/src/views/sysworkflow/lowcodepage/appPage/appPageForm/pageFlow.vue index 7f91ff1..a2eb922 100644 --- a/src/views/sysworkflow/lowcodepage/appPage/appPageForm/pageFlow.vue +++ b/src/views/sysworkflow/lowcodepage/appPage/appPageForm/pageFlow.vue @@ -3,658 +3,692 @@ @ 时间: 2024-05-07 15:07:51 @ 备注: 表单流程 --> - - diff --git a/src/views/sysworkflow/lowcodepage/workFlow.vue b/src/views/sysworkflow/lowcodepage/workFlow.vue index 2c6bf98..6643a53 100644 --- a/src/views/sysworkflow/lowcodepage/workFlow.vue +++ b/src/views/sysworkflow/lowcodepage/workFlow.vue @@ -3,75 +3,86 @@ @ 时间: 2024-03-11 14:46:00 @ 备注: 工作流 --> - -