linyk пре 2 година
родитељ
комит
bd099f6be4

+ 1 - 2
src/components/commons/Header2.0.vue

@@ -26,7 +26,6 @@
                     </el-link>
                   </router-link>
                 </el-dropdown-item>
-                <el-dropdown-item v-if="rolesPermissions.isSystemAdministrator || rolesPermissions.isRegionalAdmin">
                 <el-dropdown-item>
                   <router-link :to="{ path:'/bookkeeptest'}">
                     <el-link icon="el-icon-user" :underline="false">
@@ -34,7 +33,7 @@
                     </el-link>
                   </router-link>
                 </el-dropdown-item>
-                <el-dropdown-item v-if="rolesPermissions.isSystemAdministrator">
+                <el-dropdown-item v-if="rolesPermissions.isSystemAdministrator || rolesPermissions.isRegionalAdmin">
                   <router-link :to="{ name: 'AuthenticationManage'}">
                     <el-link icon="el-icon-view" :underline="false">
                       审核认证信息

+ 12 - 11
src/components/task/Task.vue

@@ -976,17 +976,18 @@ export default {
     },
     //结束任务
     endTask() {
-      this.$confirm('确认结束任务?', '提示', {
-        confirmButtonText: '确认结束',
-        cancelButtonText: '取消',
-        type: 'success'
-      }).then(() => {
-        this.getTaskDetail()
-        this.showLoading()
-        ensureEndTask(this.projectId, this.taskId, this.endTaskSuccess, this.endTaskFail)
-      }).catch(() => {
-
-      })
+      // this.$confirm('确认结束任务?', '提示', {
+      //   confirmButtonText: '确认结束',
+      //   cancelButtonText: '取消',
+      //   type: 'success'
+      // }).then(() => {
+      //   this.getTaskDetail()
+      //   this.showLoading()
+      //   ensureEndTask(this.projectId, this.taskId, this.endTaskSuccess, this.endTaskFail)
+      // }).catch(() => {
+      //
+      // })
+      this.$router.push({name: 'TaskAmountCalPage', params: {taskCode: this.taskId}})
     },
     //结束任务成功时的回调函数
     endTaskSuccess(res) {

+ 2 - 1
src/pages/Amount/TaskAmountCal.vue

@@ -221,7 +221,7 @@ export default {
         .replace('{defectExciationAmount}', this.taskAmount.defectExciationAmount)
         .replace('{extraRewardAmount}', this.taskAmount.extraRewardAmount)).then((res) => {
         this.taskAmount = res.data
-        this.canSubmit = this.taskAmount.status === 3
+        this.canSubmit = this.taskAmount.status !== 4
       }).catch((error) => {
         console.error(error)
         notify('error', '获取任务金额数据失败:系统异常')
@@ -251,6 +251,7 @@ export default {
       Http.post(Api.TASKAMOUNT.CAL_AND_END, postData).then((res) => {
         if (res.code === 20000) {
           notify('success', '提交成功')
+          this.canSubmit = false
         } else {
           notify('error', '提交失败')
         }

+ 9 - 10
src/router/index.js

@@ -557,18 +557,17 @@ export default new Router({
       name: 'CompanyListPage',
       path: '/companys',
       component: resolve => require(['@/pages/Company/Companys.vue'], resolve)
-    }
     },
     //Test
-    {
-      path: '/bookeep',
-      name: 'TestBookKeep',
-      component: resolve => require(['@/pages/BookKeep/Test.vue'], resolve),
-      meta: {
-        title: '',
-        requireAuth: false,
-      }
-    },
+    // {
+    //   path: '/bookeep',
+    //   name: 'TestBookKeep',
+    //   component: resolve => require(['@/pages/BookKeep/Test.vue'], resolve),
+    //   meta: {
+    //     title: '',
+    //     requireAuth: false,
+    //   }
+    // },
     {
       path: '/bookkeeptest',
       name: 'TestBookKeep',