From 4d53a9ae866e22dca1743a5dc0ea79f47e279495 Mon Sep 17 00:00:00 2001
From: Jackwang <wt373747285@163.com>
Date: Wed, 9 Dec 2020 17:16:33 +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=AA=8C?=
 =?UTF-8?q?=E6=94=B6=E3=80=91-=EF=BC=88=E7=8E=8B=E7=AB=A5=EF=BC=89-2020/12?=
 =?UTF-8?q?/9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../kpi/subpositioncheckinfo-acceptance.vue   | 34 ++++++++++---------
 1 file changed, 18 insertions(+), 16 deletions(-)

diff --git a/src/views/modules/kpi/subpositioncheckinfo-acceptance.vue b/src/views/modules/kpi/subpositioncheckinfo-acceptance.vue
index 7123cdaf..66460eab 100644
--- a/src/views/modules/kpi/subpositioncheckinfo-acceptance.vue
+++ b/src/views/modules/kpi/subpositioncheckinfo-acceptance.vue
@@ -1,13 +1,7 @@
 <template>
   <el-dialog :visible.sync="visible" :title="'处理'" :close-on-click-modal="false" :close-on-press-escape="false">
     <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'">
-<!--      <el-form-item label="审批状态" prop="checkResult" label-width="80px">-->
-<!--        <el-select v-model="dataForm.checkResult" placeholder="请选择" clearable>-->
-<!--          <el-option label="通过" value="3"> </el-option>-->
-<!--          <el-option label="驳回" value="4"> </el-option>-->
-<!--        </el-select>-->
-<!--      </el-form-item>-->
-      <el-form-item label="验收内容" prop="checkOpinion" style="overflow:hidden;">
+      <el-form-item label="验收内容" style="overflow:hidden;">
         <template>
           <div style="margin: 15px 0;"></div>
           <el-checkbox-group v-model="checkedItems" @change="handleCheckedCitiesChange">
@@ -17,6 +11,12 @@
           </el-checkbox-group>
         </template>
       </el-form-item>
+      <el-form-item label="审批" prop="checkResult" label-width="80px" >
+        <el-radio-group v-model="dataForm.checkResult">
+          <el-radio  :label="3">通过</el-radio>
+          <el-radio  :label="4">驳回</el-radio>
+        </el-radio-group>
+      </el-form-item>
       <el-form-item label="验收理由" prop="checkOpinion">
         <el-input
                 type="textarea"
@@ -46,7 +46,9 @@ export default {
       },
       acceptanceArray:[],
       checkedItems:[],
-      isAble: false
+      isAble: false,
+      checkedCount:'',
+      allCount:''
     }
   },
   computed: {
@@ -84,9 +86,7 @@ export default {
         if (res.code !== 0) {
           return this.$message.error(res.msg)
         }
-        console.log(this.dataForm);
         this.acceptanceArray = res.data
-        console.log(this.dataForm);
       }).catch(() => {})
     },
     handleCheckAllChange(val) {
@@ -94,18 +94,20 @@ export default {
       this.isIndeterminate = false;
     },
     handleCheckedCitiesChange(value) {
-        let checkedCount = value.length;
-        let allLength = this.acceptanceArray.length;
-        if(checkedCount != allLength){
-          console.log("未全选");
-        }
-      },
+
+    },
     // 表单提交
     dataFormSubmitHandle: debounce(function () {
       this.$refs['dataForm'].validate((valid) => {
         if (!valid) {
           return false
         }
+        //是否全选判断
+        this.allLength = this.acceptanceArray.length;
+        if(this.dataForm.checkResult===3 && this.checkedItems.length != this.allLength){
+          this.$message('通过请全选后提交！');
+          return false
+        }
         this.isAble = true
         this.$http['post']('/kpi/subpositioncheckinfo/acceptance', this.dataForm).then(({ data: res }) => {
           if (res.code !== 0) {