From f6909cfb97c30b3d8a5a2ce24f5676617d268a7d Mon Sep 17 00:00:00 2001
From: Jackwang <wt373747285@163.com>
Date: Wed, 9 Dec 2020 09:45:12 +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=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E8=B7=B3=E8=BD=AC=E3=80=91-=EF=BC=88=E7=8E=8B?=
 =?UTF-8?q?=E7=AB=A5=EF=BC=89-2020/12/9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/kpi/subpositioncheckinfo.vue      | 30 ++++++++++++++-----
 .../modules/kpi/subpositioncheckinforoute.vue | 29 ++++++++++++++++++
 2 files changed, 52 insertions(+), 7 deletions(-)
 create mode 100644 src/views/modules/kpi/subpositioncheckinforoute.vue

diff --git a/src/views/modules/kpi/subpositioncheckinfo.vue b/src/views/modules/kpi/subpositioncheckinfo.vue
index 15fe73be..fe8d130d 100644
--- a/src/views/modules/kpi/subpositioncheckinfo.vue
+++ b/src/views/modules/kpi/subpositioncheckinfo.vue
@@ -1,7 +1,7 @@
 <template>
   <el-card shadow="never" class="aui-card--fill">
     <div class="mod-kpi__subpositioncheckinfo}">
-      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataListSearch()">
         <el-form-item label="所属机构" label-width="75px">
           <el-cascader v-model="deptIdList"
                        :options="options"
@@ -9,7 +9,7 @@
                        clearable
                        style="width:200px"></el-cascader>
         </el-form-item>
-        <el-form-item label="系统状态" prop="decision" label-width="90px">
+        <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>
@@ -54,7 +54,12 @@
         </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 label="序号" header-align="center" align="center" width="50px">
+          <template slot-scope="scope">
+            {{scope.$index+1}}
+          </template>
+        </el-table-column>
+<!--        <el-table-column type="selection" header-align="center" align="center" width="50"></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>
@@ -63,8 +68,13 @@
         <el-table-column prop="approvalTime" 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('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>
+            <el-button type="text" size="small" @click="addHandle(scope.row.id,scope.row.status)">{{ '查看' }}</el-button>
+            <el-button v-if="scope.row.delShow" type="text" size="small" @click="openHandle(scope.row.id)">{{ '修改' }}</el-button>
+            <el-button v-if="$hasPermission('sub:check:tiral')" type="text" size="small" @click="openHandle(scope.row.id)">{{ '初审' }}</el-button>
+            <el-button v-if="$hasPermission('sub:check:acceptance')" type="text" size="small" @click="openHandle(scope.row.id)">{{ '验收' }}</el-button>
+            <el-button v-if="scope.row.delShow" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ '删除' }}</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>
@@ -139,11 +149,17 @@ export default {
   watch: {
     'deptIdList': function (val) {
       if (val.length !== 0) {
-        this.dataForm.gridId = val[val.length - 1]
+        this.dataForm.deptId = val[val.length - 1]
       } else {
-        this.dataForm.gridId = ''
+        this.dataForm.deptId = ''
       }
     }
+  },
+  methods: {
+    addHandle (id, status) {
+      this.$parent.selectComponent = 'Kpisubpositiondetail'
+      this.$router.push({ path: '/kpi-subpositioncheckinforoute', query: { id: id, status: status } })
+    },
   }
 }
 </script>
diff --git a/src/views/modules/kpi/subpositioncheckinforoute.vue b/src/views/modules/kpi/subpositioncheckinforoute.vue
new file mode 100644
index 00000000..025e6caf
--- /dev/null
+++ b/src/views/modules/kpi/subpositioncheckinforoute.vue
@@ -0,0 +1,29 @@
+<template>
+    <keep-alive include="subpositioncheckinfo">
+        <component :is="selectComponent"></component>
+    </keep-alive>
+</template>
+<script>
+import Subpositioncheckinfo from './subpositioncheckinfo'
+import Kpisubpositiondetail from './kpisubpositiondetail'
+export default {
+  data () {
+    return {
+      selectComponent: Subpositioncheckinfo
+    }
+  },
+  components: {
+      Subpositioncheckinfo,
+      Kpisubpositiondetail
+  },
+  methods: {
+    init () {
+      this.selectComponent = Subpositioncheckinfo
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+
+</style>