Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/jczz_web

shuishen

2023-12-18 e451d56284450b282be456ab4a47935dfecc1009

Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/jczz_web

 src/views/property/convenienceHotline.vue

New file
@@ -0,0 +1,280 @@
<template>
  <basic-container>
    <avue-crud :option="option" :table-loading="loading" :data="data" :page.sync="page" ref="crud" @row-del="rowDel"
      v-model="form" :permission="permissionList" @row-update="rowUpdate" @row-save="rowSave" :before-open="beforeOpen"
      @search-change="searchChange" @search-reset="searchReset" @selection-change="selectionChange"
      @current-change="currentChange" @size-change="sizeChange" @refresh-change="refreshChange" @on-load="onLoad">
      <template slot="menuLeft">
        <el-button size="small" icon="el-icon-delete" plain v-if="permission.district_delete" @click="handleDelete">删 除
        </el-button>
      </template>
    </avue-crud>
  </basic-container>
</template>

<script>
  import {
    getList,
    remove,
    update,
    add,
    getDetail
  } from "@/api/convenienceHotline/convenienceHotline"
  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: 280,
          border: true,
          //stripe:true,
          index: true,
          viewBtn: true,
          selection: true,
          dialogClickModal: false,
          column: [{
              label: "名称",
              prop: "name",
              searchSpan: 4,
              search: true,
              width: 260,
              rules: [{
                required: true,
                message: "请输入名称",
                trigger: "blur",
              }, ],
            },
            {
              label: "电话",
              prop: "telephone",
              span: 24,
              rules: [{
                required: true,
                message: "请输入电话",
                trigger: "blur",
              }, ],
            },
            {
              label: "备注",
              prop: "remark",
              span: 24,
              rules: [{
                required: true,
                message: "请输入备注",
                trigger: "blur",
              }, ],
            },
          ],
        },
        data: [],
      }
    },
    watch: {},
    computed: {
      ...mapGetters(["permission", "userInfo"]),
      permissionList() {
        return {
          addBtn: this.vaildData(this.permission.district_add, true),
          viewBtn: this.vaildData(this.permission.district_view, true),
          delBtn: this.vaildData(this.permission.district_delete, true),
          editBtn: this.vaildData(this.permission.district_edit, true),
        }
      },
      ids() {
        let ids = []
        this.selectionList.forEach((ele) => {
          ids.push(ele.id)
        })
        return ids.join(",")
      },
    },
    methods: {
      rowSave(row, done, loading) {
        if (row.picUrl.length > 0) {
          var urls = []
          var split = row.picUrl.split(",")
          split.forEach(url => {
            var names = url.split("jczz/")
            urls.push(names[1])
          })
          row.picUrl = urls.join(",")
        }
        row.userid = this.userInfo.user_id
        add(row).then(
          () => {
            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.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)) {
          getDetail(this.form.id).then((res) => {
            this.form = res.data.data
            if (this.form.picUrl.length > 0) {
              var urls = []
              var names = this.form.picUrl.split(",")
              names.forEach(name => {
                urls.push(website.minioUrl + name)
              })
              this.form.picUrl = urls.join(",")
            }
          })
        }
        // 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.picUrl) {
              if (item.picUrl.length > 0) {
                var urls = []
                var names = item.picUrl.split(",")
                names.forEach(name => {
                  urls.push(website.minioUrl + name)
                })
                item.picUrl = urls.join(",")
              }
            }
          })
          this.loading = false
          this.selectionClear()
        })
      }
    }
  }
</script>

<style>
  .avue-upload__icon {
    line-height: 6;
  }
</style>

 src/views/property/propertyCompanyDistrict.vue

@@ -15,336 +15,333 @@
</template>

