修复校验规则失效

src/views/culturalRelic/components/InfoEditDialog.vue

@@ -20,6 +20,7 @@
           class="basic-info"
           :rules="rules"
           ref="form"
+          status-icon
         >
           <el-row :gutter="50">
             <el-col :span="12">
@@ -210,7 +211,6 @@
               <el-form-item
                 label="文物封面"
                 :label-width="formLabelWidth"
-                prop="faceImage"
               >
                 <ManualUploader
                   :files="faceImage"
@@ -367,6 +367,23 @@ export default {
     },
   },
   data() {
+    let that = this;
+    var checkFaceImage = (rule, value, callback) => {
+      if (that.faceImage.length == 0) {
+        // this.$message.info('请上传封面')
+        return callback(new Error("请上传封面"));
+      } else {
+        callback();
+      }
+    };
+
+    var checkIntro = (rule, value, callback) => {
+      if (!value) {
+        return callback(new Error("请填写馆藏介绍"));
+      } else {
+        callback();
+      }
+    };
     return {
       dialogForm: {
         ...this.form,
@@ -381,8 +398,8 @@ export default {
       images: [],
       videos: [],
       audios: [],
-      culturalRelicTextureType: "",
-      culturalRelicYears: "",
+      culturalRelicTextureType: [],
+      culturalRelicYears: [],
       culturalRelicYearsProps: {
         value: "value",
         label: "label",
@@ -405,15 +422,18 @@ export default {
       },
       rules: {
         name: [{ required: true, message: "请输入文物名称", trigger: "blur" }],
-        faceImage: [
-          { required: true, message: "请上传封面", trigger: "change" },
-        ],
+        // faceImage: [
+        //   { required: true, message: "请上传封面", trigger: "change" },
+        // ],
+        // faceImage: [
+        //   { required: true, validator: checkFaceImage, trigger: "change" },
+        // ],
         deptId: [
           { required: true, message: "请填写馆藏单位", trigger: "change" },
         ],
-        intro: [
-          { required: true, message: "请填写文物介绍", trigger: "change" },
-        ],
+        // intro: [{ required: true, message: "请输入馆藏介绍", trigger: "blur" }],
+
+        intro: [{ required: true, validator: checkIntro, trigger: "blur" }],
       },
     };
   },
@@ -470,7 +490,7 @@ export default {
       this.reset();
     },
     handleSubmit() {
-      this.$refs.form.validate(async (valid) => {
+      this.$refs.form.validate(async (valid,err) => {
         if (valid) {
           var that = this;
           this.submitLoading = true;
@@ -632,6 +652,8 @@ export default {
                 this.submitLoading = false;
               });
           }
+        }else{
+          console.warn(err);
         }
       });
     },

src/views/culturalRelic/index.vue

@@ -4,6 +4,23 @@
       <SearchBar :config="searchConfig" @search="search" @reset="reset" />
     </div>
     <div class="tools">
+      <div class="tools-item">
+        <el-button
+          type="primary"
+          @click.native="handleOperation({ type: 'downloadTemplate' })"
+          icon="el-icon-download"
+        >
+          下载导入模板</el-button
+        >
+
+        <el-button
+          type="primary"
+          @click.native="handleOperation({ type: 'viewImportRecord' })"
+          icon="el-icon-document"
+        >
+          查看导入记录</el-button
+        >
+      </div>
       <div class="tools-item">
         <el-button
           type="primary"
@@ -32,23 +49,6 @@
           >
         </el-upload>
       </div>
-      <div class="tools-item">
-        <el-button
-          type="primary"
-          @click.native="handleOperation({ type: 'downloadTemplate' })"
-          icon="el-icon-download"
-        >
-          下载导入模板</el-button
-        >
-
-        <el-button
-          type="primary"
-          @click.native="handleOperation({ type: 'viewImportRecord' })"
-          icon="el-icon-document"
-        >
-          查看导入记录</el-button
-        >
-      </div>
     </div>
     <TablePage
       :data="list.records"
@@ -71,7 +71,7 @@
           :src="
             $getFullUrl(data.scope.faceImagePressUrl || data.scope.faceImageUrl)
           "
-          alt="查看大图"
+          alt="暂无图片"
           v-if="
             $getFullUrl(data.scope.faceImagePressUrl || data.scope.faceImageUrl)
           "
@@ -217,7 +217,7 @@ export default {
         // regionCode:'',//所属地（分号分隔的编号）——传当前用户的regionCode
         sourceWay: "", //来源方式
         sayExplain: "", //讲解词文件。文件id
-        status: 1, //上下架状态(0-下架，1-上架）
+        status: true, //上下架状态(0-下架，1-上架）
         // flag3d:'',//是否有3D图片（字典值：1-有；0-无）
         themeWord: "", //主题词
         url3d: "", //3durl链接

src/views/display/components/InfoEditDialog.vue

@@ -188,7 +188,6 @@
               <el-form-item
                 label="展览封面"
                 :label-width="formLabelWidth"
-                prop="faceImage"
               >
                 <ManualUploader
                   :fileLimit="1"
@@ -402,6 +401,15 @@ export default {
     },
   },
   data() {
+    let that =this
+    var checkFaceImage = (rule, value, callback) => {
+      if (that.faceImage.length == 0) {
+        // this.$message.info('请上传封面')
+        return callback(new Error("请上传封面"));
+      } else {
+        callback();
+      }
+    };
     return {
       dialogForm: {
         ...this.form,
@@ -433,9 +441,9 @@ export default {
       },
       rules: {
         title: [{ required: true, message: "请输入展览标题", trigger: "blur" }],
-        faceImage: [
-          { required: true, message: "请上传封面", trigger: "change" },
-        ],
+        // faceImage: [
+        //   { required: true, validator: checkFaceImage, trigger: "change" },
+        // ],
         deptId: [
           { required: true, message: "请填写展览单位", trigger: "change" },
         ],
@@ -513,10 +521,10 @@ export default {
 
     // 取消编辑
     cancelForm() {
-      if (this.loading ) {
+      if (this.loading) {
         this.loading = false;
       }
-      if (this.submitLoading ) {
+      if (this.submitLoading) {
         this.submitLoading = false;
       }
       this.reload();

src/views/display/index.vue

@@ -35,7 +35,7 @@
           :src="
             $getFullUrl(data.scope.faceImagePressUrl || data.scope.faceImageUrl)
           "
-          alt="查看大图"
+          alt="暂无图片"
           v-if="
             $getFullUrl(data.scope.faceImagePressUrl || data.scope.faceImageUrl)
           "
@@ -71,7 +71,6 @@
       :visible="editDialogVisible"
       :form="form"
       @handleClose="handleClose"
-      @openView="handlePreview"
       @refresh="loadData"
     />
     <PreviewDialog

src/views/virtual/index.vue

@@ -18,7 +18,7 @@
       <template v-slot:faceImageUrl="data">
         <img
           :src="data.scope.faceImageUrl"
-          alt="查看大图"
+          alt="暂无图片"
           v-if="data.scope.faceImageUrl"
           style="cursor: pointer"
           width="100px"