Merge branch 'V2' of http://47.92.161.104:10080/zq/jp-housekeeper-portal into V2

src/api/base/personPopedom.js

@@ -0,0 +1,50 @@
+import request from '@/utils/request'
+import constant from '@/constant'
+
+function pageList(formData) {
+  return request.post(constant.serverUrl + "/base/personPopedom/pageList", formData);
+}
+
+function create() {
+  return request.get(constant.serverUrl + "/base/personPopedom/create");
+}
+
+function edit(id) {
+  return request.get(constant.serverUrl + "/base/personPopedom/edit/" + id);
+}
+
+function add(formModel) {
+  return request.post(constant.serverUrl + "/base/personPopedom/add", formModel, {
+    headers: {
+      "Content-Type": "application/json"
+    }
+  });
+}
+
+function update(formModel) {
+  return request.post(constant.serverUrl + "/base/personPopedom/update", formModel, {
+    headers: {
+      "Content-Type": "application/json"
+    }
+  });
+}
+
+function remove(id) {
+  return request.post(constant.serverUrl + "/base/personPopedom/delete/" + id);
+}
+
+function batchRemove(idList) {
+  return request.post(constant.serverUrl + "/base/personPopedom/batchDelete", idList, {
+    headers: {
+      "Content-Type": "application/json"
+    }
+  });
+}
+
+function changeDefault(formModel) {
+  return request.post(constant.serverUrl + "/base/personPopedom/changeDefault", formModel);
+}
+
+export default {
+  pageList, create, edit, add, update, remove, batchRemove,changeDefault
+}

src/api/base/personRoleInfo.js

@@ -41,6 +41,10 @@ function batchRemove(idList){
   });
 }
 
+function listByCompanyId(formData){
+  return request.post(constant.serverUrl + "/base/personRoleInfo/listByCompanyId", formData);
+}
+
 export default {
-  pageList,create,edit,add,update,remove,batchRemove
+  pageList,create,edit,add,update,remove,batchRemove,listByCompanyId
 }

src/routers/modules/base.js

