From 23dfa02c35506f24ce9d457b71dff94b0ce89e84 Mon Sep 17 00:00:00 2001
From: lion <120344285@qq.com>
Date: Tue, 25 Mar 2025 11:36:37 +0800
Subject: [PATCH 1/3] up

---
 src/App.vue             |  2 +-
 src/views/flow/list.vue | 37 +++++++++++++++++++++++++++++++++++++
 2 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/src/App.vue b/src/App.vue
index 9fb69fa..156cbe5 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -2,7 +2,7 @@
   <div id="app">
     <router-view />
 
-    <ThemePicker style="display: none;"></ThemePicker>
+    <!-- <ThemePicker style="display: none;"></ThemePicker> -->
     <OnlineFile></OnlineFile>
   </div>
 </template>
diff --git a/src/views/flow/list.vue b/src/views/flow/list.vue
index d907304..d9c867c 100644
--- a/src/views/flow/list.vue
+++ b/src/views/flow/list.vue
@@ -63,6 +63,20 @@
                 "
               >
               </el-date-picker>
+              <el-select
+                style="width: 100px"
+                size="small"
+                v-model="select.flow_log_cancel"
+                placeholder="请选择"
+                clearable
+              >
+                <el-option
+                  v-for="item in [{value:1,label:'我退回过'}]"
+                  :key="item.value"
+                  :value="item.value"
+                  :label="item.label"
+                ></el-option>
+              </el-select>
               <el-input
                 clearable
                 v-model="select.keyword"
@@ -210,6 +224,14 @@
                         >
                       </div>
                     </div>
+                    <div class="mobile-desc-row">
+                      <div class="mobile-desc-row__title">
+                        我是否退回过
+                      </div>
+                      <div class="mobile-desc-row__value">
+                        {{ row.flow_log_cancel?'是':'否' }}
+                      </div>
+                    </div>
                   </div>
                   <template v-if="$route.params.type !== 'all'">
                     <el-button
@@ -316,6 +338,7 @@
                 >
               </template>
             </vxe-column>
+
             <vxe-column
               :visible="$store.getters.device === 'desktop'"
               width="164"
@@ -358,6 +381,19 @@
                 >
               </template>
             </vxe-column>
+            <vxe-column
+              :visible="$store.getters.device === 'desktop'"
+              width="120"
+              align="center"
+              field="status"
+              title="我是否退回过"
+            >
+              <template #default="{ row }">
+                {{ row.flow_log_cancel?'是':'否' }}
+              </template>
+            </vxe-column>
+
+
             <vxe-column
               :visible="$store.getters.device === 'desktop'"
               min-width="280"
@@ -550,6 +586,7 @@ export default {
         sort_name: "",
         sort_type: "",
         keyword: "",
+        flow_log_cancel:'',
         department_id: "",
         is_fav: "",
         custom_model_id: "",

From fb49403c35af5fee0ccda6136abc17b6091fb2d0 Mon Sep 17 00:00:00 2001
From: lion <120344285@qq.com>
Date: Tue, 25 Mar 2025 11:37:04 +0800
Subject: [PATCH 2/3] up

---
 src/App.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/App.vue b/src/App.vue
index 156cbe5..9fb69fa 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -2,7 +2,7 @@
   <div id="app">
     <router-view />
 
-    <!-- <ThemePicker style="display: none;"></ThemePicker> -->
+    <ThemePicker style="display: none;"></ThemePicker>
     <OnlineFile></OnlineFile>
   </div>
 </template>

From fde7b8aecbe7cc8a5e935d4b1df8475081db0b32 Mon Sep 17 00:00:00 2001
From: lion <120344285@qq.com>
Date: Tue, 25 Mar 2025 11:51:59 +0800
Subject: [PATCH 3/3] up

---
 src/views/flow/list.vue | 31 +++++++++++++++++++++++++++++--
 1 file changed, 29 insertions(+), 2 deletions(-)

diff --git a/src/views/flow/list.vue b/src/views/flow/list.vue
index d9c867c..5af67f8 100644
--- a/src/views/flow/list.vue
+++ b/src/views/flow/list.vue
@@ -64,10 +64,24 @@
               >
               </el-date-picker>
               <el-select
-                style="width: 100px"
+                style="width: 150px"
+                size="small"
+                v-model="select.status"
+                placeholder="请选择状态"
+                clearable
+              >
+                <el-option
+                  v-for="item in myStatusList"
+                  :key="item.value"
+                  :value="item.value"
+                  :label="item.label"
+                ></el-option>
+              </el-select>
+              <el-select
+                style="width: 150px"
                 size="small"
                 v-model="select.flow_log_cancel"
-                placeholder="请选择"
+                placeholder="请选择我退回的"
                 clearable
               >
                 <el-option
@@ -516,6 +530,18 @@ export default {
         [0, "办理中"],
         [1, "已完成"],
       ]),
+      myStatusList:[
+        {
+          value:-1,
+          label:'已退回'
+        },{
+          value:0,
+          label:'办理中'
+        },{
+          value:1,
+          label:'已完成'
+        }
+      ],
       statusColor: new Map([
         [-1, "warning"],
         [0, ""],
@@ -587,6 +613,7 @@ export default {
         sort_type: "",
         keyword: "",
         flow_log_cancel:'',
+        status:'',
         department_id: "",
         is_fav: "",
         custom_model_id: "",