From 07fe51032d67a01c03bfbcd2fdfbf8176438e9b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=86=8A=E6=88=90=E5=BC=BA?= <xiongchengqiang@linzikg.com>
Date: Thu, 12 Nov 2020 16:33:01 +0800
Subject: [PATCH] youhua

---
 src/style/common.less                         |  4 +-
 .../components/UseButton/index.vue            | 36 ++++++++-----
 .../edit/components/ApprovalList.vue          | 52 +++++++++++++------
 .../edit/components/ConfirmList.vue           | 49 +++++++++++------
 .../assessmentGroup/edit/components/Score.vue |  4 +-
 .../edit/components/ScoreList.vue             | 52 +++++++++++++------
 6 files changed, 136 insertions(+), 61 deletions(-)

diff --git a/src/style/common.less b/src/style/common.less
index 4c5c2ff..2e454af 100644
--- a/src/style/common.less
+++ b/src/style/common.less
@@ -12,7 +12,9 @@
   font-size: 14px;
   color: #52575b;
 }
-
+.add{
+  cursor: pointer;
+}
 .pre{
   pre{
     white-space:pre-line;
diff --git a/src/views/kpi/assessment/performance/components/UseButton/index.vue b/src/views/kpi/assessment/performance/components/UseButton/index.vue
index 798955d..dfa0cc7 100644
--- a/src/views/kpi/assessment/performance/components/UseButton/index.vue
+++ b/src/views/kpi/assessment/performance/components/UseButton/index.vue
@@ -1,13 +1,16 @@
 <!--  -->
 <template>
     <div>
-      <div style="display:inline-block;margin:0 4px;" v-for="(i,index) in authList" :key="index">
-         <el-button size="mini"
-          v-if="i.info && formList.auth[[i.permis]]"
-          :disabled='formList[i.permis]===1'
-          @click="i.click"
-          :plain='i.plain'
-          type="primary">{{i.name}}</el-button>
+      <div
+      style="display:inline-block;margin:0 4px;"
+      v-for="(i,index) in authList.filter(i=>i.info)"
+      :key="index">
+             <el-button size="mini"
+                v-if="info?info[i.permis]:formList.auth[i.permis]"
+                :disabled='formList[i.permis]===1'
+                @click="i.click"
+                :plain='i.plain'
+                type="primary">{{i.name}}</el-button>
       </div>
 
       <!-- <el-button size="mini" v-if="!info" @click="handlePingfen" type="primary">开始评分</el-button>
@@ -75,43 +78,43 @@ export default {
       authList: [
         {
           name: '催办',
-          info: !this.info,
           plain: true,
           type: 'primary',
+          info: !this.info,
           permis: 'toFast',
           click: this.handleCuiban
         },
         {
           name: '结果值录入',
-          info: !this.info,
           type: 'primary',
+          info: !this.info,
           permis: 'resultInput',
           click: this.handleJieguo
         },
         {
           name: '开始评分',
-          info: !this.info,
           type: 'primary',
+          info: !this.info,
           permis: 'editScore',
           click: this.handlePingfen
         },
         {
           name: '制定目标',
-          info: !this.info,
           type: 'primary',
+          info: !this.info,
           permis: 'keyInput',
           click: this.handleZhiding
         },
         {
           name: '同 意',
-          info: !this.info,
           type: 'primary',
+          info: !this.info,
           permis: 'keyCheck',
           click: this.handleTongyi
         }, {
           name: '驳 回',
-          info: !this.info,
           type: 'primary',
+          info: !this.info,
           permis: 'reject',
           click: this.handleBohui
         }, {
@@ -127,6 +130,13 @@ export default {
           type: 'primary',
           permis: 'tiaozhuang',
           click: this.handleZhuanjiao
+        }, {
+          name: '转 交',
+          plain: true,
+          info: !this.info,
+          type: 'primary',
+          permis: 'tiaozhuang',
+          click: this.handleZhuanjiao
         }
       ],
       dialogFormVisible: false,
diff --git a/src/views/kpi/workbench/assessmentGroup/edit/components/ApprovalList.vue b/src/views/kpi/workbench/assessmentGroup/edit/components/ApprovalList.vue
index b0e0ade..be65d5e 100644
--- a/src/views/kpi/workbench/assessmentGroup/edit/components/ApprovalList.vue
+++ b/src/views/kpi/workbench/assessmentGroup/edit/components/ApprovalList.vue
@@ -129,13 +129,14 @@ export default {
   methods: {
     // 将传入的数值复现
     handleListFor (list) {
+      console.log('list: ', list)
       if (list.length === 0) return []
       list = list.map(i => {
         i.isShow = false
         i = Object.assign({}, this.handleOptType(i), i)
         i.isActive = (i.optType === 0 || i.optType === -1) ? i.optType : 1
         i.roleDtos = JSON.parse(JSON.stringify(this.roleDtos)).map(j => {
-          j.checked = i.roleIds ? i.roleIds.includes(String(j.id)) : false
+          j.checked = i.roleIds ? i.roleIds.includes(String(j.roleId)) : false
           return j
         })
         return i
@@ -192,9 +193,17 @@ export default {
     },
     // 添加流程
     handleAdd () {
+      const a = this.handleGetList(this.list)
+      let index = -1
+      for (let i in [1, 2, 3, 4, 5, 6, 7]) {
+        if (!a.some(j => j.optType === [1, 2, 3, 4, 5, 6, 7][i])) {
+          index = [1, 2, 3, 4, 5, 6, 7][i]
+          break
+        }
+      }
       const isC = this.list.some(i => i.isCick)
       const params = {
-        optType: 1,
+        optType: index === -1 ? 7 : index,
         name: this.options[0].name,
         stepType: 0,
         isActive: 1,
@@ -213,20 +222,31 @@ export default {
       this.$forceUpdate()
     },
     handleDelete (item) {
-      if (item.id) {
-        item.isDelete = 1
-      } else {
-        this.list = this.list.filter(i => i !== item)
-      }
-      if (this.handleGetList().length === 1) {
-        this.itemInfo = {}
-      }
-      if (!this.list.some(i => i.isCick && !i.isDelete)) {
-        if (this.list[0]) {
-          this.list[0].isCick = true
-          this.itemInfo = this.list[0]
+      this.$confirm('此操作将永久删除, 是否继续?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        if (item.id) {
+          item.isDelete = 1
+        } else {
+          this.list = this.list.filter(i => i !== item)
         }
-      }
+        if (this.handleGetList().length === 1) {
+          this.itemInfo = {}
+        }
+        if (!this.list.some(i => i.isCick && !i.isDelete)) {
+          if (this.list[0]) {
+            this.list[0].isCick = true
+            this.itemInfo = this.list[0]
+          }
+        }
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消删除'
+        })
+      })
     },
     handleIsEmit (n) {
       n.map(i => {
@@ -248,12 +268,14 @@ export default {
     list: {
       deep: true,
       handler (n, o) {
+        console.log('n22: ', n)
         this.handleIsEmit(JSON.parse(JSON.stringify(n)))
       }
     },
     itemInfo: {
       deep: true,
       handler (n, o) {
+        console.log('(n: ', (n))
         const arr = n
         if (arr.isActive !== 0 && arr.isActive !== -1) {
           if (arr.optType < 1) arr.optType = 1
diff --git a/src/views/kpi/workbench/assessmentGroup/edit/components/ConfirmList.vue b/src/views/kpi/workbench/assessmentGroup/edit/components/ConfirmList.vue
index f16d2ad..9db3b06 100644
--- a/src/views/kpi/workbench/assessmentGroup/edit/components/ConfirmList.vue
+++ b/src/views/kpi/workbench/assessmentGroup/edit/components/ConfirmList.vue
@@ -141,7 +141,7 @@ export default {
         console.log('i: ', i)
         i.isActive = (i.optType === 0 || i.optType === -1) ? i.optType : 1
         i.roleDtos = JSON.parse(JSON.stringify(this.roleDtos)).map(j => {
-          j.checked = i.roleIds ? i.roleIds.includes(String(j.id)) : false
+          j.checked = i.roleIds ? i.roleIds.includes(String(j.roleId)) : false
           return j
         })
         return i
@@ -199,9 +199,17 @@ export default {
     },
     // 添加流程
     handleAdd () {
+      const a = this.handleGetList(this.list)
+      let index = -1
+      for (let i in [1, 2, 3, 4, 5, 6, 7]) {
+        if (!a.some(j => j.optType === [1, 2, 3, 4, 5, 6, 7][i])) {
+          index = [1, 2, 3, 4, 5, 6, 7][i]
+          break
+        }
+      }
       const isC = this.list.some(i => i.isCick)
       const params = {
-        optType: 1,
+        optType: index === -1 ? 7 : index,
         name: this.options[0].name,
         stepType: 0,
         isActive: 1,
@@ -222,20 +230,31 @@ export default {
       console.log('this.list: ', this.list)
     },
     handleDelete (item) {
-      if (item.id) {
-        item.isDelete = 1
-      } else {
-        this.list = this.list.filter(i => i !== item)
-      }
-      if (this.handleGetList().length === 1) {
-        this.itemInfo = {}
-      }
-      if (!this.list.some(i => i.isCick && !i.isDelete)) {
-        if (this.list[0]) {
-          this.list[0].isCick = true
-          this.itemInfo = this.list[0]
+      this.$confirm('此操作将永久删除, 是否继续?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        if (item.id) {
+          item.isDelete = 1
+        } else {
+          this.list = this.list.filter(i => i !== item)
         }
-      }
+        if (this.handleGetList().length === 1) {
+          this.itemInfo = {}
+        }
+        if (!this.list.some(i => i.isCick && !i.isDelete)) {
+          if (this.list[0]) {
+            this.list[0].isCick = true
+            this.itemInfo = this.list[0]
+          }
+        }
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消删除'
+        })
+      })
     },
     handleIsEmit (n) {
       let arr = JSON.parse(JSON.stringify(n))
diff --git a/src/views/kpi/workbench/assessmentGroup/edit/components/Score.vue b/src/views/kpi/workbench/assessmentGroup/edit/components/Score.vue
index 39d908b..385dc43 100644
--- a/src/views/kpi/workbench/assessmentGroup/edit/components/Score.vue
+++ b/src/views/kpi/workbench/assessmentGroup/edit/components/Score.vue
@@ -53,7 +53,9 @@ export default {
         console.log('n: ', n)
         let weight1 = 0
         n.chartDetails.recordSimpleDtos.map(i => {
-          weight1 = weight1 + Number(i.weight1)
+          if (i.isDelete !== 1) {
+            weight1 = weight1 + Number(i.weight1)
+          }
         })
         this.$emit('update:info', Object.assign({}, this.info, this.form, {label: n.chartDetails.status ? '权重评分:' + weight1 + '%' : '已禁用'}))
         // console.log('info: ', this.info)
diff --git a/src/views/kpi/workbench/assessmentGroup/edit/components/ScoreList.vue b/src/views/kpi/workbench/assessmentGroup/edit/components/ScoreList.vue
index 5f29454..a84c1e1 100644
--- a/src/views/kpi/workbench/assessmentGroup/edit/components/ScoreList.vue
+++ b/src/views/kpi/workbench/assessmentGroup/edit/components/ScoreList.vue
@@ -140,7 +140,7 @@ export default {
         i = Object.assign({}, this.handleOptType(i), i)
         i.isActive = i.optType === 0 ? 0 : 1
         i.roleDtos = JSON.parse(JSON.stringify(this.roleDtos)).map(j => {
-          j.checked = i.roleIds ? i.roleIds.includes(String(j.id)) : false
+          j.checked = i.roleIds ? i.roleIds.includes(String(j.roleId)) : false
           return j
         })
         return i
@@ -195,9 +195,17 @@ export default {
     },
     // 添加流程
     handleAdd () {
+      const a = this.handleGetList(this.list)
+      let index = -1
+      for (let i in [1, 2, 3, 4, 5, 6, 7]) {
+        if (!a.some(j => j.optType === [1, 2, 3, 4, 5, 6, 7][i])) {
+          index = [1, 2, 3, 4, 5, 6, 7][i]
+          break
+        }
+      }
       const isC = this.list.some(i => i.isCick)
       const params = {
-        optType: 1,
+        optType: index === -1 ? 7 : index,
         name: this.options[0].name,
         stepType: 0,
         isActive: 1,
@@ -218,20 +226,31 @@ export default {
       this.$forceUpdate()
     },
     handleDelete (item) {
-      if (item.id) {
-        item.isDelete = 1
-      } else {
-        this.list = this.list.filter(i => i !== item)
-      }
-      if (this.handleGetList().length === 1) {
-        this.itemInfo = {}
-      }
-      if (!this.list.some(i => i.isCick && !i.isDelete)) {
-        if (this.list[0]) {
-          this.list[0].isCick = true
-          this.itemInfo = this.list[0]
+      this.$confirm('此操作将永久删除, 是否继续?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        if (item.id) {
+          item.isDelete = 1
+        } else {
+          this.list = this.list.filter(i => i !== item)
         }
-      }
+        if (this.handleGetList().length === 1) {
+          this.itemInfo = {}
+        }
+        if (!this.list.some(i => i.isCick && !i.isDelete)) {
+          if (this.list[0]) {
+            this.list[0].isCick = true
+            this.itemInfo = this.list[0]
+          }
+        }
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消删除'
+        })
+      })
     },
     handleIsEmit (n) {
       n.map(i => {
@@ -241,8 +260,9 @@ export default {
         })
         i.roleIds = i.roleIds.substring(0, i.roleIds.length - 1)
         i.label = '权重评分：' + i.weight1 + '%'
+        return i
       })
-      this.$emit('update:info', this.list)
+      this.$emit('update:info', n)
       this.$forceUpdate()
     }
   },