From 67bba038b5b621a9f46768efe92a88f38ab9f24c Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Wed, 9 Dec 2020 09:48:40 +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=E6=8F=90=E6=8A=A5=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=E3=80=91=E8=80=83=E6=A0=B8=E9=A1=B9=E9=85=8D=E7=BD=AE=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2-=E7=8E=8B=E5=85=AC=E5=B3=B0-2020-12-09?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/kpi/subauditrecordslog.vue  | 62 ++++++++++++-------
 .../kpi/subcheckdictionary-add-or-update.vue  | 15 +++--
 src/views/modules/kpi/subcheckdictionary.vue  | 16 ++++-
 3 files changed, 63 insertions(+), 30 deletions(-)

diff --git a/src/views/modules/kpi/subauditrecordslog.vue b/src/views/modules/kpi/subauditrecordslog.vue
index c7a0c8d9..a4d4bc8c 100644
--- a/src/views/modules/kpi/subauditrecordslog.vue
+++ b/src/views/modules/kpi/subauditrecordslog.vue
@@ -1,12 +1,15 @@
 <template>
   <el-card shadow="never" class="aui-card--fill">
     <div class="mod-news__subauditrecordslog}">
-      <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 :inline="true" :model="dataForm" @keyup.enter.native="getDataListSearch()">
+        <el-form-item label="流程节点" prop="processCode">
+          <el-select v-model="dataForm.processCode" placeholder="流程节点" clearable>
+            <el-option v-for="item in processCodeArr" :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-button type="success" @click="getDataListSearch()">{{ $t('query') }}</el-button>
         </el-form-item>
         <el-form-item>
           <el-button v-if="$hasPermission('news:subauditrecordslog:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
@@ -16,27 +19,22 @@
         </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="checkDeptId" label="审核部门ID" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="checkDeptNaem" label="审核部门名称" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="checkTime" label="审核时间" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="checkResult" label="审核结果（1：驳回；2：通过）" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="checkOpinion" label="审核意见" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="processCode" label="审核流程节点code(审批状态（1：提交；2：初审；3：验收；4：驳回)" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="processName" 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="createdTime" 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">
+        <el-table-column label="序号" header-align="center" align="center" width="50px">
           <template slot-scope="scope">
-            <el-button v-if="$hasPermission('news:subauditrecordslog:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
-            <el-button v-if="$hasPermission('news:subauditrecordslog:delete')" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
+            {{scope.$index+1}}
           </template>
         </el-table-column>
+        <el-table-column prop="checkDeptName" label="操作部门" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="checkTime" label="操作时间" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="processName" label="流程节点" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="checkResult" label="审核结果" header-align="center" align="center" :formatter="showFlagFormatter"></el-table-column>
+        <el-table-column prop="checkOpinion" 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:subauditrecordslog:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>-->
+            <!--<el-button v-if="$hasPermission('news:subauditrecordslog:delete')" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>-->
+          <!--</template>-->
+        <!--</el-table-column>-->
       </el-table>
       <el-pagination
         :current-page="page"
@@ -67,12 +65,28 @@ export default {
         deleteIsBatch: true
       },
       dataForm: {
-        id: ''
-      }
+        id: '',
+        processCode: ''
+      },
+      processCodeArr: [
+        { dictValue: '1', dictName: '提交' },
+        { dictValue: '2', dictName: '初审' },
+        { dictValue: '3', dictName: '验收' },
+        { dictValue: '4', dictName: '驳回' }
+      ]
     }
   },
   components: {
     AddOrUpdate
+  },
+  methods: {
+    showFlagFormatter: function (row, column) {
+      if (row.showFlag === '1') {
+        return '驳回'
+      } else if (row.showFlag === '2') {
+        return '通过'
+      }
+    }
   }
 }
 </script>
diff --git a/src/views/modules/kpi/subcheckdictionary-add-or-update.vue b/src/views/modules/kpi/subcheckdictionary-add-or-update.vue
index 6dc9be90..4438e9a6 100644
--- a/src/views/modules/kpi/subcheckdictionary-add-or-update.vue
+++ b/src/views/modules/kpi/subcheckdictionary-add-or-update.vue
@@ -7,9 +7,9 @@
         <!--<el-form-item label="考核类型" prop="checkType" label-width="100px">-->
             <!--<el-input v-model="dataForm.checkType" placeholder="考核类型" maxlength="32"></el-input>-->
         <!--</el-form-item>-->
