diff --git a/src/components.d.ts b/src/components.d.ts index dbb2458..a832874 100644 --- a/src/components.d.ts +++ b/src/components.d.ts @@ -8,12 +8,14 @@ declare module '@vue/runtime-core' { export interface GlobalComponents { AddNode: typeof import('./components/workFlow/addNode.vue')['default'] + AddNodeBan: typeof import('./components/workFlow/addNodeBan.vue')['default'] AppContainer: typeof import('./components/AppContainer/index.vue')['default'] ApproverDrawer: typeof import('./components/drawer/approverDrawer.vue')['default'] Auth: typeof import('./components/Auth/index.vue')['default'] AuthAll: typeof import('./components/AuthAll/index.vue')['default'] BatchActionBar: typeof import('./components/BatchActionBar/index.vue')['default'] ConditionDrawer: typeof import('./components/drawer/conditionDrawer.vue')['default'] + copy: typeof import('./components/workFlow/nodeWrap copy.vue')['default'] CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default'] Copyright: typeof import('./components/Copyright/index.vue')['default'] DeptSelect: typeof import('./components/DeptSelect/index.vue')['default'] @@ -27,6 +29,7 @@ ImagesUpload: typeof import('./components/ImagesUpload/index.vue')['default'] ImageUpload: typeof import('./components/ImageUpload/index.vue')['default'] NodeWrap: typeof import('./components/workFlow/nodeWrap.vue')['default'] + NodeWrapBan: typeof import('./components/workFlow/nodeWrapBan.vue')['default'] NormalTable: typeof import('./components/NormalTable/index.vue')['default'] PageHeader: typeof import('./components/PageHeader/index.vue')['default'] PageMain: typeof import('./components/PageMain/index.vue')['default'] diff --git a/src/components.d.ts b/src/components.d.ts index dbb2458..a832874 100644 --- a/src/components.d.ts +++ b/src/components.d.ts @@ -8,12 +8,14 @@ declare module '@vue/runtime-core' { export interface GlobalComponents { AddNode: typeof import('./components/workFlow/addNode.vue')['default'] + AddNodeBan: typeof import('./components/workFlow/addNodeBan.vue')['default'] AppContainer: typeof import('./components/AppContainer/index.vue')['default'] ApproverDrawer: typeof import('./components/drawer/approverDrawer.vue')['default'] Auth: typeof import('./components/Auth/index.vue')['default'] AuthAll: typeof import('./components/AuthAll/index.vue')['default'] BatchActionBar: typeof import('./components/BatchActionBar/index.vue')['default'] ConditionDrawer: typeof import('./components/drawer/conditionDrawer.vue')['default'] + copy: typeof import('./components/workFlow/nodeWrap copy.vue')['default'] CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default'] Copyright: typeof import('./components/Copyright/index.vue')['default'] DeptSelect: typeof import('./components/DeptSelect/index.vue')['default'] @@ -27,6 +29,7 @@ ImagesUpload: typeof import('./components/ImagesUpload/index.vue')['default'] ImageUpload: typeof import('./components/ImageUpload/index.vue')['default'] NodeWrap: typeof import('./components/workFlow/nodeWrap.vue')['default'] + NodeWrapBan: typeof import('./components/workFlow/nodeWrapBan.vue')['default'] NormalTable: typeof import('./components/NormalTable/index.vue')['default'] PageHeader: typeof import('./components/PageHeader/index.vue')['default'] PageMain: typeof import('./components/PageMain/index.vue')['default'] diff --git a/src/components/workFlow/addNodeBan.vue b/src/components/workFlow/addNodeBan.vue new file mode 100644 index 0000000..5f996d1 --- /dev/null +++ b/src/components/workFlow/addNodeBan.vue @@ -0,0 +1,240 @@ + + + + + + + diff --git a/src/components.d.ts b/src/components.d.ts index dbb2458..a832874 100644 --- a/src/components.d.ts +++ b/src/components.d.ts @@ -8,12 +8,14 @@ declare module '@vue/runtime-core' { export interface GlobalComponents { AddNode: typeof import('./components/workFlow/addNode.vue')['default'] + AddNodeBan: typeof import('./components/workFlow/addNodeBan.vue')['default'] AppContainer: typeof import('./components/AppContainer/index.vue')['default'] ApproverDrawer: typeof import('./components/drawer/approverDrawer.vue')['default'] Auth: typeof import('./components/Auth/index.vue')['default'] AuthAll: typeof import('./components/AuthAll/index.vue')['default'] BatchActionBar: typeof import('./components/BatchActionBar/index.vue')['default'] ConditionDrawer: typeof import('./components/drawer/conditionDrawer.vue')['default'] + copy: typeof import('./components/workFlow/nodeWrap copy.vue')['default'] CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default'] Copyright: typeof import('./components/Copyright/index.vue')['default'] DeptSelect: typeof import('./components/DeptSelect/index.vue')['default'] @@ -27,6 +29,7 @@ ImagesUpload: typeof import('./components/ImagesUpload/index.vue')['default'] ImageUpload: typeof import('./components/ImageUpload/index.vue')['default'] NodeWrap: typeof import('./components/workFlow/nodeWrap.vue')['default'] + NodeWrapBan: typeof import('./components/workFlow/nodeWrapBan.vue')['default'] NormalTable: typeof import('./components/NormalTable/index.vue')['default'] PageHeader: typeof import('./components/PageHeader/index.vue')['default'] PageMain: typeof import('./components/PageMain/index.vue')['default'] diff --git a/src/components/workFlow/addNodeBan.vue b/src/components/workFlow/addNodeBan.vue new file mode 100644 index 0000000..5f996d1 --- /dev/null +++ b/src/components/workFlow/addNodeBan.vue @@ -0,0 +1,240 @@ + + + + + + + diff --git a/src/components/workFlow/nodeWrapBan.vue b/src/components/workFlow/nodeWrapBan.vue new file mode 100644 index 0000000..2de6650 --- /dev/null +++ b/src/components/workFlow/nodeWrapBan.vue @@ -0,0 +1,229 @@ + + + + + diff --git a/src/components.d.ts b/src/components.d.ts index dbb2458..a832874 100644 --- a/src/components.d.ts +++ b/src/components.d.ts @@ -8,12 +8,14 @@ declare module '@vue/runtime-core' { export interface GlobalComponents { AddNode: typeof import('./components/workFlow/addNode.vue')['default'] + AddNodeBan: typeof import('./components/workFlow/addNodeBan.vue')['default'] AppContainer: typeof import('./components/AppContainer/index.vue')['default'] ApproverDrawer: typeof import('./components/drawer/approverDrawer.vue')['default'] Auth: typeof import('./components/Auth/index.vue')['default'] AuthAll: typeof import('./components/AuthAll/index.vue')['default'] BatchActionBar: typeof import('./components/BatchActionBar/index.vue')['default'] ConditionDrawer: typeof import('./components/drawer/conditionDrawer.vue')['default'] + copy: typeof import('./components/workFlow/nodeWrap copy.vue')['default'] CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default'] Copyright: typeof import('./components/Copyright/index.vue')['default'] DeptSelect: typeof import('./components/DeptSelect/index.vue')['default'] @@ -27,6 +29,7 @@ ImagesUpload: typeof import('./components/ImagesUpload/index.vue')['default'] ImageUpload: typeof import('./components/ImageUpload/index.vue')['default'] NodeWrap: typeof import('./components/workFlow/nodeWrap.vue')['default'] + NodeWrapBan: typeof import('./components/workFlow/nodeWrapBan.vue')['default'] NormalTable: typeof import('./components/NormalTable/index.vue')['default'] PageHeader: typeof import('./components/PageHeader/index.vue')['default'] PageMain: typeof import('./components/PageMain/index.vue')['default'] diff --git a/src/components/workFlow/addNodeBan.vue b/src/components/workFlow/addNodeBan.vue new file mode 100644 index 0000000..5f996d1 --- /dev/null +++ b/src/components/workFlow/addNodeBan.vue @@ -0,0 +1,240 @@ + + + + + + + diff --git a/src/components/workFlow/nodeWrapBan.vue b/src/components/workFlow/nodeWrapBan.vue new file mode 100644 index 0000000..2de6650 --- /dev/null +++ b/src/components/workFlow/nodeWrapBan.vue @@ -0,0 +1,229 @@ + + + + + diff --git a/src/css/workflow.css b/src/css/workflow.css index 43a0bf8..eee3dec 100644 --- a/src/css/workflow.css +++ b/src/css/workflow.css @@ -1677,6 +1677,9 @@ } .dingflow-design .end-node { + display: flex; + justify-content: center; + align-items: center; border-radius: 50%; font-size: 14px; color: rgb(25 31 37 / 40%); diff --git a/src/components.d.ts b/src/components.d.ts index dbb2458..a832874 100644 --- a/src/components.d.ts +++ b/src/components.d.ts @@ -8,12 +8,14 @@ declare module '@vue/runtime-core' { export interface GlobalComponents { AddNode: typeof import('./components/workFlow/addNode.vue')['default'] + AddNodeBan: typeof import('./components/workFlow/addNodeBan.vue')['default'] AppContainer: typeof import('./components/AppContainer/index.vue')['default'] ApproverDrawer: typeof import('./components/drawer/approverDrawer.vue')['default'] Auth: typeof import('./components/Auth/index.vue')['default'] AuthAll: typeof import('./components/AuthAll/index.vue')['default'] BatchActionBar: typeof import('./components/BatchActionBar/index.vue')['default'] ConditionDrawer: typeof import('./components/drawer/conditionDrawer.vue')['default'] + copy: typeof import('./components/workFlow/nodeWrap copy.vue')['default'] CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default'] Copyright: typeof import('./components/Copyright/index.vue')['default'] DeptSelect: typeof import('./components/DeptSelect/index.vue')['default'] @@ -27,6 +29,7 @@ ImagesUpload: typeof import('./components/ImagesUpload/index.vue')['default'] ImageUpload: typeof import('./components/ImageUpload/index.vue')['default'] NodeWrap: typeof import('./components/workFlow/nodeWrap.vue')['default'] + NodeWrapBan: typeof import('./components/workFlow/nodeWrapBan.vue')['default'] NormalTable: typeof import('./components/NormalTable/index.vue')['default'] PageHeader: typeof import('./components/PageHeader/index.vue')['default'] PageMain: typeof import('./components/PageMain/index.vue')['default'] diff --git a/src/components/workFlow/addNodeBan.vue b/src/components/workFlow/addNodeBan.vue new file mode 100644 index 0000000..5f996d1 --- /dev/null +++ b/src/components/workFlow/addNodeBan.vue @@ -0,0 +1,240 @@ + + + + + + + diff --git a/src/components/workFlow/nodeWrapBan.vue b/src/components/workFlow/nodeWrapBan.vue new file mode 100644 index 0000000..2de6650 --- /dev/null +++ b/src/components/workFlow/nodeWrapBan.vue @@ -0,0 +1,229 @@ + + + + + diff --git a/src/css/workflow.css b/src/css/workflow.css index 43a0bf8..eee3dec 100644 --- a/src/css/workflow.css +++ b/src/css/workflow.css @@ -1677,6 +1677,9 @@ } .dingflow-design .end-node { + display: flex; + justify-content: center; + align-items: center; border-radius: 50%; font-size: 14px; color: rgb(25 31 37 / 40%); diff --git a/src/views/setting.vue b/src/views/setting.vue index 5cd7866..1376467 100644 --- a/src/views/setting.vue +++ b/src/views/setting.vue @@ -9,9 +9,14 @@ import copyerDrawer from '@/components/drawer/copyerDrawer.vue' import conditionDrawer from '@/components/drawer/conditionDrawer.vue' import { getWorkFlowData, setWorkFlowData } from '@/plugins/api.js' +const props = defineProps({ + allowEditNode: { + type: Boolean, + default: true, + }, +}) const workFlowStore = useWorkFlowStore() const router = useRouter() - const tipList = ref([]) const tipVisible = ref(false) const nowVal = ref(100) @@ -138,13 +143,18 @@ {{ nowVal }}%
--> -
- + +
+
-
-
- 流程结束 -
+

结束

+
+
+ +
+ +
+

结束

@@ -163,6 +173,31 @@ justify-content: flex-end; margin: 20px; } + +.box-scale { + display: flex; + justify-content: center; + align-items: center; +} +// .end-node-circle { +.end-node { + justify-content: center; + flex-direction: column; + align-content: center; + + p { + width: 280px; + height: 40px; + line-height: 40px; + color: #fff; + text-align: center; + background-color: #8cafff; + border-radius: 4px; + font-size: 14px; + margin: 0; + } +} +// } + + diff --git a/src/components/workFlow/nodeWrapBan.vue b/src/components/workFlow/nodeWrapBan.vue new file mode 100644 index 0000000..2de6650 --- /dev/null +++ b/src/components/workFlow/nodeWrapBan.vue @@ -0,0 +1,229 @@ + + + + + diff --git a/src/css/workflow.css b/src/css/workflow.css index 43a0bf8..eee3dec 100644 --- a/src/css/workflow.css +++ b/src/css/workflow.css @@ -1677,6 +1677,9 @@ } .dingflow-design .end-node { + display: flex; + justify-content: center; + align-items: center; border-radius: 50%; font-size: 14px; color: rgb(25 31 37 / 40%); diff --git a/src/views/setting.vue b/src/views/setting.vue index 5cd7866..1376467 100644 --- a/src/views/setting.vue +++ b/src/views/setting.vue @@ -9,9 +9,14 @@ import copyerDrawer from '@/components/drawer/copyerDrawer.vue' import conditionDrawer from '@/components/drawer/conditionDrawer.vue' import { getWorkFlowData, setWorkFlowData } from '@/plugins/api.js' +const props = defineProps({ + allowEditNode: { + type: Boolean, + default: true, + }, +}) const workFlowStore = useWorkFlowStore() const router = useRouter() - const tipList = ref([]) const tipVisible = ref(false) const nowVal = ref(100) @@ -138,13 +143,18 @@ {{ nowVal }}%
--> -
- + +
+
-
-
- 流程结束 -
+

结束

+
+
+ +
+ +
+

结束

@@ -163,6 +173,31 @@ justify-content: flex-end; margin: 20px; } + +.box-scale { + display: flex; + justify-content: center; + align-items: center; +} +// .end-node-circle { +.end-node { + justify-content: center; + flex-direction: column; + align-content: center; + + p { + width: 280px; + height: 40px; + line-height: 40px; + color: #fff; + text-align: center; + background-color: #8cafff; + border-radius: 4px; + font-size: 14px; + margin: 0; + } +} +// } diff --git a/src/components.d.ts b/src/components.d.ts index dbb2458..a832874 100644 --- a/src/components.d.ts +++ b/src/components.d.ts @@ -8,12 +8,14 @@ declare module '@vue/runtime-core' { export interface GlobalComponents { AddNode: typeof import('./components/workFlow/addNode.vue')['default'] + AddNodeBan: typeof import('./components/workFlow/addNodeBan.vue')['default'] AppContainer: typeof import('./components/AppContainer/index.vue')['default'] ApproverDrawer: typeof import('./components/drawer/approverDrawer.vue')['default'] Auth: typeof import('./components/Auth/index.vue')['default'] AuthAll: typeof import('./components/AuthAll/index.vue')['default'] BatchActionBar: typeof import('./components/BatchActionBar/index.vue')['default'] ConditionDrawer: typeof import('./components/drawer/conditionDrawer.vue')['default'] + copy: typeof import('./components/workFlow/nodeWrap copy.vue')['default'] CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default'] Copyright: typeof import('./components/Copyright/index.vue')['default'] DeptSelect: typeof import('./components/DeptSelect/index.vue')['default'] @@ -27,6 +29,7 @@ ImagesUpload: typeof import('./components/ImagesUpload/index.vue')['default'] ImageUpload: typeof import('./components/ImageUpload/index.vue')['default'] NodeWrap: typeof import('./components/workFlow/nodeWrap.vue')['default'] + NodeWrapBan: typeof import('./components/workFlow/nodeWrapBan.vue')['default'] NormalTable: typeof import('./components/NormalTable/index.vue')['default'] PageHeader: typeof import('./components/PageHeader/index.vue')['default'] PageMain: typeof import('./components/PageMain/index.vue')['default'] diff --git a/src/components/workFlow/addNodeBan.vue b/src/components/workFlow/addNodeBan.vue new file mode 100644 index 0000000..5f996d1 --- /dev/null +++ b/src/components/workFlow/addNodeBan.vue @@ -0,0 +1,240 @@ + + + + + + + diff --git a/src/components/workFlow/nodeWrapBan.vue b/src/components/workFlow/nodeWrapBan.vue new file mode 100644 index 0000000..2de6650 --- /dev/null +++ b/src/components/workFlow/nodeWrapBan.vue @@ -0,0 +1,229 @@ + + + + + diff --git a/src/css/workflow.css b/src/css/workflow.css index 43a0bf8..eee3dec 100644 --- a/src/css/workflow.css +++ b/src/css/workflow.css @@ -1677,6 +1677,9 @@ } .dingflow-design .end-node { + display: flex; + justify-content: center; + align-items: center; border-radius: 50%; font-size: 14px; color: rgb(25 31 37 / 40%); diff --git a/src/views/setting.vue b/src/views/setting.vue index 5cd7866..1376467 100644 --- a/src/views/setting.vue +++ b/src/views/setting.vue @@ -9,9 +9,14 @@ import copyerDrawer from '@/components/drawer/copyerDrawer.vue' import conditionDrawer from '@/components/drawer/conditionDrawer.vue' import { getWorkFlowData, setWorkFlowData } from '@/plugins/api.js' +const props = defineProps({ + allowEditNode: { + type: Boolean, + default: true, + }, +}) const workFlowStore = useWorkFlowStore() const router = useRouter() - const tipList = ref([]) const tipVisible = ref(false) const nowVal = ref(100) @@ -138,13 +143,18 @@ {{ nowVal }}%
--> -
- + +
+
-
-
- 流程结束 -
+

结束

+
+
+ +
+ +
+

结束

@@ -163,6 +173,31 @@ justify-content: flex-end; margin: 20px; } + +.box-scale { + display: flex; + justify-content: center; + align-items: center; +} +// .end-node-circle { +.end-node { + justify-content: center; + flex-direction: column; + align-content: center; + + p { + width: 280px; + height: 40px; + line-height: 40px; + color: #fff; + text-align: center; + background-color: #8cafff; + border-radius: 4px; + font-size: 14px; + margin: 0; + } +} +// } diff --git a/src/views/system/process/editProcess.vue b/src/views/system/process/editProcess.vue index c172ada..235a18a 100644 --- a/src/views/system/process/editProcess.vue +++ b/src/views/system/process/editProcess.vue @@ -9,9 +9,9 @@ const emits = defineEmits(['close']) const ruleFormRef = ref() const form: Ref = ref({ - number: '', // 编号 - name: '', // 名称 - business: '', // 关联业务 + number: '11111', // 编号 + name: '111', // 名称 + business: 'sss', // 关联业务 desc: '', // 流程描述 selectDecision: '', // 选择的决策 rejectTo: '', // 可驳回至 @@ -139,59 +139,68 @@ 关闭
- - - {{ form.number }} - - - {{ form.name }} - - - {{ form.business }} - - - - - - - - - - - - - - - - - - - - - - - - + + + + + {{ form.number }} + + + + + + + + + + + + + {{ form.name }} + + + + + + + + + + + + + + + + {{ form.business }} + + + + + + + +
+ + +
+
+ + + + + diff --git a/src/components/workFlow/nodeWrapBan.vue b/src/components/workFlow/nodeWrapBan.vue new file mode 100644 index 0000000..2de6650 --- /dev/null +++ b/src/components/workFlow/nodeWrapBan.vue @@ -0,0 +1,229 @@ + + + + + diff --git a/src/css/workflow.css b/src/css/workflow.css index 43a0bf8..eee3dec 100644 --- a/src/css/workflow.css +++ b/src/css/workflow.css @@ -1677,6 +1677,9 @@ } .dingflow-design .end-node { + display: flex; + justify-content: center; + align-items: center; border-radius: 50%; font-size: 14px; color: rgb(25 31 37 / 40%); diff --git a/src/views/setting.vue b/src/views/setting.vue index 5cd7866..1376467 100644 --- a/src/views/setting.vue +++ b/src/views/setting.vue @@ -9,9 +9,14 @@ import copyerDrawer from '@/components/drawer/copyerDrawer.vue' import conditionDrawer from '@/components/drawer/conditionDrawer.vue' import { getWorkFlowData, setWorkFlowData } from '@/plugins/api.js' +const props = defineProps({ + allowEditNode: { + type: Boolean, + default: true, + }, +}) const workFlowStore = useWorkFlowStore() const router = useRouter() - const tipList = ref([]) const tipVisible = ref(false) const nowVal = ref(100) @@ -138,13 +143,18 @@ {{ nowVal }}%
--> -
- + +
+
-
-
- 流程结束 -
+

结束

+
+
+ +
+ +
+

结束

@@ -163,6 +173,31 @@ justify-content: flex-end; margin: 20px; } + +.box-scale { + display: flex; + justify-content: center; + align-items: center; +} +// .end-node-circle { +.end-node { + justify-content: center; + flex-direction: column; + align-content: center; + + p { + width: 280px; + height: 40px; + line-height: 40px; + color: #fff; + text-align: center; + background-color: #8cafff; + border-radius: 4px; + font-size: 14px; + margin: 0; + } +} +// } diff --git a/src/views/system/process/editProcess.vue b/src/views/system/process/editProcess.vue index c172ada..235a18a 100644 --- a/src/views/system/process/editProcess.vue +++ b/src/views/system/process/editProcess.vue @@ -9,9 +9,9 @@ const emits = defineEmits(['close']) const ruleFormRef = ref() const form: Ref = ref({ - number: '', // 编号 - name: '', // 名称 - business: '', // 关联业务 + number: '11111', // 编号 + name: '111', // 名称 + business: 'sss', // 关联业务 desc: '', // 流程描述 selectDecision: '', // 选择的决策 rejectTo: '', // 可驳回至 @@ -139,59 +139,68 @@ 关闭
- - - {{ form.number }} - - - {{ form.name }} - - - {{ form.business }} - - - - - - - - - - - - - - - - - - - - - - - - + + + + + {{ form.number }} + + + + + + + + + + + + + {{ form.name }} + + + + + + + + + + + + + + + + {{ form.business }} + + + + + + + +
- 详情 +