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

project/qujing/app/AppCurriculumManage/components/List.vue

@@ -57,7 +57,7 @@
       <ai-dialog
         :visible.sync="isShow"
         @onConfirm="onConfirm"
-        @onClose="onClose"
+        @close="onClose"
         width="890px"
         title="审核">
         <el-form class="ai-form" :model="form" label-width="120px" ref="form">

project/qujing/app/AppExaminationManage/components/List.vue

@@ -51,7 +51,7 @@
       <ai-dialog
         :visible.sync="isShow"
         @onConfirm="onConfirm"
-        @onClose="onClose"
+        @close="onClose"
         width="890px"
         title="审核">
         <el-form class="ai-form" :model="form" label-width="120px" ref="form">
@@ -61,8 +61,8 @@
               <el-radio label="1">是</el-radio>
             </el-radio-group>
           </el-form-item>
-          <el-form-item prop="opinion" label="审批意见" :rules="[{required: true, message: '请输入审批意见', trigger: 'blur'}]">
+          <el-form-item prop="opinion" label="审批意见" style="width: 100%" :rules="[{required: true, message: '请输入审批意见', trigger: 'blur'}]">
-            <el-input size="small" type="textarea" :rows="3" v-model="form.opinion" clearable placeholder="请输入审批意见"></el-input>
+            <el-input size="small" type="textarea" :rows="5" v-model="form.opinion" clearable placeholder="请输入审批意见"></el-input>
           </el-form-item>
         </el-form>
       </ai-dialog>

project/qujing/app/AppResidentCredits/AppResidentCredits.vue

@@ -71,7 +71,9 @@
       },
 
       onAreaChange () {
-        this.$refs.List[0].refresh()
+        this.$nextTick(() => {
+          this.$refs.List[0].refresh()
+        })
       }
     }
   }