Merge branch 'develop' of http://gitlab.91isoft.com:90/car-test/web into gaoying

src/views/processing/carReview/write-check-form/index.vue

@@ -751,24 +751,34 @@ export default {
      *确认车型审查
      */
     submitFrom() {
-      this.$refs.form.validate(valid => {
-        if (valid) {
-          this.$modal
-            .confirm('是否确认提交表单，提交后不可修改', {
-              type: 'warning',
-              title: '提示',
-              closeOnClickModal: false
-            })
-            .then(async () => {
-              carReviewTaskConfirm({
-                taskId: this.taskId
-              }).then(res => {
-                this.$router.go(-1)
-              })
-            })
-            .catch(() => {})
-        }
-      })
+      if (this.$refs.form) {
+        this.$refs.form.validate(valid => {
+          if (valid) {
+            this.submitFromData()
+          }
+        })
+      } else {
+        this.submitFromData()
+      }
+    },
+    /**
+     *确认车型审查
+     */
+    submitFromData() {
+      this.$modal
+        .confirm('是否确认提交表单，提交后不可修改', {
+          type: 'warning',
+          title: '提示',
+          closeOnClickModal: false
+        })
+        .then(async () => {
+          carReviewTaskConfirm({
+            taskId: this.taskId
+          }).then(res => {
+            this.$router.go(-1)
+          })
+        })
+        .catch(() => {})
     },
     /**
      *确认细则内容变更

src/views/processing/checkFileLibrary/index.vue

@@ -150,7 +150,7 @@
             :preview-src-list="[baseUrl + scope.row.photo]"
           >
           </el-image>
-          <div v-else>__</div>
+          <div v-else>--</div>
         </template>
       </el-table-column>
       <el-table-column

src/views/processing/fileLibrary/index.vue

@@ -152,7 +152,7 @@
             :preview-src-list="[baseUrl + scope.row.photo]"
           >
           </el-image>
-          <div v-else>__</div>
+          <div v-else>--</div>
         </template>
       </el-table-column>
       <el-table-column

src/views/processing/retention-file/index.vue

@@ -46,6 +46,15 @@
         frameborder="0"
         style="width: 100%; height: 100%"
       ></iframe>
+      <!-- <object
+        id="pdf-object"
+        :data="fileUrl"
+        type="application/pdf"
+        width="100%"
+        height="100%"
+      >
+        <param name="filename" value="检验报告.pdf" />
+      </object> -->
     </div>
   </task-standard>
 </template>

src/views/processing/systemReview/write-check-form/index.vue

@@ -783,24 +783,34 @@ export default {
      *确认体系审查
      */
     submitFrom() {
-      this.$refs.form.validate(valid => {
-        if (valid) {
-          this.$modal
-            .confirm('是否确认提交表单，提交后不可修改', {
-              type: 'warning',
-              title: '提示',
-              closeOnClickModal: false
-            })
-            .then(async () => {
-              reviewTaskConfirm({
-                taskId: this.taskId
-              }).then(res => {
-                this.$router.go(-1)
-              })
-            })
-            .catch(() => {})
-        }
-      })
+      if (this.$refs.form) {
+        this.$refs.form.validate(valid => {
+          if (valid) {
+            this.submitFromData()
+          }
+        })
+      } else {
+        this.submitFromData()
+      }
+    },
+    /**
+     *确认体系审查
+     */
+    submitFromData() {
+      this.$modal
+        .confirm('是否确认提交表单，提交后不可修改', {
+          type: 'warning',
+          title: '提示',
+          closeOnClickModal: false
+        })
+        .then(async () => {
+          reviewTaskConfirm({
+            taskId: this.taskId
+          }).then(res => {
+            this.$router.go(-1)
+          })
+        })
+        .catch(() => {})
     },
     confirmDetailChange() {
       reviewDetailsConfirm({