Merge branch 'master' into test

src/views/ARTICLE/enterData.vue

@@ -3,7 +3,7 @@
     <div class="cmain">
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
         <el-form-item label="日期" prop="month">
-          <el-date-picker v-model="form.month" type="month" placeholder="选择日期" value-format="yyyy-MM">
+          <el-date-picker v-model="form.month" type="month" placeholder="选择日期" value-format="yyyy-MM" disabled>
           </el-date-picker>
         </el-form-item>
 
@@ -60,7 +60,7 @@ export default {
       form: {
         articleId: this.param.param.id,
         deptId: this.param.deptId,
-        month: "",
+        month: new Date().toISOString().slice(0, 7),
         plan: this.param.param.plan,
         price: "",
         schedule: "",
@@ -95,4 +95,4 @@ export default {
 </script>
 
 <style>
-</style>
+</style>

src/views/ARTICLE/index.vue

@@ -113,17 +113,16 @@
         label="实际完成投资额(万)"
         align="center"
         prop="reality"
-        width="130px"
       >
         <template slot-scope="scope">
           {{ scope.row.reality }}
         </template>
       </el-table-column>
-      <el-table-column label="年度投资完成百分比" align="center" prop="retio">
+      <el-table-column label="投资完成百分比" align="center" prop="retio">
         <template slot-scope="scope">
           {{
             scope.row.retio
-              ? scope.row.retio.toFixed(2) * 100 + "%"
+              ? (scope.row.retio * 100).toFixed(2) + "%"
               : scope.row.retio
           }}
         </template>