From cc96795795377b6a0687d42e29a3ef8f674cc9ba Mon Sep 17 00:00:00 2001
From: chen <2280784283@qq.com>
Date: Tue, 30 Jul 2024 15:32:42 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=B8=80=E4=B8=AA=E4=B8=AA?=
 =?UTF-8?q?=E4=BA=BA=E5=91=A8=E6=8A=A5=E6=B7=BB=E5=8A=A0=E7=95=8C=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/projectManagements/weekly/ExpenseClaimApply.vue | 2 +-
 ...eClaimApplyNewAdd.vue => ExpenseClaimApplyAddList.vue} | 4 ++--
 .../weekly/projectBudget/ProjectBudgetApply.vue           | 8 +++++---
 kehui-oa-front/src/router/index.js                        | 8 ++++----
 4 files changed, 12 insertions(+), 10 deletions(-)
 rename kehui-oa-front/src/pages/projectManagements/weekly/{ExpenseClaimApplyNewAdd.vue => ExpenseClaimApplyAddList.vue} (99%)

diff --git a/kehui-oa-front/src/pages/projectManagements/weekly/ExpenseClaimApply.vue b/kehui-oa-front/src/pages/projectManagements/weekly/ExpenseClaimApply.vue
index bd4b620..cd79811 100644
--- a/kehui-oa-front/src/pages/projectManagements/weekly/ExpenseClaimApply.vue
+++ b/kehui-oa-front/src/pages/projectManagements/weekly/ExpenseClaimApply.vue
@@ -78,7 +78,7 @@ export default {
   },
   methods: {
     addExpApply () {
-      this.$router.push({name: 'AddClaimApply'})
+      this.$router.push({name: 'AddListClaimApply'})
     },
     init () {
       let userId = getItem('userId')
diff --git a/kehui-oa-front/src/pages/projectManagements/weekly/ExpenseClaimApplyNewAdd.vue b/kehui-oa-front/src/pages/projectManagements/weekly/ExpenseClaimApplyAddList.vue
similarity index 99%
rename from kehui-oa-front/src/pages/projectManagements/weekly/ExpenseClaimApplyNewAdd.vue
rename to kehui-oa-front/src/pages/projectManagements/weekly/ExpenseClaimApplyAddList.vue
index e92d8e6..b6fd280 100644
--- a/kehui-oa-front/src/pages/projectManagements/weekly/ExpenseClaimApplyNewAdd.vue
+++ b/kehui-oa-front/src/pages/projectManagements/weekly/ExpenseClaimApplyAddList.vue
@@ -277,7 +277,7 @@ export default {
                     model: {
                       projectNo: '',
                       projectName: '',
-                      weekLoad: '',
+                      workload: '',
                       week: '',
                       thisWeek: '',
                       nextWeek: '',
@@ -304,7 +304,7 @@ export default {
                       {
                         type: 'custom-input',
                         title: '工作量(人日)',
-                        model: 'weekLoad',
+                        model: 'workload',
                         span: 5,
                         externalValue: {}
                       },
diff --git a/kehui-oa-front/src/pages/projectManagements/weekly/projectBudget/ProjectBudgetApply.vue b/kehui-oa-front/src/pages/projectManagements/weekly/projectBudget/ProjectBudgetApply.vue
index 9bc74ab..27ff703 100644
--- a/kehui-oa-front/src/pages/projectManagements/weekly/projectBudget/ProjectBudgetApply.vue
+++ b/kehui-oa-front/src/pages/projectManagements/weekly/projectBudget/ProjectBudgetApply.vue
@@ -42,6 +42,7 @@ import DataForm from '../../../../components/form/DataForm.vue'
 import DataTable from '../../../../components/DataTable.vue'
 import Api from '../../../../server/index.js'
 import {getItem} from '../../../../config/mUtils.js'
+import moment from "moment";
 
 export default {
   beforeRouteEnter (to, from, next) {
@@ -102,8 +103,9 @@ export default {
               budget: dataList[i].budget,
               execute: dataList[i].execute,
               implementationRate: dataList[i].implementationRate,
-              updatedAt: dataList[i].updatedAt
+              createdAt: moment(new Date(dataList[i].createdAt)).format("YYYY-MM-DD HH:mm:ss")
             })
+            this.tableTotalPage = result.data.total
           }
         }
       })
@@ -191,8 +193,8 @@ export default {
           show: true
         },
         {
-          label: '修改时间',
-          prop: 'updatedAt',
+          label: '创建时间',
+          prop: 'createdAt',
           show: true
         }
       ]
diff --git a/kehui-oa-front/src/router/index.js b/kehui-oa-front/src/router/index.js
index 9782f68..1673f7a 100644
--- a/kehui-oa-front/src/router/index.js
+++ b/kehui-oa-front/src/router/index.js
@@ -318,7 +318,7 @@ const DispatchDetails = r => require.ensure([], () => r(require('../pages/projec
 //周报填报
 const WeeklyClaimApply = r => require.ensure([], () => r(require('../pages/projectManagements/weekly/ExpenseClaimApply.vue')), 'WeeklyClaimApply')
 const AddClaimApply = r => require.ensure([], () => r(require('../pages/projectManagements/weekly/ExpenseClaimApplyAdd.vue')), 'AddClaimApply')
-const NewAddClaimApply = r => require.ensure([], () => r(require('../pages/projectManagements/weekly/ExpenseClaimApplyNewAdd.vue')), 'NewAddClaimApply')
+const AddListClaimApply = r => require.ensure([], () => r(require('../pages/projectManagements/weekly/ExpenseClaimApplyAddList.vue')), 'AddListClaimApply')
 const ClaimApplyDetail = r => require.ensure([], () => r(require('../pages/projectManagements/weekly/ExpenseClaimApplyDetail.vue')), 'ClaimApplyDetail')
 const ProjectBudgetApply = r => require.ensure([], () => r(require('../pages/projectManagements/weekly/projectBudget/ProjectBudgetApply.vue')), 'ProjectBudgetApply')
 const ProjectBudgetApplyAdd = r => require.ensure([], () => r(require('../pages/projectManagements/weekly/projectBudget/ProjectBudgetApplyAdd.vue')), 'ProjectBudgetApplyAdd')
@@ -2301,9 +2301,9 @@ export default new Router({
         },
         {
           //项目管理-->周报填报-->新增周报1
-          name: 'NewAddClaimApply',
-          path: '/project/managements/weekly/expenses/claim/apply/newAdd',
-          component: NewAddClaimApply,
+          name: 'AddListClaimApply',
+          path: '/project/managements/weekly/expenses/claim/apply/AddList',
+          component: AddListClaimApply,
           meta: {
             info: 'WeeklyManagements',
             module: 'project'