From c005793e6c1ec755362aeef1a8039f5c71338bf8 Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Sat, 8 Feb 2020 13:16:10 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B7=AF=E7=94=B1=E7=AE=A1=E7=90=86=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/custom/evaluatedept.vue     |  5 +++-
 .../modules/custom/evaluatedeptroute.vue      | 30 +++++++++++++++++++
 src/views/modules/custom/evaluateinfo.vue     |  2 +-
 src/views/modules/custom/evaluateofficer.vue  | 11 +++++++
 src/views/modules/custom/evaluateoption.vue   |  7 ++++-
 5 files changed, 52 insertions(+), 3 deletions(-)
 create mode 100644 src/views/modules/custom/evaluatedeptroute.vue

diff --git a/src/views/modules/custom/evaluatedept.vue b/src/views/modules/custom/evaluatedept.vue
index 49e147aa..f5703725 100644
--- a/src/views/modules/custom/evaluatedept.vue
+++ b/src/views/modules/custom/evaluatedept.vue
@@ -72,10 +72,13 @@ export default {
     AddOrUpdate,
     Evaluateofficer
   },
+  created: function () {
+    this.getDataList()
+  },
   methods: {
     manageHandle (deptId) {
       this.$parent.selectComponent = 'Evaluateofficer'
-      this.$router.push({ path: '/custom-evaluateofficer', query: { deptId: deptId } })
+      this.$router.push({ path: '/custom-evaluatedeptroute', query: { deptId: deptId } })
     }
   }
 }
diff --git a/src/views/modules/custom/evaluatedeptroute.vue b/src/views/modules/custom/evaluatedeptroute.vue
new file mode 100644
index 00000000..3d3e8761
--- /dev/null
+++ b/src/views/modules/custom/evaluatedeptroute.vue
@@ -0,0 +1,30 @@
+<template>
+    <keep-alive include="evaluatedept">
+        <component :is="selectComponent"></component>
+    </keep-alive>
+</template>
+<script>
+import Evaluatedept from './evaluatedept'
+import Evaluateofficer from './evaluateofficer'
+
+export default {
+    data () {
+        return {
+            selectComponent: Evaluatedept
+        }
+    },
+    components: {
+        Evaluatedept,
+        Evaluateofficer
+    },
+    methods: {
+        init () {
+            this.selectComponent = Evaluatedept
+        }
+    }
+}
+</script>
+
+<style lang="scss" scoped>
+
+</style>
diff --git a/src/views/modules/custom/evaluateinfo.vue b/src/views/modules/custom/evaluateinfo.vue
index c10964e0..37cd71e4 100644
--- a/src/views/modules/custom/evaluateinfo.vue
+++ b/src/views/modules/custom/evaluateinfo.vue
@@ -46,7 +46,7 @@
           <template slot-scope="scope">
             {{scope.$index+1}}
           </template>
-        </el-table-column>s
+        </el-table-column>
         <el-table-column prop="fullName" label="提交人姓名" header-align="center" align="center"></el-table-column>
         <el-table-column prop="mobile" label="联系电话" header-align="center" align="center"></el-table-column>
         <el-table-column prop="roleCode" label="评价类别" :formatter="formatState" header-align="center" align="center"></el-table-column>
diff --git a/src/views/modules/custom/evaluateofficer.vue b/src/views/modules/custom/evaluateofficer.vue
index f5f58c37..5fcebfc6 100644
--- a/src/views/modules/custom/evaluateofficer.vue
+++ b/src/views/modules/custom/evaluateofficer.vue
@@ -5,6 +5,11 @@
         <!-- <el-form-item>
           <el-input v-model="dataForm.id" placeholder="id" clearable></el-input>
         </el-form-item> -->
+        <div>
+        <el-form-item>
+          <el-button type="primary" @click="backToDeptList">返回</el-button>
+        </el-form-item>
+        </div>
         <el-form-item label="干部名称" prop="fullName">
           <el-input v-model="dataForm.fullName" placeholder="干部名称" clearable></el-input>
         </el-form-item>
@@ -115,6 +120,7 @@ export default {
   mounted () {
     // this.dataForm.id = this.$route.query.id
     this.dataForm.deptId = this.$route.query.deptId
+    this.getDataList()
   },
   components: {
     AddOrUpdate,
@@ -131,6 +137,11 @@ export default {
         return '男'
       }
     },
+    backToDeptList () {
+      this.$emit('refreshDataList')
+      this.$parent.selectComponent = 'Evaluatedept'
+      this.$router.push({ path: '/custom-evaluatedeptroute'})
+    },
     evaluateofficerAddHandle (deptId) {
       this.evaluateofficerAddVisible = true
       this.$nextTick(() => {
diff --git a/src/views/modules/custom/evaluateoption.vue b/src/views/modules/custom/evaluateoption.vue
index 00a5bd9d..9c92d10c 100644
--- a/src/views/modules/custom/evaluateoption.vue
+++ b/src/views/modules/custom/evaluateoption.vue
@@ -26,7 +26,12 @@
       </el-form>
       <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
         <!-- <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column> -->
-        <el-table-column prop="sort" label="序号" header-align="center" align="center"></el-table-column>
+        <el-table-column label="序号" header-align="center" align="center" width="50px">
+          <template slot-scope="scope">
+            {{scope.$index+1}}
+          </template>
+        </el-table-column>
+        <el-table-column prop="sort" label="排序" header-align="center" align="center"></el-table-column>
         <el-table-column prop="optionContent" label="评价选项" header-align="center" align="center"></el-table-column>
         <el-table-column prop="roleCode" label="类别" header-align="center" align="center" :formatter="showFlagFormat"></el-table-column>
         <el-table-column prop="available" label="操作" header-align="center" align="center">