页面修改

src/api/common/common.js

@@ -361,6 +361,17 @@ export function queryAreaTree(data) {
   })
 }
 
+/**
+ * 获取国家列表
+ */
+export function queryCountryList(data) {
+  return request({
+    url: '/Public/GetCountryList',
+    method: 'post',
+    data
+  })
+}
+
 /**
  * 获取省市区列表
  */

src/components/studyAbroad/studyAbroad-form.vue

@@ -26,6 +26,17 @@
               ref="ProductType" :options="productList" label="产品类型" :dense="false" class="col-6 q-pb-lg" emit-value
               map-options />
           </div>
+        </div>
+         <div class="row wrap">
+          <div class="col-6">
+            <q-select filled stack-label option-value="Id" option-label="Name" v-model="objOption.StudyCountryId"
+              ref="School_Id" :options="CountryList" label="留学国家" :dense="false" class="col-6 q-pr-lg q-pb-lg" emit-value
+              map-options />
+            
+          </div>
+          <div class="col-6">
+        
+          </div>
         </div>
         <div class="row wrap">
           <div class="col-6 q-pb-lg q-pr-lg">
@@ -66,7 +77,8 @@
     queryStudyAbroadProductType
   } from '../../api/studyabroad/index'
   import {
-    UploadSelfFile
+    UploadSelfFile,
+    queryCountryList
   } from '../../api/common/common'
   import {
     getSchoolDropdown,
@@ -103,6 +115,7 @@
           ImgCover: '', //封面图
           ProductType: 1, //产品类型
           StudyFeature: "", //课程特色
+          StudyCountryId:"",//留学国家
         },
         optionTitle: "",
         saveLoading: false,
@@ -114,6 +127,7 @@
           FileUrl: ''
         },
         SchoolList: [], //校区列表
+        CountryList:[],//国家列表
       }
     },
     computed: mapState({
@@ -134,12 +148,22 @@
     created() {
       this.getSchool();
       this.getProductList();
+      this.getCountryList()
     },
     mounted() {
       this.getStudyAbroadList();
       this.initObj()
     },
     methods: {
+      //获取国家列表
+      getCountryList() {
+        queryCountryList({}).then(res => {
+          console.log("res", res);
+          if (res.Code == 1) {
+            this.CountryList=res.Data;
+          }
+        });
+      },
       //课程特色
       getFeatureValue(obj) {
         this.objOption.StudyFeature = obj;
@@ -195,6 +219,7 @@
                 this.objOption.ImgCover = tempObj.ImgCover;
                 this.objOption.ProductType = tempObj.ProductType;
                 this.objOption.StudyFeature = tempObj.StudyFeature;
+                this.objOption.StudyCountryId=tempObj.StudyCountryId;
               }
             }
           })
@@ -208,6 +233,7 @@
           this.objOption.School_Id = -1;
           this.objOption.ProductType = 1;
           this.objOption.StudyFeature = "";
+          this.objOption.StudyCountryId="";
         }
       },
       //关闭弹窗

src/pages/system/area.vue

