youhua

src/utils/elementConfig.js

@@ -36,7 +36,8 @@ import {
     Loading,
     Image,
     Transfer,
-  Avatar
+    Avatar,
+    Progress
 } from 'element-ui'
 
 Vue.prototype.$loading = Loading
@@ -44,6 +45,7 @@ Vue.prototype.$message = Message
 Vue.prototype.$confirm = MessageBox.confirm
 Vue.prototype.$alert = MessageBox.alert
 
+Vue.use(Progress)
 Vue.use(Transfer)
 Vue.use(Tabs)
 Vue.use(TabPane)

src/views/kpi/assessment/goals/index.vue

@@ -18,15 +18,16 @@
                        :name="String(i.id)">
             <div class="goals-content-tabbar-table">
               <div class="goals-content-tabbar-table-header commonFont">
-                <span style="width:30%">指标名称</span>
+                <span style="width:20%">指标名称</span>
                 <span class="kaohe"
                       style="width:30%">考核标准</span>
-                <span style="width:30%">权重</span>
+                <span style="width:20%">进度</span>
-                <span style="width:10%">操作</span>
+                <span style="width:10%">权重</span>
+                <span style="width:20%">操作</span>
               </div>
               <div style="justify-content:center;"
                    v-if="handleFilter(i.detailDtos).length===0"
-                   class="goals-content-tabbar-table-content commonFont items">
+                   class="zanwu goals-content-tabbar-table-content commonFont items">
                 暂无指标
               </div>
               <draggable v-model="i.tagetLibItems"
@@ -34,7 +35,8 @@
                 <div class="goals-content-tabbar-table-content commonFont items"
                      v-for="(j,indexJ) in handleFilter(i.detailDtos)"
                      :key="indexJ">
-                  <div style="width:30%"
+                  <div class="goals-content-tabbar-table-content-top">
+                    <div style="width:20%"
                          class="my-handle"><img style="width:20px;height:20px;"
                            src="@/assets/img/yidong.png"
                            alt="">{{j.target}}</div>
@@ -42,8 +44,19 @@
                          class="kaohe">
                       <pre>{{j.keyResult}}</pre>
                     </div>
-                  <div style="width:30%">{{ Math.round((j.checkWeight * 100)*1000)/1000}}%</div>
+                    <div style="width:20%">
-                  <div style="width:10%">
+                      <el-progress type="circle"
+                                   :width='50'
+                                   :stroke-width='4'
+                                   :percentage="25"></el-progress>
+                    </div>
+                    <div style="width:10%">{{ Math.round((j.checkWeight * 100)*1000)/1000}}%</div>
+                    <div style="width:20%">
+                      <el-button @click="hanidleAddTask(j,indexJ,index)"
+                                 type="text"
+                                 size="small">
+                        添加任务
+                      </el-button>
                       <el-button @click="hanidleEdit(j,indexJ,index)"
                                  type="text"
                                  size="small">
@@ -56,6 +69,20 @@
                       </el-button>
                     </div>
                   </div>
+                  <div class="goals-content-tabbar-table-content-bottom">
+                    <div>ss</div>
+                    <div style="width:10%">
+                      <el-button type="text"
+                                 size="small">
+                        编辑
+                      </el-button>
+                      <el-button type="text"
+                                 size="small">
+                        删除
+                      </el-button>
+                    </div>
+                  </div>
+                </div>
               </draggable>
               <div style=" padding: 10px;font-size:16px;"
                    class="commonFont">
@@ -79,6 +106,35 @@
         </el-tabs>
       </div>
     </div>
+    <popup-right v-if="showTask"
+                 @cancel='handleCancelTask'
+                 @submit="handleSubmitTask"
+                 :title="taskTitle">
+      <div slot="content"
+           class="weiduManage">
+        <el-form label-position="left"
+                 ref="formTask"
+                 :model="formTask"
+                 :rules="formTask"
+                 label-width="180px">
+          <el-form-item prop="target"
+                        label='指标名称'>
+            <el-input clearable
+                      size="small"
+                      v-model="formTask.target"></el-input>
+          </el-form-item>
+          <el-form-item label="进度"
+                        prop="weight">
+            <el-input size="small"
+                      @blur="$handleBlur('formTask.checkWeight')"
+                      @input.native="$handleInputInt('formTask.checkWeight')"
+                      v-model="formTask.checkWeight">
+              <template slot="append">%</template>
+            </el-input>
+          </el-form-item>
+        </el-form>
+      </div>
+    </popup-right>
     <popup-right v-if="showIndicators"
                  @cancel='handleCancelZhibiao'
                  @submit="handleSubmitZhibiao"
@@ -149,6 +205,9 @@ import { apiResultGetDetail, apiSaveDetail, apiSaveapproval } from '@/api/assess
 export default {
   data () {
     return {
+      showTask: false,
+      taskTitle: '添加任务',
+      formTask: {},
       zhibiaoTitle: '添加指标',
       showIndicators: false,
       dimensionsList: [],
@@ -204,6 +263,19 @@ export default {
     this.handleGetTbale()
   },
   methods: {
+    // 取消添加任务
+    handleCancelTask () {
+
+    },
+    // 提交添加任务
+    handleSubmitTask () {
+
+    },
+    hanidleAddTask (j, indexJ, index) {
+      !j.arr && (j.arr = [])
+      this.showTask = true
+      console.log(j)
+    },
     handleNumber (item) {
       return item.detailDtos ? item.detailDtos.filter(i => !i.isDelete).length : 0
     },
@@ -453,18 +525,36 @@ export default {
           }
         }
         &-content {
-          display: flex;
-          padding: 20px 0;
           // align-items: center;
           // height: 60px;
+          &-top {
             border-bottom: 1px solid @borderColor;
-          justify-content: space-between;
+            display: flex;
-          div {
+            align-items: center;
+            justify-content: flex-end;
+            padding: 20px 0;
+            > div {
               padding: 0 0 0 20px;
             }
           }
+          &-bottom {
+            padding: 10px 20px 10px 0;
+            border-bottom: 1px solid @borderColor;
+            display: flex;
+            align-items: center;
+            justify-content: space-between;
+            margin: 0 0 0 20px;
+            > div {
+              flex-shrink: 0;
             }
           }
         }
+      }
+    }
+  }
+  .zanwu {
+    .center();
+    padding: 20px 0;
+  }
 }
 </style>

src/views/kpi/assessment/performance/components/UseButton/index.vue

@@ -338,7 +338,7 @@ export default {
         }
       }
 
-      const obj = { status: 1, menuName: '同意了' }
+      const obj = { status: 1, menuName: '同意了', comment: form.comment }
       const params = Object.assign({}, { resultRecordId: this.$route.query.id || '' }, obj)
       let res = await apiSaveapproval(params)
       if (res.code !== 200) {
@@ -356,7 +356,7 @@ export default {
         type: 'success'
       })
       this.dialogFormVisible = false
-      // history.go(0)
+      history.go(0)
     },
     // 驳回
     handleBohui () {