From 75be3727e2e703fe06e756fd8c6de8609b9ab5a9 Mon Sep 17 00:00:00 2001 From: zhen <1173776308@qq.com> Date: Tue, 16 Jul 2024 15:38:39 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=BC=A0=E5=90=8C=E6=9C=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/release/productioninformation.vue | 3 + src/views/smart/operationticket.vue | 2 +- src/views/smart/operationticketDetail.vue | 70 ++++++++++++--------- 3 files changed, 44 insertions(+), 31 deletions(-) diff --git a/src/views/release/productioninformation.vue b/src/views/release/productioninformation.vue index ba4d812..cb0ae68 100644 --- a/src/views/release/productioninformation.vue +++ b/src/views/release/productioninformation.vue @@ -252,6 +252,8 @@ methods: { rowSave(row, done, loading) { + this.form.checkstatus="1"; + this.form.id = row.id; add(row).then(() => { done(); this.onLoad(this.page); @@ -265,6 +267,7 @@ }); }, rowUpdate(row, index, done, loading) { + row.checkstatus="1"; update(row).then(() => { done(); this.onLoad(this.page); diff --git a/src/views/smart/operationticket.vue b/src/views/smart/operationticket.vue index 89c6afa..edc7786 100644 --- a/src/views/smart/operationticket.vue +++ b/src/views/smart/operationticket.vue @@ -625,7 +625,7 @@ import {getList, getDetail, add, update, remove, closeticket} from "@/api/smart/ debugger return closeticket( this.updateid, this.closeTicketForm.isQuakified,this.closeTicketForm.riskControlEvaluation) .then(() => { - this.closeTicketForm.isQuakifie = -1; + this.closeTicketForm.isQuakifie = ''; this.closeTicketForm.riskControlEvaluation = ''; this.closeTicketBox = false; this.onLoad(this.page); diff --git a/src/views/smart/operationticketDetail.vue b/src/views/smart/operationticketDetail.vue index 10c00f5..d607490 100644 --- a/src/views/smart/operationticketDetail.vue +++ b/src/views/smart/operationticketDetail.vue @@ -5,7 +5,7 @@ 审核状态: - + { + this.option.column[1].disabled = !val; + }, + } }, { label: "操作票类型", @@ -440,10 +449,7 @@ export default { span: 8, maxlength: 20, }, - - ] - }, ] }, @@ -541,11 +547,12 @@ export default { }, created () { this.type = this.option.column[0]; - this.option.column.push({ label: '操作项目', prop: 'operationItem' }); + // this.option.column.push({ label: '操作项目', prop: 'operationItem' }); if(this.$route.query.frameMode == "add"){ this.readonlyForm=false; this.shouldShowButton=false; this.addUpdateShowButton=true; + this.addUpdateShowButton=true; this.frame_class = null; }else{ this.readonlyForm=false; @@ -602,6 +609,7 @@ export default { cancelButtonText: "取消", type: "warning" }).then(() => { + this.tab1_form.reviewStatus="1" add(this.tab1_form).then(() => { this.$router.push({ path: "/smart/operationticket", @@ -642,20 +650,8 @@ export default { }, handleChange (column) { this.type = column - if(this.$route.query.frameMode != "add"){ - if (column.prop == 'operationItem') { - this.item_onLoad(); - } - } - if(column.prop == 'operationItem'){ - if(this.tab1_form.operationTicketNo ==="" || this.tab1_form.operationTicketNo ===null){ - this.$message({ - type: "error", - message: "请返回基本信息填写“操作票编号”!!!" - }); - } - } this.item_form.operationTicketNo = this.tab1_form.operationTicketNo; + this.item_onLoad(); }, // 操作项目 新增按钮处理 @@ -776,9 +772,9 @@ export default { headerClass(){ return 'head-style' }, - item_onLoad(row, params = {}) { + item_onLoad() { this.loading = true; - item_getListByItemId(this.item_data[0].operationTicketNo).then(res => { + item_getListByItemId(this.tab1_form.operationTicketNo).then(res => { this.item_data = res.data.data; this.loading = false; }); @@ -803,13 +799,27 @@ export default { .frame_class1 .el-input__icon { display: none; } -.frame_class1 .el-input--prefix .el-input__inner { +.frame_class1 .el-input--prefix { padding-left: 15px; } .container { display: flex; justify-content: flex-end; /* 将子元素推到容器的末端 */ } +.frame_class1 textarea.el-textarea__inner { + border: none; + box-shadow: none; + outline: none; + pointer-events: none; +} +.frame_class1 input::placeholder { + color: transparent; + display: none; /* 默认隐藏 */ +} +.frame_class1 textarea::placeholder { + color: transparent; + display: none; /* 默认隐藏 */ +} .check_status_class { display: flex; justify-content: flex-end; /* 将子元素推到容器的末端 */ From 7b4ebbd2b3ded221755d89391a9a66b6a5c5d910 Mon Sep 17 00:00:00 2001 From: zhen <1173776308@qq.com> Date: Tue, 16 Jul 2024 15:47:25 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=BC=A0=E5=90=8C=E6=9C=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/smart/operationticketDetail.vue | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/views/smart/operationticketDetail.vue b/src/views/smart/operationticketDetail.vue index d607490..7c99d4a 100644 --- a/src/views/smart/operationticketDetail.vue +++ b/src/views/smart/operationticketDetail.vue @@ -652,6 +652,11 @@ export default { this.type = column this.item_form.operationTicketNo = this.tab1_form.operationTicketNo; this.item_onLoad(); + if(this.type.prop==='operationItem'){ + this.addUpdateShowButton=false; + }else { + this.addUpdateShowButton=true; + } }, // 操作项目 新增按钮处理 From 1380b490ae67154283fc4c8b97f02de1a707082f Mon Sep 17 00:00:00 2001 From: zhen <1173776308@qq.com> Date: Tue, 16 Jul 2024 15:56:10 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=BC=A0=E5=90=8C=E6=9C=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/smart/operationticketDetail.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/views/smart/operationticketDetail.vue b/src/views/smart/operationticketDetail.vue index 7c99d4a..e660bf5 100644 --- a/src/views/smart/operationticketDetail.vue +++ b/src/views/smart/operationticketDetail.vue @@ -105,16 +105,16 @@ export default { return { checkStatusValue: this.$route.query.reviewStatus, optionCheckStatus: [{ - value: '1', + value: 1, label: '审核中', }, { - value: '2', + value: 2, label: '已审核', }, { - value: '3', + value: 3, label: '未通过', }, { - value: '4', + value: 4, label: ' ' }], defaultOperationTicketNo: "",