Merge pull request 'fix : 修复组织机构显示及部门副职不能选择bug' (#608) from dd into master

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

src/api/subsidiary/index.js

@@ -20,3 +20,11 @@ export const getCompanyDetail=(companyId)=>{
         method:'get'
     })
 }
+
+export const setCompanyLeader=(data)=>{
+    return request({
+        url:'/admin/mosr/sub/company/leader',
+        method:'post',
+        data:data
+    })
+}

src/components/organizationalStructure/CompanyDetail.vue

@@ -1,10 +1,14 @@
 <template>
   <baseTitle title="公司详情"></baseTitle>
   <fv-Form :schema="schema" @getInstance="(e)=>form = e"></fv-Form>
+  <UserPicker :multiple="false" ref="presidentNamePicker"  @ok="editPresident"></UserPicker>
+  <UserPicker :multiple="false" ref="generalManagerNamePicker" @ok="editGeneralManager"></UserPicker>
 </template>
 
-<script setup>
-import {getCompanyDetail} from "@/api/subsidiary";
+<script setup lang="jsx">
+import UserPicker from '@/views/workflow/process/common/UserPicker.vue';
+import Ttsup from '@/views/system/department/components/ToolToShowUserPicker.vue'
+import {getCompanyDetail,setCompanyLeader} from "@/api/subsidiary";
 const props=defineProps({
   value:{
     type:String,
@@ -12,6 +16,12 @@ const props=defineProps({
   }
 })
 const form = ref()
+const presidentName = ref()
+const presidentIds = ref()
+const generalManagerName = ref()
+const presidentNamePicker = ref()
+const generalManagerNamePicker = ref()
+const generalManagerIds = ref()
 const schema = reactive([
   {
     label: '公司名称：',
@@ -21,6 +31,17 @@ const schema = reactive([
     label: '公司编码：',
     prop: 'companyCode'
   },
+  {
+    label: '董事长：',
+    prop: 'presidentIds',
+    component: ()=><Ttsup modelValue={presidentName.value} onClick={()=>{presidentNamePicker.value.showUserPicker()} } />
+
+  },
+  {
+    label: '总经理：',
+    prop: 'generalManagerIds',
+    component: ()=><Ttsup modelValue={generalManagerName.value} onClick={()=>{generalManagerNamePicker.value.showUserPicker()} } />
+  },
   {
     label: '创建时间：',
     prop: 'createTime'
@@ -35,10 +56,62 @@ const _value = computed({
     emit('update:value', value)
   }
 })
+const editPresident = (list) => {
+  const arr = list.map(item=>item.name)
+  presidentIds.value = list.map(item=>item.id)
+  presidentName.value = arr.join(',')
+  setDeptmentInfo({
+    companyId: _value.value,
+    presidentIds: presidentIds.value,
+    generalManagerIds: generalManagerIds.value
+  })
+}
 
+const editGeneralManager = (list) => {
+  const arr = list.map(item=>item.name)
+  generalManagerIds.value = list.map(item=>item.id)
+  generalManagerName.value = arr.join(',')
+  setDeptmentInfo({
+    companyId: _value.value,
+    presidentIds: presidentIds.value,
+    generalManagerIds: generalManagerIds.value
+  })
+}
+
+const setDeptmentInfo = async ({companyId = [], presidentIds = [], generalManagerIds = [] }) => {
+  const params = {
+    presidentIds,
+    generalManagerIds,
+    companyId,
+  }
+  const res = await setCompanyLeader(params)
+  // console.log(res.data);
+}
 const getInfo = async () => {
   const { data } = await getCompanyDetail(_value.value)
-  form.value.setValues(data)
+  const params = {
+    companyName: data.companyName,
+    companyCode: data.companyCode,
+    createTime: data.createTime
+  }
+  presidentIds.value = data.presidentIds
+  generalManagerIds.value = data.generalManagerIds
+  params.presidentIds = formatIdsToNames(data.presidentIds, data.presidentInfo, 'userId', 'nickName')
+  presidentName.value = params.presidentIds
+  params.generalManagerIds = formatIdsToNames(data.generalManagerIds, data.generalManagerInfo, 'userId', 'nickName')
+  generalManagerName.value = params.generalManagerIds
+  form.value.setValues(params)
+}
+
+const formatIdsToNames = (ids, infoList, key, viewKey) => {
+  const resArr = []
+  if(!ids?.length) return
+  ids.forEach(item=>{
+    infoList.forEach(v=>{
+      item == v[key] && resArr.push(v[viewKey])
+    })
+  })
+  return resArr.join(',')
 }
 
 getInfo()

src/components/organizationalStructure/Department.vue

@@ -3,9 +3,9 @@
   <fv-Form :schema="companySchema" @getInstance="(e)=>companyForm = e"></fv-Form>
   <baseTitle title="部门详情"></baseTitle>
   <fv-Form :schema="schema" @getInstance="(e)=>form = e"></fv-Form>
-  <UserPicker ref="usrPickershipIds"  @ok="editshipIds"></UserPicker>
-  <UserPicker ref="usrPickerHeadIds" @ok="editheadIds"></UserPicker>
-  <UserPicker ref="departmentalDeputyIds" @ok="editdeputyIds"></UserPicker>
+  <UserPicker :multiple="false" ref="usrPickershipIds"  @ok="editshipIds"></UserPicker>
+  <UserPicker :multiple="false" ref="usrPickerHeadIds" @ok="editheadIds"></UserPicker>
+  <UserPicker :multiple="false" ref="usrPickerDeputyIds" @ok="editdeputyIds"></UserPicker>
 </template>
 
 <script setup lang="jsx">
@@ -65,7 +65,7 @@ const schema = reactive([
   {
     label: '部门副职用户：',
     prop: 'departmentalDeputyIds',
-    component: ()=><Ttsup modelValue={departmentalDeputyNames.value} onClick={()=>{departmentalDeputyIds.value.showUserPicker()} } />
+    component: ()=><Ttsup modelValue={departmentalDeputyNames.value} onClick={()=>{usrPickerDeputyIds.value.showUserPicker()} } />
   },
   {
     label: '创建时间：',

src/router/index.js

@@ -35,11 +35,6 @@ const router = createRouter({
             name: 'specialFundDetailMobile',
             component: () => import('@/views/project-management/mobledetail/SpecialFundDetailMobile.vue')
         },
-        {
-            path: '/share/mobile',
-            name: 'shareDetailMobile',
-            component: () => import('@/views/project-management/mobledetail/ShareDetailMobile.vue')
-        },
         {
             path: '/projectDemand/requirement/moblie',
             name: 'projectDemandRequirementMoblie',

src/views/project-demand/requirement/moblieDetail/OpinionMoblie.vue

@@ -1,168 +0,0 @@
-<template>
-  <!--  <baseTitle title="审核意见"></baseTitle>-->
-  <!--  <fvForm :schema="schema" @getInstance="(e)=>form = e"></fvForm>-->
-  <div class="oper-page-btn">
-    <el-button type="danger" @click="handleReject">驳回</el-button>
-    <el-button color="#DED0B2" @click="handleAgree">同意</el-button>
-  </div>
-</template>
-
-<script setup lang="jsx">
-import {ElNotification} from 'element-plus';
-import {agreeTask, rejectTask} from "@/api/project-demand/index.js";
-import {useTagsView} from '@/stores/tagsview.js'
-
-const tagsViewStore = useTagsView()
-const route = useRoute()
-const router = useRouter()
-const props = defineProps({
-  taskId: {
-    type: String,
-    default: ''
-  },
-  formData: {
-    type: Object,
-    default: {}
-  },
-  value: {
-    type: String,
-    default: ''
-  }
-})
-
-const form = ref()
-const schema = computed(() => {
-  return [
-    {
-      label: '',
-      prop: 'auditOpinion',
-      component: 'el-input',
-      colProps: {
-        span: 24
-      },
-      props: {
-        placeholder: '请输入审核意见',
-        type: 'textarea',
-        rows: 3
-      }
-    }
-  ]
-})
-const _value = computed({
-  get() {
-    return props.value;
-  },
-  set(val) {
-    emit("update:value", val);
-  }
-})
-const back = () => {
-  switch (route.name) {
-    case 'Initiation/detail':
-      router.push({name: 'Initiation'})
-      break;
-    case 'Filing/detail':
-      router.push({name: 'Filing'})
-      break;
-    case 'Implementation/detail':
-      if (route.query.source === 'home') {
-        router.push('/home')
-      } else {
-        if (route.query.step === '10') {
-          router.push({name: 'Summary'})
-        } else if (route.query.step === '20') {
-          router.push({name: 'Initiation'})
-        } else if (route.query.step === '40') {
-          router.push({name: 'Implementation'})
-        } else if (route.query.step === '50') {
-          router.push({name: 'Filing'})
-        } else if (route.query.step === '00') {
-          router.push({name: 'Requirement'})
-        }
-      }
-      break;
-    case 'Summary/detail':
-      if (route.query.source === 'home') {
-        router.push('/home')
-      } else {
-        router.push({name: 'Summary'})
-      }
-      break;
-    case 'Requirement/detail':
-      if (route.query.source === 'home') {
-        router.push('/home')
-      } else {
-        router.push({name: 'Requirement'})
-      }
-      break;
-    case 'Fund/detail':
-      if (route.query.source === 'home') {
-        router.push('/home')
-      } else {
-        router.push({name: 'Fund'})
-      }
-      break;
-    case 'Share/detail':
-      if (route.query.source === 'home') {
-        router.push('/home')
-      } else {
-        router.push({name: 'Expense/share'})
-      }
-      break;
-    case 'Phase/detail':
-      if (route.query.source === 'home') {
-        router.push('/home')
-      } else {
-        router.push({name: 'Implementation'})
-      }
-      break;
-  }
-}
-// 驳回
-const handleReject = async () => {
-  // const values = form.value.getValues()
-  if (!_value.value) {
-    ElNotification({
-      title: '提示',
-      message: '请填写审核意见',
-      type: 'warning'
-    })
-    return
-  }
-  const params = {
-    taskId: props.taskId,
-    // ...values
-    auditOpinion: _value.value
-  }
-  // console.log('params', params)
-  const res = await rejectTask(params)
-  ElNotification({
-    title: '提示',
-    message: res.msg,
-    type: res.code === 1000 ? 'success' : 'error'
-  })
-  tagsViewStore.delVisitedViews(router.currentRoute.value.path)
-  back()
-}
-
-const handleAgree = async () => {
-  // const values = form.value.getValues()
-  const params = {
-    taskId: props.taskId,
-    formData: props.formData,
-    auditOpinion: _value.value
-  }
-  const res = await agreeTask(params)
-  ElNotification({
-    title: '提示',
-    message: res.msg,
-    type: res.code === 1000 ? 'success' : 'error'
-  })
-  tagsViewStore.delVisitedViews(router.currentRoute.value.path)
-  back()
-}
-</script>
-
-<style lang="scss" scoped>
-
-</style>

src/views/project-management/mobledetail/ShareDetailMobile.vue

@@ -1,141 +0,0 @@
-<template>
-  <div style="padding: 0 10px;">
-    <baseTitle title="费用分摊详情"></baseTitle>
-    <el-form :model="formData" ref="form" class="query-form" label-width="auto">
-      <el-row>
-        <el-col :span="24">
-          <el-form-item label="分摊名称">
-            <span>{{ formData.shareName }}</span>
-          </el-form-item>
-        </el-col>
-        <el-col :span="24">
-          <el-form-item label="分摊月份">
-            <span>{{ formData.apportionmentMonth }}</span>
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
-      <el-tab-pane label="分摊明细" name="first">
-        <expense-detail-mobile/>
-      </el-tab-pane>
-      <el-tab-pane label="分摊汇总" name="second" v-loading="loading">
-        <allocation-summary-detail-mobile/>
-      </el-tab-pane>
-    </el-tabs>
-    <div v-if="shareData.taskId">
-      <baseTitle title="审核意见"></baseTitle>
-      <el-form-item prop="auditOpinion">
-        <el-input
-            v-model="auditOpinion"
-            :rows="3"
-            type="textarea"
-            placeholder="请输入审核意见"
-        />
-      </el-form-item>
-    </div>
-    <div class="approval-record">
-      <div class="approval-title">
-        <baseTitle title="审批记录"></baseTitle>
-        <div class="diagram">
-          <div class="base-title">流程图</div>
-          <el-switch
-              v-model="changeDiagram"
-              style="--el-switch-on-color:#BEA266; --el-switch-off-color:#cecdcd"
-          />
-        </div>
-      </div>
-      <div class="process">
-        <operation-render
-            v-if="shareProcessViewer&& shareData.operationList && shareData.operationList.length > 0&&!changeDiagram"
-            :isColumn="true"
-            :operation-list="shareData.operationList"
-            :state="shareData.state"/>
-        <process-diagram-viewer v-if="shareProcessViewer&&changeDiagram" id-name="shareProcess"/>
-      </div>
-    </div>
-    <opinion-moblie v-if="shareData.taskId" :formData="shareData.formData" :taskId="shareData.taskId"
-                    v-model:value="auditOpinion"></opinion-moblie>
-  </div>
-</template>
-
-<script setup lang="jsx">
-import OperationRender from '@/views/workflow/common/OperationRender.vue'
-import ProcessDiagramViewer from '@/views/workflow/common/ProcessDiagramViewer.vue'
-import {ElNotification} from "element-plus";
-import {useProcessStore} from '@/stores/processStore.js';
-import {getAllocationDetail} from "@/api/expense-manage";
-import OpinionMoblie from "./OpinionMoblie.vue";
-import AllocationSummaryDetailMobile from "./AllocationSummaryDetailMobile.vue";
-import ExpenseDetailMobile from "./ExpenseDetailMobile.vue";
-
-const changeDiagram = ref(false)
-const processStore = useProcessStore()
-const route = useRoute()
-const shareData = ref({})
-const formData = ref({})
-const auditOpinion = ref('')
-const shareProcessViewer = ref(true)
-const loading = ref(false)
-const activeName = ref('first')
-// const activeName = ref('second')
-
-const getDetail = async () => {
-  const id = route.query.id
-  shareProcessViewer.value = false
-  const {code, data, msg} = await getAllocationDetail(id)
-  if (code === 1000) {
-    shareData.value = data
-    formData.value = data.formData
-    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;
-    nextTick(() => {
-      shareProcessViewer.value = true
-    })
-  } else {
-    ElNotification({
-      title: '提示',
-      message: msg,
-      type: 'error'
-    })
-  }
-}
-
-
-const handleClick = (tab) => {
-  if (tab.index == 0) {
-    getDetail()
-  }
-}
-getDetail()
-</script>
-<style scoped lang="scss">
-:deep(.el-table--fit ) {
-  width: 100%;
-  height: 479px !important;
-}
-
-:deep(.el-tabs__nav-scroll) {
-  width: 100%;
-  display: flex;
-
-  .el-tabs__nav {
-    display: flex;
-    flex: 1;
-
-    .el-tabs__item {
-      flex: 1;
-      font-size: 16px;
-    }
-
-    .is-active {
-      color: black;
-      //background-color: #DED0B2;
-    }
-  }
-}
-</style>