物业公司bug 修复

lin

2024-03-04 b3875b8ac429c446739390a7fd748d6e7bade605

物业公司bug 修复

 src/views/property/propertyCompany.vue

@@ -5,11 +5,11 @@
      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">
      <!--   <template slot="menuLeft">
        <el-button size="small" icon="el-icon-delete" plain v-if="permission.propertyCompany_delete"
          @click="handleDelete">删 除
        </el-button>
      </template>
      </template> -->

      <template slot-scope="{row, size, index}" slot="menu">
        <el-button :size="size" v-if="permission.payInfo" type="text" icon="el-icon-circle-plus-outline"

 src/views/propertySupervision/ownersCommittee.vue

@@ -1,33 +1,33 @@
<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">
      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.article_delete" @click="handleDelete">删
          除
        </el-button>
      </template> -->
      </template>

            <!-- <template slot-scope="{type,size,row }" slot="menu">
      <template slot-scope="{type,size,row }" slot="menu">
        <el-button v-if="row.publish == '1'" icon="el-icon-close" :size="size" :type="type" @click.stop="updateFb(row)">
          撤销
        </el-button>
        <el-button v-if="row.publish == '0'" icon="el-icon-check" :size="size" :type="type" @click.stop="updateFb(row)">
          发布
        </el-button>
      </template> -->
      </template>

            <template slot-scope="{ row, size }" slot="publish">
                <el-tag :size="size" :type="showStatus(row.publish, 1).type" v-text="showStatus(row.publish, 1).text">
                </el-tag>
            </template>

            <template slot-scope="{ row, size }" slot="iscomment">
                <el-tag :size="size" :type="showStatus(row.iscomment, 2).type" v-text="showStatus(row.iscomment, 2).text">
                </el-tag>
      <template slot-scope="{ row }" slot="iscomment">
        <el-switch @change="iscommentInput($event, row)" v-model="row.iscomment" :active-value="'1'"
          :inactive-value="'0'" active-color="#13ce66" inactive-color="#ccc">
        </el-switch>
            </template>
        </avue-crud>

