From a1a6630f2eabfc78a379b5808b1bf7231a084d0b Mon Sep 17 00:00:00 2001 From: haoxuan <haoxuan> Date: 星期三, 11 十月 2023 18:02:44 +0800 Subject: [PATCH] 工序弹框的 列表和详情的更新同步 --- src/components/TaskControlModal.vue | 72 ++++++++++++++++++++++++++++++++---- 1 files changed, 64 insertions(+), 8 deletions(-) diff --git a/src/components/TaskControlModal.vue b/src/components/TaskControlModal.vue index c45b2b0..95c46be 100644 --- a/src/components/TaskControlModal.vue +++ b/src/components/TaskControlModal.vue @@ -74,7 +74,7 @@ 瀹㈡埛鍚嶇О锛歿{ currentTaskData.Order.customer || "" }} </div> <div class="title-item title-item-two"> - 璐х墿鎻忚堪锛� {{ currentTaskData.Order.orderAttr || "" }} + 閫氶亾锛� {{ channelNameConfig[currentTaskData.Channel] || "" }} </div> <div class="title-item title-item-two"> @@ -101,6 +101,14 @@ {{ item.Key }}锛歿{ item.Value || "" }} </div> + </div> + </div> + <div class="process-err-tip" v-if="getProcessParamsErrMsg"> + <div class="tip-icon"> + <span class="el-icon-error color_error"></span> + </div> + <div class="tip-content"> + 鎻愮ず: {{getProcessParamsErrMsg}} </div> </div> <div class="process-box" v-if="showBtn === 2 || showBtn === 3"> @@ -152,13 +160,13 @@ </template> </div> <!--宸︾炕椤垫寜閽�--> - <div v-show="showPreviousTaskBtn" class="paginator-btn previous" @click="previousTask"><</div> + <div v-show="showPreviousTaskBtn" class="paginator-btn previous" :class="{disabled:showBtn ===2 ||messageError}" @click="previousTask"><</div> <!--鍙崇炕椤垫寜閽�--> - <div v-show="showNextTaskBtn" class="paginator-btn next" @click="nextTask">></div> + <div v-show="showNextTaskBtn" class="paginator-btn next" :class="{disabled:showBtn ===2 ||messageError}" @click="nextTask">></div> </div> <div slot="footer" :class="messageError?'dialog-footer tac btn-error':'dialog-footer tac'" style="overflow: hidden"> - <template v-if="messageError"> + <template v-if="messageError || getProcessParamsErrMsg"> <div class="btn" v-if="messageError ==='涓嬪彂鎴愬姛锛�'||getProcessParamsErrMsg" @click="closeClick"> <img src="../../public/close-btn.png"/> </div> @@ -204,6 +212,7 @@ <script> import {getTaskInfo, sendProcessParams, startTask,} from "@/api/home"; // 浜х嚎 +import {channelNameConfig} from "@/common/constants"; export default { name: 'TaskControlModal', components: {}, @@ -235,6 +244,7 @@ isLoading: false, second: 0, secondTimer: null, + channelNameConfig: channelNameConfig }; }, mounted() { @@ -353,19 +363,33 @@ getCurrentTaskProduceParams(id) { // const id = this.currentTaskData?.Procedure?.ID if (id) { + this.currentProcessParams = [] + this.getProcessParamsErrMsg = "" startTask({id}).then((res) => { if (res.code === 200) { this.currentProcessParams = res.data.Params ?? [] + this.getProcessParamsErrMsg ='' } else { + this.currentProcessParams = [] this.getProcessParamsErrMsg = res.msg ?? '鑾峰彇宸ヨ壓鍙傛暟澶辫触锛�'; } + this.getInfo() + },err=>{ + console.error(err) + this.currentProcessParams = [] + this.getProcessParamsErrMsg = '鑾峰彇宸ヨ壓鍙傛暟澶辫触锛�' }); } }, + /** * 鍓嶇炕椤� */ previousTask() { + // 鐢熶骇鍑嗗鍊掕鏃朵腑鍜屼笅鍙戝け璐ョ姝㈢炕椤� + if (this.showBtn === 2 || this.messageError){ + return + } if (this.currentTaskIndex - 1 >= 0) { this.currentTaskIndex -= 1 this.$nextTick(() => { @@ -380,6 +404,10 @@ * 鍚庣炕椤� */ nextTask() { + // 鐢熶骇鍑嗗鍊掕鏃朵腑鍜屼笅鍙戝け璐ョ姝㈢炕椤� + if (this.showBtn === 2 || this.messageError){ + return + } if (this.currentTaskIndex + 1 <= this.taskList.length - 1) { this.currentTaskIndex += 1 this.$nextTick(() => { @@ -395,12 +423,9 @@ if (this.currentTaskData?.Procedure?.ID && this.currentTaskData?.Procedure?.Status === 1) { this.num = 0; this.showBtn = 1; - this.show = true; + // this.show = true; } else { this.show = false; - } - if (this.getProcessParamsErrMsg) { - this.messageError = this.getProcessParamsErrMsg; } }, getDateObj(date, fmt) { @@ -899,6 +924,12 @@ &.next { right: -60px; padding-left: 4px; + + } + &.disabled{ + background-color: #cccccc; + opacity: 0.8; + cursor: not-allowed; } } @@ -919,5 +950,30 @@ color: #ffffffaa; font-size: 16px; } + +} +.process-err-tip{ + box-sizing: border-box; + padding-top: 10px; + height: 160px; + width: 100%; + .tip-icon{ + display: flex; + align-items: center; + justify-content: center; + height: 70px; + .el-icon-error{ + font-size: 70px; + } + } + .tip-content{ + height: 70px; + display: flex; + align-items: center; + justify-content: center; + color: #fff; + font-size: 17px; + font-weight: 500; + } } </style> -- Gitblit v1.8.0