更新

Lou

2024-02-22 821672dbbd1a7f2be98d5e87a5f39c648ae721a7

更新

 src/api/system/user.js

@@ -138,3 +138,13 @@
    }
  })
}

export const getUserlnfoByDistrictlds = (districtIds) => {
  return request({
    url: '/api/blade-system/user/getUserInfoByDistrictIds',
    method: 'get',
    params: {
      districtIds,
    }
  })
}

 src/api/task/task.js

@@ -1,4 +1,4 @@
import request from '@/router/axios';
import request from '@/router/axios'

export const getList = (current, size, params) => {
  return request({
@@ -11,6 +11,19 @@
    }
  })
}

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

export const getBailReportingPage = (current, size, params) => {
  return request({
    url: '/api/blade-task/task/getBailReportingPage',

 src/views/article/components/deitDiscussion.vue

@@ -261,6 +261,7 @@
        },
        query: {},
        newData: {},
        articleRange: {},
      }
    },

@@ -274,12 +275,18 @@
      },

      searchReset() {
        if (this.articleRange) {
          this.query.districtId = this.newData.articleRange
        }
        this.query.articleId = this.articleId
        this.userPage.currentPage = 1
        this.getUserPage(this.userPage, this.query)
      },

      searchChange(params, done) {
        if (this.articleRange) {
          this.query.districtId = this.newData.articleRange
        }
        this.query = params
        this.query.articleId = this.articleId
        this.userPage.currentPage = 1
@@ -292,6 +299,8 @@
        this.articleId = newData.id
        this.query.level = 1
        this.query.articleId = this.articleId
        this.newData = newData
        this.query.districtId = newData.articleRange
        this.onLoad(this.userPage, this.query)
      },
      // initData(newData) {
@@ -415,13 +424,19 @@
        this.popupTableUserShow = true
        this.query = {}
        this.articleId = row.id
        let districtId
        if (type == 0) {
          this.newData = row
          districtId = this.newData.articleRange
          this.userParams = {
            articleId: row.id
            articleId: row.id,
            districtId: districtId
          }
        } else {
          districtId = this.newData.articleRange
          this.userParams = {
            topicsId: row.id
            topicsId: row.id,
            districtId: districtId
          }
        }
        this.getUserPage(this.userPage, this.userParams)

 src/views/article/components/discussionManageChild.vue

@@ -36,7 +36,7 @@
    getDetatils as getHouseholdDetail
  } from "@/api/userHouse/list/houseHold"


  import { getUserlnfoByDistrictlds  } from "@/api/system/user"

  export default {
    data() {
@@ -176,13 +176,15 @@
              display: false,
              label: "选择用户",
              prop: "userIds",
              type: 'select',
              tags: true,
              type: "tree",
              multiple: true,
              span: 12,
              offset: 8,
              remote: true,
              hide: true,
              row: true,
              dicUrl: `/api/blade-system/user/getUserlnfoByDistrictlds?districtlds=`,
              // dicUrl: `/api/blade-system/user/getUserlnfoByDistrictlds?districtlds={{}}`,
              props: {
                label: 'name',
                value: 'id',
@@ -298,20 +300,28 @@
        articleId: data.id
      }) {
        this.loading = true
        getListPd(1, 10, Object.assign(params, this.query)).then(res => {
          const data = res.data.data
          this.page.total = data.total
          this.disCussFrom = data.records[0]
          if (this.disCussFrom.userIds) {
            getPersonPublicSelect({
              id: this.disCussFrom.userIds
            }).then(res => {
        getUserlnfoByDistrictlds( data.articleRange).then(res=>{
              console.log(res);
              const column = this.findObject(this.option.column, "userIds")
              column.dicData = res.data.data
              this.loading = false
            })
          }
        })



        // getListPd(1, 10, Object.assign(params, this.query)).then(res => {
        //   const data = res.data.data
        //   this.page.total = data.total
        //   this.disCussFrom = data.records[0]
        //   if (this.disCussFrom.userIds) {
        //     getPersonPublicSelect({
        //       id: this.disCussFrom.userIds
        //     }).then(res => {
        //       const column = this.findObject(this.option.column, "userIds")
        //       column.dicData = res.data.data
        //       this.loading = false
        //     })
        //   }
        // })
      }
    }
  }

 src/views/article/discussionManage.vue

@@ -1,10 +1,9 @@
<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">删
                    除
@@ -24,13 +23,11 @@
                    参与用户
                </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>
@@ -190,7 +187,7 @@
                },
                {
                    width: 110,
                    label: "文章类型",
              label: "议事类型",
                    prop: "articleType",
                    addDisplay: true,
                    editDisplay: true,
@@ -206,29 +203,29 @@
                    type: "tree",
                    rules: [{
                        required: true,
                        message: "请选择文章类型",
                message: "请选择议事类型",
                        trigger: "blur",
                    },],
                },
                {
                    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",
                    },],
                },
            // {
            //   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: "发布时间",
@@ -236,6 +233,10 @@
                    type: "date",
                    format: "yyyy-MM-dd",
                    valueFormat: "yyyy-MM-dd HH:mm:ss",
              search: true,
              addDisplay: false,
              editDisplay: false,
              viewDisplay: false,
                },
                {
                    width: 100,
@@ -528,7 +529,7 @@
            }
            // 类型  0:文章 1经营性收支，2：物业招标 3:公益报名 4：选举调查
            row.type = 4
            row.publish = 1
        // row.publish = 1

            add(row).then(
                () => {
@@ -684,6 +685,7 @@
                this.page.total = data.total
                this.data = data.records
                this.data.forEach(item => {
            // item.articleRange = JSON.parse(item.articleRange)
                    if (item.url.length > 0) {
                        var urls = []
                        var names = item.url.split(",")

 src/views/property/companyManage.vue

@@ -1,11 +1,9 @@
<!-- 物业公司管理 -->
<template>
    <basic-container>
        <div class="basic-info">
            <avue-form :option="wyOption" v-model="wyForm"></avue-form>
        </div>
    <basic-container class="basic-container-box">
        <div class="detail-container">
            <el-tabs v-model="activeName" @tab-click="handleClick">
                <el-tab-pane label="公司管理" name="info0"></el-tab-pane>
                <el-tab-pane label="基础信息" name="info1"></el-tab-pane>
                <el-tab-pane label="经营信息" name="info2"></el-tab-pane>
                <el-tab-pane label="纳税信息" name="info3"></el-tab-pane>
@@ -14,7 +12,10 @@
                <el-tab-pane label="项目良好行为" name="info6"></el-tab-pane>
                <el-tab-pane label="违法违规行为惩戒" name="info7"></el-tab-pane>
            </el-tabs>
            <div class="answer">
            <div class="basic-info" v-show="activeName == 'info0'">
                <avue-form :option="wyOption" v-model="wyForm"></avue-form>
            </div>
            <div class="answer" v-show="activeName != 'info0'">
                <div class="topic-item" v-for="(item, index) in questionBankData" :key="index">
                    <div class="topic-title">
                        {{ index + 1 }} .{{ item.subjectName }}
@@ -129,7 +130,7 @@
                }]
            },
            wyForm: {},
            activeName: 'info1',
            activeName: 'info0',
            questionBankData: [],
            page: {
                pageSize: 20,
@@ -188,18 +189,18 @@
            })
        },

        // 保持题目
        // 保存题目
        saveQuestionBank () {
            let isChoose = false
            this.questionBankData.forEach(item => {
                if (item.chooseId) {
                    isChoose = true
                }
            })
            if (isChoose == false) return
            save(this.questionBankData).then(
                () => {
                    // this.$message({
                    //   type: "success",
                    //   message: "操作成功!",
                    // })
                    // this.questionBankOnLoad(this.page, param = {
                    //   subclassName: this.activeName,
                    //   propertyId: this.wyForm.id
                    // })
                    //  取消提示避免重复
                },
                (error) => {
                    window.console.log(error)
@@ -209,6 +210,7 @@

        // 点击tab切换
        handleClick (tab) {
            if (tab.label == '公司管理') return
            let param = {
                subclassName: tab.label,
                propertyId: this.wyForm.id
@@ -224,18 +226,36 @@
            this.saveBasicInfo()
            // 保持考试信息
            this.saveQuestionBank()
        },
        }
    }
}
</script>

<style lang="scss" scoped>
.basic-container-box {
    height: 100%;

    :deep(.basic-container__card),
    :deep(.el-card__body) {
        height: 98%;
    }

    .detail-container {
        height: calc(100% - 100px);
    }
}


:deep(.answer) {
    height: calc(100% - 60px);
    overflow-y: scroll;

    .topic-item {
        margin-bottom: 20px;

        .topic-title {
            margin-bottom: 10px;
            font-size: 14px;
        }

        .topic-options {
@@ -253,6 +273,7 @@
                    display: flex;
                    align-items: center;
                    margin-right: 6px;
                    font-size: 14px;
                }
            }
        }
@@ -262,6 +283,6 @@
.submit-btn {
    display: flex;
    justify-content: center;
    margin-bottom: 30px;
    margin: 20px;
}
</style>

 src/views/property/propertyCapitalApply.vue

@@ -317,10 +317,10 @@
              hide: true,
              parent: false,
              label: "议事标题",
              prop: "districtId",
              prop: "",
              search: false,
              type: 'select',
              dicUrl: `/api/blade-district/district/getDistrictTree?filterFlag=1`,
              dicUrl: "",
              props: {
                label: "name",
                value: "id"

 src/views/propertySupervision/propertyCapitalManage.vue

@@ -199,12 +199,12 @@
        },
        handleWork (row) {
            this.$router.push({
                path: `/work/process/${flowRoute(this.flowRoutes, row.category)}/handle/${row.taskId}/${row.processInstanceId}/${row.businessId}`
          path: `/property/process/${flowRoute(this.flowRoutes, row.category)}/handle/${row.taskId}/${row.processInstanceId}/${row.businessId}`
            })
        },
        handleDetail (row) {
            this.$router.push({
                path: `/work/process/${flowRoute(this.flowRoutes, row.category)}/detail/${row.processInstanceId}/${row.businessId}`
          path: `/property/process/${flowRoute(this.flowRoutes, row.category)}/detail/${row.processInstanceId}/${row.businessId}`
            })
        },
        handleImage (row) {

 src/views/publicSecurity/keynotePlaceManage.vue

@@ -7,15 +7,18 @@
            @refresh-change="refreshChange" @on-load="onLoad">

            <template slot-scope="{row, size}" slot="menu">
                <el-button type="text" :size="size" icon="el-icon-view" v-if="permission.place_view" plain
                <!-- <el-button type="text" :size="size" icon="el-icon-view" v-if="permission.place_view" plain
                    @click="lookDetail(row, 0)">查 看
                </el-button> -->
                <el-button type="text" :size="size" plain @click.stop="getDetail(row)">
                    详情
                </el-button>
                <el-button type="text" :size="size" icon="el-icon-s-check" v-if="permission.place_check && row.status == 1"
                    plain @click=" goAudit(row)">审 核
                <el-button type="text" :size="size" icon="el-icon-s-check" v-if="permission.place_check"
                    :disabled="row.status != 1" plain @click=" goAudit(row)">审 核
                </el-button>
                <el-button type="text" :size="size" icon="el-icon-delete" v-if="permission.place_del" plain
                <!-- <el-button type="text" :size="size" icon="el-icon-delete" v-if="permission.place_del" plain
                    @click="rowDel(row)">删 除
                </el-button>
                </el-button> -->
            </template>

            <template slot="status" slot-scope="{row, size}">
@@ -24,9 +27,13 @@
                </el-tag>
            </template>

            <template slot-scope="{row, size}" slot="phone">
                <el-button :size="size" type="text" @click="showStringDispose(row, 'phoneflag')"
                    v-text="textDispose(row, 'phoneflag', 'phone')">
            <template slot-scope="{row, size}" slot="principalPhone">
                <el-button :size="size" type="text" @click="showStringDispose(row, 'principalPhoneflag')"
                    v-text="textDispose(row, 'principalPhoneflag', 'principalPhone')">
                </el-button>
            </template>
            <template slot="menuLeft">
                <el-button type="warning" size="small" plain icon="el-icon-download" @click="handleExport">导出
                </el-button>
            </template>
        </avue-crud>
@@ -40,14 +47,97 @@

        <el-dialog :visible.sync="visible" append-to-body destroy-on-close title="审核" width="30%"
            custom-class="flow-design-dialog" :before-close="handleClose">
            <audit-base @handleSubmit="submitAudit" @handleReset="submitAudit"></audit-base>
            <audit-base @handleSubmit="submitAudit"></audit-base>
        </el-dialog>
        <el-drawer title="巡查详情" :visible.sync="isDetail" :append-to-body="true" size="40%" direction="rtl">
            <div class="title">
                <div class="icon">{{ refreshNum }}</div>
                基础信息
            </div>
            <div class="basic-info">
                <div class="info-item">
                    <div class="info-name">场所名称</div>
                    <div class="info-value">{{ rowDetail.placeName }}</div>
                </div>
                <div class="info-item">
                    <div class="info-name">场所类型</div>
                    <div class="info-value">{{ rowDetail.nineTypeName }}</div>
                </div>
                <div class="info-item">
                    <div class="info-name">检查人</div>
                    <div class="info-value">{{ rowDetail.name }}</div>
                </div>
                <div class="info-item">
                    <div class="info-name">检查时间</div>
                    <div class="info-value">{{ rowDetail.createTime }}</div>
                </div>
            </div>
            <div class="title">
                <div class="icon"></div>
                检查记录
            </div>

            <div class="question-list" v-for="(tItem, tIndex) in rowDetail.qTypeList" :key='tIndex'>
                <div class="question-type" @click="flodQL(tIndex)">
                    <div class="type-name">
                        {{ CNNum[tIndex] }}、{{ tItem.questionName }}
                    </div>
                    <div class="icon-box"><i class="el-icon-arrow-down" v-show="tItem.isShowQList"></i><i
                            class="el-icon-arrow-up" v-show="!tItem.isShowQList"></i></div>
                </div>
                <div class="question-item" v-for="(item, index) in tItem.questionList" :key='index'
                    v-show="tItem.isShowQList">
                    <div class="question-name">
                        <div class="key">{{ index + 1 }}、{{ item.itemsNameTitle }}</div>
                        <div class="value"><el-radio v-model="radio" label="1" disabled>存在</el-radio>
                            <el-radio v-model="radio" label="2" disabled>不存在</el-radio>
                        </div>
                    </div>
                    <div class="yh-pic-box">
                        <div class="yh-pic-name">
                            隐患图片
                        </div>
                        <div class="yh-pic-list">
                            <div class="pic-item" v-for="pic in item.imageUrlsList">
                                <el-image style="width: 100px; height: 100px" :src="pic" :fit="fit"></el-image>
                            </div>
                        </div>
                    </div>
                    <div class="yh-remark">
                        <div class="yh-remark-name">
                            隐患描述
                        </div>
                        <div class="yh-remark-value">
                            {{ item.remark }}
                        </div>
                    </div>
                    <div class="yh-pic-box">
                        <div class="yh-pic-name">
                            整改后图片
                        </div>
                        <div class="yh-pic-list">
                            <div class="pic-item" v-for="pic in item.rectificationImageUrlsList">
                                <el-image style="width: 100px; height: 100px" :src="pic" :fit="fit"></el-image>
                            </div>
                        </div>
                    </div>
                    <div class="yh-remark">
                        <div class="yh-remark-name">
                            整改后描述
                        </div>
                        <div class="yh-remark-value">
                            {{ item.rectificationRemark }}
                        </div>
                    </div>
                </div>
            </div>
        </el-drawer>
    </basic-container>
</template>

<script>
import {
    getList,
    getTaskPlaceSelfCheckList,
    removeTask,
    update,
    add,
@@ -60,6 +150,21 @@
    applyTaskExamine
} from "@/api/publicSecurity/keynoteManage"
import website from '@/config/website'
import NProgress from 'nprogress'
import 'nprogress/nprogress.css'
import Qs from "qs"
import {
    exportBlob
} from "@/api/common"
import {
    getToken
} from '@/util/auth'
import {
    downloadXls
} from "@/util/util"
import {
    dateNow
} from "@/util/date"
import campusReporting from './components/campusReporting'
import hotelReporting from './components/hotelReporting'
import labelReporting from './components/labelReporting'
@@ -79,6 +184,9 @@
        }

        return {
            isDetail: false,
            refreshNum: 1,
            rowDetail: [],
            auditRules: {
                status: [{ required: true, message: "必填" }],
                remark: [{ required: true, message: "必填" }],
@@ -97,154 +205,139 @@
                currentPage: 1,
                total: 0,
            },
            datetime: "",
            selectionList: [],
            option: {
                labelWidth: 96,
                labelWidth: 120,
                searchLabelWidth: 96,
                searchShow: true,
                searchMenuSpan: 3,
                menuWidth: 190,
                menuWidth: 200,
                // menu: false,
                height: "auto",
                calcHeight: 54,
                dialogWidth: 950,
                tip: false,
                // menu: false,
                border: true,
                addBtn: false,
                delBtn: false,
                //stripe:true,
                index: true,
                // viewBtn: true,
                editBtn: false,
                delBtn: false,
                selection: true,
                header: false,
                viewBtn: false,
                // selection: true,
                excelBtn: false,
                refreshBtn: false,
                searchShowBtn: false,
                columnBtn: false,
                dialogClickModal: false,
                column: [{
                    span: 12,
                    label: "社区",
                    prop: "communityName",
                column: [
                    {
                        label: "场所名称",
                        prop: "placeName",
                        span: 24,
                        row: true,
                        searchSpan: 4,
                        search: true,
                        align: 'center'
                    },
                    {
                        label: "场所地址",
                        prop: "location",
                        span: 24,
                        row: true,
                    searchSpan: 4,
                    searchLabelWidth: 46,
                    search: true,
                    hide: true,
                    align: 'center'
                },
                {
                    width: 110,
                    span: 12,
                    label: "场所负责人",
                    prop: "realName",
                    searchSpan: 4,
                    searchLabelWidth: 100,
                    search: true,
                        overHidden: true,
                    align: 'center'
                }, {
                    width: 120,
                    span: 12,
                    label: "联系方式",
                    prop: "phone",
                    searchSpan: 4,
                    search: true,
                    slot: true,
                    rules: [{
                        validator: validatorPhone,
                        trigger: 'blur'
                    }],
                    align: 'center'
                }, {
                    overHidee: true,
                    span: 12,
                    label: "地址",
                    prop: "addressName",
                    searchSpan: 4,
                    // search: true,
                    rules: [{
                        required: true,
                        message: "请输入地址",
                        trigger: "blur",
                    },],
                    align: 'center'
                }, {
                    width: 110,
                    label: "所属街道",
                    // hide: true,
                    // search: true,
                    parent: false,
                        prop: "streetName",
                        span: 24,
                        row: true,
                    searchSpan: 4,
                    prop: "streetCode",
                    type: "tree",
                    dicUrl: "/api/blade-system/region/getTownTree",
                    props: {
                        label: "name",
                        value: "id"
                    },
                    rules: [{
                        required: true,
                        message: "请选择所属街道",
                        trigger: "blur",
                    },],
                        search: true,
                    align: 'center'
                }, {
                    width: 156,
                    // hide: true,
                    parent: false,
                    searchSpan: 4,
                    label: "所属社区",
                    prop: "neiCode",
                    // search: false,
                    type: "tree",
                    dicUrl: "/api/blade-system/region/tree",
                    props: {
                        label: "name",
                        value: "id",
                    },
                    rules: [{
                        required: true,
                        message: "请选择所属社区",
                        trigger: "blur",
                    },],
                    align: 'center'
                }, {
                    label: "九小场所类型",
                    prop: "nineType",
                    dicUrl: "/api/blade-system/dict-biz/tree?code=nineType",
                    props: {
                        label: "title",
                        value: "key",
                    },
                    // type: 'select',
                    // search: true,
                    align: 'center',
                    width: 120,
                },
                {
                    width: 100,
                    addDisplay: false,
                    editDisplay: false,
                    viewDisplay: false,
                    label: '审核状态',
                    prop: 'status',
                    type: 'radio',
                    slot: true,
                    dicData: [{
                        label: '待审核',
                        value: 1
                    }, {
                        label: '已审核',
                        value: 2
                    }, {
                        label: '未通过',
                        value: 3
                    }, {
                        label: '待接收',
                        value: 4
                    }],
                        label: "所属社区",
                        prop: "communityName",
                        span: 24,
                        row: true,
                        searchSpan: 4,
                        search: true,
                        width: 160,
                        overHidden: true,
                    align: 'center'
                }],
                    },
                    {
                        label: "所属网格",
                        prop: "gridName",
                        span: 24,
                        row: true,
                        searchSpan: 4,
                        search: true,
                        align: 'center'
                    },
                    {
                        label: "场所隐患",
                        prop: "remark",
                        span: 24,
                        row: true,
                        searchSpan: 4,
                        align: 'center'
                    },
                    {
                        label: "场所负责人",
                        prop: "principal",
                        span: 24,
                        row: true,
                        searchSpan: 4,
                        search: true,
                        align: 'center'
                    },
                    {
                        label: "场所负责人电话",
                        prop: "principalPhone",
                        span: 24,
                        row: true,
                        slot: true,
                        searchSpan: 4,
                        align: 'center'
                    },
                    {
                        width: 110,
                        label: "签名",
                        prop: "signaturePath",
                        type: "upload",
                        listType: "picture-img",
                        span: 24,
                        align: 'center'
                    },
                    {
                        width: 110,
                        label: "审核状态",
                        prop: "status",
                        span: 24,
                        align: 'center',
                        slot: true,
                    },
                    {
                        label: "创建时间",
                        prop: "createTime",
                        span: 24,
                        row: true,
                        searchSpan: 4,
                        searchLabelWidth: 46,
                        align: 'center'
                    },
                ],
            },
            data: [],

            auditBasePopup: false,
            questionTypeList: [],
            CNNum: ['一', '二', '三', '四', '五', '六', '七', '八', '九', '十', '十一', '十二', '十三', '十四', '十五'],
            nineTypeList: []
        }
    },

@@ -323,6 +416,91 @@
        }
    },
    methods: {
        // 点击展开收缩
        flodQL (index) {
            this.rowDetail.qTypeList[index].isShowQList = !this.rowDetail.qTypeList[index].isShowQList
            this.refreshNum += 1
        },

        // 对数组按属性分组
        groupBy (arr, key) {
            return arr.reduce((acc, curr) => {
                (acc[curr[key]] = acc[curr[key]] || []).push(curr)
                return acc
            }, {})
        },

        // 九小类型转换
        switchNineType (type) {
            return this.nineTypeList.find(item => item.key === type) ? this.nineTypeList.find(item => item.key === type).title : ''
        },

        getDetail (row) {
            if (row.patrolRecordVOList) {
                row.patrolRecordVOList.forEach(item => {
                    item.imageUrlsList = []
                    item.rectificationImageUrlsList = []
                    if (item.imageUrls) {
                        item.imageUrlsList = item.imageUrls.split(',').map(ele => {
                            return website.minioUrl + ele
                        })

                    }
                    if (item.rectificationImageUrls) {
                        item.rectificationImageUrlsList = item.rectificationImageUrls.split(',').map(ele => {
                            return website.minioUrl + ele
                        })
                    }
                    // 查询问题类型
                    this.questionTypeList.forEach(qItem => {
                        qItem.children.forEach(qChild => {
                            if (qChild.id == item.itemId) {
                                item.qType = qItem.title
                                item.itemsNameTitle = qChild.title
                            }
                        })
                    })
                })
            }
            if (row.patrolRecordVOList) {
                // 把相同类型问题分组
                let obj = this.groupBy(row.patrolRecordVOList, 'qType')
                let arr = Object.entries(obj)
                let newArr = []
                arr.forEach(part => {
                    newArr.push({ questionName: part[0], questionList: part[1], isShowQList: true })
                })
                row.qTypeList = newArr
            }
            // 九小类型转换
            row.nineTypeName = this.switchNineType(row.nineType)
            this.rowDetail = row
            this.isDetail = true
        },

        handleExport () {
            this.$message.warning('正在开发中..')
            // this.$confirm("是否导出场所检查数据?", "提示", {
            //     confirmButtonText: "确定",
            //     cancelButtonText: "取消",
            //     type: "warning"
            // }).then(() => {
            //     NProgress.start()
            //     var data = {
            //         ...this.query
            //     }
            //     // data.isNine = 1
            //     data = Qs.stringify(data)
            //     exportBlob(
            //         `/api/blade-placeCheck/placeCheck/export-placeCheck?${this.website.tokenHeader}=${getToken()}&` + data
            //     ).then(res => {
            //         console.log('exportBlob', res)
            //         downloadXls(res.data, `场所检查${dateNow()}.xlsx`)
            //         NProgress.done()
            //     })
            // })
        },

        showStringDispose (row, type) {
            row[type] = !row[type]
        },
@@ -340,9 +518,11 @@
        // 确认提交审核
        submitAudit (form) {
            let auditForm = {
                status: form.status == 1 ? 2 : 3,
                remark: form.confirmNotion
                status: form.status == '1' ? '2' : '3',
                remark: form.confirmNotion,
                reportType: 2
            }

            applyTaskExamine(Object.assign(this.auditParams, auditForm)).then(res => {
                if (res.data.code == 200) {
                    this.$message.warning("审核成功")
@@ -355,7 +535,7 @@
        // 审核按钮
        goAudit (row) {
            this.auditParams = {
                id: row.id,
                id: row.taskId,
                reportType: row.reportType
            }
            this.visible = true
@@ -579,37 +759,35 @@
        },
        onLoad (page, params = {}) {
            const {
                dateTime
            } = this.query
            let values = {
                ...params,
            }
            // if (dateTime) {
            //   values = {
            //     ...params,
            //     startTime: dateTime[0],
            //     endTime: dateTime[1],
            //     ...this.query,
            //   }
            //   values.dateTime = null
            // }
            values.reportType = 2

            this.loading = true
            getList(page.currentPage, page.pageSize, values).then((res) => {
                const data = res.data.data
                this.page.total = data.total
                this.data = data.records
                this.data.forEach(item => {
                    this.$set(item, 'phoneflag', false)
                    if (item.imageUrls && item.imageUrls != '' && item.imageUrls != null && item.imageUrls.length) {
            getTaskPlaceSelfCheckList(page.currentPage, page.pageSize, values).then((res) => {
                const data = {
                    ...res.data.data,
                    records: res.data.data.records.map(item => {
                        return {
                            ...item,
                            'createTime': item.createTime.slice(0, 16),
                            'principalPhoneflag': false,
                        }
                    })
                }
                data.records.forEach(item => {
                    if (item.signaturePath.length > 0) {
                        var urls = []
                        var names = item.imageUrls.split(",").filter(item => item != '')
                        var names = item.signaturePath.split(",")
                        names.forEach(name => {
                            urls.push(website.minioUrl + name)
                        })
                        item.imageUrls = urls.join(",")
                        item.signaturePath = urls.join(",")
                    }
                })
                this.page.total = data.total
                this.data = data.records
                this.loading = false
                this.selectionClear()
            })
@@ -621,6 +799,11 @@
<style lang="scss" scoped>
:deep(.cur-container-box) {
    padding: 0;
}

:deep(.el-button--text) {
    border: 0;
    background: transparent !important;
}

.avue-upload__icon {
@@ -649,4 +832,120 @@
        justify-content: center;
    }
}

.title {
    margin: 10px;
    height: 40px;
    background-color: #eee;
    display: flex;
    align-items: center;

    .icon {
        width: 4px;
        height: 18px;
        background-color: #409dfe;
        margin: 0 10px;
        color: transparent;
    }
}

.basic-info {
    padding: 0 20px;
    font-size: 14px;

    .info-item {
        display: flex;
        padding: 10px;

        .info-name {
            width: 100px;
            display: flex;
            align-items: center;
        }

        .info-value {
            display: flex;
            align-items: center;
        }
    }
}

.question-list {
    padding: 0 20px;
    font-size: 14px;

    .question-type {
        height: 60px;
        display: flex;
        align-items: center;
        cursor: pointer;
        justify-content: space-between;
        padding-right: 20px;

        .type-name {}

        .icon-box {}
    }

    .question-item {
        margin-bottom: 20px;
        padding: 10px;
        background: #f5f7fa;
        border-radius: 8px;

        &>div {
            margin: 14px 0;
        }

        .question-name {
            display: flex;

            .key {
                width: 80%;
                padding-right: 20px;
                word-break: break-all;
            }

            .value {
                width: 20%;
                display: flex;
                align-items: center;
                justify-content: center;
            }
        }

        .yh-pic-box {
            display: flex;
            height: 100px;

            .yh-pic-name {
                width: 100px;
                display: flex;
                align-items: center;
                justify-content: left;
            }

            .yh-pic-list {
                width: 0;
                flex: 1;
                display: flex;
            }
        }

        .yh-remark {
            display: flex;

            .yh-remark-name {
                width: 100px;
                display: flex;
                align-items: center;
                justify-content: left;
            }

            .yh-remark-value {
                word-break: break-all;
            }
        }
    }
}
</style>

 src/views/publicSecurity/ninePlaceManage/patrolRecord.vue

@@ -433,6 +433,7 @@
                    })
                })
            }
            if (row.patrolRecordVOList) {
            // 把相同类型问题分组
            let obj = this.groupBy(row.patrolRecordVOList, 'qType')
            let arr = Object.entries(obj)
@@ -441,6 +442,7 @@
                newArr.push({ questionName: part[0], questionList: part[1], isShowQList: true })
            })
            row.qTypeList = newArr
            }
            // 九小类型转换
            row.nineTypeName = this.switchNineType(row.nineType)
            this.rowDetail = row

 src/views/publicSecurity/ninePlaceManage/situationRectification.vue

@@ -23,7 +23,7 @@
                <el-button icon="el-icon-detail" :size="size" :type="type" @click.stop="getDetail(row)">
                    详情
                </el-button>
                <el-button icon="el-icon-detail" :size="size" :type="type" @click.stop="goAudit(row)"
                <el-button icon="el-icon-s-check" :size="size" :type="type" @click.stop="goAudit(row)"
                    :disabled="row.status != 1">审核</el-button>
            </template>
        </avue-crud>
@@ -123,21 +123,7 @@
        <!-- 审核弹窗 -->
        <el-dialog :visible.sync="visible" append-to-body destroy-on-close title="审核" width="30%"
            custom-class="flow-design-dialog" :before-close="handleClose">
            <el-form ref="auditForm" :model="auditForm" :rules="auditRules">
                <el-form-item label="审核结论：" prop="status">
                    <el-radio-group v-model="auditForm.status">
                        <el-radio :label="2">通过</el-radio>
                        <el-radio :label="3">不通过</el-radio>
                    </el-radio-group>
                </el-form-item>
                <el-form-item label="不通过原因：" prop="reasonFailure" v-if="auditForm.status == 3">
                    <el-input type="textarea" v-model="auditForm.reasonFailure"></el-input>
                </el-form-item>
            </el-form>
            <div style="display:flex;justify-content:center">
                <el-button @click="submitAudit" size="small" type="primary">保 存</el-button>
                <el-button @click="cancelAudit" size="small">取 消</el-button>
            </div>
            <audit-base @handleSubmit="submitAudit"></audit-base>
        </el-dialog>
    </basic-container>
</template>
@@ -173,7 +159,6 @@
                status: [{ required: true, message: "必填" }],
                reasonFailure: [{ required: true, message: "必填" }],
            },
            auditForm: {},
            visible: false,
            typeStatus: 1,
            isDetail: false,
@@ -404,23 +389,20 @@
        // 取消审核
        cancelAudit () {
            this.visible = false
            this.auditForm = {}
            this.$refs.auditForm.resetFields()
        },

        // 确认提交审核
        submitAudit () {
            this.$refs.auditForm.validate((valid) => {
                if (valid) {
                    applyRectification(Object.assign(this.auditParams, this.auditForm)).then(res => {
        submitAudit (form) {
            let auditForm = {
                status: form.status == '1' ? '2' : '3',
                reasonFailure: form.confirmNotion,
            }

            applyRectification(Object.assign(this.auditParams, auditForm)).then(res => {
                        if (res.data.code == 200) {
                            this.$message.warning("审核成功")
                            this.onLoad(this.page)
                            this.cancelAudit()
                        }
                    })
                } else {
                    return false
                }
            })
        },

 vue.config.js

@@ -38,7 +38,8 @@
        proxy: {
            "/api": {
                //本地服务接口地址
                target: "https://srgdjczzxtpt.com:2080/api",
                target:"http://192.168.2.109:9528",
                // target: "https://srgdjczzxtpt.com:2080/api",
                // target: "https://kt39592615.goho.co",
                // target: "http://z4042833u6.wicp.vip",
                // target: "http://localhost:9528",