@@ -398,7 +398,7 @@ var routers = [
                 component: () => import('@/views/base/personRoleInfo-list.vue'),
                 meta: {
                         roles: ["admin"],
-                        title: '角色管理'
+                        title: '用户角色管理'
                 }
         },
         {

src/views/base/devicePerson-list.vue

@@ -21,25 +21,6 @@
       class="demo-form-inline"
     >
       <div>
-        <el-form-item label="绑定设备名称" prop="deviceId">
-          <el-select
-            v-model="queryModel.deviceId"
-            size="mini"
-            filterable
-            clearable
-            remote
-            style="width:220px;"
-            placeholder="请输入关键词"
-            :remote-method="queryDevice"
-          >
-            <el-option
-              v-for="device in deviceResult"
-              :key="device.id"
-              :label="device.aliasName"
-              :value="device.id"
-            ></el-option>
-          </el-select>
-        </el-form-item>
         <el-form-item label="姓名" prop="name">
           <el-input type="text" size="mini" v-model="queryModel.name"></el-input>
         </el-form-item>
@@ -76,6 +57,25 @@
           ></el-select-tree>&nbsp;
           <el-checkbox v-model="queryModel.subordinate">是否包含下级单位</el-checkbox>
         </el-form-item>
+        <el-form-item label="绑定设备名称" prop="deviceId">
+          <el-select
+            v-model="queryModel.deviceId"
+            size="mini"
+            filterable
+            clearable
+            remote
+            style="width:220px;"
+            placeholder="请输入关键词"
+            :remote-method="queryDevice"
+          >
+            <el-option
+              v-for="device in deviceResult"
+              :key="device.id"
+              :label="device.aliasName"
+              :value="device.id"
+            ></el-option>
+          </el-select>
+        </el-form-item>
         <el-form-item label="是否上传照片" prop="isUploadPhoto">
           <el-select
             v-model="queryModel.isUploadPhoto"
@@ -103,7 +103,7 @@
           </el-select>
         </el-form-item>
       </div>
-      <div>
+      <!-- <div>
         <el-form-item v-if="position1Show" :label="position1" prop="position1">
           <el-input type="text" size="mini" v-model="queryModel.position1"></el-input>
         </el-form-item>
@@ -119,7 +119,7 @@
         <el-form-item v-if="position5Show" :label="position5" prop="position5">
           <el-input type="text" size="mini" v-model="queryModel.position5"></el-input>
         </el-form-item>
-      </div>
+      </div> -->
     </el-form>
     <el-divider></el-divider>
     <el-row class="button-group">
@@ -314,7 +314,8 @@ export default {
 
     return {
       ruleValidate: {
-        deviceId: [{ required: true, message: "不能为空", trigger: "blur" }]
+        parentId: [{ required: true, message: "请选择单位", trigger: "blur" }],
+        deviceId: [{ required: true, message: "请选择设备", trigger: "blur" }]
       },
       queryModel: {
         companyCode: "",
@@ -419,6 +420,7 @@ export default {
     queryDevice(aliasName) {
       var self = this;
       var formData = new FormData();
+      formData.append("companyId", self.queryModel.parentId);
       formData.append("aliasName", aliasName);
       formData.append("limit", 10);
 

src/views/base/personInfo-list.vue

@@ -376,7 +376,7 @@
         }}</template>
       </el-table-column>
       <el-table-column prop="popedom" label="用户身份" width="200">
-        <template slot-scope="{ row }">
+        <!-- <template slot-scope="{ row }">
           <el-row>
             <el-col :span="10" v-if="row.popedom.indexOf('1') != -1"
               >个人用户</el-col
@@ -395,7 +395,7 @@
               >监管专员</el-col
             >
           </el-row>
-        </template>
+        </template> -->
       </el-table-column>
       <el-table-column label="是否自动同步" width="120">
         <template slot-scope="{ row }">
@@ -498,6 +498,12 @@
                   @click="handleDelete(row)"
                   >删除</el-link
                 >-
+                <el-link
+                  type="primary"
+                  :underline="false"
+                  @click="bindRole(row)"
+                  >角色管理</el-link
+                >-
                 <span v-if="row.faceBound">
                   <el-link
                     type="primary"
@@ -736,6 +742,11 @@
         <img :src="bindWechatUrl" style="width: 300px; fit-object: cover" />
       </div>
     </el-dialog>
+    <personPopedom-list
+      v-if="showRoleModal"
+      :personId="personId"
+      @close="onDetailModalClose"
+    ></personPopedom-list>
   </div>
 </template>
 <script>
@@ -743,6 +754,7 @@ import Constant from "@/constant";
 import PersonInfoDetail from "./personInfo-detail";
 import PersonDeviceRelationList from "./personDeviceRelation-list";
 import PersonDeviceRelationBoundList from "./personDeviceRelation-BoundList";
+import PersonPopedomList from "./personPopedom-list";
 
 import personInfoApi from "@/api/base/personInfo";
 import companyInfoApi from "@/api/base/companyInfo";
@@ -838,7 +850,8 @@ export default {
       bindWechatVisible: false,
       bindWechatUrl: "",
       bindWechatLoading: false,
-      parkList:[]
+      parkList:[],
+      showRoleModal:false
     };
   },
   created() {
@@ -1083,6 +1096,7 @@ export default {
       this.showModal = false;
       this.showDeviceModal = false;
       this.showBoundModal = false;
+      this.showRoleModal = false;
 
       if (refreshed) {
         this.changePage(this.pageIndex);
@@ -1597,6 +1611,11 @@ export default {
           });
       });
     },
+    bindRole(record) {
+      //绑定设备
+      this.personId = record.id;
+      this.showRoleModal = true;
+    },
   },
   async mounted() {
     var self = this;
@@ -1610,6 +1629,7 @@ export default {
     "personDeviceRelation-BoundList": PersonDeviceRelationBoundList,
     "el-select-tree": SelectTree,
     "lifeRecord-list": LifeRecordList,
+    "personPopedom-list":PersonPopedomList
   },
 };
 </script>

src/views/base/personPopedom-detail.vue

@@ -0,0 +1,227 @@
+
+<style scoped>
+.user-panel {
+  margin: 10px auto;
+}
+</style>
+<template>
+  <el-dialog
+    :visible.sync="showDialog"
+    :title="title"
+    :append-to-body="true"
+    style="text-align: left"
+    @close="closeDialog"
+    :close-on-click-modal="false"
+  >
+    <div class="user-panel" v-loading="loading">
+      <el-form
+        ref="form"
+        :model="formModel"
+        :rules="ruleValidate"
+        :label-width="'100px'"
+      >
+        <el-form-item label="公司" prop="companyId">
+          <el-select-tree
+            :props="props"
+            :options="companyResult"
+            v-model="formModel.companyId"
+            height="200"
+          ></el-select-tree>
+        </el-form-item>
+        <el-form-item label="角色" prop="personRoleId">
+          <el-select
+            v-model="formModel.personRoleId"
+            filterable
+            placeholder="请选择"
+            style="width: 280px"
+          >
+            <el-option
+              v-for="role in personRoleResult"
+              :key="role.id"
+              :label="role.personRoleName"
+              :value="role.id"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="展示的图标" prop="showIconId">
+          <el-input
+            v-model="formModel.showIconId"
+            placeholder="请输入展示的图标id"
+            style="width: 300px"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="备注信息" prop="remark">
+          <el-input
+            v-model="formModel.remark"
+            placeholder="请输入备注信息"
+            style="width: 300px"
+          ></el-input>
+        </el-form-item>
+      </el-form>
+    </div>
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="closeDialog">取 消</el-button>
+      <el-button type="primary" @click="handleSubmit" :loading="submitting"
+        >确 定</el-button
+      >
+    </span>
+  </el-dialog>
+</template>
+<script>
+import Constant from "@/constant";
+import personPopedomApi from "@/api/base/personPopedom";
+import personRoleInfoApi from "@/api/base/personRoleInfo";
+import companyInfoApi from "@/api/base/companyInfo";
+import deviceInfoApi from "@/api/base/deviceInfo";
+import SelectTree from "@/components/SelectTree";
+
+export default {
+  components: {
+    "el-select-tree": SelectTree,
+  },
+  props: ["businessKey", "title", "personId"],
+  data() {
+    return {
+      formModel: { companyId: "" },
+      ruleValidate: {
+        companyId: [
+          { required: true, message: "对应公司id不能为空", trigger: "blur" },
+        ],
+        personRoleId: [
+          { required: true, message: "对应角色id不能为空", trigger: "blur" },
+        ],
+      },
+      showDialog: true,
+      loading: false,
+      submitting: false,
+      companyResult: [],
+      treeData: [],
+      props: {
+        // 配置项（必选）
+        value: "id",
+        label: "name",
+        children: "children",
+      },
+      personRoleResult: [],
+    };
+  },
+  created() {
+    var self = this;
+    companyInfoApi.list().then(function (response) {
+      var jsonData = response.data;
+      if (jsonData.result) {
+        if (jsonData.data != null && jsonData.data != "") {
+          self.companyResult = jsonData.data;
+        }
+      }
+    });
+
+    // var formData = new FormData();
+    // formData.append("companyId", "c52b03cb-7526-4e8b-8b90-4f7a6a37b586");
+    // personRoleInfoApi.listByCompanyId(formData).then(function (response) {
+    //   var jsonData = response.data;
+    //   if (jsonData.result) {
+    //     if (jsonData.data != null && jsonData.data != "") {
+    //       self.personRoleResult = jsonData.data;
+    //     }
+    //   }
+    // });
+
+    this.loadTree();
+  },
+  watch: {
+    "formModel.companyId": function (val, oldval) {
+      if(val != null && val != ""){
+        var self = this;
+        self.formModel.personRoleId = "";
+        var formData = new FormData();
+        formData.append("companyId", val);
+        personRoleInfoApi.listByCompanyId(formData).then(function (response) {
+          var jsonData = response.data;
+          if (jsonData.result) {
+            if (jsonData.data != null && jsonData.data != "") {
+              self.personRoleResult = jsonData.data;
+            }
+          }
+        });
+      }
+    },
+  },
+  methods: {
+    loadTree() {
+      var formData = new FormData();
+      companyInfoApi.loadChildren(formData).then((resp) => {
+        var jsonData = resp.data;
+
+        if (jsonData.result) {
+          this.treeData = jsonData.data;
+        } else {
+          this.$message.error(jsonData.message + "");
+        }
+      });
+    },
+    closeDialog() {
+      this.$emit("close", false);
+    },
+    handleSubmit() {
+      var self = this;
+      self.formModel.personId = self.personId;
+      this.$refs["form"].validate((valid) => {
+        if (valid) {
+          (function () {
+            var id = self.formModel.id;
+
+            if (id == null || id.length == 0) {
+              return personPopedomApi.add(self.formModel);
+            } else {
+              return personPopedomApi.update(self.formModel);
+            }
+          })().then(function (response) {
+            var jsonData = response.data;
+
+            if (jsonData.result) {
+              self.$message({
+                message: "保存成功!",
+                type: "success",
+              });
+
+              self.$emit("close", true);
+            } else {
+              self.$message({
+                message: jsonData.message + "",
+                type: "warning",
+              });
+
+              self.$emit("close", false);
+            }
+          });
+        }
+      });
+    },
+  },
+  mounted: function () {
+    var self = this;
+
+    (function () {
+      if (self.businessKey.length == 0) {
+        return personPopedomApi.create();
+      } else {
+        return personPopedomApi.edit(self.businessKey);
+      }
+    })()
+      .then((response) => {
+        var jsonData = response.data;
+        self.loading = false;
+
+        if (jsonData.result) {
+          self.formModel = jsonData.data;
+        } else {
+          self.$message.error(jsonData.message + "");
+        }
+      })
+      .catch((error) => {
+        self.$message.error(error + "");
+      });
+  },
+};
+</script>

src/views/base/personPopedom-list.vue

@@ -0,0 +1,279 @@
+<template>
+  <el-dialog
+    :visible.sync="showDialog"
+    title="查看用户角色"
+    :modal-append-to-body="false"
+    append-to-body
+    :modal="true"
+    style="text-align: left"
+    @close="closeDialog"
+    :close-on-click-modal="false"
+    width="970px"
+  >
+    <div>
+      <!--
+      要resetFields起作用，必须配置:model和prop
+      -->
+      <el-divider></el-divider>
+      <el-row class="button-group">
+        <el-button
+          type="primary"
+          size="small"
+          plain
+          icon="el-icon-circle-plus"
+          @click="handleAdd"
+          >新增</el-button
+        >
+        <el-button
+          type="primary"
+          size="small"
+          plain
+          @click="handleReLoad"
+          >刷新</el-button
+        >
+      </el-row>
+      <el-table
+        :data="tableData"
+        style="min-height: 400px"
+        v-loading="loading"
+        stripe
+        @sort-change="sortChange"
+        @selection-change="handleSelectionChange"
+      >
+        <el-table-column
+          prop="companyName"
+          label="公司"
+          width="180"
+        ></el-table-column>
+        <el-table-column
+          prop="roleName"
+          label="角色"
+          width="150"
+        ></el-table-column>
+        <el-table-column
+          prop="showIconId"
+          label="图标信息"
+          width="150"
+        ></el-table-column>
+        <el-table-column
+          prop="remark"
+          label="备注信息"
+          width="150"
+        ></el-table-column>
+        <el-table-column prop="useEnable" label="默认" width="180">
+          <template slot-scope="{ row }">
+            <el-switch
+              v-model="row.isDefault"
+              active-color="#13ce66"
+              inactive-color="#ff4949"
+              @change="changeDefault(row)"
+              :disabled="row.isDefault"
+            ></el-switch>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" width="100">
+          <template slot-scope="{ row }">
+            <el-link type="danger" :underline="false" @click="handleDelete(row)"
+              >删除</el-link
+            >
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-pagination
+        :current-page.sync="pageIndex"
+        :total="totalElements"
+        :page-sizes="pageSizeList"
+        @current-change="changePage"
+        @size-change="pageSizeChange"
+        layout="total, sizes, prev, pager, next, jumper"
+      ></el-pagination>
+      <personPopedom-detail
+        v-if="showModal"
+        :businessKey="businessKey"
+        :title="modalTitle"
+        @close="onDetailModalClose"
+        :personId="personId"
+      ></personPopedom-detail>
+    </div>
+  </el-dialog>
+</template>
+<script>
+import Constant from "@/constant";
+import PersonPopedomDetail from "./personPopedom-detail";
+import personPopedomApi from "@/api/base/personPopedom";
+import NProgress from "nprogress"; // progress bar
+import "nprogress/nprogress.css"; // progress bar style
+
+export default {
+  props: ["personId"],
+  data() {
+    var self = this;
+
+    return {
+      queryModel: {
+        personId: "",
+      },
+      loading: false,
+      tableData: [],
+      pageIndex: 1,
+      pageSize: 10,
+      totalPages: 0,
+      totalElements: 0,
+      field: "",
+      direction: "",
+      pageSizeList: [10, 20, 30],
+      multipleSelection: [],
+      showModal: false,
+      modalTitle: "",
+      showDialog: true,
+    };
+  },
+  methods: {
+    closeDialog() {
+      this.$emit("close", false);
+    },
+    changePage(pageIndex) {
+      var self = this;
+
+      self.loading = true;
+
+      self.pageIndex = pageIndex;
+      var formData = new FormData();
+
+      formData.append("pageIndex", self.pageIndex);
+      formData.append("pageSize", self.pageSize);
+
+      formData.append("personId", self.personId);
+
+      if (this.field != null) {
+        formData.append("field", this.field);
+      }
+
+      if (this.direction != null) {
+        formData.append("direction", this.direction);
+      }
+
+      personPopedomApi
+        .pageList(formData)
+        .then(function (response) {
+          self.loading = false;
+
+          var jsonData = response.data.data;
+          console.log(jsonData.data);
+          self.tableData = jsonData.data;
+          self.totalPages = jsonData.totalPages;
+          self.totalElements = jsonData.recordsTotal;
+        })
+        .catch((error) => {
+          self.loading = false;
+          // self.$message.error(error + "");
+        });
+    },
+    pageSizeChange(pageSize) {
+      this.pageSize = pageSize;
+    },
+    sortChange(data) {
+      this.field = data.column.field;
+      this.direction = data.order;
+
+      this.changePage(this.pageIndex);
+    },
+    handleSelectionChange(val) {
+      this.multipleSelection = val;
+    },
+    handleReset(name) {
+      this.$refs[name].resetFields();
+    },
+    handleAdd() {
+      this.modalTitle = "新增";
+      this.businessKey = "";
+      this.showModal = true;
+      this.personId = this.personId;
+    },
+    handleDelete(record) {
+      var self = this;
+      this.$confirm("是否解除关联？", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+        distinguishCancelAndClose: true,
+      })
+        .then(() => {
+          self.loading = true;
+
+          personPopedomApi.remove(record.id).then(function (response) {
+            var jsonData = response.data;
+            self.loading = false;
+            if (jsonData.result) {
+              // var index = self.tableData.indexOf(record);
+              // self.tableData.splice(index, 1);
+              self.changePage(self.pageIndex);
+
+              self.$message({
+                type: "success",
+                message: "解绑成功!",
+              });
+            }
+          });
+        })
+        .catch((error) => {
+          self.loading = false;
+          // self.$message.error(error + "");
+        });
+    },
+    onDetailModalClose(refreshed) {
+      //保存成功后回调
+      this.showModal = false;
+
+      if (refreshed) {
+        this.changePage(this.pageIndex);
+      }
+    },
+    handleReLoad() {
+      var self = this;
+      self.changePage(self.pageIndex);
+    },
+    changeDefault(record) {
+      var self = this;
+      var formData = new FormData();
+      self.loading = true;
+
+      formData.append("id", record.id);
+      formData.append("personId", this.personId);
+      personPopedomApi.changeDefault(formData).then(function (response) {
+        var jsonData = response.data;
+        self.loading = false;
+        if (jsonData.result) {
+          self.changePage(self.pageIndex);
+        }
+      });
+    },
+  },
+  mounted: function () {
+    this.changePage(1);
+  },
+  components: {
+    "personPopedom-detail": PersonPopedomDetail,
+  },
+};
+</script>
+<style lang="scss" scoped>
+.el-breadcrumb {
+  margin: 10px;
+  line-height: 20px;
+}
+
+.el-divider {
+  margin: 5px 0;
+}
+
+.demo-form-inline {
+  margin-left: 10px;
+  text-align: left;
+}
+
+.button-group {
+  margin-left: 10px;
+  text-align: left;
+}
+</style>

