From 8bc6a04bbe6cadc38b09f163fabf91ff2ca58540 Mon Sep 17 00:00:00 2001
From: 18650502300 <18650502300@163.com>
Date: Thu, 29 Aug 2024 16:23:44 +0800
Subject: [PATCH] =?UTF-8?q?1.=E8=B5=84=E9=87=91=E6=B5=81=E6=B0=B4=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E5=9E=8B=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/dept/index.vue | 10 +++++-----
 src/views/system/flow/index.vue | 19 +++++++++++++++++++
 2 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/src/views/system/dept/index.vue b/src/views/system/dept/index.vue
index fa1b73b..c394706 100644
--- a/src/views/system/dept/index.vue
+++ b/src/views/system/dept/index.vue
@@ -463,7 +463,7 @@ export default {
       showSearch: true,
       // 表格树数据
       deptList: [],
-      appUserId: null,
+      // appUserId: null,
       // 总条数
       total: 0,
       // 运营商树选项
@@ -718,10 +718,10 @@ export default {
         // this.form.isProfitSharing = this.form.isProfitSharing === 'true';
         this.form.isUsePlatformApp = this.form.isUsePlatformApp === 'true';
         console.log("userName==========="+response.data.userName)
-        this.appUserId = this.form.appUserId;
-        if(response.data.userName){
-          this.form.appUserId = response.data.userName;
-        }
+        // this.appUserId = this.form.appUserId;
+        // if(response.data.userName){
+        //   this.form.appUserId = response.data.userName;
+        // }
         listArea({ pageNum: 1, pageSize: 999}).then(response => {
           this.areaOptions = response.rows;
         });
diff --git a/src/views/system/flow/index.vue b/src/views/system/flow/index.vue
index 09f7c7d..bce96ee 100644
--- a/src/views/system/flow/index.vue
+++ b/src/views/system/flow/index.vue
@@ -68,6 +68,16 @@
           end-placeholder="结束日期"
         ></el-date-picker>
       </el-form-item>
+      <el-form-item label="型号" prop="modelId" >
+        <el-select v-model="queryParams.modelId" filterable placeholder="请选择型号" clearable>
+          <el-option
+            v-for="item in modelOptions"
+            :key="item.modelId"
+            :label="item.model"
+            :value="item.modelId"
+          ></el-option>
+        </el-select>
+      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -205,6 +215,7 @@
 <script>
 import { listFlow, getFlow, delFlow, addFlow, updateFlow } from "@/api/system/flow";
 import { optionselect as getAreaOptionselect } from '@/api/system/area'
+import { listModel } from '@/api/system/model'
 
 export default {
   name: "Flow",
@@ -222,6 +233,7 @@ export default {
       // 显示搜索条件
       showSearch: true,
       areaOptions: [],
+      modelOptions: [],
       // 选中数组
       userName: undefined,
       // 日期范围
@@ -239,6 +251,7 @@ export default {
         pageNum: 1,
         pageSize: 20,
         areaId: null,
+        modelId: null,
         orderNo: null,
         outTradeNo: null,
         type: null,
@@ -262,8 +275,14 @@ export default {
     this.userName = this.$store.state.user.name;
     this.getList();
     this.getAreaList();
+    this.getModelList();
   },
   methods: {
+    getModelList() { //   getAreaOptionselect()
+      listModel(this.queryParams).then(response => {
+        this.modelOptions = response.rows;
+      });
+    },
     /** 查询字典类型列表 */
     getAreaList() {
       getAreaOptionselect().then(response => {