From ac67dcc5849a1e5a3940c01662d4b596b9c234a9 Mon Sep 17 00:00:00 2001
From: lion <120344285@qq.com>
Date: Wed, 2 Apr 2025 16:27:43 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue                               |  2 +-
 src/views/flow/components/FieldExport.vue | 81 ++++++++++++++-----
 src/views/flow/list.vue                   | 94 +++++++++++++++++++++--
 3 files changed, 150 insertions(+), 27 deletions(-)

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/components/FieldExport.vue b/src/views/flow/components/FieldExport.vue
index 4ceb6cb..9a13d07 100644
--- a/src/views/flow/components/FieldExport.vue
+++ b/src/views/flow/components/FieldExport.vue
@@ -4,7 +4,7 @@
       :z-index="zIndex"
       :value="isShow"
       show-footer
-      title="特殊日期"
+      title="导出"
       show-confirm-button
       :width="defaultModalSize.width"
       :height="defaultModalSize.height"
@@ -26,9 +26,18 @@
           <el-checkbox v-for="field in mainFields" :label="field.name" :key="field.id">{{ field.label }}</el-checkbox>
         </el-checkbox-group>
 
-        <!-- <h4>存在子表单</h4>
-        <div v-for="field in relationsFields" :key="field.id" style="padding-left: 10px;">
-          <h5>{{ field.label }}</h5>
+        <template v-if="sub2ModelFields.length>0">
+          <h4>存在子表单</h4>
+          <el-checkbox :indeterminate="isIndeterminate2" v-model="checkAll2" @change="handleCheckAllChange2">全选</el-checkbox>
+          <div style="margin: 15px 0;"></div>
+          <el-checkbox-group v-model="selectedFields2" @change="handleCheckedFieldsChange2">
+            <el-checkbox v-for="(field,index) in sub2ModelFields" :label="field.name" :key="index">{{ field.label }}</el-checkbox>
+          </el-checkbox-group>
+        </template>
+
+
+        <!-- <div v-for="(field,index) in sub2ModelFields" :key="index" style="padding-left: 10px;">
+          <h5>{{ field }}</h5>
 
         </div> -->
       </div>
