pref:添加窗口关联大厅

base-manager-ui/admin/src/pages/basicset/hall/hallmanage/HallManage.vue

@@ -215,6 +215,7 @@ export default {
           let { code, msg } = res.data;
           if (code == 1) {
             _this.$message.success(msg);
+            _this.selectedRowKeys = [];
             _this.getHallList();
           }
         },

base-manager-ui/admin/src/pages/basicset/hall/hallmanage/modal/AddHall.vue

@@ -105,7 +105,6 @@ export default {
     // 关闭弹窗
     handleClose() {
       this.$refs.form.resetFields();
-      console.log(this.form);
       this.Visible = false;
     },
     // 保存
@@ -130,7 +129,7 @@ export default {
 };
 </script>
   
-  <style lang="less" scoped>
+<style lang="less" scoped>
 .ant-input-number {
   width: 100%;
 }

base-manager-ui/admin/src/pages/basicset/hall/hallwindow/modal/WindowToHall.vue

+<template>
+  <div>
+    <a-modal
+      v-model="Visible"
+      :maskClosable="false"
+      title="新增大厅窗口"
+      @cancel="handleClose"
+      destroyOnClose
+      centered
+    >
+      <template slot="footer">
+        <a-button @click="handleReset">重置</a-button>
+        <a-button type="primary" @click="handleOk">确定</a-button>
+      </template>
+      <a-form-model
+        ref="form"
+        :model="form"
+        :rules="rules"
+        :label-col="{ span: 4 }"
+        :wrapper-col="{ span: 20 }"
+      >
+        <a-form-model-item label="所属大厅" prop="hallName">
+          <a-select
+            @change="handleChange"
+            labelInValue
+            placeholder="请选择所属大厅"
+            v-model="selectInfo"
+          >
+            <a-select-option v-for="v in hallList" :key="v.id" :value="v.id">
+              {{ v.hallName }}
+            </a-select-option>
+          </a-select>
+        </a-form-model-item>
+      </a-form-model>
+    </a-modal>
+  </div>
+</template>
+    
+    <script>
+import { saveWindowHall } from "@/services/hall";
+export default {
+  props: {
+    addVisile: {
+      type: Boolean,
+      require: true,
+      default: false,
+    },
+    hallList: {
+      type: Array,
+      require: true,
+      default: () => {
+        return [];
+      },
+    },
+  },
+  components: {},
+  data() {
+    return {
+      selectInfo: undefined,
+      form: {
+        windowId: "", // 窗口id
+        windowName: "", // 窗口名称
+        hallId: "", // 大厅id
+        hallName: "", // 大厅名称
+        // sort: "", // 排序
+        // remark: "", //  备注
+      },
+      rules: {
+        hallName: [
+          { required: true, message: "请选择所属大厅", trigger: "change" },
+        ],
+      },
+    };
+  },
+  computed: {
+    Visible: {
+      get() {
+        return this.addVisile;
+      },
+      set(val) {
+        this.$emit("update:addVisile", val);
+      },
+    },
+  },
+  methods: {
+    // 切换选择
+    handleChange(row) {
+      this.form.hallId = row.key;
+      this.form.hallName = row.label;
+    },
+    // 新增
+    onAdd(row) {
+      this.form.windowId = row.id;
+      this.form.windowName = row.name;
+    },
+
+    // 关闭弹窗
+    handleClose() {
+      this.selectInfo = undefined;
+      this.$refs.form.resetFields();
+      this.Visible = false;
+    },
+    // 保存
+    handleOk() {
+      this.$refs.form.validate(async (valid) => {
+        if (valid) {
+          let res = await saveWindowHall(this.form);
+          let { code, msg } = res.data;
+          if (code == 1) {
+            this.$message.success(msg);
+            this.$emit("addSuccess");
+            this.handleClose();
+          }
+        }
+      });
+    },
+    // 重置
+    handleReset() {
+      this.selectInfo = undefined;
+      this.$refs.form.resetFields();
+    },
+  },
+};
+</script>
+    
+<style lang="less" scoped>
+</style>
\ No newline at end of file

base-manager-ui/admin/src/router/config.js

@@ -149,35 +149,35 @@ const options = {
             },
           ],
         },
-        // {
-        //   path: "hall",
-        //   name: "大厅管理",
-        //   meta: {
-        //     icon: "gateway",
-        //   },
-        //   component: () => import("@/pages/basicset/hall/Hall"),
-        //   redirect: "/hall/hallmanage",
-        //   children: [
-        //     {
-        //       path: "hallmanage",
-        //       name: "",
-        //       component: () =>
-        //         import("@/pages/basicset/hall/hallmanage/HallManage.vue"),
-        //       meta: {
-        //         invisible: true,
-        //       },
-        //     },
-        //     {
-        //       path: "hallwindow",
-        //       name: "大厅窗口管理",
-        //       meta: {
-        //         invisible: true,
-        //       },
-        //       component: () =>
-        //         import("@/pages/basicset/hall/hallwindow/HallWindow.vue"),
-        //     },
-        //   ],
-        // },
+        {
+          path: "hall",
+          name: "大厅管理",
+          meta: {
+            icon: "gateway",
+          },
+          component: () => import("@/pages/basicset/hall/Hall"),
+          redirect: "/hall/hallmanage",
+          children: [
+            {
+              path: "hallmanage",
+              name: "",
+              component: () =>
+                import("@/pages/basicset/hall/hallmanage/HallManage.vue"),
+              meta: {
+                invisible: true,
+              },
+            },
+            {
+              path: "hallwindow",
+              name: "大厅窗口管理",
+              meta: {
+                invisible: true,
+              },
+              component: () =>
+                import("@/pages/basicset/hall/hallwindow/HallWindow.vue"),
+            },
+          ],
+        },
         {
           path: "personnel",
           name: "工作人员管理",

base-manager-ui/admin/src/services/dept.js

@@ -47,6 +47,10 @@ export async function addWindow(data) {
 export async function delWindow(data) {
   return request(window.delete, METHOD.GET, data);
 }
+// 获取差集窗口列表
+export async function getSubHalllist(data) {
+  return request(window.subList, METHOD.POST, data);
+}
 
 /**
  *  窗口业务