Merge branch 'dev' of http://222.90.211.174:3000/suf/domestic--e-commerc-b into dev

src/components/Upload/index.vue

@@ -454,7 +454,7 @@ export default {
         const newName = `预览图片${fileType || type}`
         window.open(`#/perview?fileId=${idNum}&absolutePath=${absolutePath}&name=${newName}`)
       } else {
-        window.open(`${process.env.VUE_APP_BASE_API}/fileStorage/preview?fileId=${idNum}#toolbar=0&navpanes=0&scrollbar=0`)
+        window.open(`${process.env.VUE_APP_BASE_API}/system/fileStorage/preview?fileId=${idNum}#toolbar=0&navpanes=0&scrollbar=0`)
       }
     },
     downloadClick(row) {

src/views/enterpriseManage/enterpriseEntry/components/AuditContent.vue

@@ -343,7 +343,7 @@
           </template>
           </cy-info-title>
           <el-form-item label="红否结果" style="width: 100%;">
-            <el-input :value="ruleForm.redNo === 0 ? '非红否' : '红否'" disabled></el-input>
+            <el-input :value="ruleForm.redNo ? (ruleForm.redNo === 0 ? '非红否' : '红否') : ''" disabled></el-input>
           </el-form-item>
           <el-form-item v-if="ruleForm.redNo === 1" label="红否失败原因" style="width: 100%;">
             <el-input :value="ruleForm.failReason" disabled></el-input>
@@ -469,7 +469,7 @@ export default {
       ]
 
       for (let i = 0; i < beforeValideFeilds.length - 1; i++) {
-        if (!this.ruleForm[beforeValideFeilds[i]]) {
+        if (this.ruleForm[beforeValideFeilds[i]] === '' || this.ruleForm[beforeValideFeilds[i]] === null) {
           return false
         }
       }