From 0d31b47a5691251e8df6cbe832634612318524c9 Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Sat, 11 May 2024 17:40:47 +0800
Subject: [PATCH] =?UTF-8?q?fix=20:=20=E5=AF=B9=E6=8E=A5=E9=9C=80=E6=B1=82?=
 =?UTF-8?q?=E5=BE=81=E9=9B=86=E5=88=97=E8=A1=A8=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/project-demand/index.js               |  9 +++-
 .../projectdemand/demandcollection/detail.vue |  8 ++--
 .../projectdemand/demandcollection/index.vue  | 43 +++++++++---------
 src/views/workflow/process/nodes/Node.vue     | 45 ++++++++++++++-----
 4 files changed, 69 insertions(+), 36 deletions(-)

diff --git a/src/api/project-demand/index.js b/src/api/project-demand/index.js
index 9657efa..6675a54 100644
--- a/src/api/project-demand/index.js
+++ b/src/api/project-demand/index.js
@@ -1,5 +1,12 @@
 import request from '@/utils/request.js'
-
+//需求征集
+export const getDemandInfo = (param) => {
+  return request({
+    url: '/workflow/mosr/requirement',
+    method: "get",
+    params: param
+  });
+};
 export const getWorkflowInfo = () => {
   return request({
     url: '/workflow/mosr/requirement/process',
diff --git a/src/views/projectdemand/demandcollection/detail.vue b/src/views/projectdemand/demandcollection/detail.vue
index 1634b8f..10c1b04 100644
--- a/src/views/projectdemand/demandcollection/detail.vue
+++ b/src/views/projectdemand/demandcollection/detail.vue
@@ -58,7 +58,7 @@
 <!--        <el-col :xs="24" :sm="24" :md="24" :lg="12" :xl="10">-->
           <div class="approval-record">
             <baseTitle title="审批记录"></baseTitle>
-            <div class="process" id="approvalRecord">
+            <div class="process">
               <process-diagram-viewer v-if="processDiagramViewer"/>
             </div>
           </div>
@@ -167,12 +167,10 @@ getTree()
 
   .approval-record {
     flex: 0.4;
-
-
     .process {
       //max-height: calc(100vh - 96px);
-      height: calc(100vh - 250px);
-      overflow: auto;
+      //height: calc(100vh - 250px);
+      overflow: hidden;
 
       &::-webkit-scrollbar {
         width: 6px;
diff --git a/src/views/projectdemand/demandcollection/index.vue b/src/views/projectdemand/demandcollection/index.vue
index acf915e..3459462 100644
--- a/src/views/projectdemand/demandcollection/index.vue
+++ b/src/views/projectdemand/demandcollection/index.vue
@@ -6,12 +6,13 @@
 <script setup lang="jsx">
 import fvSelect from '@/fvcomponents/fvSelect/index.vue'
 import Tag from '@/components/Tag.vue'
+import {getDemandInfo} from "@/api/project-demand";
 
 const router = useRouter()
 const searchConfig = reactive([
   {
-    label: '名称',
-    prop: 'roleName',
+    label: '征集类型',
+    prop: 'collectType',
     component: 'el-input',
     props: {
       placeholder: '请输入名称查询',
@@ -19,13 +20,12 @@ const searchConfig = reactive([
     }
   },
   {
-    label: '状态',
-    prop: 'state',
-    component: shallowRef(fvSelect),
+    label: '需求名称',
+    prop: 'requirementName',
+    component: 'el-input',
     props: {
-      placeholder: '请选择',
-      clearable: true,
-      cacheKey: 'normal_disable'
+      placeholder: '请输入名称查询',
+      clearable: true
     }
   }
 ])
@@ -43,26 +43,29 @@ const tableConfig = reactive({
       prop: 'selection'
     },
     {
-      prop: 'roleName',
-      label: '名称',
+      prop: 'requirementName',
+      label: '需求名称',
       align: 'center'
     },
     {
-      prop: 'roleKey',
-      label: '所属公司',
+      prop: 'collectType',
+      label: '征集类型',
       align: 'center'
     },
     {
-      prop: 'time',
-      label: '发布时间',
+      prop: 'approveName',
+      label: '审批人',
       align: 'center'
     },
     {
-      prop: 'state',
-      label: '状态',
-      align: 'center',
-      showOverflowTooltip: false,
-      currentRender: ({row, index}) => (<Tag dictType={'demand_collection'} value={row.state}/>)
+      prop: 'deadline',
+      label: '截止时间',
+      align: 'center'
+    },
+    {
+      prop: 'taskNode',
+      label: '当前节点',
+      align: 'center'
     },
     {
       prop: 'oper',
@@ -81,7 +84,7 @@ const tableConfig = reactive({
       }
     }
   ],
-  api: '/admin/role',
+  api: '/workflow/mosr/requirement',
   btns: [
     {name: '新增', key: 'add', auth: auths.add, color: '#DED0B2'},
     {name: '导出', key: 'add', auth: auths.add, type: ''},
diff --git a/src/views/workflow/process/nodes/Node.vue b/src/views/workflow/process/nodes/Node.vue
index 8bcaae5..b02ee1e 100644
--- a/src/views/workflow/process/nodes/Node.vue
+++ b/src/views/workflow/process/nodes/Node.vue
@@ -6,7 +6,8 @@
           <component :is="headerIcon"/>
         </el-icon>
         <ellipsis class="name" hover-tip :content="title"/>
-        <el-icon v-if="!isRoot && designState" size="20" style="float:right;cursor: pointer" @click.stop="emit('delNode')">
+        <el-icon v-if="!isRoot && designState" size="20" style="float:right;cursor: pointer"
+                 @click.stop="emit('delNode')">
           <Close/>
         </el-icon>
       </div>
@@ -22,10 +23,14 @@
         </template>
         <template v-else-if="showAvatar">
           <span class="placeholder" v-if="userInfo.length === 0">{{ placeholder }}</span>
-          <div  v-else v-for="item in userInfo" class="circle-user">
-            <span >{{item.name}}</span>
+          <div v-else v-for="item in userInfo" class="circle-user">
+            <span>{{ item.name }}</span>
+            <el-button v-if="item.state==='RUNNING'" type="warning" loading circle class="circle-icon"></el-button>
+            <el-button v-else-if="item.state==='UNACTIVATED'" type="info" :icon="More" circle
+                       class="circle-icon"></el-button>
+            <el-button v-else type="success" :icon="Check" circle class="circle-icon"></el-button>
           </div>
-<!--          <avatar-ellipsis :row="3" :user-info="userInfo"/>-->
+          <!--          <avatar-ellipsis :row="3" :user-info="userInfo"/>-->
         </template>
         <template v-else>
           <span class="placeholder" v-if="(content || '').trim() === ''">{{ placeholder }}</span>
@@ -43,9 +48,9 @@
     <div class="node-footer">
       <div v-if="merge" class="branch-merge">
         <svg-icon name="fenzhi" :class-name="'fen-icon'"/>
-<!--        <img data-v-1e7b1da5=""-->
-<!--             src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAABACAYAAACqaXHeAAAAAXNSR0IArs4c6QAABXlJREFUeF7tmm2IVGUUx3/nLkQUqxmkpAVhSPUllZX8EEGhvVgZQWCU6wcpsqi2mXtnoaBwoqLCufeO9oJYUJQiFZWlZPQCfYiIXkylstTyS1oWWeYWCe6cuLsz7t3r3Ll3du6907oz35bnPM9z/r895zznmWeECf6RCa6fDoBOBExwAp0UmOAB0CmCnRTopECbCZi2nivK1CMD7FpXlH+ydqctKZBz9QyjwkqFG4HzfKK/0gpvl/ulmBWIzAHkVmlRDFY2EihwwLFkRhYQxgzAtHW2CpcBc4CpOsg26eK7yVPYVFwu/9ZzPufq2VLhQBxhAk85lvSF2Y5l/3prjQlAvqR3IjwJTKqz6DeGssQuyLfBsbyjz6PcFgeAZyOwzLFk/QnrjHH/RACYtj6ncHuUCDWYXs7Lz367XEn3inB+1NzauMLGsiW3+u1b2b9lAH22LuiCD2IJED5yTbmiZpt3dAbKT7Hmjhjtdi25oPZnK/uH7dtUCpi2vqVwQ1wRWuHhWkW3StpTEb6IO3fIThhwTemuzWll/0QA5G39FTgrtghhs2vKELA7inra6d38HXvusOEnriWXHo+iFvZvGUDfap3VdYzdzQgIHmd5W7cBc2Ovoax1C3KXZ5/E/i3VgCQciNMD+J1Ug55yXjxo7QfgOdFKCvjyeL/C9MgoEBa5przrt0ti/+C+mRVB/8amrWsU7m2Ql/c5lqwJjre9CDZ1DMFnriXzw0SatvZW4FqBW6o2vwGvCGxyLPmw3rym9g8cwy0XQV8Ix2qEgH0C1ziWNCyceVu1uvZrriVLGqVGsainHO7mRyDynlCvEWupCI7Kxcat6BFg+OwW9ohyfSMIcQF44v/sZovAlRH1I7QVTwyAt1Cjy8hfh9hYvepGQogDoI74HYbSXzHwusTYl7FEAURVcdPWN+NAiAJQTzzCda4p+6N8iDPe1CkQZ8FAtY+E0AhA2uKHszTlT1QkhAHIQnwmAKr1IjQS6gHISnxmABpBCALIUnymAMIgKHxf6wMmH6E3cNTtSLLgZXoKNOgAR6UDyqyq7esKk3znfOriM48AXzc5AmGE1EFgWvXPTMS3DcAJ6TA6XDIT31YAoRCEc5JqcuKc8Kn3AVFO+E4BryvJVHzbI8BzwAdgi2vJ4ihgSY//nyIg8jqctPi2RYBp61wV5qsyR2BFVdhBhBe0wtdisNU15VAagoNrZh4BOVsfFcVCODVUoLBn6E2hIBvShpApgLyt3nvhRXFFCWxwLOmNaz8Wu8wA5G31ntQWNOukwD2OJc80Oy+ufSYAciVdJsJLcZ0K2nV1MbuUk51jnd9oXuoACmW9eHCQj49/T+j3RtiJslPgFxXmoVxe11nhPdeUq8clANPWPoXVQef9D6e1saEHVINHUBYF7Q1lnl2QL5OGkHoE5G19GRhVyBQ+L1tyST0xoa/Iygq3IOvGI4BdwIWjHBeecE15IExM3tYfgJmBOetcU2o9Q2IcsoiAw8Gf0qhyU7kgb4QCcPRTlNGvSspmtzD81J7kJ30AJX0fYeHo2seLjiXLG0TA78CZ/nGFB8uWPJakeG+t9AE4+jjK/XGLWtgTusBix5It4w5ArqRLRTjhl14IW40KD/kre66ki0R4p57IrgozS/2yb9wByDvqhbKX07Xv/oIavMfOP6pFb0pdgcqrbkFuTlp8JingbRIaBfEUHUOYltbtMPUaUNNo2rpeYWk8zSNWqvSmeSvMDIAnybT1boWnY0I4aigL7YJ4bXRqn0wBeCqG7gYVVqFcFapKWXt0gP5nizKQmvLqwpkDqAkaanmhB4MelOkI27XCDjHY7pqyN23htfXbBiArgVH7dABEETrZxzsRcLL/h6P0/Qc1qphfvB2K3wAAAABJRU5ErkJggg=="-->
-<!--             alt="">-->
+        <!--        <img data-v-1e7b1da5=""-->
+        <!--             src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAABACAYAAACqaXHeAAAAAXNSR0IArs4c6QAABXlJREFUeF7tmm2IVGUUx3/nLkQUqxmkpAVhSPUllZX8EEGhvVgZQWCU6wcpsqi2mXtnoaBwoqLCufeO9oJYUJQiFZWlZPQCfYiIXkylstTyS1oWWeYWCe6cuLsz7t3r3Ll3du6907oz35bnPM9z/r895zznmWeECf6RCa6fDoBOBExwAp0UmOAB0CmCnRTopECbCZi2nivK1CMD7FpXlH+ydqctKZBz9QyjwkqFG4HzfKK/0gpvl/ulmBWIzAHkVmlRDFY2EihwwLFkRhYQxgzAtHW2CpcBc4CpOsg26eK7yVPYVFwu/9ZzPufq2VLhQBxhAk85lvSF2Y5l/3prjQlAvqR3IjwJTKqz6DeGssQuyLfBsbyjz6PcFgeAZyOwzLFk/QnrjHH/RACYtj6ncHuUCDWYXs7Lz367XEn3inB+1NzauMLGsiW3+u1b2b9lAH22LuiCD2IJED5yTbmiZpt3dAbKT7Hmjhjtdi25oPZnK/uH7dtUCpi2vqVwQ1wRWuHhWkW3StpTEb6IO3fIThhwTemuzWll/0QA5G39FTgrtghhs2vKELA7inra6d38HXvusOEnriWXHo+iFvZvGUDfap3VdYzdzQgIHmd5W7cBc2Ovoax1C3KXZ5/E/i3VgCQciNMD+J1Ug55yXjxo7QfgOdFKCvjyeL/C9MgoEBa5przrt0ti/+C+mRVB/8amrWsU7m2Ql/c5lqwJjre9CDZ1DMFnriXzw0SatvZW4FqBW6o2vwGvCGxyLPmw3rym9g8cwy0XQV8Ix2qEgH0C1ziWNCyceVu1uvZrriVLGqVGsainHO7mRyDynlCvEWupCI7Kxcat6BFg+OwW9ohyfSMIcQF44v/sZovAlRH1I7QVTwyAt1Cjy8hfh9hYvepGQogDoI74HYbSXzHwusTYl7FEAURVcdPWN+NAiAJQTzzCda4p+6N8iDPe1CkQZ8FAtY+E0AhA2uKHszTlT1QkhAHIQnwmAKr1IjQS6gHISnxmABpBCALIUnymAMIgKHxf6wMmH6E3cNTtSLLgZXoKNOgAR6UDyqyq7esKk3znfOriM48AXzc5AmGE1EFgWvXPTMS3DcAJ6TA6XDIT31YAoRCEc5JqcuKc8Kn3AVFO+E4BryvJVHzbI8BzwAdgi2vJ4ihgSY//nyIg8jqctPi2RYBp61wV5qsyR2BFVdhBhBe0wtdisNU15VAagoNrZh4BOVsfFcVCODVUoLBn6E2hIBvShpApgLyt3nvhRXFFCWxwLOmNaz8Wu8wA5G31ntQWNOukwD2OJc80Oy+ufSYAciVdJsJLcZ0K2nV1MbuUk51jnd9oXuoACmW9eHCQj49/T+j3RtiJslPgFxXmoVxe11nhPdeUq8clANPWPoXVQef9D6e1saEHVINHUBYF7Q1lnl2QL5OGkHoE5G19GRhVyBQ+L1tyST0xoa/Iygq3IOvGI4BdwIWjHBeecE15IExM3tYfgJmBOetcU2o9Q2IcsoiAw8Gf0qhyU7kgb4QCcPRTlNGvSspmtzD81J7kJ30AJX0fYeHo2seLjiXLG0TA78CZ/nGFB8uWPJakeG+t9AE4+jjK/XGLWtgTusBix5It4w5ArqRLRTjhl14IW40KD/kre66ki0R4p57IrgozS/2yb9wByDvqhbKX07Xv/oIavMfOP6pFb0pdgcqrbkFuTlp8JingbRIaBfEUHUOYltbtMPUaUNNo2rpeYWk8zSNWqvSmeSvMDIAnybT1boWnY0I4aigL7YJ4bXRqn0wBeCqG7gYVVqFcFapKWXt0gP5nizKQmvLqwpkDqAkaanmhB4MelOkI27XCDjHY7pqyN23htfXbBiArgVH7dABEETrZxzsRcLL/h6P0/Qc1qphfvB2K3wAAAABJRU5ErkJggg=="-->
+        <!--             alt="">-->
       </div>
       <div class="btn">
         <insert-button v-if="designState" @insertNode="type => emit('insertNode', type)"/>
@@ -62,7 +67,7 @@ import InsertButton from '../common/InsertButton.vue'
 import Ellipsis from '../common/Ellipsis.vue'
 import AvatarEllipsis from '../common/AvatarEllipsis.vue'
 import SvgIcon from '@/components/svgIcon/index.vue'
-import {Close, Warning, Plus} from '@element-plus/icons-vue'
+import {Close, Warning, Plus, Check, More} from '@element-plus/icons-vue'
 
 const emit = defineEmits(['insertNode'])
 const props = defineProps({
@@ -154,7 +159,16 @@ const props = defineProps({
 const designState = computed(() => {
   return props.mode === 'design'
 })
-
+const getState = (state) => {
+  switch (state) {
+    case 'finish':
+      return 'check'
+    case 'UNACTIVATED':
+      return 'more'
+    case 'RUNNING':
+      return 'loading'
+  }
+}
 
 const init = () => {
   // let userInfo = this.$store.state.selectUserMap.get(this.nodeId);
@@ -176,7 +190,7 @@ const init = () => {
 </script>
 
 <style lang="scss" scoped>
-.circle-user{
+.circle-user {
   width: 50px;
   height: 50px;
   display: flex;
@@ -184,7 +198,18 @@ const init = () => {
   align-items: center;
   border-radius: 50%;
   border: 1px solid #ACACAC;
+  position: relative;
+
+  .circle-icon {
+    width: 10px;
+    height: 10px;
+    position: absolute;
+    top: auto !important;
+    bottom: -9px;
+    right: 15px !important;
+  }
 }
+
 .root {
   &:before {
     display: none !important;