diff --git a/src/views/leger/equipmentledger.vue b/src/views/leger/equipmentledger.vue index 9a955d5..e11e975 100644 --- a/src/views/leger/equipmentledger.vue +++ b/src/views/leger/equipmentledger.vue @@ -562,8 +562,7 @@ import {getList, getDetail, add, update, remove, reject, auditing} from "@/api/l path: "/leger/equipmentledgerDetail", query: { frameMode:"search", - id: row.id, - checkstatus: row.checkStatus + id: row.id }, }); }, diff --git a/src/views/leger/equipmentledgerDetail.vue b/src/views/leger/equipmentledgerDetail.vue index 4c4bbcf..8e92c3a 100644 --- a/src/views/leger/equipmentledgerDetail.vue +++ b/src/views/leger/equipmentledgerDetail.vue @@ -6,15 +6,7 @@ 审核状态: - - - - - - - - - + @@ -141,20 +133,6 @@ } }; return { - checkStatusValue: this.$route.query.checkstatus, - optionCheckStatus: [{ - value: 1, - label: '审核中' - }, { - value: 2, - label: '已审核' - }, { - value: 3, - label: '未通过' - }, { - value: 4, - label: ' ' - }], frame_class: '', type: {}, shouldShowButton:{}, @@ -699,7 +677,6 @@ this.addUpdateShowButton=false; this.UpdateShowButton=true; this.frame_class = 'frame_class1'; - this.checkStatusValue = this.$route.query.checkstatus; this.SearchDetail(); }else{ this.readonlyForm=false; @@ -707,20 +684,6 @@ this.UpdateShowButton=false; this.addUpdateShowButton=true; this.frame_class = null; - this.checkStatusValue = 4; - } - switch (this.$route.query.checkstatus){ - case 1: - this.form = "审核中"; - break; - case 2: - this.form = "已审核"; - break; - case 3: - this.form = "未通过"; - break; - default: - this.form =" "; } }, methods: { @@ -922,6 +885,19 @@ getDetail(this.$route.query.id).then(res => { console.log(res); this.tab1_form = res.data.data; + switch (this.tab1_form.checkStatus){ + case 1: + this.form = "审核中"; + break; + case 2: + this.form = "已审核"; + break; + case 3: + this.form = "未通过"; + break; + default: + this.form =" "; + } }); }, auditing() { diff --git a/src/views/smart/workorder.vue b/src/views/smart/workorder.vue index 0b8b363..60e425d 100644 --- a/src/views/smart/workorder.vue +++ b/src/views/smart/workorder.vue @@ -493,8 +493,7 @@ path: "/workorder/detail", query: { frameMode:"search", - id: row.id, - checkstatus: row.approvalStatus + id: row.id }, }); }, diff --git a/src/views/smart/workorderDetail.vue b/src/views/smart/workorderDetail.vue index e82638d..22b96b9 100644 --- a/src/views/smart/workorderDetail.vue +++ b/src/views/smart/workorderDetail.vue @@ -4,8 +4,9 @@
- - {{ getOptionCheckStatusLabel($route.query.checkstatus) }} + + 审核状态: +
@@ -58,7 +59,6 @@ value: 4, label: '' }], - checkStatusValue: this.$route.query.checkstatus, item_form: {}, option: { column: [{ @@ -316,7 +316,6 @@ this.shouldShowButton = false; this.addupdateShowButton = true; this.frame_class = null; - this.checkStatusValue = this.$route.query.checkstatus; this.searchDetail(); } else if (this.$route.query.frameMode == "search") { this.tab1_option.column[1].disabled = false; @@ -326,7 +325,6 @@ this.addupdateShowButton = false; this.frame_class = 'frame_class1'; this.searchDetail(); - this.checkStatusValue = 4; } }, methods: { @@ -363,6 +361,19 @@ searchDetail() { getDetail(this.$route.query.id).then(res => { this.tab1_form = res.data.data; + switch (this.tab1_form.approvalStatus){ + case 1: + this.form = "审核中"; + break; + case 2: + this.form = "已审核"; + break; + case 3: + this.form = "未通过"; + break; + default: + this.form =" "; + } }); }, submitForm() {