From a62a16bd75310d50d0231f5ad724e59d77198e28 Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Thu, 2 Apr 2020 11:58:12 +0800
Subject: [PATCH] =?UTF-8?q?=E9=9A=8F=E6=89=8B=E8=AE=B0=E5=90=8E=E5=8F=B0?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E6=B7=BB=E5=8A=A0=E7=BB=84=E7=BB=87=E6=9C=BA?=
 =?UTF-8?q?=E6=9E=84=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/workRecord/dailyrecordinfo.vue    | 46 ++++++++++++++++---
 1 file changed, 40 insertions(+), 6 deletions(-)

diff --git a/src/views/modules/workRecord/dailyrecordinfo.vue b/src/views/modules/workRecord/dailyrecordinfo.vue
index 868c27e8..71cbb407 100644
--- a/src/views/modules/workRecord/dailyrecordinfo.vue
+++ b/src/views/modules/workRecord/dailyrecordinfo.vue
@@ -15,14 +15,24 @@
             </el-option>
           </el-select>
         </el-form-item>
+        </div>
         <el-form-item label="会议内容" prop="content" label-width="90px">
           <el-input v-model="dataForm.content" placeholder="会议内容" clearable maxlength="20" @keyup.native="btKeyUpContent" style="width:200px"></el-input>
         </el-form-item>
-        </div>
         <el-form-item label="发布人" prop="nickName" label-width="90px">
           <el-input v-model="dataForm.nickName" placeholder="发布人" clearable maxlength="10" @keyup.native="btKeyUpNickName" style="width:200px"></el-input>
         </el-form-item>
-        <el-form-item label="时间" prop="startTime" label-width="90px">
+        <div>
+        <el-form-item label="所属机构" label-width="90px">
+        <el-cascader
+          v-model="ids"
+          :options="options"
+          :props="{ checkStrictly: true }"
+          clearable
+        >
+        </el-cascader>
+        </el-form-item>
+        <el-form-item label="发布时间" prop="startTime" label-width="90px">
           <el-date-picker v-model="dataForm.startTime"
                           type="date"
                           :picker-options="pickerBeginDateBefore"
@@ -32,7 +42,7 @@
                           style="width:200px">
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="至" label-width="90px" prop="endTime">
+        <el-form-item label="至" prop="endTime">
           <el-date-picker v-model="dataForm.endTime"
                           type="date"
                           :picker-options="pickerBeginDateAfter"
@@ -55,8 +65,9 @@
           <el-button v-if="$hasPermission('news:dailyrecordinfo:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
         </el-form-item>
         <el-form-item>
-            <el-button type="primary" @click="exportHandle()">{{ $t('export') }}</el-button>
-          </el-form-item>
+          <el-button type="primary" @click="exportHandle()">{{ $t('export') }}</el-button>
+        </el-form-item>
+        </div>
       </el-form>
       <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
         <el-table-column label="序号" header-align="center" align="center" width="50px">
@@ -130,7 +141,9 @@ export default {
         id: ''
       },
       meetTypeArr: [],
-      dailyTypeArr: []
+      dailyTypeArr: [],
+      ids: [],
+      options: []
     }
   },
   components: {
@@ -139,8 +152,29 @@ export default {
   created: function () {
     this.getDailyTypeArrInfo('0')
     this.getDataList()
+    this.getOptions()
+  },
+  watch: {
+    ids: function (val) {
+      if (val.length === 0) {
+        this.dataForm.deptId = ''
+      } else {
+        this.dataForm.deptId = this.ids[val.length - 1]
+      }
+    }
   },
   methods: {
+    getOptions () {
+      this.$http
+        .get(`/sys/user/deptOptions/getByLoginUser`)
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          }
+          this.options = res.data.options
+        })
+        .catch(() => {})
+    },
     getDataListOverWrite () {
       this.page = 1
       this.getDataList()