Merge remote-tracking branch 'origin/master'

linwei

2024-01-10 ca788e3a4122fbeb46947be76ec21625306fa0a7

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/views/publicSecurity/bailReporting.vue
#	src/views/publicSecurity/keynotePlaceManage.vue

 src/views/article/article.vue

@@ -221,6 +221,25 @@
                        },],
                    },
                    {
                        label: "发布时间",
                        prop: "dateTime",
                        type: "daterange",
                        format: "yyyy-MM-dd",
                        valueFormat: "yyyy-MM-dd",
                        searchSpan: 6,
                        searchRange: true,
                        hide: true,
                        addDisplay: false,
                        editDisplay: false,
                        viewDisplay: false,
                        search: true,
                        rules: [{
                            required: true,
                            message: "请选择发布时间",
                            trigger: "blur",
                        },],
                    },
                    {
                        width: 100,
                        label: "发布时间",
                        prop: "createTime",

 src/views/article/components/discussionManageChild.vue

@@ -254,7 +254,7 @@
    },
    methods: {
        getUserList () {
            let dicUrl = `/blade-household/household/selectHouseholdList?searchKey={{key}}&limit=20`
            let dicUrl = `/api/blade-household/household/selectHouseholdList?searchKey={{key}}&limit=20`
            const column = this.findObject(this.option.column, "userIds")
            column.dicUrl = dicUrl
        },

 src/views/article/discussionManage.vue

@@ -210,6 +210,25 @@
                        },],
                    },
                    {
                        label: "发布时间",
                        prop: "dateTime",
                        type: "daterange",
                        format: "yyyy-MM-dd",
                        valueFormat: "yyyy-MM-dd",
                        searchSpan: 6,
                        searchRange: true,
                        hide: true,
                        addDisplay: false,
                        editDisplay: false,
                        viewDisplay: false,
                        search: true,
                        rules: [{
                            required: true,
                            message: "请选择发布时间",
                            trigger: "blur",
                        },],
                    },
                    {
                        width: 100,
                        label: "发布时间",
                        prop: "createTime",

 src/views/article/publicSignUp.vue

@@ -202,6 +202,25 @@
                        }],
                    },
                    {
                        label: "发布时间",
                        prop: "dateTime",
                        type: "daterange",
                        format: "yyyy-MM-dd",
                        valueFormat: "yyyy-MM-dd",
                        searchSpan: 6,
                        searchRange: true,
                        hide: true,
                        addDisplay: false,
                        editDisplay: false,
                        viewDisplay: false,
                        search: true,
                        rules: [{
                            required: true,
                            message: "请选择发布时间",
                            trigger: "blur",
                        },],
                    },
                    {
                        width: 100,
                        label: "发布时间",
                        prop: "createTime",

 src/views/cGovernance/gridPatrolRecord.vue

@@ -46,13 +46,16 @@
            datetime: "",
            selectionList: [],
            option: {
                labelWidth: 96,
                searchLabelWidth: 96,
                searchShow: true,
                searchMenuSpan: 3,
                menuWidth: 210,

                height: "auto",
                calcHeight: 54,
                dialogWidth: 950,
                tip: false,
                searchShow: true,
                searchMenuSpan: 3,
                menuWidth: 350,
                border: false,
                //stripe:true,
                index: true,
@@ -102,6 +105,7 @@
                    },

                    {
                        width: 96,
                        slot: true,
                        addDisplay: false,
                        editDisplay: false,
@@ -111,6 +115,7 @@
                    },

                    {
                        width: 96,
                        slot: true,
                        addDisplay: false,
                        editDisplay: false,
@@ -134,9 +139,9 @@
                        span: 24,
                    },
                    {
                        width: 144,
                        label: "巡查时间",
                        prop: "patrolTime",
                        width: 160,
                        type: "date",
                        format: "yyyy-MM-dd HH:mm:ss",
                        valueFormat: "yyyy-MM-dd HH:mm:ss",

 src/views/cGovernance/gridWorkLog.vue

@@ -43,13 +43,14 @@
            option: {
                labelWidth: 120,
                searchLabelWidth: 96,
                searchShow: true,
                searchMenuSpan: 3,
                menuWidth: 210,

                height: "auto",
                calcHeight: 54,
                dialogWidth: 950,
                tip: false,
                searchShow: true,
                searchMenuSpan: 3,
                menuWidth: 280,
                border: false,
                //stripe:true,
                index: true,
@@ -59,6 +60,7 @@
                dialogClickModal: false,
                column: [
                    {
                        width: 120,
                        label: "走访类型",
                        prop: "type",
                        span: 12,
@@ -231,6 +233,7 @@
                    },

                    {
                        dispaly: false,
                        width: 144,
                        label: "上报时间",
                        prop: "createTime",
@@ -341,7 +344,7 @@

    methods: {
        getUserList (param = '') {
            let dicUrl = `/blade-household/household/selectHouseholdList?labelId=${param}&searchKey={{key}}&limit=20`
            let dicUrl = `/api/blade-household/household/selectHouseholdList?labelId=${param}&searchKey={{key}}&limit=20`
            const column = this.findObject(this.option.column, "householdId")
            column.dicUrl = dicUrl
        },

 src/views/cGovernance/punchCard.vue

@@ -28,6 +28,12 @@
            datetime: "",
            selectionList: [],
            option: {
                labelWidth: 120,
                searchLabelWidth: 96,
                searchShow: true,
                searchMenuSpan: 3,
                menuWidth: 280,

                menu: false,
                addBtn: false,
                border: true,
@@ -37,15 +43,13 @@
                calcHeight: 54,
                dialogWidth: 950,
                tip: false,
                searchShow: true,
                searchMenuSpan: 3,
                //stripe:true,
                viewBtn: true,
                excelBtn: true,
                dialogClickModal: false,
                column: [
                    {
                        width: 96,
                        width: 110,
                        label: "打卡人员",
                        prop: "name",
                        search: true,
@@ -66,11 +70,12 @@
                        search: true,
                        rules: [{
                            required: true,
                            message: "请选择发布时间",
                            message: "请选择打卡时间",
                            trigger: "blur",
                        },],
                    },
                    {
                        width: 144,
                        label: "打卡时间",
                        prop: "createTime",
                        type: "date",
@@ -89,14 +94,17 @@
                        prop: "workContent",
                    },
                    {
                        width: 96,
                        label: "经度",
                        prop: "lng",
                    },
                    {
                        width: 96,
                        label: "纬度",
                        prop: "lat",
                    },
                    {
                        overHidden: true,
                        label: "打卡地址",
                        prop: "address",
                    },

 src/views/cGovernance/taskECall.vue

@@ -34,6 +34,19 @@
//   import AvueMap from "avue-plugin-map";
export default {
    data () {

        //手机号格式校验
        let validatorPhone = function (rule, value, callback) {
            if (value) {
                if (!/^1[3456789]\d{9}$/.test(value)) {
                    callback(new Error('手机号格式有误！'))
                } else {
                    callback()
                }
            }
            callback()
        }

        return {
            form: {},
            query: {},
@@ -46,13 +59,16 @@
            datetime: "",
            selectionList: [],
            option: {
                labelWidth: 96,
                searchLabelWidth: 96,
                searchShow: true,
                searchMenuSpan: 3,
                menuWidth: 210,

                height: "auto",
                calcHeight: 54,
                dialogWidth: 950,
                tip: false,
                searchShow: true,
                searchMenuSpan: 3,
                menuWidth: 280,
                border: true,
                //stripe:true,
                index: true,
@@ -74,13 +90,13 @@
                    },],
                },
                {
                    width: 100,
                    label: "事件类型",
                    prop: "type",
                    span: 12,
                    searchSpan: 4,
                    dataType: "number",
                    type: "select",
                    width: 100,
                    dicUrl: "/api/blade-system/dict-biz/dictionary?code=eCallEventType",
                    props: {
                        label: "dictValue",
@@ -142,11 +158,12 @@
                    // search: true,
                },
                {
                    width: 110,
                    label: "姓名",
                    prop: "realName",
                    span: 12,
                    searchSpan: 4,
                    width: 100,
                    searchLabelWidth: 66,
                    search: true,
                    rules: [{
                        required: false,
@@ -155,17 +172,21 @@
                    },],
                },
                {
                    width: 120,
                    label: "联系方式",
                    prop: "phone",
                    span: 12,
                    width: 100,
                    searchSpan: 4,
                    search: true,
                    rules: [{
                        required: false,
                        message: "请输入联系方式",
                        trigger: "blur",
                    },],
                    },
                    {
                        validator: validatorPhone,
                        trigger: 'blur'
                    }],
                },
                {
                    label: "事发地点",
@@ -178,9 +199,9 @@
                    },],
                },
                {
                    width: 100,
                    label: "事发时间",
                    prop: "occurrenceTime",
                    width: 100,
                    type: "date",
                    format: "yyyy-MM-dd",
                    valueFormat: "yyyy-MM-dd",

 src/views/community/index.vue

@@ -32,7 +32,7 @@
            datetime: "",
            selectionList: [],
            option: {
                labelWidth: 120,
                labelWidth: 96,
                searchLabelWidth: 96,
                searchShow: true,
                searchMenuSpan: 3,

 src/views/district/index.vue

@@ -32,7 +32,7 @@
            datetime: "",
            selectionList: [],
            option: {
                labelWidth: 120,
                labelWidth: 96,
                searchLabelWidth: 96,
                searchShow: true,
                searchMenuSpan: 3,

 src/views/flow/deploy.vue

@@ -5,8 +5,8 @@
</template>

<script>
  import {deployUpload} from "@/api/flow/flow";
  import {flowCategory} from "@/util/flow";
import { deployUpload } from "@/api/flow/flow"
import { flowCategory } from "@/util/flow"

  export default {
    data() {
@@ -18,7 +18,7 @@
          file: {},
        },
        option: {
          labelWidth: 120,
                labelWidth: 96,
          menuBtn: false,
          column: [
            {
@@ -107,27 +107,27 @@
      'form.flowMode'() {
        this.$refs.form.option.column.filter(item => {
          if (item.prop === "tenantId") {
            item.display = this.form.flowMode === 2;
                    item.display = this.form.flowMode === 2
          }
        });
            })
      }
    },
    methods: {
      uploadBefore(file, done) {
        this.$message.success('部署开始');
        this.file = file;
            this.$message.success('部署开始')
            this.file = file
        done()
      },
      uploadAfter(res, done, loading) {
        if (!this.form.flowCategory) {
          this.$message.warning('清先选择流程类型');
                this.$message.warning('清先选择流程类型')
          loading()
          return false;
                return false
        }
        if (this.form.flowMode === 2 && !this.form.tenantId) {
          this.$message.warning('清先选择对应租户');
          loading();
          return false;
                this.$message.warning('清先选择对应租户')
                loading()
                return false
        }
        if (res.success) {
          deployUpload(
@@ -135,18 +135,18 @@
            (this.form.tenantId) ? this.form.tenantId.join(",") : "",
            [this.file]
          ).then(res => {
            const data = res.data;
                    const data = res.data
            if (data.success) {
              done()
            } else {
              this.$message.error(data.msg);
                        this.$message.error(data.msg)
              loading()
            }
          })
        } else {
          this.$message.warning('请上传 bpmn20.xml 标准格式文件');
                this.$message.warning('请上传 bpmn20.xml 标准格式文件')
          loading()
          return false;
                return false
        }
      },
    }

 src/views/flow/follow.vue

@@ -1,50 +1,35 @@
<template>
  <basic-container>
    <avue-crud :option="option"
               :table-loading="loading"
               :data="data"
               ref="crud"
               v-model="form"
               :page.sync="page"
               :permission="permissionList"
               @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-scope="{row}"
                slot="suspensionState">
        <el-tag>{{row.suspensionState===1?'激活':'挂起'}}</el-tag>
        <avue-crud :option="option" :table-loading="loading" :data="data" ref="crud" v-model="form" :page.sync="page"
            :permission="permissionList" @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-scope="{ row, size }" slot="suspensionState">
                <el-tag :size="size" :type="showStatus(row.suspensionState).type"
                    v-text="showStatus(row.suspensionState).text">
                </el-tag>
      </template>

    </avue-crud>
    <el-dialog title="流程删除"
               append-to-body
               :visible.sync="followBox"
               width="20%">
      <el-form :model="form"
               ref="form"
               label-width="80px">

        <el-dialog title="流程删除" append-to-body :visible.sync="followBox" width="20%">
            <el-form :model="form" ref="form" label-width="80px">
        <el-form-item label="删除理由">
          <el-input v-model="deleteReason"
                    placeholder="请输入删除理由" />
                    <el-input v-model="deleteReason" placeholder="请输入删除理由" />
        </el-form-item>
      </el-form>
      <span slot="footer"
            class="dialog-footer">
            <span slot="footer" class="dialog-footer">
        <el-button @click="followBox = false">关 闭</el-button>
        <el-button type="primary"
                   @click="handleDelete">确 定</el-button>
                <el-button type="primary" @click="handleDelete">确 定</el-button>
      </span>
    </el-dialog>
  </basic-container>
</template>

<script>
  import {mapGetters} from "vuex";
  import {followList, deleteProcessInstance} from "@/api/flow/flow";
import { mapGetters } from "vuex"
import { followList, deleteProcessInstance } from "@/api/flow/flow"

  export default {
    data() {
@@ -63,11 +48,15 @@
        followBox: false,
        deleteReason: '',
        option: {
                labelWidth: 84,
                searchLabelWidth: 84,
                searchShow: true,
                searchMenuSpan: 3,
                menuWidth: 80,

          height: 'auto',
          calcHeight: 30,
          tip: false,
          searchShow: true,
          searchMenuSpan: 6,
          border: true,
          index: true,
          selection: true,
@@ -75,67 +64,84 @@
          addBtn: false,
          viewBtn: false,
          dialogWidth: 900,
          menuWidth: 100,
          dialogClickModal: false,
          column: [
            {
              label: "执行id",
              prop: "executionId",
                        searchSpan: 4,
              search: true,
              width: 320,
            },
            {
              label: "流程key",
              prop: "processDefinitionKey",
                        searchSpan: 4,
              search: true,
            },
            {
              label: "实例id",
              prop: "processInstanceId",
                        searchSpan: 4,
              search: true,
              width: 320,
            },
            {
                        width: 100,
              label: "状态",
              prop: "suspensionState",
              slot: true,
              width: 80,
            },
            {
                        width: 110,
              label: "发起人",
              prop: "startUser",
              width: 100,
            },
            {
                        width: 144,
              label: '开始时间',
              prop: 'startTime',
              width: 165,
            },
          ]
        },
        data: []
      };
        }
    },
    computed: {
      ...mapGetters(["permission"]),
      permissionList() {
        return {
          delBtn: this.vaildData(this.permission.flow_follow_delete, false),
        };
            }
      },
      ids() {
        let ids = [];
            let ids = []
        this.selectionList.forEach(ele => {
          ids.push(ele.id);
        });
        return ids.join(",");
                ids.push(ele.id)
            })
            return ids.join(",")
        },
        showStatus () {
            return (data) => {
                if (data == 1) {
                    return {
                        text: '激活',
                        type: 'success'
                    }
                } else {
                    return {
                        text: '挂起',
                        type: 'info'
                    }
                }
            }
      }
    },
    methods: {
      rowDel(row) {
        this.followBox = true;
        this.selectionId = row.id;
        this.processInstanceId = row.processInstanceId;
            this.followBox = true
            this.selectionId = row.id
            this.processInstanceId = row.processInstanceId
      },
      handleDelete() {
        this.$confirm("确定将选择数据删除?", {
@@ -144,55 +150,55 @@
          type: "warning"
        })
          .then(() => {
            return deleteProcessInstance({deleteReason: this.deleteReason, processInstanceId: this.processInstanceId});
                    return deleteProcessInstance({ deleteReason: this.deleteReason, processInstanceId: this.processInstanceId })
          })
          .then(() => {
            this.onLoad(this.page);
            this.followBox = false;
                    this.onLoad(this.page)
                    this.followBox = false
            this.$message({
              type: "success",
              message: "操作成功!"
            });
          });
                    })
                })
      },
      searchReset() {
        this.query = {};
        this.onLoad(this.page);
            this.query = {}
            this.onLoad(this.page)
      },
      searchChange(params, done) {
        this.query = params;
        this.page.currentPage = 1;
        this.onLoad(this.page, params);
        done();
            this.query = params
            this.page.currentPage = 1
            this.onLoad(this.page, params)
            done()
      },
      selectionChange(list) {
        this.selectionList = list;
            this.selectionList = list
      },
      selectionClear() {
        this.selectionList = [];
        this.$refs.crud.toggleSelection();
            this.selectionList = []
            this.$refs.crud.toggleSelection()
      },
      currentChange(currentPage) {
        this.page.currentPage = currentPage;
            this.page.currentPage = currentPage
      },
      sizeChange(pageSize) {
        this.page.pageSize = pageSize;
            this.page.pageSize = pageSize
      },
      refreshChange() {
        this.onLoad(this.page, this.query);
            this.onLoad(this.page, this.query)
      },
      onLoad(page, params = {}) {
        this.loading = true;
            this.loading = true
        followList(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();
        });
                const data = res.data.data
                this.page.total = data.total
                this.data = data.records
                this.loading = false
                this.selectionClear()
            })
      }
    }
  };
}
</script>

<style>

 src/views/flow/manager.vue

