Merge branch 'qingban-flow-dev' of http://maven.jgiot.com:7012/jiaxiaoqiang/JG-ADMIN-TEMP into qingban-flow-dev

src/components/MyFlow/src/leftDrags/workflow/configs.ts

@@ -21,12 +21,6 @@ export const dragNodes = ref<HJInterNodeData[]>([
   //   },
   // },
   {
-    type: HJNodeType.workFlow,
-    data: {
-      label: "审核人",
-    },
-  },
-  {
     type: HJNodeType.wfStart,
     data: {
       label: "开始",
@@ -38,4 +32,10 @@ export const dragNodes = ref<HJInterNodeData[]>([
       label: "结束",
     },
   },
+  {
+    type: HJNodeType.workFlow,
+    data: {
+      label: "审核节点",
+    },
+  },
 ]);

src/components/MyFlow/src/nodes/com/operationHeader.vue

@@ -15,7 +15,7 @@ const editClick = () => {
 </script>
 
 <template>
-  <div class="box-header">
+  <div class="box-header" @click.prevent="editClick">
     <div> {{ props?.data?.label ?? "" }}</div>
     <div class="right-btns">
       <el-icon :size="18" class="right-icon">

src/components/MyFlow/src/nodes/workflow/WorkFlowNode.vue

@@ -22,7 +22,7 @@ onMounted(() => {
     </template>
     <template #default>
       <div class="content-text">
-        {{ props.data?.information?.desc ?? '暂无描述' }}
+        {{ props.data?.information?.name ?? '暂无描述' }}
       </div>
     </template>
 

src/components/MyFlow/src/types/comTypes.ts

@@ -24,7 +24,7 @@ export enum HJNodeType {
   numberFunction = "number-function",
   numberResult = "number-result",
   //   工作流相关
-  workFlow = "work-flow",
+  workFlow = "wf-flow",
   wfStart = "wf-start",
   wfEnd = "wf-end",
   //   公共 通用 上面是header 下面是content

src/views/base/apply/apply.vue

@@ -13,19 +13,19 @@
           >
             <el-card>
               <h4>阶段：{{ item.currentStep }}
-                <el-tag v-if="item.currentType === 'start'" type="success">发起</el-tag>
-                <el-tag v-if="item.currentType === 'end'" type="success">结束</el-tag>
-                <el-tag v-if="item.currentType === 'audit' && item.state === '0'" type="info">待审核</el-tag>
-                <el-tag v-if="item.currentType === 'audit' && item.state === '1'" type="success">通过</el-tag>
-                <el-tag v-if="item.currentType === 'audit' && item.state === '-1'" type="error">驳回</el-tag>
-                <el-tag v-if="item.currentType === 'audit' && item.state === '2'" type="error">已撤回</el-tag>
+                <el-tag v-if="item.currentType === 'wf-start'" type="success">发起</el-tag>
+                <el-tag v-if="item.currentType === 'wf-end'" type="success">结束</el-tag>
+                <el-tag v-if="item.currentType === 'wf-flow' && item.state === '0'" type="info">待审核</el-tag>
+                <el-tag v-if="item.currentType === 'wf-flow' && item.state === '1'" type="success">通过</el-tag>
+                <el-tag v-if="item.currentType === 'wf-flow' && item.state === '-1'" type="error">驳回</el-tag>
+                <el-tag v-if="item.currentType === 'wf-flow' && item.state === '2'" type="error">已撤回</el-tag>
               </h4>
-              <h4 v-if="item.currentType !== 'end'">
+              <h4 v-if="item.currentType !== 'wf-end'">
                 审核意见：{{ item.opinion }}
               </h4>
-              <h4 v-if="item.currentType !== 'end'">接收时间：{{ item.created }}</h4>
-              <h4 v-if="item.currentType !== 'end'">审核时间：{{ item.auditTime }}</h4>
-              <p v-if="item.currentType !== 'end'">操作人：{{ item.auditUser }}</p>
+              <h4 v-if="item.currentType !== 'wf-end'">接收时间：{{ item.created }}</h4>
+              <h4 v-if="item.currentType !== 'wf-end'">审核时间：{{ item.auditTime }}</h4>
+              <p v-if="item.currentType !== 'wf-end'">操作人：{{ item.auditUser }}</p>
             </el-card>
           </el-timeline-item>
         </template>

src/views/flow/common/LookFlowStep.vue

@@ -46,19 +46,19 @@ defineExpose({
             >
               <el-card>
                 <h4><el-text class="mx-1">{{activity.currentStep}}</el-text>
-                  <el-tag v-if="activity.currentType === 'start'" type="success">发起</el-tag>
-                  <el-tag v-if="activity.currentType === 'end'" type="success">结束</el-tag>
-                  <el-tag v-if="activity.currentType === 'audit' && activity.state === '0'" type="info">待审核</el-tag>
-                  <el-tag v-if="activity.currentType === 'audit' && activity.state === '1'" type="success">通过</el-tag>
-                  <el-tag v-if="activity.currentType === 'audit' && activity.state === '-1'" type="error">驳回</el-tag>
-                  <el-tag v-if="activity.currentType === 'audit' && activity.state === '2'" type="error">已撤回</el-tag>
+                  <el-tag v-if="activity.currentType === 'wf-start'" type="success">发起</el-tag>
+                  <el-tag v-if="activity.currentType === 'wf-end'" type="success">结束</el-tag>
+                  <el-tag v-if="activity.currentType === 'wf-flow' && activity.state === '0'" type="info">待审核</el-tag>
+                  <el-tag v-if="activity.currentType === 'wf-flow' && activity.state === '1'" type="success">通过</el-tag>
+                  <el-tag v-if="activity.currentType === 'wf-flow' && activity.state === '-1'" type="error">驳回</el-tag>
+                  <el-tag v-if="activity.currentType === 'wf-flow' && activity.state === '2'" type="error">已撤回</el-tag>
                 </h4>
                 <p>
                   <el-text class="mx-1" v-if="activity.currentStep=='开始'">发起人员:{{activity.auditUser}}</el-text>
                   <el-text class="mx-1" v-if="activity.currentStep !== '结束' && activity.currentStep !=='开始'">接收人员:{{activity.auditUser}}</el-text>
                 </p>
                 <p><el-text class="mx-1">接收时间:{{activity.created}}</el-text></p>
-                <p><el-text class="mx-1" v-if="activity.auditTime">办结时间:{{activity.auditTime}}</el-text></p>
+                <p><el-text class="mx-1" v-if="activity.auditTime">办理时间:{{activity.auditTime}}</el-text></p>
                 <p><el-text class="mx-1" v-if="activity.auditTime">办理意见:{{activity.opinion}}</el-text></p>
               </el-card>
             </el-timeline-item>

src/views/flow/definition/com/edit.vue

@@ -35,32 +35,38 @@ const userTypeOption = ref([
 
 const rules = reactive<FormRules<any>>({
   name: [
-    { required: true, message: "Please input Activity name", trigger: "blur" },
+    { required: true, message: "请输入审核节点名称", trigger: "blur" },
   ],
-  desc: [
-    { required: true, message: "Please input activity form", trigger: "blur" },
+  userType: [
+    { required: true, message: "人员类型不能为空", trigger: "blur" },
+  ],
+  candidateUsers: [
+    { required: true, message: "候选人员不能为空", trigger: "blur" },
+  ],
+  assignee: [
+    { required: true, message: "指定人员不能为空", trigger: "blur" },
+  ],
+  candidateGroups: [
+    { required: true, message: "指定角色不能为空", trigger: "blur" },
   ],
 });
 
-const submitForm = async (formEl: FormInstance | undefined) => {
-  // if (!formEl) return
-  // await formEl.validate((valid, fields) => {
-  //   if (valid) {
-  //     console.log('submit!')
-  //   } else {
-  //     console.log('error submit!', fields)
-  //   }
-  // })
-
-  if (flowRef.value && flowRef.value.updateNodeData && selectedNode.value) {
-    selectedNode.value.data.information = JSON.parse(
-      JSON.stringify(formData.value)
-    );
-    flowRef.value.updateNodeData(
-      JSON.parse(JSON.stringify(markRaw(selectedNode.value)))
-    );
-    cancel();
-  }
+const submitForm =  () => {
+  ruleFormRef.value.validate(async (valid, fields) => {
+    if (valid) {
+      if (flowRef.value && flowRef.value.updateNodeData && selectedNode.value) {
+        selectedNode.value.data.information = JSON.parse(
+            JSON.stringify(formData.value)
+        );
+        flowRef.value.updateNodeData(
+            JSON.parse(JSON.stringify(markRaw(selectedNode.value)))
+        );
+        cancel();
+      }
+    } else {
+      console.log('error submit!', fields)
+    }
+  })
 };
 
 const cancel = () => {
@@ -110,10 +116,14 @@ const onNodeOperation = async (name: HJMethodName, node: HJNodeData): void => {
 
     selectedNode.value = JSON.parse(JSON.stringify(node));
 
-    if (selectedNode.value && selectedNode.value.data.information) {
-      formData.value = JSON.parse(
-        JSON.stringify(selectedNode.value.data.information)
-      );
+    if (selectedNode.value) {
+      if(selectedNode.value.data.information){
+        formData.value = JSON.parse(
+            JSON.stringify(selectedNode.value.data.information)
+        );
+      }else{
+        formData.value = {}
+      }
     }
 
     console.log("selectedNode", selectedNode.value);
@@ -165,6 +175,7 @@ const testGetCurrentData = () => {
         class="demo-ruleForm"
         :size="formSize"
         status-icon
+        :rules="rules"
         v-show="infoVisible"
       >
         <el-form-item label="节点名称" prop="name">
@@ -229,8 +240,8 @@ const testGetCurrentData = () => {
         </el-form-item>
 
         <el-form-item>
-          <el-button type="primary" @click="submitForm(ruleFormRef)">
-            保存
+          <el-button type="primary" @click="submitForm">
+            确定
           </el-button>
           <el-button @click="cancel">取消</el-button>
         </el-form-item>