Merge remote-tracking branch 'origin/master'

linwei

2024-02-07 a0f623d098c93a729db45c9ffb38068452c62579

Merge remote-tracking branch 'origin/master'

 src/api/publicSecurity/keynoteManage.js

New file
@@ -0,0 +1,9 @@
import request from "@/router/axios"

export const applyTaskExamine = (data) => {
    return request({
        url: "/api/blade-task/task/examine",
        method: "post",
        data
    })
}

 src/views/publicSecurity/keynotePlaceManage.vue

@@ -10,8 +10,8 @@
                <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" icon="el-icon-s-check" v-if="permission.place_check && row.status == 1"
                    plain @click="lookDetail(row, 1)">审 核
                <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>
                <el-button type="text" :size="size" icon="el-icon-delete" v-if="permission.place_del" plain
                    @click="rowDel(row)">删 除
@@ -31,6 +31,25 @@
            <hotelReporting @colseDetail="colseDetail" v-if="taskType == 2" ref="hotelReporting"></hotelReporting>
            <labelReporting @colseDetail="colseDetail" v-if="taskType == 3" ref="labelReporting"></labelReporting>
        </el-dialog>

        <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="remark" v-if="auditForm.status == 3">
                    <el-input type="textarea" v-model="auditForm.remark"></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>
        </el-dialog>
    </basic-container>
</template>

@@ -45,7 +64,9 @@
import {
    mapGetters
} from "vuex"

import {
    applyTaskExamine
} from "@/api/publicSecurity/keynoteManage"
import website from '@/config/website'
import campusReporting from './components/campusReporting'
import hotelReporting from './components/hotelReporting'
@@ -66,6 +87,12 @@
        }

        return {
            auditRules: {
                status: [{ required: true, message: "必填" }],
                remark: [{ required: true, message: "必填" }],
            },
            auditForm: {},
            visible: false,
            taskType: 0,
            curRow: {},
            roleBox: false,
@@ -86,7 +113,7 @@
                searchLabelWidth: 96,
                searchShow: true,
                searchMenuSpan: 3,
                menuWidth: 160,
                menuWidth: 190,
                height: "auto",
                calcHeight: 54,
                dialogWidth: 950,
@@ -289,6 +316,44 @@
        }
    },
    methods: {
        // 弹窗关闭回调
        handleClose () {
            this.cancelAudit()
        },

        // 取消审核
        cancelAudit () {
            this.visible = false
            this.auditForm = {}
            this.$refs.auditForm.resetFields()
        },

        // 确认提交审核
        submitAudit () {
            this.$refs.auditForm.validate((valid) => {
                if (valid) {
                    applyTaskExamine(Object.assign(this.auditParams, this.auditForm)).then(res => {
                        if (res.data.code == 200) {
                            this.$message.warning("审核成功")
                            this.onLoad(this.page)
                            this.cancelAudit()
                        }
                    })
                } else {
                    return false
                }
            })
        },

        // 审核按钮
        goAudit (row) {
            this.auditParams = {
                id: row.id,
                reportType: row.reportType
            }
            console.log('this.auditParams', this.auditParams)
            this.visible = true
        },

        colseDetail () {
            this.auditBasePopup = false
@@ -332,7 +397,7 @@
        },

        rowSave (row, done, loading) {
            if (row.imageUrls.length > 0) {
            if (row.imageUrls && row.imageUrls.length > 0) {
                var urls = []
                var split = row.imageUrls.split(",").filter(item => item != '')
                split.forEach(url => {
@@ -522,7 +587,7 @@
            //   }
            //   values.dateTime = null
            // }
            values.reportType = 8
            values.reportType = 2
            this.loading = true
            getList(page.currentPage, page.pageSize, values).then((res) => {
                const data = res.data.data

 src/views/publicSecurity/ninePlaceManage/patrolRecord.vue

@@ -331,7 +331,6 @@

    methods: {
        showStringDispose (row, type) {
            console.log(row, type)
            row[type] = !row[type]
        },


 src/views/publicSecurity/positionManage/TransactRegist.vue

@@ -11,7 +11,7 @@
                    @click="lookDetail(row, 0)">查 看
                </el-button>
                <el-button type="text" :size="size" icon="el-icon-s-check" v-if="permission.place_check && row.status == 1"
                    plain @click="lookDetail(row, 1)">审 核
                    plain @click="goAudit(row)">审 核
                </el-button>
                <el-button type="text" :size="size" icon="el-icon-delete" v-if="permission.place_del" plain
                    @click="rowDel(row)">删 除
@@ -31,6 +31,25 @@
            <hotelReporting @colseDetail="colseDetail" v-if="taskType == 2" ref="hotelReporting"></hotelReporting>
            <labelReporting @colseDetail="colseDetail" v-if="taskType == 3" ref="labelReporting"></labelReporting>
        </el-dialog>

        <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="remark" v-if="auditForm.status == 3">
                    <el-input type="textarea" v-model="auditForm.remark"></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>
        </el-dialog>
    </basic-container>
</template>

@@ -45,6 +64,9 @@
import {
    mapGetters
} from "vuex"
import {
    applyTaskExamine
} from "@/api/publicSecurity/keynoteManage"

import website from '@/config/website'
import campusReporting from '../components/campusReporting'
@@ -66,6 +88,12 @@
        }

        return {
            auditRules: {
                status: [{ required: true, message: "必填" }],
                remark: [{ required: true, message: "必填" }],
            },
            auditForm: {},
            visible: false,
            taskType: 0,
            curRow: {},
            roleBox: false,
@@ -86,7 +114,7 @@
                searchLabelWidth: 96,
                searchShow: true,
                searchMenuSpan: 3,
                menuWidth: 160,
                menuWidth: 190,
                height: "auto",
                calcHeight: 54,
                dialogWidth: 950,
@@ -290,6 +318,44 @@
        }
    },
    methods: {
        // 弹窗关闭回调
        handleClose () {
            this.cancelAudit()
        },

        // 取消审核
        cancelAudit () {
            this.visible = false
            this.auditForm = {}
            this.$refs.auditForm.resetFields()
        },

        // 确认提交审核
        submitAudit () {
            this.$refs.auditForm.validate((valid) => {
                if (valid) {
                    applyTaskExamine(Object.assign(this.auditParams, this.auditForm)).then(res => {
                        if (res.data.code == 200) {
                            this.$message.warning("审核成功")
                            this.onLoad(this.page)
                            this.cancelAudit()
                        }
                    })
                } else {
                    return false
                }
            })
        },

        // 审核按钮
        goAudit (row) {
            this.auditParams = {
                id: row.id,
                reportType: row.reportType
            }
            console.log('this.auditParams', this.auditParams)
            this.visible = true
        },

        colseDetail () {
            this.auditBasePopup = false
@@ -523,7 +589,7 @@
            //   }
            //   values.dateTime = null
            // }
            values.reportType = 2
            values.reportType = 5
            this.loading = true
            getList(page.currentPage, page.pageSize, values).then((res) => {
                const data = res.data.data