@@ -10,28 +10,30 @@
          <el-radio-button label="2">定制流程</el-radio-button>
        </el-radio-group>
      </template>
      <template slot-scope="scope" slot="menu">
        <el-button type="text" size="small" icon="el-icon-refresh" v-if="permission.flow_manager_state"
          @click.stop="handleState(scope.row,scope.index)">变更状态
            <template slot-scope="{ row, size, index }" slot="menu">
                <el-button type="text" :size="size" icon="el-icon-refresh" v-if="permission.flow_manager_state"
                    @click.stop="handleState(row, index)">变更状态
        </el-button>
        <el-button type="text" size="small" icon="el-icon-search" v-if="permission.flow_manager_image"
          @click.stop="handleImage(scope.row,scope.index)">流程图
                <el-button type="text" :size="size" icon="el-icon-search" v-if="permission.flow_manager_image"
                    @click.stop="handleImage(row, index)">流程图
        </el-button>
        <el-button type="text" size="small" icon="el-icon-delete" v-if="permission.flow_manager_remove"
          @click.stop="handleSlotDelete(scope.row,scope.index)">删除
                <el-button type="text" :size="size" icon="el-icon-delete" v-if="permission.flow_manager_remove"
                    @click.stop="handleSlotDelete(row, index)">删除
        </el-button>
      </template>
      <template slot-scope="{row}" slot="tenantId">
        <el-tag>{{row.tenantId===''?'通用':row.tenantId}}</el-tag>
            <template slot-scope="{ row, size }" slot="tenantId">
                <el-tag :size="size">{{ row.tenantId === '' ? '通用' : row.tenantId }}</el-tag>
      </template>
      <template slot-scope="{row}" slot="version">
        <el-tag>v{{row.version}}</el-tag>
            <template slot-scope="{ row, size }" slot="version">
                <el-tag :size="size">v{{ row.version }}</el-tag>
      </template>
      <template slot-scope="{row}" slot="suspensionState">
        <el-tag>{{row.suspensionState===1?'激活':'挂起'}}</el-tag>
            <template slot-scope="{ row, size }" slot="suspensionState">
                <el-tag :size="size" :type="showStatus(row.suspensionState).type"
                    v-text="showStatus(row.suspensionState).text">
                </el-tag>
      </template>
      <template slot-scope="{row}" slot="category">
        <el-tag>{{row.categoryName}}</el-tag>
            <template slot-scope="{ row, size }" slot="category">
                <el-tag :size="size">{{ row.categoryName }}</el-tag>
      </template>
    </avue-crud>
    <flow-design is-dialog :is-display.sync="flowBox" :process-definition-id="processDefinitionId"></flow-design>
@@ -55,15 +57,15 @@
<script>
  import {
    mapGetters
  } from "vuex";
} from "vuex"
  import {
    managerList,
    changeState,
    deleteDeployment
  } from "@/api/flow/flow";
} from "@/api/flow/flow"
  import {
    flowCategory
  } from "@/util/flow";
} from "@/util/flow"

  export default {
    data() {
@@ -91,11 +93,15 @@
          label: '挂起'
        }],
        option: {
                labelWidth: 96,
                searchLabelWidth: 96,
                searchShow: true,
                searchMenuSpan: 3,
                menuWidth: 240,

          height: 'auto',
          calcHeight: 30,
          tip: false,
          searchShow: true,
          searchMenuSpan: 6,
          border: true,
          index: true,
          selection: true,
@@ -104,7 +110,6 @@
          viewBtn: false,
          delBtn: false,
          dialogWidth: 900,
          menuWidth: 250,
          dialogClickModal: false,
          column: [{
              label: '租户编号',
@@ -113,22 +118,28 @@
              width: 120,
            },
            {
                    overHidden: true,
              label: '流程主键',
              prop: 'id',
            },
            {
                    width: 150,
                    overHidden: true,
              label: '流程标识',
              prop: 'key',
                    searchSpan: 4,
              search: true,
              width: 150,
            },
            {
                    width: 150,
                    overHidden: true,
              label: '流程名称',
              prop: 'name',
                    searchSpan: 4,
              search: true,
              width: 150,
            },
            {
                    width: 120,
              label: "流程分类",
              type: "select",
              row: true,
@@ -141,33 +152,32 @@
              slot: true,
              prop: "category",
              // search: true,
              width: 100,
            },
            {
                    width: 100,
              label: '流程版本',
              prop: 'version',
              slot: true,
              width: 80,
            },
            {
                    width: 100,
              label: '状态',
              prop: 'suspensionState',
              slot: true,
              width: 80,
            },
            {
                    width: 144,
              label: '部署时间',
              prop: 'deploymentTime',
              width: 165,
            },
          ]
        },
        data: []
      };
        }
    },
    watch: {
      'mode'() {
        this.onLoad(this.page);
            this.onLoad(this.page)
      }
    },
    computed: {
@@ -175,45 +185,60 @@
      permissionList() {
        return {
          delBtn: this.vaildData(this.permission.flow_manager_remove, false),
        };
            }
      },
      ids() {
        let ids = [];
            let ids = []
        this.selectionList.forEach(ele => {
          ids.push(ele.id);
        });
        return ids.join(",");
                ids.push(ele.id)
            })
            return ids.join(",")
      },
      deploymentIds() {
        let ids = [];
            let ids = []
        this.selectionList.forEach(ele => {
          ids.push(ele.deploymentId);
        });
        return ids.join(",");
                ids.push(ele.deploymentId)
            })
            return ids.join(",")
        },
        showStatus () {
            return (data) => {
                if (data == 1) {
                    return {
                        text: '激活',
                        type: 'success'
                    }
                } else {
                    return {
                        text: '挂起',
                        type: 'info'
                    }
                }
            }
      }
    },
    methods: {
      searchReset() {
        this.query = {};
        this.onLoad(this.page);
            this.query = {}
            this.onLoad(this.page)
      },
      searchChange(params, done) {
        this.query = params;
        this.page.currentPage = 1;
        this.onLoad(this.page, params);
        done();
            this.query = params
            this.page.currentPage = 1
            this.onLoad(this.page, params)
            done()
      },
      selectionChange(list) {
        this.selectionList = list;
            this.selectionList = list
      },
      selectionClear() {
        this.selectionList = [];
        this.$refs.crud.toggleSelection();
            this.selectionList = []
            this.$refs.crud.toggleSelection()
      },
      handleDelete() {
        if (this.selectionList.length === 0) {
          this.$message.warning("请选择至少一条数据");
          return;
                this.$message.warning("请选择至少一条数据")
                return
        }
        this.$confirm("确定将选择数据删除?", {
            confirmButtonText: "确定",
@@ -221,16 +246,16 @@
            type: "warning"
          })
          .then(() => {
            return deleteDeployment(this.deploymentIds);
                    return deleteDeployment(this.deploymentIds)
          })
          .then(() => {
            this.$message({
              type: "success",
              message: "操作成功!"
            });
            this.$refs.crud.toggleSelection();
            this.onLoad(this.page);
          });
                    })
                    this.$refs.crud.toggleSelection()
                    this.onLoad(this.page)
                })
      },
      handleSlotDelete(row) {
        this.$confirm("确定将选择数据删除?", {
@@ -239,77 +264,77 @@
            type: "warning"
          })
          .then(() => {
            return deleteDeployment(row.deploymentId);
                    return deleteDeployment(row.deploymentId)
          })
          .then(() => {
            this.$message({
              type: "success",
              message: "操作成功!"
            });
            this.$refs.crud.toggleSelection();
            this.onLoad(this.page);
          });
                    })
                    this.$refs.crud.toggleSelection()
                    this.onLoad(this.page)
                })
      },
      handleState(row) {
        this.stateBox = true;
        this.selectionId = row.id;
            this.stateBox = true
            this.selectionId = row.id
      },
      handleDoState() {
        if (!this.flowState) {
          this.$message({
            type: "warn",
            message: "请先选择流程状态!"
          });
          return;
                })
                return
        }
        changeState({
          processId: this.selectionId,
          state: this.flowState
        }).then(res => {
          const data = res.data;
                const data = res.data
          if (data.success) {
            this.$message({
              type: "success",
              message: data.msg
            });
            this.stateBox = false;
            this.onLoad(this.page);
                    })
                    this.stateBox = false
                    this.onLoad(this.page)
          } else {
            this.$message({
              type: "warn",
              message: data.msg
            });
                    })
          }
        })
      },
      handleImage(row) {
        this.processDefinitionId = row.id;
        this.flowBox = true;
            this.processDefinitionId = row.id
            this.flowBox = true
      },
      currentChange(currentPage) {
        this.page.currentPage = currentPage;
            this.page.currentPage = currentPage
      },
      sizeChange(pageSize) {
        this.page.pageSize = pageSize;
            this.page.pageSize = pageSize
      },
      refreshChange() {
        this.onLoad(this.page, this.query);
            this.onLoad(this.page, this.query)
      },
      onLoad(page, params = {}) {
        const values = {
          ...params,
          category: (params.category) ? flowCategory(params.category) : null,
          mode: this.mode
        };
        this.loading = true;
            }
            this.loading = true
        managerList(page.currentPage, page.pageSize, Object.assign(values, this.query)).then(res => {
          const data = res.data.data;
          this.page.total = data.total;
          this.data = data.records;
          this.loading = false;
          this.selectionClear();
        });
                const data = res.data.data
                this.page.total = data.total
                this.data = data.records
                this.loading = false
                this.selectionClear()
            })
      }
    }
  };
}
</script>

 src/views/flow/model.vue

@@ -1,119 +1,62 @@
<template>
  <basic-container>
    <avue-crud :option="option"
               :table-loading="loading"
               :data="data"
               ref="crud"
               v-model="form"
               :page.sync="page"
               @search-change="searchChange"
               @search-reset="searchReset"
               @selection-change="selectionChange"
               @current-change="currentChange"
               @size-change="sizeChange"
               @refresh-change="refreshChange"
               @on-load="onLoad">
        <avue-crud :option="option" :table-loading="loading" :data="data" ref="crud" v-model="form" :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="primary"
                   size="mini"
                   icon="el-icon-circle-plus"
                   v-if="permission.flow_model_create"
                   plain
                <el-button type="primary" size="mini" icon="el-icon-circle-plus" v-if="permission.flow_model_create" plain
                   @click="handleCreate">创 建
        </el-button>
        <el-button type="danger"
                   size="mini"
                   icon="el-icon-delete"
                   v-if="permission.flow_model_delete"
                   plain
                <el-button type="danger" size="mini" icon="el-icon-delete" v-if="permission.flow_model_delete" plain
                   @click="handleDelete">删 除
        </el-button>
      </template>
      <template slot-scope="scope"
                slot="menu">
        <el-button type="text"
                   size="mini"
                   icon="el-icon-setting"
                   v-if="permission.flow_model_update"
                   @click.stop="handleUpdate(scope.row,scope.index)">配置

            <template slot-scope="{ row, size, index }" slot="menu">
                <el-button type="text" :size="size" icon="el-icon-setting" v-if="permission.flow_model_update"
                    @click.stop="handleUpdate(row, index)">配置
        </el-button>
        <el-button type="text"
                   size="mini"
                   icon="el-icon-upload2"
                   v-if="permission.flow_model_deploy"
                   @click.stop="handleDeploy(scope.row,scope.index)">部署
                <el-button type="text" :size="size" icon="el-icon-upload2" v-if="permission.flow_model_deploy"
                    @click.stop="handleDeploy(row, index)">部署
        </el-button>
        <el-button type="text"
                   size="mini"
                   icon="el-icon-delete"
                   v-if="permission.flow_model_delete"
                   @click.stop="handleSlotDelete(scope.row,scope.index)">删除
                <el-button type="text" :size="size" icon="el-icon-delete" v-if="permission.flow_model_delete"
                    @click.stop="handleSlotDelete(row, index)">删除
        </el-button>
      </template>
      <template slot-scope="{row}"
                slot="version">
        <el-tag>v{{ row.version }}</el-tag>
            <template slot-scope="{row, size}" slot="version">
                <el-tag :size="size">v{{ row.version }}</el-tag>
      </template>
    </avue-crud>
    <el-dialog title="流程配置"
               append-to-body
               destroy-on-close
               :visible.sync="flowBox"
               :close-on-press-escape="false"
               :fullscreen="true"
               :before-close="handleNutflowClose"
               custom-class="wf-dialog">
      <wf-design-base v-if="nutflowOption.step === 1"
                      class="animated fadeIn"
                      style="height: calc(100vh - 108px);"
                      ref="wf-design"
                      :options="nutflowOption.step1"></wf-design-base>
      <wf-design-base v-if="nutflowOption.step === 2"
                      class="animated fadeIn"
                      style="height: calc(100vh - 108px);"
                      ref="wf-design-view"
                      :options="nutflowOption.step2"></wf-design-base>
      <span slot="footer"
            class="avue-dialog__footer">
        <el-button size="small"
                   @click="handleNutflowClose(() => {}, true)">取 消</el-button>
        <el-button v-if="nutflowOption.step === 1"
                   size="small"
                   type="success"
                   @click="handleStep(1)">下 一 步</el-button>
        <el-button v-if="nutflowOption.step === 2"
                   size="small"
                   type="success"
                   @click="handleStep(-1)">上 一 步</el-button>
        <el-button v-if="nutflowOption.step === 2"
                   size="small"
                   type="primary"
                   @click="handleSubmitModel">确 定</el-button>
        <el-dialog title="流程配置" append-to-body destroy-on-close :visible.sync="flowBox" :close-on-press-escape="false"
            :fullscreen="true" :before-close="handleNutflowClose" custom-class="wf-dialog">
            <wf-design-base v-if="nutflowOption.step === 1" class="animated fadeIn" style="height: calc(100vh - 108px);"
                ref="wf-design" :options="nutflowOption.step1"></wf-design-base>
            <wf-design-base v-if="nutflowOption.step === 2" class="animated fadeIn" style="height: calc(100vh - 108px);"
                ref="wf-design-view" :options="nutflowOption.step2"></wf-design-base>
            <span slot="footer" class="avue-dialog__footer">
                <el-button size="small" @click="handleNutflowClose(() => { }, true)">取 消</el-button>
                <el-button v-if="nutflowOption.step === 1" size="small" type="success" @click="handleStep(1)">下 一
                    步</el-button>
                <el-button v-if="nutflowOption.step === 2" size="small" type="success" @click="handleStep(-1)">上 一
                    步</el-button>
                <el-button v-if="nutflowOption.step === 2" size="small" type="primary" @click="handleSubmitModel">确
                    定</el-button>
      </span>
    </el-dialog>
    <el-dialog title="流程部署"
               append-to-body
               :visible.sync="deployBox"
               width="20%">
      <avue-form ref="form"
                 :option="optionDeploy"
                 v-model="form"
                 @submit="handleSubmit"/>
      <span slot="footer"
            class="dialog-footer">
        <el-dialog title="流程部署" append-to-body :visible.sync="deployBox" width="20%">
            <avue-form ref="form" :option="optionDeploy" v-model="form" @submit="handleSubmit" />
            <span slot="footer" class="dialog-footer">
        <el-button @click="deployBox = false">取 消</el-button>
        <el-button type="primary"
                   @click="handleDoDeploy"
                   :loading="deployLoading">确 定</el-button>
                <el-button type="primary" @click="handleDoDeploy" :loading="deployLoading">确 定</el-button>
      </span>
    </el-dialog>
  </basic-container>
</template>

<script>
import {mapGetters} from "vuex";
import {modelList, removeModel, deployModel, submitModel, detail} from "@/api/flow/flow";
import {flowCategory} from "@/util/flow";
import { mapGetters } from "vuex"
import { modelList, removeModel, deployModel, submitModel, detail } from "@/api/flow/flow"
import { flowCategory } from "@/util/flow"

