From d1c6b23aa4c6a53a289066b9930a8063c7fe6bf0 Mon Sep 17 00:00:00 2001
From: clay <20932067@zju.edu.cn>
Date: Sun, 9 Jun 2024 19:19:02 +0800
Subject: [PATCH] =?UTF-8?q?feat=20:=20=E9=9C=80=E6=B1=82=E5=8F=98=E6=9B=B4?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/ToolToShowUserPicker.vue       |  25 ++
 .../implementation/phase.vue                  | 229 +++++++++++-------
 vite.config.js                                |  30 +--
 3 files changed, 179 insertions(+), 105 deletions(-)
 create mode 100644 src/views/project-management/implementation/components/ToolToShowUserPicker.vue

diff --git a/src/views/project-management/implementation/components/ToolToShowUserPicker.vue b/src/views/project-management/implementation/components/ToolToShowUserPicker.vue
new file mode 100644
index 0000000..d311c5b
--- /dev/null
+++ b/src/views/project-management/implementation/components/ToolToShowUserPicker.vue
@@ -0,0 +1,25 @@
+<template>
+  <el-button type="primary" link >
+    {{ modelValue || '请选择抄送人员' }}
+  </el-button>
+</template>
+
+<script setup>
+import { ref, watch, watchEffect } from 'vue';
+
+const props = defineProps({
+  modelValue: {
+    type: String,
+    default: ''
+  }
+})
+
+// const emit = defineEmits('update: modelValue')
+
+const localText = ref('')
+
+</script>
+
+<style lang="scss" scoped>
+
+</style>
\ No newline at end of file
diff --git a/src/views/project-management/implementation/phase.vue b/src/views/project-management/implementation/phase.vue
index 0c43deb..8e05176 100644
--- a/src/views/project-management/implementation/phase.vue
+++ b/src/views/project-management/implementation/phase.vue
@@ -1,8 +1,14 @@
 <template>
   <div class="apply-block">
+    <div>
+      抄送人员:
+      <Ttsup :modelValue="chooseUserInfo()" @click="chooseUser"/>
+    </div>
+    <user-picker :multiple="true" ref="userPicker" title="请选择抄送人员" v-model:value="userList" @ok="selected"/>
     <AttachmentUpload ref="attachment" label="阶段变更附件" :showTable="showTable" :otherFileList="otherFileList"
                       @getAttachment="getAttachment"
-                      @getOtherFile="getOtherFile" :showFileList="true" :formData="formData" :preview="name === 'Phase/edit'"/>
+                      @getOtherFile="getOtherFile" :showFileList="true" :formData="formData"
+                      :preview="name === 'Phase/edit'"/>
     <div class="approval-record">
       <baseTitle title="流程"></baseTitle>
       <process-diagram-viewer mode="view" v-if="processDiagramViewer"/>
@@ -16,7 +22,9 @@
 
 <script setup lang="jsx">
 import ProcessDiagramViewer from '@/views/workflow/common/ProcessDiagramViewer.vue';
-import {getPhaseProcess,submitPhaseChange,getPhaseForm,resubmitPhaseForm} from "@/api/project-manage";
+import UserPicker from "@/views/workflow/process/common/UserPicker.vue";
+import Ttsup from './components/ToolToShowUserPicker.vue'
+import {getPhaseProcess, submitPhaseChange, getPhaseForm, resubmitPhaseForm} from "@/api/project-manage";
 import {ElNotification} from "element-plus";
 import {useProcessStore} from '@/stores/processStore.js';
 import {useTagsView} from '@/stores/tagsview.js'
@@ -25,6 +33,7 @@ const tagsViewStore = useTagsView()
 const router = useRouter()
 const route = useRoute()
 const attachment = ref()
+const userPicker = ref()
 const name = ref(router.currentRoute.value.name)
 const loading = ref(false)
 const formData = ref({})
@@ -34,6 +43,7 @@ const showTable = ref(true)
 const otherFileList = ref([])
 const processInstanceData = ref()
 const processDiagramViewer = ref(true)
+const userList = ref([])
 const processStore = useProcessStore()
 const compositeParam = (item) => {
   let tag = ''
@@ -70,39 +80,131 @@ const getFileParam = (item) => {
     tag: item.tag
   }
 }