<script>
import { getList, remove, update, add, getPropertyCompanyDistrict } from "@/api/property/propertyCompanyDistrict";
import { mapGetters } from "vuex";
import website from '@/config/website';
import func from "@/util/func";
export default {
  data() {
    return {
      form: {},
      query: {},
      loading: true,
      page: {
        pageSize: 10,
        currentPage: 1,
        total: 0,
      },
      datetime: "",
      selectionList: [],
      option: {
        height: "auto",
        calcHeight: 54,
        dialogWidth: 1150,
        tip: false,
        searchShow: true,
        searchMenuSpan: 3,
        menuWidth: 350,
        border: true,
        //stripe:true,
        index: true,
        viewBtn: true,
        selection: true,
        dialogClickModal: false,
        column: [
          {
            label: "小区",
            prop: "districtId",
            searchSpan: 5,
            search: true,
            type: 'tree',
            dicUrl: `/api/blade-district/district/getDistrictTree`,
            props: {
              label: "name",
              value: "id"
            },
            defaultExpandedKeys:["361102003"],
            span: 12,
            labelWidth: 120,
            width: 260,
            rules: [
              {
  import {
    getList,
    remove,
    update,
    add,
    getPropertyCompanyDistrict
  } from "@/api/property/propertyCompanyDistrict";
  import {
    mapGetters
  } from "vuex";
  import website from '@/config/website';
  import func from "@/util/func";
  export default {
    data() {
      return {
        form: {},
        query: {},
        loading: true,
        page: {
          pageSize: 10,
          currentPage: 1,
          total: 0,
        },
        datetime: "",
        selectionList: [],
        option: {
          height: "auto",
          calcHeight: 54,
          dialogWidth: 1150,
          tip: false,
          searchShow: true,
          searchMenuSpan: 3,
          menuWidth: 350,
          border: true,
          //stripe:true,
          index: true,
          viewBtn: true,
          selection: true,
          dialogClickModal: false,
          column: [{
              label: "小区",
              prop: "districtId",
              searchSpan: 5,
              search: true,
              type: 'tree',
              dicUrl: `/api/blade-district/district/getDistrictTree`,
              props: {
                label: "name",
                value: "id"
              },
              defaultExpandedKeys: ["361102003"],
              span: 12,
              labelWidth: 120,
              width: 260,
              rules: [{
                required: true,
                message: "请选择小区",
                trigger: "blur",
              },
            ],
          },
          {
            label: '物业公司',
            prop: 'propertyCompanyId',
            type: 'tree',
            hide:true,
            searchSpan: 5,
            search: true,
            span: 12,
            labelWidth: 120,
            dicUrl: `/api/blade-propertyCompany/propertyCompany/getPropertyCompanyList`,
            cascader: ['userId'],
            props: {
              label: "name",
              value: "id"
              }, ],
            },
            rules: [
              {
            {
              label: '物业公司',
              prop: 'propertyCompanyId',
              type: 'tree',
              hide: true,
              searchSpan: 5,
              search: true,
              span: 12,
              labelWidth: 120,
              dicUrl: `/api/blade-propertyCompany/propertyCompany/getPropertyCompanyList`,
              cascader: ['userId'],
              props: {
                label: "name",
                value: "id"
              },
              rules: [{
                required: true,
                message: '请选择物业公司',
                trigger: 'blur'
              }
            ]
          },
          {
            label: '负责人',
            prop: 'principal',
            span: 12,
            labelWidth: 120,
            search:true,
            searchSpan:4,
            rules: [
              {
              }]
            },
            {
              label: '项目经理',
              prop: 'principal',
              span: 12,
              labelWidth: 120,
              search: true,
              searchSpan: 4,
              rules: [{
                required: true,
                message: "请输入负责人",
                message: "请输入项目经理",
                trigger: "blur",
              },
            ],
          },
          {
            label: '联系方式',
            prop: 'principalPhone',
            span: 12,
            labelWidth: 120,
            rules: [
              {
              }, ],
            },
            {
              label: '联系方式',
              prop: 'principalPhone',
              span: 12,
              labelWidth: 120,
              rules: [{
                required: true,
                message: "请输入联系方式",
                trigger: "blur",
              }, ],
            },
            {
              label: "物业成员",
              prop: "userId",
              span: 12,
              labelWidth: 120,
              type: "tree",
              multiple: true,
              remote: true,
              props: {
                label: 'name',
                value: 'id'
              },
            ],
          },
          {
            label: "物业成员",
            prop: "userId",
            span: 12,
            labelWidth: 120,
            type:"tree",
            multiple: true,
            props: {
              label: 'name',
              value: 'id'
              hide: true,
              dicUrl: `/api/blade-system/user/list?name={{userId}}`,
            },
            hide:true,
            dicUrl: `/api/blade-propertyCompany/propertyCompany/getUserByPropertyCompany?id={{key}}`,
          },
          {
            label: "物业阶段",
            span: 12,
            prop: "propertyStage",
            labelWidth: 120,
            type: "select",
            search: true,
            searchSpan: 4,
            dataType: "number",
            dicUrl: "/api/blade-system/dict-biz/dictionary?code=propertyStage",
            props: {
              label: "dictValue",
              value: "dictKey",
            {
              label: "物业阶段",
              span: 12,
              prop: "propertyStage",
              labelWidth: 120,
              type: "select",
              search: true,
              searchSpan: 4,
              dataType: "number",
              dicUrl: "/api/blade-system/dict-biz/dictionary?code=propertyStage",
              props: {
                label: "dictValue",
                value: "dictKey",
              },
            },
          },
          {
            label: "合同开始时间",
            prop: "startTime",
            span: 12,
            labelWidth: 120,
            type: "date",
            format: "yyyy-MM-dd",
            valueFormat: "yyyy-MM-dd",
            rules: [
              {
            {
              label: "合同开始时间",
              prop: "startTime",
              span: 12,
              labelWidth: 120,
              type: "date",
              format: "yyyy-MM-dd",
              valueFormat: "yyyy-MM-dd",
              rules: [{
                required: true,
                message: "请选择合同开始时间",
                trigger: "blur",
              },
            ],
          },
          {
            label: "合同结束时间",
            prop: "endTime",
            labelWidth: 120,
            span:12,
            type: "date",
            format: "yyyy-MM-dd",
            valueFormat: "yyyy-MM-dd",
            rules: [
              {
              }, ],
            },
            {
              label: "合同结束时间",
              prop: "endTime",
              labelWidth: 120,
              span: 12,
              type: "date",
              format: "yyyy-MM-dd",
              valueFormat: "yyyy-MM-dd",
              rules: [{
                required: true,
                message: "请选择合同结束时间",
                trigger: "blur",
              },
            ],
          },
        ],
      },
      data: [],
    };
  },
  watch: {
  },
  computed: {
    ...mapGetters(["permission", "userInfo"]),
    permissionList() {
      return {
        addBtn: this.vaildData(this.permission.propertyCompanyDistrict_add, true),
        viewBtn: this.vaildData(this.permission.propertyCompanyDistrict_view, true),
        delBtn: this.vaildData(this.permission.propertyCompanyDistrict_delete, true),
        editBtn: this.vaildData(this.permission.propertyCompanyDistrict_edit, true),
              }, ],
            },
          ],
        },
        data: [],
      };
    },
    ids() {
      let ids = [];
      this.selectionList.forEach((ele) => {
        ids.push(ele.id);
      });
      return ids.join(",");
    },
  },
  methods: {
    rowSave(row, done, loading) {
      row.userId = func.join(row.userId);
      add(row).then(
        () => {
          this.onLoad(this.page);
          this.$message({
            type: "success",
            message: "操作成功!",
          });
          done();
        },
        (error) => {
          window.console.log(error);
          loading();
        }
      );
    },
    rowUpdate(row, index, done, loading) {
      row.userId = func.join(row.userId);
      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)) {
        getPropertyCompanyDistrict(this.form.id).then((res) => {
          this.form = res.data.data;
        });
      }
      // 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,
    watch: {},
    computed: {
      ...mapGetters(["permission", "userInfo"]),
      permissionList() {
        return {
          addBtn: this.vaildData(this.permission.propertyCompanyDistrict_add, true),
          viewBtn: this.vaildData(this.permission.propertyCompanyDistrict_view, true),
          delBtn: this.vaildData(this.permission.propertyCompanyDistrict_delete, true),
          editBtn: this.vaildData(this.permission.propertyCompanyDistrict_edit, true),
        };
        values.dateTime = null;
      },
      ids() {
        let ids = [];
        this.selectionList.forEach((ele) => {
          ids.push(ele.id);
        });
        return ids.join(",");
      },
    },
    methods: {
      rowSave(row, done, loading) {
        row.userId = func.join(row.userId);
        add(row).then(
          () => {
            this.onLoad(this.page);
            this.$message({
              type: "success",
              message: "操作成功!",
            });
            done();
          },
          (error) => {
            window.console.log(error);
            loading();
          }
        );
      },
      rowUpdate(row, index, done, loading) {
        row.userId = func.join(row.userId);
        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)) {
          getPropertyCompanyDistrict(this.form.id).then((res) => {
            this.form = res.data.data;
          });
        }
        // 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.loading = false;
          this.selectionClear();
        });
      }
      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.loading = false;
        this.selectionClear();
      });
    }
  }
};
  };