export default {
  data() {
@@ -200,11 +143,15 @@
      deployBox: false,
      flowBox: false,
      option: {
                labelWidth: 96,
                searchLabelWidth: 96,
                searchShow: true,
                searchMenuSpan: 3,
                menuWidth: 210,

        height: 'auto',
        calcHeight: 30,
        tip: false,
        searchShow: true,
        searchMenuSpan: 6,
        border: true,
        index: true,
        selection: true,
@@ -213,10 +160,7 @@
        viewBtn: false,
        delBtn: false,
        dialogWidth: 900,
        menuWidth: 200,
        dialogClickModal: false,
        size: 'mini',
        searchSize: 'mini',
        column: [
          {
            label: '模型主键',
@@ -225,12 +169,14 @@
          {
            label: '模型标识',
            prop: 'modelKey',
                        searchSpan: 4,
            search: true,
            overHidden: true
          },
          {
            label: '模型名称',
            prop: 'name',
                        searchSpan: 4,
            search: true,
            overHidden: true
          },
@@ -241,14 +187,14 @@
            overHidden: true
          },
          {
                        width: 144,
            label: '创建时间',
            prop: 'created',
            overHidden: true
          },
          {
                        width: 144,
            label: '更新时间',
            prop: 'lastUpdated',
            overHidden: true
          },
        ]
      },
@@ -265,25 +211,25 @@
          minimap: true,
        }
      }
    };
        }
  },
  watch: {
    'form.flowMode'() {
      this.$refs.form.option.column.filter(item => {
        if (item.prop === "tenantId") {
          item.display = this.form.flowMode === 2;
                    item.display = this.form.flowMode === 2
        }
      });
            })
    }
  },
  computed: {
    ...mapGetters(["permission"]),
    ids() {
      let ids = [];
            let ids = []
      this.selectionList.forEach(ele => {
        ids.push(ele.id);
      });
      return ids.join(",");
                ids.push(ele.id)
            })
            return ids.join(",")
    }
  },
  methods: {
@@ -343,53 +289,53 @@
      }
    },
    handleSubmit(form, done) {
      this.deployLoading = true;
            this.deployLoading = true
      deployModel({
        modelId: this.selectionId,
        category: flowCategory(form.categoryValue),
        tenantIds: form.tenantId ? form.tenantId.join(",") : ""
      }).then(res => {
        const data = res.data;
                const data = res.data
        if (data.success) {
          this.$message({
            type: "success",
            message: data.msg
          });
          done();
          this.$refs.form.resetForm();
          this.deployBox = false;
          this.deployLoading = false;
                    })
                    done()
                    this.$refs.form.resetForm()
                    this.deployBox = false
                    this.deployLoading = false
        } else {
          done();
          this.deployLoading = false;
                    done()
                    this.deployLoading = false
          this.$message({
            type: "warn",
            message: data.msg
          });
                    })
        }
      })
    },
    searchReset() {
      this.query = {};
      this.onLoad(this.page);
            this.query = {}
            this.onLoad(this.page)
    },
    searchChange(params, done) {
      this.query = params;
      this.page.currentPage = 1;
      this.onLoad(this.page, params);
      done();
            this.query = params
            this.page.currentPage = 1
            this.onLoad(this.page, params)
            done()
    },
    selectionChange(list) {
      this.selectionList = list;
            this.selectionList = list
    },
    selectionClear() {
      this.selectionList = [];
      this.$refs.crud.toggleSelection();
            this.selectionList = []
            this.$refs.crud.toggleSelection()
    },
    handleDelete() {
      if (this.selectionList.length === 0) {
        this.$message.warning("请选择至少一条数据");
        return;
                this.$message.warning("请选择至少一条数据")
                return
      }
      this.$confirm("确定将选择数据删除?", {
        confirmButtonText: "确定",
@@ -397,19 +343,19 @@
        type: "warning"
      })
        .then(() => {
          return removeModel(this.ids);
                    return removeModel(this.ids)
        })
        .then(() => {
          this.$message({
            type: "success",
            message: "操作成功!"
          });
          this.$refs.crud.toggleSelection();
          this.onLoad(this.page);
        });
                    })
                    this.$refs.crud.toggleSelection()
                    this.onLoad(this.page)
                })
    },
    handleCreate() {
      this.flowBox = true;
            this.flowBox = true
    },
    handleUpdate(row) {
      detail({id: row.id}).then(res => {
@@ -417,15 +363,15 @@
        const {modelEditorXml} = data
        this.$set(this.nutflowOption.step1, 'xml', modelEditorXml)
        this.$set(this.nutflowOption, 'process', data)
        this.flowBox = true;
                this.flowBox = true
      })
    },
    handleDeploy(row) {
      this.deployBox = true;
      this.selectionId = row.id;
            this.deployBox = true
            this.selectionId = row.id
    },
    handleDoDeploy() {
      this.$refs.form.submit();
            this.$refs.form.submit()
    },
    handleSlotDelete(row) {
      this.$confirm("确定将选择数据删除?", {
@@ -434,42 +380,41 @@
        type: "warning"
      })
        .then(() => {
          return removeModel(row.id);
                    return removeModel(row.id)
        })
        .then(() => {
          this.$message({
            type: "success",
            message: "操作成功!"
          });
          this.$refs.crud.toggleSelection();
          this.onLoad(this.page);
        });
                    })
                    this.$refs.crud.toggleSelection()
                    this.onLoad(this.page)
                })
    },
    currentChange(currentPage) {
      this.page.currentPage = currentPage;
            this.page.currentPage = currentPage
    },
    sizeChange(pageSize) {
      this.page.pageSize = pageSize;
            this.page.pageSize = pageSize
    },
    refreshChange() {
      this.onLoad(this.page, this.query);
            this.onLoad(this.page, this.query)
    },
    onLoad(page, params = {}) {
      this.loading = true;
            this.loading = true
      modelList(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();
      });
                const data = res.data.data
                this.page.total = data.total
                this.data = data.records
                this.loading = false
                this.selectionClear()
            })
    }
  }
};
}
</script>

<style lang="scss">

.wf-dialog {
  .el-dialog__body {
    padding: 5px;

 src/views/grid/gridman.vue

@@ -32,13 +32,16 @@
            datetime: "",
            selectionList: [],
            option: {
                labelWidth: 96,
                searchLabelWidth: 96,
                searchShow: true,
                searchMenuSpan: 3,
                menuWidth: 210,

                height: "auto",
                calcHeight: 54,
                dialogWidth: 950,
                tip: false,
                searchShow: true,
                searchMenuSpan: 3,
                menuWidth: 350,
                border: true,
                //stripe:true,
                index: true,
@@ -105,6 +108,7 @@
                    },

                    {
                        width: 120,
                        label: "联系电话",
                        prop: "mobile",
                        searchSpan: 4,
@@ -119,7 +123,6 @@
                    },

                    {
                        width: 156,
                        overHidden: true,
                        label: "所属社区",
                        addDisplay: false,
@@ -136,7 +139,6 @@
                    },

                    {
                        width: 110,
                        overHidden: true,
                        label: "所属网格",
                        addDisplay: false,
@@ -151,9 +153,9 @@
                    },

                    {
                        width: 110,
                        label: "形象照",
                        prop: "picUrl",
                        width: 80,
                        type: "upload",
                        listType: "picture-img",
                        action: "/api/blade-resource/oss/endpoint/put-file-attach",

 src/views/gzll/owners.vue

@@ -10,6 +10,11 @@
                    @click="manageMember(scope.row)">业委会成员
                </el-button>
            </template>

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

        <el-drawer title="业委会成员" size="40%" append-to-body :visible.sync="memberFlag" :direction="'rtl'">
@@ -51,6 +56,12 @@
            selectionList: [],
            memberFlag: false,
            option: {
                labelWidth: 120,
                searchLabelWidth: 96,
                searchShow: true,
                searchMenuSpan: 3,
                menuWidth: 300,

                // menu: false,
                // addBtn: false,
                border: true,
@@ -60,8 +71,6 @@
                calcHeight: 54,
                dialogWidth: 950,
                tip: false,
                searchShow: true,
                searchMenuSpan: 3,
                //stripe:true,
                viewBtn: true,
                excelBtn: true,
@@ -80,8 +89,6 @@
                        },
                        defaultExpandedKeys: ["361102003"],
                        cascader: ['principalId'],
                        span: 10,
                        labelWidth: 120,
                        overHidden: true,
                        rules: [{
                            required: true,
@@ -91,13 +98,12 @@
                    },

                    {
                        span: 10,
                        labelWidth: 120,
                        offset: 2,
                        overHidden: true,
                        width: 120,
                        label: "业委会名称",
                        prop: "name",
                        search: true,
                        searchLabelWidth: 136,
                        searchLabelWidth: 124,
                        rules: [{
                            required: true,
                            message: "请输入业委会名称",
@@ -106,8 +112,8 @@
                    },

                    {
                        width: 220,
                        overHidden: true,
                        width: 220,
                        label: '小区名称',
                        addDisplay: false,
                        editDisplay: false,
@@ -121,8 +127,6 @@
                        display: false,
                    },
                    {
                        span: 10,
                        labelWidth: 120,
                        label: "业委会负责人",
                        prop: "principalId",
                        type: "tree",
@@ -141,10 +145,8 @@
                        },],
                    },
                    {
                        span: 10,
                        labelWidth: 120,
                        width: 120,
                        label: "负责人名称",
                        offset: 2,
                        prop: "principalName",
                        rules: [{
                            required: true,
@@ -153,8 +155,7 @@
                        },],
                    },
                    {
                        span: 10,
                        labelWidth: 120,
                        width: 120,
                        label: "负责人手机号",
                        prop: "mobile",
                        rules: [{
@@ -165,10 +166,8 @@
                    },

                    {
                        span: 10,
                        labelWidth: 120,
                        width: 120,
                        label: "业委会届别",
                        offset: 2,
                        prop: "session",
                        type: "number",
                        rules: [{
@@ -179,8 +178,7 @@
                    },

                    {
                        span: 10,
                        labelWidth: 120,
                        width: 100,
                        label: "成立时间",
                        prop: "establishTime",
                        type: "date",
@@ -190,14 +188,12 @@

                    {
                        span: 20,
                        labelWidth: 120,
                        label: "所在地址",
                        prop: "location",
                    },

                    {
                        span: 10,
                        labelWidth: 120,
                        width: 124,
                        label: "任期开始时间",
                        prop: "startTime",
                        type: "date",
@@ -211,10 +207,8 @@
                    },

                    {
                        span: 10,
                        labelWidth: 120,
                        width: 124,
                        label: "任期结束时间",
                        offset: 2,
                        prop: "endTime",
                        type: "date",
                        format: "yyyy-MM-dd",
@@ -231,7 +225,6 @@
                        label: "图片",
                        prop: "imageUrl",
                        type: "upload",
                        labelWidth: 120,
                        listType: "picture-img",
                        action: "/api/blade-resource/oss/endpoint/put-file",
                        propsHttp: {
@@ -240,12 +233,11 @@
                            url: "link",
                        },
                        viewDisplay: false,
                        span: 20,
                        span: 24,
                    },

                    {
                        span: 10,
                        labelWidth: 120,
                        span: 12,
                        label: "排序",
                        prop: "sort",
                        type: 'number',
@@ -257,10 +249,10 @@
                    },

                    {
                        span: 10,
                        labelWidth: 120,
                        width: 100,
                        span: 12,
                        label: "状态",
                        offset: 2,
                        slot: true,
                        prop: "status",
                        type: 'switch',
                        activeColor: "#13ce66",
@@ -284,7 +276,6 @@

                    {
                        span: 20,
                        labelWidth: 120,
                        label: "简介",
                        prop: "profile",
                        component: "AvueUeditor",
@@ -302,7 +293,6 @@
                    // {
                    //   label: "简介",
                    //   prop: "profile",
                    //   // labelWidth: 140,
                    //   viewDisplay: false,
                    //   type: "textarea"
                    // },
@@ -330,6 +320,21 @@
            })
            return ids.join(",")
        },
        showStatus () {
            return (data) => {
                if (data == 0) {
                    return {
                        text: '正常',
                        type: 'success'
                    }
                } else {
                    return {
                        text: '关闭',
                        type: 'info'
                    }
                }
            }
        }
    },
    methods: {
        manageMember (row) {

 src/views/property/components/partyOrganizationMember.vue

@@ -31,14 +31,14 @@
</template>

<script>
import {mapGetters} from "vuex";
import {add, getDetail, getList, remove, update} from "@/api/partyOrganization/partyOrganizationMember";
import {validatePhone} from "@/util/validate";
import {getAllHouseHold,getDetatils as householdDetail} from "@/api/userHouse/list/houseHold";
import func from "@/util/func";
import website from "@/config/website";
const labelWidth = 100;
const searchSpan = 5;
import { mapGetters } from "vuex"
import { add, getDetail, getList, remove, update } from "@/api/partyOrganization/partyOrganizationMember"
import { validatePhone } from "@/util/validate"
import { getAllHouseHold, getDetatils as householdDetail } from "@/api/userHouse/list/houseHold"
import func from "@/util/func"
import website from "@/config/website"
const labelWidth = 100
const searchSpan = 5
export default {
  name: "partyOrganizationMember",
  data () {
@@ -396,7 +396,7 @@

    getUserList(param){
      let dicUrl =  `/api/blade-household/household/getAllHouseHold?name={{key}}&regionCode=${this.row.areaId}`
      const column = this.findObject(this.option.column, "householdId");
            const column = this.findObject(this.option.column, "householdId")
      column.dicUrl = dicUrl
    },

@@ -515,7 +515,7 @@
      done()
    },
    beforeOpen (done, type) {
      const column = this.findObject(this.option.column, "householdId");
            const column = this.findObject(this.option.column, "householdId")
      if (["edit", "view"].includes(type)) {
        getDetail(this.form.id).then(res => {
          this.form = res.data.data
@@ -569,6 +569,4 @@
}
</script>

<style scoped>

</style>
<style scoped></style>

 src/views/property/convenienceHotline.vue

@@ -1,11 +1,13 @@
<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">
            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 size="small" icon="el-icon-delete" plain v-if="permission.district_delete"
                    @click="handleDelete">删 除
        </el-button>
      </template>
    </avue-crud>
@@ -26,6 +28,18 @@
  import website from '@/config/website'
  export default {
    data() {
        //手机号格式校验
        let validatorPhone = function (rule, value, callback) {
            if (value) {
                if (!/^1[3456789]\d{9}$/.test(value)) {
                    callback(new Error('手机号格式有误！'))
                } else {
                    callback()
                }
            }
            callback()
        }

      return {
        form: {},
        query: {},
@@ -38,13 +52,16 @@
        datetime: "",
        selectionList: [],
        option: {
                labelWidth: 66,
                searchLabelWidth: 66,
                searchShow: true,
                searchMenuSpan: 3,
                menuWidth: 210,

          height: "auto",
          calcHeight: 54,
          dialogWidth: 950,
          tip: false,
          searchShow: true,
          searchMenuSpan: 3,
          menuWidth: 280,
          border: true,
          //stripe:true,
          index: true,
@@ -64,14 +81,19 @@
              }, ],
            },
            {
              label: "电话",
                    width: 120,
                    label: "联系方式",
              prop: "telephone",
              span: 24,
              rules: [{
                required: true,
                message: "请输入电话",
                        message: "请输入联系方式",
                trigger: "blur",
              }, ],
                    },
                    {
                        validator: validatorPhone,
                        trigger: 'blur'
                    }],
            },
            {
              label: "备注",

 src/views/property/inviteTenders.vue

@@ -1,11 +1,13 @@
<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">
            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 size="small" icon="el-icon-delete" plain v-if="permission.article_delete" @click="handleDelete">删
                    除
        </el-button>
        <!--  <el-button size="small" icon="el-icon-s-order" plain @click="kqcomment">开启评论
        </el-button>
@@ -20,30 +22,26 @@
        <el-button icon="el-icon-circle-plus-outline" :size="size" :type="type" @click.stop="openDilog(row,1)">
          创建议题
        </el-button>
        <el-button v-if="row.publish == '1'" icon="el-icon-close" :size="size" :type="type" @click.stop="updateFb(row)">
                <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 v-if="row.publish == '0'" icon="el-icon-check" :size="size" :type="type"
                    @click.stop="updateFb(row)">
          发布
        </el-button>
      </template>

      <template slot-scope="{ row }" slot="publish">
        <el-tag>{{
          row.publish == "1" ? "已发布" : row.publish == "0" ? "未发布" : "未发布"
          }}
            <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 }" slot="iscomment">
        <el-tag>{{
          row.iscomment == "1" ? "开启" : row.iscomment == "0" ? "关闭" : "关闭"
          }}
            <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>
    </avue-crud>



    <el-dialog title="" append-to-body :visible.sync="dialogVisibles" width="50%" :before-close="handleClose">
      <span slot="title" class="dialog-footer">
@@ -59,9 +57,6 @@
      </div>
    </el-dialog>




  </basic-container>
</template>

@@ -73,7 +68,7 @@
    add,
    getNotice,
    upcomment
  } from "@/api/article/article";
} from "@/api/article/article"

  import {
    getListPd,
@@ -82,18 +77,18 @@
    addPd,
    getNoticePd,
    upcommentPd
  } from "@/api/discuss/publicDiscuss";
} from "@/api/discuss/publicDiscuss"

  import website from '@/config/website';
import website from '@/config/website'


  import {
    getDistrictTree
  } from "@/api/district/index";
} from "@/api/district/index"

  import {
    mapGetters
  } from "vuex";
} from "vuex"

  export default {
    data() {
@@ -128,13 +123,16 @@
        datetime: "",
        selectionList: [],
        option: {
                labelWidth: 96,
                searchLabelWidth: 96,
                searchShow: true,
                searchMenuSpan: 3,
                menuWidth: 450,

          height: "auto",
          calcHeight: 54,
          dialogWidth: 950,
          tip: false,
          searchShow: true,
          searchMenuSpan: 3,
          menuWidth: 450,
          border: false,
          //stripe:true,
          index: true,
@@ -156,10 +154,10 @@
              }, ],
            },
            {
                    width: 110,
              label: "招标封面",
              prop: "url",
              // align:'center',
              width: 80,
              type: "upload",
              listType: "picture-img",
              action: "/api/blade-resource/oss/endpoint/put-file",
@@ -203,12 +201,12 @@
              hide: true,
            },
            {
                    width: 100,
              label: "招标类型",
              prop: "type",
              searchSpan: 3,
              width: 80,
              value: 2,
              slot: true,
                    searchSpan: 4,
              search: true,
              type: "select",
              rules: [{
@@ -224,10 +222,10 @@
            {
              label: "发布时间",
              prop: "dateTime",
              type: "datetime",
                    type: "daterange",
              format: "yyyy-MM-dd",
              valueFormat: "yyyy-MM-dd",
              searchSpan: 5,
                    searchSpan: 6,
              searchRange: true,
              hide: true,
              addDisplay: false,
@@ -241,19 +239,21 @@
              }, ],
            },
            {
                    width: 144,
              label: "发布时间",
              prop: "createTime",
              type: "date",
              format: "yyyy-MM-dd",
              valueFormat: "yyyy-MM-dd HH:mm:ss",
            },

            {
                    width: 100,
              label: "发布状态",
              prop: "publish",
              searchSpan: 3,
              width: 80,
              value: "0",
              slot: true,
                    searchSpan: 4,
              search: true,
              type: "select",
              rules: [{
@@ -272,9 +272,9 @@
              ],
            },
            {
                    width: 100,
              label: "评论区",
              prop: "iscomment",
              width: 80,
              slot: true,
              type: "select",
              dicData: [{
@@ -334,7 +334,6 @@
                fontSize: '24px'
              }
            }, {
              labelWidth: 100,
              label: '开启',
              prop: 'openFlag',
              type: 'radio',
@@ -373,7 +372,6 @@
                fontSize: '24px'
              }
            }, {
              labelWidth: 100,
              label: '开启投票',
              prop: 'openFlag',
              type: 'radio',
@@ -388,7 +386,6 @@
                value: 1
              }]
            }, {
              labelWidth: 100,
              label: '开启签名',
              prop: 'signatureFlag',
              type: 'radio',
@@ -415,26 +412,26 @@
          ]
        },
        districtTree: [],
      };
        }
    },
    watch: {
      "form.articleType": {
        handler(val) {
          if (val) {
            var videoUrl = this.findObject(this.option.column, "videoUrl");
            var content = this.findObject(this.option.column, "content");
                    var videoUrl = this.findObject(this.option.column, "videoUrl")
                    var content = this.findObject(this.option.column, "content")
            if (val.indexOf('ksp') != -1) {
              videoUrl.display = true;
              content.display = false;
                        videoUrl.display = true
                        content.display = false
              videoUrl.rules = [{
                required: false,
                message: "请选择视频",
                trigger: "blur",
              }, ];
                        },]
            } else {
              videoUrl.display = false;
              content.display = true;
              videoUrl.rules = "";
                        videoUrl.display = false
                        content.display = true
                        videoUrl.rules = ""
            }
          }
        },
@@ -449,15 +446,30 @@
          viewBtn: this.vaildData(this.permission.article_view, true),
          delBtn: this.vaildData(this.permission.article_delete, true),
          editBtn: this.vaildData(this.permission.article_edit, true),
        };
            }
      },
      ids() {
        let ids = [];
            let ids = []
        this.selectionList.forEach((ele) => {
          ids.push(ele.id);
        });
        return ids.join(",");
                ids.push(ele.id)
            })
            return ids.join(",")
      },
        showStatus () {
            return (data, type) => {
                if (data == 0) {
                    return {
                        text: type == 1 ? '未发布' : '关闭',
                        type: 'info'
                    }
                } else if (data == 1) {
                    return {
                        text: type == 1 ? '已发布' : '开启',
                        type: 'success'
                    }
                }
            }
        }
    },
    methods: {

@@ -474,25 +486,25 @@
      },

      handleSubmit(form, done) {
        done();
            done()
        addPd(form).then(
          () => {
            this.$message({
              type: "success",
              message: "操作成功!",
            });
                    })
            this.dialogVisibles = false
            done();
                    done()
          },
          (error) => {
            window.console.log(error);
                    window.console.log(error)
            // loading();
          }
        );
            )
      },

      handleClose(done) {
        done();
            done()
        // this.$confirm('确认关闭？')
        //   .then(_ => {
        //     done();
@@ -501,41 +513,41 @@
      },
      rowSave(row, done, loading) {
        if (row.videoUrl.length == 0) {
          row.videoUrl = "";
                row.videoUrl = ""
        }
        row.userid = this.userInfo.user_id;
            row.userid = this.userInfo.user_id
        row.articleRange = JSON.stringify(row.articleList)
        if (row.url.length > 0) {
          var urls = []
          var split = row.url.split(",");
                var split = row.url.split(",")
          split.forEach(url => {
            var names = url.split("jczz/");
                    var names = url.split("jczz/")
            urls.push(names[1])
          })
          row.url = urls.join(",")
        }
        add(row).then(
          () => {
            this.onLoad(this.page);
                    this.onLoad(this.page)
            this.$message({
              type: "success",
              message: "操作成功!",
            });
            done();
                    })
                    done()
          },
          (error) => {
            window.console.log(error);
            loading();
                    window.console.log(error)
                    loading()
          }
        );
            )
      },
      rowUpdate(row, index, done, loading) {
        row.articleRange = JSON.stringify(row.articleList)
        if (row.url.length > 0) {
          var urls = []
          var split = row.url.split(",");
                var split = row.url.split(",")
          split.forEach(url => {
            var names = url.split("jczz/");
                    var names = url.split("jczz/")
            urls.push(names[1])
          })
          row.url = urls.join(",")
@@ -543,18 +555,18 @@

        update(row).then(
          () => {
            this.onLoad(this.page);
                    this.onLoad(this.page)
            this.$message({
              type: "success",
              message: "操作成功!",
            });
            done();
                    })
                    done()
          },
          (error) => {
            window.console.log(error);
            loading();
                    window.console.log(error)
                    loading()
          }
        );
            )
      },
      rowDel(row) {
        this.$confirm("确定将选择数据删除?", {
@@ -563,37 +575,37 @@
            type: "warning",
          })
          .then(() => {
            return remove(row.id);
                    return remove(row.id)
          })
          .then(() => {
            this.onLoad(this.page);
                    this.onLoad(this.page)
            this.$message({
              type: "success",
              message: "操作成功!",
            });
          });
                    })
                })
      },
      searchReset() {
        this.query = {};
        this.onLoad(this.page);
            this.query = {}
            this.onLoad(this.page)
      },
      searchChange(params, done) {
        this.query = params;
        this.page.currentPage = 1;
        this.onLoad(this.page, params);
        done();
            this.query = params
            this.page.currentPage = 1
            this.onLoad(this.page, params)
            done()
      },
      selectionChange(list) {
        this.selectionList = list;
            this.selectionList = list
      },
      selectionClear() {
        this.selectionList = [];
        this.$refs.crud.toggleSelection();
            this.selectionList = []
            this.$refs.crud.toggleSelection()
      },
      handleDelete() {
        if (this.selectionList.length === 0) {
          this.$message.warning("请选择至少一条数据");
          return;
                this.$message.warning("请选择至少一条数据")
                return
        }
        this.$confirm("确定将选择数据删除?", {
            confirmButtonText: "确定",
@@ -601,16 +613,16 @@
            type: "warning",
          })
          .then(() => {
            return remove(this.ids);
                    return remove(this.ids)
          })
          .then(() => {
            this.onLoad(this.page);
                    this.onLoad(this.page)
            this.$message({
              type: "success",
              message: "操作成功!",
            });
            this.$refs.crud.toggleSelection();
          });
                    })
                    this.$refs.crud.toggleSelection()
                })
      },
      beforeOpen(done, type) {
        if (["edit", "view"].includes(type)) {
@@ -619,146 +631,146 @@
            // data.forEach(item=>{
            if (data.url.length > 0) {
              var urls = []
              var names = data.url.split(",");
                        var names = data.url.split(",")
              names.forEach(name => {
                urls.push(website.minioUrl + name)
              })
              data.url = urls.join(",")
            }
            data.articleList = JSON.parse(data.articleRange)
            this.form = data;
          });
                    this.form = data
                })
        }
        // con
        done();
            done()
      },
      currentChange(currentPage) {
        this.page.currentPage = currentPage;
            this.page.currentPage = currentPage
      },
      sizeChange(pageSize) {
        this.page.pageSize = pageSize;
            this.page.pageSize = pageSize
      },
      refreshChange() {
        this.onLoad(this.page, this.query);
            this.onLoad(this.page, this.query)
      },
      onLoad(page, params = {}) {
        const {
          dateTime
        } = this.query;
            } = this.query
        let values = {
          ...params,
        };
            }
        if (dateTime) {
          values = {
            ...params,
            startTime: dateTime[0],
            endTime: dateTime[1],
            ...this.query,
          };
          values.dateTime = null;
                }
                values.dateTime = null
        }
        values.type = 2
        this.loading = true;
            this.loading = true
        console.log(values)
        getList(page.currentPage, page.pageSize, values).then((res) => {
          const data = res.data.data;
          this.page.total = data.total;
          this.data = data.records;
                const data = res.data.data
                this.page.total = data.total
                this.data = data.records
          this.data.forEach(item => {
            if (item.url.length > 0) {
              var urls = []
              var names = item.url.split(",");
                        var names = item.url.split(",")
              names.forEach(name => {
                urls.push(website.minioUrl + name)
              })
              item.url = urls.join(",")
            }
          })
          this.loading = false;
          this.selectionClear();
        });
                this.loading = false
                this.selectionClear()
            })
        getDistrictTree(params = {}).then((res) => {
          const data = res.data.data;
          this.districtTree = data;
          const column = this.findObject(this.option.column, "articleList");
          column.dicData = res.data.data;
          this.loading = false;
        });
                const data = res.data.data
                this.districtTree = data
                const column = this.findObject(this.option.column, "articleList")
                column.dicData = res.data.data
                this.loading = false
            })
      },
      updateFb(row) {
        if (row.publish == "0") {
          row.publish = "1";
                row.publish = "1"
        } else {
          row.publish = "0";
                row.publish = "0"
        }
        if (row.url.length > 0) {
          var urls = []
          var split = row.url.split(",");
                var split = row.url.split(",")
          split.forEach(url => {
            var names = url.split("jczz/");
                    var names = url.split("jczz/")
            urls.push(names[1])
          })
          row.url = urls.join(",")
        }
        update(row).then(
          () => {
            this.onLoad(this.page);
                    this.onLoad(this.page)
            this.$message({
              type: "success",
              message: "操作成功!",
            });
            done();
                    })
                    done()
          },
          (error) => {
            window.console.log(error);
            loading();
                    window.console.log(error)
                    loading()
          }
        );
            )
      },
      kqcomment() {
        if (this.selectionList.length === 0) {
          this.$message.warning("请选择至少一条数据");
          return;
                this.$message.warning("请选择至少一条数据")
                return
        }
        this.$confirm("确定将选择数据开启评论?", {
            confirmButtonText: "确定",
            cancelButtonText: "取消",
            type: "warning",
          }).then(() => {
            return upcomment(this.ids, "1");
                return upcomment(this.ids, "1")
          })
          .then(() => {
            this.onLoad(this.page);
                    this.onLoad(this.page)
            this.$message({
              type: "success",
              message: "操作成功!",
            });
            this.$refs.crud.toggleSelection();
          });
                    })
                    this.$refs.crud.toggleSelection()
                })
      },
      gbcomment() {
        if (this.selectionList.length === 0) {
          this.$message.warning("请选择至少一条数据");
          return;
                this.$message.warning("请选择至少一条数据")
                return
        }
        this.$confirm("确定将选择数据开启评论?", {
            confirmButtonText: "确定",
            cancelButtonText: "取消",
            type: "warning",
          }).then(() => {
            return upcomment(this.ids, "0");
                return upcomment(this.ids, "0")
          })
          .then(() => {
            this.onLoad(this.page);
                    this.onLoad(this.page)
            this.$message({
              type: "success",
              message: "操作成功!",
            });
            this.$refs.crud.toggleSelection();
          });
                    })
                    this.$refs.crud.toggleSelection()
                })
      }
    },
  };
}
</script>