-        <!--<el-form-item label="考核编码" prop="checkCode" label-width="100px">-->
-            <!--<el-input v-model="dataForm.checkCode" placeholder="考核编码" maxlength="32"></el-input>-->
-        <!--</el-form-item>-->
+        <el-form-item label="考核编码" prop="checkCode" label-width="100px">
+            <el-input v-model="dataForm.checkCode" placeholder="考核编码" maxlength="32"></el-input>
+        </el-form-item>
         <el-form-item prop="parentName" :label="$t('menu.parentName')" class="menu-list" label-width="100px">
             <el-popover v-model="resourceListVisible" ref="resourceListPopover" placement="bottom-start" trigger="click">
                 <el-tree :data="resourceList" :props="{ label: 'checkLabel', children: 'children' }" node-key="id"
@@ -21,6 +21,9 @@
                 <i v-if="dataForm.pid !== '0'" slot="suffix" @click.stop="deptListTreeSetDefaultHandle()" class="el-icon-circle-close el-input__icon"></i>
             </el-input>
         </el-form-item>
+        <el-form-item label="分数权重" prop="score" label-width="100px">
+            <el-input-number v-model="dataForm.score" controls-position="right" :min="0" :max="10" label="分数权重"></el-input-number>
+        </el-form-item>
         <el-form-item label="排序" prop="sort" label-width="100px">
             <el-input-number v-model="dataForm.sort" controls-position="right" :min="0" label="排序"></el-input-number>
         </el-form-item>
@@ -56,7 +59,8 @@ export default {
         checkLabel: '',
         showFlag: '1',
         checkDescribe: '',
-        sort: '0'
+        sort: '0',
+        score: 0
       },
       resourceListVisible: false,
       resourceList: [],
@@ -83,6 +87,9 @@ export default {
         ],
         sort: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        score: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
         ]
       }
     }
diff --git a/src/views/modules/kpi/subcheckdictionary.vue b/src/views/modules/kpi/subcheckdictionary.vue
index b9590106..42f82728 100644
--- a/src/views/modules/kpi/subcheckdictionary.vue
+++ b/src/views/modules/kpi/subcheckdictionary.vue
@@ -9,14 +9,15 @@
       <el-table v-loading="dataListLoading" :data="dataList" border style="width: 100%;">
         <table-tree-column prop="checkLabel" label="考核项名称" header-align="center" width="500" show-overflow-tooltip></table-tree-column>
         <!--<el-table-column prop="checkType" label="考核类型" header-align="center" align="center"></el-table-column>-->
-        <!--<el-table-column prop="checkCode" label="考核编码" header-align="center" align="center"></el-table-column>-->
+        <el-table-column prop="checkCode" label="考核编码" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="score" label="分数权重" header-align="center" align="center"></el-table-column>
         <el-table-column prop="showFlag" label="是否显示" header-align="center" align="center" :formatter="showFlagFormatter" width="200"></el-table-column>
         <el-table-column prop="sort" label="排序" header-align="center" align="center" width="200"></el-table-column>
         <el-table-column prop="checkDescribe" label="描述" header-align="center" show-overflow-tooltip></el-table-column>
         <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
           <template slot-scope="scope">
             <el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
-            <el-button type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
+            <el-button type="text" size="small" @click="deleteHandleNew(scope.row.id,scope.row.children,scope.row.checkLabel)">{{ $t('delete') }}</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -55,6 +56,17 @@ export default {
       } else if (row.showFlag === '1') {
         return '是'
       }
+    },
+    deleteHandleNew (id, children, checkLabel) {
+      if (children.length > 0) {
+        this.$alert('请先删除【' + checkLabel + '】子考核项', '删除提醒', {
+          confirmButtonText: '确定',
+          callback: action => {
+          }
+        })
+        return false
+      }
+      this.deleteHandle(id)
     }
   }
 }