bug修复

lin

2024-03-05 15f8fa5b31a267c383fdf8c015352bef2967c52d

bug修复

 src/views/article/components/discussionManageChild.vue

@@ -198,7 +198,13 @@
                ]
            },
            // 表单列表
            froms: {},
        froms: {
          openFlag: 0,
          voteRestrictions: 1,
          signatureFlag: 1,
          appointUser: 0,

        },
            dialogVisibles: false,
            articleId: '',
            discussion: {},
@@ -267,7 +273,13 @@
                    })
                    done()
                    this.$refs.DisCussFrom && this.$refs.DisCussFrom.resetForm()
                    this.froms = {}
            this.froms = {
              openFlag: 0,
              voteRestrictions: 1,
              signatureFlag: 1,
              appointUser: 0,

            }
                    this.dialogVisibles = false
                },
                (error) => {
@@ -279,7 +291,12 @@
            console.log("===init===", data)
            this.$refs.DisCussFrom && this.$refs.DisCussFrom.resetForm()
            this.dialogVisibles = true
            this.froms = {}
        this.froms = {
          openFlag: 0,
          voteRestrictions: 1,
          signatureFlag: 1,
          appointUser: 0,
        }
            this.discussion = data
            this.articleId = data.id
            this.onLoad(data)
@@ -289,14 +306,24 @@
            console.log("******handleClose*******")
            this.dialogVisibles = false
            this.$refs.DisCussFrom && this.$refs.DisCussFrom.resetForm()
            this.froms = {}
        this.froms = {
          openFlag: 0,
          voteRestrictions: 1,
          signatureFlag: 1,
          appointUser: 0,
        }
        },

        opens () {
            console.log("******opens*******")
            // this.dialogVisibles = false
            this.$refs.DisCussFrom && this.$refs.DisCussFrom.resetForm()
            this.froms = {}
        this.froms = {
          openFlag: 0,
          voteRestrictions: 1,
          signatureFlag: 1,
          appointUser: 0,
        }
        },

        onLoad (row, params = {
@@ -310,7 +337,12 @@
                if (data.records.length <= 0) {
                    console.log("--------onLoad------------")
                    this.id = ''
                    this.froms = {}
            this.froms = {
              openFlag: 0,
              voteRestrictions: 1,
              signatureFlag: 1,
              appointUser: 0,
            }
                } else {
                    console.log(">>>>>onLoad", data.records[0])
                    this.froms = data.records[0]

 src/views/article/discussionManage.vue

@@ -168,7 +168,7 @@
                label: "name",
                value: 'id'
              },
              hide: true,
              // hide: true,
            },
            {
              width: 110,

 src/views/gzll/components/todo.vue

@@ -119,6 +119,13 @@
                },
                {
                    width: 110,
              label: '小区名称',
              prop: 'districtName',
              search: true,
              hide: true,
            },
            {
              width: 110,
                    label: '联系人',
                    prop: 'linkman',
                    // search: true,
@@ -133,7 +140,7 @@
                {
                    label: '项目名称',
                    prop: 'name',
                    // search: true,
              search: true,
                },
                {
                    label: '当前步骤',

 src/views/message/messageSettings.vue

@@ -1,8 +1,8 @@
<template>
    <basic-container>
        <avue-crud :option="option" :table-loading="loading" :data="data" :page.sync="page" :permission="permissionList"
            :before-open="beforeOpen" v-model="form" ref="crud" @row-update="rowUpdate" @row-save="rowSave"
            @row-del="rowDel" @search-change="searchChange" @search-reset="searchReset" @selection-change="selectionChange"
      :before-open="beforeOpen" v-model="form" ref="crud" @row-update="rowUpdate" @row-save="rowSave" @row-del="rowDel"
      @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 type="danger" size="small" icon="el-icon-delete" plain v-if="permission.email_delete"
@@ -36,8 +36,18 @@
</template>

<script>
import { getList, getDetail, add, update, remove, enable, sendEmail } from "@/api/system/email"
import { mapGetters } from "vuex"
  import {
    getList,
    getDetail,
    add,
    update,
    remove,
    enable,
    sendEmail
  } from "@/api/system/email"
  import {
    mapGetters
  } from "vuex"

export default {
    data () {
@@ -64,8 +74,7 @@
                selection: true,
                dialogClickModal: false,
                menuWidth: 350,
                column: [
                    {
          column: [{
                        label: "主键",
                        prop: "id",
                        type: "input",
@@ -75,7 +84,7 @@
                        hide: true,
                    },
                    {
                        label: "发送者邮箱",
              label: "收/发者邮箱",
                        prop: "username",
                        type: "input",
                    },
@@ -111,7 +120,48 @@
                        label: "备注",
                        prop: "remark",
                        type: "input",
            }, {
              label: "配置类型",
              prop: "emailType",
              dicData: [{
                  label: '发送邮件配置',
                  value: '1'
                    },
                {
                  label: '接收邮件配置',
                  value: '2'
                }
              ],
              props: {
                label: "label",
                value: "value",
              },
              type: "select",
            },
            // {
            //   width: 100,
            //   label: "是否启用",
            //   prop: "status",
            //   searchSpan: 4,
            //   value: "0",
            //   slot: true,
            //   search: true,
            //   type: "select",
            //   rules: [{
            //     required: true,
            //     message: "请选择是否启用",
            //     trigger: "blur",
            //   }, ],
            //   dicData: [{
            //       label: "禁用",
            //       value: "1",
            //     },
            //     {
            //       label: "启用",
            //       value: 2,
            //     }
            //   ],
            // },
                    {
                        label: "是否启用",
                        prop: "status",
@@ -128,8 +178,7 @@
            debugForm: {},
            debugOption: {
                submitText: "保存",
                column: [
                    {
          column: [{
                        label: "收件人",
                        prop: "emails",
                        placeholder: "多个收件人请用英文逗号进行分隔",

 src/views/property/propertyCompany.vue

@@ -199,13 +199,13 @@
              row: true,
              // width: 100,
            },
            {
              width: 210,
              overHidden: true,
              label: "管理小区",
              prop: "districtNames",
              display: false
            },
            // {
            //   width: 210,
            //   overHidden: true,
            //   label: "管理小区",
            //   prop: "districtNames",
            //   display: false
            // },
            {
              label: "简介",
              prop: "remark",

 src/views/propertySupervision/ownersCommittee.vue

@@ -73,6 +73,7 @@
          searchShow: true,
          searchMenuSpan: 3,
          menuWidth: 450,
          addBtn: false,
          menu: false,
          height: "auto",
          calcHeight: 54,
@@ -88,21 +89,6 @@
          // excelBtn: true,
          dialogClickModal: false,
          column: [{
              // hide: true,
              parent: false,
              label: "小区名称",
              prop: "districtId",
              type: 'tree',
              dicUrl: `/api/blade-district/district/getDistrictTree`,
              props: {
                label: "name",
                value: "id"
              },
              defaultExpandedKeys: ["361102003"],
              span: 12,
              width: 220,
              overHidden: true,
            }, {
              label: "标题",
              prop: "title",
              span: 24,
@@ -188,14 +174,21 @@
              }, ],
            },
            {
              width: 144,
              label: "发布时间",
              prop: "createTime",
              type: "date",
              format: "yyyy-MM-dd",
              valueFormat: "yyyy-MM-dd HH:mm:ss",
              // hide: true,
              parent: false,
              label: "小区名称",
              prop: "districtId",
              type: 'tree',
              dicUrl: `/api/blade-district/district/getDistrictTree`,
              props: {
                label: "name",
                value: "id"
            },

              defaultExpandedKeys: ["361102003"],
              span: 12,
              width: 220,
              overHidden: true,
            },
            {
              width: 110,
              label: "所属街道",
@@ -217,6 +210,14 @@
              prop: "communityName",
              search: true,
              searchSpan: 4
            },
            {
              width: 144,
              label: "发布时间",
              prop: "createTime",
              type: "date",
              format: "yyyy-MM-dd",
              valueFormat: "yyyy-MM-dd HH:mm:ss",
            },

            {
@@ -477,6 +478,7 @@
      },
      searchChange(params, done) {
        this.query = params
        this.query.publish = 1
        this.page.currentPage = 1
        this.onLoad(this.page, params)
        done()
@@ -556,6 +558,7 @@
          values.dateTime = null
        }
        values.type = 5
        values.publish = 1
        this.loading = true
        console.log(values)
        getList(page.currentPage, page.pageSize, values).then((res) => {