From fdca87d8708eae60bac4ba76c0ce022a7ce264a5 Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Fri, 10 May 2024 17:56:06 +0800
Subject: [PATCH 01/36] =?UTF-8?q?fix=20:=20=E5=AE=8C=E5=96=84=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E9=A1=B5=E9=9D=A2=E7=BB=86=E8=8A=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../projectdemand/demandcollection/detail.vue | 94 +++++++++++--------
 1 file changed, 57 insertions(+), 37 deletions(-)

diff --git a/src/views/projectdemand/demandcollection/detail.vue b/src/views/projectdemand/demandcollection/detail.vue
index f2c7dbf..d52ce1a 100644
--- a/src/views/projectdemand/demandcollection/detail.vue
+++ b/src/views/projectdemand/demandcollection/detail.vue
@@ -1,41 +1,58 @@
 <template>
   <div class="detail-block">
-    <el-row gutter="20">
-      <el-col :xs="24" :sm="24" :md="24" :lg="12" :xl="14">
-        <div class="left-info">
+    <el-form :model="form" label-width="auto">
+      <el-row gutter="20">
+        <el-col :xs="24" :sm="24" :md="24" :lg="12" :xl="14">
           <baseTitle title="需求征集详情"></baseTitle>
-          <div class="info">
-            <div v-for="item in list">
-              <span>{{ item.title }}：</span>
-              <span>{{ item.text }}</span>
+          <div class="left-info">
+            <el-row>
+              <el-col :span="12" v-for="item in list">
+                <el-form-item :label="item.title">
+                  <span>{{ item.text }}</span>
+                </el-form-item>
+              </el-col>
+              <baseTitle title="征集说明"></baseTitle>
+              <el-col :span="24">
+                <el-form-item>
+                  <el-card style="width: 100%">
+                    {{ instructions }}
+                  </el-card>
+                </el-form-item>
+              </el-col>
+              <baseTitle title="申请文件"></baseTitle>
+              <el-col :span="24">
+                <el-form-item>
+                  <fvTable ref="tableIns" style="max-height: 200px;width: 100%" :tableConfig="tableConfig"
+                           @headBtnClick="headBtnClick"
+                           :pagination="false"></fvTable>
+                </el-form-item>
+              </el-col>
+              <baseTitle title="审核意见"></baseTitle>
+              <el-col :span="24">
+                <el-form-item>
+                  <el-input
+                      v-model="auditOpinion"
+                      :rows="3"
+                      type="textarea"
+                      placeholder="请输入审核意见"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </div>
+        </el-col>
+        <el-col :xs="24" :sm="24" :md="24" :lg="12" :xl="10">
+          <div class="approval-record">
+            <baseTitle title="审批记录"></baseTitle>
+            <div class="process" id="approvalRecord">
+              <process-tree ref="processTree" mode="view" id-name="approvalRecord"/>
             </div>
           </div>
-          <baseTitle title="征集说明"></baseTitle>
-          <el-card>
-            {{ instructions }}
-          </el-card>
-          <baseTitle title="申请文件"></baseTitle>
-          <fvTable ref="tableIns" style="max-height: 200px" :tableConfig="tableConfig" @headBtnClick="headBtnClick" :pagination="false"></fvTable>
-          <baseTitle title="审核意见"></baseTitle>
-          <el-input
-              v-model="auditOpinion"
-              :rows="3"
-              type="textarea"
-              placeholder="请输入审核意见"
-          />
-        </div>
-      </el-col>
-      <el-col :xs="24" :sm="24" :md="24" :lg="12" :xl="10">
-        <div class="approval-record" >
-          <baseTitle title="审批记录"></baseTitle>
-          <div class="process" id="approvalRecord">
-            <process-tree ref="processTree" mode="view" id-name="approvalRecord"/>
-          </div>
-        </div>
-      </el-col>
-    </el-row>
+        </el-col>
+      </el-row>
+    </el-form>
     <div class="oper-page-btn">
-      <el-button  @click="handleSubmit">驳回</el-button>
+      <el-button @click="handleSubmit">驳回</el-button>
       <el-button color="#DED0B2" @click="handleBack">同意</el-button>
     </div>
   </div>
@@ -46,6 +63,8 @@ import {getInitiateInfo} from "@/api/workflow/process-definition.js";
 import ProcessTree from '@/views/workflow/process/ProcessTree.vue';
 import {useProcessStore} from '@/stores/processStore.js';
 import {ElMessage} from "element-plus";