<style>

 src/views/property/oiae.vue

@@ -32,22 +32,16 @@
                </el-button>
            </template>

            <template slot-scope="{ row }" slot="publish">
                <el-tag>{{
                    row.publish == "1" ? "已发布" : row.publish == "0" ? "未发布" : "未发布"
                }}
            <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 }" slot="iscomment">
                <el-tag>{{
                    row.iscomment == "1" ? "开启" : row.iscomment == "0" ? "关闭" : "关闭"
                }}
            <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>
        </avue-crud>



        <el-dialog title="" append-to-body :visible.sync="dialogVisibles" width="50%" :before-close="handleClose">
            <span slot="title" class="dialog-footer">
@@ -62,9 +56,6 @@
                </avue-form>
            </div>
        </el-dialog>




    </basic-container>
</template>
@@ -132,13 +123,16 @@
            datetime: "",
            selectionList: [],
            option: {
                labelWidth: 120,
                searchLabelWidth: 96,
                searchShow: true,
                searchMenuSpan: 3,
                menuWidth: 280,

                height: "auto",
                calcHeight: 54,
                dialogWidth: 950,
                tip: false,
                searchShow: true,
                searchMenuSpan: 3,
                menuWidth: 450,
                border: false,
                //stripe:true,
                index: true,
@@ -162,10 +156,10 @@
                    },

                    {
                        width: 110,
                        label: "缩略图",
                        prop: "url",
                        // align:'center',
                        width: 80,
                        type: "upload",
                        listType: "picture-img",
                        action: "/api/blade-resource/oss/endpoint/put-file",
@@ -212,10 +206,10 @@
                    {
                        label: "收支类型",
                        prop: "type",
                        searchSpan: 3,
                        width: 80,
                        value: 1,
                        slot: true,
                        searchSpan: 4,
                        search: true,
                        type: "select",
                        rules: [{
@@ -228,13 +222,14 @@
                            value: 1,
                        }],
                    },

                    {
                        label: "发布时间",
                        prop: "dateTime",
                        type: "datetime",
                        type: "daterange",
                        format: "yyyy-MM-dd",
                        valueFormat: "yyyy-MM-dd",
                        searchSpan: 5,
                        searchSpan: 6,
                        searchRange: true,
                        hide: true,
                        addDisplay: false,
@@ -247,7 +242,9 @@
                            trigger: "blur",
                        },],
                    },

                    {
                        width: 100,
                        label: "发布时间",
                        prop: "createTime",
                        type: "date",
@@ -255,12 +252,12 @@
                        valueFormat: "yyyy-MM-dd HH:mm:ss",
                    },
                    {
                        width: 100,
                        label: "发布状态",
                        prop: "publish",
                        searchSpan: 3,
                        width: 80,
                        value: "0",
                        slot: true,
                        searchSpan: 4,
                        search: true,
                        type: "select",
                        rules: [{
@@ -279,9 +276,9 @@
                        ],
                    },
                    {
                        width: 100,
                        label: "评论区",
                        prop: "iscomment",
                        width: 80,
                        slot: true,
                        type: "select",
                        dicData: [{
@@ -341,7 +338,6 @@
                        fontSize: '24px'
                    }
                }, {
                    labelWidth: 100,
                    label: '开启',
                    prop: 'openFlag',
                    type: 'radio',
@@ -380,7 +376,6 @@
                        fontSize: '24px'
                    }
                }, {
                    labelWidth: 100,
                    label: '开启投票',
                    prop: 'openFlag',
                    type: 'radio',
@@ -395,7 +390,6 @@
                        value: 1
                    }]
                }, {
                    labelWidth: 100,
                    label: '开启签名',
                    prop: 'signatureFlag',
                    type: 'radio',
@@ -465,6 +459,21 @@
            })
            return ids.join(",")
        },
        showStatus () {
            return (data, type) => {
                if (data == 0) {
                    return {
                        text: type == 1 ? '未发布' : '关闭',
                        type: 'info'
                    }
                } else if (data == 1) {
                    return {
                        text: type == 1 ? '已发布' : '开启',
                        type: 'success'
                    }
                }
            }
        }
    },
    methods: {


 src/views/property/partyOrganization.vue

@@ -1,21 +1,18 @@
<template>
  <basic-container>
    <avue-crud :option="option" :table-loading="loading" :data="data" :page.sync="page" ref="crud" v-model="form"
               :permission="permissionList" @search-change="searchChange" @search-reset="searchReset"
               @row-update="rowUpdate" @row-save="rowSave" @row-del="rowDel"
               :before-open="beforeOpen"
               @selection-change="selectionChange" @current-change="currentChange" @size-change="sizeChange"
               @refresh-change="refreshChange" @on-load="onLoad">
            :permission="permissionList" @search-change="searchChange" @search-reset="searchReset" @row-update="rowUpdate"
            @row-save="rowSave" @row-del="rowDel" :before-open="beforeOpen" @selection-change="selectionChange"
            @current-change="currentChange" @size-change="sizeChange" @refresh-change="refreshChange" @on-load="onLoad">

      <template slot-scope="{row}" slot="phone">
        <el-button type="text" @click="showStringDispose(row, 'phoneNumberflag')">
            <template slot-scope="{row, size}" slot="phone">
                <el-button :size="size" type="text" @click="showStringDispose(row, 'phoneNumberflag')">
          {{ textDispose(row, 'phoneNumberflag', 'phone') }}
        </el-button>
      </template>

      <template slot-scope="scope" slot="menu">
        <el-button type="text" icon="el-icon-circle-plus-outline" size="small"
                   @click="manageMember(scope.row)">党成员
            <template slot-scope="{row, size, index}" slot="menu">
                <el-button :size="size" type="text" icon="el-icon-circle-plus-outline" @click="manageMember(row)">党成员
        </el-button>
      </template>
    </avue-crud>
@@ -23,17 +20,16 @@
    <el-drawer title="党成员" size="60%" append-to-body :visible.sync="memberFlag" :direction="'rtl'">
      <PartyOrganizationMember ref="partyOrganizationMember" />
    </el-drawer>

  </basic-container>
</template>

<script>
import {mapGetters} from "vuex";
import {getDetail,getList,add,update,remove} from "@/api/partyOrganization/partyOrganization";
import website from "@/config/website";
import func from "@/util/func";
import {validatePhone} from "@/util/validate";
import PartyOrganizationMember from "@/views/property/components/partyOrganizationMember.vue";
import { mapGetters } from "vuex"
import { getDetail, getList, add, update, remove } from "@/api/partyOrganization/partyOrganization"
import website from "@/config/website"
import func from "@/util/func"
import { validatePhone } from "@/util/validate"
import PartyOrganizationMember from "@/views/property/components/partyOrganizationMember.vue"
const searchSpan = 4
export default {
  name: "partyOrganization",
@@ -52,6 +48,12 @@
      selectionList: [],
      memberFlag: false,
      option: {
                labelWidth: 120,
                searchLabelWidth: 96,
                searchShow: true,
                searchMenuSpan: 3,
                menuWidth: 280,

        // menu: false,
        // addBtn: false,
        border: true,
@@ -61,8 +63,6 @@
        calcHeight: 54,
        dialogWidth: 950,
        tip: false,
        searchShow: true,
        searchMenuSpan: 3,
        //stripe:true,
        viewBtn: true,
        excelBtn: true,
@@ -138,6 +138,7 @@
          },

          {
                        width: 110,
            label: "负责人",
            prop: "chargePerson",
            rules: [{
@@ -147,15 +148,18 @@
            }]
          },
          {
                        width: 110,
            label: "姓名",
            prop: "name",
            searchSpan: searchSpan,
                        searchLabelWidth: 66,
            searchPlaceholder:"请输入负责人或党成员",
            hide:true,
            display: false,
            search: true
          },
          {
                        width: 120,
            label: "手机号",
            prop: "phone",
            slot: true,
@@ -473,6 +477,4 @@
}
</script>

<style scoped>

</style>
<style scoped></style>

 src/views/property/propertyCapitalApply.vue

@@ -7,12 +7,12 @@
            @selection-change="selectionChange" @current-change="currentChange" @size-change="sizeChange"
            @refresh-change="refreshChange" @on-load="onLoad">

            <template slot-scope="scope" slot="menu">
                <el-button type="text" size="small" v-if="scope.row.applyStatus === 4" @click="handleWork(scope.row)">调整申请
            <template slot-scope="{ row, size, index }" slot="menu">
                <el-button :size="size" type="text" v-if="scope.row.applyStatus === 4" @click="handleWork(scope.row)">调整申请
                </el-button>
                <el-button type="text" size="small" @click="goDetail(scope.row)">查看申请
                <el-button :size="size" type="text" @click="goDetail(scope.row)">查看申请
                </el-button>
                <el-button type="text" size="small" @click="goDetail(scope.row)">删 除
                <el-button :size="size" type="text" @click="goDetail(scope.row)">删 除
                </el-button>
            </template>
            <!-- <template slot="menuLeft">
@@ -56,13 +56,16 @@
            datetime: "",
            selectionList: [],
            option: {
                labelWidth: 154,
                searchLabelWidth: 96,
                searchShow: true,
                searchMenuSpan: 3,
                menuWidth: 140,

                height: "auto",
                calcHeight: 54,
                dialogWidth: 1150,
                tip: false,
                searchShow: true,
                searchMenuSpan: 3,
                menuWidth: 350,
                border: true,
                //stripe:true,
                index: true,
@@ -103,7 +106,6 @@
                        },
                        defaultExpandedKeys: ["361102003"],
                        span: 12,
                        labelWidth: 120,
                        width: 260,
                        rules: [{
                            required: true,
@@ -115,11 +117,10 @@
                    {
                        label: '维修项目名称',
                        prop: 'name',
                        searchLabelWidth: 120,
                        searchSpan: 5,
                        searchLabelWidth: 124,
                        search: true,
                        span: 12,
                        labelWidth: 140,
                        rules: [{
                            required: true,
                            message: "请输入维修项目名称",
@@ -127,10 +128,10 @@
                        },],
                    },
                    {
                        width: 100,
                        label: "预计开工时间",
                        prop: "runTime",
                        span: 12,
                        labelWidth: 140,
                        type: "date",
                        format: "yyyy-MM-dd",
                        valueFormat: "yyyy-MM-dd",
@@ -141,9 +142,9 @@
                        },],
                    },
                    {
                        width: 100,
                        label: "预计竣工时间",
                        prop: "completedTime",
                        labelWidth: 140,
                        span: 12,
                        type: "date",
                        format: "yyyy-MM-dd",
@@ -157,18 +158,18 @@
                    {
                        label: "项目分摊方式",
                        prop: "allocationWay",
                        labelWidth: 140,
                        value: '按建筑面积分摊',
                        span: 14,
                        row: true,
                    },
                    {
                        width: 110,
                        label: '联系人',
                        prop: 'linkman',
                        span: 12,
                        labelWidth: 120,
                        search: true,
                        searchSpan: 4,
                        searchLabelWidth: 80,
                        search: true,
                        rules: [{
                            required: true,
                            message: "请输入联系人",
@@ -176,10 +177,10 @@
                        },],
                    },
                    {
                        width: 120,
                        label: '联系方式',
                        prop: 'linkPhone',
                        span: 12,
                        labelWidth: 140,
                        rules: [{
                            required: true,
                            message: "请输入联系方式",
@@ -187,16 +188,15 @@
                        },],
                    },
                    {
                        width: 100,
                        label: '申请时间',
                        prop: 'applyTime',
                        span: 12,
                        labelWidth: 160,
                        display: false,
                    }, {
                        label: '审核进度',
                        prop: 'applyStatus',
                        span: 12,
                        labelWidth: 140,
                        display: false,
                        dicData: [{
                            label: "待审核",
@@ -226,7 +226,6 @@
                        prop: "budgetAmount",
                        span: 12,
                        hide: true,
                        labelWidth: 140,
                        type: 'number',
                        precision: 2,
                        value: '0.00'
@@ -236,7 +235,6 @@
                        prop: "actualAmount",
                        span: 12,
                        hide: true,
                        labelWidth: 140,
                        type: 'number',
                        precision: 2,
                        value: '0.00'
@@ -246,7 +244,6 @@
                        prop: "selfAmount",
                        span: 12,
                        hide: true,
                        labelWidth: 140,
                        type: 'number',
                        precision: 2,
                        value: '0.00'
@@ -256,7 +253,6 @@
                        prop: "budgetAppropriateAmount",
                        span: 12,
                        hide: true,
                        labelWidth: 140,
                        type: 'number',
                        precision: 2,
                        value: '0.00'
@@ -267,7 +263,6 @@
                        hide: true,
                        prop: "projectDigest",
                        placeholder: "例如:“XX小区XX栋XX设施设备维修，总的预算金额是X，是否含有审价，本次维修涉及范围共XX户，总面积的建筑面积为XX平方米”",
                        labelWidth: 140,
                        type: "textarea"
                    },
                    {
@@ -275,7 +270,6 @@
                        span: 24,
                        hide: true,
                        prop: "projectDescribe",
                        labelWidth: 140,
                        type: "textarea"
                    },
                    {
@@ -284,7 +278,6 @@
                        type: 'upload',
                        span: 24,
                        hide: true,
                        labelWidth: 140,
                        multiple: true,
                        // showFileList: true,
                        propsHttp: {

 src/views/property/propertyCharge.vue

@@ -1,24 +1,19 @@
<template>
  <basic-container>
    <avue-crud :option="option" :table-loading="loading" :data="data" :page.sync="page" ref="crud" v-model="form"
               :permission="permissionList" @search-change="searchChange" @search-reset="searchReset"
               @row-update="rowUpdate" @row-save="rowSave" @row-del="rowDel"
               :before-open="beforeOpen"
               @selection-change="selectionChange" @current-change="currentChange" @size-change="sizeChange"
               @refresh-change="refreshChange" @on-load="onLoad">
            :permission="permissionList" @search-change="searchChange" @search-reset="searchReset" @row-update="rowUpdate"
            @row-save="rowSave" @row-del="rowDel" :before-open="beforeOpen" @selection-change="selectionChange"
            @current-change="currentChange" @size-change="sizeChange" @refresh-change="refreshChange" @on-load="onLoad">
    </avue-crud>



  </basic-container>
</template>

<script>
import {mapGetters} from "vuex";
import {getDetail,getList,add,update,remove} from "@/api/property/propertyCharge";
import website from "@/config/website";
import func from "@/util/func";
import {validatePhone} from "@/util/validate";
import { mapGetters } from "vuex"
import { getDetail, getList, add, update, remove } from "@/api/property/propertyCharge"
import website from "@/config/website"
import func from "@/util/func"
import { validatePhone } from "@/util/validate"
const searchSpan = 4
const labelWidth=110
export default {
@@ -37,6 +32,12 @@
      selectionList: [],
      memberFlag: false,
      option: {
                labelWidth: 96,
                searchLabelWidth: 96,
                searchShow: true,
                searchMenuSpan: 3,
                menuWidth: 210,

        // menu: false,
        // addBtn: false,
        border: true,
@@ -46,8 +47,6 @@
        calcHeight: 54,
        dialogWidth: 950,
        tip: false,
        searchShow: true,
        searchMenuSpan: 3,
        //stripe:true,
        viewBtn: true,
        excelBtn: true,
@@ -63,6 +62,7 @@
              label: "name",
              value: "deptId",
            },
                        searchSpan: 4,
            search:true,
            disabled:false,
            type: "select",
@@ -355,6 +355,4 @@
}
</script>

<style scoped>

</style>
<style scoped></style>

 src/views/property/propertyChargeRecord.vue

@@ -1,26 +1,20 @@
<template>
  <basic-container>
    <avue-crud :option="option" :table-loading="loading" :data="data" :page.sync="page" ref="crud" v-model="form"
               :permission="permissionList" @search-change="searchChange" @search-reset="searchReset"
               @row-update="rowUpdate" @row-save="rowSave" @row-del="rowDel"
               :before-open="beforeOpen"
               @selection-change="selectionChange" @current-change="currentChange" @size-change="sizeChange"
               @refresh-change="refreshChange" @on-load="onLoad">
            :permission="permissionList" @search-change="searchChange" @search-reset="searchReset" @row-update="rowUpdate"
            @row-save="rowSave" @row-del="rowDel" :before-open="beforeOpen" @selection-change="selectionChange"
            @current-change="currentChange" @size-change="sizeChange" @refresh-change="refreshChange" @on-load="onLoad">
    </avue-crud>



  </basic-container>
</template>

<script>
import {mapGetters} from "vuex";
import {getDetail,getList,add,update,remove} from "@/api/property/propertyChargeRecord";
import website from "@/config/website";
import func from "@/util/func";
import {validatePhone} from "@/util/validate";
import { mapGetters } from "vuex"
import { getDetail, getList, add, update, remove } from "@/api/property/propertyChargeRecord"
import website from "@/config/website"
import func from "@/util/func"
import { validatePhone } from "@/util/validate"
const searchSpan = 4
const labelWidth=110
export default {
  name: "propertyChargeRecord",
  data () {
@@ -37,6 +31,12 @@
      selectionList: [],
      memberFlag: false,
      option: {
                labelWidth: 96,
                searchLabelWidth: 96,
                searchShow: true,
                searchMenuSpan: 3,
                menuWidth: 210,

        // menu: false,
        // addBtn: false,
        border: true,
@@ -46,8 +46,6 @@
        calcHeight: 54,
        dialogWidth: 950,
        tip: false,
        searchShow: true,
        searchMenuSpan: 3,
        //stripe:true,
        viewBtn: true,
        excelBtn: true,
@@ -57,7 +55,6 @@
        column: [
          {
            label: "物业公司",
            labelWidth:labelWidth,
            prop: "propertyId",
            checkStrictly: true,
            dicUrl: "/api/blade-propertyCompany/propertyCompany/getPropertyCompanyList",
@@ -65,6 +62,7 @@
              label: "name",
              value: "deptId",
            },
                        searchSpan,
            search:true,
            disabled:false,
            type: "select",
@@ -76,11 +74,11 @@
          },

          {

            label: "付款人",
            labelWidth:labelWidth,
            prop: "payUser",
            searchSpan: searchSpan,
            searchLabelWidth: labelWidth,
                        searchLabelWidth: 80,
            search: true,
            rules: [{
              required: true,
@@ -90,7 +88,6 @@
          },
          {
            label: "付款时间",
            labelWidth:labelWidth,
            prop: "payTime",
            rules: [{
              required: true,
@@ -100,7 +97,6 @@
          },
          {
            label: "付款金额(元)",
            labelWidth:labelWidth,
            prop: "payPrice",
            type:'number',
            precision:2,
@@ -112,7 +108,6 @@
          },
          {
            label: "付款方式",
            labelWidth:labelWidth,
            prop: "payFunc",
            checkStrictly: true,
            dicUrl: "/api/blade-system/dict-biz/dictionary?code=payPeriod",
@@ -332,6 +327,4 @@
}
</script>

<style scoped>

</style>
<style scoped></style>

 src/views/property/propertyCompany.vue

@@ -3,23 +3,20 @@
  <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">
            :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.propertyCompany_delete"
                   @click="handleDelete">删 除
        </el-button>
      </template>

      <template slot-scope="scope" slot="menu">
        <el-button v-if="permission.payInfo" type="text" icon="el-icon-circle-plus-outline" size="small"
                   @click="openPayConfig(scope.row)">商户配置
            <template slot-scope="{row, size, index}" slot="menu">
                <el-button :size="size" v-if="permission.payInfo" type="text" icon="el-icon-circle-plus-outline"
                    @click="openPayConfig(row)">商户配置
        </el-button>
      </template>


    </avue-crud>

    <el-dialog title="商户配置" append-to-body :visible.sync="payInfoVisible" top="10vh" width="70%">
@@ -41,8 +38,6 @@
      <!--      </div>-->

    </el-dialog>


  </basic-container>
</template>

@@ -55,16 +50,15 @@
  getPropertyCompany,
  getPayConfig,
  saveOrUpdateWx, saveOrUpdateAli
} from "@/api/property/propertyCompany";
import {mapGetters} from "vuex";
import website from '@/config/website';
import func from "@/util/func";
} from "@/api/property/propertyCompany"
import { mapGetters } from "vuex"
import website from '@/config/website'
import func from "@/util/func"

const labelWidth = 120
export default {
  data() {
    return {

      currentTab: "wxInfo",
      payInfoVisible: false,
      currentRow: {},
@@ -80,13 +74,16 @@
      datetime: "",
      selectionList: [],
      option: {
                labelWidth: 120,
                searchLabelWidth: 96,
                searchShow: true,
                searchMenuSpan: 3,
                menuWidth: 280,

        height: "auto",
        calcHeight: 54,
        dialogWidth: 1150,
        tip: false,
        searchShow: true,
        searchMenuSpan: 3,
        menuWidth: 350,
        border: true,
        //stripe:true,
        index: true,
@@ -95,14 +92,14 @@
        dialogClickModal: false,
        column: [
          {
                        overHidden: true,
            label: "物业公司名称",
            prop: "name",
            searchSpan: 6,
                        searchSpan: 5,
                        searchLabelWidth: 124,
            search: true,
            searchLabelWidth: 120,
            span: 18,
            row: true,
            labelWidth: 120,
            width: 260,
            rules: [
              {
@@ -122,7 +119,6 @@
            },
            hide: true,
            span: 6,
            labelWidth: 120,
            cascader: ['city'],
            dicUrl: `/api/blade-system/region/select`,
            rules: [
@@ -175,23 +171,21 @@
            ]
          },
          {
                        overHidden: true,
            label: "地址",
            prop: "address",
            span: 18,
            labelWidth: 120,
            row: true,
          },
          {
            label: "社会信用代码",
            prop: "socialCreditCode",
            labelWidth: 120,
          },

          {
            label: "简介",
            prop: "remark",
            component: "AvueUeditor",
            labelWidth: 120,
            options: {
              action: "/api/blade-resource/oss/endpoint/put-file-attach",
              props: {
@@ -325,7 +319,7 @@
        ],
      }

    };
        }
  },
  watch: {},
  computed: {
@@ -336,14 +330,14 @@
        viewBtn: this.vaildData(this.permission.propertyCompany_view, true),
        delBtn: this.vaildData(this.permission.propertyCompany_delete, true),
        editBtn: this.vaildData(this.permission.propertyCompany_edit, true),
      };
            }
    },
    ids() {
      let ids = [];
            let ids = []
      this.selectionList.forEach((ele) => {
        ids.push(ele.id);
      });
      return ids.join(",");
                ids.push(ele.id)
            })
            return ids.join(",")
    },
  },
  created() {
@@ -359,8 +353,8 @@
        this.$message({
          type: "success",
          message: "操作成功!",
        });
        done();
                })
                done()
      })

    },
@@ -384,8 +378,8 @@
        this.$message({
          type: "success",
          message: "操作成功!",
        });
        done();
                })
                done()
      })
    },

@@ -401,37 +395,37 @@
    },

    rowSave(row, done, loading) {
      row.userid = this.userInfo.user_id;
            row.userid = this.userInfo.user_id
      add(row).then(
        () => {
          this.onLoad(this.page);
                    this.onLoad(this.page)
          this.$message({
            type: "success",
            message: "操作成功!",
          });
          done();
                    })
                    done()
        },
        (error) => {
          window.console.log(error);
          loading();
                    window.console.log(error)
                    loading()
        }
      );
            )
    },
    rowUpdate(row, index, done, loading) {
      update(row).then(
        () => {
          this.onLoad(this.page);
                    this.onLoad(this.page)
          this.$message({
            type: "success",
            message: "操作成功!",
          });
          done();
                    })
                    done()
        },
        (error) => {
          window.console.log(error);
          loading();
                    window.console.log(error)
                    loading()
        }
      );
            )
    },
    rowDel(row) {
      this.$confirm("确定将选择数据删除?", {
@@ -440,37 +434,37 @@
        type: "warning",
      })
        .then(() => {
          return remove(row.id);
                    return remove(row.id)
        })
        .then(() => {
          this.onLoad(this.page);
                    this.onLoad(this.page)
          this.$message({
            type: "success",
            message: "操作成功!",
          });
        });
                    })
                })
    },
    searchReset() {
      this.query = {};
      this.onLoad(this.page);
            this.query = {}
            this.onLoad(this.page)
    },
    searchChange(params, done) {
      this.query = params;
      this.page.currentPage = 1;
      this.onLoad(this.page, params);
      done();
            this.query = params
            this.page.currentPage = 1
            this.onLoad(this.page, params)
            done()
    },
    selectionChange(list) {
      this.selectionList = list;
            this.selectionList = list
    },
    selectionClear() {
      this.selectionList = [];
      this.$refs.crud.toggleSelection();
            this.selectionList = []
            this.$refs.crud.toggleSelection()
    },
    handleDelete() {
      if (this.selectionList.length === 0) {
        this.$message.warning("请选择至少一条数据");
        return;
                this.$message.warning("请选择至少一条数据")
                return
      }
      this.$confirm("确定将选择数据删除?", {
        confirmButtonText: "确定",
@@ -478,60 +472,60 @@
        type: "warning",
      })
        .then(() => {
          return remove(this.ids);
                    return remove(this.ids)
        })
        .then(() => {
          this.onLoad(this.page);
                    this.onLoad(this.page)
          this.$message({
            type: "success",
            message: "操作成功!",
          });
          this.$refs.crud.toggleSelection();
        });
                    })
                    this.$refs.crud.toggleSelection()
                })
    },
    beforeOpen(done, type) {
      if (["edit", "view"].includes(type)) {
        getPropertyCompany(this.form.id).then((res) => {
          this.form = res.data.data;
        });
                    this.form = res.data.data
                })
      }
      // con
      done();
            done()
    },
    currentChange(currentPage) {
      this.page.currentPage = currentPage;
            this.page.currentPage = currentPage
    },
    sizeChange(pageSize) {
      this.page.pageSize = pageSize;
            this.page.pageSize = pageSize
    },
    refreshChange() {
      this.onLoad(this.page, this.query);
            this.onLoad(this.page, this.query)
    },
    onLoad(page, params = {}) {
      const {dateTime} = this.query;
            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;
                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();
      });
                const data = res.data.data
                this.page.total = data.total
                this.data = data.records
                this.loading = false
                this.selectionClear()
            })
    }
  }
};
}
</script>

