From 4b63edeae3d84d09b706338c723ac52a400f7c65 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期四, 13 三月 2025 11:15:38 +0800
Subject: [PATCH] 容缺、跳过理由必填写

---
 src/views/flowable/task/myProcess/send/index.vue |   20 ++++++++++++++++----
 src/views/projectProcess/detail/index.vue        |   17 ++++++++++++-----
 2 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/src/views/flowable/task/myProcess/send/index.vue b/src/views/flowable/task/myProcess/send/index.vue
index 706f2c2..e50e92b 100644
--- a/src/views/flowable/task/myProcess/send/index.vue
+++ b/src/views/flowable/task/myProcess/send/index.vue
@@ -343,7 +343,14 @@
       this.$prompt('澶囨敞璇存槑', '纭畾瑕佸缂烘浠诲姟鍚�', {
         confirmButtonText: '纭畾',
         cancelButtonText: '鍙栨秷',
-        inputType: 'textarea'
+        inputType: 'textarea',
+        inputValidator: (value) => {
+          if (!value || value.trim() === '') {
+            return "璇峰~鍐欏娉ㄨ鏄�"
+          }
+          return true
+        },
+        inputErrorMessage: '璇峰~鍐欏娉ㄨ鏄�'
       }).then(({ value }) => {
         let waitForm = {
           taskId: this.taskId,
@@ -367,9 +374,14 @@
       this.$prompt('澶囨敞璇存槑', '纭畾瑕佽烦杩囨浠诲姟鍚�', {
         confirmButtonText: '纭畾',
         cancelButtonText: '鍙栨秷',
-        inputType: 'textarea'
-        // inputPattern: /[\w!#$%&'*+/=?^_`{|}~-]+(?:\.[\w!#$%&'*+/=?^_`{|}~-]+)*@(?:[\w](?:[\w-]*[\w])?\.)+[\w](?:[\w-]*[\w])?/,
-        // inputErrorMessage: '閭鏍煎紡涓嶆纭�'
+        inputType: 'textarea',
+        inputValidator: (value) => {
+          if (!value || value.trim() === '') {
+            return "璇峰~鍐欏娉ㄨ鏄�"
+          }
+          return true
+        },
+        inputErrorMessage: '璇峰~鍐欏娉ㄨ鏄�'
       }).then(({ value }) => {
         let jumpForm = {
           taskId: this.taskId,
diff --git a/src/views/projectProcess/detail/index.vue b/src/views/projectProcess/detail/index.vue
index 070bc84..388a05a 100644
--- a/src/views/projectProcess/detail/index.vue
+++ b/src/views/projectProcess/detail/index.vue
@@ -18,11 +18,11 @@
       </div>
       <div class="search-warp">
         <div @click="changeTab(1, 'all')" :class="{'item-warm': true, 'all-color': true, 'active': 1 === selectTabId}">鍏ㄩ儴浜嬮」<span v-if="detailData && detailData.statistics">锛坽{detailData.statistics.totalTaskNum}}锛�</span></div>
-        <div @click="changeTab(2, 'todo')" :class="{'item-warm': true, 'all-color': true, 'active': 2 === selectTabId}">寰呭姙浜嬮」<span v-if="detailData && detailData.statistics">锛坽{detailData.statistics.todoTaskNum}}锛�</span></div>
-        <div @click="changeTab(3, 'wait')" :class="{'item-warm': true, 'current-color': true, 'active': 3 === selectTabId}">瀹圭己浜嬮」</div>
+        <div @click="changeTab(2, 'todo')" :class="{'item-warm': true, 'todo-color': true, 'active': 2 === selectTabId}">寰呭姙浜嬮」<span v-if="detailData && detailData.statistics">锛坽{detailData.statistics.todoTaskNum}}锛�</span></div>
         <div @click="changeTab(4, 'remaining')" :class="{'item-warm': true, 'remaining-color': true, 'active': 4 === selectTabId}">鍓╀綑浜嬮」<span v-if="detailData && detailData.statistics">锛坽{detailData.statistics.remainingTaskNum}}锛�</span></div>
         <div @click="changeTab(5, 'timely')" :class="{'item-warm': true, 'timely-color': true, 'active': 5 === selectTabId}">鎸夋椂瀹屾垚<span v-if="detailData && detailData.statistics">锛坽{detailData.statistics.timelyFinishedTaskNum}}锛�</span></div>
         <div @click="changeTab(6, 'overtime')" :class="{'item-warm': true, 'overtime-color': true, 'active': 6 === selectTabId}">瓒呮椂浜嬮」锛�0锛�</div>
+        <div @click="changeTab(3, 'wait')" :class="{'item-warm': true, 'wait-color': true, 'active': 3 === selectTabId}">瀹圭己浜嬮」</div>
 <!--        <div @click="changeTab(7, 'willOvertime')" :class="{'item-warm': true, 'willOvertime-color': true, 'active': 7 === selectTabId}">涓存湡浜嬮」锛�0锛�</div>-->
         <div @click="changeTab(8, 'urge')" :class="{'item-warm': true, 'urge-color': true, 'active': 8 === selectTabId}">鐫e姙浜嬮」锛�0锛�</div>
       </div>
@@ -545,6 +545,9 @@
 .all-color {
   background-color: rgb(180, 253, 255);
 }
+.todo-color {
+  background-color: rgb(66, 174, 243);
+}
 
 .current-color {
   background-color: rgb(127, 131, 247);
@@ -558,14 +561,18 @@
   background-color: rgb(204, 247, 131);
 }
 .overtime-color {
-  background-color: rgb(129, 179, 55);
-  color: white;
+  background-color: #e8e866;
 }
+
+.wait-color {
+  background-color: orange;
+}
+
 .willOvertime-color {
   background-color: rgb(255, 248, 29);
 }
 .urge-color {
-  background-color: rgb(0, 0, 0);
+  background-color: red;
   color: white;
 }
 .active {

--
Gitblit v1.8.0