From db6ccd2afd5f544924a3579c6bb8a71986e56693 Mon Sep 17 00:00:00 2001
From: Lemon <ziao4956@gmail.com>
Date: Tue, 19 Sep 2023 09:09:14 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=BC=80=E7=A5=A8=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E6=96=B0=E5=A2=9E=E8=BF=90=E8=90=A5=E5=95=86=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jsowell-ui/src/views/order/invoice/index.vue | 23 ++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/jsowell-ui/src/views/order/invoice/index.vue b/jsowell-ui/src/views/order/invoice/index.vue
index a6bf17441..4ec03b83b 100644
--- a/jsowell-ui/src/views/order/invoice/index.vue
+++ b/jsowell-ui/src/views/order/invoice/index.vue
@@ -1,6 +1,18 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
+
+      <el-form-item label="所属运营商" prop="merchantId" label-width="120">
+        <el-select v-model="queryParams.merchantId" filterable clearable placeholder="请选择运营商">
+          <el-option
+            v-for="item in merchantList"
+            :key="item.merchantName"
+            :label="item.merchantName"
+            :value="item.id"
+          />
+        </el-select>
+      </el-form-item>
+
       <el-form-item label="会员id" prop="memberId">
         <el-input
           v-model="queryParams.memberId"
@@ -144,6 +156,7 @@
 
 <script>
 import { listInvoice, getInvoice, delInvoice, addInvoice, updateInvoice } from "@/api/order/invoice";
+import {getMerchantList} from "@/api/pile/merchant";
 
 export default {
   name: "Invoice",
@@ -166,6 +179,8 @@ export default {
       total: 0,
       // 申请开票表格数据
       invoiceList: [],
+      // 运营商列表
+      merchantList: [],
       // 弹出层标题
       title: "",
       // 是否显示弹出层
@@ -175,6 +190,7 @@ export default {
         pageNum: 1,
         pageSize: 10,
         memberId: null,
+        merchantId: null,
         orderCodes: null,
         status: null,
         totalAmount: null,
@@ -191,6 +207,7 @@ export default {
   },
   created() {
     this.getList();
+    this.getMerchantList();
   },
   methods: {
     /** 查询申请开票列表 */
@@ -203,6 +220,12 @@ export default {
         this.loading = false;
       });
     },
+    getMerchantList() {
+      getMerchantList().then((response) => {
+        this.merchantList = response.rows;
+        console.log("merchantList", this.merchantList)
+      });
+    },
     // 取消按钮
     cancel() {
       this.open = false;