Merge pull request 'master' (#399) from master into prod

Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/399

src/api/user/user.js

@@ -185,3 +185,17 @@ export const unbindAllUserByPost = (postId) => {
     }
   })
 }
+
+export const bindAccount=(data)=>{
+  return request({
+    url: '/admin/mosr/user/bind/account',
+    method: 'post',
+    data
+  })
+}
+export const getBindAccount=(userId)=>{
+  return request({
+    url: `/admin/mosr/user/bind/account/info/${userId}`,
+    method: 'get'
+  })
+}

src/components/DetailComponent/ExpenseDetail.vue

@@ -49,6 +49,7 @@
 <script setup lang="jsx">
 import {getResearchUser, getAllocationDetails} from "@/api/expense-manage";
 import {exportExcel} from "@/utils/export-excel";
+import {ElNotification} from "element-plus";
 
 const route = useRoute()
 const tableIns = ref()
@@ -159,6 +160,13 @@ const concatColumn = (columnIndex, length, rowIndex) => {
 const init = () => {
   loading.value = true
   getAllocationDetails(route.query.id).then(res => {
+    if(res.code!==1000){
+      ElNotification({
+        title: '提示',
+        message: res.msg,
+        type: 'error'
+      })
+    }
     columnInfo.value = res.data.columns
     let tableDataLet = res.data.tableData;
     let personInfoKey = []

src/views/expense-management/share/add.vue

@@ -160,17 +160,17 @@ import UserPicker from "@/views/workflow/process/common/UserPicker.vue";
 const userList = ref([])
 const changeDiagram = ref(false)
 const rules = reactive({
-  shareName: [{required: true, message: '请输入分摊名称', trigger:  ['blur', 'change']}],
+  shareName: [{required: true, message: '请输入分摊名称', trigger: ['blur', 'change']}],
-  apportionmentMonth: [{required: true, message: '请选择月份', trigger:  ['blur', 'change']}],
+  apportionmentMonth: [{required: true, message: '请选择月份', trigger: ['blur', 'change']}],
-  projectId: [{required: true, message: '请选择项目名称', trigger:  ['blur', 'change']}],
+  projectId: [{required: true, message: '请选择项目名称', trigger: ['blur', 'change']}],
   // researchPersonnel: [{required: true, message: '请选择研发人员', trigger:  ['blur', 'change']}],
-  wagesPayable: [{required: true, message: '请输入应发工资', trigger:  ['blur', 'change']}],
+  wagesPayable: [{required: true, message: '请输入应发工资', trigger: ['blur', 'change']}],
-  performance: [{required: true, message: '请输入绩效', trigger:  ['blur', 'change']}],
+  performance: [{required: true, message: '请输入绩效', trigger: ['blur', 'change']}],
-  reserveFund: [{required: true, message: '请输入公积金', trigger:  ['blur', 'change']}],
+  reserveFund: [{required: true, message: '请输入公积金', trigger: ['blur', 'change']}],
-  socialSecurity: [{required: true, message: '请输入社保', trigger:  ['blur', 'change']}],
+  socialSecurity: [{required: true, message: '请输入社保', trigger: ['blur', 'change']}],
-  annuity: [{required: true, message: '请输入年金', trigger:  ['blur', 'change']}],
+  annuity: [{required: true, message: '请输入年金', trigger: ['blur', 'change']}],
-  workday: [{required: true, message: '请输入工作日', trigger:  ['blur', 'change']}],
+  workday: [{required: true, message: '请输入工作日', trigger: ['blur', 'change']}],
-  researchDuration: [{required: true, message: '请输入研发时长', trigger:  ['blur', 'change']}],
+  researchDuration: [{required: true, message: '请输入研发时长', trigger: ['blur', 'change']}],
 })
 const processStore = useProcessStore()
 const opentionData = ref()
@@ -243,6 +243,7 @@ const handleAdd = () => {
     projectId: '',
     projectName: '',
     researchPersonnel: '',
+    researchPersonnelName: '',
     wagesPayable: null,
     performance: null,
     reserveFund: null,
@@ -251,6 +252,7 @@ const handleAdd = () => {
     workday: '21.75',
     researchDuration: null,
   }
+  currentReachPerson.value.name=''
   formData.value.tableData.push(row)
 }
 const handleCopy = (row) => {
@@ -281,19 +283,29 @@ const handleSubmit = (instance) => {
         type: 'error'
       })
     }
+    let researchPersonnel = ''
     formData.value.tableData.forEach(item => {
       item.projectName = getProjectName(item.projectId)
+      researchPersonnel = item.researchPersonnel
       if (item.performance == 0) {
         item.performance = null
       }
     })
+    if (!researchPersonnel) {
+      ElNotification({
+        title: '提示',
+        message: '请选择研发人员',
+        type: 'error'
+      })
+      return;
+    }
     let params = {
       shareName: formData.value.shareName,
       apportionmentMonth: formData.value.apportionmentMonth,
       usrAllocations: formData.value.tableData,
       deploymentId: processInstanceData.value.deploymentId,
     }
-    // console.log('params', params, formData.value.tableData)
+    console.log('params', params, formData.value.tableData)
     const {code, msg} = await addAllocation(params)
     ElNotification({
       title: '提示',
@@ -318,17 +330,19 @@ const handleResubmit = (instance) => {
         type: 'error'
       })
     }
-  let newUsrAllocationsObj={}
+    let newUsrAllocationsObj = {}
-  let newUsrAllocationsObjArray=[]
+    let newUsrAllocationsObjArray = []
+    let researchPersonnel = ''
     formData.value.tableData.forEach(item => {
       item.allocationId = formData.value.allocationId
       item.projectName = getProjectName(item.projectId)
+      researchPersonnel = item.researchPersonnel
       if (item.performance == 0) {
         item.performance = null
       }
-      newUsrAllocationsObj={
+      newUsrAllocationsObj = {
         projectId: item.projectId,
-        projectName:item.projectName,
+        projectName: item.projectName,
         researchPersonnel: item.researchPersonnel,
         wagesPayable: item.wagesPayable,
         performance: item.performance,
@@ -340,6 +354,14 @@ const handleResubmit = (instance) => {
       }
       newUsrAllocationsObjArray.push(newUsrAllocationsObj)
     })
+    if (!researchPersonnel) {
+      ElNotification({
+        title: '提示',
+        message: '请选择研发人员',
+        type: 'error'
+      })
+      return;
+    }
     let params = {
       allocationId: formData.value.allocationId,
       shareName: formData.value.shareName,

src/views/system/user/index.vue

@@ -1,14 +1,16 @@
 <template>
   <fvSearchForm ref="form" :searchConfig="searchConfig" @search="search"></fvSearchForm>
   <fvTable ref="tableIns" :tableConfig="tableConfig" @headBtnClick="headBtnClick"></fvTable>
+  <user-picker :multiple="true" ref="userPicker" title="请选择研发人员" v-model:value="userList" @ok="selected"/>
 </template>
 
 <script setup lang="jsx">
 import Tag from '@/components/Tag.vue'
 import fvSelect from '@/fvcomponents/fvSelect/index.vue'
+import UserPicker from "@/views/workflow/process/common/UserPicker.vue";
 import { useAuthStore } from '@/stores/userstore.js'
-import { getDeptOpt, getSubCompOpt } from '../../../api/user/user.js';
+import { getDeptOpt, getSubCompOpt,bindAccount,getBindAccount } from '@/api/user/user.js';
-import { ElMessageBox } from 'element-plus';
+import {ElMessageBox, ElNotification} from 'element-plus';
 
 const authStore = useAuthStore()
 const router = useRouter()
@@ -75,11 +77,14 @@ const searchConfig = ref([
 ])
 
 const tableIns = ref()
-
+const currentId = ref('')
+const userList = ref([])
+const userPicker = ref()
 const auths = {
   edit: ['admin:user:edit'],
   del: ['admin:user:del'],
   add: ['admin:user:add'],
+  bindUser: ['admin:bind:account'],
 }
 
 const tableConfig = reactive({
@@ -118,12 +123,14 @@ const tableConfig = reactive({
       prop: 'accountType',
       label: '主子账号',
       align: 'center',
+      showOverflowTooltip: false,
       currentRender: ({row, index}) => (<Tag dictType={'account_type'} value={row.accountType} />)
     },
     {
       prop: 'state',
       label: '状态',
       align: 'center',
+      showOverflowTooltip: false,
       currentRender: ({row, index}) => (<Tag dictType={'normal_disable'} value={row.state} />)
     },
     {
@@ -137,6 +144,7 @@ const tableConfig = reactive({
       fixed: 'right',
       width: '150',
       align: 'center',
+      showOverflowTooltip: false,
       currentRender: ({row, index}) => {
         return (
           <div>
@@ -146,7 +154,11 @@ const tableConfig = reactive({
               <el-button type="danger" v-perm={auths.del} link onClick={()=>handleDel(row)}>删除</el-button> :
               null
             }
-
+            {
+              row.accountType == 0 ?
+              <el-button type="primary" v-perm={auths.bindUser} link onClick={()=>handleBindAccount(row)}>绑定账号</el-button> :
+              null
+            }
           </div>
         )
       }
@@ -207,7 +219,46 @@ const handleDel = (row) => {
     // const { code } = await
   }).catch(()=>{})
 }
-
+const handleBindAccount=(row)=>{
+  currentId.value = row.userId
+  getBindAccount(row.userId).then(res=>{
+    if(res.code != 1000){
+      ElNotification({
+        title: '提示',
+        message: res.msg,
+        type: 'error'
+      })
+    }else {
+      userList.value = res.data
+      nextTick(()=>{
+        userPicker.value.showUserPicker()
+      })
+    }
+  })
+}
+const selected = (select) => {
+  let userInfoList = []
+  for (let val of select) {
+    let userInfo = {
+      id: val.id,
+      name: val.name
+    }
+    userInfoList.push(userInfo)
+  }
+  userList.value = userInfoList
+  let ids=userList.value.map(item=>item.id)
+  let params={
+    id:currentId.value,
+    ids:ids
+  }
+  bindAccount(params).then(res=>{
+    ElNotification({
+      title: '提示',
+      message: res.msg,
+      type: res.code === 1000 ? 'success' : 'error'
+    })
+  })
+}
 const headBtnClick = (key) => {
   switch(key) {
     case 'add': handleAdd()

src/views/workflow/process/common/UserPicker.vue

@@ -192,8 +192,12 @@ const showUserPicker = () => {
     value: "0"
   };
   dataList.value = [];
+  console.log('_value.value',_value.value)
   if(props.setNullToSelectList){
     selectList.value = []
+  }else {
+
+    selectList.value =_value.value
   }
   chooseId.value = 0;
   radio.value = 0;