会议室订单结算

src/views/markets/marketInfo.vue

@@ -76,7 +76,7 @@
         />
         <p>会议室设置</p>
       </div>
-      <div class="height-100" @click="toPage()">
+      <div class="height-100" @click="toPage('/tenant/marketinfo/meetingroomscheduleorder')">
         <img
           src="http://oss.qlan99.com/20210204/528927c30c854370a28085a02774b951.png"
           width="50"

src/views/markets/meetingroomscheduleorder.vue

@@ -0,0 +1,357 @@
+<template>
+  <a-card :bordered="false">
+    <!-- 查询区域 -->
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-row :gutter="24">
+          <a-col :span="3">
+            <a-form-item label="">
+              <j-input
+                placeholder="账单号"
+                v-model="queryParam.orderNo"
+              ></j-input>
+            </a-form-item>
+          </a-col>
+          <a-col :span="3">
+            <a-form-item label="">
+              <j-input
+                placeholder="会议主题"
+                v-model="queryParam.theme"
+              ></j-input>
+            </a-form-item>
+          </a-col>
+          <a-col :span="3">
+            <a-form-item label="">
+              <j-input
+                placeholder="公司名称"
+                v-model="queryParam.name"
+              ></j-input>
+            </a-form-item>
+          </a-col>
+          <a-col :span="3">
+            <a-form-item label="">
+              <j-input
+                placeholder="预定人"
+                v-model="queryParam.destinedName"
+              ></j-input>
+            </a-form-item>
+          </a-col>
+          <a-col :span="3">
+            <a-form-item label="">
+              <j-input
+                placeholder="联系电话"
+                v-model="queryParam.mobile"
+              ></j-input>
+            </a-form-item>
+          </a-col>
+          <a-col :md="6" :sm="8">
+            <span
+              style="float: left; overflow: hidden"
+              class="table-page-search-submitButtons"
+            >
+              <a-button type="primary" @click="searchQuery" icon="search"
+                >查询</a-button
+              >
+            </span>
+          </a-col>
+        </a-row>
+      </a-form>
+    </div>
+    <!-- 查询区域-END -->
+
+    <!-- table区域-begin -->
+    <div>
+      <a-table
+        ref="table"
+        size="middle"
+        :scroll="{ x: true }"
+        bordered
+        rowKey="id"
+        :columns="columns"
+        :dataSource="dataSource"
+        :pagination="ipagination"
+        :loading="loading"
+        :rowSelection="{
+          selectedRowKeys: selectedRowKeys,
+          onChange: onSelectChange,
+        }"
+        class="j-table-force-nowrap"
+        @change="handleTableChange"
+      >
+        <template slot="orderDetailList" slot-scope="text">
+          <div
+            v-if="text && text.length > 0"
+            v-for="(item, index) in text"
+            :key="index"
+          >
+            {{ item.payWayName }}:{{ item.amount }}
+            <a-divider type="vertical" />
+          </div>
+        </template>
+        <template slot="imgSlot" slot-scope="text, record">
+          <span v-if="!text" style="font-size: 12px; font-style: italic"
+            >无图片</span
+          >
+          <img
+            v-else
+            :src="getImgView(text)"
+            :preview="record.id"
+            height="25px"
+            alt=""
+            style="max-width: 80px; font-size: 12px; font-style: italic"
+          />
+        </template>
+        <template slot="fileSlot" slot-scope="text">
+          <span v-if="!text" style="font-size: 12px; font-style: italic"
+            >无文件</span
+          >
+          <a-button
+            v-else
+            :ghost="true"
+            type="primary"
+            icon="download"
+            size="small"
+            @click="downloadFile(text)"
+          >
+            下载
+          </a-button>
+        </template>
+
+        <!-- <span slot="action" slot-scope="text, record">
+          <a @click="handleEdit(record)">编辑</a>
+          <a-divider type="vertical" />
+          <a @click="setStatus(record, 0)">确认</a>
+          <a-divider type="vertical" />
+          <a @click="setStatus(record, 0)">结账</a>
+          <a-divider type="vertical" />
+          <a @click="setStatus(record, 0)">删除</a>
+        </span> -->
+        <span slot="action" slot-scope="text, record">
+          <a @click="handleDetail(record)">全部档期</a>
+          <a-divider type="vertical" />
+          <template v-if="record.confirmStatus != 0 && record.billStatus == 0">
+            <a @click="handleSettle(record)">结账</a>
+            <a-divider type="vertical"
+          /></template>
+          <template v-if="record.confirmStatus == 0">
+            <a @click="handleEdit(record)">修改</a>
+            <a-divider type="vertical"
+          /></template>
+          <template v-if="record.confirmStatus == 0">
+            <a @click="batchConfirm(record)">确认</a>
+            <a-divider type="vertical" />
+          </template>
+          <a v-if="record.status == 0" @click="handleEdit(record)">删除</a>
+        </span>
+      </a-table>
+    </div>
+
+    <bus-meeting-room-schedule-edit-modal
+      ref="modalForm"
+      @ok="modalFormOk"
+    ></bus-meeting-room-schedule-edit-modal>
+    <meeting-room-schedule-detail-modal
+      ref="modalMeetingRoomScheduleDetail"
+      :meetingRoomScheduleId="meetingRoomScheduleId"
+      @ok="modalFormOk"
+    ></meeting-room-schedule-detail-modal>
+    <bus-meeting-room-schedule-edit-modal-2
+      ref="modalForm2"
+      @ok="modalFormOk"
+    ></bus-meeting-room-schedule-edit-modal-2>
+  </a-card>
+</template>
+
+<script>
+import "@/assets/less/TableExpand.less";
+import { mixinDevice } from "@/utils/mixin";
+import { JeecgListMixin } from "@/mixins/JeecgListMixin";
+import BusMeetingRoomScheduleEditModal from "./modules/meetingRoomSchedule/BusMeetingRoomScheduleEditModal";
+import meetingRoomScheduleDetailModal from "./modules/meetingRoomSchedule/meetingRoomScheduleDetail/meetingRoomScheduleDetailModal";
+import BusMeetingRoomScheduleEditModal2 from "./modules/meetingRoomScheduleOrder/BusMeetingRoomScheduleEditModal";
+import { httpAction, postAction } from "@/api/manage";
+export default {
+  name: "BusMeetingRoomList",
+  mixins: [JeecgListMixin, mixinDevice],
+  components: {
+    BusMeetingRoomScheduleEditModal,
+    meetingRoomScheduleDetailModal,
+    BusMeetingRoomScheduleEditModal2,
+  },
+  data() {
+    return {
+      description: "bus_meeting_room管理页面",
+      // 表头
+      columns: [
+        {
+          title: "账单号",
+          align: "center",
+          dataIndex: "orderNo",
+        },
+        {
+          title: "会议主题",
+          align: "center",
+          dataIndex: "theme",
+        },
+        {
+          title: "公司名称",
+          align: "center",
+          dataIndex: "name",
+        },
+        {
+          title: "预定人",
+          align: "center",
+          dataIndex: "destinedName",
+        },
+        {
+          title: "联系电话",
+          align: "center",
+          dataIndex: "mobile",
+        },
+        {
+          title: "账单状态",
+          align: "center",
+          dataIndex: "billStatus",
+          customRender: function (text) {
+            return text == 1 ? "已结账" : "未结账";
+          },
+        },
+        {
+          title: "挂账人",
+          align: "center",
+          dataIndex: "",
+          customRender: function (text) {
+            //后期结合房间订单关联
+            return "无";
+          },
+        },
+        {
+          title: "消费金额",
+          align: "center",
+          dataIndex: "amount",
+        },
+        {
+          title: "付款",
+          align: "center",
+          dataIndex: "orderDetailList",
+          scopedSlots: { customRender: "orderDetailList" },
+        },
+        {
+          title: "状态",
+          align: "center",
+          dataIndex: "confirmStatus",
+          customRender: function (text) {
+            return text == 1 ? "已确认" : "未确认";
+          },
+        },
+        {
+          title: "创建时间",
+          align: "center",
+          dataIndex: "createTime",
+        },
+        {
+          title: "操作",
+          dataIndex: "action",
+          align: "center",
+          fixed: "right",
+          width: 147,
+          scopedSlots: { customRender: "action" },
+        },
+      ],
+      url: {
+        list: "/business/busMeetingRoomSchedule/list",
+        delete: "/business/busMeetingRoomSchedule/delete",
+        deleteBatch: "/business/busMeetingRoomSchedule/deleteBatch",
+        exportXlsUrl: "/business/busMeetingRoomSchedule/exportXls",
+        importExcelUrl: "business/busMeetingRoomSchedule/importExcel",
+        confirmBatch:
+          "/business/busMeetingRoomScheduleDetail/confirmBatchByMeetingRoomScheduleId",
+      },
+      dictOptions: {},
+      superFieldList: [],
+      meetingRoomScheduleId: "",
+    };
+  },
+  created() {
+    this.getSuperFieldList();
+  },
+  computed: {
+    importExcelUrl: function () {
+      return `${window._CONFIG["domianURL"]}/${this.url.importExcelUrl}`;
+    },
+  },
+  methods: {
+    handleSettle(record) {
+      this.$refs.modalForm2.edit(record);
+      this.$refs.modalForm2.title = "结账";
+      this.$refs.modalForm2.disableSubmit = false;
+    },
+    handleDetail(record) {
+      console.log("record", record);
+      this.meetingRoomScheduleId = record.id;
+      this.$refs.modalMeetingRoomScheduleDetail.add(record);
+      this.$refs.modalMeetingRoomScheduleDetail.title = "档期列表预定确认";
+      this.$refs.modalMeetingRoomScheduleDetail.disableSubmit = true;
+    },
+    batchConfirm(record) {
+      if (!this.url.confirmBatch) {
+        this.$message.error("请设置url.confirmBatch!");
+        return;
+      }
+
+      var that = this;
+      that.loading = true;
+      postAction(that.url.confirmBatch, {
+        id: record.id,
+      })
+        .then((res) => {
+          if (res.success) {
+            that.$message.success(res.message);
+            that.loadData();
+          } else {
+            that.$message.warning(res.message);
+          }
+        })
+        .finally(() => {
+          that.loading = false;
+        });
+    },
+    setStatus(record, status) {
+      record.status = status;
+      postAction("/business/busMeetingRoomSchedule/edit", record).then(
+        (res) => {
+          if (res.success) {
+            this.$message.success(res.message);
+          } else {
+            this.$message.warning(res.message);
+          }
+        }
+      );
+    },
+    initDictConfig() {},
+    getSuperFieldList() {
+      let fieldList = [];
+      fieldList.push({ type: "string", value: "tenantId", text: "关联租户" });
+      fieldList.push({ type: "string", value: "hotelId", text: "关联酒店" });
+      fieldList.push({ type: "string", value: "name", text: "名称" });
+      fieldList.push({ type: "string", value: "spec", text: "规格" });
+      fieldList.push({ type: "number", value: "area", text: "金额" });
+      fieldList.push({ type: "int", value: "number", text: "人数" });
+      fieldList.push({
+        type: "string",
+        value: "adminName",
+        text: "管理员姓名",
+      });
+      fieldList.push({ type: "string", value: "address", text: "地址" });
+      fieldList.push({ type: "string", value: "facility", text: "设备" });
+      fieldList.push({ type: "int", value: "sort", text: "排序" });
+      fieldList.push({ type: "string", value: "remark", text: "描述" });
+      fieldList.push({ type: "int", value: "status", text: "状态" });
+      this.superFieldList = fieldList;
+    },
+  },
+};
+</script>
+<style scoped>
+@import "~@assets/less/common.less";
+</style>