</script>

<style>
.avue-upload__icon {
  line-height: 6;
}
</style>
  .avue-upload__icon {
    line-height: 6;
  }
</style>

 src/views/system/menu.vue

@@ -161,6 +161,24 @@
                message: "请输入菜单别名",
                trigger: "blur"
              }]
            }, {
              label: "菜单",
              prop: "menuType",
              type: "radio",
              rules: [{
                required: true,
                message: "请选择菜单",
                trigger: "blur"
              }],
              dicData: [{
                  label: "PC端",
                  value: 0
                },
                {
                  label: "移动端",
                  value: 1
                }
              ],
            },
            {
              label: "新窗口",
@@ -195,14 +213,6 @@
              }]
            },
            {
              label: "菜单备注",
              prop: "remark",
              type: "textarea",
              span: 24,
              minRows: 2,
              hide: true
            },
            {
              label: "背景色",
              prop: "background",
              span: 12,
@@ -229,7 +239,15 @@
              },
              multiple: true,
              // hide: true
            }
            },
            {
              label: "菜单备注",
              prop: "remark",
              type: "textarea",
              span: 24,
              minRows: 2,
              hide: true
            },
          ]
        },
        data: [],
@@ -275,9 +293,9 @@
        });

        // getTreeList().then(res => {
          // console.log(JSON.stringify(res.data.data))
          const column = this.findObject(this.option.column, "labelList");
          column.dicData =this.labelList;
        // console.log(JSON.stringify(res.data.data))
        const column = this.findObject(this.option.column, "labelList");
        column.dicData = this.labelList;
        // });
      },
      handleAdd(row) {
@@ -415,7 +433,7 @@
          this.selectionClear();
        });
        getTreeList().then(res => {
          this.labelList =res.data.data;
          this.labelList = res.data.data;
        });
      },
      treeLoad(tree, treeNode, resolve) {
@@ -424,9 +442,9 @@
          resolve(res.data.data);
        });
        // getTreeList().then(res => {
          // console.log(JSON.stringify(res.data.data))
          const column = this.findObject(this.option.column, "labelList");
          column.dicData = this.labelList;
        // console.log(JSON.stringify(res.data.data))
        const column = this.findObject(this.option.column, "labelList");
        column.dicData = this.labelList;
        // });
      }
    }
