From 061def3606b5c9bd269729de0a85b475ccb3b355 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Wed, 13 Dec 2023 10:30:57 +0800
Subject: [PATCH] 住户标签+场所管理

---
 src/api/place/place.js                |   19 
 src/api/label/label.js                |    9 
 src/views/place/index.vue             |  754 +++++++++++++++++-----------
 src/views/userHouse/houseHoldList.vue |  752 ++++++++++++++++------------
 4 files changed, 900 insertions(+), 634 deletions(-)

diff --git a/src/api/label/label.js b/src/api/label/label.js
index 31d2fac..8f419a2 100644
--- a/src/api/label/label.js
+++ b/src/api/label/label.js
@@ -7,6 +7,15 @@
     params: {}
   })
 }
+export const getLabelList = (params) => {
+  return request({
+    url: '/api/blade-label/label/getLabelList',
+    method: 'get',
+    params: {
+       ...params
+    }
+  })
+}
 export const getList = (current, size, params) => {
   return request({
     url: '/api/blade-label/label/list',
diff --git a/src/api/place/place.js b/src/api/place/place.js
index 3513d7a..d4458af 100644
--- a/src/api/place/place.js
+++ b/src/api/place/place.js
@@ -46,4 +46,21 @@
       id
     }
   })
-}
\ No newline at end of file
+}
+
+export const getPlaceExt = (params) => {
+  return request({
+    url: '/api/blade-placeExt/placeExt/getDetail',
+    method: 'get',
+    params: {
+      ...params
+    }
+  })
+}
+export const updatePlaceExt = (row) => {
+  return request({
+    url: '/api/blade-placeExt/placeExt/update',
+    method: 'post',
+    data: row
+  })
+}
diff --git a/src/views/place/index.vue b/src/views/place/index.vue
index d55de56..982c98b 100644
--- a/src/views/place/index.vue
+++ b/src/views/place/index.vue
@@ -15,340 +15,484 @@
         </el-button>
       </template>
     </avue-crud>
-    
+
+    <el-dialog title="场所维护" append-to-body :visible.sync="roleBox" center>
+      <avue-crud :option="placeOption" :search.sync="search" :table-loading="loading" :data="placeExt" ref="crud"
+        v-model="houseHoldForm" :permission="permissionList" @row-del="houseHoldRowDel" @row-update="houseHoldRowUpdate"
+        @row-save="houseHoldRowSave" :page.sync="holdPage" @current-change="currentChange" @size-change="sizeChange">
+      </avue-crud>
+
+      <avue-form :option="optionDetail" v-model="placeForm"></avue-form>
+
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="roleBox = false">取 消</el-button>
+        <el-button type="primary" @click="submitRole">确 定</el-button>
+      </span>
+    </el-dialog>
+
   </basic-container>
 </template>
 
 <script>