<style>

 src/views/property/propertyCompanyDistrict.vue

@@ -30,6 +30,18 @@
import func from "@/util/func"
export default {
    data () {
        //手机号格式校验
        let validatorPhone = function (rule, value, callback) {
            if (value) {
                if (!/^1[3456789]\d{9}$/.test(value)) {
                    callback(new Error('手机号格式有误！'))
                } else {
                    callback()
                }
            }
            callback()
        }

        return {
            form: {},
            query: {},
@@ -42,13 +54,16 @@
            datetime: "",
            selectionList: [],
            option: {
                labelWidth: 120,
                searchLabelWidth: 96,
                searchShow: true,
                searchMenuSpan: 3,
                menuWidth: 210,

                height: "auto",
                calcHeight: 54,
                dialogWidth: 1150,
                tip: false,
                searchShow: true,
                searchMenuSpan: 3,
                menuWidth: 350,
                border: true,
                //stripe:true,
                index: true,
@@ -57,7 +72,6 @@
                dialogClickModal: false,
                column: [
                    {
                        width: 220,
                        overHidden: true,
                        label: '小区名称',
                        addDisplay: false,
@@ -87,7 +101,6 @@
                        },
                        defaultExpandedKeys: ["361102003"],
                        span: 12,
                        labelWidth: 120,
                        width: 260,
                        rules: [{
                            required: true,
@@ -97,11 +110,11 @@
                    },

                    {
                        overHidden: true,
                        label: "物业公司",
                        addDisplay: false,
                        editDisplay: false,
                        viewDisplay: false,
                        width: 160,
                        label: "物业公司",
                        prop: "propertyCompanyName",
                        search: true,
                        searchSpan: 4,
@@ -118,7 +131,6 @@
                        prop: 'propertyCompanyId',
                        type: 'tree',
                        span: 12,
                        labelWidth: 120,
                        dicUrl: `/api/blade-propertyCompany/propertyCompany/getPropertyCompanyList`,
                        cascader: ['userId'],
                        props: {
@@ -132,10 +144,10 @@
                        }]
                    },
                    {
                        width: 110,
                        label: '项目经理',
                        prop: 'principal',
                        span: 12,
                        labelWidth: 120,
                        search: true,
                        searchSpan: 4,
                        rules: [{
@@ -145,21 +157,24 @@
                        },],
                    },
                    {
                        width: 120,
                        label: '联系方式',
                        prop: 'principalPhone',
                        span: 12,
                        labelWidth: 120,
                        rules: [{
                            required: true,
                            message: "请输入联系方式",
                            trigger: "blur",
                        },],
                        },
                        {
                            validator: validatorPhone,
                            trigger: 'blur'
                        }],
                    },
                    {
                        label: "物业成员",
                        prop: "userId",
                        span: 12,
                        labelWidth: 120,
                        type: "tree",
                        multiple: true,
                        remote: true,
@@ -171,10 +186,10 @@
                        dicUrl: `/api/blade-propertyCompany/propertyCompany/getUserByPropertyCompany?id={{propertyCompanyId}}`,
                    },
                    {
                        width: 100,
                        label: "物业阶段",
                        span: 12,
                        prop: "propertyStage",
                        labelWidth: 120,
                        type: "select",
                        search: true,
                        searchSpan: 4,
@@ -186,10 +201,10 @@
                        },
                    },
                    {
                        width: 100,
                        label: "合同开始时间",
                        prop: "startTime",
                        span: 12,
                        labelWidth: 120,
                        type: "date",
                        format: "yyyy-MM-dd",
                        valueFormat: "yyyy-MM-dd",
@@ -200,9 +215,9 @@
                        },],
                    },
                    {
                        width: 100,
                        label: "合同结束时间",
                        prop: "endTime",
                        labelWidth: 120,
                        span: 12,
                        type: "date",
                        format: "yyyy-MM-dd",

 src/views/publicSecurity/bailReporting.vue

@@ -1,19 +1,25 @@
<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-scope="scope" slot="menu">
        <el-button type="text" size="small" icon="el-icon-view" plain @click="lookDetail(scope.row,0)">查 看
            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-scope="{row, size, index}" slot="menu">
                <el-button :size="size" type="text" icon="el-icon-view" plain @click="lookDetail(row, 0)">查 看
        </el-button>
        <el-button type="text" size="small" icon="el-icon-s-check" v-if="scope.row.status == 1" plain
          @click="lookDetail(scope.row,1)">审 核
                <el-button :size="size" type="text" icon="el-icon-s-check" v-if="row.status == 1" plain
                    @click="lookDetail(row, 1)">审 核
        </el-button>
        <el-button type="text" size="small" icon="el-icon-delete" plain @click="rowDel(scope.row)">删 除
                <el-button :size="size" type="text" icon="el-icon-delete" plain @click="rowDel(row)">删 除
        </el-button>
      </template>

            <template slot="status" slot-scope="{row, size}">
                <el-tag :size="size" :type="showStatus(row.status).type">
                    {{ showStatus(row.status).text }}
                </el-tag>
            </template>
    </avue-crud>

    <el-dialog class="place-info-box audit-info-box" title="" append-to-body :visible.sync="auditBasePopup" width="60%">
@@ -46,6 +52,19 @@

  export default {
    data() {

        //手机号格式校验
        let validatorPhone = function (rule, value, callback) {
            if (value) {
                if (!/^1[3456789]\d{9}$/.test(value)) {
                    callback(new Error('手机号格式有误！'))
                } else {
                    callback()
                }
            }
            callback()
        }

      return {
        curRow: {},
        roleBox: false,
@@ -62,13 +81,16 @@
        datetime: "",
        selectionList: [],
        option: {
                labelWidth: 96,
                searchLabelWidth: 96,
                searchShow: true,
                searchMenuSpan: 3,
                menuWidth: 210,

          height: "auto",
          calcHeight: 54,
          dialogWidth: 950,
          tip: false,
          searchShow: true,
          searchMenuSpan: 3,
          menuWidth: 280,
          border: true,
          // menu: false,
          //stripe:true,
@@ -93,18 +115,28 @@
              searchSpan: 4,
              search: true,
              hide: true,
            }, {
                                     },
                {
                    width: 100,
              span: 12,
              label: "名称",
              prop: "realName",
                    prop: "name",
              searchSpan: 4,
                    searchLabelWidth: 66,
              search: true,
            }, {
                    width: 120,
              span: 12,
              label: "电话",
                    label: "联系方式",
              prop: "phone",
              searchSpan: 4,
              search: true,
                    rules: [
                        {
                            validator: validatorPhone,
                            trigger: 'blur'
                        }
                    ],
            }, {
              span: 12,
              label: "外出事由",
@@ -113,11 +145,13 @@
              search: true,
            },
            {
                    width: 144,
              label: "创建时间",
              prop: "createTime",
              searchSpan: 4,
            },
            {
                    width: 100,
              addDisplay: false,
              editDisplay: false,
              viewDisplay: false,
@@ -137,10 +171,11 @@
              }]
            },
            {
                                      width: 110,
              label: "所属街道",
              // hide: true,
              searchSpan: 4,
              // search: true,
                                      search: true,
              parent: false,
              prop: "streetCode",
              type: "tree",
@@ -155,12 +190,13 @@
                trigger: "blur",
              }, ],
            }, {
                                      width: 156,
              // hide: true,
              parent: false,
              searchSpan: 4,
              label: "所属社区",
              prop: "neiCode",
              // search: true,
                                      search: true,
              type: "tree",
              dicUrl: "/api/blade-system/region/tree",
              props: {
@@ -174,11 +210,14 @@
                trigger: "blur",
              }, ],
            }, {
                                      width: 220,
                                      overHidden: true,
              label: "小区",
              prop: "aoiCode",
              searchSpan: 4,
              type: 'tree',
              // search: true,
                                      searchLabelWidth: 66,
                                      search: true,
              parent: false,
              dicUrl: `/api/blade-district/district/getDistrictTree`,
              props: {
@@ -187,9 +226,6 @@
              },
              // defaultExpandedKeys: ["361102003"],
              span: 12,
              labelWidth: 120,
              // width: 220,
              // overHidden: true,
              rules: [{
                required: true,
                message: "请选择小区",
@@ -199,26 +235,7 @@
              display: true,
              // hide: true,
            },
            // {
            //   addDisplay: false,
            //   editDisplay: false,
            //   viewDisplay: false,
            //   label: '类型',
            //   prop: 'reportType',
            //   type: 'radio',
            //   slot: true,
            //   // search: true,
            //   dicData: [{
            //     label: '取保候审',
            //     value: 1
            //   }, ]
            // },
            // {
            //   span: 12,
            //   label: "地址",
            //   prop: "addressName",
            //   searchSpan: 4,
            // },

          ],
        },
        data: [],
@@ -256,6 +273,31 @@
        })
        return ids.join(",")
      },

        showStatus () {
            return (data) => {
                let tags = {}

                if (data == 1) {
                    tags = {
                        type: 'warning',
                        text: '待审核'
                    }
                } else if (data == 2) {
                    tags = {
                        type: 'success',
                        text: '已审核'
                    }
                } else if (data == 3) {
                    tags = {
                        type: 'danger',
                        text: '未通过'
                    }
                }

                return tags
            }
        }
    },
    methods: {
      colseDetail() {

 src/views/publicSecurity/keynotePlaceManage.vue

@@ -1,18 +1,25 @@
<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">
            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-scope="scope" slot="menu">
        <el-button type="text" size="small" icon="el-icon-view" plain @click="lookDetail(scope.row,0)">查 看
            <template slot-scope="{row, size}" slot="menu">
                <el-button type="text" :size="size" icon="el-icon-view" plain @click="lookDetail(row, 0)">查 看
        </el-button>
        <el-button type="text" size="small" icon="el-icon-s-check" v-if="scope.row.status == 1" plain
          @click="lookDetail(scope.row,1)">审 核
                <el-button type="text" :size="size" icon="el-icon-s-check" v-if="row.status == 1" plain
                    @click="lookDetail(row, 1)">审 核
        </el-button>
        <el-button type="text" size="small" icon="el-icon-delete" plain @click="rowDel(scope.row)">删 除
                <el-button type="text" :size="size" icon="el-icon-delete" plain @click="rowDel(row)">删 除
        </el-button>
            </template>

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

    </avue-crud>
@@ -45,6 +52,19 @@

  export default {
    data() {

        //手机号格式校验
        let validatorPhone = function (rule, value, callback) {
            if (value) {
                if (!/^1[3456789]\d{9}$/.test(value)) {
                    callback(new Error('手机号格式有误！'))
                } else {
                    callback()
                }
            }
            callback()
        }

      return {
        taskType: 0,
        curRow: {},
@@ -62,13 +82,16 @@
        datetime: "",
        selectionList: [],
        option: {
                labelWidth: 96,
                searchLabelWidth: 96,
                searchShow: true,
                searchMenuSpan: 3,
                menuWidth: 210,

          height: "auto",
          calcHeight: 54,
          dialogWidth: 950,
          tip: false,
          searchShow: true,
          searchMenuSpan: 3,
          menuWidth: 280,
          // menu: false,
          border: true,
          //stripe:true,
@@ -78,15 +101,7 @@
          delBtn: false,
          selection: true,
          dialogClickModal: false,
          column: [
            // {
            //   span: 12,
            //   label: "场所名称",
            //   prop: "name",
            //   searchSpan: 4,
            //   search: true,
            // },
            {
                column: [ {
              span: 12,
              label: "社区",
              prop: "communityName",
@@ -102,46 +117,50 @@
              search: true,
              hide: true,
            },

            {
                    width: 110,
              span: 12,
              label: "名称",
              prop: "realName",
              searchSpan: 4,
                    searchLabelWidth: 66,
              search: true,
            }, {
                    width: 120,
              span: 12,
              label: "电话",
                    label: "联系方式",
              prop: "phone",
              searchSpan: 4,
              search: true,
            }, {
              addDisplay: false,
              editDisplay: false,
              viewDisplay: false,
              label: '类型',
              prop: 'reportType',
              type: 'radio',
              slot: true,
              search: true,
              searchSpan: 3,
              dicData: [{
                label: '旅馆安全',
                value: 2
              }, {
                label: '打金店',
                value: 3
              }, {
                label: '二手手机维修',
                value: 4
              }, {
                label: '二手车交易',
                value: 5
              }, {
                label: '校园安全',
                value: 6
              }]
            },
                    rules: [
            {
                            validator: validatorPhone,
                            trigger: 'blur'
                        }
                    ],
                }, {
                    overHidee: true,
                    span: 12,
                    label: "地址",
                    prop: "addressName",
                    searchSpan: 4,
                    // search: true,
                    rules: [{
                        required: true,
                        message: "请输入地址",
                        trigger: "blur",
                    },],
                }, {
                    width: 144,
                    label: "创建时间",
                    prop: "createTime",
                    searchSpan: 4,

                },

                {
                    width: 100,
              addDisplay: false,
              editDisplay: false,
              viewDisplay: false,
@@ -160,14 +179,10 @@
                value: 3
              }]
            }, {
              label: "创建时间",
              prop: "createTime",
              searchSpan: 4,

            }, {
                                      width: 110,
              label: "所属街道",
              // hide: true,
              // search: true,
                                      search: true,
              parent: false,
              searchSpan: 4,
              prop: "streetCode",
@@ -183,8 +198,9 @@
                trigger: "blur",
              }, ],
            }, {
                                      width: 156,
              // hide: true,
              // search: true,
                                      search: true,
              parent: false,
              searchSpan: 4,
              label: "所属社区",
@@ -202,8 +218,11 @@
                trigger: "blur",
              }, ],
            }, {
                                      width: 220,
                                      overHidee: true,
              // hide: true,
              // search: true,
                                      searchLabelWidth: 66,
                                      search: true,
              parent: false,
              searchSpan: 4,
              label: "小区",
@@ -221,16 +240,33 @@
                trigger: "blur",
              }, ],
            }, {
              span: 12,
              label: "地址",
              prop: "addressName",
                    width: 100,
                    addDisplay: false,
                    editDisplay: false,
                    viewDisplay: false,
                    label: '类型',
                    prop: 'reportType',
                    type: 'radio',
                    slot: true,
              searchSpan: 4,
              // search: true,
              rules: [{
                required: true,
                message: "请输入场所名称",
                trigger: "blur",
              }, ],
                    searchLabelWidth: 66,
                    search: true,
                    dicData: [{
                        label: '旅馆安全',
                        value: 2
                    }, {
                        label: '打金店',
                        value: 3
                    }, {
                        label: '二手手机维修',
                        value: 4
                    }, {
                        label: '二手车交易',
                        value: 5
                    }, {
                        label: '校园安全',
                        value: 6
                    }]
            },
          ],
        },
@@ -271,7 +307,30 @@
        })
        return ids.join(",")
      },
        showStatus () {
            return (data) => {
                let tags = {}

                if (data == 1) {
                    tags = {
                        type: 'warning',
                        text: '待审核'
                    }
                } else if (data == 2) {
                    tags = {
                        type: 'success',
                        text: '已审核'
                    }
                } else if (data == 3) {
                    tags = {
                        type: 'danger',
                        text: '未通过'
                    }
                }

                return tags
            }
        }
    },
    methods: {


 src/views/report/reportlist.vue

@@ -1,56 +1,32 @@
<template>
  <basic-container>
    <avue-crud :option="option"
               :table-loading="loading"
               :data="data"
               ref="crud"
               v-model="form"
               :page.sync="page"
               :permission="permissionList"
               @row-del="rowDel"
               @search-change="searchChange"
               @search-reset="searchReset"
               @selection-change="selectionChange"
               @current-change="currentChange"
               @size-change="sizeChange"
               @refresh-change="refreshChange"
               @on-load="onLoad">
        <avue-crud :option="option" :table-loading="loading" :data="data" ref="crud" v-model="form" :page.sync="page"
            :permission="permissionList" @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
                   @click="handleDelete">删 除
                <el-button type="danger" size="small" icon="el-icon-delete" plain @click="handleDelete">删 除
        </el-button>
      </template>
      <template slot-scope="scope" slot="menu">
        <el-button
          type="text"
          icon="el-icon-edit-outline"
          size="small"
          @click.stop="handleDesign(scope.row.name)"
          v-if="userInfo.role_name.includes('admin')"
        >设计
            <template slot-scope="{ row, size, index }" slot="menu">
                <el-button :size="size" type="text" icon="el-icon-edit-outline" @click.stop="handleDesign(row.name)"
                    v-if="userInfo.role_name.includes('admin')">设计
        </el-button>
        <el-button
          type="text"
          icon="el-icon-view"
          size="small"
          @click.stop="handlePreview(scope.row.name)"
          v-if="userInfo.role_name.includes('admin')"
        >预览
                <el-button :size="size" type="text" icon="el-icon-view" @click.stop="handlePreview(row.name)"
                    v-if="userInfo.role_name.includes('admin')">预览
        </el-button>
      </template>
      <template slot-scope="{row}" slot="name">
        <el-tag style="cursor:pointer" @click="handlePreview(row.name)">{{ row.name }}</el-tag>

            <template slot-scope="{row, size}" slot="name">
                <el-tag :size="size" style="cursor:pointer" @click="handlePreview(row.name)">{{ row.name }}</el-tag>
      </template>
    </avue-crud>
  </basic-container>
</template>

<script>
import {getList, remove} from "@/api/report/report";
import {mapGetters} from "vuex";
import { getList, remove } from "@/api/report/report"
import { mapGetters } from "vuex"

export default {
  data() {
@@ -65,11 +41,15 @@
        total: 0
      },
      option: {
                labelWidth: 96,
                searchLabelWidth: 96,
                searchShow: true,
                searchMenuSpan: 3,
                menuWidth: 240,

        height: 'auto',
        calcHeight: 30,
        tip: false,
        searchShow: true,
        searchMenuSpan: 6,
        border: true,
        index: true,
        selection: true,
@@ -79,6 +59,7 @@
          {
            label: "文件名",
            prop: "name",
                        searchSpan: 4,
            search: true,
            slot: true,
          },
@@ -93,7 +74,7 @@
        ]
      },
      data: []
    };
        }
  },
  computed: {
    ...mapGetters(["userInfo", "permission"]),
@@ -103,22 +84,22 @@
        viewBtn: false,
        delBtn: true,
        editBtn: false
      };
            }
    },
    ids() {
      let ids = [];
            let ids = []
      this.selectionList.forEach(ele => {
        ids.push(ele.id);
      });
      return ids.join(",");
                ids.push(ele.id)
            })
            return ids.join(",")
    }
  },
  methods: {
    handlePreview(name) {
      this.$router.push({path: `/myiframe/urlPath?name=preview-${name}&src=${this.website.reportUrl}/preview?_u=blade-${name}`});
            this.$router.push({ path: `/myiframe/urlPath?name=preview-${name}&src=${this.website.reportUrl}/preview?_u=blade-${name}` })
    },
    handleDesign(name) {
      this.$router.push({path: `/myiframe/urlPath?name=designer-${name}&src=${this.website.reportUrl}/designer?_u=blade-${name}`});
            this.$router.push({ path: `/myiframe/urlPath?name=designer-${name}&src=${this.website.reportUrl}/designer?_u=blade-${name}` })
    },
    rowDel(row) {
      this.$confirm("确定将选择数据删除?", {
@@ -127,37 +108,37 @@
        type: "warning"
      })
        .then(() => {
          return remove(row.id);
                    return remove(row.id)
        })
        .then(() => {
          this.onLoad(this.page);
                    this.onLoad(this.page)
          this.$message({
            type: "success",
            message: "操作成功!"
          });
        });
                    })
                })
    },
    searchReset() {
      this.query = {};
      this.onLoad(this.page);
            this.query = {}
            this.onLoad(this.page)
    },
    searchChange(params, done) {
      this.query = params;
      this.page.currentPage = 1;
      this.onLoad(this.page, params);
      done();
            this.query = params
            this.page.currentPage = 1
            this.onLoad(this.page, params)
            done()
    },
    selectionChange(list) {
      this.selectionList = list;
            this.selectionList = list
    },
    selectionClear() {
      this.selectionList = [];
      this.$refs.crud.toggleSelection();
            this.selectionList = []
            this.$refs.crud.toggleSelection()
    },
    handleDelete() {
      if (this.selectionList.length === 0) {
        this.$message.warning("请选择至少一条数据");
        return;
                this.$message.warning("请选择至少一条数据")
                return
      }
      this.$confirm("确定将选择数据删除?", {
        confirmButtonText: "确定",
@@ -165,39 +146,38 @@
        type: "warning"
      })
        .then(() => {
          return remove(this.ids);
                    return remove(this.ids)
        })
        .then(() => {
          this.onLoad(this.page);
                    this.onLoad(this.page)
          this.$message({
            type: "success",
            message: "操作成功!"
          });
          this.$refs.crud.toggleSelection();
        });
                    })
                    this.$refs.crud.toggleSelection()
                })
    },
    currentChange(currentPage) {
      this.page.currentPage = currentPage;
            this.page.currentPage = currentPage
    },
    sizeChange(pageSize) {
      this.page.pageSize = pageSize;
            this.page.pageSize = pageSize
    },
    refreshChange() {
      this.onLoad(this.page, this.query);
            this.onLoad(this.page, this.query)
    },
    onLoad(page, params = {}) {
      this.loading = true;
            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();
      });
                const data = res.data.data
                this.page.total = data.total
                this.data = data.records
                this.loading = false
                this.selectionClear()
            })
    }
  }
};
}
</script>

<style>
</style>
<style></style>

 src/views/resource/attach.vue

@@ -1,54 +1,27 @@
<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-del="rowDel"
               @search-change="searchChange"
               @search-reset="searchReset"
               @selection-change="selectionChange"
               @current-change="currentChange"
               @size-change="sizeChange"
               @refresh-change="refreshChange"
               @on-load="onLoad">
        <avue-crud :option="option" :table-loading="loading" :data="data" :page.sync="page" :permission="permissionList"
            :before-open="beforeOpen" v-model="form" ref="crud" @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="primary"
                   size="small"
                   plain
                   v-if="permission.attach_upload"
                   icon="el-icon-upload2"
                <el-button type="primary" size="small" plain v-if="permission.attach_upload" icon="el-icon-upload2"
                   @click="handleUpload">上 传
        </el-button>
        <el-button type="danger"
                   size="small"
                   icon="el-icon-delete"
                   plain
                   v-if="permission.attach_delete"
                <el-button type="danger" size="small" icon="el-icon-delete" plain v-if="permission.attach_delete"
                   @click="handleDelete">删 除
        </el-button>
      </template>
      <template slot-scope="scope" slot="menu">
        <el-button type="text"
                   icon="el-icon-download"
                   size="small"
                   v-if="permission.attach_download"
                   @click="handleDownload(scope.row)">下载
            <template slot-scope="{row, size}" slot="menu">
                <el-button :size="size" type="text" icon="el-icon-download" v-if="permission.attach_download"
                    @click="handleDownload(row)">下载
        </el-button>
      </template>
      <template slot-scope="{row}"
                slot="attachSize">
        <el-tag>{{`${row.attachSize} KB`}}</el-tag>
            <template slot-scope="{row, size}" slot="attachSize">
                <el-tag :size="size">{{ `${row.attachSize} KB` }}</el-tag>
      </template>
    </avue-crud>
    <el-dialog title="附件管理"
               append-to-body
               :visible.sync="attachBox"
               width="555px">
        <el-dialog title="附件管理" append-to-body :visible.sync="attachBox" width="555px">
      <avue-form ref="form" :option="attachOption" v-model="attachForm" :upload-after="uploadAfter">
      </avue-form>
    </el-dialog>
@@ -56,8 +29,8 @@
</template>

<script>
  import {getList, getDetail, remove} from "@/api/resource/attach";
  import {mapGetters} from "vuex";
import { getList, getDetail, remove } from "@/api/resource/attach"
import { mapGetters } from "vuex"

  export default {
    data() {
@@ -73,11 +46,15 @@
        attachBox: false,
        selectionList: [],
        option: {
                labelWidth: 96,
                searchLabelWidth: 96,
                searchShow: true,
                searchMenuSpan: 3,
                menuWidth: 140,

          height: 'auto',
          calcHeight: 30,
          tip: false,
          searchShow: true,
          searchMenuSpan: 6,
          border: true,
          index: true,
          viewBtn: true,
@@ -96,6 +73,7 @@
            {
              label: "附件域名",
              prop: "domainUrl",
                        searchSpan: 4,
              search: true,
              rules: [{
                required: true,
@@ -106,6 +84,7 @@
            {
              label: "附件名称",
              prop: "name",
                        searchSpan: 4,
              search: true,
              rules: [{
                required: true,
@@ -116,6 +95,7 @@
            {
              label: "附件原名",
              prop: "originalName",
                        searchSpan: 4,
              search: true,
              rules: [{
                required: true,
@@ -124,6 +104,7 @@
              }]
            },
            {
                        width: 100,
              label: "附件拓展名",
              prop: "extension",
              rules: [{
@@ -133,6 +114,7 @@
              }]
            },
            {
                        width: 100,
              label: "附件大小",
              prop: "attachSize",
              slot: true,
@@ -164,7 +146,7 @@
            }
          ]
        }
      };
        }
    },
    computed: {
      ...mapGetters(["permission"]),
@@ -174,28 +156,28 @@
          editBtn: false,
          viewBtn: false,
          delBtn: this.vaildData(this.permission.attach_delete, false)
        };
            }
      },
      ids() {
        let ids = [];
            let ids = []
        this.selectionList.forEach(ele => {
          ids.push(ele.id);
        });
        return ids.join(",");
                ids.push(ele.id)
            })
            return ids.join(",")
      }
    },
    methods: {
      handleUpload() {
        this.attachBox = true;
            this.attachBox = true
      },
      uploadAfter(res, done, loading, column) {
        window.console.log(column);
        this.attachBox = false;
        this.refreshChange();
        done();
            window.console.log(column)
            this.attachBox = false
            this.refreshChange()
            done()
      },
      handleDownload(row) {
        window.open(`${row.link}`);
            window.open(`${row.link}`)
      },
      rowDel(row) {
        this.$confirm("确定将选择数据删除?", {
@@ -204,20 +186,20 @@
          type: "warning"
        })
          .then(() => {
            return remove(row.id);
                    return remove(row.id)
          })
          .then(() => {
            this.onLoad(this.page);
                    this.onLoad(this.page)
            this.$message({
              type: "success",
              message: "操作成功!"
            });
          });
                    })
                })
      },
      handleDelete() {
        if (this.selectionList.length === 0) {
          this.$message.warning("请选择至少一条数据");
          return;
                this.$message.warning("请选择至少一条数据")
                return
        }
        this.$confirm("确定将选择数据删除?", {
          confirmButtonText: "确定",
@@ -225,64 +207,63 @@
          type: "warning"
        })
          .then(() => {
            return remove(this.ids);
                    return remove(this.ids)
          })
          .then(() => {
            this.onLoad(this.page);
                    this.onLoad(this.page)
            this.$message({
              type: "success",
              message: "操作成功!"
            });
            this.$refs.crud.toggleSelection();
          });
                    })
                    this.$refs.crud.toggleSelection()
                })
      },
      beforeOpen(done, type) {
        if (["edit", "view"].includes(type)) {
          getDetail(this.form.id).then(res => {
            this.form = res.data.data;
          });
                    this.form = res.data.data
                })
        }
        done();
            done()
      },
      searchReset() {
        this.query = {};
        this.onLoad(this.page);
            this.query = {}
            this.onLoad(this.page)
      },
      searchChange(params, done) {
        this.query = params;
        this.page.currentPage = 1;
        this.onLoad(this.page, params);
        done();
            this.query = params
            this.page.currentPage = 1
            this.onLoad(this.page, params)
            done()
      },
      selectionChange(list) {
        this.selectionList = list;
            this.selectionList = list
      },
      selectionClear() {
        this.selectionList = [];
        this.$refs.crud.toggleSelection();
            this.selectionList = []
            this.$refs.crud.toggleSelection()
      },
      currentChange(currentPage) {
        this.page.currentPage = currentPage;
            this.page.currentPage = currentPage
      },
      sizeChange(pageSize) {
        this.page.pageSize = pageSize;
            this.page.pageSize = pageSize
      },
      refreshChange() {
        this.onLoad(this.page, this.query);
            this.onLoad(this.page, this.query)
      },
      onLoad(page, params = {}) {
        this.loading = true;
            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();
        });
                const data = res.data.data
                this.page.total = data.total
                this.data = data.records
                this.loading = false
                this.selectionClear()
            })
      }
    }
  };
}
</script>

<style>
</style>
<style></style>

 src/views/resource/oss.vue

@@ -1,68 +1,43 @@
<template>
  <basic-container>
    <avue-crud :option="option"
               :table-loading="loading"
               :data="data"
               :page.sync="page"
               :permission="permissionList"
               v-model="form"
               ref="crud"
               @row-update="rowUpdate"
               @row-save="rowSave"
               @row-del="rowDel"
               :before-open="beforeOpen"
               @search-change="searchChange"
               @search-reset="searchReset"
               @selection-change="selectionChange"
               @current-change="currentChange"
               @size-change="sizeChange"
               @refresh-change="refreshChange"
               @on-load="onLoad">
        <avue-crud :option="option" :table-loading="loading" :data="data" :page.sync="page" :permission="permissionList"
            v-model="form" ref="crud" @row-update="rowUpdate" @row-save="rowSave" @row-del="rowDel"
            :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 type="danger"
                   size="small"
                   icon="el-icon-delete"
                   plain
                   v-if="permission.oss_delete"
                <el-button type="danger" size="small" icon="el-icon-delete" plain v-if="permission.oss_delete"
                   @click="handleDelete">删 除
        </el-button>
      </template>
      <template slot-scope="scope" slot="menu">
        <el-button type="text"
                   icon="el-icon-video-play"
                   size="small"
                   v-if="userInfo.role_name.includes('admin')"
                   @click="handleDebug(scope.row)">调试

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

            <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}"
                slot="category">
        <el-tag>{{row.categoryName}}</el-tag>
            <template slot-scope="{row, size}" slot="category">
                <el-tag :size="size">{{ row.categoryName }}</el-tag>
      </template>
    </avue-crud>
    <el-dialog title="对象存储上传调试"
               append-to-body
               :visible.sync="box"
               width="550px">

        <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} from "@/api/resource/oss";
  import {mapGetters} from "vuex";
  import func from "@/util/func";
import { getList, getDetail, add, update, remove, enable } from "@/api/resource/oss"
import { mapGetters } from "vuex"
import func from "@/util/func"

  export default {
    data() {
@@ -78,17 +53,19 @@
        },
        selectionList: [],
        option: {
                labelWidth: 120,
                searchLabelWidth: 96,
                searchShow: true,
                searchMenuSpan: 3,
                menuWidth: 350,

          height: 'auto',
          calcHeight: 30,
          tip: false,
          searchShow: true,
          searchMenuSpan: 6,
          border: true,
          index: true,
          viewBtn: true,
          selection: true,
          menuWidth: 350,
          labelWidth: 100,
          dialogWidth: 880,
          dialogClickModal: false,
          column: [
@@ -188,10 +165,10 @@
              display: false,
            },
            {
                        width: 100,
              label: "是否启用",
              prop: "status",
              span: 24,
              width: 80,
              align: "center",
              slot: true,
              addDisplay: false,
@@ -234,23 +211,23 @@
            },
          ]
        }
      };
        }
    },
    watch: {
      'form.category'() {
        const category = func.toInt(this.form.category);
            const category = func.toInt(this.form.category)
        this.$refs.crud.option.column.filter(item => {
          if (item.prop === "appId") {
            item.display = category === 4;
                    item.display = category === 4
          }
          if (item.prop === "region") {
            item.display = category === 4 || category === 5;
                    item.display = category === 4 || category === 5
          }
        });
            })
      },
      'debugForm.code'() {
        const column = this.findObject(this.debugOption.column, "backgroundUrl");
        column.action = `/api/blade-resource/oss/endpoint/put-file?code=${this.debugForm.code}`;
            const column = this.findObject(this.debugOption.column, "backgroundUrl")
            column.action = `/api/blade-resource/oss/endpoint/put-file?code=${this.debugForm.code}`
      }
    },
    computed: {
@@ -261,42 +238,42 @@
          viewBtn: this.vaildData(this.permission.oss_view),
          delBtn: this.vaildData(this.permission.oss_delete),
          editBtn: this.vaildData(this.permission.oss_edit)
        };
            }
      },
      ids() {
        let ids = [];
            let ids = []
        this.selectionList.forEach(ele => {
          ids.push(ele.id);
        });
        return ids.join(",");
                ids.push(ele.id)
            })
            return ids.join(",")
      }
    },
    methods: {
      rowSave(row, done, loading) {
        add(row).then(() => {
          this.onLoad(this.page);
                this.onLoad(this.page)
          this.$message({
            type: "success",
            message: "操作成功!"
          });
          done();
                })
                done()
        }, error => {
          window.console.log(error);
          loading();
        });
                window.console.log(error)
                loading()
            })
      },
      rowUpdate(row, index, done, loading) {
        update(row).then(() => {
          this.onLoad(this.page);
                this.onLoad(this.page)
          this.$message({
            type: "success",
            message: "操作成功!"
          });
          done();
                })
                done()
        }, error => {
          window.console.log(error);
          loading();
        });
                window.console.log(error)
                loading()
            })
      },
      rowDel(row) {
        this.$confirm("确定将选择数据删除?", {
@@ -305,32 +282,32 @@
          type: "warning"
        })
          .then(() => {
            return remove(row.id);
                    return remove(row.id)
          })
          .then(() => {
            this.onLoad(this.page);
                    this.onLoad(this.page)
            this.$message({
              type: "success",
              message: "操作成功!"
            });
          });
                    })
                })
      },
      searchReset() {
        this.query = {};
        this.onLoad(this.page);
            this.query = {}
            this.onLoad(this.page)
      },
      searchChange(params, done) {
        this.query = params;
        this.page.currentPage = 1;
        this.onLoad(this.page, params);
        done();
            this.query = params
            this.page.currentPage = 1
            this.onLoad(this.page, params)
            done()
      },
      selectionChange(list) {
        this.selectionList = list;
            this.selectionList = list
      },
      selectionClear() {
        this.selectionList = [];
        this.$refs.crud.toggleSelection();
            this.selectionList = []
            this.$refs.crud.toggleSelection()
      },
      handleEnable(row) {
        this.$confirm("是否确定启用这条配置?", {
@@ -339,33 +316,33 @@
          type: "warning"
        })
          .then(() => {
            return enable(row.id);
                    return enable(row.id)
          })
          .then(() => {
            this.onLoad(this.page);
                    this.onLoad(this.page)
            this.$message({
              type: "success",
              message: "操作成功!"
            });
            this.$refs.crud.toggleSelection();
          });
                    })
                    this.$refs.crud.toggleSelection()
                })
      },
      handleDebug(row) {
        this.box = true;
        this.debugForm.code = row.ossCode;
        this.debugForm.backgroundUrl = '';
            this.box = true
            this.debugForm.code = row.ossCode
            this.debugForm.backgroundUrl = ''
      },
      handleSubmit(form, done) {
        this.$message({
          type: "success",
          message: `获取到图片地址:[${form.backgroundUrl}]`
        });
        done();
            })
            done()
      },
      handleDelete() {
        if (this.selectionList.length === 0) {
          this.$message.warning("请选择至少一条数据");
          return;
                this.$message.warning("请选择至少一条数据")
                return
        }
        this.$confirm("确定将选择数据删除?", {
          confirmButtonText: "确定",
@@ -373,44 +350,44 @@
          type: "warning"
        })
          .then(() => {
            return remove(this.ids);
                    return remove(this.ids)
          })
          .then(() => {
            this.onLoad(this.page);
                    this.onLoad(this.page)
            this.$message({
              type: "success",
              message: "操作成功!"
            });
            this.$refs.crud.toggleSelection();
          });
                    })
                    this.$refs.crud.toggleSelection()
                })
      },
      beforeOpen(done, type) {
        if (["edit", "view"].includes(type)) {
          getDetail(this.form.id).then(res => {
            this.form = res.data.data;
          });
                    this.form = res.data.data
                })
        }
        done();
            done()
      },
      currentChange(currentPage) {
        this.page.currentPage = currentPage;
            this.page.currentPage = currentPage
      },
      sizeChange(pageSize) {
        this.page.pageSize = pageSize;
            this.page.pageSize = pageSize
      },
      refreshChange() {
        this.onLoad(this.page, this.query);
            this.onLoad(this.page, this.query)
      },
      onLoad(page, params = {}) {
        this.loading = true;
            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();
        });
                const data = res.data.data
                this.page.total = data.total
                this.data = data.records
                this.loading = false
                this.selectionClear()
            })
      }
    }
  };
}
</script>

 src/views/resource/sms.vue

@@ -1,68 +1,41 @@
<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">
        <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.sms_delete"
                <el-button type="danger" size="small" icon="el-icon-delete" plain v-if="permission.sms_delete"
                   @click="handleDelete">删 除
        </el-button>
      </template>
      <template slot-scope="scope" slot="menu">
        <el-button type="text"
                   icon="el-icon-video-play"
                   size="small"
                   v-if="userInfo.role_name.includes('admin')"
                   @click="handleDebug(scope.row)">调试

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

            <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}"
                slot="category">
        <el-tag>{{row.categoryName}}</el-tag>
            <template slot-scope="{row, size}" slot="category">
                <el-tag :size="size">{{ row.categoryName }}</el-tag>
      </template>
    </avue-crud>
    <el-dialog title="手机短信发送调试"
               append-to-body
               :visible.sync="box"
               width="550px">
        <el-dialog title="手机短信发送调试" append-to-body :visible.sync="box" width="550px">
      <avue-form :option="debugOption" v-model="debugForm" @submit="handleSend"/>
    </el-dialog>
  </basic-container>
</template>

<script>
  import {getList, getDetail, add, update, remove, enable, send} from "@/api/resource/sms";
  import {mapGetters} from "vuex";
  import func from "@/util/func";
import { getList, getDetail, add, update, remove, enable, send } from "@/api/resource/sms"
import { mapGetters } from "vuex"
import func from "@/util/func"

  export default {
    data() {
@@ -78,17 +51,19 @@
        },
        selectionList: [],
        option: {
                labelWidth: 96,
                searchLabelWidth: 96,
                searchShow: true,
                searchMenuSpan: 3,
                menuWidth: 350,

          height: 'auto',
          calcHeight: 30,
          tip: false,
          searchShow: true,
          searchMenuSpan: 6,
          border: true,
          index: true,
          viewBtn: true,
          selection: true,
          menuWidth: 350,
          labelWidth: 100,
          dialogWidth: 880,
          dialogClickModal: false,
          column: [
@@ -98,7 +73,7 @@
              value: 1,
              span: 24,
              width: 100,
              searchLabelWidth: 50,
                        searchLabelWidth: 66,
              row: true,
              dicUrl: "/api/blade-system/dict/dictionary?code=sms",
              props: {
@@ -108,6 +83,7 @@
              dataType: "number",
              slot: true,
              prop: "category",
                        searchSpan: 4,
              search: true,
              rules: [{
                required: true,
@@ -120,6 +96,7 @@
              prop: "smsCode",
              span: 24,
              width: 200,
                        searchSpan: 4,
              search: true,
              rules: [{
                required: true,
@@ -132,6 +109,8 @@
              prop: "templateId",
              span: 24,
              width: 200,
                        searchSpan: 4,
                        searchLabelWidth: 80,
              search: true,
              rules: [{
                required: true,
@@ -183,10 +162,10 @@
              }],
            },
            {
                        width: 100,
              label: "是否启用",
              prop: "status",
              span: 24,
              width: 80,
              align: "center",
              slot: true,
              addDisplay: false,
@@ -227,45 +206,45 @@
            },
          ]
        }
      };
        }
    },
    watch: {
      'form.category'() {
        const category = func.toInt(this.form.category);
            const category = func.toInt(this.form.category)
        this.$refs.crud.option.column.filter(item => {
          if (item.prop === "templateId") {
            if (category === 1) {
              item.label = "模版内容";
                        item.label = "模版内容"
            } else {
              item.label = "模版ID";
                        item.label = "模版ID"
            }
          }
          if (item.prop === "accessKey") {
            if (category === 1) {
              item.label = "apiKey";
                        item.label = "apiKey"
            } else if (category === 4) {
              item.label = "appId";
                        item.label = "appId"
            } else {
              item.label = "accessKey";
                        item.label = "accessKey"
            }
          }
          if (item.prop === "secretKey") {
            item.display = category !== 1;
                    item.display = category !== 1
            if (category === 4) {
              item.label = "appKey";
                        item.label = "appKey"
            } else {
              item.label = "secretKey";
                        item.label = "secretKey"
            }
          }
          if (item.prop === "regionId") {
            if (category === 3) {
              item.display = true;
              item.value = "cn-hangzhou";
                        item.display = true
                        item.value = "cn-hangzhou"
            } else {
              item.display = false;
                        item.display = false
            }
          }
        });
            })
      }
    },
    computed: {
@@ -276,42 +255,42 @@
          viewBtn: this.vaildData(this.permission.sms_view, false),
          delBtn: this.vaildData(this.permission.sms_delete, false),
          editBtn: this.vaildData(this.permission.sms_edit, false)
        };
            }
      },
      ids() {
        let ids = [];
            let ids = []
        this.selectionList.forEach(ele => {
          ids.push(ele.id);
        });
        return ids.join(",");
                ids.push(ele.id)
            })
            return ids.join(",")
      }
    },
    methods: {
      rowSave(row, done, loading) {
        add(row).then(() => {
          this.onLoad(this.page);
                this.onLoad(this.page)
          this.$message({
            type: "success",
            message: "操作成功!"
          });
          done();
                })
                done()
        }, error => {
          window.console.log(error);
          loading();
        });
                window.console.log(error)
                loading()
            })
      },
      rowUpdate(row, index, done, loading) {
        update(row).then(() => {
          this.onLoad(this.page);
                this.onLoad(this.page)
          this.$message({
            type: "success",
            message: "操作成功!"
          });
          done();
                })
                done()
        }, error => {
          window.console.log(error);
          loading();
        });
                window.console.log(error)
                loading()
            })
      },
      rowDel(row) {
        this.$confirm("确定将选择数据删除?", {
@@ -320,15 +299,15 @@
          type: "warning"
        })
          .then(() => {
            return remove(row.id);
                    return remove(row.id)
          })
          .then(() => {
            this.onLoad(this.page);
                    this.onLoad(this.page)
            this.$message({
              type: "success",
              message: "操作成功!"
            });
          });
                    })
                })
      },
      handleEnable(row) {
        this.$confirm("是否确定启用这条配置?", {
@@ -337,39 +316,39 @@
          type: "warning"
        })
          .then(() => {
            return enable(row.id);
                    return enable(row.id)
          })
          .then(() => {
            this.onLoad(this.page);
                    this.onLoad(this.page)
            this.$message({
              type: "success",
              message: "操作成功!"
            });
            this.$refs.crud.toggleSelection();
          });
                    })
                    this.$refs.crud.toggleSelection()
                })
      },
      handleDebug(row) {
        this.box = true;
        this.debugForm.code = row.smsCode;
            this.box = true
            this.debugForm.code = row.smsCode
      },
      handleSend(form, done, loading) {
        send(form.code, form.phones, form.params).then((res) => {
          this.$message({
            type: "success",
            message: "发送成功!"
          });
          done();
          window.console.log(res);
          this.box = false;
                })
                done()
                window.console.log(res)
                this.box = false
        }, error => {
          window.console.log(error);
          loading();
        });
                window.console.log(error)
                loading()
            })
      },
      handleDelete() {
        if (this.selectionList.length === 0) {
          this.$message.warning("请选择至少一条数据");
          return;
                this.$message.warning("请选择至少一条数据")
                return
        }
        this.$confirm("确定将选择数据删除?", {
          confirmButtonText: "确定",
@@ -377,62 +356,62 @@
          type: "warning"
        })
          .then(() => {
            return remove(this.ids);
                    return remove(this.ids)
          })
          .then(() => {
            this.onLoad(this.page);
                    this.onLoad(this.page)
            this.$message({
              type: "success",
              message: "操作成功!"
            });
            this.$refs.crud.toggleSelection();
          });
                    })
                    this.$refs.crud.toggleSelection()
                })
      },
      beforeOpen(done, type) {
        if (["edit", "view"].includes(type)) {
          getDetail(this.form.id).then(res => {
            this.form = res.data.data;
          });
                    this.form = res.data.data
                })
        }
        done();
            done()
      },
      searchReset() {
        this.query = {};
        this.onLoad(this.page);
            this.query = {}
            this.onLoad(this.page)
      },
      searchChange(params, done) {
        this.query = params;
        this.page.currentPage = 1;
        this.onLoad(this.page, params);
        done();
            this.query = params
            this.page.currentPage = 1
            this.onLoad(this.page, params)
            done()
      },
      selectionChange(list) {
        this.selectionList = list;
            this.selectionList = list
      },
      selectionClear() {
        this.selectionList = [];
        this.$refs.crud.toggleSelection();
            this.selectionList = []
            this.$refs.crud.toggleSelection()
      },
      currentChange(currentPage) {
        this.page.currentPage = currentPage;
            this.page.currentPage = currentPage
      },
      sizeChange(pageSize) {
        this.page.pageSize = pageSize;
            this.page.pageSize = pageSize
      },
      refreshChange() {
        this.onLoad(this.page, this.query);
            this.onLoad(this.page, this.query)
      },
      onLoad(page, params = {}) {
        this.loading = true;
            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();
        });
                const data = res.data.data
                this.page.total = data.total
                this.data = data.records
                this.loading = false
                this.selectionClear()
            })
      }
    }
  };
}
</script>


 src/views/task/reportForRepairs.vue

@@ -2,7 +2,7 @@
 * @Author: shuishen 1109946754@qq.com
 * @Date: 2023-12-14 17:10:00
 * @LastEditors: shuishen 1109946754@qq.com
 * @LastEditTime: 2024-01-06 15:01:25
 * @LastEditTime: 2024-01-09 18:59:37
 * @FilePath: \jczz_web\src\views\task\reportForRepairs.vue
 * @Description:
 *
@@ -12,16 +12,17 @@
<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="confirmFlag" slot-scope="{row}">
        <el-tag size="small" :type="showConfirmFlag(row.confirmFlag).type">
            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="confirmFlag" slot-scope="{row, size}">
                <el-tag :size="size" :type="showConfirmFlag(row.confirmFlag).type">
          {{ showConfirmFlag(row.confirmFlag).text }}
        </el-tag>
      </template>

      <template slot="expand" slot-scope="{row}">
            <template slot="expand" slot-scope="{row, size}">
        <el-timeline>
          <el-timeline-item v-for="(item, index) in timeLineData(row)" :key="index" :timestamp="item.createTime"
            :icon="item.icon" :color="item.color" :hide-timestamp="item.contentType == 3" placement="top">
@@ -66,24 +67,24 @@
        </el-timeline>
      </template>

      <template slot-scope="scope" slot="menu">
        <el-button v-if="permission.report_for_repairs_details" size="small" type="text" icon="el-icon-document-remove"
          @click="rowExpansion(scope.row)">
            <template slot-scope="{row, size, index}" slot="menu">
                <el-button :size="size" v-if="permission.report_for_repairs_details" type="text"
                    icon="el-icon-document-remove" @click="rowExpansion(row)">
          详情
        </el-button>

        <el-button v-if="permission.report_for_repairs_reply" size="small" type="text" icon="el-icon-chat-dot-square"
          :disabled="scope.row.confirmFlag === 3" @click="replyBtnClick(scope.row)">
                <el-button :size="size" v-if="permission.report_for_repairs_reply" type="text"
                    icon="el-icon-chat-dot-square" :disabled="row.confirmFlag === 3" @click="replyBtnClick(row)">
          回复
        </el-button>

        <el-button v-if="permission.report_for_repairs_turn_over" size="small" type="text" icon="el-icon-document-copy"
          :disabled="scope.row.confirmFlag === 3" @click="turnOverBtnClick(scope.row)">
                <el-button :size="size" v-if="permission.report_for_repairs_turn_over" type="text"
                    icon="el-icon-document-copy" :disabled="row.confirmFlag === 3" @click="turnOverBtnClick(row)">
          移交
        </el-button>

        <el-button v-if="permission.report_for_repairs_del" size="small" type="text" icon="el-icon-delete"
          @click="rowDel(scope.row)">
                <el-button :size="size" v-if="permission.report_for_repairs_del" type="text" icon="el-icon-delete"
                    @click="rowDel(row)">
          删除
        </el-button>
      </template>
@@ -99,9 +100,10 @@
      <avue-form ref="replyForm" :option="replyOption" v-model="replyForm" @submit="handleSubmit"
        @reset-change="handleReset">
        <template slot-scope="{row}" slot="videoList">
          <el-upload class="video-uploader" action="/api/blade-resource/oss/endpoint/put-file" :file-list="fileList"
            :headers="updateHeader" :show-file-list="true" :limit="1" :on-change="getFile" :on-exceed="handleExceed"
            :on-success="uploadVideoProcess" :before-upload="beforeUploadVideo" :before-remove="beforeRemove">
                    <el-upload class="video-uploader" action="/api/blade-resource/oss/endpoint/put-file"
                        :file-list="fileList" :headers="updateHeader" :show-file-list="true" :limit="1" :on-change="getFile"
                        :on-exceed="handleExceed" :on-success="uploadVideoProcess" :before-upload="beforeUploadVideo"
                        :before-remove="beforeRemove">
            <el-button size="small" type="primary">点击上传</el-button>
            <div slot="tip" class="el-upload__tip">上传视频只能是 mp4 格式，且大小不能超过 50MB</div>
          </el-upload>
@@ -163,6 +165,12 @@
        datetime: "",
        selectionList: [],
        option: {
                labelWidth: 96,
                searchLabelWidth: 96,
                searchShow: true,
                searchMenuSpan: 3,
                menuWidth: 280,

          viewBtn: false,
          editBtn: false,
          delBtn: false,
@@ -173,19 +181,19 @@
          calcHeight: 54,
          dialogWidth: 950,
          tip: false,
          searchShow: true,
          searchMenuSpan: 3,
          menuWidth: 272,
          border: true,
          //stripe:true,
          // excelBtn: true,
          dialogClickModal: false,
          column: [{
              width: 96,
                column: [
                    {
                        width: 100,
              label: "类型",
              prop: "type",
              span: 12,
                        searchLabelWidth: 66,
              searchSpan: 4,
                        search: true,
              dataType: "number",
              type: "select",
              dicUrl: "/api/blade-system/dict-biz/dictionary?code=reportForRepairsType",
@@ -193,23 +201,23 @@
                label: "dictValue",
                value: "dictKey",
              },
              search: true,
            },
            {
              width: 96,
                        width: 110,
              label: "姓名",
              prop: "realName",
              span: 12,
              searchSpan: 4,
                        searchLabelWidth: 66,
              search: true,
            },

            {
              width: 96,
                        width: 120,
              label: "手机号码",
              prop: "phone",
              search: true,
              searchSpan: 3,
                        searchSpan: 4,
              slot: true,
              rules: [{
                validator: validatorPhone,
@@ -234,23 +242,23 @@
              span: 24,
            },
            {
                        overHidden: true,
              label: "地点",
              prop: "addressName",
              overHidden: true
            },
            {
              width: 100,
                        label: "状态",
              addDisplay: false,
              editDisplay: false,
              slot: true,
              label: "状态",
              prop: "confirmFlag",
              overHidden: true
            },
            {
                        width: 144,
              label: "上报时间",
              prop: "createTime",
              width: 160,
              addDisplay: false,
              editDisplay: false,
              type: "date",
@@ -258,9 +266,9 @@
              valueFormat: "yyyy-MM-dd HH:mm:ss",
            },
            {
                        width: 144,
              label: "处理时间",
              prop: "confirmTime",
              width: 160,
              addDisplay: false,
              editDisplay: false,
              type: "date",