From d3fe46f0bc0627a056ce8ae3dcc4ccaf4f3115b8 Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Mon, 10 Jun 2024 00:25:00 +0800
Subject: [PATCH] =?UTF-8?q?fix=20:=20=E4=BF=AE=E5=A4=8D=E6=8F=90=E4=BA=A4?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE=E6=97=81=E8=BE=B9=E7=9A=84=E8=BF=94=E5=9B=9E?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E7=BB=86=E8=8A=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DetailComponent/ProjectApply.vue          |  4 ++
 src/views/expense-management/ledger/index.vue |  5 ---
 src/views/project-demand/summary/add.vue      |  4 ++
 .../project-management/filing/conclusion.vue  |  4 ++
 .../implementation/account.vue                |  6 ++-
 .../implementation/check.vue                  |  4 ++
 .../implementation/index.vue                  |  1 +
 .../implementation/share.vue                  | 41 +++++++++++++++----
 .../project-management/initiation/apply.vue   |  4 ++
 9 files changed, 59 insertions(+), 14 deletions(-)

diff --git a/src/components/DetailComponent/ProjectApply.vue b/src/components/DetailComponent/ProjectApply.vue
index d4b1edb..bc45b06 100644
--- a/src/components/DetailComponent/ProjectApply.vue
+++ b/src/components/DetailComponent/ProjectApply.vue
@@ -27,6 +27,7 @@
     <div class="oper-page-btn">
       <el-button color="#DED0B2" v-if="route.query.state==0" @click="handleSubmit(applyForm)">提交</el-button>
       <el-button color="#DED0B2" v-else-if="route.query.state==3" @click="handleSubmit(applyForm)">重新提交</el-button>
+      <el-button @click="handleBack">返回</el-button>
     </div>
   </div>
 </template>
@@ -70,6 +71,9 @@ const processDiagramViewer = ref(false)
 const name = ref(router.currentRoute.value.name)
 const applyForm = ref()
 const deploymentId = ref()
+const handleBack = () => {
+  history.back()
+}
 const compositeParam = (item) => {
   // let tag = ''
   // if (name.value === 'Initiation/apply' || route.query.state==3) {
diff --git a/src/views/expense-management/ledger/index.vue b/src/views/expense-management/ledger/index.vue
index 7bac909..052765b 100644
--- a/src/views/expense-management/ledger/index.vue
+++ b/src/views/expense-management/ledger/index.vue
@@ -122,11 +122,6 @@ const tableConfig = reactive({
         }
       }
     },
-    {
-      prop: 'digest',
-      label: '摘要',
-      align: 'center'
-    },
     {
       prop: 'afterTax',
       label: '税后余额(元)',
diff --git a/src/views/project-demand/summary/add.vue b/src/views/project-demand/summary/add.vue
index 87aa3a1..6963ed8 100644
--- a/src/views/project-demand/summary/add.vue
+++ b/src/views/project-demand/summary/add.vue
@@ -244,6 +244,7 @@
       <!--      <el-button type="info" @click="staging">存为草稿</el-button>-->
       <el-button color="#DED0B2" v-if="name==='Summary/add'" @click="handleSubmit(summaryForm)">发布</el-button>
       <el-button color="#DED0B2" v-else @click="handleResubmit">重新发布</el-button>
+      <el-button @click="handleBack">返回</el-button>
     </div>
   </div>
 </template>
@@ -307,6 +308,9 @@ const rules = reactive({
   contentDescription: [{required: true, message: '请输入研发项目关键内容描述', trigger: 'blur'}]
 })
 
+const handleBack = () => {
+  history.back()
+}
 const disabledDate = (time) => {
   return time.getTime() < new Date(formData.value.startTime).getTime();
 }
diff --git a/src/views/project-management/filing/conclusion.vue b/src/views/project-management/filing/conclusion.vue
index d779200..f67715f 100644
--- a/src/views/project-management/filing/conclusion.vue
+++ b/src/views/project-management/filing/conclusion.vue
@@ -12,6 +12,7 @@
     <div class="oper-page-btn">
       <el-button color="#DED0B2" v-if="name==='Filing/conclusion'" @click="handleSubmit">提交</el-button>
       <el-button color="#DED0B2" v-else @click="handleResubmit">重新提交</el-button>
+      <el-button @click="handleBack">返回</el-button>
     </div>
   </div>
 </template>
@@ -92,6 +93,9 @@ const handleDownload = (row) => {
     a.click()
   })
 }