@@ -434,4 +452,4 @@
</script>

<style>
</style>
</style>

 src/views/userHouse/houseHoldList.vue

@@ -67,10 +67,10 @@
          </div>


          <span slot="footer" class="dialog-footer">
          <!-- <span slot="footer" class="dialog-footer">
            <el-button @click="labelFlag = false">取 消</el-button>
            <el-button type="primary" @click="submitRole">确 定</el-button>
          </span>
          </span> -->
        </el-dialog>

        <el-dialog :title="'编辑标签   ' +  currentLabel.name" append-to-body :visible.sync="editLabelFlge" width="655px">
@@ -162,7 +162,7 @@
          addBtn: true,
          dialogType: 'drawer',
          dialogClickModal: false,
          menuWidth:280,
          menuWidth: 280,
          column: [{
              label: "姓名",
              prop: "name",

 src/views/userHouse/houseList.vue

@@ -59,10 +59,10 @@
              {{item.name}}
            </div>
          </div>
          <span slot="footer" class="dialog-footer">
          <!--  <span slot="footer" class="dialog-footer">
            <el-button @click="labelFlag = false">取 消</el-button>
            <el-button type="primary" @click="submitRole">确 定</el-button>
          </span>
          </span> -->
        </el-dialog>

        <el-dialog :title="'编辑标签   ' +  currentLabel.name" append-to-body :visible.sync="editLabelFlge" width="655px">