src/views/base/personRoleInfo-detail.vue

@@ -11,21 +11,15 @@
     :modal-append-to-body="false"
     style="text-align: left"
     @close="closeDialog"
+    :close-on-click-modal="false"
   >
     <div class="user-panel" v-loading="loading">
       <el-form
         ref="form"
         :model="formModel"
         :rules="ruleValidate"
-        :label-width="'100px'"
+        :label-width="'20%'"
       >
-        <el-form-item label="" prop="id">
-          <el-input
-            v-model="formModel.id"
-            placeholder="请输入"
-            style="width: 300px"
-          ></el-input>
-        </el-form-item>
         <el-form-item label="用户角色名称" prop="personRoleName">
           <el-input
             v-model="formModel.personRoleName"
@@ -34,18 +28,26 @@
           ></el-input>
         </el-form-item>
         <el-form-item label="适用于与场景id" prop="sceneId">
-          <el-input
+          <el-select
             v-model="formModel.sceneId"
-            placeholder="请输入适用于与场景id"
-            style="width: 300px"
-          ></el-input>
+            filterable
+            placeholder="请选择"
+            style="width: 200px"
+          >
+            <el-option
+              v-for="result in sceneData"
+              :key="result.id"
+              :label="result.sceneName"
+              :value="result.id"
+            ></el-option>
+          </el-select>
         </el-form-item>
         <el-form-item label="是否启用" prop="useEnable">
