Commit 21a61a9e authored by Facius's avatar Facius

Merge branch 'dev-1.4.3' into test

parents dd17c51d dd3a5d3d
...@@ -250,11 +250,7 @@ ...@@ -250,11 +250,7 @@
:itemIndex="itemIndex" :itemIndex="itemIndex"
:item="item" :item="item"
:value="form[item.fieldsName] || ''" :value="form[item.fieldsName] || ''"
:disabled=" :disabled=" exception || readOnly "
orderStatus === '88' ||
orderStatus === '86' ||
readOnly
"
@value-change="fieldValueChange" @value-change="fieldValueChange"
> >
</xh-parts> </xh-parts>
...@@ -549,6 +545,9 @@ export default { ...@@ -549,6 +545,9 @@ export default {
//console.log(this.form.name, 'form.name') //console.log(this.form.name, 'form.name')
}, },
computed: { computed: {
exception() {
return this.orderStatus == '86'
}
readOnly() { readOnly() {
return [80, 81, 85, 87, 89, 88, 110].indexOf(Number(this.orderStatus)) != -1 return [80, 81, 85, 87, 89, 88, 110].indexOf(Number(this.orderStatus)) != -1
}, },
...@@ -649,7 +648,7 @@ export default { ...@@ -649,7 +648,7 @@ export default {
// this.showTab = this.list.length > 1 // this.showTab = this.list.length > 1
// 异常单处理 // 异常单处理
if (this.orderStatus === '86'){ if (this.exception){
if (this.auditResults.length === 0) { if (this.auditResults.length === 0) {
this.$refs.uToast.show({ this.$refs.uToast.show({
title: '未找到不通过项', title: '未找到不通过项',
...@@ -977,7 +976,9 @@ export default { ...@@ -977,7 +976,9 @@ export default {
if (this.inGuaranteePeriod === 'Y') { if (this.inGuaranteePeriod === 'Y') {
this.$u.api.inOrderFinish(this.orderId).then((res) => { this.$u.api.inOrderFinish(this.orderId).then((res) => {
if (res.code == 200) { if (res.code == 200) {
this.submitParts() if (!this.exception) {
this.submitParts()
}
this.$refs.uToast.show({ this.$refs.uToast.show({
title: '提交成功', title: '提交成功',
type: 'success', type: 'success',
......
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