From d2bcb53e5a39e5652d6da5f5827e354dca38d527 Mon Sep 17 00:00:00 2001
From: Jackwang <wt373747285@163.com>
Date: Tue, 8 Dec 2020 10:31:20 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E7=BD=91=E6=A0=BC=E5=AE=9E=E4=BD=93?=
 =?UTF-8?q?=E5=8C=96=E8=BF=90=E4=BD=9C=E3=80=91-=E3=80=90=E9=98=B5?=
 =?UTF-8?q?=E5=9C=B0=E5=BB=BA=E8=AE=BE=E5=88=97=E8=A1=A8=E3=80=91-?=
 =?UTF-8?q?=EF=BC=88=E7=8E=8B=E7=AB=A5=EF=BC=89-2020/12/8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../subpositioncheckinfo-add-or-update.vue    |   4 +-
 .../modules/kpi/subpositioncheckinfo.vue      | 119 ++++++++++++++----
 2 files changed, 96 insertions(+), 27 deletions(-)

diff --git a/src/views/modules/kpi/subpositioncheckinfo-add-or-update.vue b/src/views/modules/kpi/subpositioncheckinfo-add-or-update.vue
index e9142cfa..926f2b1e 100644
--- a/src/views/modules/kpi/subpositioncheckinfo-add-or-update.vue
+++ b/src/views/modules/kpi/subpositioncheckinfo-add-or-update.vue
@@ -143,7 +143,7 @@ export default {
     },
     // 获取信息
     getInfo () {
-      this.$http.get(`/news/subpositioncheckinfo/${this.dataForm.id}`).then(({ data: res }) => {
+      this.$http.get(`/kpi/subpositioncheckinfo/${this.dataForm.id}`).then(({ data: res }) => {
         if (res.code !== 0) {
           return this.$message.error(res.msg)
         }
@@ -159,7 +159,7 @@ export default {
         if (!valid) {
           return false
         }
-        this.$http[!this.dataForm.id ? 'post' : 'put']('/news/subpositioncheckinfo/', this.dataForm).then(({ data: res }) => {
+        this.$http[!this.dataForm.id ? 'post' : 'put']('/kpi/subpositioncheckinfo/', this.dataForm).then(({ data: res }) => {
           if (res.code !== 0) {
             return this.$message.error(res.msg)
           }
diff --git a/src/views/modules/kpi/subpositioncheckinfo.vue b/src/views/modules/kpi/subpositioncheckinfo.vue
index af21d363..15fe73be 100644
--- a/src/views/modules/kpi/subpositioncheckinfo.vue
+++ b/src/views/modules/kpi/subpositioncheckinfo.vue
@@ -1,42 +1,70 @@
 <template>
   <el-card shadow="never" class="aui-card--fill">
-    <div class="mod-news__subpositioncheckinfo}">
+    <div class="mod-kpi__subpositioncheckinfo}">
       <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
-        <el-form-item>
-          <el-input v-model="dataForm.id" placeholder="id" clearable></el-input>
+        <el-form-item label="所属机构" label-width="75px">
+          <el-cascader v-model="deptIdList"
+                       :options="options"
+                       :props="{ checkStrictly: true }"
+                       clearable
+                       style="width:200px"></el-cascader>
+        </el-form-item>
+        <el-form-item label="系统状态" prop="decision" label-width="90px">
+          <el-select v-model="dataForm.status" placeholder="请选择" clearable>
+            <el-option label="提交" value="1"> </el-option>
+            <el-option label="初审" value="2"> </el-option>
+            <el-option label="验收" value="3"> </el-option>
+            <el-option label="驳回" value="4"> </el-option>
+          </el-select>
+        </el-form-item>
+        <br>
+        <el-form-item label="提交时间"
+                      prop="startTime" label-width="75px">
+          <el-date-picker v-model="dataForm.startTime"
+                          type="date"
+                          :picker-options="pickerBeginDateBefore"
+                          value-format="yyyy-MM-dd"
+                          format="yyyy-MM-dd"
+                          placeholder="选择日期时间"
+                          style="width:200px"
+                          @change="changeTime">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="至"
+                      label-width="25px"
+                      prop="endTime">
+          <el-date-picker v-model="dataForm.endTime"
+                          type="date"
+                          :picker-options="pickerBeginDateAfter"
+                          value-format="yyyy-MM-dd"
+                          format="yyyy-MM-dd"
+                          placeholder="选择日期时间"
+                          style="width:200px"
+                          @change="changeTime">
+          </el-date-picker>
         </el-form-item>
         <el-form-item>
-          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
+          <el-button type="success" @click="getDataListSearch()">{{ $t('query') }}</el-button>
         </el-form-item>
         <el-form-item>
-          <el-button v-if="$hasPermission('news:subpositioncheckinfo:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
+          <el-button v-if="$hasPermission('kpi:subpositioncheckinfo:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
         </el-form-item>
         <el-form-item>
-          <el-button v-if="$hasPermission('news:subpositioncheckinfo:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
+          <el-button v-if="$hasPermission('kpi:subpositioncheckinfo:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
         </el-form-item>
       </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="id" label="主键" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="communityId" label="社区ID" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="communityName" label="社区名称" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="gridIds" label="关联网格ID" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="gridNames" label="关联网格名称" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="communityName" label="社区" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="gridNames" label="关联网格" header-align="center" align="center"></el-table-column>
         <el-table-column prop="submitTime" label="提交时间" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="status" label="审批状态（1：提交；2：初审；3：验收；4：驳回）" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="approvalDeptId" label="审批部门ID" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="approvalDeptName" label="审批部门名称" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="statusName" label="审批状态" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="approvalDeptName" label="审批部门" header-align="center" align="center"></el-table-column>
         <el-table-column prop="approvalTime" label="审批时间" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="delFlag" label="逻辑删除标识" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="revision" label="乐观锁" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="createdBy" label="创建人" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="createdTime1" label="创建时间" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="updatedBy" label="更新人" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="updatedTime" label="更新时间" header-align="center" align="center"></el-table-column>
         <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
           <template slot-scope="scope">
-            <el-button v-if="$hasPermission('news:subpositioncheckinfo:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
-            <el-button v-if="$hasPermission('news:subpositioncheckinfo:delete')" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
+            <el-button v-if="$hasPermission('kpi:subpositioncheckinfo:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
+            <el-button v-if="$hasPermission('kpi:subpositioncheckinfo:delete')" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -63,18 +91,59 @@ export default {
   data () {
     return {
       mixinViewModuleOptions: {
-        getDataListURL: '/news/subpositioncheckinfo/page',
+        getDataListURL: '/kpi/subpositioncheckinfo/page',
         getDataListIsPage: true,
-        deleteURL: '/news/subpositioncheckinfo',
+        deleteURL: '/kpi/subpositioncheckinfo',
         deleteIsBatch: true
       },
       dataForm: {
-        id: ''
+        id: '',
+        status:'',
+        startTime:'',
+        endTime:''
+      },
+      deptIdList: [],
+      pickerBeginDateBefore: {
+        disabledDate: (time) => {
+          let beginDateVal = this.dataForm.endTime;
+          if (beginDateVal) {
+            return time.getTime() > new Date(beginDateVal + ' 00:00:00').getTime()
+          }
+        }
+      },
+      pickerBeginDateAfter: {
+        disabledDate: (time) => {
+          let EndDateVal = this.dataForm.startTime;
+          if (EndDateVal) {
+            return time.getTime() < new Date(EndDateVal + ' 00:00:00').getTime()
+          }
+        }
       }
     }
   },
+  created () {
+    this.$http
+            .get(`/sys/user/deptOptions/getMiddleByLoginUser`)
+            .then(({ data: res }) => {
+              if (res.code !== 0) {
+                return this.$message.error(res.msg)
+              }
+              this.options = res.data.options
+            })
+            .catch(() => { })
+    this.initTime()
+  },
   components: {
     AddOrUpdate
+  },
+  watch: {
+    'deptIdList': function (val) {
+      if (val.length !== 0) {
+        this.dataForm.gridId = val[val.length - 1]
+      } else {
+        this.dataForm.gridId = ''
+      }
+    }
   }
 }
 </script>