-const handleSubmit =async () => {
-    let files = []
-    let singleFile = {}
-    let fileArray
+
+const chooseUser = () => {
+  userPicker.value.showUserPicker()
+}
+const chooseUserInfo = () => {
+  if (userList.value.length > 0){
+    return userList.value.map(item => {
+      return item.name
+    }).join(',')
+  }else {
+    return "请选择抄送人员"
+  }
+}
+const selected = (select) => {
+  let userInfoList = []
+  for (let val of select) {
+    let userInfo = {
+      id: val.id,
+      name: val.name,
+      avatar: val.avatar,
+    }
+    userInfoList.push(userInfo)
+  }
+  userList.value = userInfoList
+}
+const handleSubmit = async () => {
+  let files = []
+  let singleFile = {}
+  let fileArray
+  if (file.value.fileId !== undefined) {
+    singleFile = {
+      fileId: file.value.fileId
+    }
+  }
+  fileArray = otherFileList.value
+  fileArray.forEach(item => {
+    files.push(getFileParam(item))
+  })
+  let userIds = []
+  if (userList.value.length > 0){
+    userIds = userList.value.map(item => {
+      return item.id
+    })
+  }
+  let params = {
+    deploymentId: deploymentId.value,
+    requirementId: route.query.id,
+    fileList: files,
+    singleFile: singleFile,
+    projectId: route.query.projectId,
+    userIds: userIds
+  }
+  if (JSON.stringify(singleFile) === "{}") {
+    attachment.value.validate()
+    ElNotification({
+      title: '提示',
+      message: '请上传附件',
+      type: 'error'
+    })
+    return;
+  } else {
+    attachment.value.clearValidate()
+  }
+  console.log('params-提交', params,userList.value)
+  // let res = await submitPhaseChange(params)
+  // ElNotification({
+  //   title: '提示',
+  //   message: res.msg,
+  //   type: res.code === 1000 ? 'success' : 'error'
+  // })
+  // if (res.code === 1000) {
+  //   tagsViewStore.delVisitedViews(router.currentRoute.value.path)
+  //   await router.push({
+  //     name: 'Implementation'
+  //   })
+  // }
+}
+const handleResubmit = (instance) => {
+  let singleFile = {}
+  let otherFiles = []
+  let fileArray
+  if (attachment.value.singleFile !== null && name.value === 'Phase/edit') {
+    singleFile = {
+      fileId: attachment.value.singleFile.fileId
+    }
+    fileArray = attachment.value.allFileList
+  } else {
     if (file.value.fileId !== undefined) {
       singleFile = {
         fileId: file.value.fileId
       }
     }
     fileArray = otherFileList.value
-    fileArray.forEach(item => {
-      files.push(getFileParam(item))
+  }
+  fileArray.forEach(item => {
+    otherFiles.push(getFileParam(item))
+  })
+  let userIds = []
+  if (userList.value.length > 0){
+    userIds = userList.value.map(item => {
+      return item.id
     })
-    let params = {
-      deploymentId: deploymentId.value,
-      requirementId: route.query.id,
-      fileList: files,
-      singleFile: singleFile,
-      projectId: route.query.projectId,
-    }
-    if (JSON.stringify(singleFile) === "{}") {
-      attachment.value.validate()
-      ElNotification({
-        title: '提示',
-        message: '请上传附件',
-        type: 'error'
-      })
-      return;
-    }else {
-      attachment.value.clearValidate()
-    }
-    console.log('params-提交', params)
-    let res = await submitPhaseChange(params)
+  }
+  //todo requirementId
+  let params = {
+    deploymentId: deploymentId.value,
+    requirementId: route.query.id,
+    fileList: otherFiles,
+    singleFile: singleFile,
+    projectId: route.query.projectId,
+    userIds: userIds
+  }
+  if (JSON.stringify(singleFile) === "{}") {
+    attachment.value.validate()
+    ElNotification({
+      title: '提示',
+      message: '请上传附件',
+      type: 'error'
+    })
+    return;
+  } else {
+    attachment.value.clearValidate()
+  }
+  console.log('重新提交params', params)
+  resubmitPhaseForm(params).then(res => {
     ElNotification({
       title: '提示',
       message: res.msg,
@@ -110,67 +212,14 @@ const handleSubmit =async () => {
     })
     if (res.code === 1000) {
       tagsViewStore.delVisitedViews(router.currentRoute.value.path)
-      await router.push({
+      router.push({
         name: 'Implementation'
       })
     }
-}
-const handleResubmit = (instance) => {
-    let singleFile = {}
-    let otherFiles = []
-    let fileArray
-    if (attachment.value.singleFile!==null&&name.value === 'Phase/edit') {
-      singleFile = {
-        fileId: attachment.value.singleFile.fileId
-      }
-      fileArray = attachment.value.allFileList
-    } else {
-      if (file.value.fileId !== undefined) {
-        singleFile = {
-          fileId: file.value.fileId
-        }
-      }
-      fileArray = otherFileList.value
-    }
-    fileArray.forEach(item => {
-      otherFiles.push(getFileParam(item))
-    })
-    //todo requirementId
-    let params = {
-      deploymentId: deploymentId.value,
-      requirementId: route.query.id,
-      fileList: otherFiles,
-      singleFile: singleFile,
-      projectId: route.query.projectId,
-    }
-    if (JSON.stringify(singleFile) === "{}") {
-      attachment.value.validate()
-      ElNotification({
-        title: '提示',
-        message: '请上传附件',
-        type: 'error'
-      })
-      return;
-    }else {
-      attachment.value.clearValidate()
-    }
-    console.log('重新提交params', params)
-    resubmitPhaseForm(params).then(res => {
-      ElNotification({
-        title: '提示',
-        message: res.msg,
-        type: res.code === 1000 ? 'success' : 'error'
-      })
-      if (res.code === 1000) {
-        tagsViewStore.delVisitedViews(router.currentRoute.value.path)
-        router.push({
-          name: 'Implementation'
-        })
-      }
-    })
+  })
 }
 const init = async () => {
-  const {msg, code,data} = await getPhaseProcess()
+  const {msg, code, data} = await getPhaseProcess()
   processDiagramViewer.value = false
   if (code === 1000) {
     deploymentId.value = data.deploymentId
@@ -184,11 +233,11 @@ const init = async () => {
     nextTick(() => {
       processDiagramViewer.value = true
     })
-  }else {
+  } else {
     ElNotification({
       title: '提示',
       message: msg,
-      type:'error'
+      type: 'error'
     })
   }
 }
@@ -201,21 +250,21 @@ const getDetailInfo = async () => {
     })
     if (res.code === 1000) {
       formData.value = res.data
-      loading.value=false
+      loading.value = false
     }
   })
 }
 onMounted(async () => {
   await init()
-  if (name.value === 'Phase/edit'){
-    loading.value=true
+  if (name.value === 'Phase/edit') {
+    loading.value = true
     await getDetailInfo()
   }
 })
 </script>
 
 <style scoped>
-.apply-block{
+.apply-block {
   margin: 15px 0;
 }
 </style>
diff --git a/vite.config.js b/vite.config.js
index e3c4d22..3f5511a 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -1,8 +1,8 @@
-import {fileURLToPath, URL} from 'node:url'
-import {defineConfig} from 'vite'
+import { fileURLToPath, URL } from 'node:url'
+import { defineConfig } from 'vite'
 import AutoImport from 'unplugin-auto-import/vite'
 import Components from 'unplugin-vue-components/vite'
-import {ElementPlusResolver} from 'unplugin-vue-components/resolvers'
+import { ElementPlusResolver } from 'unplugin-vue-components/resolvers'
 import Icons from 'unplugin-icons/vite'
 import IconsResolver from 'unplugin-icons/resolver'
 import vue from '@vitejs/plugin-vue'
@@ -17,7 +17,7 @@ export default defineConfig({
     vueJsx(),
     AutoImport({
       //自动导入vue相关函数
-      imports: ['vue', 'vue-router'],
+      imports: ['vue','vue-router'],
       resolvers: [
         ElementPlusResolver(),
         //自动导入图标组件
@@ -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/, '')
@@ -80,19 +80,19 @@ export default defineConfig({
       //   target: 'http://clay.frp.feashow.cn/',
       //   // target: 'http://192.168.31.175:8000',
       //   changeOrigin: true,
-      //   rewrite: (path) => path.replace(/^\/summary/, '')
+      //   rewrite: (path) => path.replace(/^\/api/, '')
       // },
       '/api': {
-        target: 'http://mosr.feashow.cn',
-        // target: 'http://clay.frp.feashow.cn/',
+        // target: 'http://mosr.feashow.cn/',
+        target: 'http://10.7.127.57:8000',
         changeOrigin: true,
-        // rewrite: (path) => path.replace(/^\/api/, '')
+        rewrite: (path) => path.replace(/^\/api/, '')
       },
-      // '/summary/notice-ws': {
-      //   target: 'ws://mosr.feashow.cn/summary/notice-ws',
-      //   ws: true,
-      //   changeOrigin: true,
-      // }
+      '/api/notice-ws': {
+        target: 'ws://mosr.feashow.cn/api/notice-ws',
+        ws: true,
+        changeOrigin: true,
+      }
     }
   }
 })