Merge pull request 'dj' (#289) from dj into master

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

src/api/expense-manage/index.js

@@ -21,7 +21,7 @@ export const getAllocationProcess = () => {
 };
 export const getAllocationDetailList = (params) => {
   return request({
-    url: '/workflow/mosr/cost/allocation/process',
+    url: '/workflow/mosr/cost/allocation/usr',
     method: "get",
     params:params
   });
@@ -38,3 +38,19 @@ export const getProjectOption = () => {
     method: "get"
   });
 };
+export const getAllocationCollect = (allocationId) => {
+  return request({
+    url: '/workflow/mosr/cost/allocation/collect',
+    method: "get",
+    params:{
+      allocationId:allocationId
+    }
+  });
+};
+export const editAllocation = (data) => {
+  return request({
+    url: '/workflow/mosr/cost/allocation/edit',
+    method: "post",
+    data
+  });
+};

src/components/DetailComponent/ExpenseDetail.vue

@@ -1,7 +1,7 @@
 <template>
   <div v-loading="loading">
     <fvSearchForm :searchConfig="searchConfig" @search="search"></fvSearchForm>
-    <fvTable ref="tableIns" :tableConfig="tableConfig" :data="detailList.formData">
+    <fvTable v-if="showTable" ref="tableIns" :tableConfig="tableConfig" :data="detailList">
       <template #empty>
         <el-empty description="暂无数据"/>
       </template>
@@ -102,6 +102,10 @@ const props = defineProps({
   loading: {
     type: Boolean,
     default: false
+  },
+  showTable: {
+    type: Boolean,
+    default: true
   }
 })
 const search = (val) => {
@@ -111,6 +115,9 @@ const search = (val) => {
 watch(() => props.loading, (val) => {
   props.loading=val
 })
+watch(() => props.showTable, (val) => {
+  props.showTable=val
+})
 </script>
 
 <style scoped>

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

@@ -51,49 +51,49 @@
               </el-form-item>
             </template>
           </el-table-column>
-          <el-table-column prop="wagesPayable" label="应发工资" width="175">
+          <el-table-column prop="wagesPayable" label="应发工资">
             <template #default="scope">
               <el-form-item prop="time" :rules="scope.row.wagesPayable?'1':rules.wagesPayable">
                 <el-input-number v-model="scope.row.wagesPayable" placeholder="请输入应发工资" :controls="false"/>
               </el-form-item>
             </template>
           </el-table-column>
-          <el-table-column prop="performance" label="绩效" width="175">
+          <el-table-column prop="performance" label="绩效">
             <template #default="scope">
               <el-form-item prop="time" :rules="scope.row.performance?'1':rules.performance">
                 <el-input-number v-model="scope.row.performance" placeholder="请输入绩效" :controls="false"/>
               </el-form-item>
             </template>
           </el-table-column>
-          <el-table-column prop="reserveFund" label="公积金" width="175">
+          <el-table-column prop="reserveFund" label="公积金">
             <template #default="scope">
               <el-form-item prop="time" :rules="scope.row.reserveFund?'1':rules.reserveFund">
                 <el-input-number v-model="scope.row.reserveFund" placeholder="请输入公积金" :controls="false"/>
               </el-form-item>
             </template>
           </el-table-column>
-          <el-table-column prop="socialSecurity" label="社保" width="175">
+          <el-table-column prop="socialSecurity" label="社保">
             <template #default="scope">
               <el-form-item prop="time" :rules="scope.row.socialSecurity?'1':rules.socialSecurity">
                 <el-input-number v-model="scope.row.socialSecurity" placeholder="请输入社保" :controls="false"/>
               </el-form-item>
             </template>
           </el-table-column>
-          <el-table-column prop="annuity" label="年金" width="175">
+          <el-table-column prop="annuity" label="年金">
             <template #default="scope">
               <el-form-item prop="time" :rules="scope.row.annuity?'1':rules.annuity">
                 <el-input-number v-model="scope.row.annuity" placeholder="请输入年金" :controls="false"/>
               </el-form-item>
             </template>
           </el-table-column>
-          <el-table-column prop="workday" label="工作日(天)" width="175">
+          <el-table-column prop="workday" label="工作日(天)">
             <template #default="scope">
               <el-form-item prop="time" :rules="scope.row.workday?'1':rules.workday">
                 <el-input-number v-model="scope.row.workday" placeholder="请输入工作日" :controls="false"/>
               </el-form-item>
             </template>
           </el-table-column>
-          <el-table-column prop="researchDuration" label="研发时长(天)" width="175">
+          <el-table-column prop="researchDuration" label="研发时长(天)" >
             <template #default="scope">
               <el-form-item prop="time" :rules="scope.row.researchDuration?'1':rules.researchDuration">
                 <el-input-number v-model="scope.row.researchDuration" placeholder="请输入研发时长" :controls="false"/>
@@ -141,6 +141,7 @@ import {useTagsView} from '@/stores/tagsview.js'
 import {addAllocation, getAllocationDetail, getAllocationProcess, getResearchUser,getProjectOption} from "@/api/expense-manage";
 import {useProcessStore} from '@/stores/processStore.js';
 import ProcessDiagramViewer from '@/views/workflow/common/ProcessDiagramViewer.vue';
+import {getAllocationDetailList} from "../../../api/expense-manage";
 
 const rules = reactive({
   shareName: [{required: true, message: '请输入分摊名称', trigger: 'blur'}],
@@ -162,7 +163,7 @@ const loading = ref(false)
 const route = useRoute()
 const router = useRouter()
 const tagsViewStore = useTagsView()
-let formData = reactive({
+const formData = ref({
   tableData: [
     {
       projectId:'',
@@ -190,6 +191,15 @@ const getProjectOptions = async () => {
   const res = await getProjectOption()
   nameOptions.value = res.data
 }
+const getProjectName=(id)=>{
+  let label=''
+  nameOptions.value.forEach(item=>{
+    if(item.value===id){
+      label=item.label
+    }
+  })
+  return label
+}
 const handleAdd = () => {
   let row = {
     projectId: '',
@@ -204,23 +214,34 @@ const handleAdd = () => {
     researchDuration: '',
     // subtotal: '',
   }
-  formData.tableData.push(row)
+  formData.value.tableData.push(row)
 }
 const handleCopy = (row) => {
-  formData.tableData.push(row)
+  formData.value.tableData.push(row)
 }
 const handleDelete = (index) => {
-  formData.tableData.splice(index, 1)
+  formData.value.tableData.splice(index, 1)
 }
 const handleSubmit = (instance) => {
   if (!instance) return
   instance.validate(async (valid) => {
-    if (!valid) return
+    if (!valid){
+      return ElNotification({
+        title: '提示',
+        message: '请完善数据,再提交!',
+        type: 'error'
+      })
+    }
+    formData.value.tableData.forEach(item => {
+      item.projectName = getProjectName(item.projectId)
+    })
     let params = {
-      ...formData,
+      shareName:formData.value.shareName,
-      usrAllocations: formData.tableData,
+      apportionmentMonth:formData.value.apportionmentMonth,
+      usrAllocations: formData.value.tableData,
       deploymentId: processInstanceData.value.deploymentId,
     }
+    console.log('params',params)
     const {code, msg} = await addAllocation(params)
     ElNotification({
       title: '提示',
@@ -236,18 +257,34 @@ const handleSubmit = (instance) => {
   })
 }
 const getDetailInfo = async () => {
-  getAllocationDetail(12).then(res => {
+  loading.value=true
+  getAllocationDetail(route.query.id).then(res => {
     ElNotification({
       title: '提示',
       message: res.msg,
       type: res.code === 1000 ? 'success' : 'error'
     })
     if (res.code === 1000) {
-      formData = res.data.formData
+      formData.value = res.data.formData
       loading.value = false
     }
   })
 }
+const getDetailList = async () => {
+  let params = {
+    allocationId: route.query.id
+  }
+  const {code, data, msg} = await getAllocationDetailList(params)
+  if (code === 1000) {
+    formData.value.tableData = data.rows
+  }else {
+    ElNotification({
+      title: '提示',
+      message: msg,
+      type:  'error'
+    })
+  }
+}
 const init = async () => {
   processDiagramViewer.value = false
   await getResearchOptions()
@@ -282,6 +319,7 @@ onMounted(async () => {
   if (route.query.id) {
     loading.value = true
     await getDetailInfo()
+    // await getDetailList()
   }
 })
 </script>

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

@@ -15,15 +15,14 @@
   </el-form>
   <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
     <el-tab-pane label="分摊明细" name="first">
-      <expense-detail :processViewer="shareProcessViewer" :detailList="detailList"
+      <expense-detail :showTable="showTable" :detailList="detailList" :loading="loading"/>
-                      :loading="loading"/>
     </el-tab-pane>
     <el-tab-pane label="分摊汇总" name="second">
-<!--      <fvTable ref="tableIns" :tableConfig="tableConfig" @headBtnClick="headBtnClick">-->
+      <fvTable ref="tableIns" :tableConfig="tableConfig" :data="collectList">
-<!--        <template #empty>-->
+        <template #empty>
-<!--          <el-empty description="暂无数据"/>-->
+          <el-empty description="暂无数据"/>
-<!--        </template>-->
+        </template>
-<!--      </fvTable>-->
+      </fvTable>
     </el-tab-pane>
   </el-tabs>
     <div v-if="shareData.taskId">
@@ -53,7 +52,7 @@ 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, getAllocationDetailList} from "@/api/expense-manage";
+import {getAllocationDetail, getAllocationDetailList,getAllocationCollect} from "@/api/expense-manage";
 
 const processStore = useProcessStore()
 const route = useRoute()
@@ -62,42 +61,90 @@ const detailList = ref([])
 const formData = ref({})
 const auditOpinion = ref('')
 const shareProcessViewer = ref(true)
+const showTable = ref(true)
 const loading = ref(false)
+const collectList = ref([])
 const activeName = ref('first')
+const tableConfig = reactive({
+  columns: [
+    {
+      prop: 'index',
+      type: 'index',
+      label: '序号',
+      align: 'center',
+      width: '80',
+    },
+    {
+      prop: 'originalFileName',
+      label: '项目名称',
+      align: 'center',
+    },
+    {
+      prop: 'tag',
+      label: '费用性质',
+      align: 'center'
+    },
+    {
+      prop: 'size',
+      label: '项目阶段',
+      align: 'center'
+    },
+    {
+      prop: 'size',
+      label: '分摊金额',
+      align: 'center'
+    }
+  ]
+})
 const getDetail = async () => {
   const id = route.query.id
-  loading.value = true
+  shareProcessViewer.value = false
   const {code, data, msg} = await getAllocationDetail(id)
   if (code === 1000) {
     shareData.value = data
     formData.value = data.formData
-    loading.value = false
-  } else {
-    ElNotification({
-      title: '提示',
-      message: msg,
-      type: 'error'
-    })
-    loading.value = false
-  }
-}
-const getDetailList = async () => {
-  let params = {
-    allocationId: route.query.id
-  }
-  shareProcessViewer.value = false
-  const {code, data, msg} = await getAllocationDetailList(params)
-  if (code === 1000) {
-    detailList.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;
-    nextTick(() => {
+    nextTick(()=>{
       shareProcessViewer.value = true
     })
+  } else {
+    ElNotification({
+      title: '提示',
+      message: msg,
+      type: 'error'
+    })
+  }
+}
+const getDetailList = async () => {
+  let params = {
+    allocationId: route.query.id
+  }
+  loading.value = true
+  showTable.value = false
+  const {code, data, msg} = await getAllocationDetailList(params)
+  if (code === 1000) {
+    detailList.value = data.rows
+    nextTick(() => {
+      showTable.value = true
+      loading.value = false
+    })
+  }else {
+    ElNotification({
+      title: '提示',
+      message: msg,
+      type:  'error'
+    })
+  }
+}
+const getDetailCollect = async () => {
+  const {code, data, msg} = await getAllocationCollect(route.query.id)
+  if (code === 1000) {
+    collectList.value = data.rows
   }else {
     ElNotification({
       title: '提示',
@@ -107,7 +154,8 @@ const getDetailList = async () => {
   }
 }
 getDetail()
-// getDetailList()
+getDetailList()
+// getDetailCollect()
 </script>
 <style scoped lang="scss">
 :deep(.el-tabs__nav-scroll) {

src/views/project-management/implementation/detail.vue

@@ -8,21 +8,22 @@
           :processViewer="commonProvessViewer"
           v-show="showActive == '00'"
           :loading="loading"
+          v-model:value="auditOpinion"
       />
       <summary-detail v-show="showActive == '10'" :formData="commonForm.formData" :data="commonForm"
-                      :processViewer="commonProvessViewer" :loading="loading" :fileListShow="fileListShow"/>
+                      :processViewer="commonProvessViewer" :loading="loading" :fileListShow="fileListShow" v-model:value="auditOpinion"/>
       <ApprovalDetail type="approval" v-show="showActive == '20'" :formData="commonForm.formData"
                       :data="commonForm" :processViewer="commonProvessViewer" :loading="loading"
-                      :fileListShow="fileListShow"/>
+                      :fileListShow="fileListShow" v-model:value="auditOpinion"/>
       <ApprovalDetail type="execute" v-show="showActive == '40'" :formData="commonForm.formData"
                       :data="commonForm" :processViewer="commonProvessViewer" :loading="loading"
-                      :fileListShow="fileListShow"/>
+                      :fileListShow="fileListShow" v-model:value="auditOpinion"/>
       <ApprovalDetail type="archivist" v-show="showActive == '50'" :formData="commonForm.formData" :data="commonForm"
-                      :processViewer="commonProvessViewer" :loading="loading" :fileListShow="fileListShow"/>
+                      :processViewer="commonProvessViewer" :loading="loading" :fileListShow="fileListShow" v-model:value="auditOpinion"/>
 
     </template>
   </steps>
-  <opinion v-if="commonForm.taskId" :formData="commonForm.formData" :taskId="commonForm.taskId"/>
+  <opinion v-if="commonForm.taskId" :formData="commonForm.formData" :taskId="commonForm.taskId" v-model:value="auditOpinion"/>
 </template>
 
 <script setup lang="jsx">
@@ -40,6 +41,7 @@ const loading = ref(false)
 const processStore = useProcessStore()
 const fileListShow = ref('READ')
 const currentStep = ref()
+const auditOpinion = ref('')
 route.query.step == '10' && (currentStep.value = 1)
 route.query.step == '20' && (currentStep.value = 2)
 route.query.step == '40' && (currentStep.value = 3)

src/views/project-management/implementation/uploadFee.vue

@@ -38,7 +38,7 @@
           <el-form-item prop="researchStage"  :rules="scope.row.researchStage?'1':rules.researchStage">
             <el-select v-model="scope.row.researchStage" placeholder="请选择研发阶段" clearable filterable>
               <el-option
-                  v-for="item in cacheStore.getDict('research_stage')"
+                  v-for="item in cacheStore.getDict('fee_stage')"
                   :key="item.value"
                   :label="item.label"
                   :value="item.value"

src/views/tool/dict/index.vue

@@ -317,7 +317,7 @@ const getTreeList = async () => {
   let params = {
     ...queryType,
     pageNum: 1,
-    pageSize: 50
+    pageSize: 500
   };
   getDictTypeList(params).then(res => {
     if (res.code === 1000) {