+
+const form = ref();
 const processStore = useProcessStore()
 const list = ref([
   {
@@ -81,7 +100,7 @@ const tableConfig = reactive({
       prop: 'oper',
       label: '操作',
       align: 'center',
-      width:'200px',
+      width: '200px',
       showOverflowTooltip: false,
       currentRender: ({row, index}) => {
         return (
@@ -95,9 +114,9 @@ const tableConfig = reactive({
   ],
   api: ''
 })
-const getTree=async()=>{
-   getInitiateInfo('pronode_46c5e446-b4d1-495e-a97d-40667fa6aa9f').then(res => {
-    console.log('res11',res)
+const getTree = async () => {
+  getInitiateInfo('pronode_46c5e446-b4d1-495e-a97d-40667fa6aa9f').then(res => {
+    console.log('res11', res)
     // processDefinition.value = res.data;
     //构建表单及校验规则
     processStore.setDesign(res.data)
@@ -143,10 +162,11 @@ getTree()
     flex: 0.4;
 
 
-    .process{
+    .process {
       //max-height: calc(100vh - 96px);
       height: calc(100vh - 250px);
       overflow: auto;
+
       &::-webkit-scrollbar {
         width: 6px;
         height: 6px;

From dde77b1425df68d55f5e0ca2fb97906e3e073e14 Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Sat, 11 May 2024 14:58:41 +0800
Subject: [PATCH 02/36] =?UTF-8?q?fix=20:=20=E5=AE=8C=E5=96=84=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/project-demand/index.js               |  14 ++
 src/components/Tinymce.vue                    |   5 +
 .../projectdemand/demandcollection/add.vue    | 144 ++++++++++++++----
 .../projectdemand/demandcollection/detail.vue |  42 +++--
 vite.config.js                                |  12 +-
 5 files changed, 167 insertions(+), 50 deletions(-)
 create mode 100644 src/api/project-demand/index.js

diff --git a/src/api/project-demand/index.js b/src/api/project-demand/index.js
new file mode 100644
index 0000000..9657efa
--- /dev/null
+++ b/src/api/project-demand/index.js
@@ -0,0 +1,14 @@
+import request from '@/utils/request.js'
+
+export const getWorkflowInfo = () => {
+  return request({
+    url: '/workflow/mosr/requirement/process',
+    method: "get"
+  });
+};
+export const getInfo = (requirementId) => {
+  return request({
+    url: `/workflow/mosr/requirement/info/${requirementId}`,
+    method: "get"
+  });
+};
diff --git a/src/components/Tinymce.vue b/src/components/Tinymce.vue
index 6ed6a7d..216d8ad 100644
--- a/src/components/Tinymce.vue
+++ b/src/components/Tinymce.vue
@@ -68,6 +68,10 @@ const props = defineProps({
     type: [String, Array],
     default: "微软雅黑=Microsoft YaHei,Helvetica Neue,PingFang SC,sans-serif;苹果苹方=PingFang SC,Microsoft YaHei,sans-serif;宋体=simsun,serif;仿宋体=FangSong,serif;黑体=SimHei,sans-serif;Arial=arial,helvetica,sans-serif;Arial Black=arial black,avant garde;Book Antiqua=book antiqua,palatino;"
   },
+  width:{
+    type: Number,
+    default: 600
+  },
   height:{
     type: Number,
     default: 450
@@ -84,6 +88,7 @@ const init = reactive({
   placeholder: "在这里输入文字", //textarea中的提示信息
   min_width: 300,
   min_height: 200,
+  width:props.width,
   height: props.height, //注：引入autoresize插件时，此属性失效
   resize: "both", //编辑器宽高是否可变，false-否,true-高可变，'both'-宽高均可，注意引号
   promotion: false,
diff --git a/src/views/projectdemand/demandcollection/add.vue b/src/views/projectdemand/demandcollection/add.vue
index c141a85..9cdf78e 100644
--- a/src/views/projectdemand/demandcollection/add.vue
+++ b/src/views/projectdemand/demandcollection/add.vue
@@ -1,11 +1,63 @@
 <template>
-  <div v-loading="loading">
+  <div v-loading="loading"  class="add-block">
     <baseTitle title="需求征集信息录入"></baseTitle>
-    <fvForm :schema="schame" @getInstance="getInstance" :rules="rules"></fvForm>
+    <el-form :model="queryParams" inline class="query-form" ref="demandForm">
+      <el-row gutter="20">
+        <el-col :xs="24" :sm="24" :md="24" :lg="12" :xl="14">
+         <div class="left-info">
+           <el-form-item label="名称" prop="name">
+             <el-input v-model="queryParams.name" placeholder="请输入子公司编码" clearable></el-input>
+           </el-form-item>
+           <el-form-item label="所属公司" prop="company">
+             <el-select v-model="queryParams.company" placeholder="登录状态" clearable filterable>
+               <el-option
+                   v-for="item in companyOption"
+                   :key="item.value"
+                   :label="item.label"
+                   :value="item.value"
+               />
+             </el-select>
+           </el-form-item>
+           <el-form-item label="征集类型" prop="type">
+             <el-select v-model="queryParams.type" placeholder="登录状态" clearable filterable>
+               <el-option
+                   v-for="item in typeOption"
+                   :key="item.value"
+                   :label="item.label"
+                   :value="item.value"
+               />
+             </el-select>
+           </el-form-item>
+           <el-form-item label="截止时间" prop="time">
+             <el-config-provider>
+               <el-date-picker
+                   v-model="dateValue"
+                   type="datetime"
+                   value-format="YYYY-MM-DD HH:mm:ss"
+               />
+             </el-config-provider>
+           </el-form-item>
+           <el-form-item>
+             <el-button type="primary" @click="getList">搜索</el-button>
+             <el-button type="primary" @click="handleReset">重置</el-button>
+           </el-form-item>
+         </div>
+        </el-col>
+        <el-col :xs="24" :sm="24" :md="24" :lg="12" :xl="10">
+          <div class="approval-record">
+            <baseTitle title="xx"></baseTitle>
+            <div class="process" id="approvalRecord">
+              <process-tree ref="processTree" mode="view" id-name="approvalRecord"/>
+            </div>
+          </div>
+        </el-col>
+      </el-row>
+    </el-form>
+    <!--    <fvForm :schema="schame" @getInstance="getInstance" :rules="rules"></fvForm>-->
     <baseTitle title="征集说明"></baseTitle>
-    <Tinymce image-url="/notice/file" file-url="/notice/file" v-model:value="instructions" height="300"/>
+    <Tinymce image-url="/notice/file" file-url="/notice/file" v-model:value="instructions"  height="300"/>
     <baseTitle title="申请文件"></baseTitle>
-    <file-upload  @getFile="getFile"/>
+    <file-upload @getFile="getFile"/>
     <div class="oper-page-btn">
       <el-button color="#DED0B2" @click="handleSubmit">提交</el-button>
       <el-button @click="handleBack">返回</el-button>
@@ -14,16 +66,28 @@
 </template>
 
 <script setup lang="jsx">
+import {getInitiateInfo} from "@/api/workflow/process-definition.js";
 import {useTagsView} from '@/stores/tagsview.js'
 import {useAuthStore} from '@/stores/userstore.js'
-import {ElLoading, ElNotification} from 'element-plus';
+import {ElLoading, ElMessage, ElNotification} from 'element-plus';
 import {getMenuList} from '@/api/system/menuman.js'
-import {getRoleDetail, operate, getTemRoleOption} from "@/api/role/role";
+import {getWorkflowInfo} from "@/api/project-demand/index.js";
 import FileUpload from "../../../components/FileUpload.vue";
 
+import ProcessTree from '@/views/workflow/process/ProcessTree.vue';
+const dateValue = ref()
+const queryParams = reactive({
+  name: '',
+  company: '',
+  type: '',
+})
+const processTree = ref()
 const tagsViewStore = useTagsView()
 const authStore = useAuthStore()
 const route = useRoute()
+const demandForm = ref()
+const typeOption = ref([])
+const companyOption = ref([])
 const form = ref(null)
 const fileList = ref(null)
 const menuTree = ref(null)
@@ -100,30 +164,39 @@ const rules = reactive({
   subCompanyId: [{required: true, message: '请输入', trigger: 'change'}]
 })
 
+//重置功能
+const handleReset = () => {
+  demandForm.value.resetFields()
+  init()
+}
+
 const getInstance = (e) => {
   form.value = e
 }
-const getFile=(val)=>{
+const getFile = (val) => {
   console.log('fileList', val)
-  fileList.value=val
+  fileList.value = val
 }
-const init = async () => {
-  form.value.setValues({state: '1', template: false})
-  const res = await getTemRoleOption()
-  localData.tempRoleOpt = res.data
-  const {data} = await getMenuList()
-  localData.menuData = data
-}
-
-const getInfo = async () => {
-  if (!route.query.id) return
-  const {data} = await getRoleDetail(route.query.id)
-  data.menuIds.forEach(key => {
-    menuTree.value.setChecked(key, true, false)
+const init =  () => {
+  console.log("asdasdasd")
+  getWorkflowInfo().then(res => {
+    console.log('res', res)
   })
-  form.value.setValues(data)
 }
-
+const getTree = async () => {
+  getInitiateInfo('pronode_46c5e446-b4d1-495e-a97d-40667fa6aa9f').then(res => {
+    console.log('res11', res)
+    // processDefinition.value = res.data;
+    //构建表单及校验规则
+    processStore.setDesign(res.data)
+    nextTick(() => {
+      processTree.value.init()
+    })
+  }).catch(err => {
+    ElMessage.error(err);
+  });
+}
+getTree()
 const handleSubmit = async () => {
   // const loading = ElLoading.service({fullscreen: true})
   // const {isValidate} = await form.value.validate()
@@ -151,16 +224,23 @@ watch(localData, (val) => {
   menuTree.value.filter(val.filterText)
 })
 
-onMounted(async () => {
-  loading.value = true
-  await init()
-  if (route.query.id) {
-    await getInfo()
-  }
-  loading.value = false
-})
+// onMounted(async () => {
+//   loading.value = true
+init()
+//   if (route.query.id) {
+//     await getInfo()
+//   }
+//   loading.value = false
+// })
+
+
 </script>
 
 <style lang="scss" scoped>
-
+.add-block{
+  //display: flex;
+  //justify-content: space-between;
+  overflow-x: hidden;
+  overflow-y: auto;
+}
 </style>
diff --git a/src/views/projectdemand/demandcollection/detail.vue b/src/views/projectdemand/demandcollection/detail.vue
index d52ce1a..1602718 100644
--- a/src/views/projectdemand/demandcollection/detail.vue
+++ b/src/views/projectdemand/demandcollection/detail.vue
@@ -45,7 +45,8 @@
           <div class="approval-record">
             <baseTitle title="审批记录"></baseTitle>
             <div class="process" id="approvalRecord">
-              <process-tree ref="processTree" mode="view" id-name="approvalRecord"/>
+              <process-diagram-viewer/>
+<!--              <process-tree ref="processTree" mode="view" id-name="approvalRecord"/>-->
             </div>
           </div>
         </el-col>
@@ -61,11 +62,15 @@
 <script setup lang="jsx">
 import {getInitiateInfo} from "@/api/workflow/process-definition.js";
 import ProcessTree from '@/views/workflow/process/ProcessTree.vue';
+import ProcessDiagramViewer from '@/views/workflow/common/ProcessDiagramViewer.vue'
 import {useProcessStore} from '@/stores/processStore.js';
+import {getInfo} from "@/api/project-demand/index.js";
 import {ElMessage} from "element-plus";
 
 const form = ref();
 const processStore = useProcessStore()
+const processInstanceData = ref()
+
 const list = ref([
   {
     title: '名称',
@@ -115,17 +120,30 @@ const tableConfig = reactive({
   api: ''
 })
 const getTree = async () => {
-  getInitiateInfo('pronode_46c5e446-b4d1-495e-a97d-40667fa6aa9f').then(res => {
-    console.log('res11', res)
-    // processDefinition.value = res.data;
-    //构建表单及校验规则
-    processStore.setDesign(res.data)
-    nextTick(() => {
-      processTree.value.init()
-    })
-  }).catch(err => {
-    ElMessage.error(err);
-  });
+  getInfo(9).then(res => {
+    let data = res.data
+    processInstanceData.value = data
+    processStore.setDesign(data)
+    processStore.runningList.value = data.runningList;
+    processStore.endList.value = data.endList;
+    processStore.noTakeList.value = data.noTakeList;
+    processStore.refuseList.value = data.refuseList;
+    processStore.passList.value = data.passList;
+  })
+
+
+
+  // getInitiateInfo('pronode_46c5e446-b4d1-495e-a97d-40667fa6aa9f').then(res => {
+  //   console.log('res11', res)
+  //   // processDefinition.value = res.data;
+  //   //构建表单及校验规则
+  //   processStore.setDesign(res.data)
+  //   nextTick(() => {
+  //     processTree.value.init()
+  //   })
+  // }).catch(err => {
+  //   ElMessage.error(err);
+  // });
 }
 getTree()
 </script>
diff --git a/vite.config.js b/vite.config.js
index 3dc021f..92e2a1e 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -69,12 +69,12 @@ export default defineConfig({
     strictPort: false,
     open: true,
     proxy: {
-      // '/api/admin': {
-      //   target: 'http://dev-mosr.frp.feashow.cn/',
-      //   // target: 'http://192.168.31.175:8000',
-      //   changeOrigin: true,
-      //   rewrite: (path) => path.replace(/^\/api/, '')
-      // },
+      '/api/workflow': {
+        target: 'http://clay.frp.feashow.cn/',
+        // target: 'http://192.168.31.175:8000',
+        changeOrigin: true,
+        rewrite: (path) => path.replace(/^\/api/, '')
+      },
       '/api': {
         target: 'http://mosr.feashow.cn',
         changeOrigin: true,

From 5c0e962626cf01283b5a14667e63a90d637aa7e1 Mon Sep 17 00:00:00 2001
From: clay <20932067@zju.edu.cn>
Date: Sat, 11 May 2024 15:10:43 +0800
Subject: [PATCH 03/36] =?UTF-8?q?feat=20:=20workflow=E5=89=8D=E7=AB=AF?=
 =?UTF-8?q?=E5=86=85=E5=AE=B9=E6=A3=80=E6=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/projectdemand/demandcollection/add.vue   | 14 +-------------
 src/views/workflow/process/ProcessTree.vue         |  2 ++
 .../process/config/ConditionGroupItemConfig.vue    |  2 +-
 3 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/src/views/projectdemand/demandcollection/add.vue b/src/views/projectdemand/demandcollection/add.vue
index 9cdf78e..92c23fe 100644
--- a/src/views/projectdemand/demandcollection/add.vue
+++ b/src/views/projectdemand/demandcollection/add.vue
@@ -66,11 +66,9 @@
 </template>
 
 <script setup lang="jsx">
-import {getInitiateInfo} from "@/api/workflow/process-definition.js";
 import {useTagsView} from '@/stores/tagsview.js'
 import {useAuthStore} from '@/stores/userstore.js'
 import {ElLoading, ElMessage, ElNotification} from 'element-plus';
-import {getMenuList} from '@/api/system/menuman.js'
 import {getWorkflowInfo} from "@/api/project-demand/index.js";
 import FileUpload from "../../../components/FileUpload.vue";
 
@@ -181,22 +179,12 @@ const init =  () => {
   console.log("asdasdasd")
   getWorkflowInfo().then(res => {
     console.log('res', res)
-  })
-}
-const getTree = async () => {
-  getInitiateInfo('pronode_46c5e446-b4d1-495e-a97d-40667fa6aa9f').then(res => {
-    console.log('res11', res)
-    // processDefinition.value = res.data;
-    //构建表单及校验规则
     processStore.setDesign(res.data)
     nextTick(() => {
       processTree.value.init()
     })
-  }).catch(err => {
-    ElMessage.error(err);
-  });
+  })
 }
-getTree()
 const handleSubmit = async () => {
   // const loading = ElLoading.service({fullscreen: true})
   // const {isValidate} = await form.value.validate()
diff --git a/src/views/workflow/process/ProcessTree.vue b/src/views/workflow/process/ProcessTree.vue
index f4c1d11..f5cd4c0 100644
--- a/src/views/workflow/process/ProcessTree.vue
+++ b/src/views/workflow/process/ProcessTree.vue
@@ -36,6 +36,8 @@ const valid = ref(true)
 let vNode = {}
 
 const init = () => {
+
+  console.log("sdsdsdsdsdsdsd",processStore.getProcess())
   processStore.init()
   initMapping(processStore.getProcess())
   // 定义类名(可忽略)
diff --git a/src/views/workflow/process/config/ConditionGroupItemConfig.vue b/src/views/workflow/process/config/ConditionGroupItemConfig.vue
index aec6350..3565108 100644
--- a/src/views/workflow/process/config/ConditionGroupItemConfig.vue
+++ b/src/views/workflow/process/config/ConditionGroupItemConfig.vue
@@ -155,7 +155,7 @@ const conditionList = computed(() => {
   // if (conditionItems.length === 0 || conditionItems[0].id !== 'root') {
   //   conditionItems.unshift({id: 'root', title: '发起人', valueType: 'User'})
   // }
-  conditionItems.unshift({id: 'root', title: '发起人', valueType: 'User'})
+  // conditionItems.unshift({id: 'root', title: '发起人', valueType: 'User'})
   return conditionItems
 })
 

From 452e2479e0ac712d28fa219bc880863f64cf41ad Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Sat, 11 May 2024 15:30:53 +0800
Subject: [PATCH 04/36] =?UTF-8?q?fix=20:=20=E5=AE=8C=E5=96=84=E9=9C=80?=
 =?UTF-8?q?=E6=B1=82=E6=96=B0=E5=A2=9E=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Tinymce.vue                    |   4 +-
 .../projectdemand/demandcollection/add.vue    | 137 ++++++++++--------
 2 files changed, 80 insertions(+), 61 deletions(-)

diff --git a/src/components/Tinymce.vue b/src/components/Tinymce.vue
index 216d8ad..0295cdb 100644
--- a/src/components/Tinymce.vue
+++ b/src/components/Tinymce.vue
@@ -69,8 +69,8 @@ const props = defineProps({
     default: "微软雅黑=Microsoft YaHei,Helvetica Neue,PingFang SC,sans-serif;苹果苹方=PingFang SC,Microsoft YaHei,sans-serif;宋体=simsun,serif;仿宋体=FangSong,serif;黑体=SimHei,sans-serif;Arial=arial,helvetica,sans-serif;Arial Black=arial black,avant garde;Book Antiqua=book antiqua,palatino;"
   },
   width:{
-    type: Number,
-    default: 600
+    type: String,
+    default: 'auto'
   },
   height:{
     type: Number,
diff --git a/src/views/projectdemand/demandcollection/add.vue b/src/views/projectdemand/demandcollection/add.vue
index 92c23fe..ce317c0 100644
--- a/src/views/projectdemand/demandcollection/add.vue
+++ b/src/views/projectdemand/demandcollection/add.vue
@@ -1,63 +1,58 @@
 <template>
-  <div v-loading="loading"  class="add-block">
+  <div v-loading="loading" class="add-block">
     <baseTitle title="需求征集信息录入"></baseTitle>
     <el-form :model="queryParams" inline class="query-form" ref="demandForm">
-      <el-row gutter="20">
-        <el-col :xs="24" :sm="24" :md="24" :lg="12" :xl="14">
-         <div class="left-info">
-           <el-form-item label="名称" prop="name">
-             <el-input v-model="queryParams.name" placeholder="请输入子公司编码" clearable></el-input>
-           </el-form-item>
-           <el-form-item label="所属公司" prop="company">
-             <el-select v-model="queryParams.company" placeholder="登录状态" clearable filterable>
-               <el-option
-                   v-for="item in companyOption"
-                   :key="item.value"
-                   :label="item.label"
-                   :value="item.value"
-               />
-             </el-select>
-           </el-form-item>
-           <el-form-item label="征集类型" prop="type">
-             <el-select v-model="queryParams.type" placeholder="登录状态" clearable filterable>
-               <el-option
-                   v-for="item in typeOption"
-                   :key="item.value"
-                   :label="item.label"
-                   :value="item.value"
-               />
-             </el-select>
-           </el-form-item>
-           <el-form-item label="截止时间" prop="time">
-             <el-config-provider>
-               <el-date-picker
-                   v-model="dateValue"
-                   type="datetime"
-                   value-format="YYYY-MM-DD HH:mm:ss"
-               />
-             </el-config-provider>
-           </el-form-item>
-           <el-form-item>
-             <el-button type="primary" @click="getList">搜索</el-button>
-             <el-button type="primary" @click="handleReset">重置</el-button>
-           </el-form-item>
-         </div>
-        </el-col>
-        <el-col :xs="24" :sm="24" :md="24" :lg="12" :xl="10">
-          <div class="approval-record">
-            <baseTitle title="xx"></baseTitle>
-            <div class="process" id="approvalRecord">
-              <process-tree ref="processTree" mode="view" id-name="approvalRecord"/>
-            </div>
-          </div>
-        </el-col>
-      </el-row>
+      <div class="left-info">
+        <el-form-item label="名称" prop="name">
+          <el-input v-model="queryParams.name" placeholder="请输入子公司编码" clearable></el-input>
+        </el-form-item>
+        <el-form-item label="所属公司" prop="company">
+          <el-select v-model="queryParams.company" placeholder="登录状态" clearable filterable>
+            <el-option
+                v-for="item in companyOption"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="征集类型" prop="type">
+          <el-select v-model="queryParams.type" placeholder="登录状态" clearable filterable>
+            <el-option
+                v-for="item in typeOption"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="截止时间" prop="time">
+          <el-config-provider>
+            <el-date-picker
+                v-model="dateValue"
+                type="datetime"
+                value-format="YYYY-MM-DD HH:mm:ss"
+            />
+          </el-config-provider>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" @click="getList">搜索</el-button>
+          <el-button type="primary" @click="handleReset">重置</el-button>
+        </el-form-item>
+      </div>
     </el-form>
     <!--    <fvForm :schema="schame" @getInstance="getInstance" :rules="rules"></fvForm>-->
     <baseTitle title="征集说明"></baseTitle>
-    <Tinymce image-url="/notice/file" file-url="/notice/file" v-model:value="instructions"  height="300"/>
+    <Tinymce image-url="/notice/file" file-url="/notice/file" v-model:value="instructions" height="300"/>
     <baseTitle title="申请文件"></baseTitle>
     <file-upload @getFile="getFile"/>
+    <div class="approval-record">
+      <baseTitle title="流程"></baseTitle>
+      <process-diagram-viewer/>
+      <!--      <div class="process" id="approvalRecord">-->
+      <!--        <process-tree ref="processTree" mode="view" id-name="approvalRecord"/>-->
+      <!--      </div>-->
+    </div>
     <div class="oper-page-btn">
       <el-button color="#DED0B2" @click="handleSubmit">提交</el-button>
       <el-button @click="handleBack">返回</el-button>
@@ -66,13 +61,16 @@
 </template>
 
 <script setup lang="jsx">
+import {getInitiateInfo} from "@/api/workflow/process-definition.js";
 import {useTagsView} from '@/stores/tagsview.js'
 import {useAuthStore} from '@/stores/userstore.js'
 import {ElLoading, ElMessage, ElNotification} from 'element-plus';
+import {getMenuList} from '@/api/system/menuman.js'
 import {getWorkflowInfo} from "@/api/project-demand/index.js";
 import FileUpload from "../../../components/FileUpload.vue";
-
+import ProcessDiagramViewer from '@/views/workflow/common/ProcessDiagramViewer.vue'
 import ProcessTree from '@/views/workflow/process/ProcessTree.vue';
+import {useProcessStore} from '@/stores/processStore.js';
 const dateValue = ref()
 const queryParams = reactive({
   name: '',
@@ -93,6 +91,9 @@ const loading = ref(false)
 const localData = reactive({
   affiliatedCompany: []
 })
+
+const processStore = useProcessStore()
+const processInstanceData = ref()
 const instructions = ref()
 const schame = computed(() => {
   let arr = [
@@ -175,16 +176,34 @@ const getFile = (val) => {
   console.log('fileList', val)
   fileList.value = val
 }
-const init =  () => {
+const init = () => {
   console.log("asdasdasd")
   getWorkflowInfo().then(res => {
+    let data = res.data
     console.log('res', res)
-    processStore.setDesign(res.data)
-    nextTick(() => {
-      processTree.value.init()
-    })
+    processInstanceData.value = data
+    processStore.setDesign(data)
+    processStore.runningList.value = data.runningList;
+    processStore.endList.value = data.endList;
+    processStore.noTakeList.value = data.noTakeList;
+    processStore.refuseList.value = data.refuseList;
+    processStore.passList.value = data.passList;
   })
 }
+// const getTree = async () => {
+//   getInitiateInfo('pronode_46c5e446-b4d1-495e-a97d-40667fa6aa9f').then(res => {
+//     console.log('res11', res)
+//     // processDefinition.value = res.data;
+//     //构建表单及校验规则
+//     processStore.setDesign(res.data)
+//     nextTick(() => {
+//       processTree.value.init()
+//     })
+//   }).catch(err => {
+//     ElMessage.error(err);
+//   });
+// }
+// getTree()
 const handleSubmit = async () => {
   // const loading = ElLoading.service({fullscreen: true})
   // const {isValidate} = await form.value.validate()
@@ -225,7 +244,7 @@ init()
 </script>
 
 <style lang="scss" scoped>
-.add-block{
+.add-block {
   //display: flex;
   //justify-content: space-between;
   overflow-x: hidden;

From e6a515f67386d1895dbbf1adc2b404cc57421012 Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Sat, 11 May 2024 15:41:56 +0800
Subject: [PATCH 05/36] =?UTF-8?q?fix=20:=20=E5=AE=8C=E5=96=84=E9=9C=80?=
 =?UTF-8?q?=E6=B1=82=E6=96=B0=E5=A2=9E/=E8=AF=A6=E6=83=85=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/projectdemand/demandcollection/add.vue  | 14 ++++++++++----
 .../projectdemand/demandcollection/detail.vue     | 12 ++++++------
 src/views/workflow/process/ProcessTree.vue        | 15 +++++++--------
 3 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/src/views/projectdemand/demandcollection/add.vue b/src/views/projectdemand/demandcollection/add.vue
index ce317c0..d16cc16 100644
--- a/src/views/projectdemand/demandcollection/add.vue
+++ b/src/views/projectdemand/demandcollection/add.vue
@@ -48,7 +48,7 @@
     <file-upload @getFile="getFile"/>
     <div class="approval-record">
       <baseTitle title="流程"></baseTitle>
-      <process-diagram-viewer/>
+      <process-diagram-viewer v-if="processDiagramViewer"/>
       <!--      <div class="process" id="approvalRecord">-->
       <!--        <process-tree ref="processTree" mode="view" id-name="approvalRecord"/>-->
       <!--      </div>-->
@@ -71,6 +71,7 @@ import FileUpload from "../../../components/FileUpload.vue";
 import ProcessDiagramViewer from '@/views/workflow/common/ProcessDiagramViewer.vue'
 import ProcessTree from '@/views/workflow/process/ProcessTree.vue';
 import {useProcessStore} from '@/stores/processStore.js';
+
 const dateValue = ref()
 const queryParams = reactive({
   name: '',
@@ -78,6 +79,7 @@ const queryParams = reactive({
   type: '',
 })
 const processTree = ref()
+const processDiagramViewer = ref(false)
 const tagsViewStore = useTagsView()
 const authStore = useAuthStore()
 const route = useRoute()
@@ -176,11 +178,11 @@ const getFile = (val) => {
   console.log('fileList', val)
   fileList.value = val
 }
-const init = () => {
+const init = async () => {
   console.log("asdasdasd")
   getWorkflowInfo().then(res => {
     let data = res.data
-    console.log('res', res)
+    console.log('res2', res)
     processInstanceData.value = data
     processStore.setDesign(data)
     processStore.runningList.value = data.runningList;
@@ -188,6 +190,10 @@ const init = () => {
     processStore.noTakeList.value = data.noTakeList;
     processStore.refuseList.value = data.refuseList;
     processStore.passList.value = data.passList;
+    nextTick(()=>{
+      console.log('processDiagramViewer')
+      processDiagramViewer.value=true
+    })
   })
 }
 // const getTree = async () => {
@@ -233,7 +239,7 @@ watch(localData, (val) => {
 
 // onMounted(async () => {
 //   loading.value = true
-init()
+  init()
 //   if (route.query.id) {
 //     await getInfo()
 //   }
diff --git a/src/views/projectdemand/demandcollection/detail.vue b/src/views/projectdemand/demandcollection/detail.vue
index 1602718..3bc9e7e 100644
--- a/src/views/projectdemand/demandcollection/detail.vue
+++ b/src/views/projectdemand/demandcollection/detail.vue
@@ -1,8 +1,8 @@
 <template>
   <div class="detail-block">
     <el-form :model="form" label-width="auto">
-      <el-row gutter="20">
-        <el-col :xs="24" :sm="24" :md="24" :lg="12" :xl="14">
+<!--      <el-row gutter="20">-->
+<!--        <el-col :xs="24" :sm="24" :md="24" :lg="12" :xl="14">-->
           <baseTitle title="需求征集详情"></baseTitle>
           <div class="left-info">
             <el-row>
@@ -40,8 +40,8 @@
               </el-col>
             </el-row>
           </div>
-        </el-col>
-        <el-col :xs="24" :sm="24" :md="24" :lg="12" :xl="10">
+<!--        </el-col>-->
+<!--        <el-col :xs="24" :sm="24" :md="24" :lg="12" :xl="10">-->
           <div class="approval-record">
             <baseTitle title="审批记录"></baseTitle>
             <div class="process" id="approvalRecord">
@@ -49,8 +49,8 @@
 <!--              <process-tree ref="processTree" mode="view" id-name="approvalRecord"/>-->
             </div>
           </div>
-        </el-col>
-      </el-row>
+<!--        </el-col>-->
+<!--      </el-row>-->
     </el-form>
     <div class="oper-page-btn">
       <el-button @click="handleSubmit">驳回</el-button>
diff --git a/src/views/workflow/process/ProcessTree.vue b/src/views/workflow/process/ProcessTree.vue
index f5cd4c0..e3b3d48 100644
--- a/src/views/workflow/process/ProcessTree.vue
+++ b/src/views/workflow/process/ProcessTree.vue
@@ -36,8 +36,7 @@ const valid = ref(true)
 let vNode = {}
 
 const init = () => {
-
-  console.log("sdsdsdsdsdsdsd",processStore.getProcess())
+  // console.log("sdsdsdsdsdsdsd",processStore.getProcess())
   processStore.init()
   initMapping(processStore.getProcess())
   // 定义类名(可忽略)
@@ -50,7 +49,7 @@ const init = () => {
 
 // 初始化map集合,以便数据整理
 const initMapping = (node) => {
-  node.forEach(nodeItem => {
+  node?.forEach(nodeItem => {
     processStore.nodeMap.set(nodeItem.id, nodeItem)
     processStore.parentMap.set(nodeItem.parentId, nodeItem)
   })
@@ -59,15 +58,15 @@ const initMapping = (node) => {
 const initHeaderBgc = (node) => {
   if (node.props && props.mode === 'preview') {
     let headerBgc = '#ff943e'
-    if (processStore.runningList.value.includes(node.id)) {
+    if (processStore.runningList.value?.includes(node.id)) {
       headerBgc = '#1e90ff'
-    } else if (processStore.endList.value.includes(node.id)) {
+    } else if (processStore.endList.value?.includes(node.id)) {
       headerBgc = '#20b2aa'
-    } else if (processStore.noTakeList.value.includes(node.id)) {
+    } else if (processStore.noTakeList.value?.includes(node.id)) {
       headerBgc = '#909399'
-    } else if (processStore.refuseList.value.includes(node.id)) {
+    } else if (processStore.refuseList.value?.includes(node.id)) {
       headerBgc = '#f56c6c'
-    } else if (processStore.passList.value.includes(node.id)) {
+    } else if (processStore.passList.value?.includes(node.id)) {
       headerBgc = '#ff943e'
     }
     node.props.headerBgc = headerBgc

From c008aab0d38f68cfa2881ad70f1e0b4ab7c687e1 Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Sat, 11 May 2024 15:51:19 +0800
Subject: [PATCH 06/36] =?UTF-8?q?fix=20:=20=E4=BF=AE=E5=A4=8D=E7=BB=86?=
 =?UTF-8?q?=E8=8A=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/styles/index.scss                        | 2 +-
 src/views/projectdemand/demandcollection/detail.vue | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/assets/styles/index.scss b/src/assets/styles/index.scss
index 2231156..6181c73 100644
--- a/src/assets/styles/index.scss
+++ b/src/assets/styles/index.scss
@@ -378,7 +378,7 @@ html, body, #app, .el-container, .el-aside, .el-main {
 .scale {
   margin-top: 10px;
   z-index: 666;
-  position: absolute;
+  //position: absolute;
 }
 
 .el-overlay-dialog {
diff --git a/src/views/projectdemand/demandcollection/detail.vue b/src/views/projectdemand/demandcollection/detail.vue
index 3bc9e7e..c0dd080 100644
--- a/src/views/projectdemand/demandcollection/detail.vue
+++ b/src/views/projectdemand/demandcollection/detail.vue
@@ -120,7 +120,7 @@ const tableConfig = reactive({
   api: ''
 })
 const getTree = async () => {
-  getInfo(9).then(res => {
+  getInfo(10).then(res => {
     let data = res.data
     processInstanceData.value = data
     processStore.setDesign(data)

From 9da9b763beef1bed8831a7f95c658375dd02f253 Mon Sep 17 00:00:00 2001
From: clay <20932067@zju.edu.cn>
Date: Sat, 11 May 2024 15:59:25 +0800
Subject: [PATCH 07/36] =?UTF-8?q?feat=20:=20=E8=AF=A6=E6=83=85=E9=A1=B5?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../projectdemand/demandcollection/add.vue    |  2 -
 .../projectdemand/demandcollection/detail.vue | 67 ++++++++-----------
 2 files changed, 28 insertions(+), 41 deletions(-)

diff --git a/src/views/projectdemand/demandcollection/add.vue b/src/views/projectdemand/demandcollection/add.vue
index d16cc16..3ba0ebf 100644
--- a/src/views/projectdemand/demandcollection/add.vue
+++ b/src/views/projectdemand/demandcollection/add.vue
@@ -179,7 +179,6 @@ const getFile = (val) => {
   fileList.value = val
 }
 const init = async () => {
-  console.log("asdasdasd")
   getWorkflowInfo().then(res => {
     let data = res.data
     console.log('res2', res)
@@ -191,7 +190,6 @@ const init = async () => {
     processStore.refuseList.value = data.refuseList;
     processStore.passList.value = data.passList;
     nextTick(()=>{
-      console.log('processDiagramViewer')
       processDiagramViewer.value=true
     })
   })
diff --git a/src/views/projectdemand/demandcollection/detail.vue b/src/views/projectdemand/demandcollection/detail.vue
index 3bc9e7e..1634b8f 100644
--- a/src/views/projectdemand/demandcollection/detail.vue
+++ b/src/views/projectdemand/demandcollection/detail.vue
@@ -1,21 +1,35 @@
 <template>
   <div class="detail-block">
     <el-form :model="form" label-width="auto">
-<!--      <el-row gutter="20">-->
-<!--        <el-col :xs="24" :sm="24" :md="24" :lg="12" :xl="14">-->
           <baseTitle title="需求征集详情"></baseTitle>
           <div class="left-info">
             <el-row>
-              <el-col :span="12" v-for="item in list">
-                <el-form-item :label="item.title">
-                  <span>{{ item.text }}</span>
+              <el-col :span="12">
+                <el-form-item label="名称">
+                  <span>{{ formData.requirementName }}</span>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="名称">
+                  <span>{{ formData.requirementName }}</span>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="名称">
+                  <span>{{ formData.requirementName }}</span>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="截止时间">
+                  <span>{{ formData.deadline }}</span>
                 </el-form-item>
               </el-col>
               <baseTitle title="征集说明"></baseTitle>
               <el-col :span="24">
                 <el-form-item>
                   <el-card style="width: 100%">
-                    {{ instructions }}
+                    <div v-html="formData.collectExplain">
+                    </div>
                   </el-card>
                 </el-form-item>
               </el-col>
@@ -45,8 +59,7 @@
           <div class="approval-record">
             <baseTitle title="审批记录"></baseTitle>
             <div class="process" id="approvalRecord">
-              <process-diagram-viewer/>
-<!--              <process-tree ref="processTree" mode="view" id-name="approvalRecord"/>-->
+              <process-diagram-viewer v-if="processDiagramViewer"/>
             </div>
           </div>
 <!--        </el-col>-->
@@ -70,24 +83,10 @@ import {ElMessage} from "element-plus";
 const form = ref();
 const processStore = useProcessStore()
 const processInstanceData = ref()
+const processDiagramViewer = ref(false)
 
-const list = ref([
-  {
-    title: '名称',
-    text: '名名称称名名称名称名称名称'
-  }, {
-    title: '所属公司',
-    text: '名称名称名称名称'
-  }, {
-    title: '征集类型',
-    text: '名称名称名称名称'
-  }, {
-    title: '截止时间',
-    text: '名称名称名称名称'
-  },
-])
 const processTree = ref()
-const instructions = ref('ds')
+const formData = ref({})
 const auditOpinion = ref('')
 const tableConfig = reactive({
   columns: [
@@ -120,8 +119,9 @@ const tableConfig = reactive({
   api: ''
 })
 const getTree = async () => {
-  getInfo(9).then(res => {
+  getInfo(10).then(res => {
     let data = res.data
+    formData.value = data.formData;
     processInstanceData.value = data
     processStore.setDesign(data)
     processStore.runningList.value = data.runningList;
@@ -129,21 +129,10 @@ const getTree = async () => {
     processStore.noTakeList.value = data.noTakeList;
     processStore.refuseList.value = data.refuseList;
     processStore.passList.value = data.passList;
+    nextTick(()=>{
+      processDiagramViewer.value=true
+    })
   })
-
-
-
-  // getInitiateInfo('pronode_46c5e446-b4d1-495e-a97d-40667fa6aa9f').then(res => {
-  //   console.log('res11', res)
-  //   // processDefinition.value = res.data;
-  //   //构建表单及校验规则
-  //   processStore.setDesign(res.data)
-  //   nextTick(() => {
-  //     processTree.value.init()
-  //   })
-  // }).catch(err => {
-  //   ElMessage.error(err);
-  // });
 }
 getTree()
 </script>

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 08/36] =?UTF-8?q?fix=20:=20=E5=AF=B9=E6=8E=A5=E9=9C=80?=
 =?UTF-8?q?=E6=B1=82=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;

From 0cf56d875e7f6e195351334b663e9251bf3a6b15 Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Sat, 11 May 2024 17:48:44 +0800
Subject: [PATCH 09/36] =?UTF-8?q?fix=20:=20=E5=AF=B9=E6=8E=A5=E9=9C=80?=
 =?UTF-8?q?=E6=B1=82=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/views/projectdemand/demandcollection/index.vue | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/views/projectdemand/demandcollection/index.vue b/src/views/projectdemand/demandcollection/index.vue
index 3459462..8d7d917 100644
--- a/src/views/projectdemand/demandcollection/index.vue
+++ b/src/views/projectdemand/demandcollection/index.vue
@@ -67,6 +67,14 @@ const tableConfig = reactive({
       label: '当前节点',
       align: 'center'
     },
+    {
+      prop: 'state',
+      label: '状态',
+      align: 'center',
+      width:200,
+      showOverflowTooltip: false,
+      currentRender: ({row, index}) => (<point-tag dictType={'process_state'} value={row.state}/>)
+    },
     {
       prop: 'oper',
       label: '操作',

From 04d0e9a7d26ab8ef36c94000b0fbde8ee71dd95c Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Sat, 11 May 2024 17:50:35 +0800
Subject: [PATCH 10/36] =?UTF-8?q?fix=20:=20=E4=BF=AE=E5=A4=8D=E9=9C=80?=
 =?UTF-8?q?=E6=B1=82=E5=BE=81=E9=9B=86=E5=88=97=E8=A1=A8=E7=BB=86=E8=8A=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/projectdemand/demandcollection/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/projectdemand/demandcollection/index.vue b/src/views/projectdemand/demandcollection/index.vue
index 8d7d917..14ce54d 100644
--- a/src/views/projectdemand/demandcollection/index.vue
+++ b/src/views/projectdemand/demandcollection/index.vue
@@ -73,7 +73,7 @@ const tableConfig = reactive({
       align: 'center',
       width:200,
       showOverflowTooltip: false,
-      currentRender: ({row, index}) => (<point-tag dictType={'process_state'} value={row.state}/>)
+      currentRender: ({row, index}) => (<Tag dictType={'process_state'} value={row.state}/>)
     },
     {
       prop: 'oper',

From 6c27a5f954f37db6289910a3d3e5876f7090841f Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Sat, 11 May 2024 18:06:25 +0800
Subject: [PATCH 11/36] =?UTF-8?q?fix=20:=20=E5=AF=B9=E6=8E=A5=E9=9C=80?=
 =?UTF-8?q?=E6=B1=82=E5=BE=81=E9=9B=86=E8=AF=A6=E6=83=85=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/projectdemand/demandcollection/detail.vue | 12 ++++++------
 src/views/projectdemand/demandcollection/index.vue  |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/views/projectdemand/demandcollection/detail.vue b/src/views/projectdemand/demandcollection/detail.vue
index 10c1b04..aaa074b 100644
--- a/src/views/projectdemand/demandcollection/detail.vue
+++ b/src/views/projectdemand/demandcollection/detail.vue
@@ -10,13 +10,13 @@
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="名称">
-                  <span>{{ formData.requirementName }}</span>
+                <el-form-item label="所属公司">
+                  <span>{{ formData.affiliatedCompany }}</span>
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="名称">
-                  <span>{{ formData.requirementName }}</span>
+                <el-form-item label="征集类型">
+                  <span>{{ formData.collectType }}</span>
                 </el-form-item>
               </el-col>
               <el-col :span="12">
@@ -79,7 +79,7 @@ import ProcessDiagramViewer from '@/views/workflow/common/ProcessDiagramViewer.v
 import {useProcessStore} from '@/stores/processStore.js';
 import {getInfo} from "@/api/project-demand/index.js";
 import {ElMessage} from "element-plus";
-
+const route = useRoute()
 const form = ref();
 const processStore = useProcessStore()
 const processInstanceData = ref()
@@ -119,7 +119,7 @@ const tableConfig = reactive({
   api: ''
 })
 const getTree = async () => {
-  getInfo(10).then(res => {
+  getInfo(route.query.id).then(res => {
     let data = res.data
     formData.value = data.formData;
     processInstanceData.value = data
diff --git a/src/views/projectdemand/demandcollection/index.vue b/src/views/projectdemand/demandcollection/index.vue
index 14ce54d..0fa62b4 100644
--- a/src/views/projectdemand/demandcollection/index.vue
+++ b/src/views/projectdemand/demandcollection/index.vue
@@ -124,7 +124,7 @@ const handleDetail = (row) => {
   router.push({
     path: '/projectdemand/demanddetail',
     query: {
-      id: row.roleId
+      id: row.requirementId
     }
   })
 }

From f0212046f348fcb936fc561ed510c57bb4f6de89 Mon Sep 17 00:00:00 2001
From: clay <20932067@zju.edu.cn>
Date: Sat, 11 May 2024 20:38:05 +0800
Subject: [PATCH 12/36] =?UTF-8?q?build=20:=20=E4=BF=AE=E6=94=B9dm=E5=8F=91?=
 =?UTF-8?q?=E5=B8=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/styles/index.scss                        | 3 ++-
 src/views/projectdemand/demandcollection/detail.vue | 4 +++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/assets/styles/index.scss b/src/assets/styles/index.scss
index 6181c73..e35bb62 100644
--- a/src/assets/styles/index.scss
+++ b/src/assets/styles/index.scss
@@ -378,7 +378,8 @@ html, body, #app, .el-container, .el-aside, .el-main {
 .scale {
   margin-top: 10px;
   z-index: 666;
-  //position: absolute;
+  position: absolute;
+  top: -20px;
 }
 
 .el-overlay-dialog {
diff --git a/src/views/projectdemand/demandcollection/detail.vue b/src/views/projectdemand/demandcollection/detail.vue
index aaa074b..0cbf1cc 100644
--- a/src/views/projectdemand/demandcollection/detail.vue
+++ b/src/views/projectdemand/demandcollection/detail.vue
@@ -168,9 +168,11 @@ getTree()
   .approval-record {
     flex: 0.4;
     .process {
+      position: relative;
       //max-height: calc(100vh - 96px);
       //height: calc(100vh - 250px);
-      overflow: hidden;
+      //height: auto;
+      //overflow: hidden;
 
       &::-webkit-scrollbar {
         width: 6px;

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

---
 src/assets/styles/index.scss                  |   2 +-
 .../projectdemand/demandcollection/add.vue    |   2 +-
 .../projectdemand/demandcollection/detail.vue | 156 ++++++++++--------
 3 files changed, 89 insertions(+), 71 deletions(-)

diff --git a/src/assets/styles/index.scss b/src/assets/styles/index.scss
index e35bb62..d94c6bf 100644
--- a/src/assets/styles/index.scss
+++ b/src/assets/styles/index.scss
@@ -379,7 +379,7 @@ html, body, #app, .el-container, .el-aside, .el-main {
   margin-top: 10px;
   z-index: 666;
   position: absolute;
-  top: -20px;
+  //top: -20px;
 }
 
 .el-overlay-dialog {
diff --git a/src/views/projectdemand/demandcollection/add.vue b/src/views/projectdemand/demandcollection/add.vue
index 3ba0ebf..3a80b0a 100644
--- a/src/views/projectdemand/demandcollection/add.vue
+++ b/src/views/projectdemand/demandcollection/add.vue
@@ -4,7 +4,7 @@
     <el-form :model="queryParams" inline class="query-form" ref="demandForm">
       <div class="left-info">
         <el-form-item label="名称" prop="name">
-          <el-input v-model="queryParams.name" placeholder="请输入子公司编码" clearable></el-input>
+          <el-input v-model="queryParams.name" placeholder="请输入名称" clearable></el-input>
         </el-form-item>
         <el-form-item label="所属公司" prop="company">
           <el-select v-model="queryParams.company" placeholder="登录状态" clearable filterable>
diff --git a/src/views/projectdemand/demandcollection/detail.vue b/src/views/projectdemand/demandcollection/detail.vue
index 0cbf1cc..7e986c6 100644
--- a/src/views/projectdemand/demandcollection/detail.vue
+++ b/src/views/projectdemand/demandcollection/detail.vue
@@ -1,71 +1,74 @@
 <template>
   <div class="detail-block">
     <el-form :model="form" label-width="auto">
-          <baseTitle title="需求征集详情"></baseTitle>
-          <div class="left-info">
-            <el-row>
-              <el-col :span="12">
-                <el-form-item label="名称">
-                  <span>{{ formData.requirementName }}</span>
-                </el-form-item>
-              </el-col>
-              <el-col :span="12">
-                <el-form-item label="所属公司">
-                  <span>{{ formData.affiliatedCompany }}</span>
-                </el-form-item>
-              </el-col>
-              <el-col :span="12">
-                <el-form-item label="征集类型">
-                  <span>{{ formData.collectType }}</span>
-                </el-form-item>
-              </el-col>
-              <el-col :span="12">
-                <el-form-item label="截止时间">
-                  <span>{{ formData.deadline }}</span>
-                </el-form-item>
-              </el-col>
-              <baseTitle title="征集说明"></baseTitle>
-              <el-col :span="24">
-                <el-form-item>
-                  <el-card style="width: 100%">
-                    <div v-html="formData.collectExplain">
-                    </div>
-                  </el-card>
-                </el-form-item>
-              </el-col>
-              <baseTitle title="申请文件"></baseTitle>
-              <el-col :span="24">
-                <el-form-item>
-                  <fvTable ref="tableIns" style="max-height: 200px;width: 100%" :tableConfig="tableConfig"
-                           @headBtnClick="headBtnClick"
-                           :pagination="false"></fvTable>
-                </el-form-item>
-              </el-col>
+      <baseTitle title="需求征集详情"></baseTitle>
+      <div class="left-info">
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="名称">
+              <span>{{ formData.requirementName }}</span>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="所属公司">
+              <span>{{ formData.affiliatedCompany }}</span>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="征集类型">
+              <span>{{ formData.collectType }}</span>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="截止时间">
+              <span>{{ formData.deadline }}</span>
+            </el-form-item>
+          </el-col>
+          <baseTitle title="征集说明"></baseTitle>
+          <el-col :span="24">
+            <el-form-item>
+              <el-card style="width: 100%">
+                <div v-html="formData.collectExplain">
+                </div>
+              </el-card>
+            </el-form-item>
+          </el-col>
+          <baseTitle title="申请文件"></baseTitle>
+          <el-col :span="24">
+            <el-form-item>
+              <fvTable ref="tableIns" style="max-height: 200px;width: 100%" :tableConfig="tableConfig"
+                       @headBtnClick="headBtnClick"
+                       :pagination="false"></fvTable>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <div v-if="processInstanceData.taskId">
               <baseTitle title="审核意见"></baseTitle>
-              <el-col :span="24">
-                <el-form-item>
-                  <el-input
-                      v-model="auditOpinion"
-                      :rows="3"
-                      type="textarea"
-                      placeholder="请输入审核意见"
-                  />
-                </el-form-item>
-              </el-col>
-            </el-row>
-          </div>
-<!--        </el-col>-->
-<!--        <el-col :xs="24" :sm="24" :md="24" :lg="12" :xl="10">-->
-          <div class="approval-record">
-            <baseTitle title="审批记录"></baseTitle>
-            <div class="process">
-              <process-diagram-viewer v-if="processDiagramViewer"/>
+
+              <el-form-item>
+                <el-input
+                    v-model="auditOpinion"
+                    :rows="3"
+                    type="textarea"
+                    placeholder="请输入审核意见"
+                />
+              </el-form-item>
             </div>
-          </div>
-<!--        </el-col>-->
-<!--      </el-row>-->
+          </el-col>
+        </el-row>
+      </div>
+      <!--        </el-col>-->
+      <!--        <el-col :xs="24" :sm="24" :md="24" :lg="12" :xl="10">-->
+      <div class="approval-record">
+        <baseTitle title="审批记录"></baseTitle>
+        <div class="process">
+          <process-diagram-viewer v-if="processDiagramViewer"/>
+        </div>
+      </div>
+      <!--        </el-col>-->
+      <!--      </el-row>-->
     </el-form>
-    <div class="oper-page-btn">
+    <div class="oper-page-btn" v-if="processInstanceData.taskId">
       <el-button @click="handleSubmit">驳回</el-button>
       <el-button color="#DED0B2" @click="handleBack">同意</el-button>
     </div>
@@ -73,16 +76,14 @@
 </template>
 
 <script setup lang="jsx">
-import {getInitiateInfo} from "@/api/workflow/process-definition.js";
-import ProcessTree from '@/views/workflow/process/ProcessTree.vue';
 import ProcessDiagramViewer from '@/views/workflow/common/ProcessDiagramViewer.vue'
 import {useProcessStore} from '@/stores/processStore.js';
 import {getInfo} from "@/api/project-demand/index.js";
-import {ElMessage} from "element-plus";
+
 const route = useRoute()
 const form = ref();
 const processStore = useProcessStore()
-const processInstanceData = ref()
+const processInstanceData = ref({})
 const processDiagramViewer = ref(false)
 
 const processTree = ref()
@@ -129,8 +130,8 @@ const getTree = async () => {
     processStore.noTakeList.value = data.noTakeList;
     processStore.refuseList.value = data.refuseList;
     processStore.passList.value = data.passList;
-    nextTick(()=>{
-      processDiagramViewer.value=true
+    nextTick(() => {
+      processDiagramViewer.value = true
     })
   })
 }
@@ -143,7 +144,23 @@ getTree()
   justify-content: space-between;
   overflow-x: hidden;
   overflow-y: auto;
+  padding-right: 10px;
+  &::-webkit-scrollbar {
+    width: 6px;
+    height: 6px;
+  }
 
+  // 滚动条轨道
+  &::-webkit-scrollbar-track {
+    background: rgb(239, 239, 239);
+    border-radius: 2px;
+  }
+
+  // 小滑块
+  &::-webkit-scrollbar-thumb {
+    background: rgba(80, 81, 82, 0.29);
+    border-radius: 10px;
+  }
   .left-info {
     flex: 0.6;
 
@@ -168,11 +185,12 @@ getTree()
   .approval-record {
     flex: 0.4;
     .process {
+      //padding-top: 20px;
       position: relative;
       //max-height: calc(100vh - 96px);
       //height: calc(100vh - 250px);
       //height: auto;
-      //overflow: hidden;
+      //overflow: scroll;
 
       &::-webkit-scrollbar {
         width: 6px;

From a7d9391e9a4e8e31efffd10b7a891de6a05f0cfd Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Sat, 11 May 2024 21:16:03 +0800
Subject: [PATCH 14/36] =?UTF-8?q?fix=20:=20=E4=BF=AE=E5=A4=8D=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../projectdemand/demandcollection/detail.vue | 60 ++++++++-----------
 1 file changed, 25 insertions(+), 35 deletions(-)

diff --git a/src/views/projectdemand/demandcollection/detail.vue b/src/views/projectdemand/demandcollection/detail.vue
index 7e986c6..8dab32e 100644
--- a/src/views/projectdemand/demandcollection/detail.vue
+++ b/src/views/projectdemand/demandcollection/detail.vue
@@ -62,7 +62,9 @@
       <div class="approval-record">
         <baseTitle title="审批记录"></baseTitle>
         <div class="process">
-          <process-diagram-viewer v-if="processDiagramViewer"/>
+          <operation-render :operation-list="processInstanceData.operationList"
+                            :state="'1'"/>
+<!--          <process-diagram-viewer v-if="processDiagramViewer"/>-->
         </div>
       </div>
       <!--        </el-col>-->
@@ -76,6 +78,7 @@
 </template>
 
 <script setup lang="jsx">
+import OperationRender from '@/views/workflow/common/OperationRender.vue'
 import ProcessDiagramViewer from '@/views/workflow/common/ProcessDiagramViewer.vue'
 import {useProcessStore} from '@/stores/processStore.js';
 import {getInfo} from "@/api/project-demand/index.js";
@@ -142,25 +145,10 @@ getTree()
 .detail-block {
   display: flex;
   justify-content: space-between;
-  overflow-x: hidden;
-  overflow-y: auto;
+  overflow: hidden;
+  //overflow-y: auto;
   padding-right: 10px;
-  &::-webkit-scrollbar {
-    width: 6px;
-    height: 6px;
-  }
 
-  // 滚动条轨道
-  &::-webkit-scrollbar-track {
-    background: rgb(239, 239, 239);
-    border-radius: 2px;
-  }
-
-  // 小滑块
-  &::-webkit-scrollbar-thumb {
-    background: rgba(80, 81, 82, 0.29);
-    border-radius: 10px;
-  }
   .left-info {
     flex: 0.6;
 
@@ -184,30 +172,32 @@ getTree()
 
   .approval-record {
     flex: 0.4;
+    padding-bottom: 30px;
+
     .process {
       //padding-top: 20px;
       position: relative;
       //max-height: calc(100vh - 96px);
       //height: calc(100vh - 250px);
       //height: auto;
-      //overflow: scroll;
+      //overflow: auto;
 
-      &::-webkit-scrollbar {
-        width: 6px;
-        height: 6px;
-      }
-
-      // 滚动条轨道
-      &::-webkit-scrollbar-track {
-        background: rgb(239, 239, 239);
-        border-radius: 2px;
-      }
-
-      // 小滑块
-      &::-webkit-scrollbar-thumb {
-        background: rgba(80, 81, 82, 0.29);
-        border-radius: 10px;
-      }
+      //&::-webkit-scrollbar {
+      //  width: 6px;
+      //  height: 6px;
+      //}
+      //
+      //// 滚动条轨道
+      //&::-webkit-scrollbar-track {
+      //  background: rgb(239, 239, 239);
+      //  border-radius: 2px;
+      //}
+      //
+      //// 小滑块
+      //&::-webkit-scrollbar-thumb {
+      //  background: rgba(80, 81, 82, 0.29);
+      //  border-radius: 10px;
+      //}
     }
 
 

From 9c6c494b8059f0af712262ac622a5141b722b08b Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Sat, 11 May 2024 21:37:15 +0800
Subject: [PATCH 15/36] =?UTF-8?q?fix=20:=20=E4=BF=AE=E5=A4=8D=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/home/index.vue                            |  4 ++--
 src/views/projectdemand/demandcollection/add.vue    | 10 +++++-----
 src/views/projectdemand/demandcollection/detail.vue |  5 +++--
 src/views/workflow/common/InstanceDetails.vue       |  2 +-
 src/views/workflow/common/OperationRender.vue       |  1 +
 5 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/views/home/index.vue b/src/views/home/index.vue
index 3a37363..bd72a33 100644
--- a/src/views/home/index.vue
+++ b/src/views/home/index.vue
@@ -105,7 +105,7 @@ const todoNum = ref(20)
 const tableConfig = reactive({
   columns: [
     {
-      prop: 'userName',
+      prop: 'taskId',
       label: '单据编号',
       align: 'center',
     },
@@ -143,7 +143,7 @@ const tableConfig = reactive({
       }
     }
   ],
-  api: '',
+  api: '/workflow/process/task',
   params: {},
 })
 
diff --git a/src/views/projectdemand/demandcollection/add.vue b/src/views/projectdemand/demandcollection/add.vue
index 3a80b0a..88234cb 100644
--- a/src/views/projectdemand/demandcollection/add.vue
+++ b/src/views/projectdemand/demandcollection/add.vue
@@ -1,13 +1,13 @@
 <template>
   <div v-loading="loading" class="add-block">
     <baseTitle title="需求征集信息录入"></baseTitle>
-    <el-form :model="queryParams" inline class="query-form" ref="demandForm">
+    <el-form :model="demandInfo" inline class="query-form" ref="demandForm">
       <div class="left-info">
         <el-form-item label="名称" prop="name">
-          <el-input v-model="queryParams.name" placeholder="请输入名称" clearable></el-input>
+          <el-input v-model="demandInfo.name" placeholder="请输入名称" clearable></el-input>
         </el-form-item>
         <el-form-item label="所属公司" prop="company">
-          <el-select v-model="queryParams.company" placeholder="登录状态" clearable filterable>
+          <el-select v-model="demandInfo.company" placeholder="登录状态" clearable filterable>
             <el-option
                 v-for="item in companyOption"
                 :key="item.value"
@@ -17,7 +17,7 @@
           </el-select>
         </el-form-item>
         <el-form-item label="征集类型" prop="type">
-          <el-select v-model="queryParams.type" placeholder="登录状态" clearable filterable>
+          <el-select v-model="demandInfo.type" placeholder="登录状态" clearable filterable>
             <el-option
                 v-for="item in typeOption"
                 :key="item.value"
@@ -73,7 +73,7 @@ import ProcessTree from '@/views/workflow/process/ProcessTree.vue';
 import {useProcessStore} from '@/stores/processStore.js';
 
 const dateValue = ref()
-const queryParams = reactive({
+const demandInfo = reactive({
   name: '',
   company: '',
   type: '',
diff --git a/src/views/projectdemand/demandcollection/detail.vue b/src/views/projectdemand/demandcollection/detail.vue
index 8dab32e..f89771e 100644
--- a/src/views/projectdemand/demandcollection/detail.vue
+++ b/src/views/projectdemand/demandcollection/detail.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="detail-block">
-    <el-form :model="form" label-width="auto">
+    <el-form :model="formData" label-width="auto">
       <baseTitle title="需求征集详情"></baseTitle>
       <div class="left-info">
         <el-row>
@@ -63,7 +63,7 @@
         <baseTitle title="审批记录"></baseTitle>
         <div class="process">
           <operation-render :operation-list="processInstanceData.operationList"
-                            :state="'1'"/>
+                            :state="'4'"/>
 <!--          <process-diagram-viewer v-if="processDiagramViewer"/>-->
         </div>
       </div>
@@ -82,6 +82,7 @@ import OperationRender from '@/views/workflow/common/OperationRender.vue'
 import ProcessDiagramViewer from '@/views/workflow/common/ProcessDiagramViewer.vue'
 import {useProcessStore} from '@/stores/processStore.js';
 import {getInfo} from "@/api/project-demand/index.js";
+import {CircleCheckFilled, Close, Loading, MoreFilled} from "@element-plus/icons-vue";
 
 const route = useRoute()
 const form = ref();
diff --git a/src/views/workflow/common/InstanceDetails.vue b/src/views/workflow/common/InstanceDetails.vue
index 8e66901..0e0cadd 100644
--- a/src/views/workflow/common/InstanceDetails.vue
+++ b/src/views/workflow/common/InstanceDetails.vue
@@ -95,4 +95,4 @@ defineExpose({
   init
 })
 
-</script>
\ No newline at end of file
+</script>
diff --git a/src/views/workflow/common/OperationRender.vue b/src/views/workflow/common/OperationRender.vue
index 1a1b139..e415143 100644
--- a/src/views/workflow/common/OperationRender.vue
+++ b/src/views/workflow/common/OperationRender.vue
@@ -7,6 +7,7 @@
                         :color="operation.color"
                         size="large"
                         placement="top">
+
         <el-card>
           <div style="display: flex;">
             <div v-for="(user,index) in operation.userInfo" :key="index" class="avatar_name">

From 44ed106775c861fac31caac2087e771e4cf7e1ef Mon Sep 17 00:00:00 2001
From: clay <20932067@zju.edu.cn>
Date: Sat, 11 May 2024 21:40:49 +0800
Subject: [PATCH 16/36] =?UTF-8?q?build=20:=20=E9=9C=80=E6=B1=82=E5=BE=81?=
 =?UTF-8?q?=E9=9B=86=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/project-demand/index.js               | 15 +++++
 src/utils/request.js                          |  2 -
 .../projectdemand/demandcollection/add.vue    | 64 ++++++++++---------
 .../projectdemand/demandcollection/detail.vue | 22 +++++--
 4 files changed, 64 insertions(+), 39 deletions(-)

diff --git a/src/api/project-demand/index.js b/src/api/project-demand/index.js
index 6675a54..043e7fc 100644
--- a/src/api/project-demand/index.js
+++ b/src/api/project-demand/index.js
@@ -19,3 +19,18 @@ export const getInfo = (requirementId) => {
     method: "get"
   });
 };
+export const agreeTask = (data) => {
+  return request({
+    url: `/workflow/mosr/process/task/agree`,
+    method: "post",
+    data: data
+  });
+};
+
+export const addRequirement = (data) => {
+  return request({
+    url: `/workflow/mosr/requirement`,
+    method: "post",
+    data: data
+  });
+};
diff --git a/src/utils/request.js b/src/utils/request.js
index 9c580c1..d95c00b 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -29,8 +29,6 @@ serveice.interceptors.response.use(response => {
     if (response.request.responseType === 'blob' || response.request.responseType === 'arraybuffer') {
         return response.data
     }
-    console.log("window.location.pathname", window.location.pathname)
-    console.log("windows", window.location.search)
     return response.data
 }, error => {
     let response = error.response
diff --git a/src/views/projectdemand/demandcollection/add.vue b/src/views/projectdemand/demandcollection/add.vue
index 88234cb..76cc048 100644
--- a/src/views/projectdemand/demandcollection/add.vue
+++ b/src/views/projectdemand/demandcollection/add.vue
@@ -1,13 +1,13 @@
 <template>
   <div v-loading="loading" class="add-block">
     <baseTitle title="需求征集信息录入"></baseTitle>
-    <el-form :model="demandInfo" inline class="query-form" ref="demandForm">
+    <el-form :model="fromData" inline class="query-form" ref="demandForm">
       <div class="left-info">
         <el-form-item label="名称" prop="name">
-          <el-input v-model="demandInfo.name" placeholder="请输入名称" clearable></el-input>
+          <el-input v-model="fromData.name" placeholder="请输入名称" clearable></el-input>
         </el-form-item>
         <el-form-item label="所属公司" prop="company">
-          <el-select v-model="demandInfo.company" placeholder="登录状态" clearable filterable>
+          <el-select v-model="fromData.company" placeholder="登录状态" clearable filterable>
             <el-option
                 v-for="item in companyOption"
                 :key="item.value"
@@ -17,7 +17,7 @@
           </el-select>
         </el-form-item>
         <el-form-item label="征集类型" prop="type">
-          <el-select v-model="demandInfo.type" placeholder="登录状态" clearable filterable>
+          <el-select v-model="fromData.type" placeholder="登录状态" clearable filterable>
             <el-option
                 v-for="item in typeOption"
                 :key="item.value"
@@ -61,19 +61,15 @@
 </template>
 
 <script setup lang="jsx">
-import {getInitiateInfo} from "@/api/workflow/process-definition.js";
 import {useTagsView} from '@/stores/tagsview.js'
 import {useAuthStore} from '@/stores/userstore.js'
-import {ElLoading, ElMessage, ElNotification} from 'element-plus';
-import {getMenuList} from '@/api/system/menuman.js'
-import {getWorkflowInfo} from "@/api/project-demand/index.js";
+import {getWorkflowInfo, addRequirement} from "@/api/project-demand/index.js";
 import FileUpload from "../../../components/FileUpload.vue";
 import ProcessDiagramViewer from '@/views/workflow/common/ProcessDiagramViewer.vue'
-import ProcessTree from '@/views/workflow/process/ProcessTree.vue';
 import {useProcessStore} from '@/stores/processStore.js';
 
 const dateValue = ref()
-const demandInfo = reactive({
+const fromData = reactive({
   name: '',
   company: '',
   type: '',
@@ -85,7 +81,12 @@ const authStore = useAuthStore()
 const route = useRoute()
 const demandForm = ref()
 const typeOption = ref([])
-const companyOption = ref([])
+const companyOption = ref([
+  {
+    label: "测试公司",
+    value: 1
+  }
+])
 const form = ref(null)
 const fileList = ref(null)
 const menuTree = ref(null)
@@ -178,6 +179,8 @@ const getFile = (val) => {
   console.log('fileList', val)
   fileList.value = val
 }
+
+
 const init = async () => {
   getWorkflowInfo().then(res => {
     let data = res.data
@@ -189,8 +192,8 @@ const init = async () => {
     processStore.noTakeList.value = data.noTakeList;
     processStore.refuseList.value = data.refuseList;
     processStore.passList.value = data.passList;
-    nextTick(()=>{
-      processDiagramViewer.value=true
+    nextTick(() => {
+      processDiagramViewer.value = true
     })
   })
 }
@@ -208,25 +211,24 @@ const init = async () => {
 //   });
 // }
 // getTree()
-const handleSubmit = async () => {
-  // const loading = ElLoading.service({fullscreen: true})
-  // const {isValidate} = await form.value.validate()
-  // if (!isValidate) return Promise.reject()
-  // const values = form.value.getValues()
-  // values.menuIds = checkChange()
-  // operate(values).then(res => {
-  //   ElNotification({
-  //     title: route.query.isAdd ? '新增' : '编辑',
-  //     message: res.msg,
-  //     type: res.code === 1000 ? 'success' : 'error'
-  //   })
-  //   loading.close()
-  //   res.code === 1000 ? tagsViewStore.delViewAndGoView('/system/role') : null
-  // }).finally(() => {
-  //   loading.close()
-  // })
+
+
+const handleSubmit = () => {
+  console.log(fromData,"fromData")
+  addRequirement({
+    "collectExplain": "需求说明",
+    "collectType": "征集类型",
+    "companyIds": [22,23,24],
+    "files": [],
+    "requirementId": 0,
+    "requirementName": "测试需求征集20240519001",
+    "deploymentId": "1817079f-0f74-11ef-8b96-f268fc747b04"
+  }).then(res=>{
+
+  })
 }
 
+
 const handleBack = () => {
   history.back()
 }
@@ -237,7 +239,7 @@ watch(localData, (val) => {
 
 // onMounted(async () => {
 //   loading.value = true
-  init()
+init()
 //   if (route.query.id) {
 //     await getInfo()
 //   }
diff --git a/src/views/projectdemand/demandcollection/detail.vue b/src/views/projectdemand/demandcollection/detail.vue
index f89771e..685272f 100644
--- a/src/views/projectdemand/demandcollection/detail.vue
+++ b/src/views/projectdemand/demandcollection/detail.vue
@@ -71,8 +71,8 @@
       <!--      </el-row>-->
     </el-form>
     <div class="oper-page-btn" v-if="processInstanceData.taskId">
-      <el-button @click="handleSubmit">驳回</el-button>
-      <el-button color="#DED0B2" @click="handleBack">同意</el-button>
+      <el-button @click="handleBack">驳回</el-button>
+      <el-button color="#DED0B2" @click="handleSubmit">同意</el-button>
     </div>
   </div>
 </template>
@@ -81,8 +81,7 @@
 import OperationRender from '@/views/workflow/common/OperationRender.vue'
 import ProcessDiagramViewer from '@/views/workflow/common/ProcessDiagramViewer.vue'
 import {useProcessStore} from '@/stores/processStore.js';
-import {getInfo} from "@/api/project-demand/index.js";
-import {CircleCheckFilled, Close, Loading, MoreFilled} from "@element-plus/icons-vue";
+import {getInfo, agreeTask} from "@/api/project-demand/index.js";
 
 const route = useRoute()
 const form = ref();
@@ -123,7 +122,18 @@ const tableConfig = reactive({
   ],
   api: ''
 })
-const getTree = async () => {
+const handleSubmit = () => {
+  let approve = {
+    taskId: processInstanceData.value.taskId,
+    auditOpinion : auditOpinion.value,
+    formData: formData.value
+  }
+  agreeTask(approve).then(res => {
+    console.log(res)
+  })
+}
+
+const init = async () => {
   getInfo(route.query.id).then(res => {
     let data = res.data
     formData.value = data.formData;
@@ -139,7 +149,7 @@ const getTree = async () => {
     })
   })
 }
-getTree()
+init()
 </script>
 
 <style lang="scss" scoped>

From b58dfcb566014c066fceb1d711b4e754de2601bc Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Sat, 11 May 2024 21:48:16 +0800
Subject: [PATCH 17/36] =?UTF-8?q?fix=20:=20=E9=A6=96=E9=A1=B5=E5=BE=85?=
 =?UTF-8?q?=E5=8A=9E=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/home/index.vue                      | 19 ++++++++++------
 .../projectdemand/demandcollection/add.vue    | 22 ++++++++++++++-----
 2 files changed, 28 insertions(+), 13 deletions(-)

diff --git a/src/views/home/index.vue b/src/views/home/index.vue
index bd72a33..da1aefb 100644
--- a/src/views/home/index.vue
+++ b/src/views/home/index.vue
@@ -105,25 +105,30 @@ const todoNum = ref(20)
 const tableConfig = reactive({
   columns: [
     {
-      prop: 'taskId',
-      label: '单据编号',
+      prop: 'processName',
+      label: '流程名称',
       align: 'center',
     },
     {
-      prop: 'nickName',
-      label: '消息主题',
+      prop: 'initiatorName',
+      label: '发起人',
       align: 'center',
     },
     {
-      prop: 'type',
+      prop: 'state',
       label: '类型',
       align: 'center',
       showOverflowTooltip: false,
       currentRender: ({row, index}) => (<Tag dictType={'todo_type'} value={row.state}/>)
     },
     {
-      prop: 'createTime',
-      label: '创建时间',
+      prop: 'submitTime',
+      label: '提交时间',
+      align: 'center',
+    },
+    {
+      prop: 'taskName',
+      label: '当前节点',
       align: 'center',
     },
     {
diff --git a/src/views/projectdemand/demandcollection/add.vue b/src/views/projectdemand/demandcollection/add.vue
index 76cc048..869c5dd 100644
--- a/src/views/projectdemand/demandcollection/add.vue
+++ b/src/views/projectdemand/demandcollection/add.vue
@@ -7,7 +7,7 @@
           <el-input v-model="fromData.name" placeholder="请输入名称" clearable></el-input>
         </el-form-item>
         <el-form-item label="所属公司" prop="company">
-          <el-select v-model="fromData.company" placeholder="登录状态" clearable filterable>
+          <el-select v-model="fromData.company" placeholder="所属公司" clearable filterable>
             <el-option
                 v-for="item in companyOption"
                 :key="item.value"
@@ -17,7 +17,7 @@
           </el-select>
         </el-form-item>
         <el-form-item label="征集类型" prop="type">
-          <el-select v-model="fromData.type" placeholder="登录状态" clearable filterable>
+          <el-select v-model="fromData.type" placeholder="征集类型" clearable filterable>
             <el-option
                 v-for="item in typeOption"
                 :key="item.value"
@@ -67,7 +67,10 @@ import {getWorkflowInfo, addRequirement} from "@/api/project-demand/index.js";
 import FileUpload from "../../../components/FileUpload.vue";
 import ProcessDiagramViewer from '@/views/workflow/common/ProcessDiagramViewer.vue'
 import {useProcessStore} from '@/stores/processStore.js';
+import {ElMessage} from "element-plus";
+import {useRouter} from 'vue-router'
 
+const router = useRouter()
 const dateValue = ref()
 const fromData = reactive({
   name: '',
@@ -214,17 +217,24 @@ const init = async () => {
 
 
 const handleSubmit = () => {
-  console.log(fromData,"fromData")
+  console.log(fromData, "fromData")
   addRequirement({
     "collectExplain": "需求说明",
     "collectType": "征集类型",
-    "companyIds": [22,23,24],
+    "companyIds": [22, 23, 24],
     "files": [],
     "requirementId": 0,
     "requirementName": "测试需求征集20240519001",
     "deploymentId": "1817079f-0f74-11ef-8b96-f268fc747b04"
-  }).then(res=>{
-
+  }).then(res => {
+    if (res.code === 1000) {
+      ElMessage.success(res.msg)
+      router.push({
+        path: '/projectdemand/demandcollection'
+      })
+    } else {
+      ElMessage.error(res.msg)
+    }
   })
 }
 

From 5e08db55fb32b94d6fe06f2e3e8a98d02a174ea0 Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Sat, 11 May 2024 23:22:55 +0800
Subject: [PATCH 18/36] =?UTF-8?q?fix=20:=20=E4=BF=AE=E5=A4=8D=E7=BB=86?=
 =?UTF-8?q?=E8=8A=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/home/index.js                         |   8 +
 src/views/home/index.vue                      |   2 +-
 .../projectdemand/demandcollection/add.vue    | 213 ++++++------------
 .../projectdemand/demandcollection/detail.vue |   2 -
 .../projectdemand/demandcollection/index.vue  |   2 +-
 5 files changed, 79 insertions(+), 148 deletions(-)
 create mode 100644 src/api/home/index.js

diff --git a/src/api/home/index.js b/src/api/home/index.js
new file mode 100644
index 0000000..f62d17b
--- /dev/null
+++ b/src/api/home/index.js
@@ -0,0 +1,8 @@
+import request from '@/utils/request.js'
+
+export const getHomeInfo = () => {
+  return request({
+    url: '/workflow/mosr/process/task',
+    method: "get"
+  });
+};
diff --git a/src/views/home/index.vue b/src/views/home/index.vue
index da1aefb..1f9f023 100644
--- a/src/views/home/index.vue
+++ b/src/views/home/index.vue
@@ -148,7 +148,7 @@ const tableConfig = reactive({
       }
     }
   ],
-  api: '/workflow/process/task',
+  api: '/workflow/mosr/process/task',
   params: {},
 })
 
diff --git a/src/views/projectdemand/demandcollection/add.vue b/src/views/projectdemand/demandcollection/add.vue
index 869c5dd..b5119c3 100644
--- a/src/views/projectdemand/demandcollection/add.vue
+++ b/src/views/projectdemand/demandcollection/add.vue
@@ -1,13 +1,13 @@
 <template>
   <div v-loading="loading" class="add-block">
     <baseTitle title="需求征集信息录入"></baseTitle>
-    <el-form :model="fromData" inline class="query-form" ref="demandForm">
+    <el-form :model="formData" inline class="query-form" ref="demandForm">
       <div class="left-info">
-        <el-form-item label="名称" prop="name">
-          <el-input v-model="fromData.name" placeholder="请输入名称" clearable></el-input>
+        <el-form-item label="名称" prop="requirementName">
+          <el-input v-model="formData.requirementName" placeholder="请输入名称" clearable></el-input>
         </el-form-item>
-        <el-form-item label="所属公司" prop="company">
-          <el-select v-model="fromData.company" placeholder="所属公司" clearable filterable>
+        <el-form-item label="所属公司" prop="companyIds">
+          <el-select v-model="formData.companyIds" placeholder="所属公司" clearable filterable multiple>
             <el-option
                 v-for="item in companyOption"
                 :key="item.value"
@@ -16,8 +16,8 @@
             />
           </el-select>
         </el-form-item>
-        <el-form-item label="征集类型" prop="type">
-          <el-select v-model="fromData.type" placeholder="征集类型" clearable filterable>
+        <el-form-item label="征集类型" prop="collectType">
+          <el-select v-model="formData.collectType" placeholder="征集类型" clearable filterable>
             <el-option
                 v-for="item in typeOption"
                 :key="item.value"
@@ -29,21 +29,17 @@
         <el-form-item label="截止时间" prop="time">
           <el-config-provider>
             <el-date-picker
-                v-model="dateValue"
+                v-model="formData.deadline"
                 type="datetime"
+                placeholder="截止时间"
                 value-format="YYYY-MM-DD HH:mm:ss"
             />
           </el-config-provider>
         </el-form-item>
-        <el-form-item>
-          <el-button type="primary" @click="getList">搜索</el-button>
-          <el-button type="primary" @click="handleReset">重置</el-button>
-        </el-form-item>
       </div>
     </el-form>
-    <!--    <fvForm :schema="schame" @getInstance="getInstance" :rules="rules"></fvForm>-->
     <baseTitle title="征集说明"></baseTitle>
-    <Tinymce image-url="/notice/file" file-url="/notice/file" v-model:value="instructions" height="300"/>
+    <Tinymce image-url="/notice/file" file-url="/notice/file" v-model:value="formData.collectExplain" height="300"/>
     <baseTitle title="申请文件"></baseTitle>
     <file-upload @getFile="getFile"/>
     <div class="approval-record">
@@ -61,33 +57,42 @@
 </template>
 
 <script setup lang="jsx">
-import {useTagsView} from '@/stores/tagsview.js'
-import {useAuthStore} from '@/stores/userstore.js'
-import {getWorkflowInfo, addRequirement} from "@/api/project-demand/index.js";
-import FileUpload from "../../../components/FileUpload.vue";
-import ProcessDiagramViewer from '@/views/workflow/common/ProcessDiagramViewer.vue'
 import {useProcessStore} from '@/stores/processStore.js';
+import {getWorkflowInfo, addRequirement,getInfo} from "@/api/project-demand/index.js";
+import FileUpload from "@/components/FileUpload.vue";
+import ProcessDiagramViewer from '@/views/workflow/common/ProcessDiagramViewer.vue';
 import {ElMessage} from "element-plus";
-import {useRouter} from 'vue-router'
+import {useRoute,useRouter} from 'vue-router'
 
 const router = useRouter()
-const dateValue = ref()
-const fromData = reactive({
-  name: '',
-  company: '',
-  type: '',
-})
-const processTree = ref()
-const processDiagramViewer = ref(false)
-const tagsViewStore = useTagsView()
-const authStore = useAuthStore()
 const route = useRoute()
-const demandForm = ref()
-const typeOption = ref([])
+const dateValue = ref()
+let formData = reactive({
+  requirementName: '',
+  companyIds: '',
+  collectType: '',
+  collectExplain: ''
+})
+const processDiagramViewer = ref(false)
+
+const typeOption = ref([
+  {
+    label: "需求征集",
+    value: '需求征集'
+  }
+])
 const companyOption = ref([
   {
-    label: "测试公司",
-    value: 1
+    label: "测试公司1",
+    value: 22
+  },
+  {
+    label: "测试公司2",
+    value: 23
+  },
+  {
+    label: "测试公司3",
+    value: 24
   }
 ])
 const form = ref(null)
@@ -97,93 +102,14 @@ const loading = ref(false)
 const localData = reactive({
   affiliatedCompany: []
 })
-
 const processStore = useProcessStore()
 const processInstanceData = ref()
-const instructions = ref()
-const schame = computed(() => {
-  let arr = [
-    {
-      label: '名称',
-      prop: 'roleName',
-      component: 'el-input',
-      props: {
-        placeholder: '请输入名称',
-        clearable: true
-      }
-    },
-    {
-      label: '所属公司',
-      prop: 'subCompanyId',
-      component: 'el-tree-select',
-      props: {
-        placeholder: '请选择所属公司',
-        clearable: true,
-        filterable: true,
-        checkStrictly: true,
-        data: localData.affiliatedCompany,
-        disabled: route.query.userType == 0 ? true : false
-      },
-      on: {
-        change: async (val) => {
-          const {data} = await getDeptOpt({subCompanyId: val})
-          localData.departmentIdOpt = data
-        }
-      }
-    },
-    {
-      label: '征集类型',
-      prop: 'subCompanyType',
-      component: 'el-tree-select',
-      props: {
-        placeholder: '请选择征集类型',
-        clearable: true,
-        filterable: true,
-        checkStrictly: true,
-        data: localData.affiliatedCompany,
-        disabled: route.query.userType == 0 ? true : false
-      },
-      on: {
-        change: async (val) => {
-          const {data} = await getDeptOpt({subCompanyId: val})
-          localData.departmentIdOpt = data
-        }
-      }
-    },
-    {
-      label: '截止时间',
-      prop: 'dateValue',
-      component: 'el-date-picker',
-      props: {
-        placeholder: '请选择截止时间',
-        clearable: true,
-        type: 'datetime'
-      }
-    }
-  ]
-  return !authStore.roles.includes('superAdmin') ? arr.slice(0, arr.length - 1) : arr
-})
 
-const rules = reactive({
-  roleName: [{required: true, message: '请输入', trigger: 'change'}],
-  subCompanyId: [{required: true, message: '请输入', trigger: 'change'}]
-})
-
-//重置功能
-const handleReset = () => {
-  demandForm.value.resetFields()
-  init()
-}
-
-const getInstance = (e) => {
-  form.value = e
-}
 const getFile = (val) => {
   console.log('fileList', val)
   fileList.value = val
 }
 
-
 const init = async () => {
   getWorkflowInfo().then(res => {
     let data = res.data
@@ -200,32 +126,18 @@ const init = async () => {
     })
   })
 }
-// const getTree = async () => {
-//   getInitiateInfo('pronode_46c5e446-b4d1-495e-a97d-40667fa6aa9f').then(res => {
-//     console.log('res11', res)
-//     // processDefinition.value = res.data;
-//     //构建表单及校验规则
-//     processStore.setDesign(res.data)
-//     nextTick(() => {
-//       processTree.value.init()
-//     })
-//   }).catch(err => {
-//     ElMessage.error(err);
-//   });
-// }
-// getTree()
-
 
 const handleSubmit = () => {
-  console.log(fromData, "fromData")
+  console.log(formData, "formData")
   addRequirement({
-    "collectExplain": "需求说明",
-    "collectType": "征集类型",
-    "companyIds": [22, 23, 24],
-    "files": [],
+    "collectExplain": formData.collectExplain,
+    "collectType": formData.collectType,
+    "companyIds": formData.companyIds,
+    "files": fileList.value,
+    "deadline": formData.deadline,
     "requirementId": 0,
-    "requirementName": "测试需求征集20240519001",
-    "deploymentId": "1817079f-0f74-11ef-8b96-f268fc747b04"
+    "requirementName": formData.requirementName,
+    "deploymentId": processInstanceData.value.deploymentId
   }).then(res => {
     if (res.code === 1000) {
       ElMessage.success(res.msg)
@@ -237,6 +149,17 @@ const handleSubmit = () => {
     }
   })
 }
+const getDetailInfo = async () => {
+  getInfo(route.query.id).then(res => {
+    if (res.code === 1000) {
+      ElMessage.success(res.msg)
+      console.log('res.data',res.data.formData)
+      formData=res.data.formData
+    } else {
+      ElMessage.error(res.msg)
+    }
+  })
+}
 
 
 const handleBack = () => {
@@ -247,15 +170,14 @@ watch(localData, (val) => {
   menuTree.value.filter(val.filterText)
 })
 
-// onMounted(async () => {
-//   loading.value = true
-init()
-//   if (route.query.id) {
-//     await getInfo()
-//   }
-//   loading.value = false
-// })
-
+onMounted( async ()=>{
+  loading.value = true
+  await init()
+  // if(route.query.id) {
+  //   await getDetailInfo()
+  // }
+  loading.value = false
+})
 
 </script>
 
@@ -265,5 +187,8 @@ init()
   //justify-content: space-between;
   overflow-x: hidden;
   overflow-y: auto;
+  .approval-record{
+    position: relative;
+  }
 }
 </style>
diff --git a/src/views/projectdemand/demandcollection/detail.vue b/src/views/projectdemand/demandcollection/detail.vue
index 685272f..e6153d3 100644
--- a/src/views/projectdemand/demandcollection/detail.vue
+++ b/src/views/projectdemand/demandcollection/detail.vue
@@ -44,7 +44,6 @@
           <el-col :span="24">
             <div v-if="processInstanceData.taskId">
               <baseTitle title="审核意见"></baseTitle>
-
               <el-form-item>
                 <el-input
                     v-model="auditOpinion"
@@ -57,7 +56,6 @@
           </el-col>
         </el-row>
       </div>
-      <!--        </el-col>-->
       <!--        <el-col :xs="24" :sm="24" :md="24" :lg="12" :xl="10">-->
       <div class="approval-record">
         <baseTitle title="审批记录"></baseTitle>
diff --git a/src/views/projectdemand/demandcollection/index.vue b/src/views/projectdemand/demandcollection/index.vue
index 0fa62b4..a4bfb44 100644
--- a/src/views/projectdemand/demandcollection/index.vue
+++ b/src/views/projectdemand/demandcollection/index.vue
@@ -116,7 +116,7 @@ const handleEdit = (row) => {
   router.push({
     path: '/projectdemand/demandedit',
     query: {
-      id: row.roleId
+      id: row.requirementId
     }
   })
 }

From 48e5d82acb57d5b12dec7730facfd84cb353821a Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Sun, 12 May 2024 13:05:52 +0800
Subject: [PATCH 19/36] =?UTF-8?q?fix=20:=20=E4=BF=AE=E5=A4=8D=E7=BB=86?=
 =?UTF-8?q?=E8=8A=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/project-demand/index.js |  6 ++++
 src/components/FileUpload.vue   | 61 ++++++++++++++++++++++++++++-----
 src/views/home/index.vue        |  2 +-
 vite.config.js                  |  2 +-
 4 files changed, 60 insertions(+), 11 deletions(-)

diff --git a/src/api/project-demand/index.js b/src/api/project-demand/index.js
index 043e7fc..0113419 100644
--- a/src/api/project-demand/index.js
+++ b/src/api/project-demand/index.js
@@ -34,3 +34,9 @@ export const addRequirement = (data) => {
     data: data
   });
 };
+export const deleteFile = (path) => {
+  return request({
+    url: '/process/file/delete/'+ path,
+    method: "delete"
+  });
+};
diff --git a/src/components/FileUpload.vue b/src/components/FileUpload.vue
index e4e2774..53f05a1 100644
--- a/src/components/FileUpload.vue
+++ b/src/components/FileUpload.vue
@@ -9,6 +9,9 @@
              :auto-upload="true"
              :before-upload="beforeUpload"
              :on-success="handleUploadSuccess"
+             :before-remove="beforeRemove"
+             :on-remove="handleRemoveAttachment"
+             @handleRemove="handleRemove1"
   >
     <el-button color="#DED0B2">上传文件</el-button>
   </el-upload>
@@ -16,10 +19,12 @@
 
 <script setup>
 import {defineProps, computed, ref} from "vue";
-import {ElMessage} from "element-plus";
-import { getToken } from '@/utils/auth'
+import {ElMessage, ElMessageBox} from "element-plus";
+import {getToken} from '@/utils/auth'
+import {deleteFile} from "@/api/project-demand";
+
 const baseURL = import.meta.env.VITE_BASE_URL
-const uploadFileUrl = ref(baseURL + "/workflow/process/file")
+const uploadFileUrl = ref(baseURL + "/workflow/process/file/upload")
 const headers = reactive({
   authorization: getToken()
 })
@@ -34,10 +39,11 @@ const props = defineProps({
   },
   maxSize: {
     type: Number,
-    default: 5
+    default: 30
   }
 })
-const emit = defineEmits(["input","getFile"])
+
+const emit = defineEmits(["input", "getFile"])
 const fileList = ref([])
 const _value = computed({
   get() {
@@ -49,11 +55,11 @@ const _value = computed({
 })
 
 const beforeUpload = (file) => {
-  // if (props.maxSize > 0 && file.size / 1024 / 1024 > props.maxSize) {
-  //   ElMessage.warning(`每个文件最大不超过 ${props.maxSize}MB`)
-  // } else {
+  if (props.maxSize > 0 && file.size / 1024 / 1024 > props.maxSize) {
+    ElMessage.warning(`每个文件最大不超过 ${props.maxSize}MB`)
+  } else {
     return true
-  // }
+  }
 }
 const handleUploadSuccess = (res, file) => {
   if (res.code !== 1000) {
@@ -63,5 +69,42 @@ const handleUploadSuccess = (res, file) => {
   fileList.value.push(data)
   emit("getFile", fileList.value)
 }
+const beforeRemove = (file) => {
+  console.log('file.response.data.originalFilename', file.response)
+  return ElMessageBox.confirm(`确认删除名称为${file.response.data.originalFilename}的文件吗?`, '系统提示', {
+    confirmButtonText: '确定',
+    cancelButtonText: '取消',
+    type: 'warning'
+  }).then(() => true
+      // () => false
+  )
+  // ElMessageBox.confirm(`确认删除名称为${file.response.data.originalFilename}的表格吗?`, '系统提示', {
+  //   confirmButtonText: '确定',
+  //   cancelButtonText: '取消',
+  //   type: 'warning'
+  // }).then(() => {
+  //   return true;
+  // }).catch(()=>{
+  //   ElMessage.warning("用户取消删除! ");
+  //   return false;
+  // })
+}
+const handleRemoveAttachment = (file) => {
+  handleRemove(file.response.data)
+}
+const handleRemove = (file) => {
+  console.log('fil对对对e', file,fileList.value)
+  // "http://43.138.199.198:8888//group1/M00/00/00/CgAICGY_pZKAFiruAAAAAAAAAAA88.docx"
+
+  // deleteFile(file.id).then(res => {
+  //   if (res.code === 1000) {
+  //     ElMessage.success("删除成功");
+  //     fileList.value.splice(fileList.value.findIndex((item) => item.id === file.id), 1);
+  //   }
+  // });
+};
+const handleRemove1=()=>{
+  console.log('handleRemove1vdvd')
+}
 </script>
 
diff --git a/src/views/home/index.vue b/src/views/home/index.vue
index 1f9f023..5675428 100644
--- a/src/views/home/index.vue
+++ b/src/views/home/index.vue
@@ -119,7 +119,7 @@ const tableConfig = reactive({
       label: '类型',
       align: 'center',
       showOverflowTooltip: false,
-      currentRender: ({row, index}) => (<Tag dictType={'todo_type'} value={row.state}/>)
+      currentRender: ({row, index}) => (<Tag dictType={'todo_type'} value={row.targetState}/>)
     },
     {
       prop: 'submitTime',
diff --git a/vite.config.js b/vite.config.js
index 92e2a1e..da93391 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -18,7 +18,6 @@ export default defineConfig({
     AutoImport({
       //自动导入vue相关函数
       imports: ['vue','vue-router'],
-
       resolvers: [
         ElementPlusResolver(),
         //自动导入图标组件
@@ -70,6 +69,7 @@ export default defineConfig({
     open: true,
     proxy: {
       '/api/workflow': {
+        // target: 'http://frp.feashow.cn:31800/',
         target: 'http://clay.frp.feashow.cn/',
         // target: 'http://192.168.31.175:8000',
         changeOrigin: true,

From 6fbcdc82cafedce0ce662cec9796104785bb39d2 Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Sun, 12 May 2024 13:59:50 +0800
Subject: [PATCH 20/36] =?UTF-8?q?fix=20:=20=E4=BF=AE=E5=A4=8D=E7=BB=86?=
 =?UTF-8?q?=E8=8A=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/FileUpload.vue | 72 ++++++++++++++++++++++++-----------
 1 file changed, 50 insertions(+), 22 deletions(-)

diff --git a/src/components/FileUpload.vue b/src/components/FileUpload.vue
index 53f05a1..5398ed1 100644
--- a/src/components/FileUpload.vue
+++ b/src/components/FileUpload.vue
@@ -6,15 +6,37 @@
              with-credentials
              :multiple="maxSize > 0"
              :data="uploadParams"
+             :show-file-list="false"
              :auto-upload="true"
              :before-upload="beforeUpload"
              :on-success="handleUploadSuccess"
-             :before-remove="beforeRemove"
-             :on-remove="handleRemoveAttachment"
-             @handleRemove="handleRemove1"
   >
+<!--    :before-remove="beforeRemove"-->
+<!--    :on-remove="handleRemoveAttachment"-->
+<!--    @handleRemove="handleRemove1"-->
     <el-button color="#DED0B2">上传文件</el-button>
   </el-upload>
+  <div v-if="showTable||fileList.length!==0">
+    <el-table :data="fileList" style="width: 100%">
+      <el-table-column fixed prop="originalFilename" label="文件名" />
+      <el-table-column fixed prop="fileType" label="文件类型" />
+      <el-table-column fixed prop="size" label="文件大小"  >
+        <template #default="scope">
+          {{parseInt(scope.row.size/1024)}}{{parseInt(scope.row.size/1024)>1024?'MB':'KB'}}
+        </template>
+      </el-table-column>
+<!--      <el-table-column fixed prop="url" label="url"  />-->
+      <el-table-column fixed="right" label="操作" >
+        <template #default="scope">
+          <a :href="scope.row.url">
+            下载
+          </a>
+          <el-button link type="primary" size="small" @click="beforeRemove(scope.row)">
+            删除
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table></div>
 </template>
 
 <script setup>
@@ -29,6 +51,7 @@ const headers = reactive({
   authorization: getToken()
 })
 const disabled = ref(false)
+const showTable = ref(false)
 const uploadParams = ref({})
 const props = defineProps({
   value: {
@@ -55,7 +78,11 @@ const _value = computed({
 })
 
 const beforeUpload = (file) => {
-  if (props.maxSize > 0 && file.size / 1024 / 1024 > props.maxSize) {
+  const FileExt = file.name.replace(/.+\./, "");
+  if (['zip', 'rar','pdf','doc','docx','xlsx'].indexOf(FileExt.toLowerCase()) === -1){
+    ElMessage.warning('请上传后缀名为pdf、doc、docx、xlsx、zip或rar的文件！');
+    return false;
+  } else if (props.maxSize > 0 && file.size / 1024 / 1024 > props.maxSize) {
     ElMessage.warning(`每个文件最大不超过 ${props.maxSize}MB`)
   } else {
     return true
@@ -65,35 +92,30 @@ const handleUploadSuccess = (res, file) => {
   if (res.code !== 1000) {
     ElMessage.error("上传失败")
   }
+  showTable.value=true
   let data = res.data
   fileList.value.push(data)
   emit("getFile", fileList.value)
 }
-const beforeRemove = (file) => {
-  console.log('file.response.data.originalFilename', file.response)
-  return ElMessageBox.confirm(`确认删除名称为${file.response.data.originalFilename}的文件吗?`, '系统提示', {
+const beforeRemove = (row) => {
+  console.log('row',row)
+  // console.log('file.response.data.originalFilename', file.response)
+  ElMessageBox.confirm(`确认删除名称为${row.originalFilename}的表格吗?`, '系统提示', {
     confirmButtonText: '确定',
     cancelButtonText: '取消',
     type: 'warning'
-  }).then(() => true
-      // () => false
-  )
-  // ElMessageBox.confirm(`确认删除名称为${file.response.data.originalFilename}的表格吗?`, '系统提示', {
-  //   confirmButtonText: '确定',
-  //   cancelButtonText: '取消',
-  //   type: 'warning'
-  // }).then(() => {
-  //   return true;
-  // }).catch(()=>{
-  //   ElMessage.warning("用户取消删除! ");
-  //   return false;
-  // })
+  }).then(() => {
+    handleRemove(row)
+  }).catch(()=>{
+    ElMessage.warning("用户取消删除! ");
+    // return false;
+  })
 }
 const handleRemoveAttachment = (file) => {
   handleRemove(file.response.data)
 }
-const handleRemove = (file) => {
-  console.log('fil对对对e', file,fileList.value)
+const handleRemove = (row) => {
+  console.log('fil对对对e',row,fileList.value)
   // "http://43.138.199.198:8888//group1/M00/00/00/CgAICGY_pZKAFiruAAAAAAAAAAA88.docx"
 
   // deleteFile(file.id).then(res => {
@@ -108,3 +130,9 @@ const handleRemove1=()=>{
 }
 </script>
 
+<style lang="scss" scoped>
+a{
+  font-size: 12px;
+  color:#2a99ff;
+}
+</style>

From 416fa2ed53d78088ad7099e10ea6b9c233cf28e3 Mon Sep 17 00:00:00 2001
From: clay <20932067@zju.edu.cn>
Date: Sun, 12 May 2024 14:23:34 +0800
Subject: [PATCH 21/36] =?UTF-8?q?build=20:=20=E6=B5=81=E7=A8=8B=E6=BC=94?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/project-demand/index.js               |  7 ++++++
 .../projectdemand/demandcollection/add.vue    |  2 +-
 .../projectdemand/demandcollection/detail.vue | 17 ++++++++++----
 .../workflow/common/ProcessDiagramViewer.vue  |  8 ++++++-
 .../process/common/AvatarEllipsis.vue         |  4 ++++
 src/views/workflow/process/nodes/Node.vue     | 22 +++++++++++--------
 6 files changed, 45 insertions(+), 15 deletions(-)

diff --git a/src/api/project-demand/index.js b/src/api/project-demand/index.js
index 0113419..24ee479 100644
--- a/src/api/project-demand/index.js
+++ b/src/api/project-demand/index.js
@@ -26,6 +26,13 @@ export const agreeTask = (data) => {
     data: data
   });
 };
+export const rejectTask = (data) => {
+  return request({
+    url: `/workflow/mosr/process/task/reject`,
+    method: "post",
+    data: data
+  });
+};
 
 export const addRequirement = (data) => {
   return request({
diff --git a/src/views/projectdemand/demandcollection/add.vue b/src/views/projectdemand/demandcollection/add.vue
index b5119c3..0c54103 100644
--- a/src/views/projectdemand/demandcollection/add.vue
+++ b/src/views/projectdemand/demandcollection/add.vue
@@ -44,7 +44,7 @@
     <file-upload @getFile="getFile"/>
     <div class="approval-record">
       <baseTitle title="流程"></baseTitle>
-      <process-diagram-viewer v-if="processDiagramViewer"/>
+      <process-diagram-viewer mode="view" v-if="processDiagramViewer" />
       <!--      <div class="process" id="approvalRecord">-->
       <!--        <process-tree ref="processTree" mode="view" id-name="approvalRecord"/>-->
       <!--      </div>-->
diff --git a/src/views/projectdemand/demandcollection/detail.vue b/src/views/projectdemand/demandcollection/detail.vue
index e6153d3..eb0781f 100644
--- a/src/views/projectdemand/demandcollection/detail.vue
+++ b/src/views/projectdemand/demandcollection/detail.vue
@@ -60,16 +60,16 @@
       <div class="approval-record">
         <baseTitle title="审批记录"></baseTitle>
         <div class="process">
-          <operation-render :operation-list="processInstanceData.operationList"
+          <operation-render v-if="processDiagramViewer" :operation-list="processInstanceData.operationList"
                             :state="'4'"/>
-<!--          <process-diagram-viewer v-if="processDiagramViewer"/>-->
+          <process-diagram-viewer v-if="processDiagramViewer"/>
         </div>
       </div>
       <!--        </el-col>-->
       <!--      </el-row>-->
     </el-form>
     <div class="oper-page-btn" v-if="processInstanceData.taskId">
-      <el-button @click="handleBack">驳回</el-button>
+      <el-button @click="handleReject">驳回</el-button>
       <el-button color="#DED0B2" @click="handleSubmit">同意</el-button>
     </div>
   </div>
@@ -79,7 +79,7 @@
 import OperationRender from '@/views/workflow/common/OperationRender.vue'
 import ProcessDiagramViewer from '@/views/workflow/common/ProcessDiagramViewer.vue'
 import {useProcessStore} from '@/stores/processStore.js';
-import {getInfo, agreeTask} from "@/api/project-demand/index.js";
+import {getInfo, agreeTask, rejectTask} from "@/api/project-demand/index.js";
 
 const route = useRoute()
 const form = ref();
@@ -130,6 +130,15 @@ const handleSubmit = () => {
     console.log(res)
   })
 }
+const handleReject = () => {
+  let approve = {
+    taskId: processInstanceData.value.taskId,
+    auditOpinion : auditOpinion.value,
+  }
+  rejectTask(approve).then(res => {
+    console.log(res)
+  })
+}
 
 const init = async () => {
   getInfo(route.query.id).then(res => {
diff --git a/src/views/workflow/common/ProcessDiagramViewer.vue b/src/views/workflow/common/ProcessDiagramViewer.vue
index 1050a29..595e0c3 100644
--- a/src/views/workflow/common/ProcessDiagramViewer.vue
+++ b/src/views/workflow/common/ProcessDiagramViewer.vue
@@ -9,7 +9,7 @@
   <div style="margin-top: 40px">
     <div :style="'transform: scale('+ scale / 100 +');'">
       <div id="previewProcess">
-        <process-tree mode="preview" ref="processTreePreview" id-name="previewProcess"/>
+        <process-tree :mode="mode" ref="processTreePreview" id-name="previewProcess"/>
       </div>
     </div>
   </div>
@@ -20,6 +20,12 @@ import ProcessTree from '@/views/workflow/process/ProcessTree.vue'
 
 const processTreePreview = ref()
 const scale = ref(100)
+const props = defineProps({
+  mode: {
+    type: String,
+    default: 'preview'
+  }
+})
 
 nextTick(()=>{
   processTreePreview.value.init()
diff --git a/src/views/workflow/process/common/AvatarEllipsis.vue b/src/views/workflow/process/common/AvatarEllipsis.vue
index 883f400..2665f58 100644
--- a/src/views/workflow/process/common/AvatarEllipsis.vue
+++ b/src/views/workflow/process/common/AvatarEllipsis.vue
@@ -38,6 +38,10 @@ const props = defineProps({
   userInfo: {
     type: Array,
     default: []
+  },
+  mode: {
+    type: String,
+    default: 'design'
   }
 })
 
diff --git a/src/views/workflow/process/nodes/Node.vue b/src/views/workflow/process/nodes/Node.vue
index b02ee1e..36acd65 100644
--- a/src/views/workflow/process/nodes/Node.vue
+++ b/src/views/workflow/process/nodes/Node.vue
@@ -17,24 +17,28 @@
         </el-icon>
         <template v-if="selectUser.show && mode === 'view'">
           <div class="avatar_button">
-            <avatar-ellipsis :row="3" v-if="userInfo.length > 0" :user-info="userInfo"/>
+            <avatar-ellipsis :row="3" v-if="userInfo.length > 0" :mode="mode" :user-info="userInfo"/>
             <el-button type="primary" :icon="Plus" circle/>
           </div>
         </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>
-            <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" v-if="userInfo.length > 0" :mode="mode" :user-info="userInfo"/>
+
+
+<!--          <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"/>-->
         </template>
         <template v-else>
           <span class="placeholder" v-if="(content || '').trim() === ''">{{ placeholder }}</span>
-          <ellipsis :row="3" :content="content" v-else/>
+          <ellipsis :row="3" :content="content"  :mode="mode" v-else/>
         </template>
       </div>
       <div class="node-error" v-if="showError">

From eeab66d8fb1c28f99441a8096f0a213e02c975bb Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Sun, 12 May 2024 14:44:04 +0800
Subject: [PATCH 22/36] =?UTF-8?q?fix=20:=20=E4=BF=AE=E5=A4=8D=E7=BB=86?=
 =?UTF-8?q?=E8=8A=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/project-demand/index.js               |  4 +-
 src/components/FileUpload.vue                 | 16 ++++----
 src/views/home/index.vue                      |  1 -
 .../projectdemand/demandcollection/index.vue  | 10 +++--
 .../process/common/AvatarEllipsis.vue         | 39 ++++++++++++++-----
 src/views/workflow/process/nodes/Node.vue     | 35 +----------------
 6 files changed, 48 insertions(+), 57 deletions(-)

diff --git a/src/api/project-demand/index.js b/src/api/project-demand/index.js
index 24ee479..9ec21ce 100644
--- a/src/api/project-demand/index.js
+++ b/src/api/project-demand/index.js
@@ -41,9 +41,9 @@ export const addRequirement = (data) => {
     data: data
   });
 };
-export const deleteFile = (path) => {
+export const deleteFile = (id) => {
   return request({
-    url: '/process/file/delete/'+ path,
+    url: `/process/file/delete/${id}`,
     method: "delete"
   });
 };
diff --git a/src/components/FileUpload.vue b/src/components/FileUpload.vue
index 5398ed1..6f09d10 100644
--- a/src/components/FileUpload.vue
+++ b/src/components/FileUpload.vue
@@ -91,6 +91,8 @@ const beforeUpload = (file) => {
 const handleUploadSuccess = (res, file) => {
   if (res.code !== 1000) {
     ElMessage.error("上传失败")
+  }else {
+    ElMessage.success("上传成功")
   }
   showTable.value=true
   let data = res.data
@@ -116,14 +118,12 @@ const handleRemoveAttachment = (file) => {
 }
 const handleRemove = (row) => {
   console.log('fil对对对e',row,fileList.value)
-  // "http://43.138.199.198:8888//group1/M00/00/00/CgAICGY_pZKAFiruAAAAAAAAAAA88.docx"
-
-  // deleteFile(file.id).then(res => {
-  //   if (res.code === 1000) {
-  //     ElMessage.success("删除成功");
-  //     fileList.value.splice(fileList.value.findIndex((item) => item.id === file.id), 1);
-  //   }
-  // });
+  deleteFile(row.id).then(res => {
+    if (res.code === 1000) {
+      ElMessage.success("删除成功");
+      // fileList.value.splice(fileList.value.findIndex((item) => item.id === file.id), 1);
+    }
+  });
 };
 const handleRemove1=()=>{
   console.log('handleRemove1vdvd')
diff --git a/src/views/home/index.vue b/src/views/home/index.vue
index 5675428..0bbfa5d 100644
--- a/src/views/home/index.vue
+++ b/src/views/home/index.vue
@@ -46,7 +46,6 @@
               <span>常用网站</span>
             </div>
             <el-divider/>
-
           </div>
         </div>
       </el-col>
diff --git a/src/views/projectdemand/demandcollection/index.vue b/src/views/projectdemand/demandcollection/index.vue
index a4bfb44..f67c2dc 100644
--- a/src/views/projectdemand/demandcollection/index.vue
+++ b/src/views/projectdemand/demandcollection/index.vue
@@ -4,9 +4,7 @@
 </template>
 
 <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([
@@ -16,7 +14,9 @@ const searchConfig = reactive([
     component: 'el-input',
     props: {
       placeholder: '请输入名称查询',
-      clearable: true
+      clearable: true,
+      filterable: true,
+      checkStrictly: true
     }
   },
   {
@@ -25,7 +25,9 @@ const searchConfig = reactive([
     component: 'el-input',
     props: {
       placeholder: '请输入名称查询',
-      clearable: true
+      clearable: true,
+      filterable: true,
+      checkStrictly: true
     }
   }
 ])
diff --git a/src/views/workflow/process/common/AvatarEllipsis.vue b/src/views/workflow/process/common/AvatarEllipsis.vue
index 2665f58..78b6206 100644
--- a/src/views/workflow/process/common/AvatarEllipsis.vue
+++ b/src/views/workflow/process/common/AvatarEllipsis.vue
@@ -5,8 +5,11 @@
     <slot name="pre"></slot>
     <div style="display: flex;flex-wrap: wrap;">
       <div v-for="(user,index) in userInfo" :key="index" class="avatar_name">
-        <el-avatar size="large"
-                   :src="user.avatar"></el-avatar>
+        <div class="circle-user">
+          <el-tooltip class="item" effect="dark" :content="user.name" placement="bottom-start">
+            <span class="item_name">{{ user.name }}</span>
+          </el-tooltip>
+        </div>
         <div v-if="user.icon"
              class="el-timeline-item__node" :style="{
                       backgroundColor: user.color
@@ -15,17 +18,15 @@
             <component :is="user.icon"/>
           </el-icon>
         </div>
-        <el-tooltip class="item" effect="dark" :content="user.name" placement="bottom-start">
-          <span class="item_name">{{ user.name }}</span>
-        </el-tooltip>
       </div>
     </div>
   </div>
 </template>
 
 <script setup>
-import {Loading,Close,CircleCheckFilled,MoreFilled} from '@element-plus/icons-vue'
+import {Loading, Close, CircleCheckFilled, MoreFilled} from '@element-plus/icons-vue'
 import {defineProps} from "vue";
+
 const props = defineProps({
   row: {
     type: Number,
@@ -74,7 +75,7 @@ const initUser = (user) => {
     user["icon"] = Close
     user["color"] = "#f56c6c"
   }
-  if (state === 'PASS'){
+  if (state === 'PASS') {
     user["icon"] = MoreFilled
     user["color"] = "#c0c4cc"
   }
@@ -84,7 +85,27 @@ const initUser = (user) => {
 init()
 </script>
 
-<style scoped>
+<style scoped lang="scss">
+.circle-user {
+  width: 50px;
+  height: 50px;
+  display: flex;
+  justify-content: center;
+  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;
+  }
+}
+
 .avatar_name {
   display: flex;
   flex-direction: column;
@@ -96,7 +117,7 @@ init()
 
 .el-timeline-item__node {
   position: absolute;
-  bottom: 20px;
+  bottom: 0;
   right: 1px;
 }
 
diff --git a/src/views/workflow/process/nodes/Node.vue b/src/views/workflow/process/nodes/Node.vue
index 36acd65..28d801b 100644
--- a/src/views/workflow/process/nodes/Node.vue
+++ b/src/views/workflow/process/nodes/Node.vue
@@ -23,22 +23,11 @@
         </template>
         <template v-else-if="showAvatar">
           <span class="placeholder" v-if="userInfo.length === 0">{{ placeholder }}</span>
-
-          <avatar-ellipsis :row="3" v-if="userInfo.length > 0" :mode="mode" :user-info="userInfo"/>
-
-
-<!--          <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" v-if="userInfo.length > 0" :user-info="userInfo"/>
         </template>
         <template v-else>
           <span class="placeholder" v-if="(content || '').trim() === ''">{{ placeholder }}</span>
-          <ellipsis :row="3" :content="content"  :mode="mode" v-else/>
+          <ellipsis :row="3" :content="content" :mode="mode" v-else/>
         </template>
       </div>
       <div class="node-error" v-if="showError">
@@ -194,26 +183,6 @@ const init = () => {
 </script>
 
 <style lang="scss" scoped>
-.circle-user {
-  width: 50px;
-  height: 50px;
-  display: flex;
-  justify-content: center;
-  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;

From 876bd1f9f9358ae79db95c737e04d5aa51fce2d8 Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Sun, 12 May 2024 15:11:37 +0800
Subject: [PATCH 23/36] =?UTF-8?q?fix=20:=20=E4=BF=AE=E5=A4=8D=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E5=88=A0=E9=99=A4=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/project-demand/index.js |  4 ++--
 src/components/FileUpload.vue   | 18 +++---------------
 2 files changed, 5 insertions(+), 17 deletions(-)

diff --git a/src/api/project-demand/index.js b/src/api/project-demand/index.js
index 9ec21ce..98d3da5 100644
--- a/src/api/project-demand/index.js
+++ b/src/api/project-demand/index.js
@@ -41,9 +41,9 @@ export const addRequirement = (data) => {
     data: data
   });
 };
-export const deleteFile = (id) => {
+export const deleteFile = (fileId) => {
   return request({
-    url: `/process/file/delete/${id}`,
+    url: `/workflow/process/file/delete/${fileId}`,
     method: "delete"
   });
 };
diff --git a/src/components/FileUpload.vue b/src/components/FileUpload.vue
index 6f09d10..5f7ba9b 100644
--- a/src/components/FileUpload.vue
+++ b/src/components/FileUpload.vue
@@ -11,9 +11,6 @@
              :before-upload="beforeUpload"
              :on-success="handleUploadSuccess"
   >
-<!--    :before-remove="beforeRemove"-->
-<!--    :on-remove="handleRemoveAttachment"-->
-<!--    @handleRemove="handleRemove1"-->
     <el-button color="#DED0B2">上传文件</el-button>
   </el-upload>
   <div v-if="showTable||fileList.length!==0">
@@ -25,7 +22,6 @@
           {{parseInt(scope.row.size/1024)}}{{parseInt(scope.row.size/1024)>1024?'MB':'KB'}}
         </template>
       </el-table-column>
-<!--      <el-table-column fixed prop="url" label="url"  />-->
       <el-table-column fixed="right" label="操作" >
         <template #default="scope">
           <a :href="scope.row.url">
@@ -100,8 +96,6 @@ const handleUploadSuccess = (res, file) => {
   emit("getFile", fileList.value)
 }
 const beforeRemove = (row) => {
-  console.log('row',row)
-  // console.log('file.response.data.originalFilename', file.response)
   ElMessageBox.confirm(`确认删除名称为${row.originalFilename}的表格吗?`, '系统提示', {
     confirmButtonText: '确定',
     cancelButtonText: '取消',
@@ -110,24 +104,18 @@ const beforeRemove = (row) => {
     handleRemove(row)
   }).catch(()=>{
     ElMessage.warning("用户取消删除! ");
-    // return false;
   })
 }
-const handleRemoveAttachment = (file) => {
-  handleRemove(file.response.data)
-}
+
 const handleRemove = (row) => {
-  console.log('fil对对对e',row,fileList.value)
   deleteFile(row.id).then(res => {
     if (res.code === 1000) {
       ElMessage.success("删除成功");
-      // fileList.value.splice(fileList.value.findIndex((item) => item.id === file.id), 1);
+      fileList.value.splice(fileList.value.findIndex((item) => item.id === row.id), 1);
     }
   });
 };
-const handleRemove1=()=>{
-  console.log('handleRemove1vdvd')
-}
+
 </script>
 
 <style lang="scss" scoped>

From 548cab4cdefa663a09b1c5ea926e459b6d108085 Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Sun, 12 May 2024 15:14:28 +0800
Subject: [PATCH 24/36] =?UTF-8?q?fix=20:=20=E4=BF=AE=E5=A4=8D=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E5=88=A0=E9=99=A4=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/projectdemand/demandcollection/index.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/views/projectdemand/demandcollection/index.vue b/src/views/projectdemand/demandcollection/index.vue
index f67c2dc..ae2926c 100644
--- a/src/views/projectdemand/demandcollection/index.vue
+++ b/src/views/projectdemand/demandcollection/index.vue
@@ -9,8 +9,8 @@ import Tag from '@/components/Tag.vue'
 const router = useRouter()
 const searchConfig = reactive([
   {
-    label: '征集类型',
-    prop: 'collectType',
+    label: '需求名称',
+    prop: 'requirementName',
     component: 'el-input',
     props: {
       placeholder: '请输入名称查询',
@@ -20,8 +20,8 @@ const searchConfig = reactive([
     }
   },
   {
-    label: '需求名称',
-    prop: 'requirementName',
+    label: '征集类型',
+    prop: 'collectType',
     component: 'el-input',
     props: {
       placeholder: '请输入名称查询',

From aaedb362b51db4001015a380d8166417a3be006b Mon Sep 17 00:00:00 2001
From: clay <20932067@zju.edu.cn>
Date: Sun, 12 May 2024 15:14:39 +0800
Subject: [PATCH 25/36] =?UTF-8?q?build=20:=20=E6=8C=89=E9=92=AE=E6=9D=83?=
 =?UTF-8?q?=E9=99=90=E5=8C=BA=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../projectdemand/demandcollection/detail.vue |  2 +-
 .../projectdemand/demandcollection/index.vue  | 27 ++++++++++++++-----
 src/views/workflow/process/nodes/Node.vue     |  2 +-
 3 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/src/views/projectdemand/demandcollection/detail.vue b/src/views/projectdemand/demandcollection/detail.vue
index eb0781f..1c0047e 100644
--- a/src/views/projectdemand/demandcollection/detail.vue
+++ b/src/views/projectdemand/demandcollection/detail.vue
@@ -68,7 +68,7 @@
       <!--        </el-col>-->
       <!--      </el-row>-->
     </el-form>
-    <div class="oper-page-btn" v-if="processInstanceData.taskId">
+    <div class="oper-page-btn" v-if="processInstanceData.state === '1' && processInstanceData.taskId">
       <el-button @click="handleReject">驳回</el-button>
       <el-button color="#DED0B2" @click="handleSubmit">同意</el-button>
     </div>
diff --git a/src/views/projectdemand/demandcollection/index.vue b/src/views/projectdemand/demandcollection/index.vue
index a4bfb44..aa63a86 100644
--- a/src/views/projectdemand/demandcollection/index.vue
+++ b/src/views/projectdemand/demandcollection/index.vue
@@ -71,7 +71,7 @@ const tableConfig = reactive({
       prop: 'state',
       label: '状态',
       align: 'center',
-      width:200,
+      width: 200,
       showOverflowTooltip: false,
       currentRender: ({row, index}) => (<Tag dictType={'process_state'} value={row.state}/>)
     },
@@ -81,12 +81,27 @@ const tableConfig = reactive({
       align: 'center',
       showOverflowTooltip: false,
       currentRender: ({row, index}) => {
+        let btn = [{label: '详情', func: () => handleDetail(row), type: 'primary'}]
+        if (row.state === '3' || row.state === '2') {
+          btn.push({label: '编辑', func: () => handleEdit(row), type: 'primary'})
+          btn.push({label: '删除', func: () => handleDel(row), type: 'danger'})
+        }else if (row.state === '4'){
+          btn.push({label: '上报', func: () => handleReport(row), type: 'primary'})
+        }
         return (
-            <div>
-              <el-button type="primary" link onClick={() => handleDetail(row)}>详情
-              </el-button>
-              <el-button type="primary" link onClick={() => handleEdit(row)}>编辑</el-button>
-              <el-button type="primary" link onClick={() => handleReport(row)}>上报</el-button>
+            <div style={{width: '100%'}}>
+              {
+                btn.map(item => (
+                    <el-button
+                        type={item.type}
+                        // v-perm={item.auth}
+                        onClick={() => item.func()}
+                        link
+                    >
+                      {item.label}
+                    </el-button>
+                ))
+              }
             </div>
         )
       }
diff --git a/src/views/workflow/process/nodes/Node.vue b/src/views/workflow/process/nodes/Node.vue
index 36acd65..ef615b6 100644
--- a/src/views/workflow/process/nodes/Node.vue
+++ b/src/views/workflow/process/nodes/Node.vue
@@ -24,7 +24,7 @@
         <template v-else-if="showAvatar">
           <span class="placeholder" v-if="userInfo.length === 0">{{ placeholder }}</span>
 
-          <avatar-ellipsis :row="3" v-if="userInfo.length > 0" :mode="mode" :user-info="userInfo"/>
+          <avatar-ellipsis :row="3" v-if="userInfo.length > 0" :user-info="userInfo"/>
 
 
 <!--          <div v-else v-for="item in userInfo" class="circle-user">-->

From d139b016a2e5eb6ddfc7aeacdb784c59b5350614 Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Sun, 12 May 2024 15:35:40 +0800
Subject: [PATCH 26/36] =?UTF-8?q?fix=20:=20=E4=BF=AE=E5=A4=8D=E7=BB=86?=
 =?UTF-8?q?=E8=8A=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/project-demand/index.js               |  2 +-
 src/views/home/index.vue                      | 57 ++++++-------------
 .../projectdemand/demandcollection/add.vue    |  2 +-
 .../projectdemand/demandcollection/detail.vue | 10 +---
 .../projectdemand/demandcollection/index.vue  | 21 +++----
 5 files changed, 30 insertions(+), 62 deletions(-)

diff --git a/src/api/project-demand/index.js b/src/api/project-demand/index.js
index 98d3da5..2be96fc 100644
--- a/src/api/project-demand/index.js
+++ b/src/api/project-demand/index.js
@@ -36,7 +36,7 @@ export const rejectTask = (data) => {
 
 export const addRequirement = (data) => {
   return request({
-    url: `/workflow/mosr/requirement`,
+    url: '/workflow/mosr/requirement',
     method: "post",
     data: data
   });
diff --git a/src/views/home/index.vue b/src/views/home/index.vue
index 0bbfa5d..129e740 100644
--- a/src/views/home/index.vue
+++ b/src/views/home/index.vue
@@ -16,7 +16,7 @@
             </el-col>
           </el-row>
           <h4>待办 ({{ todoNum }})</h4>
-          <fvTable ref="tableIns" class="home-table" :tableConfig="tableConfig" @headBtnClick="headBtnClick">
+          <fvTable ref="tableIns" class="home-table" :tableConfig="tableConfig">
             <template #empty>
               <el-empty description="暂无待办"/>
             </template>
@@ -25,11 +25,6 @@
       </el-col>
       <el-col :xs="24" :sm="24" :md="6" :lg="6" :xl="6">
         <div class="right">
-          <!--          <div class="right-top">-->
-          <!--            <h3>欢迎回来， Sunshine</h3>-->
-          <!--            <div>科技创新项目需求征集中， 要求参见OA内部信！</div>-->
-          <!--          </div>-->
-          <!--          <div class="right-gap"></div>-->
           <div class="right-top ">
             <div>
               <h3>帮助文档</h3>
@@ -56,6 +51,7 @@
 <script setup lang="jsx">
 import 'element-plus/theme-chalk/display.css'
 
+const router = useRouter()
 const list = ref([
   {
     title: '待立项',
@@ -114,7 +110,7 @@ const tableConfig = reactive({
       align: 'center',
     },
     {
-      prop: 'state',
+      prop: 'targetState',
       label: '类型',
       align: 'center',
       showOverflowTooltip: false,
@@ -140,7 +136,7 @@ const tableConfig = reactive({
       currentRender: ({row, index}) => {
         return (
             <div>
-              <el-button type="primary" link onClick={() => handleEdit(row)}>查看</el-button>
+              <el-button type="primary" link onClick={() => handleView(row)}>查看</el-button>
               <el-button type="primary" link onClick={() => handleEdit(row)}>已读</el-button>
             </div>
         )
@@ -150,14 +146,18 @@ const tableConfig = reactive({
   api: '/workflow/mosr/process/task',
   params: {},
 })
-
-const headBtnClick = (key) => {
-  switch (key) {
-    case 'add':
-      handleAdd()
-      break;
+const handleView = (row) => {
+  console.log('row', row)
+  if (row.requirementId) {
+    router.push({
+      path: '/projectdemand/demanddetail',
+      query: {
+        id: row.requirementId
+      }
+    })
   }
 }
+
 </script>
 
 <style lang="scss" scoped>
@@ -166,29 +166,21 @@ const headBtnClick = (key) => {
     margin-top: 10px;
   }
   :deep(.el-table) {
-    height: 300px!important;
+    height: 300px !important;
   }
 
 
 }
+
 @media only screen and (max-width: 1000px) {
   .right {
     margin-top: 10px;
   }
   :deep(.el-table) {
-    height: 300px!important;
+    height: 300px !important;
   }
 
 }
-//.right-gap {
-//  background-color: #EFEFEF;
-//  width: 20px;
-//  //margin-right: -10px;
-//}
-:deep(.el-table) {
-  //height: 200px;
-  //max-height: 400px;
-}
 
 .home-bg {
   height: calc(100vh - 130px);
@@ -277,21 +269,6 @@ const headBtnClick = (key) => {
     flex-direction: column;
     justify-content: space-between;
 
-    //.right-top {
-    //  h3 {
-    //    text-align: center;
-    //    margin-bottom: 15px;
-    //  }
-    //
-    //  div {
-    //    color: #909399;
-    //    font-size: 14px;
-    //    margin: 0 20px;
-    //    letter-spacing: 1px;
-    //    line-height: 25px;
-    //  }
-    //}
-
     .right-top {
       flex: 0.5;
       padding: 15px;
diff --git a/src/views/projectdemand/demandcollection/add.vue b/src/views/projectdemand/demandcollection/add.vue
index 0c54103..bb5f4e2 100644
--- a/src/views/projectdemand/demandcollection/add.vue
+++ b/src/views/projectdemand/demandcollection/add.vue
@@ -78,7 +78,7 @@ const processDiagramViewer = ref(false)
 const typeOption = ref([
   {
     label: "需求征集",
-    value: '需求征集'
+    value: '00'
   }
 ])
 const companyOption = ref([
diff --git a/src/views/projectdemand/demandcollection/detail.vue b/src/views/projectdemand/demandcollection/detail.vue
index 1c0047e..0718153 100644
--- a/src/views/projectdemand/demandcollection/detail.vue
+++ b/src/views/projectdemand/demandcollection/detail.vue
@@ -56,17 +56,14 @@
           </el-col>
         </el-row>
       </div>
-      <!--        <el-col :xs="24" :sm="24" :md="24" :lg="12" :xl="10">-->
       <div class="approval-record">
         <baseTitle title="审批记录"></baseTitle>
         <div class="process">
           <operation-render v-if="processDiagramViewer" :operation-list="processInstanceData.operationList"
-                            :state="'4'"/>
+                            :state="processInstanceData.state"/>
           <process-diagram-viewer v-if="processDiagramViewer"/>
         </div>
       </div>
-      <!--        </el-col>-->
-      <!--      </el-row>-->
     </el-form>
     <div class="oper-page-btn" v-if="processInstanceData.state === '1' && processInstanceData.taskId">
       <el-button @click="handleReject">驳回</el-button>
@@ -86,7 +83,6 @@ const form = ref();
 const processStore = useProcessStore()
 const processInstanceData = ref({})
 const processDiagramViewer = ref(false)
-
 const processTree = ref()
 const formData = ref({})
 const auditOpinion = ref('')
@@ -123,7 +119,7 @@ const tableConfig = reactive({
 const handleSubmit = () => {
   let approve = {
     taskId: processInstanceData.value.taskId,
-    auditOpinion : auditOpinion.value,
+    auditOpinion: auditOpinion.value,
     formData: formData.value
   }
   agreeTask(approve).then(res => {
@@ -133,7 +129,7 @@ const handleSubmit = () => {
 const handleReject = () => {
   let approve = {
     taskId: processInstanceData.value.taskId,
-    auditOpinion : auditOpinion.value,
+    auditOpinion: auditOpinion.value,
   }
   rejectTask(approve).then(res => {
     console.log(res)
diff --git a/src/views/projectdemand/demandcollection/index.vue b/src/views/projectdemand/demandcollection/index.vue
index 9fa30f6..b660cab 100644
--- a/src/views/projectdemand/demandcollection/index.vue
+++ b/src/views/projectdemand/demandcollection/index.vue
@@ -5,6 +5,7 @@
 
 <script setup lang="jsx">
 import Tag from '@/components/Tag.vue'
+import fvSelect from '@/fvcomponents/fvSelect/index.vue'
 
 const router = useRouter()
 const searchConfig = reactive([
@@ -22,22 +23,16 @@ const searchConfig = reactive([
   {
     label: '征集类型',
     prop: 'collectType',
-    component: 'el-input',
+    component: shallowRef(fvSelect),
     props: {
-      placeholder: '请输入名称查询',
+      placeholder: '请选择征集类型',
       clearable: true,
       filterable: true,
-      checkStrictly: true
+      cacheKey: 'todo_type'
     }
   }
 ])
 const tableIns = ref()
-const auths = {
-  edit: ['admin:role:edit'],
-  add: ['admin:role:add'],
-  export: ['admin:role:export'],
-}
-
 const tableConfig = reactive({
   columns: [
     {
@@ -86,8 +81,8 @@ const tableConfig = reactive({
         let btn = [{label: '详情', func: () => handleDetail(row), type: 'primary'}]
         if (row.state === '3' || row.state === '2') {
           btn.push({label: '编辑', func: () => handleEdit(row), type: 'primary'})
-          btn.push({label: '删除', func: () => handleDel(row), type: 'danger'})
-        }else if (row.state === '4'){
+          btn.push({label: '删除', func: () => handleDelete(row), type: 'danger'})
+        } else if (row.state === '4') {
           btn.push({label: '上报', func: () => handleReport(row), type: 'primary'})
         }
         return (
@@ -111,8 +106,8 @@ const tableConfig = reactive({
   ],
   api: '/workflow/mosr/requirement',
   btns: [
-    {name: '新增', key: 'add', auth: auths.add, color: '#DED0B2'},
-    {name: '导出', key: 'add', auth: auths.add, type: ''},
+    {name: '新增', key: 'add', color: '#DED0B2'},
+    {name: '导出', key: 'add', type: ''},
   ],
   params: {}
 })

From 72a85729101beedcf1dd37a798b713647105b61e Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Sun, 12 May 2024 15:47:14 +0800
Subject: [PATCH 27/36] =?UTF-8?q?fix=20:=20=E4=BF=AE=E5=A4=8D=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=E6=95=B0=E6=8D=AE=E5=9B=9E=E6=98=BE=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../projectdemand/demandcollection/add.vue    | 39 ++++++++-----------
 1 file changed, 17 insertions(+), 22 deletions(-)

diff --git a/src/views/projectdemand/demandcollection/add.vue b/src/views/projectdemand/demandcollection/add.vue
index bb5f4e2..bfa7593 100644
--- a/src/views/projectdemand/demandcollection/add.vue
+++ b/src/views/projectdemand/demandcollection/add.vue
@@ -44,7 +44,7 @@
     <file-upload @getFile="getFile"/>
     <div class="approval-record">
       <baseTitle title="流程"></baseTitle>
-      <process-diagram-viewer mode="view" v-if="processDiagramViewer" />
+      <process-diagram-viewer mode="view" v-if="processDiagramViewer"/>
       <!--      <div class="process" id="approvalRecord">-->
       <!--        <process-tree ref="processTree" mode="view" id-name="approvalRecord"/>-->
       <!--      </div>-->
@@ -58,19 +58,20 @@
 
 <script setup lang="jsx">
 import {useProcessStore} from '@/stores/processStore.js';
-import {getWorkflowInfo, addRequirement,getInfo} from "@/api/project-demand/index.js";
+import {getWorkflowInfo, addRequirement, getInfo} from "@/api/project-demand/index.js";
 import FileUpload from "@/components/FileUpload.vue";
 import ProcessDiagramViewer from '@/views/workflow/common/ProcessDiagramViewer.vue';
 import {ElMessage} from "element-plus";
-import {useRoute,useRouter} from 'vue-router'
+import {useRoute, useRouter} from 'vue-router'
 
 const router = useRouter()
 const route = useRoute()
 const dateValue = ref()
-let formData = reactive({
+const formData = ref({
   requirementName: '',
   companyIds: '',
   collectType: '',
+  deadline: '',
   collectExplain: ''
 })
 const processDiagramViewer = ref(false)
@@ -106,14 +107,12 @@ const processStore = useProcessStore()
 const processInstanceData = ref()
 
 const getFile = (val) => {
-  console.log('fileList', val)
   fileList.value = val
 }
 
 const init = async () => {
   getWorkflowInfo().then(res => {
     let data = res.data
-    console.log('res2', res)
     processInstanceData.value = data
     processStore.setDesign(data)
     processStore.runningList.value = data.runningList;
@@ -128,16 +127,12 @@ const init = async () => {
 }
 
 const handleSubmit = () => {
-  console.log(formData, "formData")
+  console.log(formData.value, "formData.value")
   addRequirement({
-    "collectExplain": formData.collectExplain,
-    "collectType": formData.collectType,
-    "companyIds": formData.companyIds,
-    "files": fileList.value,
-    "deadline": formData.deadline,
-    "requirementId": 0,
-    "requirementName": formData.requirementName,
-    "deploymentId": processInstanceData.value.deploymentId
+    ...formData.value,
+    requirementId: 0,
+    files: fileList.value,
+    deploymentId: processInstanceData.value.deploymentId
   }).then(res => {
     if (res.code === 1000) {
       ElMessage.success(res.msg)
@@ -153,8 +148,7 @@ const getDetailInfo = async () => {
   getInfo(route.query.id).then(res => {
     if (res.code === 1000) {
       ElMessage.success(res.msg)
-      console.log('res.data',res.data.formData)
-      formData=res.data.formData
+      formData.value = res.data.formData
     } else {
       ElMessage.error(res.msg)
     }
@@ -170,12 +164,12 @@ watch(localData, (val) => {
   menuTree.value.filter(val.filterText)
 })
 
-onMounted( async ()=>{
+onMounted(async () => {
   loading.value = true
   await init()
-  // if(route.query.id) {
-  //   await getDetailInfo()
-  // }
+  if (route.query.id) {
+    await getDetailInfo()
+  }
   loading.value = false
 })
 
@@ -187,7 +181,8 @@ onMounted( async ()=>{
   //justify-content: space-between;
   overflow-x: hidden;
   overflow-y: auto;
-  .approval-record{
+
+  .approval-record {
     position: relative;
   }
 }

From 13774dada97fe9b0a839a58d5989eba669c3bb2a Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Sun, 12 May 2024 16:34:10 +0800
Subject: [PATCH 28/36] =?UTF-8?q?fix=20:=20=E4=BF=AE=E5=A4=8D=E4=B8=8A?=
 =?UTF-8?q?=E4=BC=A0=E6=96=87=E4=BB=B6=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/FileUpload.vue | 51 ++++++++++++++++++++---------------
 1 file changed, 30 insertions(+), 21 deletions(-)

diff --git a/src/components/FileUpload.vue b/src/components/FileUpload.vue
index 5f7ba9b..9533118 100644
--- a/src/components/FileUpload.vue
+++ b/src/components/FileUpload.vue
@@ -11,18 +11,20 @@
              :before-upload="beforeUpload"
              :on-success="handleUploadSuccess"
   >
-    <el-button color="#DED0B2">上传文件</el-button>
+    <el-button color="#DED0B2" :loading="loading">上传文件</el-button>
   </el-upload>
   <div v-if="showTable||fileList.length!==0">
     <el-table :data="fileList" style="width: 100%">
-      <el-table-column fixed prop="originalFilename" label="文件名" />
-      <el-table-column fixed prop="fileType" label="文件类型" />
-      <el-table-column fixed prop="size" label="文件大小"  >
+      <el-table-column prop="originalFilename" label="文件名"/>
+      <el-table-column prop="fileType" label="文件类型"/>
+      <el-table-column prop="size" label="文件大小">
         <template #default="scope">
-          {{parseInt(scope.row.size/1024)}}{{parseInt(scope.row.size/1024)>1024?'MB':'KB'}}
+          {{ parseInt(scope.row.size / 1024) }}KB
+<!--          {{ parseInt(scope.row.size / 1024) > 1024 ? 'MB' : 'KB' }}-->
         </template>
       </el-table-column>
-      <el-table-column fixed="right" label="操作" >
+<!--      <el-table-column prop="tag" label="标签"/>-->
+      <el-table-column fixed="right" label="操作">
         <template #default="scope">
           <a :href="scope.row.url">
             下载
@@ -32,7 +34,8 @@
           </el-button>
         </template>
       </el-table-column>
-    </el-table></div>
+    </el-table>
+  </div>
 </template>
 
 <script setup>
@@ -47,6 +50,7 @@ const headers = reactive({
   authorization: getToken()
 })
 const disabled = ref(false)
+const loading = ref(false)
 const showTable = ref(false)
 const uploadParams = ref({})
 const props = defineProps({
@@ -74,23 +78,28 @@ const _value = computed({
 })
 
 const beforeUpload = (file) => {
-  const FileExt = file.name.replace(/.+\./, "");
-  if (['zip', 'rar','pdf','doc','docx','xlsx'].indexOf(FileExt.toLowerCase()) === -1){
-    ElMessage.warning('请上传后缀名为pdf、doc、docx、xlsx、zip或rar的文件！');
-    return false;
-  } else if (props.maxSize > 0 && file.size / 1024 / 1024 > props.maxSize) {
-    ElMessage.warning(`每个文件最大不超过 ${props.maxSize}MB`)
-  } else {
-    return true
-  }
+  // const FileExt = file.name.replace(/.+\./, "");
+  // if (['zip', 'rar', 'pdf', 'doc', 'docx', 'xlsx'].indexOf(FileExt.toLowerCase()) === -1) {
+  //   ElMessage.warning('请上传后缀名为pdf、doc、docx、xlsx、zip或rar的文件！');
+  //   return false;
+  // } else
+  // if (props.maxSize > 0 && file.size / 1024 / 1024 > props.maxSize) {
+  //   ElMessage.warning(`每个文件最大不超过 ${props.maxSize}MB`)
+  // } else {
+  loading.value=true
+  return true
+  // }
 }
 const handleUploadSuccess = (res, file) => {
+
   if (res.code !== 1000) {
+    loading.value=false
     ElMessage.error("上传失败")
-  }else {
+  } else {
+    loading.value=false
     ElMessage.success("上传成功")
   }
-  showTable.value=true
+  showTable.value = true
   let data = res.data
   fileList.value.push(data)
   emit("getFile", fileList.value)
@@ -102,7 +111,7 @@ const beforeRemove = (row) => {
     type: 'warning'
   }).then(() => {
     handleRemove(row)
-  }).catch(()=>{
+  }).catch(() => {
     ElMessage.warning("用户取消删除! ");
   })
 }
@@ -119,8 +128,8 @@ const handleRemove = (row) => {
 </script>
 
 <style lang="scss" scoped>
-a{
+a {
   font-size: 12px;
-  color:#2a99ff;
+  color: #2a99ff;
 }
 </style>

From 324cc268b5a509c1e71ebdd83ca82437de38f50e Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Sun, 12 May 2024 17:03:12 +0800
Subject: [PATCH 29/36] =?UTF-8?q?fix=20:=20=E4=BF=AE=E5=A4=8D=E4=B8=8A?=
 =?UTF-8?q?=E4=BC=A0=E6=96=87=E4=BB=B6=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/FileUpload.vue                 | 29 ++++++-----
 .../projectdemand/demandcollection/detail.vue | 52 +++++++------------
 2 files changed, 34 insertions(+), 47 deletions(-)

diff --git a/src/components/FileUpload.vue b/src/components/FileUpload.vue
index 9533118..d90202e 100644
--- a/src/components/FileUpload.vue
+++ b/src/components/FileUpload.vue
@@ -15,20 +15,24 @@
   </el-upload>
   <div v-if="showTable||fileList.length!==0">
     <el-table :data="fileList" style="width: 100%">
-      <el-table-column prop="originalFilename" label="文件名"/>
-      <el-table-column prop="fileType" label="文件类型"/>
-      <el-table-column prop="size" label="文件大小">
+      <el-table-column label="序号" type="index" align="center" width="80"/>
+      <el-table-column prop="originalFilename" label="文件名" align="center"/>
+      <el-table-column prop="size" label="文件大小" align="center">
         <template #default="scope">
           {{ parseInt(scope.row.size / 1024) }}KB
-<!--          {{ parseInt(scope.row.size / 1024) > 1024 ? 'MB' : 'KB' }}-->
+          <!--          {{ parseInt(scope.row.size / 1024) > 1024 ? 'MB' : 'KB' }}-->
         </template>
       </el-table-column>
-<!--      <el-table-column prop="tag" label="标签"/>-->
-      <el-table-column fixed="right" label="操作">
+      <el-table-column prop="tag" label="标签" align="center">
         <template #default="scope">
-          <a :href="scope.row.url">
-            下载
-          </a>
+          <el-input v-model="scope.row.tag" size="mini" placeholder="请输入标签"/>
+        </template>
+      </el-table-column>
+      <el-table-column align="center" label="操作">
+        <template #default="scope">
+<!--          <a :href="scope.row.url">-->
+<!--            下载-->
+<!--          </a>-->
           <el-button link type="primary" size="small" @click="beforeRemove(scope.row)">
             删除
           </el-button>
@@ -86,17 +90,16 @@ const beforeUpload = (file) => {
   // if (props.maxSize > 0 && file.size / 1024 / 1024 > props.maxSize) {
   //   ElMessage.warning(`每个文件最大不超过 ${props.maxSize}MB`)
   // } else {
-  loading.value=true
+  loading.value = true
   return true
   // }
 }
 const handleUploadSuccess = (res, file) => {
-
   if (res.code !== 1000) {
-    loading.value=false
+    loading.value = false
     ElMessage.error("上传失败")
   } else {
-    loading.value=false
+    loading.value = false
     ElMessage.success("上传成功")
   }
   showTable.value = true
diff --git a/src/views/projectdemand/demandcollection/detail.vue b/src/views/projectdemand/demandcollection/detail.vue
index 0718153..fe3b26c 100644
--- a/src/views/projectdemand/demandcollection/detail.vue
+++ b/src/views/projectdemand/demandcollection/detail.vue
@@ -33,12 +33,26 @@
               </el-card>
             </el-form-item>
           </el-col>
-          <baseTitle title="申请文件"></baseTitle>
+          <baseTitle title="附件列表"></baseTitle>
           <el-col :span="24">
             <el-form-item>
-              <fvTable ref="tableIns" style="max-height: 200px;width: 100%" :tableConfig="tableConfig"
-                       @headBtnClick="headBtnClick"
-                       :pagination="false"></fvTable>
+              <el-table :data="formData.fileList" style="width: 100%">
+                <el-table-column label="序号" type="index" align="center" width="80"/>
+                <el-table-column prop="originalFilename" label="文件名" align="center"/>
+                <el-table-column prop="tag" label="标签" align="center"/>
+                <el-table-column prop="size" label="文件大小" align="center">
+                  <template #default="scope">
+                    {{ parseInt(scope.row.size / 1024) }}KB
+                  </template>
+                </el-table-column>
+                <el-table-column align="center" label="操作">
+                  <template #default="scope">
+                    <a :href="scope.row.url">
+                      下载
+                    </a>
+                  </template>
+                </el-table-column>
+              </el-table>
             </el-form-item>
           </el-col>
           <el-col :span="24">
@@ -86,36 +100,6 @@ const processDiagramViewer = ref(false)
 const processTree = ref()
 const formData = ref({})
 const auditOpinion = ref('')
-const tableConfig = reactive({
-  columns: [
-    {
-      prop: 'roleName',
-      label: '文件名',
-      align: 'center'
-    },
-    {
-      prop: 'roleKey',
-      label: '标签',
-      align: 'center'
-    },
-    {
-      prop: 'oper',
-      label: '操作',
-      align: 'center',
-      width: '200px',
-      showOverflowTooltip: false,
-      currentRender: ({row, index}) => {
-        return (
-            <div>
-              <el-button type="primary" link onClick={() => handleDownload(row)}>下载
-              </el-button>
-            </div>
-        )
-      }
-    }
-  ],
-  api: ''
-})
 const handleSubmit = () => {
   let approve = {
     taskId: processInstanceData.value.taskId,

From 6ae58eefafb03331a42944e76efae4dc769715d9 Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Sun, 12 May 2024 19:05:13 +0800
Subject: [PATCH 30/36] =?UTF-8?q?fix=20:=20=E4=BF=AE=E5=A4=8D=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/FileUpload.vue                 |  8 -------
 .../projectdemand/demandcollection/add.vue    | 22 +++++++++++++------
 .../projectdemand/demandcollection/detail.vue |  9 ++++++--
 3 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/src/components/FileUpload.vue b/src/components/FileUpload.vue
index d90202e..4257e10 100644
--- a/src/components/FileUpload.vue
+++ b/src/components/FileUpload.vue
@@ -23,16 +23,8 @@
           <!--          {{ parseInt(scope.row.size / 1024) > 1024 ? 'MB' : 'KB' }}-->
         </template>
       </el-table-column>
-      <el-table-column prop="tag" label="标签" align="center">
-        <template #default="scope">
-          <el-input v-model="scope.row.tag" size="mini" placeholder="请输入标签"/>
-        </template>
-      </el-table-column>
       <el-table-column align="center" label="操作">
         <template #default="scope">
-<!--          <a :href="scope.row.url">-->
-<!--            下载-->
-<!--          </a>-->
           <el-button link type="primary" size="small" @click="beforeRemove(scope.row)">
             删除
           </el-button>
diff --git a/src/views/projectdemand/demandcollection/add.vue b/src/views/projectdemand/demandcollection/add.vue
index bfa7593..d47a9de 100644
--- a/src/views/projectdemand/demandcollection/add.vue
+++ b/src/views/projectdemand/demandcollection/add.vue
@@ -57,6 +57,7 @@
 </template>
 
 <script setup lang="jsx">
+import {useAuthStore} from '@/stores/userstore.js'
 import {useProcessStore} from '@/stores/processStore.js';
 import {getWorkflowInfo, addRequirement, getInfo} from "@/api/project-demand/index.js";
 import FileUpload from "@/components/FileUpload.vue";
@@ -64,6 +65,7 @@ import ProcessDiagramViewer from '@/views/workflow/common/ProcessDiagramViewer.v
 import {ElMessage} from "element-plus";
 import {useRoute, useRouter} from 'vue-router'
 
+const authStore = useAuthStore()
 const router = useRouter()
 const route = useRoute()
 const dateValue = ref()
@@ -79,7 +81,7 @@ const processDiagramViewer = ref(false)
 const typeOption = ref([
   {
     label: "需求征集",
-    value: '00'
+    value: '需求征集'
   }
 ])
 const companyOption = ref([
@@ -100,16 +102,23 @@ const form = ref(null)
 const fileList = ref(null)
 const menuTree = ref(null)
 const loading = ref(false)
-const localData = reactive({
-  affiliatedCompany: []
-})
 const processStore = useProcessStore()
 const processInstanceData = ref()
 
 const getFile = (val) => {
-  fileList.value = val
+  console.log('val', val)
+  let fileObj = {}
+  let newFileArray = []
+  val.forEach(item => {
+    fileObj = {
+      fileId: item.id,
+      tag: formData.value.collectType,
+      userId: authStore.userinfo.userId
+    }
+    newFileArray.push(fileObj)
+  })
+  fileList.value=newFileArray
 }
-
 const init = async () => {
   getWorkflowInfo().then(res => {
     let data = res.data
@@ -155,7 +164,6 @@ const getDetailInfo = async () => {
   })
 }
 
-
 const handleBack = () => {
   history.back()
 }
diff --git a/src/views/projectdemand/demandcollection/detail.vue b/src/views/projectdemand/demandcollection/detail.vue
index fe3b26c..c8328fe 100644
--- a/src/views/projectdemand/demandcollection/detail.vue
+++ b/src/views/projectdemand/demandcollection/detail.vue
@@ -11,7 +11,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="所属公司">
-              <span>{{ formData.affiliatedCompany }}</span>
+              <span>{{ formData.companyIds }}</span>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -38,7 +38,7 @@
             <el-form-item>
               <el-table :data="formData.fileList" style="width: 100%">
                 <el-table-column label="序号" type="index" align="center" width="80"/>
-                <el-table-column prop="originalFilename" label="文件名" align="center"/>
+                <el-table-column prop="fileName" label="文件名" align="center"/>
                 <el-table-column prop="tag" label="标签" align="center"/>
                 <el-table-column prop="size" label="文件大小" align="center">
                   <template #default="scope">
@@ -140,6 +140,11 @@ init()
 </script>
 
 <style lang="scss" scoped>
+a {
+  cursor: pointer;
+  font-size: 12px;
+  color: #2a99ff;
+}
 .detail-block {
   display: flex;
   justify-content: space-between;

From 250f6344f17c67c66952c17cf7b6ad6a2a3c98cc Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Sun, 12 May 2024 19:08:41 +0800
Subject: [PATCH 31/36] =?UTF-8?q?fix=20:=20=E4=BF=AE=E5=A4=8D=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/projectdemand/demandcollection/add.vue | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/views/projectdemand/demandcollection/add.vue b/src/views/projectdemand/demandcollection/add.vue
index d47a9de..67f6906 100644
--- a/src/views/projectdemand/demandcollection/add.vue
+++ b/src/views/projectdemand/demandcollection/add.vue
@@ -102,6 +102,9 @@ const form = ref(null)
 const fileList = ref(null)
 const menuTree = ref(null)
 const loading = ref(false)
+const localData = reactive({
+  affiliatedCompany: []
+})
 const processStore = useProcessStore()
 const processInstanceData = ref()
 

From 55e0f28ebc01c968a7a9db14138acf05fe506e18 Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Sun, 12 May 2024 19:39:39 +0800
Subject: [PATCH 32/36] =?UTF-8?q?fix=20:=20=E4=BF=AE=E5=A4=8D=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/FileUpload.vue                 | 40 +++++++++---------
 .../projectdemand/demandcollection/add.vue    | 41 +++++++++++++++++--
 .../projectdemand/demandcollection/detail.vue |  2 +-
 vite.config.js                                |  4 +-
 4 files changed, 61 insertions(+), 26 deletions(-)

diff --git a/src/components/FileUpload.vue b/src/components/FileUpload.vue
index 4257e10..707ac68 100644
--- a/src/components/FileUpload.vue
+++ b/src/components/FileUpload.vue
@@ -13,25 +13,25 @@
   >
     <el-button color="#DED0B2" :loading="loading">上传文件</el-button>
   </el-upload>
-  <div v-if="showTable||fileList.length!==0">
-    <el-table :data="fileList" style="width: 100%">
-      <el-table-column label="序号" type="index" align="center" width="80"/>
-      <el-table-column prop="originalFilename" label="文件名" align="center"/>
-      <el-table-column prop="size" label="文件大小" align="center">
-        <template #default="scope">
-          {{ parseInt(scope.row.size / 1024) }}KB
-          <!--          {{ parseInt(scope.row.size / 1024) > 1024 ? 'MB' : 'KB' }}-->
-        </template>
-      </el-table-column>
-      <el-table-column align="center" label="操作">
-        <template #default="scope">
-          <el-button link type="primary" size="small" @click="beforeRemove(scope.row)">
-            删除
-          </el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-  </div>
+<!--  <div v-if="showTable||fileList.length!==0">-->
+<!--    <el-table :data="fileList" style="width: 100%">-->
+<!--      <el-table-column label="序号" type="index" align="center" width="80"/>-->
+<!--      <el-table-column prop="originalFilename" label="文件名" align="center"/>-->
+<!--      <el-table-column prop="size" label="文件大小" align="center">-->
+<!--        <template #default="scope">-->
+<!--          {{ parseInt(scope.row.size / 1024) }}KB-->
+<!--          &lt;!&ndash;          {{ parseInt(scope.row.size / 1024) > 1024 ? 'MB' : 'KB' }}&ndash;&gt;-->
+<!--        </template>-->
+<!--      </el-table-column>-->
+<!--      <el-table-column align="center" label="操作">-->
+<!--        <template #default="scope">-->
+<!--          <el-button link type="primary" size="small" @click="beforeRemove(scope.row)">-->
+<!--            删除-->
+<!--          </el-button>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
+<!--    </el-table>-->
+<!--  </div>-->
 </template>
 
 <script setup>
@@ -124,7 +124,7 @@ const handleRemove = (row) => {
 
 <style lang="scss" scoped>
 a {
-  font-size: 12px;
+  font-size: 14px;
   color: #2a99ff;
 }
 </style>
diff --git a/src/views/projectdemand/demandcollection/add.vue b/src/views/projectdemand/demandcollection/add.vue
index 67f6906..651bb42 100644
--- a/src/views/projectdemand/demandcollection/add.vue
+++ b/src/views/projectdemand/demandcollection/add.vue
@@ -39,9 +39,27 @@
       </div>
     </el-form>
     <baseTitle title="征集说明"></baseTitle>
+
     <Tinymce image-url="/notice/file" file-url="/notice/file" v-model:value="formData.collectExplain" height="300"/>
     <baseTitle title="申请文件"></baseTitle>
     <file-upload @getFile="getFile"/>
+    <el-table :data="formData.fileList" style="width: 100%" v-if="showTable">
+      <el-table-column label="序号" type="index" align="center" width="80"/>
+      <el-table-column prop="fileName" label="文件名" align="center"/>
+      <el-table-column prop="tag" label="标签" align="center"/>
+      <el-table-column prop="size" label="文件大小" align="center">
+        <template #default="scope">
+          {{ parseInt(scope.row.size / 1024) }}KB
+        </template>
+      </el-table-column>
+      <el-table-column align="center" label="操作">
+        <template #default="scope">
+          <a :href="scope.row.url">
+            下载
+          </a>
+        </template>
+      </el-table-column>
+    </el-table>
     <div class="approval-record">
       <baseTitle title="流程"></baseTitle>
       <process-diagram-viewer mode="view" v-if="processDiagramViewer"/>
@@ -76,6 +94,7 @@ const formData = ref({
   deadline: '',
   collectExplain: ''
 })
+const showTable = ref(false)
 const processDiagramViewer = ref(false)
 
 const typeOption = ref([
@@ -109,7 +128,16 @@ const processStore = useProcessStore()
 const processInstanceData = ref()
 
 const getFile = (val) => {
-  console.log('val', val)
+  console.log('val', val, route.query.isAdd)
+  if(route.query.isAdd==undefined){
+    showTable.value=true
+    val.forEach(item => {
+
+      formData.value.fileList.push(item)
+    })
+    fileList.value=formData.value.fileList
+    console.log('fileList.value',fileList.value)
+  }
   let fileObj = {}
   let newFileArray = []
   val.forEach(item => {
@@ -139,7 +167,6 @@ const init = async () => {
 }
 
 const handleSubmit = () => {
-  console.log(formData.value, "formData.value")
   addRequirement({
     ...formData.value,
     requirementId: 0,
@@ -161,6 +188,9 @@ const getDetailInfo = async () => {
     if (res.code === 1000) {
       ElMessage.success(res.msg)
       formData.value = res.data.formData
+      if(route.query.isAdd==undefined){
+        showTable.value=true
+      }
     } else {
       ElMessage.error(res.msg)
     }
@@ -187,12 +217,17 @@ onMounted(async () => {
 </script>
 
 <style lang="scss" scoped>
+
 .add-block {
   //display: flex;
   //justify-content: space-between;
   overflow-x: hidden;
   overflow-y: auto;
-
+  a {
+    cursor: pointer;
+    font-size: 14px;
+    color: #2a99ff;
+  }
   .approval-record {
     position: relative;
   }
diff --git a/src/views/projectdemand/demandcollection/detail.vue b/src/views/projectdemand/demandcollection/detail.vue
index c8328fe..6a29df0 100644
--- a/src/views/projectdemand/demandcollection/detail.vue
+++ b/src/views/projectdemand/demandcollection/detail.vue
@@ -142,7 +142,7 @@ init()
 <style lang="scss" scoped>
 a {
   cursor: pointer;
-  font-size: 12px;
+  font-size: 14px;
   color: #2a99ff;
 }
 .detail-block {
diff --git a/vite.config.js b/vite.config.js
index da93391..bcb4f05 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -69,8 +69,8 @@ export default defineConfig({
     open: true,
     proxy: {
       '/api/workflow': {
-        // target: 'http://frp.feashow.cn:31800/',
-        target: 'http://clay.frp.feashow.cn/',
+        target: 'http://frp.feashow.cn:31800/',
+        // target: 'http://clay.frp.feashow.cn/',
         // target: 'http://192.168.31.175:8000',
         changeOrigin: true,
         rewrite: (path) => path.replace(/^\/api/, '')

From b170d4226372178bf2fbc06518fabe2579baa53f Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Sun, 12 May 2024 19:42:24 +0800
Subject: [PATCH 33/36] =?UTF-8?q?fix=20:=20=E4=BF=AE=E5=A4=8D=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/FileUpload.vue | 38 +++++++++++++++++------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/src/components/FileUpload.vue b/src/components/FileUpload.vue
index 707ac68..a529625 100644
--- a/src/components/FileUpload.vue
+++ b/src/components/FileUpload.vue
@@ -13,25 +13,25 @@
   >
     <el-button color="#DED0B2" :loading="loading">上传文件</el-button>
   </el-upload>
-<!--  <div v-if="showTable||fileList.length!==0">-->
-<!--    <el-table :data="fileList" style="width: 100%">-->
-<!--      <el-table-column label="序号" type="index" align="center" width="80"/>-->
-<!--      <el-table-column prop="originalFilename" label="文件名" align="center"/>-->
-<!--      <el-table-column prop="size" label="文件大小" align="center">-->
-<!--        <template #default="scope">-->
-<!--          {{ parseInt(scope.row.size / 1024) }}KB-->
-<!--          &lt;!&ndash;          {{ parseInt(scope.row.size / 1024) > 1024 ? 'MB' : 'KB' }}&ndash;&gt;-->
-<!--        </template>-->
-<!--      </el-table-column>-->
-<!--      <el-table-column align="center" label="操作">-->
-<!--        <template #default="scope">-->
-<!--          <el-button link type="primary" size="small" @click="beforeRemove(scope.row)">-->
-<!--            删除-->
-<!--          </el-button>-->
-<!--        </template>-->
-<!--      </el-table-column>-->
-<!--    </el-table>-->
-<!--  </div>-->
+  <div v-if="showTable||fileList.length!==0">
+    <el-table :data="fileList" style="width: 100%">
+      <el-table-column label="序号" type="index" align="center" width="80"/>
+      <el-table-column prop="originalFilename" label="文件名" align="center"/>
+      <el-table-column prop="size" label="文件大小" align="center">
+        <template #default="scope">
+          {{ parseInt(scope.row.size / 1024) }}KB
+          <!--          {{ parseInt(scope.row.size / 1024) > 1024 ? 'MB' : 'KB' }}-->
+        </template>
+      </el-table-column>
+      <el-table-column align="center" label="操作">
+        <template #default="scope">
+          <el-button link type="primary" size="small" @click="beforeRemove(scope.row)">
+            删除
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+  </div>
 </template>
 
 <script setup>

From bd220ad5b1e0073f2d74e3342130f6cd2173a9f7 Mon Sep 17 00:00:00 2001
From: clay <20932067@zju.edu.cn>
Date: Sun, 12 May 2024 20:27:38 +0800
Subject: [PATCH 34/36] =?UTF-8?q?feat=20:=20=E9=87=8D=E6=96=B0=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/project-demand/index.js               | 13 ++++
 .../projectdemand/demandcollection/add.vue    | 28 ++++++--
 src/views/workflow/common/OperationRender.vue | 68 +++++++++++--------
 3 files changed, 76 insertions(+), 33 deletions(-)

diff --git a/src/api/project-demand/index.js b/src/api/project-demand/index.js
index 2be96fc..a15d983 100644
--- a/src/api/project-demand/index.js
+++ b/src/api/project-demand/index.js
@@ -19,6 +19,12 @@ export const getInfo = (requirementId) => {
     method: "get"
   });
 };
+export const getFormInfo = (requirementId) => {
+  return request({
+    url: `/workflow/mosr/requirement/form/${requirementId}`,
+    method: "get"
+  });
+};
 export const agreeTask = (data) => {
   return request({
     url: `/workflow/mosr/process/task/agree`,
@@ -41,6 +47,13 @@ export const addRequirement = (data) => {
     data: data
   });
 };
+export const resubmit = (data) => {
+  return request({
+    url: '/workflow/mosr/requirement/resubmit',
+    method: "post",
+    data: data
+  });
+};
 export const deleteFile = (fileId) => {
   return request({
     url: `/workflow/process/file/delete/${fileId}`,
diff --git a/src/views/projectdemand/demandcollection/add.vue b/src/views/projectdemand/demandcollection/add.vue
index 651bb42..ec9b648 100644
--- a/src/views/projectdemand/demandcollection/add.vue
+++ b/src/views/projectdemand/demandcollection/add.vue
@@ -69,6 +69,7 @@
     </div>
     <div class="oper-page-btn">
       <el-button color="#DED0B2" @click="handleSubmit">提交</el-button>
+      <el-button color="#DED0B2" @click="handleResubmit">重新提交</el-button>
       <el-button @click="handleBack">返回</el-button>
     </div>
   </div>
@@ -77,7 +78,7 @@
 <script setup lang="jsx">
 import {useAuthStore} from '@/stores/userstore.js'
 import {useProcessStore} from '@/stores/processStore.js';
-import {getWorkflowInfo, addRequirement, getInfo} from "@/api/project-demand/index.js";
+import {getWorkflowInfo, addRequirement, getFormInfo,resubmit} from "@/api/project-demand/index.js";
 import FileUpload from "@/components/FileUpload.vue";
 import ProcessDiagramViewer from '@/views/workflow/common/ProcessDiagramViewer.vue';
 import {ElMessage} from "element-plus";
@@ -150,6 +151,8 @@ const getFile = (val) => {
   })
   fileList.value=newFileArray
 }
+
+
 const init = async () => {
   getWorkflowInfo().then(res => {
     let data = res.data
@@ -183,11 +186,28 @@ const handleSubmit = () => {
     }
   })
 }
-const getDetailInfo = async () => {
-  getInfo(route.query.id).then(res => {
+const handleResubmit = () => {
+  resubmit({
+    ...formData.value,
+    files: fileList.value,
+    deploymentId: processInstanceData.value.deploymentId
+  }).then(res => {
     if (res.code === 1000) {
       ElMessage.success(res.msg)
-      formData.value = res.data.formData
+      router.push({
+        path: '/projectdemand/demandcollection'
+      })
+    } else {
+      ElMessage.error(res.msg)
+    }
+  })
+}
+const getDetailInfo = async () => {
+  getFormInfo(route.query.id).then(res => {
+    if (res.code === 1000) {
+      console.log(res)
+      ElMessage.success(res.msg)
+      formData.value = res.data
       if(route.query.isAdd==undefined){
         showTable.value=true
       }
diff --git a/src/views/workflow/common/OperationRender.vue b/src/views/workflow/common/OperationRender.vue
index e415143..784b6cc 100644
--- a/src/views/workflow/common/OperationRender.vue
+++ b/src/views/workflow/common/OperationRender.vue
@@ -20,34 +20,43 @@
                   <component :is="user.icon"/>
                 </el-icon>
               </div>
-              <el-tooltip  effect="dark" :content="user.name" placement="bottom-start">
+              <el-tooltip effect="dark" :content="user.name" placement="bottom-start">
                 <span class="username">{{ user.name }}</span>
               </el-tooltip>
+
+              <template v-if="user.auditOpinion">
+                <div style="margin-top: 10px;background:#f5f5f5;padding: 10px;">
+                  <div>
+                    {{ user.auditOpinion }}
+                  </div>
+                </div>
+              </template>
             </div>
             <div style="margin-left: 10px;">
               <div style="color: #c0bebe">{{ operation.operationName }}</div>
               <div style="font-size: 14px; font-weight: bold;">{{ operation.remark }}</div>
             </div>
           </div>
-          <template v-if="operation.comment">
-            <div style="margin-top: 10px;background:#f5f5f5;padding: 10px;">
-              <div>
-                {{ operation.comment.context }}
-              </div>
-              <div style="margin-top: 10px;" v-if="operation.comment.attachments && operation.comment.attachments.length > 0">
-                <template v-for="(item) in getAttachmentList(operation.comment.attachments,true)">
-                  <el-image
-                      style="width: 100px; height: 100px"
-                      :src="item.url"
-                      :preview-src-list="[item.url]">
-                  </el-image>
-                </template>
-                <div v-for="(file) in getAttachmentList(operation.comment.attachments,false)">
-                  <el-link style="color: #2a99ff" :href="file.url" icon="el-icon-document">{{ file.name }}</el-link>
-                </div>
-              </div>
-            </div>
-          </template>
+<!--          <template v-if="operation.comment">-->
+<!--            <div style="margin-top: 10px;background:#f5f5f5;padding: 10px;">-->
+<!--              <div>-->
+<!--                {{ operation.comment.context }}-->
+<!--              </div>-->
+<!--              <div style="margin-top: 10px;"-->
+<!--                   v-if="operation.comment.attachments && operation.comment.attachments.length > 0">-->
+<!--                <template v-for="(item) in getAttachmentList(operation.comment.attachments,true)">-->
+<!--                  <el-image-->
+<!--                      style="width: 100px; height: 100px"-->
+<!--                      :src="item.url"-->
+<!--                      :preview-src-list="[item.url]">-->
+<!--                  </el-image>-->
+<!--                </template>-->
+<!--                <div v-for="(file) in getAttachmentList(operation.comment.attachments,false)">-->
+<!--                  <el-link style="color: #2a99ff" :href="file.url" icon="el-icon-document">{{ file.name }}</el-link>-->
+<!--                </div>-->
+<!--              </div>-->
+<!--            </div>-->
+<!--          </template>-->
         </el-card>
       </el-timeline-item>
       <el-timeline-item :color="timeline.color" :icon="timeline.icon" size="large">
@@ -61,7 +70,7 @@
 
 <script setup>
 import {CircleCheckFilled, Close, Loading, MoreFilled} from "@element-plus/icons-vue";
-import {ref,defineProps} from 'vue'
+import {ref, defineProps} from 'vue'
 
 const props = defineProps({
   operationList: {
@@ -114,12 +123,12 @@ const init = () => {
       break
   }
   // let operationListNew = []
-  for (let i = 0;i<props.operationList.length;i++) {
+  for (let i = 0; i < props.operationList.length; i++) {
     let operationNew = initOperationFun(props.operationList[i])
     let userList = []
-    if (operationNew.userInfo){
+    if (operationNew.userInfo) {
       for (let user of operationNew.userInfo) {
-        let userNew = initUser(user,operationNew.operation)
+        let userNew = initUser(user, operationNew.operation)
         userList.push(userNew)
       }
       operationNew.userInfo = userList
@@ -133,7 +142,7 @@ const init = () => {
 
 const getAttachmentList = (attachments, image) => {
   let result = [];
-  if (attachments){
+  if (attachments) {
     for (let attachment of attachments) {
       if (attachment.isImage === image) {
         result.push(attachment)
@@ -143,7 +152,7 @@ const getAttachmentList = (attachments, image) => {
   return result;
 }
 
-const initUser = (user,type) => {
+const initUser = (user, type) => {
   let state = user.state
   //创建节点
   if (state === 'CREATE') {
@@ -155,7 +164,7 @@ const initUser = (user,type) => {
     user["icon"] = 'CircleCheckFilled'
     user["color"] = "#0bbd87"
   }
-  if (type === "CC"){
+  if (type === "CC") {
     user["icon"] = "Promotion"
     user["color"] = "#3395f8"
   }
@@ -170,7 +179,7 @@ const initUser = (user,type) => {
     user["icon"] = 'Close'
     user["color"] = "#f56c6c"
   }
-  if (state === 'PASS'){
+  if (state === 'PASS') {
     user["icon"] = 'MoreFilled'
     user["color"] = "#c0c4cc"
   }
@@ -278,7 +287,8 @@ init()
   position: relative;
   margin-right: 5px;
 }
-.el-timeline-item__node{
+
+.el-timeline-item__node {
   position: absolute;
   bottom: 20px;
   right: 1px;

From 71d78d9cca0832ac7e8033ce99b929144323b9bd Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Sun, 12 May 2024 21:53:08 +0800
Subject: [PATCH 35/36] =?UTF-8?q?fix=20:=20=E4=BF=AE=E5=A4=8D=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/project-demand/index.js               |  13 ++
 src/components/FileUpload.vue                 |  38 ++---
 src/views/home/index.vue                      |   4 +-
 .../projectdemand/demandcollection/add.vue    | 157 ++++++++++++------
 .../projectdemand/demandcollection/detail.vue |  26 ++-
 5 files changed, 163 insertions(+), 75 deletions(-)

diff --git a/src/api/project-demand/index.js b/src/api/project-demand/index.js
index 2be96fc..97b6f96 100644
--- a/src/api/project-demand/index.js
+++ b/src/api/project-demand/index.js
@@ -41,9 +41,22 @@ export const addRequirement = (data) => {
     data: data
   });
 };
+export const resubmitRequirement = (data) => {
+  return request({
+    url: '/workflow/mosr/requirement/resubmit',
+    method: "post",
+    data: data
+  });
+};
 export const deleteFile = (fileId) => {
   return request({
     url: `/workflow/process/file/delete/${fileId}`,
     method: "delete"
   });
 };
+export const getCompanyOption = () => {
+  return request({
+    url: '/admin/mosr/sub/company/companyOption',
+    method: "get"
+  });
+};
diff --git a/src/components/FileUpload.vue b/src/components/FileUpload.vue
index a529625..707ac68 100644
--- a/src/components/FileUpload.vue
+++ b/src/components/FileUpload.vue
@@ -13,25 +13,25 @@
   >
     <el-button color="#DED0B2" :loading="loading">上传文件</el-button>
   </el-upload>
-  <div v-if="showTable||fileList.length!==0">
-    <el-table :data="fileList" style="width: 100%">
-      <el-table-column label="序号" type="index" align="center" width="80"/>
-      <el-table-column prop="originalFilename" label="文件名" align="center"/>
-      <el-table-column prop="size" label="文件大小" align="center">
-        <template #default="scope">
-          {{ parseInt(scope.row.size / 1024) }}KB
-          <!--          {{ parseInt(scope.row.size / 1024) > 1024 ? 'MB' : 'KB' }}-->
-        </template>
-      </el-table-column>
-      <el-table-column align="center" label="操作">
-        <template #default="scope">
-          <el-button link type="primary" size="small" @click="beforeRemove(scope.row)">
-            删除
-          </el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-  </div>
+<!--  <div v-if="showTable||fileList.length!==0">-->
+<!--    <el-table :data="fileList" style="width: 100%">-->
+<!--      <el-table-column label="序号" type="index" align="center" width="80"/>-->
+<!--      <el-table-column prop="originalFilename" label="文件名" align="center"/>-->
+<!--      <el-table-column prop="size" label="文件大小" align="center">-->
+<!--        <template #default="scope">-->
+<!--          {{ parseInt(scope.row.size / 1024) }}KB-->
+<!--          &lt;!&ndash;          {{ parseInt(scope.row.size / 1024) > 1024 ? 'MB' : 'KB' }}&ndash;&gt;-->
+<!--        </template>-->
+<!--      </el-table-column>-->
+<!--      <el-table-column align="center" label="操作">-->
+<!--        <template #default="scope">-->
+<!--          <el-button link type="primary" size="small" @click="beforeRemove(scope.row)">-->
+<!--            删除-->
+<!--          </el-button>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
+<!--    </el-table>-->
+<!--  </div>-->
 </template>
 
 <script setup>
diff --git a/src/views/home/index.vue b/src/views/home/index.vue
index 129e740..51d3347 100644
--- a/src/views/home/index.vue
+++ b/src/views/home/index.vue
@@ -148,11 +148,11 @@ const tableConfig = reactive({
 })
 const handleView = (row) => {
   console.log('row', row)
-  if (row.requirementId) {
+  if(row.targetState=='00'&&row.taskId){
     router.push({
       path: '/projectdemand/demanddetail',
       query: {
-        id: row.requirementId
+        id: row.taskId
       }
     })
   }
diff --git a/src/views/projectdemand/demandcollection/add.vue b/src/views/projectdemand/demandcollection/add.vue
index 651bb42..86cef3a 100644
--- a/src/views/projectdemand/demandcollection/add.vue
+++ b/src/views/projectdemand/demandcollection/add.vue
@@ -7,14 +7,8 @@
           <el-input v-model="formData.requirementName" placeholder="请输入名称" clearable></el-input>
         </el-form-item>
         <el-form-item label="所属公司" prop="companyIds">
-          <el-select v-model="formData.companyIds" placeholder="所属公司" clearable filterable multiple>
-            <el-option
-                v-for="item in companyOption"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-            />
-          </el-select>
+          <el-tree-select v-model="formData.companyIds" :data="companyOption" style="width: 100%;"
+                          filterable clearable :check-strictly="true" multiple/>
         </el-form-item>
         <el-form-item label="征集类型" prop="collectType">
           <el-select v-model="formData.collectType" placeholder="征集类型" clearable filterable>
@@ -39,11 +33,10 @@
       </div>
     </el-form>
     <baseTitle title="征集说明"></baseTitle>
-
     <Tinymce image-url="/notice/file" file-url="/notice/file" v-model:value="formData.collectExplain" height="300"/>
     <baseTitle title="申请文件"></baseTitle>
     <file-upload @getFile="getFile"/>
-    <el-table :data="formData.fileList" style="width: 100%" v-if="showTable">
+    <el-table :data="formData.fileList" style="width: 100%">
       <el-table-column label="序号" type="index" align="center" width="80"/>
       <el-table-column prop="fileName" label="文件名" align="center"/>
       <el-table-column prop="tag" label="标签" align="center"/>
@@ -57,6 +50,9 @@
           <a :href="scope.row.url">
             下载
           </a>
+          <el-button link type="primary" size="small" @click="beforeRemove(scope.row)">
+            删除
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -80,8 +76,11 @@ import {useProcessStore} from '@/stores/processStore.js';
 import {getWorkflowInfo, addRequirement, getInfo} from "@/api/project-demand/index.js";
 import FileUpload from "@/components/FileUpload.vue";
 import ProcessDiagramViewer from '@/views/workflow/common/ProcessDiagramViewer.vue';
-import {ElMessage} from "element-plus";
+import {ElMessage, ElMessageBox} from "element-plus";
 import {useRoute, useRouter} from 'vue-router'
+import {getSubCompOpt} from '@/api/user/user.js'
+import {deleteFile} from "@/api/project-demand";
+import {resubmitRequirement} from "../../../api/project-demand";
 
 const authStore = useAuthStore()
 const router = useRouter()
@@ -121,36 +120,53 @@ const form = ref(null)
 const fileList = ref(null)
 const menuTree = ref(null)
 const loading = ref(false)
-const localData = reactive({
-  affiliatedCompany: []
-})
 const processStore = useProcessStore()
 const processInstanceData = ref()
 
 const getFile = (val) => {
   console.log('val', val, route.query.isAdd)
-  if(route.query.isAdd==undefined){
-    showTable.value=true
+  if (route.query.isAdd == undefined) {
+    // showTable.value = true
+    let fileObj = {}
+    let newFileArray = []
     val.forEach(item => {
-
-      formData.value.fileList.push(item)
+      fileObj = {
+        fileId: item.id,
+        size: item.size,
+        fileName: item.fileName,
+        fileType: item.fileType,
+        url: item.url,
+        processNodeTag: null,
+        tag: formData.value.collectType,
+        userId: authStore.userinfo.userId
+      }
+      newFileArray.push(fileObj)
+      formData.value.fileList.push(fileObj)
     })
-    fileList.value=formData.value.fileList
-    console.log('fileList.value',fileList.value)
+    fileList.value = formData.value.fileList
+  } else {
+    let fileObj = {}
+    let newFileArray = []
+    val.forEach(item => {
+      fileObj = {
+        fileId: item.id,
+        size: item.size,
+        fileName: item.fileName,
+        fileType: item.fileType,
+        url: item.url,
+        processNodeTag: null,
+        tag: formData.value.collectType,
+        userId: authStore.userinfo.userId
+      }
+      newFileArray.push(fileObj)
+    })
+    formData.value.fileList = newFileArray
+    fileList.value = newFileArray
   }
-  let fileObj = {}
-  let newFileArray = []
-  val.forEach(item => {
-    fileObj = {
-      fileId: item.id,
-      tag: formData.value.collectType,
-      userId: authStore.userinfo.userId
-    }
-    newFileArray.push(fileObj)
-  })
-  fileList.value=newFileArray
 }
 const init = async () => {
+  const res = await getSubCompOpt()
+  companyOption.value = res.data
   getWorkflowInfo().then(res => {
     let data = res.data
     processInstanceData.value = data
@@ -167,30 +183,48 @@ const init = async () => {
 }
 
 const handleSubmit = () => {
-  addRequirement({
-    ...formData.value,
-    requirementId: 0,
-    files: fileList.value,
-    deploymentId: processInstanceData.value.deploymentId
-  }).then(res => {
-    if (res.code === 1000) {
-      ElMessage.success(res.msg)
-      router.push({
-        path: '/projectdemand/demandcollection'
-      })
-    } else {
-      ElMessage.error(res.msg)
-    }
-  })
+  if (route.query.isAdd == undefined) {
+    resubmitRequirement({
+      ...formData.value,
+      requirementId: 0,
+      files: fileList.value,
+      deploymentId: processInstanceData.value.deploymentId
+    }).then(res => {
+      if (res.code === 1000) {
+        ElMessage.success(res.msg)
+        router.push({
+          path: '/projectdemand/demandcollection'
+        })
+      } else {
+        ElMessage.error(res.msg)
+      }
+    })
+  }else {
+    addRequirement({
+      ...formData.value,
+      requirementId: 0,
+      files: fileList.value,
+      deploymentId: processInstanceData.value.deploymentId
+    }).then(res => {
+      if (res.code === 1000) {
+        ElMessage.success(res.msg)
+        router.push({
+          path: '/projectdemand/demandcollection'
+        })
+      } else {
+        ElMessage.error(res.msg)
+      }
+    })
+  }
 }
 const getDetailInfo = async () => {
   getInfo(route.query.id).then(res => {
     if (res.code === 1000) {
       ElMessage.success(res.msg)
       formData.value = res.data.formData
-      if(route.query.isAdd==undefined){
-        showTable.value=true
-      }
+      // if (route.query.isAdd == undefined) {
+      //   showTable.value = true
+      // }
     } else {
       ElMessage.error(res.msg)
     }
@@ -200,11 +234,26 @@ const getDetailInfo = async () => {
 const handleBack = () => {
   history.back()
 }
+const beforeRemove = (row) => {
+  ElMessageBox.confirm(`确认删除名称为${row.filename}的表格吗?`, '系统提示', {
+    confirmButtonText: '确定',
+    cancelButtonText: '取消',
+    type: 'warning'
+  }).then(() => {
+    handleRemove(row)
+  }).catch(() => {
+    ElMessage.warning("用户取消删除! ");
+  })
+}
 
-watch(localData, (val) => {
-  menuTree.value.filter(val.filterText)
-})
-
+const handleRemove = (row) => {
+  deleteFile(row.fileId).then(res => {
+    if (res.code === 1000) {
+      ElMessage.success("删除成功");
+      fileList.value.splice(fileList.value.findIndex((item) => item.id === row.id), 1);
+    }
+  });
+};
 onMounted(async () => {
   loading.value = true
   await init()
@@ -223,11 +272,13 @@ onMounted(async () => {
   //justify-content: space-between;
   overflow-x: hidden;
   overflow-y: auto;
+
   a {
     cursor: pointer;
     font-size: 14px;
     color: #2a99ff;
   }
+
   .approval-record {
     position: relative;
   }
diff --git a/src/views/projectdemand/demandcollection/detail.vue b/src/views/projectdemand/demandcollection/detail.vue
index 6a29df0..59b80c3 100644
--- a/src/views/projectdemand/demandcollection/detail.vue
+++ b/src/views/projectdemand/demandcollection/detail.vue
@@ -11,7 +11,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="所属公司">
-              <span>{{ formData.companyIds }}</span>
+              <span>{{ getDataSourceOptionItem(formData.companyIds) }}</span>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -91,10 +91,12 @@ import OperationRender from '@/views/workflow/common/OperationRender.vue'
 import ProcessDiagramViewer from '@/views/workflow/common/ProcessDiagramViewer.vue'
 import {useProcessStore} from '@/stores/processStore.js';
 import {getInfo, agreeTask, rejectTask} from "@/api/project-demand/index.js";
+import {getSubCompOpt} from '@/api/user/user.js'
 
 const route = useRoute()
 const form = ref();
 const processStore = useProcessStore()
+const companyOption = ref([])
 const processInstanceData = ref({})
 const processDiagramViewer = ref(false)
 const processTree = ref()
@@ -119,11 +121,33 @@ const handleReject = () => {
     console.log(res)
   })
 }
+const getCompanyOption=async ()=>{
+  const res = await getSubCompOpt()
+  companyOption.value= res.data
+  console.log('companyOption.value',companyOption.value)
+}
+const getDataSourceOptionItem = (val) => {
+  console.log('val',val,companyOption.value)
+  if(val!==undefined){
 
+  }
+  // let arr=[]
+  // console.log('arr',arr)
+  // for (let item of companyOption.value) {
+  //   if (item.value === dataSourceId) {
+  //     return item.label;
+  //   }
+  // }
+  // return "";
+}
 const init = async () => {
+  await getCompanyOption()
   getInfo(route.query.id).then(res => {
     let data = res.data
     formData.value = data.formData;
+    if(data.formData.companyIds.length!==0){
+
+    }
     processInstanceData.value = data
     processStore.setDesign(data)
     processStore.runningList.value = data.runningList;

From 2d73580195c8ed8022dd863498279d5bf1f589d7 Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Sun, 12 May 2024 21:56:44 +0800
Subject: [PATCH 36/36] =?UTF-8?q?fix=20:=20=E4=BF=AE=E5=A4=8D=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/projectdemand/demandcollection/detail.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/projectdemand/demandcollection/detail.vue b/src/views/projectdemand/demandcollection/detail.vue
index 59b80c3..cca6e05 100644
--- a/src/views/projectdemand/demandcollection/detail.vue
+++ b/src/views/projectdemand/demandcollection/detail.vue
@@ -11,7 +11,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="所属公司">
-              <span>{{ getDataSourceOptionItem(formData.companyIds) }}</span>
+              <span>{{ formData.companyIds }}</span>
             </el-form-item>
           </el-col>
           <el-col :span="12">