-import { getList, remove, update, add, getPlace } from "@/api/place/place";
-import { mapGetters } from "vuex";
-import website from '@/config/website';
-export default {
-  data() {
-    return {
-      form: {},
-      query: {},
-      loading: true,
-      page: {
-        pageSize: 10,
-        currentPage: 1,
-        total: 0,
-      },
-      datetime: "",
-      selectionList: [],
-      option: {
-        height: "auto",
-        calcHeight: 54,
-        dialogWidth: 950,
-        tip: false,
-        searchShow: true,
-        searchMenuSpan: 3,
-        menuWidth: 350,
-        border: true,
-        //stripe:true,
-        index: true,
-        viewBtn: true,
-        selection: true,
-        dialogClickModal: false,
-        column: [
-          {
-            label: "场所名称",
-            prop: "placeName",
+  import {
+    getList,
+    remove,
+    update,
+    add,
+    getPlace,
+    getPlaceExt,
+    updatePlaceExt
+  } from "@/api/place/place";
+  import {
+    mapGetters
+  } from "vuex";
+  import website from '@/config/website';
+  export default {
+    data() {
+      return {
+        form: {},
+        query: {},
+        loading: true,
+        roleBox: false,
+        placeForm: {},
+        optionDetail: {
+          submitBtn: false,
+          emptyBtn: false,
+          column: [{
+              label: '场所名称',
+              prop: 'placeName',
+            },
+            {
+              label: '法人信息',
+              prop: 'legalPerson'
+            },
+            {
+              label: '法人电话',
+              prop: 'legalTel'
+            },
+            {
+              label: '场所位置',
+              prop: 'localtion'
+            }, {
+              label: '审核状态',
+              prop: 'confirmFlag',
+              type: 'radio',
+              dicData: [{
+                label: '待审核',
+                value: 0
+              }, {
+                label: '审核通过',
+                value: 1
+              }, {
+                label: '审核不通过',
+                value: 2
+              }]
+            }
+          ]
+        },
+        rowPlace: {},
+        placeExt: [],
+        placeOption: {
+          menu: false,
+          height: 300,
+          calcHeight: 54,
+          dialogWidth: 950,
+          tip: false,
+          searchShow: false,
+          addBtn: false,
+          delBtn: false,
+          editBtn: false,
+          border: true,
+          index: true,
+          dialogClickModal: false,
+          column: [{
+            label: "名称",
+            prop: "name",
             searchSpan: 4,
             search: true,
-            rules: [
-              {
+          }, {
+            label: "电话",
+            prop: "telephone",
+            searchSpan: 4,
+            search: true,
+          }, {
+            label: "暂住地",
+            prop: "tempAddress",
+            searchSpan: 4,
+            search: true,
+          }, ]
+        },
+        page: {
+          pageSize: 10,
+          currentPage: 1,
+          total: 0,
+        },
+        datetime: "",
+        selectionList: [],
+        option: {
+          height: "auto",
+          calcHeight: 54,
+          dialogWidth: 950,
+          tip: false,
+          searchShow: true,
+          searchMenuSpan: 3,
+          menuWidth: 350,
+          border: true,
+          //stripe:true,
+          index: true,
+          viewBtn: true,
+          selection: true,
+          dialogClickModal: false,
+          column: [{
+              label: "场所名称",
+              prop: "placeName",
+              searchSpan: 4,
+              search: true,
+              rules: [{
                 required: true,
                 message: "请输入场所名称",
                 trigger: "blur",
-              },
-            ],
-          },
-          {
-            label: "场所标签",
-            prop: "label",
-            type:"tree",
-            dicUrl:"/api/blade-categoryLabel/categoryLabel/getAllList",
-            props: {
-              label: "categoryName",
-              value: "categoryNo"
+              }, ],
             },
-            multiple:true,
-            dataType:"string",
-            hide:true,
-            rules: [
-              {
+            {
+              label: "场所标签",
+              prop: "label",
+              type: "tree",
+              dicUrl: "/api/blade-categoryLabel/categoryLabel/getAllList",
+              props: {
+                label: "categoryName",
+                value: "categoryNo"
+              },
+              multiple: true,
+              dataType: "string",
+              hide: true,
+              rules: [{
                 required: true,
                 message: "请输入场所标签",
                 trigger: "blur",
-              },
-            ],
-          },
-          {
-            label: "负责人",
-            prop: "principal",
-            searchSpan: 4,
-            search: true,
-            rules: [
-              {
+              }, ],
+            },
+            {
+              label: "负责人",
+              prop: "principal",
+              searchSpan: 4,
+              search: true,
+              rules: [{
                 required: false,
                 message: "请输入负责人",
                 trigger: "blur",
-              },
-            ],
-          },
-          {
-            label: "联系电话",
-            prop: "principalPhone",
-            searchSpan: 4,
-            search: true,
-            rules: [
-              {
+              }, ],
+            },
+            {
+              label: "联系电话",
+              prop: "principalPhone",
+              searchSpan: 4,
+              search: true,
+              rules: [{
                 required: false,
                 message: "请输入联系电话",
                 trigger: "blur",
-              },
-            ],
-          },
-          {
-            label: "场所照片",
-            prop: "imageUrls",
-            width:80,
-            type: "upload",
-            listType: "picture-card",
-            dataType:"string",
-            multiple: true,
-            action: "/api/blade-resource/oss/endpoint/put-file",
-            propsHttp: {
-              res: "data",
-              name: 'name',
-              url: "link",
+              }, ],
+            }, {
+              label: "审核状态",
+              prop: "confirmFlag",
+              searchSpan: 4,
+              search: true,
+              dicData: [{
+                label: '待审核',
+                value: 0,
+              }, {
+                label: '审核通过',
+                value: 1,
+              }, {
+                label: '审核不通过',
+                value: 2,
+              }],
             },
-            span: 24,
-          },
-          {
-            label: "位置",
-            prop: "localtion",
-            span:24,
-            minWidth:220,
-            overHidden:true,
-            rules: [
-              {
+            {
+              label: "场所照片",
+              prop: "imageUrls",
+              width: 80,
+              type: "upload",
+              listType: "picture-card",
+              dataType: "string",
+              multiple: true,
+              action: "/api/blade-resource/oss/endpoint/put-file",
+              propsHttp: {
+                res: "data",
+                name: 'name',
+                url: "link",
+              },
+              span: 24,
+            },
+            {
+              label: "位置",
+              prop: "localtion",
+              span: 24,
+              minWidth: 220,
+              overHidden: true,
+              rules: [{
                 required: true,
                 message: "请输入区域",
                 trigger: "blur",
-              },
-            ],
-          }
-        ],
-      },
-      data: [],
-    };
-  },
-  watch: {
-  },
-  computed: {
-    ...mapGetters(["permission", "userInfo"]),
-    permissionList() {
-      return {
-        addBtn: this.vaildData(this.permission.place_add, true),
-        viewBtn: this.vaildData(this.permission.place_view, true),
-        delBtn: this.vaildData(this.permission.place_delete, true),
-        editBtn: this.vaildData(this.permission.place_edit, true),
-      };
-    },
-    ids() {
-      let ids = [];
-      this.selectionList.forEach((ele) => {
-        ids.push(ele.id);
-      });
-      return ids.join(",");
-    },
-  },
-  methods: {
-    rowSave(row, done, loading) {
-      if (row.imageUrls.length > 0) {
-        var urls = []
-        var split = row.imageUrls.split(",");
-        split.forEach(url => {
-          var names = url.split("jczz/");
-          urls.push(names[1])
-        })
-        row.imageUrls = urls.join(",")
-      }
-      add(row).then(
-        () => {
-          this.onLoad(this.page);
-          this.$message({
-            type: "success",
-            message: "操作成功!",
-          });
-          done();
-        },
-        (error) => {
-          window.console.log(error);
-          loading();
-        }
-      );
-    },
-    rowUpdate(row, index, done, loading) {
-      if (row.imageUrls.length > 0) {
-        var urls = []
-        var split = row.imageUrls.split(",");
-        split.forEach(url => {
-          var names = url.split("jczz/");
-          urls.push(names[1])
-        })
-        row.imageUrls = urls.join(",")
-      }
-      update(row).then(
-        () => {
-          this.onLoad(this.page);
-          this.$message({
-            type: "success",
-            message: "操作成功!",
-          });
-          done();
-        },
-        (error) => {
-          window.console.log(error);
-          loading();
-        }
-      );
-    },
-    rowDel(row) {
-      this.$confirm("确定将选择数据删除?", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
-        .then(() => {
-          return remove(row.id);
-        })
-        .then(() => {
-          this.onLoad(this.page);
-          this.$message({
-            type: "success",
-            message: "操作成功!",
-          });
-        });
-    },
-    searchReset() {
-      this.query = {};
-      this.onLoad(this.page);
-    },
-    searchChange(params, done) {
-      this.query = params;
-      this.page.currentPage = 1;
-      this.onLoad(this.page, params);
-      done();
-    },
-    selectionChange(list) {
-      this.selectionList = list;
-    },
-    selectionClear() {
-      this.selectionList = [];
-      this.$refs.crud.toggleSelection();
-    },
-    handleDelete() {
-      if (this.selectionList.length === 0) {
-        this.$message.warning("请选择至少一条数据");
-        return;
-      }
-      this.$confirm("确定将选择数据删除?", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
-        .then(() => {
-          return remove(this.ids);
-        })
-        .then(() => {
-          this.onLoad(this.page);
-          this.$message({
-            type: "success",
-            message: "操作成功!",
-          });
-          this.$refs.crud.toggleSelection();
-        });
-    },
-    beforeOpen(done, type) {
-      if (["edit", "view"].includes(type)) {
-        getPlace(this.form.id).then((res) => {
-          this.form = res.data.data;
-          if (this.form.imageUrls) {
-            if (this.form.imageUrls.length > 0) {
-              var urls = []
-              var names = this.form.imageUrls.split(",");
-              names.forEach(name => {
-                urls.push(website.minioUrl + name)
-              })
-              this.form.imageUrls = urls.join(",")
+              }, ],
             }
-          }
-          if(this.form.placePoiLabelVOList){
-            var arr = []
-            this.form.placePoiLabelVOList.forEach(item=>{
-              arr.push(item.poiCode);
-            })
-            this.form.label = arr.join(",")
-          }
-          console.log(this.form,888888)
-        });
-      }
-      // con
-      done();
-    },
-    currentChange(currentPage) {
-      this.page.currentPage = currentPage;
-    },
-    sizeChange(pageSize) {
-      this.page.pageSize = pageSize;
-    },
-    refreshChange() {
-      this.onLoad(this.page, this.query);
-    },
-    onLoad(page, params = {}) {
-      const { dateTime } = this.query;
-      let values = {
-        ...params,
+          ],
+        },
+        data: [],
       };
-      if (dateTime) {
-        values = {
-          ...params,
-          startTime: dateTime[0],
-          endTime: dateTime[1],
-          ...this.query,
+    },
+    watch: {},
+    computed: {
+      ...mapGetters(["permission", "userInfo"]),
+      permissionList() {
+        return {
+          addBtn: this.vaildData(this.permission.place_add, true),
+          viewBtn: this.vaildData(this.permission.place_view, true),
+          delBtn: this.vaildData(this.permission.place_delete, true),
+          editBtn: this.vaildData(this.permission.place_edit, true),
         };
-        values.dateTime = null;
-      }
-      this.loading = true;
-      getList(page.currentPage, page.pageSize, values).then((res) => {
-        const data = res.data.data;
-        this.page.total = data.total;
-        this.data = data.records;
-        this.data.forEach(item => {
-          if (item.imageUrls) {
-            if (item.imageUrls.length > 0) {
-              var urls = []
-              var names = item.imageUrls.split(",");
-              names.forEach(name => {
-                urls.push(website.minioUrl + name)
-              })
-              item.imageUrls = urls.join(",")
-            }
+      },
+      ids() {
+        let ids = [];
+        this.selectionList.forEach((ele) => {
+          ids.push(ele.id);
+        });
+        return ids.join(",");
+      },
+    },
+    methods: {
+
+      ManageTenants(item) {
+        this.roleBox = true
+        this.rowPlace = item
+        this.placeForm = {
+          placeName: '',
+          legalPerson: '',
+          legalTel: '',
+          localtion: '',
+          confirmFlag: '',
+        };
+        this.placeExt = []
+        this.onLoadPlaceExt()
+      },
+
+      submitRole() {
+        updatePlaceExt(this.placeForm).then(
+          () => {
+            this.$message({
+              type: "success",
+              message: "操作成功!",
+            });
+            this.roleBox = false
+          },
+          (error) => {
+            window.console.log(error);
+            loading();
           }
-        })
-        this.loading = false;
-        this.selectionClear();
-      });
+        );
+      },
+
+      onLoadPlaceExt() {
+        let params = {
+          placeId: this.rowPlace.id,
+        }
+        getPlaceExt(Object.assign(params)).then(res => {
+          const data = res.data.data;
+          if (data) {
+            this.placeForm = data;
+            this.placeExt = data.placePractitioner;
+            this.loading = false;
+            this.selectionClear();
+          }
+        });
+      },
+
+      rowSave(row, done, loading) {
+        if (row.imageUrls.length > 0) {
+          var urls = []
+          var split = row.imageUrls.split(",");
+          split.forEach(url => {
+            var names = url.split("jczz/");
+            urls.push(names[1])
+          })
+          row.imageUrls = urls.join(",")
+        }
+        add(row).then(
+          () => {
+            this.onLoad(this.page);
+            this.$message({
+              type: "success",
+              message: "操作成功!",
+            });
+            done();
+          },
+          (error) => {
+            window.console.log(error);
+            loading();
+          }
+        );
+      },
+      rowUpdate(row, index, done, loading) {
+        if (row.imageUrls.length > 0) {
+          var urls = []
+          var split = row.imageUrls.split(",");
+          split.forEach(url => {
+            var names = url.split("jczz/");
+            urls.push(names[1])
+          })
+          row.imageUrls = urls.join(",")
+        }
+        update(row).then(
+          () => {
+            this.onLoad(this.page);
+            this.$message({
+              type: "success",
+              message: "操作成功!",
+            });
+            done();
+          },
+          (error) => {
+            window.console.log(error);
+            loading();
+          }
+        );
+      },
+      rowDel(row) {
+        this.$confirm("确定将选择数据删除?", {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning",
+          })
+          .then(() => {
+            return remove(row.id);
+          })
+          .then(() => {
+            this.onLoad(this.page);
+            this.$message({
+              type: "success",
+              message: "操作成功!",
+            });
+          });
+      },
+      searchReset() {
+        this.query = {};
+        this.onLoad(this.page);
+      },
+      searchChange(params, done) {
+        this.query = params;
+        this.page.currentPage = 1;
+        this.onLoad(this.page, params);
+        done();
+      },
+      selectionChange(list) {
+        this.selectionList = list;
+      },
+      selectionClear() {
+        this.selectionList = [];
+        this.$refs.crud.toggleSelection();
+      },
+      handleDelete() {
+        if (this.selectionList.length === 0) {
+          this.$message.warning("请选择至少一条数据");
+          return;
+        }
+        this.$confirm("确定将选择数据删除?", {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning",
+          })
+          .then(() => {
+            return remove(this.ids);
+          })
+          .then(() => {
+            this.onLoad(this.page);
+            this.$message({
+              type: "success",
+              message: "操作成功!",
+            });
+            this.$refs.crud.toggleSelection();
+          });
+      },
+      beforeOpen(done, type) {
+        if (["edit", "view"].includes(type)) {
+          getPlace(this.form.id).then((res) => {
+            this.form = res.data.data;
+            if (this.form.imageUrls) {
+              if (this.form.imageUrls.length > 0) {
+                var urls = []
+                var names = this.form.imageUrls.split(",");
+                names.forEach(name => {
+                  urls.push(website.minioUrl + name)
+                })
+                this.form.imageUrls = urls.join(",")
+              }
+            }
+            if (this.form.placePoiLabelVOList) {
+              var arr = []
+              this.form.placePoiLabelVOList.forEach(item => {
+                arr.push(item.poiCode);
+              })
+              this.form.label = arr.join(",")
+            }
+            console.log(this.form, 888888)
+          });
+        }
+        // con
+        done();
+      },
+      currentChange(currentPage) {
+        this.page.currentPage = currentPage;
+      },
+      sizeChange(pageSize) {
+        this.page.pageSize = pageSize;
+      },
+      refreshChange() {
+        this.onLoad(this.page, this.query);
+      },
+      onLoad(page, params = {}) {
+        const {
+          dateTime
+        } = this.query;
+        let values = {
+          ...params,
+        };
+        if (dateTime) {
+          values = {
+            ...params,
+            startTime: dateTime[0],
+            endTime: dateTime[1],
+            ...this.query,
+          };
+          values.dateTime = null;
+        }
+        this.loading = true;
+        getList(page.currentPage, page.pageSize, values).then((res) => {
+          const data = res.data.data;
+          this.page.total = data.total;
+          this.data = data.records;
+          this.data.forEach(item => {
+            if (item.imageUrls) {
+              if (item.imageUrls.length > 0) {
+                var urls = []
+                var names = item.imageUrls.split(",");
+                names.forEach(name => {
+                  urls.push(website.minioUrl + name)
+                })
+                item.imageUrls = urls.join(",")
+              }
+            }
+          })
+          this.loading = false;
+          this.selectionClear();
+        });
+      }
     }
-  }
-};
+  };
 </script>
 
 <style>
-.avue-upload__icon {
-  line-height: 6;
-}
+  .avue-upload__icon {
+    line-height: 6;
+  }
 </style>
diff --git a/src/views/userHouse/houseHoldList.vue b/src/views/userHouse/houseHoldList.vue
index 059af9c..f18e46d 100644
--- a/src/views/userHouse/houseHoldList.vue
+++ b/src/views/userHouse/houseHoldList.vue
@@ -2,8 +2,8 @@
   <el-row>
     <el-col :span="24">
       <basic-container>
-        <avue-crud :option="option" :search.sync="search" :table-loading="loading" :data="data" ref="crud" v-model="form"
-          :permission="permissionList" @row-del="rowDel" @row-update="rowUpdate" @row-save="rowSave"
+        <avue-crud :option="option" :search.sync="search" :table-loading="loading" :data="data" ref="crud"
+          v-model="form" :permission="permissionList" @row-del="rowDel" @row-update="rowUpdate" @row-save="rowSave"
           :before-open="beforeOpen" :page.sync="page" @search-change="searchChange" @search-reset="searchReset"
           @selection-change="selectionChange" @current-change="currentChange" @size-change="sizeChange"
           @refresh-change="refreshChange" @on-load="onLoad">
@@ -11,12 +11,21 @@
             <el-button type="danger" size="small" plain icon="el-icon-delete" v-if="permission.household_delete"
               @click="handleDelete">删 除
             </el-button>
-            <el-button type="success" size="small" plain v-if="this.permission.household_import"
-              icon="el-icon-upload2" @click="handleImport">导入
+            <el-button type="success" size="small" plain v-if="this.permission.household_import" icon="el-icon-upload2"
+              @click="handleImport">导入
             </el-button>
-            <el-button type="warning" size="small" plain v-if="this.permission.household_export"
-              icon="el-icon-download" @click="handleExport">导出
+            <el-button type="warning" size="small" plain v-if="this.permission.household_export" icon="el-icon-download"
+              @click="handleExport">导出
             </el-button>
+          </template>
+          <template slot-scope="scope" slot="menu">
+            <el-button type="text" icon="el-icon-circle-plus-outline" size="small" v-if="permission.househould_manager"
+              @click="manageLabel(scope.row)">标签
+            </el-button>
+            <!--  <el-button type="success" size="small" plain icon="el-icon-upload2" @click="handleImport">导入
+            </el-button>
+            <el-button type="warning" size="small" plain icon="el-icon-download" @click="handleExport">导出
+            </el-button> -->
           </template>
           <template slot-scope="{row}" slot="tenantName">
             <el-tag>{{ row.tenantName }}</el-tag>
@@ -31,7 +40,7 @@
             <el-tag>{{ row.userTypeName }}</el-tag>
           </template>
         </avue-crud>
-        <el-dialog title="用户角色配置" append-to-body :visible.sync="roleBox" width="345px">
+        <el-dialog title="用户角色配置" append-to-body :visible.sync="roleBox" width="345px" center>
 
           <el-tree :data="roleGrantList" show-checkbox check-strictly default-expand-all node-key="id" ref="treeRole"
             :default-checked-keys="roleTreeObj" :props="props">
@@ -42,6 +51,42 @@
             <el-button type="primary" @click="submitRole">确 定</el-button>
           </span>
         </el-dialog>
+
+        <el-dialog title="标签管理" append-to-body :visible.sync="labelFlag" center>
+
+          <div id="" v-for="(item1,index1) in labelData">
+            <el-row>
+              <el-col :span="24">
+                <div>
+                  <el-divider content-position="left">{{item1.name}}</el-divider>
+                </div>
+              </el-col>
+            </el-row>
+            <div id="" class="grid-container2" v-if="item1.children">
+              <div id="" v-for="(item2,index2) in item1.children ">
+                <div id="" @click="changLabel(item2)">
+                  {{item2.name}}
+                </div>
+              </div>
+            </div>
+          </div>
+
+
+          <span slot="footer" class="dialog-footer">
+            <el-button @click="roleBox = false">取 消</el-button>
+            <el-button type="primary" @click="submitRole">确 定</el-button>
+          </span>
+        </el-dialog>
+
+        <el-dialog title="编辑标签" append-to-body :visible.sync="editLabelFlge" width="655px">
+          <avue-form :option="labelOption" v-model="excelForm">
+            <template slot="excelTemplate">
+
+            </template>
+          </avue-form>
+        </el-dialog>
+
+
         <el-dialog title="用户数据导入" append-to-body :visible.sync="excelBox" width="555px">
           <avue-form :option="excelOption" v-model="excelForm" :upload-after="uploadAfter">
             <template slot="excelTemplate">
@@ -57,348 +102,399 @@
 </template>
 
 <script>
-import {
-  getList,
-  remove,
-  add,
-  update,
-  getDetatil
-} from "@/api/userHouse/list/houseHold.js";
-import {
-  exportBlob
-} from "@/api/common";
-import {
-  mapGetters
-} from "vuex";
-import {
-  getToken
-} from '@/util/auth';
-import {
-  downloadXls
-} from "@/util/util";
-import {
-  dateNow
-} from "@/util/date";
-import NProgress from 'nprogress';
-import 'nprogress/nprogress.css';
-import Qs from "qs";
+  import {
+    getList,
+    remove,
+    add,
+    update,
+    getDetatil
+  } from "@/api/userHouse/list/houseHold.js";
+  import {
+    getLabelList,
+  } from '@/api/label/label'
+  import {
+    exportBlob
+  } from "@/api/common";
+  import {
+    mapGetters
+  } from "vuex";
+  import {
+    getToken
+  } from '@/util/auth';
+  import {
+    downloadXls
+  } from "@/util/util";
+  import {
+    dateNow
+  } from "@/util/date";
+  import NProgress from 'nprogress';
+  import 'nprogress/nprogress.css';
+  import Qs from "qs";
 
-export default {
-  data() {
-    return {
-      form: {},
-      search: {},
-      excelBox: false,
-      selectionList: [],
-      query: {},
-      loading: true,
-      page: {
-        pageSize: 10,
-        currentPage: 1,
-        total: 0
-      },
-      option: {
-        height: 'auto',
-        calcHeight: 80,
-        tip: false,
-        searchShow: true,
-        searchMenuSpan: 6,
-        border: true,
-        index: true,
-        selection: true,
-        viewBtn: true,
-        addBtn:true,
-        dialogType: 'drawer',
-        dialogClickModal: false,
-        column: [{
-          label: "姓名",
-          prop: "name",
-          search: true,
-          searchSpan: 4,
+  export default {
+    data() {
+      return {
+        labelData: [],
+        form: {},
+        search: {},
+        excelBox: false,
+        selectionList: [],
+        labelFlag: false,
+        editLabelFlge: false,
+        query: {},
+        loading: true,
+        page: {
+          pageSize: 10,
+          currentPage: 1,
+          total: 0
         },
-        {
-          label: "电话",
-          prop: "phoneNumber",
-          search: true,
-          searchSpan: 4,
-        },
-        {
-          label: "身份证号",
-          prop: "idCard",
-          search: true,
-          searchSpan: 4,
-        },
-        {
-          label: "性别",
-          prop: "gender",
-          type: "select",
-          dicData: [
-            {
-              label: "男",
-              value: 1
+        option: {
+          height: 'auto',
+          calcHeight: 80,
+          tip: false,
+          searchShow: true,
+          searchMenuSpan: 6,
+          border: true,
+          index: true,
+          selection: true,
+          viewBtn: true,
+          addBtn: true,
+          dialogType: 'drawer',
+          dialogClickModal: false,
+          column: [{
+              label: "姓名",
+              prop: "name",
+              search: true,
+              searchSpan: 4,
             },
             {
-              label: "女",
+              label: "电话",
+              prop: "phoneNumber",
+              search: true,
+              searchSpan: 4,
+            },
+            {
+              label: "身份证号",
+              prop: "idCard",
+              search: true,
+              searchSpan: 4,
+            },
+            {
+              label: "性别",
+              prop: "gender",
+              type: "select",
+              dicData: [{
+                  label: "男",
+                  value: 1
+                },
+                {
+                  label: "女",
+                  value: 0
+                },
+                {
+                  label: "未知",
+                  value: 1
+                }
+              ],
+            },
+            {
+              label: "关系",
+              prop: "relationship",
+              type: "select",
+              dicUrl: "/api/blade-system/dict-biz/dictionary?code=roleRelation",
+              dataType: "number",
+              props: {
+                label: "dictValue",
+                value: "dictKey",
+              },
+            },
+            {
+              label: "小区",
+              prop: "aoiName",
+              search: true,
+              searchSpan: 4,
+            },
+            {
+              label: "地址",
+              prop: "address",
+              display: false
+            },
+          ]
+        },
+        data: [],
+
+        excelForm: {},
+        labelOption: {
+          column: [{
+            label: '级别',
+            prop: 'radio',
+            type: 'radio',
+            button: true,
+            row: true,
+            dicData: [{
+              label: '撤销',
+              value: -1
+            }, {
+              label: '绿',
               value: 0
-            },
-            {
-              label: "未知",
+            }, {
+              label: '黄',
               value: 1
-            }
-          ],
-        },
-        {
-          label: "关系",
-          prop: "relationship",
-          type:"select",
-          dicUrl: "/api/blade-system/dict-biz/dictionary?code=roleRelation",
-          dataType: "number",
-          props: {
-            label: "dictValue",
-            value: "dictKey",
-          },
-        },
-        {
-          label: "小区",
-          prop: "aoiName",
-          search: true,
-          searchSpan: 4,
-        },
-        {
-          label: "地址",
-          prop: "address",
-          display: false
-        },
-        ]
-      },
-      data: [],
-
-      excelForm: {},
-      excelOption: {
-        submitBtn: false,
-        emptyBtn: false,
-        column: [{
-          label: '模板上传',
-          prop: 'excelFile',
-          type: 'upload',
-          drag: true,
-          loadText: '模板上传中,请稍等',
-          span: 24,
-          propsHttp: {
-            res: 'data'
-          },
-          tip: '请上传 .xls,.xlsx 标准格式文件',
-          action: "/api/blade-system/user/import-user"
-        },
-        {
-          label: "数据覆盖",
-          prop: "isCovered",
-          type: "switch",
-          align: "center",
-          width: 80,
-          dicData: [{
-            label: "否",
-            value: 0
-          },
-          {
-            label: "是",
-            value: 1
-          }
-          ],
-          value: 0,
-          slot: true,
-          rules: [{
-            required: true,
-            message: "请选择是否覆盖",
-            trigger: "blur"
+            }, {
+              label: '红',
+              value: ''
+            }]
+          }, {
+            row: true,
+            label: '备注',
+            prop: 'input',
+            type: 'input'
           }]
         },
-        {
-          label: '模板下载',
-          prop: 'excelTemplate',
-          formslot: true,
-          span: 24,
+        excelOption: {
+          submitBtn: false,
+          emptyBtn: false,
+          column: [{
+              label: '模板上传',
+              prop: 'excelFile',
+              type: 'upload',
+              drag: true,
+              loadText: '模板上传中,请稍等',
+              span: 24,
+              propsHttp: {
+                res: 'data'
+              },
+              tip: '请上传 .xls,.xlsx 标准格式文件',
+              action: "/api/blade-system/user/import-user"
+            },
+            {
+              label: "数据覆盖",
+              prop: "isCovered",
+              type: "switch",
+              align: "center",
+              width: 80,
+              dicData: [{
+                  label: "否",
+                  value: 0
+                },
+                {
+                  label: "是",
+                  value: 1
+                }
+              ],
+              value: 0,
+              slot: true,
+              rules: [{
+                required: true,
+                message: "请选择是否覆盖",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: '模板下载',
+              prop: 'excelTemplate',
+              formslot: true,
+              span: 24,
+            }
+          ]
         }
-        ]
-      }
-    };
-  },
-  watch: {
-  },
-  computed: {
-    ...mapGetters(["userInfo", "permission"]),
-    permissionList() {
-      return {
-        addBtn: this.vaildData(this.permission.household_add, false),
-        viewBtn: this.vaildData(this.permission.household_view, true),
-        delBtn: this.vaildData(this.permission.household_delete, true),
-        editBtn: this.vaildData(this.permission.household_edit, true)
       };
-    }
-  },
-  mounted() {
-  },
-  methods: {
-    rowSave(row, done, loading) {
-      add(row).then(() => {
-        this.initFlag = false;
-        this.onLoad(this.page);
-        this.$message({
-          type: "success",
-          message: "操作成功!"
-        });
-        done();
-      }, error => {
-        window.console.log(error);
-        loading();
-      });
     },
-    rowUpdate(row, index, done, loading) {
-      update(row).then(() => {
-        this.initFlag = false;
-        this.onLoad(this.page);
-        this.$message({
-          type: "success",
-          message: "操作成功!"
-        });
-        done();
-      }, error => {
-        window.console.log(error);
-        loading();
-      });
-    },
-    rowDel(row) {
-      this.$confirm("确定将选择数据删除?", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning"
-      })
-        .then(() => {
-          return remove(row.id);
-        })
-        .then(() => {
-          this.onLoad(this.page);
-          this.$message({
-            type: "success",
-            message: "操作成功!"
-          });
-        });
-    },
-    searchReset() {
-      this.query = {};
-      this.treeDeptId = '';
-      this.onLoad(this.page);
-    },
-    searchChange(params, done) {
-      this.query = params;
-      this.page.currentPage = 1;
-      this.onLoad(this.page, params);
-      done();
-    },
-    selectionChange(list) {
-      this.selectionList = list;
-    },
-    selectionClear() {
-      this.selectionList = [];
-      // this.$refs.crud.toggleSelection();
-    },
-    handleDelete() {
-      if (this.selectionList.length === 0) {
-        this.$message.warning("请选择至少一条数据");
-        return;
+    watch: {},
+    computed: {
+      ...mapGetters(["userInfo", "permission"]),
+      permissionList() {
+        return {
+          addBtn: this.vaildData(this.permission.household_add, false),
+          viewBtn: this.vaildData(this.permission.household_view, true),
+          delBtn: this.vaildData(this.permission.household_delete, true),
+          editBtn: this.vaildData(this.permission.household_edit, true)
+        };
       }
-      this.$confirm("确定将选择数据删除?", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning"
-      })
-        .then(() => {
-          return remove(this.ids);
-        })
-        .then(() => {
-          this.onLoad(this.page);
-          this.$message({
-            type: "success",
-            message: "操作成功!"
-          });
-          this.$refs.crud.toggleSelection();
-        });
     },
-    handleImport() {
-      this.excelBox = true;
-    },
-    uploadAfter(res, done, loading, column) {
-      window.console.log(column);
-      this.excelBox = false;
-      this.refreshChange();
-      done();
-    },
-    handleExport() {
-      this.$confirm("是否导出住户数据?", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning"
-      }).then(() => {
-        NProgress.start();
-        var data = {
-          ...this.query
+    mounted() {},
+    methods: {
+
+      changLabel(item) {
+        this.editLabelFlge = true
+      },
+      manageLabel() {
+        this.labelFlag = true
+        let params = {
+          parentId: 1000
         }
-        data = Qs.stringify(data);
-        exportBlob(
-          `/api/blade-household/household/export-household?${this.website.tokenHeader}=${getToken()}&` + data
-        ).then(res => {
-          downloadXls(res.data, `住户数据表${dateNow()}.xlsx`);
-          NProgress.done();
+        getLabelList(Object.assign(params)).then(res => {
+          const data = res.data.data;
+          this.labelData = data;
+          this.loading = false;
+        });
+      },
+      rowSave(row, done, loading) {
+        add(row).then(() => {
+          this.initFlag = false;
+          this.onLoad(this.page);
+          this.$message({
+            type: "success",
+            message: "操作成功!"
+          });
+          done();
+        }, error => {
+          window.console.log(error);
+          loading();
+        });
+      },
+      rowUpdate(row, index, done, loading) {
+        update(row).then(() => {
+          this.initFlag = false;
+          this.onLoad(this.page);
+          this.$message({
+            type: "success",
+            message: "操作成功!"
+          });
+          done();
+        }, error => {
+          window.console.log(error);
+          loading();
+        });
+      },
+      rowDel(row) {
+        this.$confirm("确定将选择数据删除?", {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning"
+          })
+          .then(() => {
+            return remove(row.id);
+          })
+          .then(() => {
+            this.onLoad(this.page);
+            this.$message({
+              type: "success",
+              message: "操作成功!"
+            });
+          });
+      },
+      searchReset() {
+        this.query = {};
+        this.treeDeptId = '';
+        this.onLoad(this.page);
+      },
+      searchChange(params, done) {
+        this.query = params;
+        this.page.currentPage = 1;
+        this.onLoad(this.page, params);
+        done();
+      },
+      selectionChange(list) {
+        this.selectionList = list;
+      },
+      selectionClear() {
+        this.selectionList = [];
+        // this.$refs.crud.toggleSelection();
+      },
+      handleDelete() {
+        if (this.selectionList.length === 0) {
+          this.$message.warning("请选择至少一条数据");
+          return;
+        }
+        this.$confirm("确定将选择数据删除?", {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning"
+          })
+          .then(() => {
+            return remove(this.ids);
+          })
+          .then(() => {
+            this.onLoad(this.page);
+            this.$message({
+              type: "success",
+              message: "操作成功!"
+            });
+            this.$refs.crud.toggleSelection();
+          });
+      },
+      handleImport() {
+        this.excelBox = true;
+      },
+      uploadAfter(res, done, loading, column) {
+        window.console.log(column);
+        this.excelBox = false;
+        this.refreshChange();
+        done();
+      },
+      handleExport() {
+        this.$confirm("是否导出住户数据?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(() => {
+          NProgress.start();
+          var data = {
+            ...this.query
+          }
+          data = Qs.stringify(data);
+          exportBlob(
+            `/api/blade-household/household/export-household?${this.website.tokenHeader}=${getToken()}&` + data
+          ).then(res => {
+            downloadXls(res.data, `住户数据表${dateNow()}.xlsx`);
+            NProgress.done();
+          })
+        });
+      },
+      handleTemplate() {
+        exportBlob(`/api/blade-system/user/export-template?${this.website.tokenHeader}=${getToken()}`).then(res => {
+          downloadXls(res.data, "住户数据模板.xlsx");
         })
-      });
-    },
-    handleTemplate() {
-      exportBlob(`/api/blade-system/user/export-template?${this.website.tokenHeader}=${getToken()}`).then(res => {
-        downloadXls(res.data, "住户数据模板.xlsx");
-      })
-    },
-    beforeOpen(done, type) {
-      if (["edit", "view"].includes(type)) {
-        getDetatil(this.form.id).then(res => {
-          this.form = res.data.data;
+      },
+      beforeOpen(done, type) {
+        if (["edit", "view"].includes(type)) {
+          getDetatil(this.form.id).then(res => {
+            this.form = res.data.data;
+          });
+        }
+        this.initFlag = true;
+        done();
+      },
+      currentChange(currentPage) {
+        this.page.currentPage = currentPage;
+      },
+      sizeChange(pageSize) {
+        this.page.pageSize = pageSize;
+      },
+      refreshChange() {
+        this.onLoad(this.page, this.query);
+      },
+      onLoad(page, params = {}) {
+        this.loading = true;
+        getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
+          const data = res.data.data;
+          this.page.total = data.total;
+          this.data = data.records;
+          this.loading = false;
+          this.selectionClear();
         });
       }
-      this.initFlag = true;
-      done();
-    },
-    currentChange(currentPage) {
-      this.page.currentPage = currentPage;
-    },
-    sizeChange(pageSize) {
-      this.page.pageSize = pageSize;
-    },
-    refreshChange() {
-      this.onLoad(this.page, this.query);
-    },
-    onLoad(page, params = {}) {
-      this.loading = true;
-      getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
-        const data = res.data.data;
-        this.page.total = data.total;
-        this.data = data.records;
-        this.loading = false;
-        this.selectionClear();
-      });
     }
-  }
-};
+  };
 </script>
 
 <style>
-.box {
-  height: 800px;
-}
+  .box {
+    height: 800px;
+  }
 
-.el-scrollbar {
-  height: 100%;
-}
+  .grid-container2 {
+    display: grid;
+    grid-template-columns: auto auto auto auto;
+    grid-gap: 10px;
+  }
 
-.box .el-scrollbar__wrap {
-  overflow: scroll;
-}
+  .el-scrollbar {
+    height: 100%;
+  }
+
+  .box .el-scrollbar__wrap {
+    overflow: scroll;
+  }
 </style>

--
Gitblit v1.9.3