Merge remote-tracking branch 'origin/master'

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>

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,6 +22,8 @@
 
 <script setup lang="jsx">
 import ProcessDiagramViewer from '@/views/workflow/common/ProcessDiagramViewer.vue';
+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';
@@ -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,6 +80,31 @@ const getFileParam = (item) => {
     tag: item.tag
   }
 }
+
+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 = {}
@@ -83,12 +118,19 @@ const handleSubmit =async () => {
   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()
@@ -101,19 +143,19 @@ const handleSubmit =async () => {
   } else {
     attachment.value.clearValidate()
   }
-    console.log('params-提交', params)
-    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'
-      })
-    }
+  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 = {}
@@ -135,6 +177,12 @@ const handleResubmit = (instance) => {
   fileArray.forEach(item => {
     otherFiles.push(getFileParam(item))
   })
+  let userIds = []
+  if (userList.value.length > 0){
+    userIds = userList.value.map(item => {
+      return item.id
+    })
+  }
   //todo requirementId
   let params = {
     deploymentId: deploymentId.value,
@@ -142,6 +190,7 @@ const handleResubmit = (instance) => {
     fileList: otherFiles,
     singleFile: singleFile,
     projectId: route.query.projectId,
+    userIds: userIds
   }
   if (JSON.stringify(singleFile) === "{}") {
     attachment.value.validate()

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/, '')
@@ -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,
+      }
     }
   }
 })