@@ -62,15 +71,20 @@ export default {
       config: {
         fields: []
       },
+      sub2ModelFields:[],
       fileName: `导出_${this.$moment().valueOf()}`,
       selectedFields: [],
       checkAll: false,
       isIndeterminate: false,
+      //子表单
+      selectedFields2: [],
+      checkAll2: false,
+      isIndeterminate2: false,
     }
   },
   computed: {
     mainFields() {
-      return this.config?.fields?.filter(i => i.type !== 'relation')
+      return this.config?.fields?.filter(i => i.type !== 'relation' && i.type !== 'file')
     },
     relationsFields() {
       return this.config?.fields?.filter(i => i.type === 'relation')
@@ -79,19 +93,29 @@ export default {
   methods: {
     handleCheckedFieldsChange(value) {
       let checkedCount = value.length;
-      this.checkAll = checkedCount === this.config?.fields?.length;
+      this.checkAll = checkedCount === this.mainFields?.length;
       this.isIndeterminate = checkedCount > 0 && checkedCount < this.config?.fields?.length;
     },
     handleCheckAllChange(val) {
-      this.selectedFields = val ? this.config.fields?.map(i => i.name) : [];
+      this.selectedFields = val ? this.mainFields?.map(i => i.name) : [];
       this.isIndeterminate = false;
     },
+
+    handleCheckedFieldsChange2(value) {
+      let checkedCount = value.length;
+      this.checkAll2 = checkedCount === this.sub2ModelFields.length;
+      this.isIndeterminate2 = checkedCount > 0 && checkedCount < this.sub2ModelFields.length;
+    },
+    handleCheckAllChange2(val) {
+      this.selectedFields2 = val ? this.sub2ModelFields?.map(i => i.name) : [];
+      this.isIndeterminate2 = false;
+    },
     async getFields(id) {
       try {
         const { customModel } = await fieldConfig(id)
         this.config = customModel
         this.config.fields.forEach(i => {
-          i.name = 'data.' + i.name
+          i.name = i.name
         })
         this.fileName = `${customModel.name}_${this.$moment().valueOf()}`
       } catch (err) {
@@ -140,18 +164,33 @@ export default {
         return parts.join('&');
       };
       try {
-        let export_fields = {}
-        this.selectedFields?.forEach(field => {
-          let key = field
-          export_fields[key] = this.config?.fields?.find(j => j.name === key)?.label
-        })
-        await download('/api/oa/flow/list-groups', 'get', {
-          ...this.select,
-          type: this.$route.params.type,
-          is_export: 1,
-          export_name: this.fileName,
-          export_fields
-        }, this.fileName+'.xlsx', paramsSerializer)
+        let export_fields = {
+          'no':'编号'
+        }
+        if((this.selectedFields && this.selectedFields.length>0) || (this.selectedFields2 && this.selectedFields2.length>0)){
+          this.selectedFields?.forEach(field => {
+            let key = field
+            export_fields[key] = this.config?.fields?.find(j => j.name === key)?.label
+          })
+          if(this.selectedFields2 && this.selectedFields2.length>0){
+            this.selectedFields2?.forEach(field => {
+              let key = field
+              export_fields[key] = this.sub2ModelFields?.find(j => j.name === key)?.label
+            })
+          }
+
+          await download(`/api/oa/flow/list/${this.$route.params.type}`, 'get', {
+            ...this.select,
+            type: this.$route.params.type,
+            is_export: 1,
+            export_name: this.fileName,
+            export_fields
+          }, this.fileName+'.xlsx', paramsSerializer)
+        }else{
+          // this.$Message.warning("请选择需要导出的字段")
+          return
+        }
+
       } catch (err) {
         console.error(err)
       }
@@ -164,7 +203,7 @@ export default {
       }
     },
     "select.custom_model_id"(newVal) {
-      this.getFields(newVal)
+        // this.getFields(newVal)
     }
   },
 }
diff --git a/src/views/flow/list.vue b/src/views/flow/list.vue
index 701c599..c2643f2 100644
--- a/src/views/flow/list.vue
+++ b/src/views/flow/list.vue
@@ -25,6 +25,7 @@
                 filterable
                 clearable
                 size="small"
+                @change="changeModelId"
                 v-model="select.custom_model_id"
               >
                 <el-option
@@ -34,6 +35,42 @@
                   :label="item.name"
                 ></el-option>
               </el-select>
+              <!-- 自定义筛选 条件 -->
+              <el-select
+                v-if="select.custom_model_id"
+                style="width: 180px"
+                filterable
+                clearable
+                size="small"
+                placeholder="字段"
+                v-model="select.field_id"
+              >
+                <el-option
+                  v-for="item in modelsField"
+                  :key="item.id"
+                  :value="item.id"
+                  :label="item.label"
+                ></el-option>
+              </el-select>
+              <el-select
+              v-if="select.custom_model_id"
+                style="width: 180px"
+                filterable
+                clearable
+                size="small"
+                placeholder="类型"
+                v-model="select.operator"
+              >
+                <el-option
+                  v-for="item in modelsFieldOpr"
+                  :key="item.id"
+                  :value="item.id"
+                  :label="item.label"
+                ></el-option>
+              </el-select>
+
+              <el-input size="small" style="width: 180px" v-if="select.custom_model_id" v-model="select.field_keyword" placeholder="关键词"></el-input>
+
               <el-select
                 style="width: 100px"
                 size="small"
@@ -110,7 +147,7 @@
                 icon="el-icon-download"
                 type="primary"
                 size="small"
-                @click="isShowFieldExport = true"
+                @click="showExport"
               >导出</el-button
               >
 <!--              <el-button-->
@@ -131,7 +168,7 @@
             :key="model.custom_model_id"
             :effect="select.custom_model_id === model.custom_model_id ? 'dark' : 'plain'"
             :type="['success', 'info', 'warning', 'danger'][index%4]"
-            @click="select.custom_model_id = model.custom_model_id,getList()">
+            @click="select.custom_model_id = model.custom_model_id,getFields(model.custom_model_id),getList()">
             {{ model.custom_model ? model.custom_model.name : '' }}{{ model.total }}
           </el-tag>
         </div>
@@ -504,12 +541,12 @@
     <share ref="share" :is-show.sync="isShowShare" :flow="pickedFlow"></share>
     <list-popover :is-show.sync="isShowListPopover" :id="listPopoverId" :pos="listPopoverPos" />
     <multi-deal :is-show.sync="isShowMultiDeal" :deal-flows="multiDealFlows" @refresh="getList" />
-    <field-export :is-show.sync="isShowFieldExport" :select="select" />
+    <field-export ref="isShowFieldExport" :is-show.sync="isShowFieldExport" :select="select" />
   </div>
 </template>
 
 <script>
-import { flowList, toggleFav, destroy, recall, updateFlowTime, todoTotal } from "@/api/flow";
+import { flowList, toggleFav, destroy, recall, updateFlowTime, todoTotal,fieldConfig } from "@/api/flow";
 import moment from "moment/moment";
 import ListPopover from "./components/ListPopover.vue";
 import MultiDeal from "./components/MultiDeal.vue"
@@ -632,13 +669,29 @@ export default {
         custom_model_id: "",
         date_range: "",
         date_type: "create_date",
+        field_id:'',
+        operator:'',
+        field_keyword:''
       },
       loading: false,
       list: [],
       total: 0,
 
       title: "",
+      sub2ModelFields:[],
       models: [],
+      config:{},
+      modelsField:[],
+      modelsFieldOpr:[{
+        id:'eq',
+        label:'等于'
+      },{
+        id:'neq',
+        label:'不等于'
+      },{
+        id:'like',
+        label:'包含'
+      }],
       dataTypes: [
         {
           value: "create_date",
@@ -744,7 +797,31 @@ export default {
         } catch (err) {}
       }
     },
-
+    changeModelId(e){
+      console.log("e",e)
+      this.select.field_id = ''
+      this.select.operator = ''
+      this.select.field_keyword = ''
+      if(e){
+        this.getFields(e)
+        this.getList()
+      }
+    },
+    // 获取 字段
+    showExport(){
+      this.$refs.isShowFieldExport.config = this.config
+      this.$refs.isShowFieldExport.sub2ModelFields = this.sub2ModelFields
+      this.isShowFieldExport = true
+    },
+    async getFields(id) {
+      try {
+        const { customModel } = await fieldConfig(id)
+        this.modelsField = customModel.fields
+        this.config = customModel
+      } catch (err) {
+        console.error(id)
+      }
+    },
     async getList(refresh=false) {
       if (this.loading) return
       this.loading = true;
@@ -758,6 +835,13 @@ export default {
         this.total = res?.data?.total ?? 0;
         this.models = res.customModels;
         this.title = res.pageTitle;
+        if(res.sub2ModelFields instanceof Object){
+          this.sub2ModelFields = Object.entries(res.sub2ModelFields).map(([key, value]) => ({
+            label: value,
+            name: key
+          }));
+        }
+
         this.loading = false;
       } catch (err) {
         console.error(err);