src/views/markets/modules/meetingRoomSchedule/BusMeetingRoomScheduleEditForm.vue

@@ -160,7 +160,7 @@ export default {
   },
   methods: {
     puls() {
-      this.model.detailList.push({ });
+      this.model.detailList.push({});
     },
     remove(index) {
       this.model.detailList.splice(index, 1);
@@ -170,6 +170,7 @@ export default {
     },
     edit(record) {
       this.model = Object.assign({}, record);
+      delete this.model.createTime;
       this.visible = true;
     },
     submitForm() {
@@ -191,8 +192,8 @@ export default {
             .then((res) => {
               if (res.success) {
                 that.$message.success(res.message);
-                console.log(1)
-                that.$emit("ok",this.model);
+                console.log(1);
+                that.$emit("ok", this.model);
                 // that.$parent.modalFormOk2(this.model);
               } else {
                 that.$message.warning(res.message);

src/views/markets/modules/meetingRoomSchedule/meetingRoomScheduleDetail/meetingRoomScheduleDetailList.vue

@@ -194,18 +194,19 @@ export default {
         this.$message.warning("请选择一条记录！");
         return;
       } else {
-        var ids = "";
-        for (var a = 0; a < this.selectedRowKeys.length; a++) {
-          ids += this.selectedRowKeys[a] + ",";
-        }
+        // var ids = "";
+        // for (var a = 0; a < this.selectedRowKeys.length; a++) {
+        //   ids += this.selectedRowKeys[a] + ",";
+        // }
         var that = this;
         that.loading = true;
-        postAction(that.url.confirmBatch, { ids: ids })
+        postAction(that.url.confirmBatch, { ids: this.selectedRowKeys })
           .then((res) => {
             if (res.success) {
               that.$message.success(res.message);
               that.loadData();
               that.onClearSelected();
+              that.$emit("ok");
             } else {
               that.$message.warning(res.message);
             }
@@ -224,6 +225,7 @@ export default {
           if (res.success) {
             that.$message.success(res.message);
             item.status = 1;
+            that.$emit("ok");
           } else {
             that.$message.warning(res.message);
           }

src/views/markets/modules/meetingRoomSchedule/meetingRoomScheduleDetail/meetingRoomScheduleDetailModal.vue

@@ -12,6 +12,7 @@
     <meeting-room-schedule-detail-list
       :meetingRoomScheduleId="meetingRoomScheduleId"
       ref="modalMeetingRoomScheduleDetailListModal"
+      @ok="submitCallback"
     ></meeting-room-schedule-detail-list>
   </j-modal>
 </template>

src/views/markets/modules/meetingRoomScheduleOrder/BusMeetingRoomScheduleEditForm.vue

@@ -0,0 +1,333 @@
+<template>
+  <a-spin :spinning="confirmLoading">
+    <j-form-container :disabled="formDisabled">
+      <a-form-model
+        ref="form"
+        :model="model"
+        :rules="validatorRules"
+        slot="detail"
+      >
+        <a-row>
+          <a-col :span="24">
+            <a-form-model-item
+              label="账单号"
+              :labelCol="labelCol"
+              :wrapperCol="wrapperCol"
+              prop="orderNo"
+            >
+              <a-input
+                disabled
+                v-model="model.orderNo"
+                placeholder="请输入账单号"
+              ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item
+              label="公司名称"
+              :labelCol="labelCol"
+              :wrapperCol="wrapperCol"
+              prop="name"
+            >
+              <a-input
+                disabled
+                v-model="model.name"
+                placeholder="请输入公司名称"
+              ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item
+              label="会议主题"
+              :labelCol="labelCol"
+              :wrapperCol="wrapperCol"
+              prop="theme"
+            >
+              <a-input
+                disabled
+                v-model="model.theme"
+                placeholder="请输入会议主题"
+              ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item
+              label="挂房账"
+              :labelCol="labelCol"
+              :wrapperCol="wrapperCol"
+              prop="payType"
+            >
+              <a-radio-group v-model="model.payType">
+                <a-radio :value="1">否</a-radio>
+                <a-radio :value="2">是</a-radio>
+              </a-radio-group>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item
+              label="金额"
+              :labelCol="labelCol"
+              :wrapperCol="wrapperCol"
+              prop="amount"
+            >
+              <a-input-number
+                v-model="model.amount"
+                placeholder="请输入金额"
+                style="width: 100%"
+                :min="1"
+              />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24" v-if="model.payType == 2">
+            <a-form-model-item
+              label="入账人"
+              :labelCol="labelCol"
+              :wrapperCol="wrapperCol"
+              prop="settleRoomOrderNo"
+            >
+              <a-input
+                v-show="false"
+                v-model="model.settleRoomOrderNo"
+                placeholder="请输入入账人"
+                style="width: 100%"
+              />
+              <a @click="handleRoomOrder">请选择</a>
+            </a-form-model-item>
+          </a-col>
+
+          <a-col :span="24">
+            <a-divider orientation="left"> 支付方式 </a-divider>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item
+              label="结账优惠"
+              :labelCol="labelCol"
+              :wrapperCol="wrapperCol"
+              prop="preferentialAmount"
+            >
+              <a-input-number
+                v-model="model.preferentialAmount"
+                placeholder="请输入结账优惠"
+                style="width: 100%"
+                :min="0"
+              />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item
+              label="结账应收"
+              :labelCol="labelCol"
+              :wrapperCol="wrapperCol"
+            >
+              {{ receiptsAmount }}
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item
+              label="输入合计"
+              :labelCol="labelCol"
+              :wrapperCol="wrapperCol"
+            >
+              {{ sumAmount }}
+            </a-form-model-item>
+          </a-col>
+          <a-col
+            :span="24"
+            v-for="(item, index) in paymentMethodList"
+            :key="index"
+          >
+            <a-form-model-item
+              :label="item.name"
+              :labelCol="labelCol"
+              :wrapperCol="wrapperCol"
+              :prop="`paymentMethodList[${index}].amount`"
+            >
+              <a-input-number
+                v-model="item.amount"
+                style="width: 100%"
+                :min="0"
+              ></a-input-number>
+            </a-form-model-item>
+          </a-col>
+        </a-row>
+      </a-form-model>
+    </j-form-container>
+  </a-spin>
+</template>
+
+<script>
+import { httpAction, getAction } from "@/api/manage";
+import { validateDuplicateValue } from "@/utils/util";
+
+export default {
+  name: "BusMeetingRoomForm",
+  components: {},
+  props: {
+    //表单禁用
+    disabled: {
+      type: Boolean,
+      default: false,
+      required: false,
+    },
+  },
+  data() {
+    return {
+      model: { detailList: [{}] },
+      labelCol: {
+        xs: { span: 24 },
+        sm: { span: 5 },
+      },
+      wrapperCol: {
+        xs: { span: 24 },
+        sm: { span: 16 },
+      },
+      labelCol2: {
+        xs: { span: 7 },
+        sm: { span: 10 },
+      },
+      wrapperCol2: {
+        xs: { span: 7 },
+        sm: { span: 11 },
+      },
+      confirmLoading: false,
+      validatorRules: {
+        payType: [{ required: true, message: "请输入挂房账!" }],
+        amount: [{ required: true, message: "请输入金额!" }],
+        // settleRoomOrderNo: [{ required: true, message: "请输入入账人!" }],
+      },
+      url: {
+        add: "/business/busMeetingRoomSchedule/create",
+        edit: "/business/busMeetingRoomSchedule/edit",
+        queryById: "/business/busMeetingRoomSchedule/queryById",
+        settle: "/business/busMeetingRoomSchedule/settle",
+      },
+      meetingRoomList: [],
+      timeSpanList: [
+        { id: 1, name: "上午" },
+        { id: 2, name: "下午" },
+        { id: 3, name: "晚上" },
+      ],
+      paymentMethodList: [],
+    };
+  },
+  computed: {
+    formDisabled() {
+      return this.disabled;
+    },
+    receiptsAmount() {
+      var sum = this.model.amount - this.model.preferentialAmount;
+
+      return sum;
+    },
+    sumAmount() {
+      if (this.paymentMethodList && this.paymentMethodList.length > 0) {
+        return this.paymentMethodList.reduce(function (total, v) {
+          return total + v.amount;
+        }, 0);
+      } else {
+        return 0;
+      }
+    },
+  },
+  created() {
+    getAction("/business/busMeetingRoom/list", {
+      pageNo: 1,
+      pageSize: 100,
+      stauts: 1,
+    }).then((res) => {
+      if (res.success) {
+        this.meetingRoomList = res.result.records;
+      }
+    });
+    getAction("/business/busRoomPayType/queryList", {
+      pageNo: 1,
+      pageSize: 100,
+    }).then((res) => {
+      if (res.success) {
+        if (res.result && res.result.length > 0) {
+          res.result.forEach((item) => {
+            Object.assign(item, { amount: 0 });
+          });
+          this.paymentMethodList = res.result;
+          console.log("  this.paymentMethodList", this.paymentMethodList);
+        }
+      }
+    });
+    var _info = JSON.parse(localStorage.getItem("storeInfo"));
+    if (_info) {
+      this.model.hotelId = _info.id;
+    }
+    //备份model原始值
+    this.modelDefault = JSON.parse(JSON.stringify(this.model));
+  },
+  methods: {
+    handleRoomOrder() {
+      this.$message.warning("房间订单功能暂未实现,请先选择挂房账否操作");
+    },
+    puls() {
+      this.model.detailList.push({});
+    },
+    remove(index) {
+      this.model.detailList.splice(index, 1);
+    },
+    add() {
+      this.edit(this.modelDefault);
+    },
+    edit(record) {
+      this.model = Object.assign({}, record, { preferentialAmount: 0 });
+      delete this.model.createTime;
+      this.visible = true;
+    },
+    submitForm() {
+      const that = this;
+      // 触发表单验证
+      this.$refs.form.validate((valid) => {
+        if (valid) {
+          if (this.receiptsAmount > this.model.amount) {
+            this.$message.error("输入优惠金额不能大于订单金额");
+            return;
+          }
+          if (this.receiptsAmount != this.sumAmount) {
+            this.$message.error("输入必须等于结账应收金额");
+            return;
+          }
+          this.model.paymentMethodList = this.paymentMethodList;
+          that.confirmLoading = true;
+          let httpurl = this.url.settle;
+          let method = "post";
+          httpAction(httpurl, this.model, method)
+            .then((res) => {
+              if (res.success) {
+                that.$message.success(res.message);
+                that.$emit("ok", this.model);
+              } else {
+                that.$message.warning(res.message);
+              }
+            })
+            .finally(() => {
+              that.confirmLoading = false;
+            });
+        }
+      });
+    },
+  },
+};
+</script>
+<style scoped>
+.dynamic-delete-button {
+  cursor: pointer;
+  position: relative;
+  top: 10px;
+  margin-left: 5px;
+  font-size: 18px;
+  color: #1890ff;
+  transition: all 0.3s;
+}
+.dynamic-delete-button:hover {
+  color: #777;
+}
+.dynamic-delete-button[disabled] {
+  cursor: not-allowed;
+  opacity: 0.5;
+}
+</style>

src/views/markets/modules/meetingRoomScheduleOrder/BusMeetingRoomScheduleEditModal.vue

@@ -0,0 +1,60 @@
+<template>
+  <j-modal
+    :title="title"
+    :width="width"
+    :visible="visible"
+    switchFullscreen
+    @ok="handleOk($event)"
+    :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
+    @cancel="handleCancel"
+    cancelText="关闭">
+    <bus-meeting-room-schedule-edit-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></bus-meeting-room-schedule-edit-form>
+  </j-modal>
+</template>
+
+<script>
+
+  import BusMeetingRoomScheduleEditForm from './BusMeetingRoomScheduleEditForm'
+  export default {
+    name: 'BusMeetingRoomModal',
+    components: {
+      BusMeetingRoomScheduleEditForm
+    },
+    data () {
+      return {
+        title:'',
+        width:800,
+        visible: false,
+        disableSubmit: false
+      }
+    },
+    methods: {
+      add () {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.add();
+        })
+      },
+      edit (record) {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.edit(record);
+        })
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      handleOk () {
+        this.$refs.realForm.submitForm();
+      },
+      submitCallback($event){
+        this.$emit('ok',$event);
+        this.visible = false;
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>

src/views/markets/modules/memberCard/BusMemberCardForm.vue

@@ -218,20 +218,18 @@ export default {
     },
   },
   created() {
-    httpAction(
-      "/org.jeecg.modules.business/busMarketMember/list",
-      { pageNo: 1, pageSize: 100 },
-      "get"
-    ).then((res) => {
+    getAction("/org.jeecg.modules.business/busMarketMember/list", {
+      pageNo: 1,
+      pageSize: 100,
+    }).then((res) => {
       if (res.success) {
         this.gradeList = res.result.records;
       }
     });
-    httpAction(
-      "/business/busRoomPayType/queryList",
-      { pageNo: 1, pageSize: 100 },
-      "get"
-    ).then((res) => {
+    getAction("/business/busRoomPayType/queryList", {
+      pageNo: 1,
+      pageSize: 100,
+    }).then((res) => {
       if (res.success) {
         this.paymentMethodList = res.result;
       }