+<template>
+  <div class="page-body">
+    <div class="page-search row items-center">
+      <div class="col row wrap q-mr-lg q-col-gutter-md">
+        <div class="col-3">
+          <q-input @change="resetSearch" clearable standout="bg-primary text-white" class="col-6 q-pr-lg q-pr-lg" v-model="msg.MenuName"
+            label="名称" maxlength="20" @clear="resetSearch" />
+        </div>
+ 
+        <div class="col-3">
+          <q-select @input="resetSearch" standout="bg-primary text-white" v-model="msg.MenuType" class="col-6 q-pr-lg q-pr-lg" :options="MenuTypeOpts"
+            emit-value map-options label="菜单类型" />
+        </div>
+        
+      </div>
+    </div>
+    <div class="page-content">
+      <q-table :pagination="msg" :loading="loading" no-data-label="暂无相关数据" flat class="sticky-tow-column-table"
+        separator="none" :data="data" :columns="columns" row-key="name">
+        <template v-slot:top="props">
+          <div class="col-2 q-table__title">地区信息</div>
+          <q-space />
+          <div class="page-option">
+            <q-btn color="accent" class="q-mr-md" size="sm" icon="add" label="新增菜单" @click="EditMenu(null)" />
+          </div>
+        </template>
+        <template v-slot:body-cell-Status="props">
+          <q-td :props="props">
+            <q-toggle size="md" color="primary" :false-value="1" :true-value="0" v-model="props.row.Status"
+              title="注意：关闭后，分类将无法正常使用." @input="DeleteMenu(props.row)" />
+          </q-td>
+        </template>
+        <template v-slot:bottom>
+          <q-pagination class="full-width justify-end" v-model="msg.pageIndex" color="primary" :max="pageCount"
+            :input="true" @input="changePage" />
+        </template>
+        <template v-slot:body-cell-optioned="props">
+          <q-td :props="props">
+            <q-btn flat size="xs" icon="edit" color="accent" style="font-weight:400" label="编辑"
+              @click="EditMenu(props.row)" />
+              
+            <q-btn flat size="xs" icon="edit" color="accent" style="font-weight:400" label="功能权限"
+              @click="gotomenufunction(props.row)" />
+          </q-td>
+        </template>
+      </q-table>
+      <menu-form v-if="isShowMenuForm" :save-obj="menuObjOption" @close="closeMenuSaveForm" @success="refreshPage">
+      </menu-form>
+    </div>
+  </div>
+</template>
+<script>
+  import {
+    getMenuPage,
+    getMenuTypeList,
+    getMenuLevelList,
+    updateMenuStatus,
+  } from '../../api/system/index'
+  import menuForm from '../../components/system/menu-form'
+  export default {
+    meta: {
+      title: "地区管理"
+    },
+    components: {
+      menuForm,
+    },
+    data() {
+      return {
+        currentUrl: "",
+        columns: [{
+            name: 'MenuId',
+            label: '菜单编号',
+            field: 'MenuId',
+            align: 'left'
+          },
+          {
+            name: 'MenuName',
+            required: true,
+            label: '菜单名称',
+            align: 'left',
+            field: row => row.MenuName
+          },
+          {
+            name: 'MenuUrl',
+            label: '菜单地址',
+            field: 'MenuUrl',
+            align: 'left'
+          },
+          {
+            name: 'MenuTypeStr',
+            label: '菜单类型',
+            field: 'MenuTypeStr',
+            align: 'left'
+          },
+          {
+            name: 'MenuLevel',
+            label: '菜单等级',
+            field: 'MenuLevel',
+            align: 'left'
+          },
+          {
+            name: 'MenuIcon',
+            label: '图标',
+            field: 'MenuIcon',
+            align: 'left'
+          },
+          {
+            name: 'SortNum',
+            label: '排序',
+            field: 'SortNum',
+            align: 'left'
+          },
+          {
+            name: 'CreateTimeStr',
+            label: '创建时间',
+            field: 'CreateTimeStr',
+            align: 'left'
+          },
+          {
+            name: 'Status',
+            label: '状态',
+            align: 'left',
+            field: 'Status'
+          },
+          {
+            name: 'optioned',
+            label: '操作',
+            field: 'MenuId'
+          }
+        ],
+        data: [],
+        loading: true,
+        ShowOpts: [{
+            label: '全部',
+            value: '-1'
+          },
+          {
+            label: '正常',
+            value: '0'
+          },
+          {
+            label: '删除',
+            value: '1'
+          }
+        ],
+        //菜单等级
+        MenuLevelOpts: [],
+        //菜单类型
+        MenuTypeOpts: [],
+        msg: {
+          pageIndex: 1,
+          pageSize: 12,
+          rowsPerPage: 12,
+          MenuName: "",
+          MenuUrl: "",
+          MenuLevel: -1,
+          MenuType: -1,
+          Status: "-1",
+        },
+        pageCount: 0,
+        isShowMenuForm: false,
+        menuObjOption: null,
+      }
+    },
+    mounted() {
+      this.initData();
+      this.currentUrl = this.$route.path
+      this.getmenulist()
+    },
+    methods: {
+      //跳转到功能权限
+      gotomenufunction(obj) {
+        var tempStr = '/system/menufunction?menuId=' + obj.MenuId;
+        this.$router.push({
+          path: tempStr
+        });
+      },
+      //初始化下拉框
+      initData() {
+        this.MenuTypeOpts = getMenuTypeList();
+        this.MenuLevelOpts = getMenuLevelList();
+      },
+      //重新查询
+      resetSearch() {
+        this.msg.pageIndex = 1;
+        this.getmenulist();
+      },
+      //翻页
+      changePage(val) {
+        this.msg.pageIndex = val;
+        this.getmenulist()
+      },
+      //获取菜单分页列表
+      getmenulist() {
+        this.loading = true;
+        getMenuPage(this.msg).then(res => {
+          this.loading = false
+          this.data = res.Data.PageData
+          this.pageCount = res.Data.PageCount
+        }).catch(() => {
+          this.loading = false
+        })
+      },
+      //刷新页面
+      refreshPage() {
+        if (!this.menuObjOption) {
+          this.msg.pageIndex = 1;
+          this.msg.MenuName = "";
+          this.msg.MenuUrl = "";
+          this.msg.MenuLevel = -1;
+          this.msg.MenuType = -1;
+          this.msg.Status = "-1";
+        }
+        this.getmenulist()
+      },
+      //新增修改菜单
+      EditMenu(obj) {
+        if (obj) {
+          this.menuObjOption = obj
+        } else {
+          this.menuObjOption = null
+        }
+        this.isShowMenuForm = true
+      },
+      //关闭弹窗
+      closeMenuSaveForm() {
+        this.isShowMenuForm = false
+      },
+      //修改菜单状态
+      DeleteMenu(obj) {
+        var that = this;
+        var delMsg = {
+          MenuId: obj.MenuId,
+          Status: obj.Status
+        };
+        var tipMsg = "";
+        if (delMsg.Status == 0) {
+          tipMsg = "是否启用【" + obj.MenuName + "】菜单?";
+        } else {
+          tipMsg = "是否禁用【" + obj.MenuName + "】菜单?";
+        }
+        this.$q.dialog({
+          title: '提示信息',
+          message: tipMsg,
+          cancel: true,
+          persistent: true,
+          ok: "确定",
+          cancel: "取消",
+        }).onOk(() => {
+          updateMenuStatus(delMsg).then(res => {
+            if (res.Code == 1) {
+              that.$q.notify({
+                icon: 'iconfont icon-chenggong',
+                color: 'accent',
+                timeout: 2000,
+                message: '操作成功',
+                position: 'top'
+              })
+              that.getmenulist();
+            }
+          })
+        }).onCancel(() => {
+          obj.Status = obj.Status == 1 ? 0 : 1;
+        });
+      }
+    }
+  }
+
+</script>
+<style lang="sass">
+  @import url('~assets/css/table.sass')
+
+</style>

src/router/routes.js

@@ -78,6 +78,11 @@ const routes = [{
     component: () =>
       import("pages/system/dept.vue")
   },
+  {
+    path: "/system/area", //地区管理
+    component: () =>
+      import("pages/system/area.vue")
+  },
   {
     path: "/system/deptrelation", //部门关系图
     component: () =>