+const handleBack = () => {
+  history.back()
+}
 const compositeParam = (item) => {
   let tag = ''
   if (name.value === 'Filing/conclusion' || name.value === 'Filing/edit') {
diff --git a/src/views/project-management/implementation/account.vue b/src/views/project-management/implementation/account.vue
index 65c724a..f1b5111 100644
--- a/src/views/project-management/implementation/account.vue
+++ b/src/views/project-management/implementation/account.vue
@@ -9,6 +9,7 @@
 
 <script setup lang="jsx">
 import fvSelect from '@/fvcomponents/fvSelect/index.vue'
+import {toThousands} from '@/utils/changePrice.js'
 
 const router = useRouter()
 const route = useRoute()
@@ -125,7 +126,10 @@ const tableConfig = reactive({
     {
       prop: 'afterTax',
       label: '税后余额(元)',
-      align: 'center'
+      align: 'center',
+      currentRender:({row})=>{
+        return <span>{toThousands(row.afterTax)}</span>
+      }
     }
   ],
   api: '/workflow/mosr/expense/ledger',
diff --git a/src/views/project-management/implementation/check.vue b/src/views/project-management/implementation/check.vue
index e219b9e..5200207 100644
--- a/src/views/project-management/implementation/check.vue
+++ b/src/views/project-management/implementation/check.vue
@@ -21,6 +21,7 @@
     <div class="oper-page-btn">
       <el-button color="#DED0B2" v-if="name==='Implementation/check'" @click="handleSubmit(applyForm)">提交</el-button>
       <el-button color="#DED0B2" v-else @click="handleResubmit(applyForm)">重新提交</el-button>
+      <el-button @click="handleBack">返回</el-button>
     </div>
   </div>
 </template>
@@ -46,6 +47,9 @@ const otherFileList = ref([])
 const processInstanceData = ref()
 const processDiagramViewer = ref(true)
 const processStore = useProcessStore()
+const handleBack = () => {
+  history.back()
+}
 const compositeParam = (item) => {
   let tag = ''
   if (name.value === 'Implementation/check' || name.value === 'Implementation/edit') {
diff --git a/src/views/project-management/implementation/index.vue b/src/views/project-management/implementation/index.vue
index 73ac41b..7541b91 100644
--- a/src/views/project-management/implementation/index.vue
+++ b/src/views/project-management/implementation/index.vue
@@ -245,6 +245,7 @@ const tableConfig = reactive({
       prop: 'oper',
       label: '操作',
       align: 'center',
+      fixed:'right',
       showOverflowTooltip: false,
       currentRender: ({row, index}) => {
         let btn = []
diff --git a/src/views/project-management/implementation/share.vue b/src/views/project-management/implementation/share.vue
index 58f5b50..200418f 100644
--- a/src/views/project-management/implementation/share.vue
+++ b/src/views/project-management/implementation/share.vue
@@ -13,6 +13,7 @@
 import fvSelect from '@/fvcomponents/fvSelect/index.vue'
 import {computed, ref} from "vue";
 import {getBaseInfoApi} from "@/components/steps/api";
+import {getResearchUser} from "@/api/expense-manage";
 
 const route = useRoute()
 const schema = computed(() => {
@@ -94,14 +95,17 @@ const tableConfig = reactive({
       width:'80'
     },
     {
-      prop: 'name',
+      prop: 'time',
       label: '时间',
       align: 'center'
     },
     {
       prop: 'researchPersonnel',
       label: '研发人员',
-      align: 'center'
+      align: 'center',
+      currentRender:({row})=>{
+        return <span>{getResearchName(row.researchPersonnel)}</span>
+      }
     },
     {
       prop: 'wagesPayable',
@@ -117,24 +121,29 @@ const tableConfig = reactive({
       prop: 'reserveFund',
       label: '公积金',
       align: 'center'
-    },{
+    },
+    {
       prop: 'socialSecurity',
       label: '社保',
       align: 'center'
-    },{
+    },
+    {
       prop: 'annuity',
       label: '年金',
       align: 'center'
-    },{
+    },
+    {
       prop: 'workday',
       label: '工作日(天)',
       align: 'center'
-    },{
+    },
+    {
       prop: 'researchDuration',
       label: '研发工时(天)',
       align: 'center'
-    },{
-      prop: 'survey',
+    },
+    {
+      prop: 'subtotal',
       label: '小计',
       align: 'center'
     }
@@ -144,6 +153,21 @@ const tableConfig = reactive({
     projectId: route.query.id
   }
 })
+const researchOptions = ref([])
+const getResearchOptions = async () => {
+  const res = await getResearchUser()
+  researchOptions.value = res.data
+}
+const getResearchName=(id)=>{
+  if(!id)return;
+  let label=''
+  researchOptions.value.forEach(item=>{
+    if(item.value==id){
+      label=item.label
+    }
+  })
+  return label
+}
 const getBaseInfo = async () => {
   try {
     const {code, data} = await getBaseInfoApi(route.query.id)
@@ -152,6 +176,7 @@ const getBaseInfo = async () => {
   }
 }
 
+getResearchOptions()
 getBaseInfo()
 </script>
 
diff --git a/src/views/project-management/initiation/apply.vue b/src/views/project-management/initiation/apply.vue
index eceacdb..5ffb219 100644
--- a/src/views/project-management/initiation/apply.vue
+++ b/src/views/project-management/initiation/apply.vue
@@ -21,6 +21,7 @@
     <div class="oper-page-btn">
       <el-button color="#DED0B2" v-if="name==='Initiation/apply'" @click="handleSubmit(applyForm)">提交</el-button>
       <el-button color="#DED0B2" v-else @click="handleResubmit">重新提交</el-button>
+      <el-button @click="handleBack">返回</el-button>
     </div>
   </div>
 </template>
@@ -87,6 +88,9 @@ const loading = ref(false)
 const processInstanceData = ref()
 const processDiagramViewer = ref(true)
 const name = ref(router.currentRoute.value.name)
+const handleBack = () => {
+  history.back()
+}
 const handleDownload = (row) => {
   downloadFile(row.fileId).then(res => {
     const blob = new Blob([res])