-          <el-input
+          <el-switch
             v-model="formModel.useEnable"
-            placeholder="请输入是否启用"
-            style="width: 300px"
-          ></el-input>
+            active-color="#13ce66"
+            inactive-color="#ff4949"
+          ></el-switch>
         </el-form-item>
         <el-form-item label="备注" prop="remark">
           <el-input
@@ -54,41 +56,6 @@
             style="width: 300px"
           ></el-input>
         </el-form-item>
-        <el-form-item label="创建人" prop="createBy">
-          <el-input
-            v-model="formModel.createBy"
-            placeholder="请输入创建人"
-            style="width: 300px"
-          ></el-input>
-        </el-form-item>
-        <el-form-item label="创建时间" prop="createTime">
-          <el-input
-            v-model="formModel.createTime"
-            placeholder="请输入创建时间"
-            style="width: 300px"
-          ></el-input>
-        </el-form-item>
-        <el-form-item label="更新人" prop="updateBy">
-          <el-input
-            v-model="formModel.updateBy"
-            placeholder="请输入更新人"
-            style="width: 300px"
-          ></el-input>
-        </el-form-item>
-        <el-form-item label="更新时间" prop="updateTime">
-          <el-input
-            v-model="formModel.updateTime"
-            placeholder="请输入更新时间"
-            style="width: 300px"
-          ></el-input>
-        </el-form-item>
-        <el-form-item label="是否删除" prop="delFlag">
-          <el-input
-            v-model="formModel.delFlag"
-            placeholder="请输入是否删除"
-            style="width: 300px"
-          ></el-input>
-        </el-form-item>
       </el-form>
     </div>
     <span slot="footer" class="dialog-footer">