@@ -92,7 +92,7 @@
            datetime: "",
            selectionList: [],
            option: {
                labelWidth: 96,
          labelWidth: 120,
                searchLabelWidth: 96,
                searchShow: true,
                searchMenuSpan: 3,
@@ -105,13 +105,9 @@
                border: true,
                //stripe:true,
                index: true,
                addBtn: false,
                viewBtn: false,
                delBtn: false,
                editBtn: false,
                selection: false,
                excelBtn: false,
                menu: false,
          viewBtn: true,
          selection: true,
          excelBtn: true,
                dialogClickModal: false,
                column: [{
                    label: "标题",
@@ -119,8 +115,8 @@
                    span: 24,
                    row: true,
                    searchSpan: 4,
                    searchLabelWidth: 50,
                    search: true,
              searchLabelWidth: 46,
                    rules: [{
                        required: true,
                        message: "请输入业主大会标题",
@@ -143,6 +139,24 @@
                    span: 24,
                },
                {
              hide: true,
              parent: false,
              label: "公示范围",
              prop: "articleList",
              type: 'tree',
              dicData: [],
              props: {
                label: "name",
                value: 'id'
              },
              span: 12,
              rules: [{
                required: true,
                message: "请选择公示范围",
                trigger: "blur",
              }, ],
            },
            {
                    width: 100,
                    label: "业主大会类型",
                    prop: "type",
@@ -160,38 +174,6 @@
                        label: "业主大会",
                        value: 5,
                    }],
                },
                // {
                //   label: "招标来源",
                //   prop: "sourceName",
                //   search: true,
                //   searchSpan: 4,
                //   span: 24,
                //   rules: [{
                //     required: true,
                //     message: "请输入招标类型",
                //     trigger: "blur",
                //   }, ],
                // },
                {
                    label: "公示范围",
                    prop: "articleList",
                    span: 12,
                    minRows: 2,
                    type: "cascader",
                    multiple: true,
                    tags: true,
                    dicData: [],
                    rules: [{
                        required: true,
                        message: "请选择业主大会范围",
                        trigger: "blur",
                    },],
                    props: {
                        label: "name",
                        value: 'id'
                    },
                    hide: true,
                },
                {
                    label: "发布时间",
@@ -221,47 +203,73 @@
                    valueFormat: "yyyy-MM-dd HH:mm:ss",
                },

                // {
                //   width: 100,
                //   label: "发布状态",
                //   prop: "publish",
                //   value: "0",
                //   slot: true,
                //   searchSpan: 4,
                //   search: true,
                //   type: "select",
                //   display: false,
                //   rules: [{
                //     required: true,
                //     message: "请选择发布状态",
                //     trigger: "blur",
                //   }, ],
                //   dicData: [{
                //       label: "未发布",
                //       value: "0",
                //     },
                //     {
                //       label: "已发布",
                //       value: "1",
                //     }
                //   ],
                // },
                // {
                //   width: 100,
                //   label: "评论区",
                //   prop: "iscomment",
                //   slot: true,
                //   type: "select",
                //   dicData: [{
                //       label: "关闭",
                //       value: "0",
                //     },
                //     {
                //       label: "开启",
                //       value: "1",
                //     }
                //   ],
                // },
            {
              width: 110,
              label: "所属街道",
              addDisplay: false,
              editDisplay: false,
              viewDisplay: false,
              prop: "streetName",
              search: true,
              searchSpan: 4
            },

            {
              width: 156,
              overHidden: true,
              label: "所属社区",
              addDisplay: false,
              editDisplay: false,
              viewDisplay: false,
              prop: "communityName",
              search: true,
              searchSpan: 4
            },

            {
              width: 100,
              label: "发布状态",
              prop: "publish",
              value: "0",
              slot: true,
              searchSpan: 4,
              search: true,
              type: "select",
              display: false,
              rules: [{
                required: true,
                message: "请选择发布状态",
                trigger: "blur",
              }, ],
              dicData: [{
                  label: "未发布",
                  value: "0",
                },
                {
                  label: "已发布",
                  value: "1",
                }
              ],
            },
            {
              width: 100,
              label: "评论区",
              prop: "iscomment",
              slot: true,
              type: "switch",
              activeColor: "#13ce66",
              inactiveColor: "#ccc",
              value: '1',
              dicData: [{
                  label: "关闭",
                  value: "0",
                },
                {
                  label: "开启",
                  value: "1",
                }
              ],
            },
                {
                    label: "内容",
                    prop: "content",
@@ -345,6 +353,14 @@
        }
    },
    methods: {
      iscommentInput(e, data) {
        upcomment(data.id, e).then(() => {
          this.$message({
            type: "success",
            message: "操作成功!",
          })
        })
      },

        openDilog (row, type) {
            this.dialogVisibles = true
@@ -397,7 +413,10 @@
                })
                row.url = urls.join(",")
            }
            add(row).then(
        add({
          ...row,
          districtId: row.articleList
        }).then(
                () => {
                    this.onLoad(this.page)
                    this.$message({
@@ -424,7 +443,10 @@
                row.url = urls.join(",")
            }

            update(row).then(
        update({
          ...row,
          district_id: row.articleList
        }).then(
                () => {
                    this.onLoad(this.page)
                    this.$message({
@@ -534,14 +556,13 @@
            if (dateTime) {
                values = {
                    ...params,
                    startTime: dateTime[0],
                    endTime: dateTime[1],
            startTime: dateTime[0] + ' 00:00:01',
            endTime: dateTime[1] + ' 23:59:59',
                    ...this.query,
                }
                values.dateTime = null
            }
            values.type = 5
            values.publish = 1
            this.loading = true
            console.log(values)
            getList(page.currentPage, page.pageSize, values).then((res) => {
@@ -561,7 +582,9 @@
                this.loading = false
                this.selectionClear()
            })
            getDistrictTree(params = {}).then((res) => {
        getDistrictTree({
          filterFlag: 1
        }).then((res) => {
                const data = res.data.data
                this.districtTree = data
                const column = this.findObject(this.option.column, "articleList")
@@ -645,8 +668,16 @@
}
</script>

<style>
<style lang="scss" scoped>
.avue-upload__icon {
    line-height: 6;
}

  :deep(.avue-form__menu--center) {
    text-align: left;
  }

  :deep(.avue-form__menu--center .el-button) {
    margin: 0 5px 0 0;
  }
</style>

 src/views/propertySupervision/propertyEvaluation.vue

@@ -5,11 +5,11 @@
      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">
      <!-- <template slot="menuLeft">
        <el-button size="small" icon="el-icon-delete" plain v-if="permission.propertyCompany_delete"
          @click="handleDelete">删 除
        </el-button>
      </template>
      </template> -->
    </avue-crud>

    <el-dialog title="商户配置" append-to-body :visible.sync="payInfoVisible" top="10vh" width="70%">