Commit 29df5009 authored by 高滢's avatar 高滢

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

parents d0ac1d43 c51eab31
...@@ -751,8 +751,20 @@ export default { ...@@ -751,8 +751,20 @@ export default {
*确认车型审查 *确认车型审查
*/ */
submitFrom() { submitFrom() {
if (this.$refs.form) {
this.$refs.form.validate(valid => { this.$refs.form.validate(valid => {
if (valid) { if (valid) {
this.submitFromData()
}
})
} else {
this.submitFromData()
}
},
/**
*确认车型审查
*/
submitFromData() {
this.$modal this.$modal
.confirm('是否确认提交表单,提交后不可修改', { .confirm('是否确认提交表单,提交后不可修改', {
type: 'warning', type: 'warning',
...@@ -767,8 +779,6 @@ export default { ...@@ -767,8 +779,6 @@ export default {
}) })
}) })
.catch(() => {}) .catch(() => {})
}
})
}, },
/** /**
*确认细则内容变更 *确认细则内容变更
......
...@@ -150,7 +150,7 @@ ...@@ -150,7 +150,7 @@
:preview-src-list="[baseUrl + scope.row.photo]" :preview-src-list="[baseUrl + scope.row.photo]"
> >
</el-image> </el-image>
<div v-else>__</div> <div v-else>--</div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
......
...@@ -152,7 +152,7 @@ ...@@ -152,7 +152,7 @@
:preview-src-list="[baseUrl + scope.row.photo]" :preview-src-list="[baseUrl + scope.row.photo]"
> >
</el-image> </el-image>
<div v-else>__</div> <div v-else>--</div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
......
...@@ -46,6 +46,15 @@ ...@@ -46,6 +46,15 @@
frameborder="0" frameborder="0"
style="width: 100%; height: 100%" style="width: 100%; height: 100%"
></iframe> ></iframe>
<!-- <object
id="pdf-object"
:data="fileUrl"
type="application/pdf"
width="100%"
height="100%"
>
<param name="filename" value="检验报告.pdf" />
</object> -->
</div> </div>
</task-standard> </task-standard>
</template> </template>
......
...@@ -783,8 +783,20 @@ export default { ...@@ -783,8 +783,20 @@ export default {
*确认体系审查 *确认体系审查
*/ */
submitFrom() { submitFrom() {
if (this.$refs.form) {
this.$refs.form.validate(valid => { this.$refs.form.validate(valid => {
if (valid) { if (valid) {
this.submitFromData()
}
})
} else {
this.submitFromData()
}
},
/**
*确认体系审查
*/
submitFromData() {
this.$modal this.$modal
.confirm('是否确认提交表单,提交后不可修改', { .confirm('是否确认提交表单,提交后不可修改', {
type: 'warning', type: 'warning',
...@@ -799,8 +811,6 @@ export default { ...@@ -799,8 +811,6 @@ export default {
}) })
}) })
.catch(() => {}) .catch(() => {})
}
})
}, },
confirmDetailChange() { confirmDetailChange() {
reviewDetailsConfirm({ reviewDetailsConfirm({
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment