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

Lou

2024-01-18 6ad9528f48ad50d6a73a32f967fdf88b0e6b025a

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

 src/api/answerRecord/answerRecord.js

New file
@@ -0,0 +1,49 @@
import request from '@/router/axios';

export const getList = (current, size, params) => {
  return request({
    url: '/api/blade-answerRecord/answerRecord/list',
    method: 'get',
    params: {
      ...params,
      current,
      size,
    }
  })
}

export const getDetail = (id) => {
  return request({
    url: '/api/blade-answerRecord/answerRecord/detail',
    method: 'get',
    params: {
      id
    }
  })
}

export const remove = (ids) => {
  return request({
    url: '/api/blade-answerRecord/answerRecord/remove',
    method: 'post',
    params: {
      ids,
    }
  })
}

export const save = (row) => {
  return request({
    url: '/api/blade-answerRecord/answerRecord/submit',
    method: 'post',
    data: row
  })
}

export const update = (row) => {
  return request({
    url: '/api/blade-answerRecord/answerRecord/submit',
    method: 'post',
    data: row
  })
}

 src/api/system/email.js

New file
@@ -0,0 +1,70 @@
import request from '@/router/axios';

export const getList = (current, size, params) => {
  return request({
    url: '/api/blade-email/email/list',
    method: 'get',
    params: {
      ...params,
      current,
      size,
    }
  })
}

export const getDetail = (id) => {
  return request({
    url: '/api/blade-email/email/detail',
    method: 'get',
    params: {
      id
    }
  })
}

export const remove = (ids) => {
  return request({
    url: '/api/blade-email/email/remove',
    method: 'post',
    params: {
      ids,
    }
  })
}

export const add = (row) => {
  return request({
    url: '/api/blade-email/email/submit',
    method: 'post',
    data: row
  })
}

export const update = (row) => {
  return request({
    url: '/api/blade-email/email/submit',
    method: 'post',
    data: row
  })
}

export const enable = (id) => {
  return request({
    url: '/api/blade-email/email/enable',
    method: 'post',
    params: {
      id
    }
  })
}

export const sendEmail = (params) => {
  return request({
    url: '/api/blade-email/email/sendEmail',
    method: 'post',
    params: {
      ...params
    }
  })
}


 src/util/util.js

@@ -458,3 +458,18 @@

  return null; // 如果找不到目标id，返回null
};

//转换标签颜色
export const setLabelColor = (color) => {
  let obj = {
    red: "#EA1F1F",
    yellow: "#FFB42B",
    green: "#30D17C",
  };

  for (let i in obj) {
    if (color == i) {
      return obj[i];
    }
  }
};

 src/views/article/components/deitDiscussion.vue

@@ -40,8 +40,9 @@
      </div>
    </el-dialog>

    <el-dialog title="" append-to-body :visible.sync="popupTableUserShow" width="50%" :before-close="userHandleClose">
      <avue-crud :data="userData" :page="userPage" :option="userOption"></avue-crud>
    <el-dialog title="" append-to-body :visible.sync="popupTableUserShow" width="80%" :before-close="userHandleClose">
      <avue-crud :data="userData" :page="userPage" :option="userOption" @search-change="searchChange"
        @search-reset="searchReset"></avue-crud>
    </el-dialog>
  </div>
