Merge remote-tracking branch 'origin/develop' into develop

src/views/base/agent/components/EditTarget.vue

@@ -15,26 +15,26 @@
         </el-col>
         <el-col :span="12">
           <el-form-item label="Q1代理指标(万元)" prop="q1">
-            <el-input v-model.number="form.q1" style="width: 100%" />
+            <el-input-number v-model="form.q1" :min="0" :precision="2" style="width: 100%" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="Q2代理指标(万元)" prop="q2">
-            <el-input v-model.number="form.q2" style="width: 100%" />
+            <el-input-number v-model="form.q2" :min="0" :precision="2" style="width: 100%" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="Q3代理指标(万元)" prop="q3">
-            <el-input v-model.number="form.q3" style="width: 100%" />
+            <el-input-number v-model="form.q3" :min="0" :precision="2" style="width: 100%" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="Q4代理指标(万元)" prop="q4">
-            <el-input v-model.number="form.q4" style="width: 100%" />
+            <el-input-number v-model="form.q4" :min="0" :precision="2" style="width: 100%" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
@@ -86,7 +86,7 @@
         if (!row) {
           this.title = '新增指标'
         } else {
-          this.form = row
+          this.form = JSON.parse(JSON.stringify(row))
           this.form.year = '' + row.year
           this.title = '编辑指标'
         }