From 0812f6f6de4edb042d9e4a68d745b1e9011b8016 Mon Sep 17 00:00:00 2001
From: zhangyongzhangyong <2012005003@qq.coom>
Date: Mon, 27 Apr 2020 19:06:20 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9B=AE=E6=A0=87=E7=AE=A1=E7=90=86=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../streetpersiongoalmonth-add-or-update.vue  | 19 +++++-------
 .../modules/kpi/streetpersiongoalmonth.vue    | 31 ++++++++++++-------
 2 files changed, 28 insertions(+), 22 deletions(-)

diff --git a/src/views/modules/kpi/streetpersiongoalmonth-add-or-update.vue b/src/views/modules/kpi/streetpersiongoalmonth-add-or-update.vue
index dd87d47f..08537ea2 100644
--- a/src/views/modules/kpi/streetpersiongoalmonth-add-or-update.vue
+++ b/src/views/modules/kpi/streetpersiongoalmonth-add-or-update.vue
@@ -1,23 +1,20 @@
 <template>
   <el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false" width="30%" center>
-    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : '120px'">
+    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '130px' : '130px'">
           <el-form-item label="年月" prop="monthYear">
           <el-date-picker v-model="dataForm.monthYear"
-              type="month" clearable placeholder="选择月" style="width: 300px;" :disabled="dataForm.id?true:false"
+              type="month" clearable placeholder="选择月" :disabled="dataForm.id?true:false"
               value-format="yyyy-MM"  format="yyyy-MM">
           </el-date-picker>
       </el-form-item>
-          <el-form-item label="群众目标比例" prop="residentGoalNum">
-          <el-input v-model="dataForm.residentGoalNum" placeholder="群众目标数" style="width: 300px;"></el-input>
-          <span>%</span>
+          <el-form-item label="群众目标比例 %" prop="residentGoalNum">
+          <el-input-number v-model="dataForm.residentGoalNum" :min="0" label="群众目标数"></el-input-number>
       </el-form-item>
-          <el-form-item label="党员目标比例" prop="partyGoalNum">
-          <el-input v-model="dataForm.partyGoalNum" placeholder="党员目标数" style="width: 300px;"></el-input>
-          <span>%</span>
+          <el-form-item label="党员目标比例 %" prop="partyGoalNum">
+          <el-input-number v-model="dataForm.partyGoalNum" :min="0" label="党员目标数"></el-input-number>
       </el-form-item>
-          <el-form-item label="企业目标比例" prop="companyGoalNum">
-          <el-input v-model="dataForm.companyGoalNum" placeholder="企业目标数" style="width: 300px;"></el-input>
-          <span>%</span>
+          <el-form-item label="企业目标比例 %" prop="companyGoalNum">
+          <el-input-number v-model="dataForm.companyGoalNum" :min="0" label="企业目标数"></el-input-number>
       </el-form-item>
       </el-form>
     <template slot="footer">
diff --git a/src/views/modules/kpi/streetpersiongoalmonth.vue b/src/views/modules/kpi/streetpersiongoalmonth.vue
index a4123da3..240de973 100644
--- a/src/views/modules/kpi/streetpersiongoalmonth.vue
+++ b/src/views/modules/kpi/streetpersiongoalmonth.vue
@@ -26,11 +26,11 @@
       <el-dialog title="街道目标数设定" :visible.sync="dialogFormVisible" width="30%" center>
         <el-form :model="dataForm">
           <el-form-item label="目标比例" label-width="120px">
-            <el-input v-model="goalProportion" style="width: 300px;"></el-input>
-            <span>%</span>
+            <el-input-number v-model="goalProportion" :min="0" v-on:change="watchGoalProportion(goalProportion)"></el-input-number>
+            <span style="margin-left: 10px;">%</span>
           </el-form-item>
           <el-form-item label="目标人数" label-width="120px">
-            <el-input v-model="goalNumber" style="width: 300px;"></el-input>
+            <el-input-number v-model="goalNumber" :min="0"  v-on:change="watchGoalNumbern(goalNumber)"></el-input-number>
           </el-form-item>
         </el-form>
         <div slot="footer" class="dialog-footer">
@@ -75,17 +75,23 @@ export default {
     this.getStreetName()
     this.getStreetGoalScore()
   },
-  watch: {
-    // 根据目标比例 计算 目标数
-    goalProportion: function (val) {
-      if (val.length === 0) {
-        this.goalProportion = ''
+  methods: {
+    // 数据监听1
+    watchGoalProportion (goalProportion) {
+      if (this.goalProportion === 0) {
+        this.goalNumber = 0
       } else {
         this.goalNumber = Math.round(this.personBasicNumber * (this.goalProportion / 100))
       }
-    }
-  },
-  methods: {
+    },
+    // 数据监听2
+    watchGoalNumbern (goalNumber) {
+      if (this.goalNumber === 0) {
+        this.goalProportion = 0
+      } else {
+        this.goalProportion = Math.round(this.goalNumber / this.personBasicNumber * 100)
+      }
+    },
     // 获取街道目标表的街道名称
     getStreetName () {
       this.$http
@@ -121,6 +127,9 @@ export default {
       if (column.property === undefined || column.property === '') {
         return false
       }
+      if (row.isDisabled === '0') {
+        return false
+      }
       this.dialogFormVisible = true
       this.dataForm.streetId = columnId // 这里的街道ID格式为：1202869594882400257-PartyGoalNum
       // this.personBasicNumber = row[columnId] // 获取单元格的值