</template>
@@ -58,6 +59,8 @@
  import {
    getPage
  } from "@/api/discuss/userTopics"

  import website from '@/config/website'


  import {
@@ -112,11 +115,17 @@
              prop: 'discussContent',
              type: 'input',
              row: true,
              rules: [{
                required: true,
                message: '请输入议题',
                trigger: 'blur'
              }],
            },
            {
              label: '选项范围',
              prop: 'optionRange',
              type: 'radio',
              value: 0,
              button: true,
              row: true,
              dicData: [{
@@ -125,14 +134,19 @@
              }, {
                label: '单选',
                value: 0
              }]
              }],
              rules: [{
                required: true,
                message: '请选项范围',
                trigger: 'blur'
              }],
            },
            {
              label: '排序',
              prop: 'sort',
              controlsPosition: '',
              type: 'number'
            },
            // {
            //   label: '排序',
            //   prop: 'sort',
            //   controlsPosition: '',
            //   type: 'number'
            // },
            {
              label: '选项内容',
              prop: 'children',
@@ -186,23 +200,53 @@

        userData: [],
        userOption: {
          addBtn: false,
          labelWidth: 96,
          searchLabelWidth: 96,
          searchShow: true,
          searchMenuSpan: 3,
          // menuWidth: 500,
          menu: false,

          height: "auto",
          calcHeight: 54,
          dialogWidth: 950,
          tip: false,
          border: false,
          //stripe:true,
          index: true,
          editBtn: false,
          addBtn: false,
          viewBtn: false,
          selection: true,
          delBtn: false,
          excelBtn: true,
          dialogClickModal: false,
          column: [{
            label: '姓名',
            prop: 'name'
            prop: 'name',
            searchSpan: 4,
            search: true,
          }, {
            label: '头像',
            type: 'upload',
            listType: "picture-img",
            prop: 'avatar'
          }, {
            label: '手机',
            prop: 'phone'
            prop: 'phone',
            searchSpan: 4,
            search: true,
          }, {
            label: '小区',
            prop: 'aoiName'
          }, {
            label: '地址',
            prop: 'addressName'
          }, {
            label: '签名',
            type: 'upload',
            listType: "picture-img",
            prop: 'signaturePath'
          }, {
            label: '时间',
            prop: 'createTime'
@@ -215,19 +259,45 @@
          currentPage: 1,
          total: 0
        },
        query: {},
      }
    },

    watch: {},

    methods: {

      userHandleClose() {

        this.popupTableUserShow = false
      },

      searchReset() {
        this.query = {}
        this.getUserPage(this.userPage)
      },

      searchChange(params, done) {
        this.query = params
        this.userPage.currentPage = 1
        this.getUserPage(this.userPage, params)
        done()
      },
      initData(newData) {
        this.editFlag = false
        this.popupTableShow = true
        this.articleId = newData.id

        this.onLoad()
        this.query.level = 1
        this.query.articleId = this.articleId
        this.onLoad(this.userPage, this.query)
      },
      // initData(newData) {
      //   this.editFlag = false
      //   this.popupTableShow = true
      //   this.articleId = newData.id

      //   this.onLoad()
      // },

      handleClose() {
        this.popupTableShow = false
@@ -301,7 +371,7 @@
            return remove(row.id)
          })
          .then(() => {
            this.onLoad()
            this.getUserPage(this.userPage)

            this.$message({
              type: "success",
@@ -340,7 +410,7 @@

      openUser(row, type = 0) {
        this.popupTableUserShow = true

        this.query = {}
        if (type == 0) {
          this.userParams = {
            articleId: row.id
@@ -362,19 +432,17 @@
            if (item.avatar.length > 0) {
              item.avatar = website.minioUrl + item.avatar
            }
            if (item.signaturePath && item.signaturePath.length > 0) {
              item.signaturePath = website.minioUrl + item.signaturePath
              // console.log("=====>", item.signaturePath)
            }
          })
        })
      },

      onLoad() {
      onLoad(page, params = {}) {
        this.loading = true

        let params = {
          level: 1,
          articleId: this.articleId
        }

        getLists(1, 100, Object.assign(params, this.query)).then(res => {
        getLists(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
          const data = res.data.data
          this.data = data
          this.loading = false

 src/views/article/components/discussionManageChild.vue

@@ -1,6 +1,6 @@
<template>
  <div>
    <el-dialog title="" append-to-body :visible.sync="dialogVisibles" width="60%" :before-close="handleClose">
    <el-dialog title="" append-to-body :visible.sync="dialogVisibles" width="50%" :before-close="handleClose">
      <avue-form ref="DisCussFrom" :option="option" v-model="disCussFrom" @submit="handleSubmit"></avue-form>
    </el-dialog>
  </div>
@@ -86,26 +86,14 @@
          addBtn: false,
          searchMenuSpan: 3,
          menuWidth: 500,
          column: [
            //   {
            //     label: '标题',
            //     prop: 'title',
            //     searchSpan: 4,
            //     span: 6,
            // },
            {
              label: '参与人数',
              prop: 'topsCount',
              searchSpan: 4,
              display: false,
              span: 6,
            },
            {
          column: [{
              label: '开启投票',
              prop: 'openFlag',
              type: 'radio',
              button: true,
              row: true,
              span: 6,
              offset: 8,
              value: 0,
              dicData: [{
                label: '开启',
@@ -124,7 +112,9 @@
              prop: 'voteRestrictions',
              type: 'radio',
              button: true,
              span: 6,
              row: true,
              span: 12,
              offset: 8,
              dicData: [{
                label: '一人一票',
                value: 0
@@ -143,7 +133,9 @@
              prop: 'signatureFlag',
              type: 'radio',
              button: true,
              row: true,
              span: 6,
              offset: 8,
              dicData: [{
                label: '不需要',
                value: 0
@@ -157,26 +149,29 @@
                trigger: "blur",
              }, ],
              value: 0
            }, {
              label: '指定用户',
              prop: 'appointUser',
              type: 'radio',
              button: true,
              span: 6,
              dicData: [{
                label: '不限制',
                value: 0
              }, {
                label: '指定用户',
                value: 1
              }],
              rules: [{
                required: true,
                message: "请选择是否指定用户",
                trigger: "blur",
              }, ],
              value: 0
            },
            // {
            //   label: '指定用户',
            //   prop: 'appointUser',
            //   type: 'radio',
            //   button: true,
            //   row: true,
            //   span: 12,
            //   offset: 8,
            //   dicData: [{
            //     label: '不限制',
            //     value: 0
            //   }, {
            //     label: '指定用户',
            //     value: 1
            //   }],
            //   rules: [{
            //     required: true,
            //     message: "请选择是否指定用户",
            //     trigger: "blur",
            //   }, ],
            //   value: 0
            // },

            {
              display: false,
@@ -184,8 +179,10 @@
              prop: "userIds",
              type: 'select',
              span: 6,
              offset: 8,
              remote: true,
              hide: true,
              row: true,
              dicUrl: "",
              props: {
                label: 'name',
@@ -202,6 +199,8 @@
            {
              label: "截止时间",
              span: 6,
              offset: 8,
              row: true,
              prop: "endTime",
              type: "datetime",
              format: "yyyy-MM-dd hh:mm:ss",
@@ -303,15 +302,15 @@
          const data = res.data.data
          this.page.total = data.total
          this.disCussFrom = data.records[0]

          if (this.disCussFrom.userIds) {
          getPersonPublicSelect({
            id: this.disCussFrom.userIds
          }).then(res => {
            const column = this.findObject(this.option.column, "userIds")
            column.dicData = res.data.data

            this.loading = false
          })
          }
        })
      }
    }

 src/views/article/components/publicSignUpChild.vue

@@ -1,8 +1,9 @@
<template>

  <div>
    <el-dialog title="" append-to-body :visible.sync="dialogVisiblesUser" width="50%" :before-close="userHandleClose">
      <avue-crud ref="DataUser" :option="userOption" :data="dataUser" v-model="dataUser" :page="pageUser"></avue-crud>
    <el-dialog title="" append-to-body :visible.sync="dialogVisiblesUser" width="80%" :before-close="userHandleClose">
      <avue-crud ref="DataUser" :option="userOption" :data="dataUser" v-model="dataUser" :page="pageUser"
        @search-change="searchChange" @search-reset="searchReset"></avue-crud>
    </el-dialog>
  </div>

@@ -112,11 +113,31 @@
        // 选择行
        selectionList: [],
        userOption: {
          addBtn: false,
          labelWidth: 96,
          searchLabelWidth: 96,
          searchShow: true,
          searchMenuSpan: 3,
          // menuWidth: 500,
          menu: false,

          height: "auto",
          calcHeight: 54,
          dialogWidth: 950,
          tip: false,
          border: false,
          //stripe:true,
          index: true,
          editBtn: false,
          addBtn: false,
          viewBtn: false,
          selection: true,
          delBtn: false,
          excelBtn: true,
          dialogClickModal: false,
          column: [{
              label: '姓名',
              prop: 'name'
              prop: 'name',
              search: true,
            }, {
              label: '头像',
              type: 'upload',
@@ -131,7 +152,8 @@
            },
            {
              label: '手机',
              prop: 'phone'
              prop: 'phone',
              search: true,
            }, {
              label: '小区',
              prop: 'aoiName'
@@ -164,6 +186,17 @@
      }
    },
    methods: {
      searchReset() {
        this.query = {}
        this.getUser(this.userPage)
      },

      searchChange(params, done) {
        this.query = params
        this.userPage.currentPage = 1
        this.getUser(this.userPage, params)
        done()
      },
      init(data) {
        this.houseCode = data.houseCode
        this.onLoad(this.page)

 src/views/place/components/baseAllInfo.vue

@@ -1,26 +1,35 @@
<template>
    <div class="cur-container-box">
    <el-dialog class="place-info-box" title="场所维护" append-to-body :visible.sync="roleBox" center @close="roleBoxClose">

        <div class="cur-container-box" v-if="roleBox">

        <div class="content-box">

            <box-title class="m10" :classVal="9" :title="'基本信息'"></box-title>
            <avue-form ref="baseForm" :option="option" v-model="form"></avue-form>
                <avue-form ref="baseForm" :option="option" v-model="form" :key="reload"></avue-form>

            <box-title class="m10" :classVal="9" :title="'其他信息'"></box-title>
            <avue-form ref="restForm" :option="optionDetail" v-model="placeForm"></avue-form>

            <box-title class="m10" :classVal="9" :title="'从业人员'"></box-title>
            <avue-crud :option="placeOption" :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="holdCurrentChange"
                @size-change="holdSizeChange" @refresh-change="refreshHoldChange" @on-load="holdOnLoad">
                <avue-crud :option="placeOption" :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="holdCurrentChange" @size-change="holdSizeChange" @refresh-change="refreshHoldChange"
                    @on-load="holdOnLoad">
            </avue-crud>

        </div>

        <div class="footer-btn-box">
            <el-button size="small" type="primary" @click="dataUpdate">保 存</el-button>

            <el-button size="small" @click="closeRowDetails">关 闭</el-button>
                <el-button size="small" @click="roleBoxClose">关 闭</el-button>
        </div>

    </div>

    </el-dialog>
</template>

<script>
@@ -57,6 +66,9 @@
        }

        return {
            reload: Math.random(),
            roleBox: false,

            placeExt: [],

            form: {},
@@ -76,38 +88,24 @@
                        }],
                    },


                    {
                        span: 7,
                        label: "场所标签",
                        prop: "label",
                        type: "cascader",
                        dicUrl: "/api/blade-category/category/getCategory?level=2",
                        cascader: ["smallLabel"],
                        props: {
                            label: "categoryName",
                            value: "categoryNo"
                        },
                        width: 160,
                        overHidden: true,
                        slot: true,
                        label: "地址",
                        prop: "location",
                        type: 'map',
                        dataType: "string",
                        hide: true,
                        rules: [{
                        span: 12,
                        value: [117.966460, 28.431002, ""],
                        rules: [
                            {
                            required: true,
                            message: "请输入场所标签",
                                message: "请选择地址",
                            trigger: "blur",
                        },],
                    },
                    {
                        span: 5,
                        label: "",
                        labelWidth: 20,
                        prop: "smallLabel",
                        type: "cascader",
                        dicUrl: "/api/blade-category/category/getCategory?parentNo={{label}}",
                        props: {
                            label: "categoryName",
                            value: "categoryNo"
                        },
                        dataType: "string",
                        hide: true,
                        ],
                    },

                    {
@@ -143,6 +141,7 @@
                        prop: "neiCode",
                        search: false,
                        type: "tree",
                        dataType: 'string',
                        dicUrl: "/api/blade-system/region/tree",
                        props: {
                            label: "name",
@@ -167,6 +166,7 @@
                            label: "gridName",
                            value: "id",
                        },
                        dataType: 'string',
                        dicUrl:
                            "/api/blade-grid/grid/getGridList?communityCode={{neiCode}}",
                        rules: [
@@ -176,6 +176,65 @@
                                trigger: "blur",
                            },
                        ],
                    },


                    {
                        span: 7,
                        label: "场所标签",
                        prop: "label",
                        type: "select",
                        dicUrl: "/api/blade-category/category/getCategory?level=2",
                        cascader: ["smallLabel"],
                        props: {
                            label: "categoryName",
                            value: "categoryNo"
                        },
                        dataType: "string",
                        hide: true,
                        rules: [{
                            required: true,
                            message: "请输入场所标签",
                            trigger: "blur",
                        },],
                    },
                    {
                        span: 5,
                        label: "",
                        labelWidth: 20,
                        prop: "smallLabel",
                        type: "select",
                        dicUrl: "/api/blade-category/category/getCategory?parentNo={{label}}",
                        props: {
                            label: "categoryName",
                            value: "categoryNo"
                        },
                        dataType: "string",
                        hide: true,
                    },

                    {
                        span: 12,
                        label: "标签颜色",
                        prop: "color",
                        type: "select",
                        dicData: [
                            {
                                label: '绿',
                                value: 'green'
                            }, {
                                label: '黄',
                                value: 'yellow'
                            }, {
                                label: '红',
                                value: 'red'
                            }
                        ],
                        props: {
                            label: "label",
                            value: "value"
                        },
                        hide: true,
                    },

                    {
@@ -193,25 +252,6 @@
                            url: "link",
                        },
                        span: 24,
                    },

                    {
                        width: 160,
                        overHidden: true,
                        slot: true,
                        label: "位置",
                        prop: "location",
                        type: 'map',
                        dataType: "string",
                        span: 24,
                        value: [117.966460, 28.431002, ""],
                        rules: [
                            {
                                required: true,
                                message: "请选择位置",
                                trigger: "blur",
                            },
                        ],
                    },
                ]
            },
@@ -330,6 +370,7 @@
                total: 0,
            },
            houseHoldForm: {},

        }
    },

@@ -337,17 +378,23 @@

    inject: ["placeElement"],

    watch: {
        'placeElement.curRow': {
            handler (newData) {
    watch: {},

    methods: {
        initOpen (newData) {
            this.curRow = newData
            this.roleBox = true

                const that = this
                if (newData && 'id' in newData && newData['id'] != null && newData['id'] != '') {

                    that.$axios.all([
                        getPlace(newData['id']),
                        getPlaceExt({ placeId: newData['id'] }),
                    ]).then(that.$axios.spread(function (baseInfo, restInfo) {
                        that.form = baseInfo.data.data
                console.log(that.form, 90999)

                // that.$nextTick(() => that.$refs.baseForm.dicInit('cascader'))

                        that.form.location = [that.form.lng, that.form.lat, that.form.location].join(',')

@@ -390,16 +437,14 @@
                            }
                        }

                // that.$nextTick(() => {
                //     that.$refs.baseForm.dicInit('select')
                // })
                    }))

                    that.holdOnLoad(this.holdPage)
                }
            },
            immediate: true
        }
    },

    methods: {
        locationDispose (data) {
            data = data.split(',')

@@ -455,7 +500,7 @@
        houseHoldRowSave (row, done, loading) {
            holdAdd({
                ...row,
                placeId: this.placeElement.curRow.id
                placeId: this.curRow.id
            }).then(
                () => {
                    this.holdOnLoad(this.holdPage)
@@ -478,11 +523,11 @@
        },

        holdOnLoad (holdPage, params = {}) {
            if (!this.placeElement.curRow.id) return
            if (!this.curRow.id) return

            let values = {
                ...params,
                placeId: this.placeElement.curRow.id
                placeId: this.curRow.id
            }

            getHoldList(holdPage.currentPage, holdPage.pageSize, values).then((res) => {
@@ -557,8 +602,14 @@
            })
        },

        closeRowDetails () {
            this.placeElement.roleBox = false
        roleBoxClose () {
            this.form = {}
            this.placeForm = {}

            this.$refs.baseForm && this.$refs.baseForm.resetForm()
            this.$refs.restForm && this.$refs.restForm.resetForm()

            this.roleBox = false
        }
    },
}

 src/views/place/index.vue

@@ -48,9 +48,7 @@
            </template>
        </avue-crud>

        <el-dialog class="place-info-box" title="场所维护" append-to-body :visible.sync="roleBox" center @close="roleBoxClose">
            <baseAllInfo></baseAllInfo>
        </el-dialog>
        <baseAllInfo ref="BaseAllInfo"></baseAllInfo>

        <el-dialog class="place-info-box audit-info-box" title="审核" append-to-body :visible.sync="auditBasePopup"
            width="30%">
@@ -93,9 +91,6 @@
        }

        return {
            curRow: {},
            roleBox: false,

            form: {},
            query: {},
            loading: true,
@@ -143,38 +138,22 @@
                    },

                    {
                        span: 7,
                        label: "场所标签",
                        prop: "label",
                        type: "cascader",
                        dicUrl: "/api/blade-category/category/getCategory?level=2",
                        cascader: ["smallLabel"],
                        props: {
                            label: "categoryName",
                            value: "categoryNo"
                        },
                        width: 156,
                        overHidden: true,
                        slot: true,
                        label: "地址",
                        prop: "location",
                        type: 'map',
                        dataType: "string",
                        hide: true,
                        rules: [{
                            required: true,
                            message: "请输入场所标签",
                            trigger: "blur",
                        },],
                    },

                        span: 12,
                        value: [117.966460, 28.431002, ""],
                        rules: [
                    {
                        span: 5,
                        label: "",
                        labelWidth: 20,
                        prop: "smallLabel",
                        type: "cascader",
                        dicUrl: "/api/blade-category/category/getCategory?parentNo={{label}}",
                        props: {
                            label: "categoryName",
                            value: "categoryNo"
                                required: true,
                                message: "请选择地址",
                                trigger: "blur",
                        },
                        dataType: "string",
                        hide: true,
                        ],
                    },

                    {
@@ -294,6 +273,67 @@
                            },
                        ],
                    },


                    {
                        span: 7,
                        label: "场所标签",
                        prop: "label",
                        type: "select",
                        dicUrl: "/api/blade-category/category/getCategory?level=2",
                        cascader: ["smallLabel"],
                        props: {
                            label: "categoryName",
                            value: "categoryNo"
                        },
                        dataType: "string",
                        hide: true,
                        rules: [{
                            required: true,
                            message: "请输入场所标签",
                            trigger: "blur",
                        },],
                    },

                    {
                        span: 5,
                        label: "",
                        labelWidth: 20,
                        prop: "smallLabel",
                        type: "select",
                        dicUrl: "/api/blade-category/category/getCategory?parentNo={{label}}",
                        props: {
                            label: "categoryName",
                            value: "categoryNo"
                        },
                        dataType: "string",
                        hide: true,
                    },

                    {
                        span: 12,
                        label: "标签颜色",
                        prop: "color",
                        type: "select",
                        dicData: [
                            {
                                label: '绿',
                                value: 'green'
                            }, {
                                label: '黄',
                                value: 'yellow'
                            }, {
                                label: '红',
                                value: 'red'
                            }
                        ],
                        props: {
                            label: "label",
                            value: "value"
                        },
                        hide: true,
                    },

                    {
                        width: 110,
                        label: "场所照片",
@@ -311,24 +351,6 @@
                        span: 24,
                    },

                    {
                        width: 156,
                        overHidden: true,
                        slot: true,
                        label: "位置",
                        prop: "location",
                        type: 'map',
                        dataType: "string",
                        span: 24,
                        value: [117.966460, 28.431002, ""],
                        rules: [
                            {
                                required: true,
                                message: "请选择位置",
                                trigger: "blur",
                            },
                        ],
                    },

                    {
                        width: 96,
@@ -521,13 +543,8 @@
            this.auditBasePopup = true
        },

        roleBoxClose () {
            this.curRow = {}
        },

        ManageTenants (item) {
            this.curRow = item
            this.roleBox = true
            this.$refs.BaseAllInfo.initOpen(item)
        },

        rowSave (row, done, loading) {

 src/views/property/components/propertyEdit.vue

@@ -1,34 +1,59 @@
<template>

  <el-dialog title="" append-to-body :visible.sync="infoVisible" top="10vh" width="70%">
  <el-dialog title="" append-to-body :visible.sync="infoVisible" top="10vh" width="70%" :before-close="handleClose">
    <el-tabs v-model="activeName" @tab-click="handleClick">
      <el-tab-pane label="基础信息" name="first"></el-tab-pane>
      <el-tab-pane label="基础信息" name="second"></el-tab-pane>
      <el-tab-pane label="良好行为信息" name="third"></el-tab-pane>
      <el-tab-pane label="不良行为信息" name="fourth"></el-tab-pane>
      <!-- <el-tab-pane label="物业信息" name="first"></el-tab-pane> -->
      <el-tab-pane label="基础信息" name="info1"></el-tab-pane>
      <el-tab-pane label="经营信息" name="info2"></el-tab-pane>
      <el-tab-pane label="纳税信息" name="info3"></el-tab-pane>
      <el-tab-pane label="党建信息" name="info4"></el-tab-pane>
      <el-tab-pane label="企业良好行为" name="info5"></el-tab-pane>
      <el-tab-pane label="项目良好行为" name="info6"></el-tab-pane>
      <el-tab-pane label="违法违规行为惩戒" name="info7"></el-tab-pane>

    </el-tabs>


    <avue-form :option="option" v-model="first" v-if="activeName == 'first'"></avue-form>
    <!-- <avue-form :option="option" v-model="first" v-if="activeName == 'first'" @submit="rowSave"></avue-form> -->

    <!-- <avue-form :option="option" v-model="second" v-if="activeName == 'second'"></avue-form> -->
    <div>

    <div v-if="activeName != 'first'">
      <div v-for="(item, index) in questionBankData" :key="index">
        <div>
          {{ item.subjectName }}
          {{index+1}} .{{ item.subjectName }}
        </div>
        <div v-for="(item1, index1) in item.subjectOptionList" :key="index1">
        <!-- <div v-for="(item1, index1) in item.subjectOptionList" :key="index1"> -->
          <!-- <div>
            {{ item1.optionName }}
          </div> -->
          <el-radio-group>
            <el-radio :label="item1.id">{{item1.optionName}}</el-radio>
          </el-radio-group>
        <!-- <el-radio-group v-model="item.ids" v-if="item.choicesType == 0"> -->

        <div v-if="item.choicesType == 0">
          <div v-for="(item1, index1) in item.subjectOptionList" :key="index1">
            <el-radio v-model="item1.ids" :label="item1.id">{{item1.optionName}}-----------{{item1.score}}</el-radio>
        </div>
      </div>

        <!-- </el-radio-group> -->

        <div v-if="item.choicesType == 3">
          <!-- <div>{{item1.optionName}}</div> -->
          <div v-for="(item1, index1) in item.subjectOptionList" :key="index1">
            <el-input-number v-model="item1.numbers" @change="handleChange" :min="0" :max="25"
              :label="item1.optionName"></el-input-number>
          </div>

          <!-- <el-input v-model="item1.numbers" type="number" :placeholder="item1.optionName"></el-input> -->
        </div>

        <!-- </div> -->
      </div>

    </div>

    <div slot="footer" class="dialog-footer">
      <el-button @click="infoVisible = false">取 消</el-button>
      <el-button type="primary" @click="submit">提 交</el-button>
    </div>


@@ -40,10 +65,21 @@
    getList,
    remove
  } from "@/api/subjectChoices/subjectChoices";

  import {
    save
  } from "@/api/answerRecord/answerRecord";
  import {
    add
  } from "@/api/property/propertyCompany"
  import {
    mapGetters
  } from "vuex"
  export default {
    data() {
      return {
        activeName: 'first',
        property: {},
        activeName: 'info1',
        infoVisible: false,
        page: {
          pageSize: 20,
@@ -170,7 +206,55 @@
        },
      };
    },
    computed: {
      ...mapGetters(["permission", "userInfo"]),
    },
    methods: {

      handleClose() {
        this.infoVisible = false
        // this.$refs.DisCussFrom && this.$refs.DisCussFrom.resetForm()
      },

      submit() {
        console.log("============>", this.questionBankData)
        save(this.questionBankData).then(
          () => {
            // this.onLoad(this.page)
            this.$message({
              type: "success",
              message: "操作成功!",
            })
            done()
          },
          (error) => {
            window.console.log(error)
            loading()
          }
        )
      },
      handleChange(value) {
        console.log(value);
      },

      rowSave(form, done) {
        console.log('==========>', JSON.stringify(form))
        form.userid = this.userInfo.user_id
        add(form).then(
          () => {
            // this.onLoad(this.page)
            this.$message({
              type: "success",
              message: "操作成功!",
            })
            done()
          },
          (error) => {
            window.console.log(error)
            loading()
          }
        )
      },

      questionBankOnLoad(page, params = {}) {
        // params = {}
@@ -183,18 +267,41 @@
          const data = res.data.data;
          this.page.total = data.total;
          this.questionBankData = data.records;
          // this.questionBankLoading = false;
          this.questionBankData.forEach(item => {
            item.propertyId = this.property.id
          })
        });
      },

      init(row) {
        this.infoVisible = true
        let param = {
          subclassName: '基础信息'
        }
        this.property = row
        this.questionBankOnLoad(this.page, param)
      },

      handleClick(tab, event) {
        console.log(tab, event);
        // this.$confirm("确定将选择数据删除?", {
        //     confirmButtonText: "确定",
        //     cancelButtonText: "取消",
        //     type: "warning",
        //   })
        //   .then(() => {
        //     return remove(row.id)
        //   })
        //   .then(() => {
        //     this.onLoad(this.page)
        //     this.$message({
        //       type: "success",
        //       message: "操作成功!",
        //     })
        //   })
        // console.log(tab, event);
        console.log('============>', JSON.stringify(this.questionBankData))
        let param = {
          categoryName: tab.label
          subclassName: tab.label
        }
        this.questionBankOnLoad(this.page, param)
      }

 src/views/property/propertyCompany.vue

@@ -18,7 +18,7 @@
          @click="openPayConfig(row)">商户配置
        </el-button>

        <el-button :size="size" icon="el-icon-circle-plus-outline" type="text" @click="addProperty()">新 增
        <el-button :size="size" icon="el-icon-circle-plus-outline" type="text" @click="addProperty(row)">物业评定
        </el-button>
      </template>
    </avue-crud>
@@ -350,8 +350,8 @@
    methods: {


      addProperty() {
        this.$refs.propertyEdit.init();
      addProperty(row) {
        this.$refs.propertyEdit.init(row);
      },

      aliSubmit(form, done) {

 src/views/propertySupervision/houseHoldSupervision.vue

@@ -236,13 +236,13 @@
              hide: true,
              display: false
            },
            {
              width: 156,
              overHidden: true,
              label: "地址",
              prop: "address",
              display: false,
            },
            // {
            //   width: 156,
            //   overHidden: true,
            //   label: "地址",
            //   prop: "address",
            //   display: false,
            // },
            {
              // hide: true,
              width: 220,

 src/views/system/email.vue

New file
@@ -0,0 +1,339 @@
<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"
               @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"
                   @click="handleDelete">删 除
        </el-button>
      </template>

      <template slot-scope="{row, size}" slot="status">
        <el-tag :size="size" :type="row.statusName == '是' ? 'success' : 'info'">{{ row.statusName }}</el-tag>
      </template>




      <template slot-scope="{ row, size, index }" slot="menu">
        <el-button :size="size" type="text" icon="el-icon-circle-check" v-if="permission.email_enable"
                   @click.stop="handleEnable(row)">启用
        </el-button>
        <el-button :size="size" type="text" icon="el-icon-video-play" v-if="userInfo.role_name.includes('admin')"
                   @click="handleDebug(row)">调试
        </el-button>
      </template>

    </avue-crud>

    <el-dialog title="短信发送调试" append-to-body :visible.sync="box" width="550px">
      <avue-form ref="form" :option="debugOption" v-model="debugForm" @submit="handleSubmit" />
    </el-dialog>

  </basic-container>
</template>

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

  export default {
    data() {
      return {
        box:false,
        form: {},
        query: {},
        loading: true,
        page: {
          pageSize: 10,
          currentPage: 1,
          total: 0
        },
        selectionList: [],
        option: {height:'auto',
          calcHeight: 30,
          tip: false,
          searchShow: true,
          searchMenuSpan: 6,
          border: true,
          index: true,
          viewBtn: true,
          selection: true,
          dialogClickModal: false,
          menuWidth: 350,
          column: [
            {
              label: "主键",
              prop: "id",
              type: "input",
              addDisplay: false,
              editDisplay: false,
              viewDisplay: false,
              hide: true,
            },
            {
              label: "发送者邮箱",
              prop: "username",
              type: "input",
            },
            {
              label: "授权码",
              prop: "password",
              type: "input",
            },
            {
              label: "服务器地址",
              prop: "host",
              type: "input",
            },
            {
              label: "端口号",
              prop: "port",
              type: "input",
              value:465
            },
            {
              label: "默认编码",
              prop: "defaultEncoding",
              type: "input",
              value:"UTF-8"
            },
            {
              label: "协议",
              prop: "protocol",
              type: "input",
              value: "smtps"
            },
            {
              label: "备注",
              prop: "remark",
              type: "input",
            },
            {
              label: "是否启用",
              prop: "status",
              type: "input",
              addDisplay: false,
              editDisplay: false,
              viewDisplay: false,
            },
          ]},
        data: [],


        debugForm: {},
        debugOption: {
          submitText: "提交",
          column: [
            {
              label: "收件人",
              prop: "emails",
              placeholder:"多个收件人请用英文逗号进行分隔",
              span: 24,
            },
            {
              label: "主题",
              prop: "subject",
              span: 24,
            },
            {
              label: "内容",
              prop: "content",
              type:"textarea",
              minRow:5,
              span: 24,
            },
          ]
        }

      };
    },
    computed: {
      ...mapGetters(["permission","userInfo"]),
      permissionList() {
        return {
          addBtn: this.vaildData(this.permission.email_add, false),
          viewBtn: this.vaildData(this.permission.email_view, false),
          delBtn: this.vaildData(this.permission.email_delete, false),
          editBtn: this.vaildData(this.permission.email_edit, false)
        };
      },
      ids() {
        let ids = [];
        this.selectionList.forEach(ele => {
          ids.push(ele.id);
        });
        return ids.join(",");
      }
    },
    methods: {
      handleSubmit (form, done) {
        console.log(form,"+++++++++")

        form.emails = form.emails.split(",")

        sendEmail(form).then(res=>{
          this.$message({
            type: "success",
            message: "发送成功!"
          });
        })
        done()
      },
      rowSave(row, done, loading) {
        add(row).then(() => {
          this.onLoad(this.page);
          this.$message({
            type: "success",
            message: "操作成功!"
          });
          done();
        }, error => {
          loading();
          window.console.log(error);
        });
      },
      rowUpdate(row, index, done, loading) {
        update(row).then(() => {
          this.onLoad(this.page);
          this.$message({
            type: "success",
            message: "操作成功!"
          });
          done();
        }, error => {
          loading();
          console.log(error);
        });
      },
      rowDel(row) {
        this.$confirm("确定将选择数据删除?", {
          confirmButtonText: "确定",
          cancelButtonText: "取消",
          type: "warning"
        })
          .then(() => {
            return remove(row.id);
          })
          .then(() => {
            this.onLoad(this.page);
            this.$message({
              type: "success",
              message: "操作成功!"
            });
          });
      },
      handleDebug (row) {
        console.log(row,"++++++++++")
        this.box = true
      },
      handleEnable (row) {
        this.$confirm("是否确定启用这条配置?", {
          confirmButtonText: "确定",
          cancelButtonText: "取消",
          type: "warning"
        })
          .then(() => {
            return enable(row.id)
          })
          .then(() => {
            this.onLoad(this.page)
            this.$message({
              type: "success",
              message: "操作成功!"
            })
            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;
          });
        }
        done();
      },
      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();
      },
      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>
</style>

 src/views/userHouse/components/householdManager.vue

@@ -53,7 +53,7 @@
            var regIdCard = /^(^[1-9]\d{7}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}$)|(^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])((\d{4})|\d{3}[Xx])$)$/

            // 如果通过该验证，说明身份证格式正确，但准确性还需计算
            if (regIdCard.test(value)) {
            if (regIdCard.test(value) || value == '') {
                if (value.length == 18) {
                    var idCardWi = new Array(7, 9, 10, 5, 8, 4, 2, 1, 6, 3, 7, 9, 10,
                        5, 8, 4, 2) // 将前17位加权因子保存在数组里
@@ -527,6 +527,12 @@
                        prop: "cardNumber",
                        hide: true,
                    },

                    {
                        label: "备注",
                        prop: "remark",
                        hide: true,
                    },
                ]
            },
            houseCode: "",

 src/views/userHouse/houseHoldList.vue

@@ -3,25 +3,25 @@
    <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"
          :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">
                    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">
          <template slot="menuLeft">
            <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="{row, size}" slot="menu">
            <el-button :size="size" type="text" icon="el-icon-circle-plus-outline" v-if="permission.househould_manager"
              @click="manageLabel(row)">标签
                        <el-button :size="size" type="text" icon="el-icon-circle-plus-outline"
                            v-if="permission.househould_manager" @click="manageLabel(row)">标签
            </el-button>
          </template>
          <template slot-scope="{row, size}" slot="phoneNumber">
@@ -39,8 +39,8 @@
        </avue-crud>
        <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">
                    <el-tree :data="roleGrantList" show-checkbox check-strictly default-expand-all node-key="id"
                        ref="treeRole" :default-checked-keys="roleTreeObj" :props="props">
          </el-tree>

          <span slot="footer" class="dialog-footer">
@@ -59,8 +59,8 @@
              </el-col>
            </el-row>
            <div class="grid-container2" v-if="item.children">
              <div class="grid-item" :style="{ backgroundColor: item2.color }" v-for="(item2, index2) in item.children"
                @click="changLabel(item2)" :key="index2">
                            <div class="grid-item" :style="{ backgroundColor: getColor(item2.color) }"
                                v-for="(item2, index2) in item.children" @click="changLabel(item2)" :key="index2">
                {{ item2.name }}
              </div>
            </div>
@@ -72,7 +72,8 @@
          </span> -->
        </el-dialog>

        <el-dialog :title="'编辑标签   ' + currentLabel.name" append-to-body :visible.sync="editLabelFlge" width="655px">
                <el-dialog :title="'编辑标签   ' + currentLabel.name" append-to-body :visible.sync="editLabelFlge"
                    width="655px">
          <avue-form :option="labelOption" v-model="labelForm" :submit="onsubmit">
          </avue-form>
          <span slot="footer" class="dialog-footer">
@@ -96,6 +97,7 @@
</template>

<script>
import { setLabelColor } from '@/util/util'
  import {
    getList,
    remove,
@@ -142,7 +144,7 @@
          /^(^[1-9]\d{7}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}$)|(^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])((\d{4})|\d{3}[Xx])$)$/

        // 如果通过该验证，说明身份证格式正确，但准确性还需计算
        if (regIdCard.test(value)) {
            if (regIdCard.test(value) || value == '') {
          if (value.length == 18) {
            var idCardWi = new Array(7, 9, 10, 5, 8, 4, 2, 1, 6, 3, 7, 9, 10,
              5, 8, 4, 2) // 将前17位加权因子保存在数组里
@@ -675,6 +677,12 @@
              prop: "cardNumber",
              hide: true,
            },

                {
                    label: "备注",
                    prop: "remark",
                    hide: true,
                },
          ]
        },
        data: [],
@@ -692,18 +700,15 @@
            row: true,
            dicData: [{
              label: '撤销',
              value: '#EBEDF0'
                        value: '#999'
            }, {
              label: '绿',
              // value: '#30D17C'
              value:'green'
            }, {
              label: '黄',
              // value: '#FFB42B'
              value:'yellow'
            }, {
              label: '红',
              // value: '#EA1F1F'
              value:'red'
            }],
            rules: [{
@@ -859,6 +864,12 @@
        return (list) => {
          return list.map(item => item.labelName).join(',')
        }
        },

        getColor () {
            return (data) => {
                return setLabelColor(data)
            }
      }
    },
    mounted() {},

 src/views/userHouse/houseList.vue

@@ -52,8 +52,8 @@

                <el-dialog title="标签管理" append-to-body :visible.sync="labelFlag" center width="600px">
                    <div id="" class="grid-container2">
                        <div class="grid-item" :style="{ backgroundColor: item.color }" v-for="(item, index) in labelData"
                            :key="index" @click="changLabel(item)">
                        <div class="grid-item" v-for="(item, index) in labelData" :key="index" @click="changLabel(item)">
                            {{ item.color }}
                            {{ item.name }}
                        </div>
                    </div>
@@ -92,6 +92,8 @@
</template>

<script>
import { setLabelColor } from '@/util/util'

import {
    getList,
    remove,
@@ -162,18 +164,15 @@
                    row: true,
                    dicData: [{
                        label: '撤销',
                        // value: '#EBEDF0'
                        value: '#999'
                    }, {
                        label: '绿',
                        // value: '#30D17C'
                        value:'green'
                    }, {
                        label: '黄',
                        // value: '#FFB42B'
                        value:'yellow'
                    }, {
                        label: '红',
                        // value: '#EA1F1F'
                        value:'red'
                    }],
                    rules: [{
@@ -227,21 +226,15 @@
                        display: false
                    },
                    {
                        width: 156,
                        overHidden: true,
                        label: "地址",
                        prop: "address",
                        display: false,
                    },
                    {
                        // hide: true, 
                        width: 220,
                        overHidden: true,
                        label: '地址',
                        parent: false,
                        prop: "houseName",
                        searchSpan: 4,
                        display: false,
                        searchLabelWidth: 66,
                        searchSpan: 4,
                        search: true,
                    },
                    {
@@ -518,6 +511,12 @@
            return (list) => {
                return list.map(item => item.labelName).join(',')
            }
        },

        getColor () {
            return (data) => {
                return setLabelColor(data)
            }
        }
    },
    mounted () { },

 src/views/work/process/maintenanceFundApply/handle.vue

@@ -20,10 +20,14 @@
        </div>
        <el-row type="flex" class="row-bg">
          <el-timeline>
            <el-timeline-item :key="flow.id" :timestamp="flow.createTime" v-for="flow in flowList" placement="top">
                        <el-timeline-item :key="flow.id" :timestamp="flow.createTime" v-for="flow in flowList"
                            placement="top">
              <el-card shadow="hover">
                <p>{{flow.assigneeName}} 在 [{{flow.createTime}}] 开始处理 [{{flow.historyActivityName}}] 环节</p>
                <p v-if="flow.historyActivityDurationTime!==''">任务历时 [{{flow.historyActivityDurationTime}}]</p>
                                <p>{{ flow.assigneeName }} 在 [{{ flow.createTime }}] 开始处理 [{{ flow.historyActivityName }}]
                                    环节</p>
                                <p v-if="flow.historyActivityDurationTime !== ''">任务历时 [{{ flow.historyActivityDurationTime
                                }}]
                                </p>
                <p v-if="flow.comment!==''">批复意见: [{{flow.comment}}]</p>
                <p v-if="flow.endTime!==''">结束时间: [{{flow.endTime}}]</p>
              </el-card>
@@ -62,7 +66,7 @@
  import {
    historyFlowList,
    leaveDetail
  } from "@/api/work/process";
} from "@/api/work/process"

  import {
    getList,
@@ -70,10 +74,11 @@
    update,
    add,
    getPropertyCapitalApply
  } from "@/api/property/propertyCapitalApply";
} from "@/api/property/propertyCapitalApply"
  import {
    completeTask
  } from "@/api/work/work";
} from "@/api/work/work"
import website from '@/config/website'

  export default {
    data() {
@@ -289,6 +294,7 @@
              label: '施工方案附件',
              prop: 'constructionSchemeUrls',
              type: 'upload',
                    listType: 'picture-img',
              span: 24,
              hide: true,
              labelWidth: 140,
@@ -311,7 +317,7 @@
      }
    },
    created() {
      this.init();
        this.init()
    },
    beforeRouteUpdate(to, from, next) {
      // 在当前路由改变，但是该组件被复用时调用
@@ -319,80 +325,81 @@
      // 由于会渲染同样的 Foo 组件，因此组件实例会被复用。而这个钩子就会在这个情况下被调用
      // 可以访问组件实例 `this`
      if (to.fullPath !== from.fullPath) {
        next();
        this.init();
            next()
            this.init()
      }
    },
    methods: {
      init() {
        this.taskId = this.$route.params.taskId;
        this.processInstanceId = this.$route.params.processInstanceId;
        this.businessId = this.$route.params.businessId;
            this.taskId = this.$route.params.taskId
            this.processInstanceId = this.$route.params.processInstanceId
            this.businessId = this.$route.params.businessId
        historyFlowList(this.processInstanceId).then(res => {
          const data = res.data;
                const data = res.data
          if (data.success) {
            this.flowList = data.data;
                    this.flowList = data.data
          }
        })
        getPropertyCapitalApply(this.businessId).then(res => {
          const data = res.data;
                const data = res.data
          if (data.success) {
            this.form = data.data;
                    data.data.constructionSchemeUrls = website.minioUrl + data.data.constructionSchemeUrls
                    this.form = data.data
          }
        })
      },
      handleAgree() {
        if (!this.form.comment) {
          this.$message.warning('请先填写批复意见');
          return;
                this.$message.warning('请先填写批复意见')
                return
        }
        const params = {
          taskId: this.taskId,
          processInstanceId: this.processInstanceId,
          flag: 'ok',
          comment: this.form.comment,
        };
            }
        completeTask(params).then(res => {
          const data = res.data;
                const data = res.data
          if (data.success) {
            this.$message.success(data.msg);
            this.$router.$avueRouter.closeTag();
                    this.$message.success(data.msg)
                    this.$router.$avueRouter.closeTag()
            this.$router.push({
              path: `/work/todo`
            });
                    })
          } else {
            this.$message.error(data.msg || '提交失败');
                    this.$message.error(data.msg || '提交失败')
          }
        })
      },
      handleDisagree() {
        if (!this.form.comment) {
          this.$message.warning('请先填写批复意见');
          return;
                this.$message.warning('请先填写批复意见')
                return
        }
        const params = {
          taskId: this.taskId,
          processInstanceId: this.processInstanceId,
          comment: this.form.comment,
        };
            }
        completeTask(params).then(res => {
          const data = res.data;
                const data = res.data
          if (data.success) {
            this.$message.success(data.msg);
            this.$router.$avueRouter.closeTag();
                    this.$message.success(data.msg)
                    this.$router.$avueRouter.closeTag()
            this.$router.push({
              path: `/work/todo`
            });
                    })
          } else {
            this.$message.error(data.msg || '提交失败');
                    this.$message.error(data.msg || '提交失败')
          }
        })
      },
      handleCancel() {
        this.$router.$avueRouter.closeTag();
            this.$router.$avueRouter.closeTag()
        this.$router.push({
          path: `/work/todo`
        });
            })
      }
    }
  }