平台-区域管理

src/views/platformSection/regionManage/adminManage.vue

@@ -28,7 +28,7 @@
           </div>
           <DropdownMenu
             slot="list"
-            style="width: 200px"
+            style="width: 150px"
             @mousedown.native.stop
             @click.native.stop
           >
@@ -38,6 +38,15 @@
             ></CustomTree>
           </DropdownMenu>
         </Dropdown>
+        <Select
+          v-model="searchForm.state"
+          @on-change="searchList()"
+          style="margin-right: 10px; width: 150px"
+        >
+          <Option :value="0">所有状态</Option>
+          <Option :value="1">启用</Option>
+          <Option :value="2">禁用</Option>
+        </Select>
         <Input
           v-model="searchForm.name"
           placeholder="请输入名称"
@@ -180,6 +189,7 @@ export default {
         dropList: [],
         areaname: "",
         areaid: null,
+        state: 0,
         page: 1,
         size: 10,
         list: [],
@@ -429,7 +439,7 @@ export default {
     align-items: center;
     .search_drop {
       margin-right: 10px;
-      width: 200px;
+      width: 150px;
     }
   }
 }

src/views/platformSection/regionManage/regionManage.vue

@@ -2,7 +2,7 @@
   <div class="main_root">
     <div class="search_header">
       <Input
-        v-model="searchForm.name"
+        v-model="searchForm.regionName"
         placeholder="请输入区域名称"
         search
         @on-search="searchList()"
@@ -45,19 +45,19 @@
     <Modal
       class="modal1"
       :mask-closable="false"
-      v-model="areaInfo.show"
-      :title="areaInfo.id ? '编辑' : '新建'"
+      v-model="regionInfo.show"
+      title="新建"
     >
       <Form
         ref="addForm"
-        :model="areaInfo"
+        :model="regionInfo"
         :rules="rules"
         :label-width="100"
         inline
       >
-        <FormItem label="区域名称" prop="areaname" style="width: 100%">
+        <FormItem label="区域名称" prop="regionName" style="width: 100%">
           <Input
-            v-model="areaInfo.areaname"
+            v-model="regionInfo.regionName"
             placeholder="请输入区域名称"
           ></Input>
         </FormItem>
@@ -67,7 +67,7 @@
           style="width: calc(50% - 10px)"
         >
           <Input
-            v-model="areaInfo.admin"
+            v-model="regionInfo.admin.aname"
             placeholder="请输入管理员名称"
           ></Input>
         </FormItem>
@@ -77,18 +77,31 @@
           style="width: calc(50% - 10px)"
         >
           <Input
-            v-model="areaInfo.loginname"
+            v-model="regionInfo.admin.loginname"
             placeholder="请输入登录账号"
           ></Input>
         </FormItem>
-        <FormItem label="密码" prop="pwd" style="width: calc(50% - 10px)">
-          <Input v-model="areaInfo.pwd" placeholder="请输入密码"></Input>
+        <FormItem label="密码" prop="loginpwd" style="width: calc(50% - 10px)">
+          <Input
+            v-model="regionInfo.admin.loginpwd"
+            placeholder="请输入密码"
+          ></Input>
         </FormItem>
-        <FormItem label="确认密码" prop="pwd1" style="width: calc(50% - 10px)">
-          <Input v-model="areaInfo.pwd1" placeholder="请输入确认密码"></Input>
+        <FormItem
+          label="确认密码"
+          prop="loginpwd1"
+          style="width: calc(50% - 10px)"
+        >
+          <Input
+            v-model="regionInfo.admin.loginpwd1"
+            placeholder="请输入确认密码"
+          ></Input>
         </FormItem>
         <FormItem label="手机号码" prop="phone" style="width: calc(50% - 10px)">
-          <Input v-model="areaInfo.phone" placeholder="请输入手机号码"></Input>
+          <Input
+            v-model="regionInfo.admin.phone"
+            placeholder="请输入手机号码"
+          ></Input>
         </FormItem>
         <FormItem
           label="短信验证码"
