From 221d7fd8df8585c2a16c0f4796018dc0c80c01eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E9=A3=9E?= <lipengfei@outlook.com>
Date: Thu, 20 Feb 2020 19:32:36 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=AF=E7=94=A8=E7=8A=B6=E6=80=81=E9=80=89?=
 =?UTF-8?q?=E9=A1=B9=E5=A2=9E=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/custom/evaluateinfo.vue     | 35 ++++++++++++++++---
 src/views/modules/custom/evaluateofficer.vue  | 16 +++++++++
 .../modules/custom/evaluateofficercount.vue   | 16 +++++++++
 src/views/modules/custom/evaluateoption.vue   | 12 ++++++-
 4 files changed, 74 insertions(+), 5 deletions(-)

diff --git a/src/views/modules/custom/evaluateinfo.vue b/src/views/modules/custom/evaluateinfo.vue
index a4c04b87..c608d843 100644
--- a/src/views/modules/custom/evaluateinfo.vue
+++ b/src/views/modules/custom/evaluateinfo.vue
@@ -32,10 +32,11 @@
             </el-date-picker>
           </el-form-item>
           <el-form-item label="评价状态">
-            <el-select v-model="dataForm.roleCode" placeholder="评价状态" clearable>
-              <el-option label="点赞" :value="1"></el-option>
-              <el-option label="吐槽" :value="2"></el-option>
-            </el-select></el-form-item>
+            <el-select v-model="dataForm.roleCode" placeholder="评价状态" clearable=true>
+              <el-option v-for="item in roleFlagArr" :key="item.dictValue" :label="item.dictName" :value="item.dictValue">
+              </el-option>
+            </el-select>
+          </el-form-item>
           <el-form-item>
             <el-button @click="getDataList()">{{ $t('query') }}</el-button>
           </el-form-item>
@@ -112,11 +113,29 @@ export default {
         endTime: '',
         roleCode: ''
       },
+      roleFlagArr: [],
       optionList: [],
+      pickerBeginDateBefore: {
+        disabledDate: (time) => {
+          let beginDateVal = this.dataForm.startTime
+          if (beginDateVal) {
+            return time.getTime() > new Date(beginDateVal).getTime()
+          }
+        }
+      },
+      pickerBeginDateAfter: {
+        disabledDate: (time) => {
+          let EndDateVal = this.dataForm.endTime
+          if (EndDateVal) {
+            return time.getTime() < new Date(EndDateVal).getTime()
+          }
+        }
+      }
     }
   },
   created: function () {
     this.getOptionsList()
+    this.getRoleListInfo()
   },
   mounted () {
     this.dataForm.id = this.$route.query.id
@@ -132,6 +151,14 @@ export default {
         this.optionList = res.data.optionList
       }).catch(() => {})
     },
+    getRoleListInfo () {
+      this.$http.get(`/custom/evaluateoption/listSimple`).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.roleFlagArr = res.data
+      }).catch(() => {})
+    },
     backToOfficerList () {
       this.$emit('refreshDataList')
       this.$parent.selectComponent = 'EvaluateOfficerCountList'
diff --git a/src/views/modules/custom/evaluateofficer.vue b/src/views/modules/custom/evaluateofficer.vue
index f738ad84..f79775b2 100644
--- a/src/views/modules/custom/evaluateofficer.vue
+++ b/src/views/modules/custom/evaluateofficer.vue
@@ -116,6 +116,22 @@ export default {
         id: '',
         deptId: ''
       },
+      pickerBeginDateBefore: {
+        disabledDate: (time) => {
+          let beginDateVal = this.dataForm.startTime
+          if (beginDateVal) {
+            return time.getTime() > new Date(beginDateVal).getTime()
+          }
+        }
+      },
+      pickerBeginDateAfter: {
+        disabledDate: (time) => {
+          let EndDateVal = this.dataForm.endTime
+          if (EndDateVal) {
+            return time.getTime() < new Date(EndDateVal).getTime()
+          }
+        }
+      },
       evaluateofficerAddVisible: false,
       upLoadUrl: ''
     }
diff --git a/src/views/modules/custom/evaluateofficercount.vue b/src/views/modules/custom/evaluateofficercount.vue
index 26501997..b780b318 100644
--- a/src/views/modules/custom/evaluateofficercount.vue
+++ b/src/views/modules/custom/evaluateofficercount.vue
@@ -97,6 +97,22 @@ export default {
         sort: '',
         startTime: '',
         endTime: ''
+      },
+      pickerBeginDateBefore: {
+        disabledDate: (time) => {
+          let beginDateVal = this.dataForm.startTime
+          if (beginDateVal) {
+            return time.getTime() > new Date(beginDateVal).getTime()
+          }
+        }
+      },
+      pickerBeginDateAfter: {
+        disabledDate: (time) => {
+          let EndDateVal = this.dataForm.endTime
+          if (EndDateVal) {
+            return time.getTime() < new Date(EndDateVal).getTime()
+          }
+        }
       }
     }
   },
diff --git a/src/views/modules/custom/evaluateoption.vue b/src/views/modules/custom/evaluateoption.vue
index 79be1e8b..9f0ea0ab 100644
--- a/src/views/modules/custom/evaluateoption.vue
+++ b/src/views/modules/custom/evaluateoption.vue
@@ -14,6 +14,13 @@
             </el-option>
           </el-select>
         </el-form-item>
+        <el-form-item label="状态" prop="available">
+          <el-select v-model="dataForm.available" placeholder="状态" clearable>
+            <el-option label="停用" :value="0"></el-option>
+            <el-option label="启用" :value="1"></el-option>
+          </el-select>
+
+        </el-form-item>
         <el-form-item>
           <el-button @click="getDataList()">{{ $t('query') }}</el-button>
         </el-form-item>
@@ -77,7 +84,10 @@ export default {
         deleteIsBatch: true
       },
       dataForm: {
-        id: ''
+        id: '',
+        optionContent: '',
+        roleCode: '',
+        available: ''
       },
       roleFlagArr: []
     }