From 627b822f1546770e31542e993570c9482fc179ca Mon Sep 17 00:00:00 2001
From: jason <2667446@qq.com>
Date: Wed, 27 Mar 2024 09:27:14 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=BF=E9=92=89=E9=92=89=E8=AE=BE=E8=AE=A1?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B=E5=90=8E=E7=AB=AF=E6=8E=A5=E5=85=A5-10%?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/bpm/simple/index.ts                   |  9 +++++
 .../SimpleProcessDesigner/src/addNode.vue     |  7 ++--
 .../src/drawer/approverDrawer.vue             |  2 +-
 .../SimpleProcessDesigner/src/nodeWrap.vue    |  3 +-
 src/views/bpm/model/index.vue                 |  4 +-
 src/views/bpm/simpleWorkflow/index.vue        | 39 +++++++++++++++----
 6 files changed, 50 insertions(+), 14 deletions(-)
 create mode 100644 src/api/bpm/simple/index.ts

diff --git a/src/api/bpm/simple/index.ts b/src/api/bpm/simple/index.ts
new file mode 100644
index 00000000..93307f56
--- /dev/null
+++ b/src/api/bpm/simple/index.ts
@@ -0,0 +1,9 @@
+import request from '@/config/axios'
+
+
+export const saveBpmSimpleModel = async (data) => {
+  return await request.post({
+    url: '/bpm/simple/save',
+    data: data
+  })
+}
\ No newline at end of file
diff --git a/src/components/SimpleProcessDesigner/src/addNode.vue b/src/components/SimpleProcessDesigner/src/addNode.vue
index 9686165c..ec5baf16 100644
--- a/src/components/SimpleProcessDesigner/src/addNode.vue
+++ b/src/components/SimpleProcessDesigner/src/addNode.vue
@@ -10,6 +10,7 @@
             </div>
             <p>审批人</p>
           </a>
+          <!--  TODO 暂时去掉未完成
           <a class="add-node-popover-item notifier" @click="addType(2)">
             <div class="item-wrapper">
               <span class="iconfont"></span>
@@ -22,6 +23,7 @@
             </div>
             <p>条件分支</p>
           </a>
+          -->
         </div>
         <template #reference>
           <button class="btn" type="button">
@@ -71,8 +73,7 @@ const addType = (type) => {
           candidateStrategy: undefined,
           candidateParam: []
         },
-        childNode: props.childNodeP,
-        nodeUserList: []
+        // childNode: props.childNodeP
       }
     } else if (type == 2) {
       data = {
@@ -97,7 +98,7 @@ const addType = (type) => {
           priorityLevel: 1,
           conditionList: [],
           nodeUserList: [],
-          childNode: props.childNodeP
+          // childNode: props.childNodeP
         },
         {
           name: '条件2',
diff --git a/src/components/SimpleProcessDesigner/src/drawer/approverDrawer.vue b/src/components/SimpleProcessDesigner/src/drawer/approverDrawer.vue
index 5a19d52e..b5c32cbb 100644
--- a/src/components/SimpleProcessDesigner/src/drawer/approverDrawer.vue
+++ b/src/components/SimpleProcessDesigner/src/drawer/approverDrawer.vue
@@ -250,7 +250,7 @@ const saveApprover = () => {
   closeDrawer()
 }
 const saveConfig = () => {
-  console.log('before userTaskConfig is ', userTaskConfig.value.id)
+
   const rawConfig = toRaw(userTaskConfig.value)
   rawConfig.value.attributes = toRaw(candidateConfig.value)
   rawConfig.flag = true
diff --git a/src/components/SimpleProcessDesigner/src/nodeWrap.vue b/src/components/SimpleProcessDesigner/src/nodeWrap.vue
index ecfbdfec..210cb84f 100644
--- a/src/components/SimpleProcessDesigner/src/nodeWrap.vue
+++ b/src/components/SimpleProcessDesigner/src/nodeWrap.vue
@@ -295,7 +295,8 @@ const setPerson = (priorityLevel) => {
     }
     setUserTaskConfig({
       value: {
-        ...JSON.parse(JSON.stringify(props.nodeConfig))
+        ...JSON.parse(JSON.stringify(props.nodeConfig)),
+        id: 'Activity_'+_uid,
       },
       flag: false,
       id: _uid,
diff --git a/src/views/bpm/model/index.vue b/src/views/bpm/model/index.vue
index d616f2c0..e7f4ce38 100644
--- a/src/views/bpm/model/index.vue
+++ b/src/views/bpm/model/index.vue
@@ -74,7 +74,7 @@
       </el-table-column>
       <el-table-column label="流程图标" align="center" prop="icon" width="100">
         <template #default="scope">
-          <el-image :src="scope.row.icon" class="w-32px h-32px" />
+          <el-image :src="scope.row.icon" class="h-32px w-32px" />
         </template>
       </el-table-column>
       <el-table-column label="流程分类" align="center" prop="categoryName" width="100" />
@@ -165,7 +165,7 @@
           <el-button
             link
             type="primary"
-            @click="handleSimpleDesign(scope.row.id)"
+            @click="handleSimpleDesign(scope.row)"
             v-hasPermi="['bpm:model:update']"
           >
             仿钉钉设计流程
diff --git a/src/views/bpm/simpleWorkflow/index.vue b/src/views/bpm/simpleWorkflow/index.vue
index 89132787..c1cc111a 100644
--- a/src/views/bpm/simpleWorkflow/index.vue
+++ b/src/views/bpm/simpleWorkflow/index.vue
@@ -5,7 +5,7 @@
       <el-row>
         <el-col :span="20"/>
         <el-col :span="4">
-          <el-button type="primary" size="small" @click="test">测试</el-button>
+          <el-button type="primary" size="small" @click="test">保存(用于测试，还未完成)</el-button>
         </el-col>
       </el-row>
       <div class="box-scale">
@@ -23,20 +23,45 @@
 import nodeWrap from '@/components/SimpleProcessDesigner/src/nodeWrap.vue'
 import approverDrawer from '@/components/SimpleProcessDesigner/src/drawer/approverDrawer.vue'
 import { ref } from 'vue'
+import { saveBpmSimpleModel } from '@/api/bpm/simple'
 defineOptions({ name: 'SimpleWorkflowDesignEditor' })
+const uid = getCurrentInstance().uid;
+const router = useRouter() // 路由
+const { query } = useRoute() // 路由的查询
+const modelId = query.modelId;
+const message = useMessage() // 国际化
 const nodeConfig = ref({
   name: '发起人',
   type: 0,
-  id: 'root',
-  nodeUserList: [],
+  id: 'Activity_'+uid,
   attributes: {
-    "candidateStrategy": 70
+    "candidateStrategy": '70'
   },
-  childNode: {},
+  childNode: undefined
 })
-const test = ()=> {
-  console.log('json format', toRaw(nodeConfig.value))
+const test = async ()=> {
+  if (!modelId) {
+    message.error('缺少模型 modelId 编号')
+    return
+  }
+  const data = {
+    modelId: modelId,
+    simpleModelBody: toRaw(nodeConfig.value)
+  }
+  console.log('request json data is ', data)
+  const result =  await saveBpmSimpleModel(data);
+  console.log('the result is ', result)
+  if(result){
+    message.success('修改成功')
+  } else {
+    message.alert('修改失败');
+  }
+  close ()
 }
+const close = () => {
+  router.push({ path: '/bpm/manager/model' })
+}
+
 </script>
 <style>
 @import url('@/components/SimpleProcessDesigner/theme/workflow.css');