Bläddra i källkod

Merge branch 'V0.0.4' of http://10.87.21.221:8000/jzyd_yyds/soc_web into V0.0.4

luojun 1 år sedan
förälder
incheckning
51145ebfa4

+ 8 - 3
src/views/core/outIn/letter/dialog.addletter.vue

@@ -63,11 +63,12 @@
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="上传介绍信附件" prop="letterFile">
+              <el-form-item label="上传介绍信附件" ref="letterFile" prop="letterFile">
                 <K-file-upload
-                  ref="upload"
+                  ref="uploadFile"
                   :limit=2
                   :defaultValue="formFileListDefualtValue"
+                  @input="fileListChanged"
                   v-model="formData.letterFile"
                 />
               </el-form-item>
@@ -302,6 +303,10 @@ export default {
       this.userInfo.imgFile = list;
       this.$refs.userImgFile.clearValidate();
     },
+    fileListChanged(list)
+    {
+      this.$refs.letterFile.clearValidate();
+    },
     endDisabledDate(time) {
       //小于开始日期禁止选择
       let startDate = new Date();
@@ -331,7 +336,7 @@ export default {
     onHide() {
       this.isShow = false;
       this.formData = this.reset();
-      this.$refs["upload"].clearFiles();
+      this.$refs["uploadFile"].clearFiles();
     },
     onHideUser() {
       this.open = false;

+ 2 - 2
src/views/core/reportForms/selfInspectReport.vue

@@ -211,9 +211,9 @@ export default {
       );
     },
     handleExport() {
-      this.download('core/safetyInspectReport/export', {
+      this.download('core/safetyInspectReport/selfInspectExport', {
         ...this.queryParams
-      }, `${'【' + this.orgName + '】' + '-网点负责人统计报表-' + this.formatTime(new Date(), 'YYYYMMDD')}.xlsx`)
+      }, `${'【' + this.orgName + '】' + '-网点负责人自查统计报表-' + this.formatTime(new Date(), 'YYYYMMDD')}.xlsx`)
     },