提交

src/layout/components/Navbar.vue

@@ -154,8 +154,10 @@ export default {
       this.$router.push(`/login?redirect=${this.$route.fullPath}`)
     },
     sideTabChange(index, item) {
+      console.log()
+      const token = getToken()
       if (item.href) {
-        window.open(`${item.href}?token=${getToken()}`)
+        window.open(`${item.href}?token=${token}`)
         return
       }
       this.sideMenuTabIndex = index

src/views/goaf/alert/accept.vue

@@ -10,7 +10,7 @@
       <el-col :span="16" class="button-group">
         <div class="select-search right">
           <el-cascader
-            v-model="conditions.reviewGroupId"
+            v-model="conditions.acceptGroupId"
             :options="treeData"
             :props="{ checkStrictly: true, emitPath: false }"
             style="min-width: 160px"
@@ -24,7 +24,7 @@
               <span v-if="!node.isLeaf"> ({{ data.children.length }}) </span>
             </template>
           </el-cascader>
-          <el-select v-model="conditions.reviewAccountId" style="width:100px;margin:0 10px" filterable clearable placeholder="执行人">
+          <el-select v-model="conditions.acceptAccountId" style="width:100px;margin:0 10px" filterable clearable placeholder="执行人">
             <el-option v-for="item in userList" :key="item.accountId" :value="item.accountId" :label="item.accountName" />
           </el-select>
           <el-select v-model="conditions.hdangerLevel" style="width: 80px;" filterable placeholder="级别" clearable>
@@ -184,8 +184,8 @@ export default {
         goafOrebelt: undefined,
         goafOrebody: undefined,
         goafOreheight: undefined,
-        reviewGroupId: undefined,
-        reviewAccountId: undefined,
+        acceptGroupId: undefined,
+        acceptAccountId: undefined,
         hdangerLevel: undefined
       },
       goafList: [],

src/views/goaf/alert/activity/Accept.vue

@@ -195,6 +195,14 @@ export default {
       }
       this.formData.acceptRemark = flow.data.actionRemark
       this.formData.attachList = flow.data.attachList
+
+      this.formData.acceptAccountId = flow.user.accountIdTo
+      this.formData.acceptAccountName = flow.user.accountNameTo
+      this.formData.acceptGroupId = flow.user.groupIdTo
+      this.formData.acceptGroupName = flow.user.groupNameTo
+      this.formData.acceptPositionId = flow.user.positionIdTo
+      this.formData.acceptPositionName = flow.user.positionNameTo
+
       updateDanger(this.formData).then((resp) => {
         const { code, msg } = resp
         if (code === 0) {

src/views/goaf/alert/activity/Rectify.vue

@@ -223,6 +223,13 @@ export default {
       this.formData.rectifyRemark = flow.data.actionRemark
       this.formData.attachList = flow.data.attachList
 
+      this.formData.rectifyAccountId = flow.user.accountIdTo
+      this.formData.rectifyAccountName = flow.user.accountNameTo
+      this.formData.rectifyGroupId = flow.user.groupIdTo
+      this.formData.rectifyGroupName = flow.user.groupNameTo
+      this.formData.rectifyPositionId = flow.user.positionIdTo
+      this.formData.rectifyPositionName = flow.user.positionNameTo
+
       updateDanger(this.formData).then((resp) => {
         const { code, msg } = resp
         if (code === 0) {

src/views/goaf/alert/activity/Review.vue

@@ -198,6 +198,14 @@ export default {
       }
       this.formData.reviewRemark = flow.data.actionRemark
       this.formData.attachList = flow.data.attachList
+
+      this.formData.reviewAccountId = flow.user.accountIdTo
+      this.formData.reviewAccountName = flow.user.accountNameTo
+      this.formData.reviewGroupId = flow.user.groupIdTo
+      this.formData.reviewGroupName = flow.user.groupNameTo
+      this.formData.reviewPositionId = flow.user.positionIdTo
+      this.formData.reviewPositionName = flow.user.positionNameTo
+
       updateDanger(this.formData).then((resp) => {
         const { code, msg } = resp
         if (code === 0) {

src/views/goaf/alert/rectify.vue

@@ -10,7 +10,7 @@
       <el-col :span="16" class="button-group">
         <div class="select-search right">
           <el-cascader
-            v-model="conditions.reviewGroupId"
+            v-model="conditions.rectifyGroupId"
             :options="treeData"
             :props="{ checkStrictly: true, emitPath: false }"
             style="min-width: 160px"
@@ -24,7 +24,7 @@
               <span v-if="!node.isLeaf"> ({{ data.children.length }}) </span>
             </template>
           </el-cascader>
-          <el-select v-model="conditions.reviewAccountId" style="width:100px;margin:0 10px" filterable clearable placeholder="执行人">
+          <el-select v-model="conditions.rectifyAccountId" style="width:100px;margin:0 10px" filterable clearable placeholder="执行人">
             <el-option v-for="item in userList" :key="item.accountId" :value="item.accountId" :label="item.accountName" />
           </el-select>
           <el-select v-model="conditions.hdangerLevel" style="width: 80px;" filterable placeholder="级别" clearable>
@@ -184,8 +184,8 @@ export default {
         goafOrebelt: undefined,
         goafOrebody: undefined,
         goafOreheight: undefined,
-        reviewGroupId: undefined,
-        reviewAccountId: undefined,
+        rectifyGroupId: undefined,
+        rectifyAccountId: undefined,
         hdangerLevel: undefined
       },
       goafList: [],

src/views/goaf/danger/activity/Accept.vue

@@ -195,6 +195,14 @@ export default {
       }
       this.formData.acceptRemark = flow.data.actionRemark
       this.formData.attachList = flow.data.attachList
+
+      this.formData.acceptAccountId = flow.user.accountIdTo
+      this.formData.acceptAccountName = flow.user.accountNameTo
+      this.formData.acceptGroupId = flow.user.groupIdTo
+      this.formData.acceptGroupName = flow.user.groupNameTo
+      this.formData.acceptPositionId = flow.user.positionIdTo
+      this.formData.acceptPositionName = flow.user.positionNameTo
+
       updateDanger(this.formData).then((resp) => {
         const { code, msg } = resp
         if (code === 0) {

src/views/goaf/danger/activity/Rectify.vue

@@ -223,6 +223,13 @@ export default {
       this.formData.rectifyRemark = flow.data.actionRemark
       this.formData.attachList = flow.data.attachList
 
+      this.formData.rectifyAccountId = flow.user.accountIdTo
+      this.formData.rectifyAccountName = flow.user.accountNameTo
+      this.formData.rectifyGroupId = flow.user.groupIdTo
+      this.formData.rectifyGroupName = flow.user.groupNameTo
+      this.formData.rectifyPositionId = flow.user.positionIdTo
+      this.formData.rectifyPositionName = flow.user.positionNameTo
+
       updateDanger(this.formData).then((resp) => {
         const { code, msg } = resp
         if (code === 0) {

src/views/goaf/danger/activity/Review.vue

@@ -198,6 +198,14 @@ export default {
       }
       this.formData.reviewRemark = flow.data.actionRemark
       this.formData.attachList = flow.data.attachList
+
+      this.formData.reviewAccountId = flow.user.accountIdTo
+      this.formData.reviewAccountName = flow.user.accountNameTo
+      this.formData.reviewGroupId = flow.user.groupIdTo
+      this.formData.reviewGroupName = flow.user.groupNameTo
+      this.formData.reviewPositionId = flow.user.positionIdTo
+      this.formData.reviewPositionName = flow.user.positionNameTo
+
       updateDanger(this.formData).then((resp) => {
         const { code, msg } = resp
         if (code === 0) {