@@ -97,14 +110,14 @@
         >
           <Input
             style="width: calc(100% - 102px)"
-            v-model="areaInfo.code"
+            v-model="regionInfo.msgcode"
             placeholder="请输入短信验证码"
           ></Input>
           <div class="code_btn disabled">获取验证码</div>
         </FormItem>
       </Form>
       <div slot="footer">
-        <Button @click="areaInfo.show = false">取消</Button>
+        <Button @click="regionInfo.show = false">取消</Button>
         <Button @click="saveAddInfo()" type="primary">保存</Button>
       </div>
     </Modal>
@@ -135,28 +148,28 @@ export default {
     return {
       date_format,
       searchForm: {
-        name: "",
+        regionName: "",
         page: 1,
         size: 10,
         list: [],
         total: 0
       },
-      // 新建/编辑
-      areaInfo: {
+      // 新建
+      regionInfo: {
         show: false,
-        id: null,
-        areaname: "",
-        admin: "",
-        loginname: "",
-        pwd: "",
-        pwd1: "",
-        phone: "",
-        code: ""
+        regionName: "",
+        admin: {
+          aname: "",
+          loginname: "",
+          loginpwd: "",
+          loginpwd1: "",
+          phone: ""
+        }
       },
       // 查看
       viewInfo: {
         show: false,
-        areaname: "",
+        regionName: "",
         list: [],
         columns: [
           {
@@ -183,7 +196,7 @@ export default {
         ]
       },
       rules: {
-        areaname: [
+        regionName: [
           {
             required: true,
             message: "请输入区域名称",
@@ -235,7 +248,7 @@ export default {
         },
         {
           title: "区域名称",
-          key: "areaname",
+          key: "regionName",
           align: "center"
         },
         {
@@ -295,24 +308,24 @@ export default {
     getList() {
       this.searchForm.list = [
         {
-          id: 1,
-          areaname: "区域一",
+          regionid: 1,
+          regionName: "区域一",
           createname: "区域一",
           createtime: 1710838418,
           updatename: "区域一",
           updatetime: 1710838430
         },
         {
-          id: 2,
-          areaname: "区域二",
+          regionid: 2,
+          regionName: "区域二",
           createname: "区域一",
           createtime: 1710838418,
           updatename: "区域一",
           updatetime: 1710838430
         },
         {
-          id: 3,
-          areaname: "区域三",
+          regionid: 3,
+          regionName: "区域三",
           createname: "区域一",
           createtime: 1710838418,
           updatename: "区域一",
@@ -323,18 +336,18 @@ export default {
     },
     // 新建
     toAdd() {
-      this.areaInfo.show = true;
-      this.areaInfo.areaname = "";
-      this.areaInfo.admin = "";
-      this.areaInfo.loginname = "";
-      this.areaInfo.pwd = "";
-      this.areaInfo.pwd1 = "";
-      this.areaInfo.phone = "";
-      this.areaInfo.code = "";
+      this.regionInfo.show = true;
+      this.regionInfo.regionName = "";
+      this.regionInfo.admin = "";
+      this.regionInfo.loginname = "";
+      this.regionInfo.pwd = "";
+      this.regionInfo.pwd1 = "";
+      this.regionInfo.phone = "";
+      this.regionInfo.code = "";
     },
     // 保存新建
     saveAddInfo() {
-      this.areaInfo.show = false;
+      this.regionInfo.show = false;
     },
     // 进入
     toEnter() {
@@ -346,7 +359,7 @@ export default {
     // 查看
     toView() {
       this.viewInfo.show = true;
-      this.viewInfo.areaname = "河南星火燎原软件科技有限公司";
+      this.viewInfo.regionName = "河南星火燎原软件科技有限公司";
       this.viewInfo.list = [
         {
           admin: "周文彦",
@@ -362,8 +375,8 @@ export default {
     },
     // 编辑
     toEdit(row) {
-      this.areaInfo.show = true;
-      this.areaInfo.id = row.id;
+      this.regionInfo.show = true;
+      this.regionInfo.regionid = row.regionid;
     },
     // 删除
     toDel() {