@@ -104,9 +71,10 @@ import Constant from "@/constant";
 import personRoleInfoApi from "@/api/base/personRoleInfo";
 
 export default {
-  props: ["businessKey", "title"],
+  props: ["businessKey", "title", "sceneData"],
   data() {
     return {
+      formModel: {},
       ruleValidate: {
         id: [{ required: true, message: "不能为空", trigger: "blur" }],
         personRoleName: [
@@ -119,25 +87,6 @@ export default {
             trigger: "blur",
           },
         ],
-        useEnable: [
-          { required: true, message: "是否启用不能为空", trigger: "blur" },
-        ],
-        remark: [{ required: true, message: "备注不能为空", trigger: "blur" }],
-        createBy: [
-          { required: true, message: "创建人不能为空", trigger: "blur" },
-        ],
-        createTime: [
-          { required: true, message: "创建时间不能为空", trigger: "blur" },
-        ],
-        updateBy: [
-          { required: true, message: "更新人不能为空", trigger: "blur" },
-        ],
-        updateTime: [
-          { required: true, message: "更新时间不能为空", trigger: "blur" },
-        ],
-        delFlag: [
-          { required: true, message: "是否删除不能为空", trigger: "blur" },
-        ],
       },
       showDialog: true,
       loading: false,
@@ -188,6 +137,10 @@ export default {
     var self = this;
 
     (function () {
+      if (self.formModel.useEnable == null) {
+        self.formModel.useEnable = 0;
+      }
+
       if (self.businessKey.length == 0) {
         return personRoleInfoApi.create();
       } else {

src/views/base/personRoleInfo-list.vue

@@ -6,7 +6,7 @@
         <a href="#">系统管理</a>
       </el-breadcrumb-item>
       <el-breadcrumb-item>
-        <a href="/personRoleInfo">角色管理</a>
+        <a href="/personRoleInfo">用户角色管理</a>
       </el-breadcrumb-item>
     </el-breadcrumb>
     <el-divider></el-divider>
@@ -19,26 +19,34 @@
       inline
       class="demo-form-inline"
     >
-      <el-form-item label="用户角色名称" prop="personRoleName">
-        <el-input
-          type="text"
-          size="mini"
-          v-model="queryModel.personRoleName"
-        ></el-input>
-      </el-form-item>
-      <el-form-item label="适用于与场景id" prop="sceneId">
-        <el-input
-          type="text"
-          size="mini"
+      <el-form-item label="适用场景" prop="sceneId">
+        <el-select
           v-model="queryModel.sceneId"
-        ></el-input>
+          filterable
+          placeholder="请选择"
+          style="width: 110px"
+          size="mini"
+        >
+          <el-option
+            v-for="result in sceneData"
+            :key="result.id"
+            :label="result.sceneName"
+            :value="result.id"
+          ></el-option>
+        </el-select>
       </el-form-item>
       <el-form-item label="是否启用" prop="useEnable">
-        <el-input
-          type="text"
-          size="mini"
+        <el-select
           v-model="queryModel.useEnable"
-        ></el-input>
+          filterable
+          placeholder="请选择"
+          style="width: 80px"
+          size="mini"
+        >
+          <el-option label="全部" value=""></el-option>
+          <el-option label="是" value="1"></el-option>
+          <el-option label="否" value="0"></el-option>
+        </el-select>
       </el-form-item>
       <el-form-item>
         <el-button
@@ -131,6 +139,7 @@
       v-if="showModal"
       :businessKey="businessKey"
       :title="modalTitle"
+      :sceneData="sceneData"
       @close="onDetailModalClose"
     ></personRoleInfo-detail>
   </div>
@@ -139,6 +148,7 @@
 import Constant from "@/constant";
 import PersonRoleInfoDetail from "./personRoleInfo-detail";
 import personRoleInfoApi from "@/api/base/personRoleInfo";
+import sceneInfoApi from "@/api/base/sceneInfo";
 import NProgress from "nprogress"; // progress bar
 import "nprogress/nprogress.css"; // progress bar style
 
@@ -148,16 +158,8 @@ export default {
 
     return {
       queryModel: {
-        id: "",
-        personRoleName: "",
         sceneId: "",
         useEnable: "",
-        remark: "",
-        createBy: "",
-        createTime: "",
-        updateBy: "",
-        updateTime: "",
-        delFlag: "",
       },
       loading: false,
       tableData: [],
@@ -172,8 +174,15 @@ export default {
       showModal: false,
       modalTitle: "",
       businessKey: "",
+      sceneData: [],
     };
   },
+  created() {
+    sceneInfoApi.list().then((response) => {
+      var jsonData = response.data;
+      this.sceneData = jsonData.data;
+    });
+  },
   methods: {
     changePage(pageIndex) {
       var self = this;
@@ -186,16 +195,8 @@ export default {
       formData.append("pageIndex", self.pageIndex);
       formData.append("pageSize", self.pageSize);
 
-      formData.append("id", self.queryModel.id);
-      formData.append("personRoleName", self.queryModel.personRoleName);
       formData.append("sceneId", self.queryModel.sceneId);
       formData.append("useEnable", self.queryModel.useEnable);
-      formData.append("remark", self.queryModel.remark);
-      formData.append("createBy", self.queryModel.createBy);
-      formData.append("createTime", self.queryModel.createTime);
-      formData.append("updateBy", self.queryModel.updateBy);
-      formData.append("updateTime", self.queryModel.updateTime);
-      formData.append("delFlag", self.queryModel.delFlag);
 
       if (this.field != null) {
         formData.append("field", this.field);
@@ -244,11 +245,13 @@ export default {
       this.modalTitle = "新增";
       this.businessKey = "";
       this.showModal = true;
+      this.sceneData = this.sceneData;
     },
     handleEdit(record) {
       this.modalTitle = "编辑";
       this.businessKey = record.id;
       this.showModal = true;
+      this.sceneData = this.sceneData;
     },
     handleDelete(record) {
       var self = this;